Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 44cf6f6955 |
+20
-14
@@ -134,7 +134,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
|
|||||||
{
|
{
|
||||||
for (int i = 0; i < 11; i++)
|
for (int i = 0; i < 11; i++)
|
||||||
{
|
{
|
||||||
times.add(new Rolling(SIZE));
|
this.times.add(new Rolling(SIZE));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -144,19 +144,25 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
|
|||||||
{
|
{
|
||||||
String name = e.name;
|
String name = e.name;
|
||||||
int index = Arrays.asList(TIME_NAMES).indexOf(name);
|
int index = Arrays.asList(TIME_NAMES).indexOf(name);
|
||||||
if (index == -1) continue;
|
if (index == -1)
|
||||||
times.get(index).add(e.timeNs);
|
{
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
times.get(0).add(event.getTotalTimeNs());
|
this.times.get(index).add(e.timeNs);
|
||||||
|
}
|
||||||
|
this.times.get(0).add(event.getTotalTimeNs());
|
||||||
}
|
}
|
||||||
|
|
||||||
public String toString()
|
@Override public String toString()
|
||||||
{
|
{
|
||||||
StringBuilder sb = new StringBuilder();
|
StringBuilder sb = new StringBuilder();
|
||||||
for (int i = 0; i < times.size(); i++)
|
for (int i = 0; i < this.times.size(); i++)
|
||||||
{
|
{
|
||||||
if (times.get(i).getAverage() == 0) continue;
|
if (this.times.get(i).getAverage() == 0)
|
||||||
sb.append(TIME_NAMES[i]).append(": ").append(times.get(i).getAverage()).append("\n");
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
sb.append(TIME_NAMES[i]).append(": ").append(this.times.get(i).getAverage()).append("\n");
|
||||||
}
|
}
|
||||||
return sb.toString();
|
return sb.toString();
|
||||||
}
|
}
|
||||||
@@ -186,13 +192,13 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
|
|||||||
|
|
||||||
public RegionFileStorageExternalCache getOrCreateRegionFileCache(RegionFileStorage storage)
|
public RegionFileStorageExternalCache getOrCreateRegionFileCache(RegionFileStorage storage)
|
||||||
{
|
{
|
||||||
RegionFileStorageExternalCache cache = regionFileStorageCacheRef.get();
|
RegionFileStorageExternalCache cache = this.regionFileStorageCacheRef.get();
|
||||||
if (cache == null)
|
if (cache == null)
|
||||||
{
|
{
|
||||||
cache = new RegionFileStorageExternalCache(storage);
|
cache = new RegionFileStorageExternalCache(storage);
|
||||||
if (!regionFileStorageCacheRef.compareAndSet(null, cache))
|
if (!this.regionFileStorageCacheRef.compareAndSet(null, cache))
|
||||||
{
|
{
|
||||||
cache = regionFileStorageCacheRef.get();
|
cache = this.regionFileStorageCacheRef.get();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return cache;
|
return cache;
|
||||||
@@ -304,17 +310,17 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
|
|||||||
|
|
||||||
public <T> T joinSync(CompletableFuture<T> future)
|
public <T> T joinSync(CompletableFuture<T> future)
|
||||||
{
|
{
|
||||||
if (!unsafeThreadingRecorded && !future.isDone())
|
if (!this.unsafeThreadingRecorded && !future.isDone())
|
||||||
{
|
{
|
||||||
EVENT_LOGGER.error("Unsafe MultiThreading in Chunk Generator: ", new RuntimeException("Concurrent future"));
|
EVENT_LOGGER.error("Unsafe MultiThreading in Chunk Generator: ", new RuntimeException("Concurrent future"));
|
||||||
EVENT_LOGGER.error("To increase stability, it is recommended to set world generation threads count to 1.");
|
EVENT_LOGGER.error("To increase stability, it is recommended to set world generation threads count to 1.");
|
||||||
unsafeThreadingRecorded = true;
|
this.unsafeThreadingRecorded = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return future.join();
|
return future.join();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void updateAllFutures()
|
@Override public void updateAllFutures()
|
||||||
{
|
{
|
||||||
if (this.unknownExceptionCount > 0)
|
if (this.unknownExceptionCount > 0)
|
||||||
{
|
{
|
||||||
|
|||||||
+1
-1
Submodule coreSubProjects updated: f7bf05b62f...5b746a9534
Reference in New Issue
Block a user