mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-06 07:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the leak

Browse Source
This commit is contained in:
Daniel Mills
2020-12-28 13:17:49 -05:00
parent 5878128746
commit 56ae387f7b
6 changed files with 79 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/volmit/iris/util/J.java
View File

@@ -19,7 +19,7 @@ public class J
tid++;
Thread t = new Thread(r);
t.setName("Iris Actuator " + tid);
t.setPriority(Thread.MIN_PRIORITY);
t.setPriority(8);
t.setUncaughtExceptionHandler((et, e) ->
{
Iris.info("Exception encountered in " + et.getName());

30
src/main/java/com/volmit/iris/util/PregenJob.java
View File

@@ -18,7 +18,10 @@ import org.bukkit.event.world.ChunkUnloadEvent;
import java.awt.*;
import java.io.File;
import java.io.IOException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Semaphore;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
public class PregenJob implements Listener
@@ -53,7 +56,7 @@ public class PregenJob implements Listener
private double cps = 0;
private int lg = 0;
private long lt = M.ms();
private int cubeSize = 9;
private int cubeSize = 32;
private long nogen = M.ms();
private KList<ChunkPosition> requeueMCA = new KList<ChunkPosition>();
private RollingSequence acps = new RollingSequence(PaperLib.isPaper() ? 8 : 32);
@@ -64,6 +67,25 @@ public class PregenJob implements Listener
private final DirectWorldWriter writer;
int xc = 0;
private IrisAccess access = null;
private static int tid = 0;
private static final ExecutorService e = Executors.newCachedThreadPool(new ThreadFactory()
{
@Override
public Thread newThread(Runnable r)
{
tid++;
Thread t = new Thread(r);
t.setName("Iris Pregen Worker " + tid);
t.setPriority(3);
t.setUncaughtExceptionHandler((et, e) ->
{
Iris.info("Exception encountered in " + et.getName());
e.printStackTrace();
});
return t;
}
});
public PregenJob(World world, int size, MortarSender sender, Runnable onDone)
{
@@ -439,7 +461,7 @@ public class PregenJob implements Listener
}
};
J.a(g);
e.execute(g);
}
else
@@ -447,7 +469,7 @@ public class PregenJob implements Listener
{
consumer.accept(new ChunkPosition(chunkX, chunkZ), Color.magenta.darker().darker().darker());
}
J.a(() ->
e.execute(() ->
{
try
{
@@ -626,7 +648,7 @@ public class PregenJob implements Listener
try
{
vv.add("Parallelism: " + access().getCompound().getCurrentlyGeneratingEngines());
vv.add("Precache : " + access().getPrecacheSize());
vv.add("Plax Cache : " + Form.f(access().getParallaxChunkCount()));
}
catch(Throwable e)