Use ThreadPool with login server.

L2J_Mobius_01.0_Ertheia/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/Config.java

@@ -3573,6 +3573,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_02.5_Underground/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_02.5_Underground/java/org/l2jmobius/Config.java

@@ -3599,6 +3599,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_02.5_Underground/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_03.0_Helios/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_03.0_Helios/java/org/l2jmobius/Config.java

@@ -3621,6 +3621,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_03.0_Helios/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_04.0_GrandCrusade/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/Config.java

@@ -3595,6 +3595,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_05.0_Salvation/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/Config.java

@@ -3604,6 +3604,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_05.5_EtinasFate/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/Config.java

@@ -3616,6 +3616,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_06.0_Fafurion/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/Config.java

@@ -3659,6 +3659,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_07.0_PreludeOfWar/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java

@@ -3675,6 +3675,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_08.2_Homunculus/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/Config.java

@@ -3650,6 +3650,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/Config.java

@@ -3654,6 +3654,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_10.2_MasterClass/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/Config.java

@@ -3656,6 +3656,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_10.3_MasterClass/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/Config.java

@@ -3698,6 +3698,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_C6_Interlude/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_C6_Interlude/java/org/l2jmobius/Config.java

@@ -2897,6 +2897,19 @@ public class Config
 		MYSQL_BIN_PATH = serverSettings.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 		BACKUP_PATH = serverSettings.getString("BackupPath", "../backup/");
 		BACKUP_DAYS = serverSettings.getInt("BackupDays", 30);
+		SCHEDULED_THREAD_POOL_COUNT = serverSettings.getInt("ScheduledThreadPoolCount", 2);
+		if (SCHEDULED_THREAD_POOL_COUNT == -1)
+		{
+			SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+		}
+		THREADS_PER_SCHEDULED_THREAD_POOL = serverSettings.getInt("ThreadsPerScheduledThreadPool", 2);
+		INSTANT_THREAD_POOL_COUNT = serverSettings.getInt("InstantThreadPoolCount", 2);
+		if (INSTANT_THREAD_POOL_COUNT == -1)
+		{
+			INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+		}
+		THREADS_PER_INSTANT_THREAD_POOL = serverSettings.getInt("ThreadsPerInstantThreadPool", 4);
+		THREADS_FOR_CLIENT_PACKETS = serverSettings.getBoolean("ThreadsForClientPackets", true);
 		SHOW_LICENCE = serverSettings.getBoolean("ShowLicence", false);
 		AUTO_CREATE_ACCOUNTS = serverSettings.getBoolean("AutoCreateAccounts", true);
 		FLOOD_PROTECTION = serverSettings.getBoolean("EnableFloodProtection", true);

L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_C6_Interlude/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_CT_0_Interlude/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/Config.java

@@ -3056,6 +3056,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);
 			FLOOD_PROTECTION = loginConfig.getBoolean("EnableFloodProtection", true);

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_CT_2.4_Epilogue/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java

@@ -3174,6 +3174,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);
 			FLOOD_PROTECTION = loginConfig.getBoolean("EnableFloodProtection", true);

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_CT_2.6_HighFive/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/Config.java

@@ -3181,6 +3181,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);
 			FLOOD_PROTECTION = loginConfig.getBoolean("EnableFloodProtection", true);

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_Classic_1.0/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_Classic_1.0/java/org/l2jmobius/Config.java

@@ -3464,6 +3464,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_Classic_1.0/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_Classic_1.0/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/Config.java

@@ -3510,6 +3510,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_Classic_2.0_Saviors/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/Config.java

@@ -3516,6 +3516,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_Classic_2.5_Zaken/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/Config.java

@@ -3522,6 +3522,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_Classic_2.7_Antharas/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/Config.java

@@ -3522,6 +3522,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_Classic_2.8_SevenSigns/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/Config.java

@@ -3522,6 +3522,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_Classic_2.9.5_Saviors/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/Config.java

@@ -3545,6 +3545,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/Config.java

@@ -3531,6 +3531,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable

L2J_Mobius_Classic_3.0_TheKamael/dist/login/config/LoginServer.ini

@@ -67,11 +67,33 @@ MySqlBinLocation = C:/xampp/mysql/bin/
 BackupPath = ../backup/
 
 # Maximum number of days that backups will be kept.
-# Old backups will be deleted.
+# Old files in backup folder will be deleted.
 # Set to 0 to disable.
 BackupDays = 30
 
 
+# ---------------------------------------------------------------------------
+# Thread Configuration
+# ---------------------------------------------------------------------------
+
+# Determines the amount of scheduled thread pools. If set to -1, the server will decide the amount depending on the available processors.
+ScheduledThreadPoolCount = 2
+
+# Specifies how many threads will be in a single scheduled pool.
+ThreadsPerScheduledThreadPool = 2
+
+# Determines the amount of instant thread pools. If set to -1, the server will decide the amount depending on the available processors.
+InstantThreadPoolCount = 2
+
+# Specifies how many threads will be in a single instant pool.
+ThreadsPerInstantThreadPool = 4
+
+# Use threads to run client packets individually.
+# Less lag when using threads, but more CPU consumption.
+# Default: True
+ThreadsForClientPackets = True
+
+
 # ---------------------------------------------------------------------------
 # Security
 # ---------------------------------------------------------------------------

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/Config.java

