mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 16:37:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[9272] Revert "[9265] * Call Database::ThreadStart()/ThreadEnd() for all DBs."

Browse source 
This reverts commit af146f14c0999eed0e293bc0595a04e62df54f3e.

Not need call this function more that one per thread.
This commit is contained in:
VladimirMangos 2010-01-30 17:59:18 +03:00
parent a24320d4b5
commit df70a2c81d
4 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/game/WorldSocketMgr.cpp
View file

@ -153,8 +153,6 @@ class ReactorRunnable : protected ACE_Task_Base
DEBUG_LOG ("Network Thread Starting"); DEBUG_LOG ("Network Thread Starting");
WorldDatabase.ThreadStart (); WorldDatabase.ThreadStart ();
CharacterDatabase.ThreadStart();
loginDatabase.ThreadStart();
ACE_ASSERT (m_Reactor); ACE_ASSERT (m_Reactor);
@ -188,8 +186,6 @@ class ReactorRunnable : protected ACE_Task_Base
} }
WorldDatabase.ThreadEnd (); WorldDatabase.ThreadEnd ();
CharacterDatabase.ThreadEnd();
loginDatabase.ThreadEnd();
DEBUG_LOG ("Network Thread Exitting"); DEBUG_LOG ("Network Thread Exitting");

4
src/mangosd/CliRunnable.cpp
View file

@ -294,8 +294,6 @@ void CliRunnable::run()
{ {
///- Init new SQL thread for the world database (one connection call enough) ///- Init new SQL thread for the world database (one connection call enough)
WorldDatabase.ThreadStart(); // let thread do safe mySQL requests WorldDatabase.ThreadStart(); // let thread do safe mySQL requests
CharacterDatabase.ThreadStart();
loginDatabase.ThreadStart();
char commandbuf[256]; char commandbuf[256];
@ -354,6 +352,4 @@ void CliRunnable::run()
///- End the database thread ///- End the database thread
WorldDatabase.ThreadEnd(); // free mySQL thread resources WorldDatabase.ThreadEnd(); // free mySQL thread resources
CharacterDatabase.ThreadEnd();
loginDatabase.ThreadEnd();
} }

5
src/mangosd/WorldRunnable.cpp
View file

@ -42,9 +42,6 @@ void WorldRunnable::run()
{ {
///- Init new SQL thread for the world database ///- Init new SQL thread for the world database
WorldDatabase.ThreadStart(); // let thread do safe mySQL requests (one connection call enough) WorldDatabase.ThreadStart(); // let thread do safe mySQL requests (one connection call enough)
CharacterDatabase.ThreadStart();
loginDatabase.ThreadStart();
sWorld.InitResultQueue(); sWorld.InitResultQueue();
uint32 realCurrTime = 0; uint32 realCurrTime = 0;
@ -93,6 +90,4 @@ void WorldRunnable::run()
///- End the database thread ///- End the database thread
WorldDatabase.ThreadEnd(); // free mySQL thread resources WorldDatabase.ThreadEnd(); // free mySQL thread resources
CharacterDatabase.ThreadEnd();
loginDatabase.ThreadEnd();
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "9271" #define REVISION_NR "9272"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__