9
0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-12-28 11:39:07 +00:00

Fix closing issues

This commit is contained in:
Daniel Mills
2021-08-09 02:12:30 -04:00
parent c95ea19da1
commit 79b3d7359a
6 changed files with 113 additions and 25 deletions

View File

@@ -0,0 +1,53 @@
/*
* Iris is a World Generator for Minecraft Bukkit Servers
* Copyright (c) 2021 Arcane Arts (Volmit Software)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.volmit.iris.util.io;
import com.volmit.iris.util.math.RNG;
import java.io.File;
import java.io.IOException;
public class InstanceState {
public static int getInstanceId()
{
try {
return Integer.parseInt(IO.readAll(instanceFile()).trim());
} catch (Throwable e) {
e.printStackTrace();
}
return -1;
}
public static void updateInstanceId()
{
try {
IO.writeAll(instanceFile(), RNG.r.imax() + "");
} catch (IOException e) {
e.printStackTrace();
}
}
private static File instanceFile()
{
File f = new File("plugins/Iris/cache/instance");
f.getParentFile().mkdirs();
return f;
}
}

View File

@@ -21,6 +21,7 @@ package com.volmit.iris.util.parallel;
import com.volmit.iris.Iris;
import com.volmit.iris.core.IrisSettings;
import com.volmit.iris.util.collection.KList;
import com.volmit.iris.util.io.InstanceState;
import com.volmit.iris.util.math.M;
import com.volmit.iris.util.scheduling.J;
import com.volmit.iris.util.scheduling.Looper;
@@ -38,6 +39,7 @@ public class MultiBurst {
private final String name;
private final int tc;
private final int priority;
private final int instance;
public MultiBurst(int tc) {
this("Iris", 6, tc);
@@ -47,17 +49,24 @@ public class MultiBurst {
this.name = name;
this.priority = priority;
this.tc = tc;
instance = InstanceState.getInstanceId();
last = new AtomicLong(M.ms());
heartbeat = new Looper() {
@Override
protected long loop() {
if(instance != InstanceState.getInstanceId())
{
shutdownNow();
return -1;
}
if (M.ms() - last.get() > TimeUnit.MINUTES.toMillis(1) && service != null) {
service.shutdown();
service = null;
Iris.debug("Shutting down MultiBurst Pool " + getName() + " to conserve resources.");
}
return 60000;
return 30000;
}
};
heartbeat.setName(name + " Monitor");

View File

@@ -42,7 +42,7 @@ public abstract class Looper extends Thread {
}
}
Iris.info("Thread " + getName() + " Shutdown. Pregen stopped / finished.");
Iris.debug("Iris Thread " + getName() + " Shutdown.");
}
protected abstract long loop();