From 87218eadcdeac5ba86a035edfd079958405cb24f Mon Sep 17 00:00:00 2001 From: Machiavelli Date: Wed, 18 Aug 2010 02:25:52 +0200 Subject: * HIGHLY EXPERIMENTAL - USE AT OWN RISK * Database Layer: - Implement connection pooling: Instead of 1 delay thread per database, you can configure between 1 and 32 worker threads that have a seperate thread in the core and have a seperate connection to the MySQL server (based on raczman/Albator´s database layer for Trinitycore3) - Implement a configurable thread bundle for synchroneous requests from seperate core threads (see worldserver.conf.dist for more info) - Every mapupdate thread now has its seperate MySQL connection to the world and characters database - Drop inconsistent PExecuteLog function - query logging will be implemented CONSISTENTLY later - Drop current prepared statement interface - this will be done *properly* later - You´ll need to update your worldserver.conf and authserver.conf - You´re recommended to make a backup of your databases before using this. * HIGHLY EXPERIMENTAL - USE AT OWN RISK * * HIGHLY EXPERIMENTAL - USE AT OWN RISK * etc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --HG-- branch : trunk --- src/server/worldserver/CommandLine/CliRunnable.cpp | 36 +++++++++++++++++++--- 1 file changed, 32 insertions(+), 4 deletions(-) (limited to 'src/server/worldserver/CommandLine') diff --git a/src/server/worldserver/CommandLine/CliRunnable.cpp b/src/server/worldserver/CommandLine/CliRunnable.cpp index d105f29f3c2..e44ec1ada94 100644 --- a/src/server/worldserver/CommandLine/CliRunnable.cpp +++ b/src/server/worldserver/CommandLine/CliRunnable.cpp @@ -690,8 +690,28 @@ int kb_hit_return() /// %Thread start void CliRunnable::run() { - ///- Init new SQL thread for the world database (one connection call enough) - WorldDatabase.ThreadStart(); // let thread do safe mySQL requests + ///- Init MySQL threads or connections + bool needInit = true; + if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_WORLDDB) & MYSQL_BUNDLE_RA)) + { + WorldDatabase.Init_MySQL_Connection(); + needInit = false; + } + + if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_LOGINDB) & MYSQL_BUNDLE_RA)) + { + LoginDatabase.Init_MySQL_Connection(); + needInit = false; + } + + if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_CHARDB) & MYSQL_BUNDLE_RA)) + { + CharacterDatabase.Init_MySQL_Connection(); + needInit = false; + } + + if (needInit) + MySQL::Thread_Init(); char commandbuf[256]; @@ -759,6 +779,14 @@ void CliRunnable::run() } - ///- End the database thread - WorldDatabase.ThreadEnd(); // free mySQL thread resources + ///- Free MySQL thread resources and deallocate lingering connections + if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_WORLDDB) & MYSQL_BUNDLE_RA)) + WorldDatabase.End_MySQL_Connection(); + if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_LOGINDB) & MYSQL_BUNDLE_RA)) + LoginDatabase.End_MySQL_Connection(); + + if (!(sWorld.getConfig(CONFIG_MYSQL_BUNDLE_CHARDB) & MYSQL_BUNDLE_RA)) + CharacterDatabase.End_MySQL_Connection(); + if (needInit) + MySQL::Thread_End(); } -- cgit v1.2.3