lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addition of ThreadsForLoading configuration.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-04-05 18:30:14 +00:00
parent 955c2eff68
commit fc6c31df53
59 changed files with 1144 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_3.0_Helios/dist/game/config/Server.ini vendored
View File

@@ -145,6 +145,10 @@ ThreadsPerInstantThreadPool = 2
# Default: 2
UrgentPacketThreadCoreSize = 2
# Use threads to decrease startup time.
# Default: False
ThreadsForLoading = False
# ---------------------------------------------------------------------------
# Dead Lock Detector (separate thread for detecting deadlocks)

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/Config.java
View File

@@ -436,6 +436,7 @@ public final class Config
public static int INSTANT_THREAD_POOL_COUNT;
public static int THREADS_PER_INSTANT_THREAD_POOL;
public static int IO_PACKET_THREAD_CORE_SIZE;
public static boolean THREADS_FOR_LOADING;
public static boolean DEADLOCK_DETECTOR;
public static int DEADLOCK_CHECK_INTERVAL;
public static boolean RESTART_ON_DEADLOCK;
@@ -1299,6 +1300,7 @@ public final class Config
}
THREADS_PER_INSTANT_THREAD_POOL = serverSettings.getInt("ThreadsPerInstantThreadPool", 2);
IO_PACKET_THREAD_CORE_SIZE = serverSettings.getInt("UrgentPacketThreadCoreSize", 2);
THREADS_FOR_LOADING = serverSettings.getBoolean("ThreadsForLoading", false);
DEADLOCK_DETECTOR = serverSettings.getBoolean("DeadLockDetector", true);
DEADLOCK_CHECK_INTERVAL = serverSettings.getInt("DeadLockCheckInterval", 20);

48
L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/IXmlReader.java
View File

@@ -165,29 +165,47 @@ public interface IXmlReader
return false;
}
final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
final File[] listOfFiles = dir.listFiles();
for (File f : listOfFiles)
if (Config.THREADS_FOR_LOADING)
{
if (recursive && f.isDirectory())
final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
final File[] listOfFiles = dir.listFiles();
for (File file : listOfFiles)
{
parseDirectory(f, recursive);
}
else if (getCurrentFileFilter().accept(f))
{
jobs.add(ThreadPool.schedule(() ->
if (recursive && file.isDirectory())
{
parseFile(f);
}, 0));
parseDirectory(file, recursive);
}
else if (getCurrentFileFilter().accept(file))
{
jobs.add(ThreadPool.schedule(() ->
{
parseFile(file);
}, 0));
}
}
while (!jobs.isEmpty())
{
for (ScheduledFuture<?> job : jobs)
{
if ((job == null) || job.isDone() || job.isCancelled())
{
jobs.remove(job);
}
}
}
}
while (!jobs.isEmpty())
else
{
for (ScheduledFuture<?> job : jobs)
final File[] listOfFiles = dir.listFiles();
for (File file : listOfFiles)
{
if ((job == null) || job.isDone() || job.isCancelled())
if (recursive && file.isDirectory())
{
jobs.remove(job);
parseDirectory(file, recursive);
}
else if (getCurrentFileFilter().accept(file))
{
parseFile(file);
}
}
}

42
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/SpawnsData.java
View File

@@ -95,28 +95,44 @@ public class SpawnsData implements IXmlReader
}
LOGGER.info(getClass().getSimpleName() + ": Initializing spawns...");
final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
for (SpawnTemplate template : _spawns)
if (Config.THREADS_FOR_LOADING)
{
if (template.isSpawningByDefault())
final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
for (SpawnTemplate template : _spawns)
{
jobs.add(ThreadPool.schedule(() ->
if (template.isSpawningByDefault())
{
template.spawnAll(null);
template.notifyActivate();
}, 0));
jobs.add(ThreadPool.schedule(() ->
{
template.spawnAll(null);
template.notifyActivate();
}, 0));
}
}
}
while (!jobs.isEmpty())
{
for (ScheduledFuture<?> job : jobs)
while (!jobs.isEmpty())
{
if ((job == null) || job.isDone() || job.isCancelled())
for (ScheduledFuture<?> job : jobs)
{
jobs.remove(job);
if ((job == null) || job.isDone() || job.isCancelled())
{
jobs.remove(job);
}
}
}
}
else
{
for (SpawnTemplate template : _spawns)
{
if (template.isSpawningByDefault())
{
template.spawnAll(null);
template.notifyActivate();
}
}
}
LOGGER.info(getClass().getSimpleName() + ": All spawns has been initialized!");
}

40
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/engines/DocumentEngine.java
View File

@@ -69,26 +69,40 @@ public class DocumentEngine
public List<Item> loadItems()
{
final List<Item> list = new CopyOnWriteArrayList<>();
final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
for (File file : _itemFiles)
if (Config.THREADS_FOR_LOADING)
{
jobs.add(ThreadPool.schedule(() ->
final List<ScheduledFuture<?>> jobs = new CopyOnWriteArrayList<>();
for (File file : _itemFiles)
{
jobs.add(ThreadPool.schedule(() ->
{
final DocumentItem document = new DocumentItem(file);
document.parse();
list.addAll(document.getItemList());
}, 0));
}
while (!jobs.isEmpty())
{
for (ScheduledFuture<?> job : jobs)
{
if ((job == null) || job.isDone() || job.isCancelled())
{
jobs.remove(job);
}
}
}
}
else
{
for (File file : _itemFiles)
{
final DocumentItem document = new DocumentItem(file);
document.parse();
list.addAll(document.getItemList());
}, 0));
}
while (!jobs.isEmpty())
{
for (ScheduledFuture<?> job : jobs)
{
if ((job == null) || job.isDone() || job.isCancelled())
{
jobs.remove(job);
}
}
}
return list;
}