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

ThreadPool settings moved to server configs.

Browse Source
This commit is contained in:
MobiusDev 2017-08-23 05:40:47 +00:00
parent 5f8a5da5b3
commit cfe3ee3b6f
12 changed files with 196 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
L2J_Mobius_Classic/dist/game/config/General.ini vendored
View File

@ -128,45 +128,6 @@ SkillCheckRemove = True
SkillCheckGM = False
# ---------------------------------------------------------------------------
# Thread Configuration
# ---------------------------------------------------------------------------
# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
ScheduledThreadPoolCount = -1
# Specifies how many threads will be in a single scheduled pool.
Default: 4
ThreadsPerScheduledThreadPool = 40
# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
InstantThreadPoolCount = -1
# Specifies how many threads will be in a single instant pool.
Default: 2
ThreadsPerInstantThreadPool = 20
# Default: 2
UrgentPacketThreadCoreSize = 20
# ---------------------------------------------------------------------------
# Dead Lock Detector (separate thread for detecting deadlocks)
# ---------------------------------------------------------------------------
# For improved crash logs and automatic restart in deadlock case if enabled.
# Check interval is in seconds.
# Default: True
DeadLockDetector = True
# Default: 20
DeadLockCheckInterval = 20
# Default: False
RestartOnDeadlock = False
# ---------------------------------------------------------------------------
# Optimization
# ---------------------------------------------------------------------------

39
L2J_Mobius_Classic/dist/game/config/Server.ini vendored
View File

@ -109,6 +109,45 @@ ServerListAge = 0
ServerListBrackets = False
# ---------------------------------------------------------------------------
# Thread Configuration
# ---------------------------------------------------------------------------
# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
ScheduledThreadPoolCount = -1
# Specifies how many threads will be in a single scheduled pool.
Default: 4
ThreadsPerScheduledThreadPool = 40
# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
InstantThreadPoolCount = -1
# Specifies how many threads will be in a single instant pool.
Default: 2
ThreadsPerInstantThreadPool = 20
# Default: 2
UrgentPacketThreadCoreSize = 20
# ---------------------------------------------------------------------------
# Dead Lock Detector (separate thread for detecting deadlocks)
# ---------------------------------------------------------------------------
# For improved crash logs and automatic restart in deadlock case if enabled.
# Check interval is in seconds.
# Default: True
DeadLockDetector = True
# Default: 20
DeadLockCheckInterval = 20
# Default: False
RestartOnDeadlock = False
# ---------------------------------------------------------------------------
# Player HWID settings (DO NOT USE)
# ---------------------------------------------------------------------------

18
L2J_Mobius_Classic/java/com/l2jmobius/Config.java
View File