@@ -3545,6 +3545,19 @@ public class Config
 			MYSQL_BIN_PATH = loginConfig.getString("MySqlBinLocation", "C:/xampp/mysql/bin/");
 			BACKUP_PATH = loginConfig.getString("BackupPath", "../backup/");
 			BACKUP_DAYS = loginConfig.getInt("BackupDays", 30);
+			SCHEDULED_THREAD_POOL_COUNT = loginConfig.getInt("ScheduledThreadPoolCount", 2);
+			if (SCHEDULED_THREAD_POOL_COUNT == -1)
+			{
+				SCHEDULED_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_SCHEDULED_THREAD_POOL = loginConfig.getInt("ThreadsPerScheduledThreadPool", 2);
+			INSTANT_THREAD_POOL_COUNT = loginConfig.getInt("InstantThreadPoolCount", 2);
+			if (INSTANT_THREAD_POOL_COUNT == -1)
+			{
+				INSTANT_THREAD_POOL_COUNT = Math.max(2, Runtime.getRuntime().availableProcessors() / 2);
+			}
+			THREADS_PER_INSTANT_THREAD_POOL = loginConfig.getInt("ThreadsPerInstantThreadPool", 4);
+			THREADS_FOR_CLIENT_PACKETS = loginConfig.getBoolean("ThreadsForClientPackets", true);
 			SHOW_LICENCE = loginConfig.getBoolean("ShowLicence", true);
 			SHOW_PI_AGREEMENT = loginConfig.getBoolean("ShowPIAgreement", false);
 			AUTO_CREATE_ACCOUNTS = loginConfig.getBoolean("AutoCreateAccounts", true);

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/LoginServer.java

@@ -33,6 +33,7 @@ import org.l2jmobius.commons.database.DatabaseBackup;
 import org.l2jmobius.commons.database.DatabaseFactory;
 import org.l2jmobius.commons.enums.ServerMode;
 import org.l2jmobius.commons.network.NetServer;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.PropertiesParser;
 import org.l2jmobius.gameserver.network.loginserverpackets.game.ServerStatus;
 import org.l2jmobius.loginserver.network.LoginClient;
@@ -95,6 +96,9 @@ public class LoginServer
 		// Prepare Database
 		DatabaseFactory.init();
 		
+		// Initialize ThreadPool.
+		ThreadPool.init();
+		
 		try
 		{
 			LoginController.load();

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/loginserver/network/LoginPacketHandler.java

@@ -18,10 +18,11 @@ package org.l2jmobius.loginserver.network;
 
 import java.util.logging.Logger;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.commons.network.PacketHandlerInterface;
 import org.l2jmobius.commons.network.ReadablePacket;
+import org.l2jmobius.commons.threads.ThreadPool;
 import org.l2jmobius.commons.util.CommonUtil;
-import org.l2jmobius.gameserver.network.PacketLogger;
 import org.l2jmobius.loginserver.network.clientpackets.LoginClientPacket;
 
 /**
@@ -42,8 +43,8 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		catch (Exception e)
 		{
-			PacketLogger.warning("LoginPacketHandler: Problem receiving packet id from " + client);
+			LOGGER.warning("LoginPacketHandler: Problem receiving packet id from " + client);
-			PacketLogger.warning(CommonUtil.getStackTrace(e));
+			LOGGER.warning(CommonUtil.getStackTrace(e));
 			client.disconnect();
 			return;
 		}
@@ -75,10 +76,23 @@ public class LoginPacketHandler implements PacketHandlerInterface<LoginClient>
 		}
 		
 		// Continue on another thread.
-		final Thread thread = new Thread(new ExecuteTask(client, packet, newPacket, packetId), getClass().getName());
+		if (Config.THREADS_FOR_CLIENT_PACKETS)
-		thread.setPriority(Thread.NORM_PRIORITY);
+		{
-		thread.setDaemon(false);
+			ThreadPool.execute(new ExecuteTask(client, packet, newPacket, packetId));
-		thread.start();
+		}
+		else // Wait for execution.
+		{
+			try
+			{
+				newPacket.read(packet);
+				newPacket.run(client);
+			}
+			catch (Exception e)
+			{
+				LOGGER.warning("LoginPacketHandler: Problem with " + client + " [Packet: 0x" + Integer.toHexString(packetId).toUpperCase() + "]");
+				LOGGER.warning(CommonUtil.getStackTrace(e));
+			}
+		}
 	}
 	
 	private class ExecuteTask implements Runnable