Skip to content

Commit

Permalink
[9272] Revert "[9265] * Call Database::ThreadStart()/ThreadEnd() for …
Browse files Browse the repository at this point in the history
…all DBs."

This reverts commit af146f1.

Not need call this function more that one per thread.
  • Loading branch information
VladimirMangos committed Jan 30, 2010
1 parent e9ebc67 commit e1e18b7
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 16 deletions.
8 changes: 2 additions & 6 deletions src/game/WorldSocketMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,7 @@ class ReactorRunnable : protected ACE_Task_Base
{
DEBUG_LOG ("Network Thread Starting");

WorldDatabase.ThreadStart();
CharacterDatabase.ThreadStart();
loginDatabase.ThreadStart();
WorldDatabase.ThreadStart ();

ACE_ASSERT (m_Reactor);

Expand Down Expand Up @@ -187,9 +185,7 @@ class ReactorRunnable : protected ACE_Task_Base
}
}

WorldDatabase.ThreadEnd();
CharacterDatabase.ThreadEnd();
loginDatabase.ThreadEnd();
WorldDatabase.ThreadEnd ();

DEBUG_LOG ("Network Thread Exitting");

Expand Down
4 changes: 0 additions & 4 deletions src/mangosd/CliRunnable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,6 @@ void CliRunnable::run()
{
///- Init new SQL thread for the world database (one connection call enough)
WorldDatabase.ThreadStart(); // let thread do safe mySQL requests
CharacterDatabase.ThreadStart();
loginDatabase.ThreadStart();

char commandbuf[256];

Expand Down Expand Up @@ -354,6 +352,4 @@ void CliRunnable::run()

///- End the database thread
WorldDatabase.ThreadEnd(); // free mySQL thread resources
CharacterDatabase.ThreadEnd();
loginDatabase.ThreadEnd();
}
5 changes: 0 additions & 5 deletions src/mangosd/WorldRunnable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ void WorldRunnable::run()
{
///- Init new SQL thread for the world database
WorldDatabase.ThreadStart(); // let thread do safe mySQL requests (one connection call enough)
CharacterDatabase.ThreadStart();
loginDatabase.ThreadStart();

sWorld.InitResultQueue();

uint32 realCurrTime = 0;
Expand Down Expand Up @@ -93,6 +90,4 @@ void WorldRunnable::run()

///- End the database thread
WorldDatabase.ThreadEnd(); // free mySQL thread resources
CharacterDatabase.ThreadEnd();
loginDatabase.ThreadEnd();
}
2 changes: 1 addition & 1 deletion src/shared/revision_nr.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__
#define __REVISION_NR_H__
#define REVISION_NR "9271"
#define REVISION_NR "9272"
#endif // __REVISION_NR_H__

0 comments on commit e1e18b7

Please sign in to comment.