@ -1215,6 +1215,16 @@ public final class Config
SERVER_LIST_AGE = serverSettings.getInt("ServerListAge", 0);
SERVER_LIST_BRACKET = serverSettings.getBoolean("ServerListBrackets", false);
SCHEDULED_THREAD_POOL_COUNT = serverSettings.getInt("ScheduledThreadPoolCount", -1);
THREADS_PER_SCHEDULED_THREAD_POOL = serverSettings.getInt("ThreadsPerScheduledThreadPool", 4);
INSTANT_THREAD_POOL_COUNT = serverSettings.getInt("InstantThreadPoolCount", -1);
THREADS_PER_INSTANT_THREAD_POOL = serverSettings.getInt("ThreadsPerInstantThreadPool", 2);
IO_PACKET_THREAD_CORE_SIZE = serverSettings.getInt("UrgentPacketThreadCoreSize", 2);
DEADLOCK_DETECTOR = serverSettings.getBoolean("DeadLockDetector", true);
DEADLOCK_CHECK_INTERVAL = serverSettings.getInt("DeadLockCheckInterval", 20);
RESTART_ON_DEADLOCK = serverSettings.getBoolean("RestartOnDeadlock", false);
SERVER_RESTART_SCHEDULE_ENABLED = serverSettings.getBoolean("ServerRestartScheduleEnabled", false);
SERVER_RESTART_SCHEDULE_MESSAGE = serverSettings.getBoolean("ServerRestartScheduleMessage", false);
SERVER_RESTART_SCHEDULE_COUNTDOWN = serverSettings.getInt("ServerRestartScheduleCountdown", 600);
@ -1705,14 +1715,6 @@ public final class Config
ALT_DEV_NO_SPAWNS = General.getBoolean("AltDevNoSpawns", false) || Boolean.getBoolean("nospawns");
ALT_DEV_SHOW_QUESTS_LOAD_IN_LOGS = General.getBoolean("AltDevShowQuestsLoadInLogs", false);
ALT_DEV_SHOW_SCRIPTS_LOAD_IN_LOGS = General.getBoolean("AltDevShowScriptsLoadInLogs", false);
SCHEDULED_THREAD_POOL_COUNT = General.getInt("ScheduledThreadPoolCount", -1);
THREADS_PER_SCHEDULED_THREAD_POOL = General.getInt("ThreadsPerScheduledThreadPool", 4);
INSTANT_THREAD_POOL_COUNT = General.getInt("InstantThreadPoolCount", -1);
THREADS_PER_INSTANT_THREAD_POOL = General.getInt("ThreadsPerInstantThreadPool", 2);
IO_PACKET_THREAD_CORE_SIZE = General.getInt("UrgentPacketThreadCoreSize", 2);
DEADLOCK_DETECTOR = General.getBoolean("DeadLockDetector", true);
DEADLOCK_CHECK_INTERVAL = General.getInt("DeadLockCheckInterval", 20);
RESTART_ON_DEADLOCK = General.getBoolean("RestartOnDeadlock", false);
ALLOW_DISCARDITEM = General.getBoolean("AllowDiscardItem", true);
AUTODESTROY_ITEM_AFTER = General.getInt("AutoDestroyDroppedItemAfter", 600);
HERB_AUTO_DESTROY_TIME = General.getInt("AutoDestroyHerbTime", 60) * 1000;

39
L2J_Mobius_Ertheia/dist/game/config/General.ini vendored
View File

@ -128,45 +128,6 @@ SkillCheckRemove = True
SkillCheckGM = False
# ---------------------------------------------------------------------------
# Thread Configuration
# ---------------------------------------------------------------------------
# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
ScheduledThreadPoolCount = -1
# Specifies how many threads will be in a single scheduled pool.
Default: 4
ThreadsPerScheduledThreadPool = 40
# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
InstantThreadPoolCount = -1
# Specifies how many threads will be in a single instant pool.
Default: 2
ThreadsPerInstantThreadPool = 20
# Default: 2
UrgentPacketThreadCoreSize = 20
# ---------------------------------------------------------------------------
# Dead Lock Detector (separate thread for detecting deadlocks)
# ---------------------------------------------------------------------------
# For improved crash logs and automatic restart in deadlock case if enabled.
# Check interval is in seconds.
# Default: True
DeadLockDetector = True
# Default: 20
DeadLockCheckInterval = 20
# Default: False
RestartOnDeadlock = False
# ---------------------------------------------------------------------------
# Optimization
# ---------------------------------------------------------------------------

39
L2J_Mobius_Ertheia/dist/game/config/Server.ini vendored
View File

@ -109,6 +109,45 @@ ServerListAge = 0
ServerListBrackets = False
# ---------------------------------------------------------------------------
# Thread Configuration
# ---------------------------------------------------------------------------
# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
ScheduledThreadPoolCount = -1
# Specifies how many threads will be in a single scheduled pool.
Default: 4
ThreadsPerScheduledThreadPool = 40
# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
InstantThreadPoolCount = -1
# Specifies how many threads will be in a single instant pool.
Default: 2
ThreadsPerInstantThreadPool = 20
# Default: 2
UrgentPacketThreadCoreSize = 20
# ---------------------------------------------------------------------------
# Dead Lock Detector (separate thread for detecting deadlocks)
# ---------------------------------------------------------------------------
# For improved crash logs and automatic restart in deadlock case if enabled.
# Check interval is in seconds.
# Default: True
DeadLockDetector = True
# Default: 20
DeadLockCheckInterval = 20
# Default: False
RestartOnDeadlock = False
# ---------------------------------------------------------------------------
# Player HWID settings (DO NOT USE)
# ---------------------------------------------------------------------------

18
L2J_Mobius_Ertheia/java/com/l2jmobius/Config.java
View File

@ -1212,6 +1212,16 @@ public final class Config
SERVER_LIST_AGE = serverSettings.getInt("ServerListAge", 0);
SERVER_LIST_BRACKET = serverSettings.getBoolean("ServerListBrackets", false);
SCHEDULED_THREAD_POOL_COUNT = serverSettings.getInt("ScheduledThreadPoolCount", -1);
THREADS_PER_SCHEDULED_THREAD_POOL = serverSettings.getInt("ThreadsPerScheduledThreadPool", 4);
INSTANT_THREAD_POOL_COUNT = serverSettings.getInt("InstantThreadPoolCount", -1);
THREADS_PER_INSTANT_THREAD_POOL = serverSettings.getInt("ThreadsPerInstantThreadPool", 2);
IO_PACKET_THREAD_CORE_SIZE = serverSettings.getInt("UrgentPacketThreadCoreSize", 2);
DEADLOCK_DETECTOR = serverSettings.getBoolean("DeadLockDetector", true);
DEADLOCK_CHECK_INTERVAL = serverSettings.getInt("DeadLockCheckInterval", 20);
RESTART_ON_DEADLOCK = serverSettings.getBoolean("RestartOnDeadlock", false);
SERVER_RESTART_SCHEDULE_ENABLED = serverSettings.getBoolean("ServerRestartScheduleEnabled", false);
SERVER_RESTART_SCHEDULE_MESSAGE = serverSettings.getBoolean("ServerRestartScheduleMessage", false);
SERVER_RESTART_SCHEDULE_COUNTDOWN = serverSettings.getInt("ServerRestartScheduleCountdown", 600);
@ -1699,14 +1709,6 @@ public final class Config
ALT_DEV_NO_SPAWNS = General.getBoolean("AltDevNoSpawns", false) || Boolean.getBoolean("nospawns");
ALT_DEV_SHOW_QUESTS_LOAD_IN_LOGS = General.getBoolean("AltDevShowQuestsLoadInLogs", false);
ALT_DEV_SHOW_SCRIPTS_LOAD_IN_LOGS = General.getBoolean("AltDevShowScriptsLoadInLogs", false);
SCHEDULED_THREAD_POOL_COUNT = General.getInt("ScheduledThreadPoolCount", -1);
THREADS_PER_SCHEDULED_THREAD_POOL = General.getInt("ThreadsPerScheduledThreadPool", 4);
INSTANT_THREAD_POOL_COUNT = General.getInt("InstantThreadPoolCount", -1);
THREADS_PER_INSTANT_THREAD_POOL = General.getInt("ThreadsPerInstantThreadPool", 2);
IO_PACKET_THREAD_CORE_SIZE = General.getInt("UrgentPacketThreadCoreSize", 2);
DEADLOCK_DETECTOR = General.getBoolean("DeadLockDetector", true);
DEADLOCK_CHECK_INTERVAL = General.getInt("DeadLockCheckInterval", 20);
RESTART_ON_DEADLOCK = General.getBoolean("RestartOnDeadlock", false);
ALLOW_DISCARDITEM = General.getBoolean("AllowDiscardItem", true);
AUTODESTROY_ITEM_AFTER = General.getInt("AutoDestroyDroppedItemAfter", 600);
HERB_AUTO_DESTROY_TIME = General.getInt("AutoDestroyHerbTime", 60) * 1000;

39
L2J_Mobius_Helios/dist/game/config/General.ini vendored
View File

@ -128,45 +128,6 @@ SkillCheckRemove = True
SkillCheckGM = False
# ---------------------------------------------------------------------------
# Thread Configuration
# ---------------------------------------------------------------------------
# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
ScheduledThreadPoolCount = -1
# Specifies how many threads will be in a single scheduled pool.
Default: 4
ThreadsPerScheduledThreadPool = 40
# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
InstantThreadPoolCount = -1
# Specifies how many threads will be in a single instant pool.
Default: 2
ThreadsPerInstantThreadPool = 20
# Default: 2
UrgentPacketThreadCoreSize = 20
# ---------------------------------------------------------------------------
# Dead Lock Detector (separate thread for detecting deadlocks)
# ---------------------------------------------------------------------------
# For improved crash logs and automatic restart in deadlock case if enabled.
# Check interval is in seconds.
# Default: True
DeadLockDetector = True
# Default: 20
DeadLockCheckInterval = 20
# Default: False
RestartOnDeadlock = False
# ---------------------------------------------------------------------------
# Optimization
# ---------------------------------------------------------------------------

39
L2J_Mobius_Helios/dist/game/config/Server.ini vendored
View File

@ -109,6 +109,45 @@ ServerListAge = 0
ServerListBrackets = False
# ---------------------------------------------------------------------------
# Thread Configuration
# ---------------------------------------------------------------------------
# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
ScheduledThreadPoolCount = -1
# Specifies how many threads will be in a single scheduled pool.
Default: 4
ThreadsPerScheduledThreadPool = 40
# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
InstantThreadPoolCount = -1
# Specifies how many threads will be in a single instant pool.
Default: 2
ThreadsPerInstantThreadPool = 20
# Default: 2
UrgentPacketThreadCoreSize = 20
# ---------------------------------------------------------------------------
# Dead Lock Detector (separate thread for detecting deadlocks)
# ---------------------------------------------------------------------------
# For improved crash logs and automatic restart in deadlock case if enabled.
# Check interval is in seconds.
# Default: True
DeadLockDetector = True
# Default: 20
DeadLockCheckInterval = 20
# Default: False
RestartOnDeadlock = False
# ---------------------------------------------------------------------------
# Player HWID settings (DO NOT USE)
# ---------------------------------------------------------------------------

18
L2J_Mobius_Helios/java/com/l2jmobius/Config.java
View File

@ -1214,6 +1214,16 @@ public final class Config
SERVER_LIST_AGE = serverSettings.getInt("ServerListAge", 0);
SERVER_LIST_BRACKET = serverSettings.getBoolean("ServerListBrackets", false);
SCHEDULED_THREAD_POOL_COUNT = serverSettings.getInt("ScheduledThreadPoolCount", -1);
THREADS_PER_SCHEDULED_THREAD_POOL = serverSettings.getInt("ThreadsPerScheduledThreadPool", 4);
INSTANT_THREAD_POOL_COUNT = serverSettings.getInt("InstantThreadPoolCount", -1);
THREADS_PER_INSTANT_THREAD_POOL = serverSettings.getInt("ThreadsPerInstantThreadPool", 2);
IO_PACKET_THREAD_CORE_SIZE = serverSettings.getInt("UrgentPacketThreadCoreSize", 2);
DEADLOCK_DETECTOR = serverSettings.getBoolean("DeadLockDetector", true);
DEADLOCK_CHECK_INTERVAL = serverSettings.getInt("DeadLockCheckInterval", 20);
RESTART_ON_DEADLOCK = serverSettings.getBoolean("RestartOnDeadlock", false);
SERVER_RESTART_SCHEDULE_ENABLED = serverSettings.getBoolean("ServerRestartScheduleEnabled", false);
SERVER_RESTART_SCHEDULE_MESSAGE = serverSettings.getBoolean("ServerRestartScheduleMessage", false);
SERVER_RESTART_SCHEDULE_COUNTDOWN = serverSettings.getInt("ServerRestartScheduleCountdown", 600);
@ -1702,14 +1712,6 @@ public final class Config
ALT_DEV_NO_SPAWNS = General.getBoolean("AltDevNoSpawns", false) || Boolean.getBoolean("nospawns");
ALT_DEV_SHOW_QUESTS_LOAD_IN_LOGS = General.getBoolean("AltDevShowQuestsLoadInLogs", false);
ALT_DEV_SHOW_SCRIPTS_LOAD_IN_LOGS = General.getBoolean("AltDevShowScriptsLoadInLogs", false);
SCHEDULED_THREAD_POOL_COUNT = General.getInt("ScheduledThreadPoolCount", -1);
THREADS_PER_SCHEDULED_THREAD_POOL = General.getInt("ThreadsPerScheduledThreadPool", 4);
INSTANT_THREAD_POOL_COUNT = General.getInt("InstantThreadPoolCount", -1);
THREADS_PER_INSTANT_THREAD_POOL = General.getInt("ThreadsPerInstantThreadPool", 2);
IO_PACKET_THREAD_CORE_SIZE = General.getInt("UrgentPacketThreadCoreSize", 2);
DEADLOCK_DETECTOR = General.getBoolean("DeadLockDetector", true);
DEADLOCK_CHECK_INTERVAL = General.getInt("DeadLockCheckInterval", 20);
RESTART_ON_DEADLOCK = General.getBoolean("RestartOnDeadlock", false);
ALLOW_DISCARDITEM = General.getBoolean("AllowDiscardItem", true);
AUTODESTROY_ITEM_AFTER = General.getInt("AutoDestroyDroppedItemAfter", 600);
HERB_AUTO_DESTROY_TIME = General.getInt("AutoDestroyHerbTime", 60) * 1000;

39
L2J_Mobius_Underground/dist/game/config/General.ini vendored
View File

@ -128,45 +128,6 @@ SkillCheckRemove = True
SkillCheckGM = False
# ---------------------------------------------------------------------------
# Thread Configuration
# ---------------------------------------------------------------------------
# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
ScheduledThreadPoolCount = -1
# Specifies how many threads will be in a single scheduled pool.
Default: 4
ThreadsPerScheduledThreadPool = 40
# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
InstantThreadPoolCount = -1
# Specifies how many threads will be in a single instant pool.
Default: 2
ThreadsPerInstantThreadPool = 20
# Default: 2
UrgentPacketThreadCoreSize = 20
# ---------------------------------------------------------------------------
# Dead Lock Detector (separate thread for detecting deadlocks)
# ---------------------------------------------------------------------------
# For improved crash logs and automatic restart in deadlock case if enabled.
# Check interval is in seconds.
# Default: True
DeadLockDetector = True
# Default: 20
DeadLockCheckInterval = 20
# Default: False
RestartOnDeadlock = False
# ---------------------------------------------------------------------------
# Optimization
# ---------------------------------------------------------------------------

39
L2J_Mobius_Underground/dist/game/config/Server.ini vendored
View File

@ -109,6 +109,45 @@ ServerListAge = 0
ServerListBrackets = False
# ---------------------------------------------------------------------------
# Thread Configuration
# ---------------------------------------------------------------------------
# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
ScheduledThreadPoolCount = -1
# Specifies how many threads will be in a single scheduled pool.
Default: 4
ThreadsPerScheduledThreadPool = 40
# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
Default: -1
InstantThreadPoolCount = -1
# Specifies how many threads will be in a single instant pool.
Default: 2
ThreadsPerInstantThreadPool = 20
# Default: 2
UrgentPacketThreadCoreSize = 20
# ---------------------------------------------------------------------------
# Dead Lock Detector (separate thread for detecting deadlocks)
# ---------------------------------------------------------------------------
# For improved crash logs and automatic restart in deadlock case if enabled.
# Check interval is in seconds.
# Default: True
DeadLockDetector = True
# Default: 20
DeadLockCheckInterval = 20
# Default: False
RestartOnDeadlock = False
# ---------------------------------------------------------------------------
# Player HWID settings (DO NOT USE)
# ---------------------------------------------------------------------------

18
L2J_Mobius_Underground/java/com/l2jmobius/Config.java
View File

@ -1214,6 +1214,16 @@ public final class Config
SERVER_LIST_AGE = serverSettings.getInt("ServerListAge", 0);
SERVER_LIST_BRACKET = serverSettings.getBoolean("ServerListBrackets", false);
SCHEDULED_THREAD_POOL_COUNT = serverSettings.getInt("ScheduledThreadPoolCount", -1);
THREADS_PER_SCHEDULED_THREAD_POOL = serverSettings.getInt("ThreadsPerScheduledThreadPool", 4);
INSTANT_THREAD_POOL_COUNT = serverSettings.getInt("InstantThreadPoolCount", -1);
THREADS_PER_INSTANT_THREAD_POOL = serverSettings.getInt("ThreadsPerInstantThreadPool", 2);
IO_PACKET_THREAD_CORE_SIZE = serverSettings.getInt("UrgentPacketThreadCoreSize", 2);
DEADLOCK_DETECTOR = serverSettings.getBoolean("DeadLockDetector", true);
DEADLOCK_CHECK_INTERVAL = serverSettings.getInt("DeadLockCheckInterval", 20);
RESTART_ON_DEADLOCK = serverSettings.getBoolean("RestartOnDeadlock", false);
SERVER_RESTART_SCHEDULE_ENABLED = serverSettings.getBoolean("ServerRestartScheduleEnabled", false);
SERVER_RESTART_SCHEDULE_MESSAGE = serverSettings.getBoolean("ServerRestartScheduleMessage", false);
SERVER_RESTART_SCHEDULE_COUNTDOWN = serverSettings.getInt("ServerRestartScheduleCountdown", 600);
@ -1702,14 +1712,6 @@ public final class Config
ALT_DEV_NO_SPAWNS = General.getBoolean("AltDevNoSpawns", false) || Boolean.getBoolean("nospawns");
ALT_DEV_SHOW_QUESTS_LOAD_IN_LOGS = General.getBoolean("AltDevShowQuestsLoadInLogs", false);
ALT_DEV_SHOW_SCRIPTS_LOAD_IN_LOGS = General.getBoolean("AltDevShowScriptsLoadInLogs", false);
SCHEDULED_THREAD_POOL_COUNT = General.getInt("ScheduledThreadPoolCount", -1);
THREADS_PER_SCHEDULED_THREAD_POOL = General.getInt("ThreadsPerScheduledThreadPool", 4);
INSTANT_THREAD_POOL_COUNT = General.getInt("InstantThreadPoolCount", -1);
THREADS_PER_INSTANT_THREAD_POOL = General.getInt("ThreadsPerInstantThreadPool", 2);
IO_PACKET_THREAD_CORE_SIZE = General.getInt("UrgentPacketThreadCoreSize", 2);
DEADLOCK_DETECTOR = General.getBoolean("DeadLockDetector", true);
DEADLOCK_CHECK_INTERVAL = General.getInt("DeadLockCheckInterval", 20);
RESTART_ON_DEADLOCK = General.getBoolean("RestartOnDeadlock", false);
ALLOW_DISCARDITEM = General.getBoolean("AllowDiscardItem", true);
AUTODESTROY_ITEM_AFTER = General.getInt("AutoDestroyDroppedItemAfter", 600);
HERB_AUTO_DESTROY_TIME = General.getInt("AutoDestroyHerbTime", 60) * 1000;