Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 21:32:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Cleanup: Drop some unused code.

Browse Source 
Closes #1010, #581, and #248
This commit is contained in:
laly
2011-03-26 03:28:59 +02:00
committed by Shocker
parent 30d6b0fcd6
commit b9af020e72
3 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/server/worldserver/Master.cpp
View File

@@ -83,7 +83,7 @@ public:
{
if (!_delaytime)
return;
sLog->outString("Starting up anti-freeze thread (%u seconds max stuck time)...",_delaytime/1000);
sLog->outString("Starting up anti-freeze thread (%u seconds max stuck time)...", _delaytime/1000);
m_loops = 0;
w_loops = 0;
m_lastchange = 0;
@@ -210,13 +210,13 @@ int Master::Run()
ULONG_PTR appAff;
ULONG_PTR sysAff;
if (GetProcessAffinityMask(hProcess,&appAff,&sysAff))
if (GetProcessAffinityMask(hProcess, &appAff, &sysAff))
{
ULONG_PTR curAff = Aff & appAff; // remove non accessible processors
if (!curAff)
{
sLog->outError("Processors marked in UseProcessors bitmask (hex) %x not accessible for Trinityd. Accessible processors bitmask (hex): %x",Aff,appAff);
sLog->outError("Processors marked in UseProcessors bitmask (hex) %x not accessible for Trinityd. Accessible processors bitmask (hex): %x", Aff, appAff);
}
else
{
@@ -234,7 +234,7 @@ int Master::Run()
//if (Prio && (m_ServiceStatus == -1) /* need set to default process priority class in service mode*/)
if (Prio)
{
if(SetPriorityClass(hProcess,HIGH_PRIORITY_CLASS))
if (SetPriorityClass(hProcess, HIGH_PRIORITY_CLASS))
sLog->outString("TrinityCore process priority class set to HIGH");
else
sLog->outError("Can't set Trinityd process priority class.");
@@ -252,9 +252,6 @@ int Master::Run()
soap_thread = new ACE_Based::Thread(runnable);
}
uint32 realCurrTime, realPrevTime;
realCurrTime = realPrevTime = getMSTime();
///- Start up freeze catcher thread
if (uint32 freeze_delay = sConfig->GetIntDefault("MaxCoreStuckTime", 0))
{
@@ -270,7 +267,7 @@ int Master::Run()
if (sWorldSocketMgr->StartNetwork(wsport, bind_ip.c_str ()) == -1)
{
sLog->outError ("Failed to start network");
sLog->outError("Failed to start network");
World::StopNow(ERROR_EXIT_CODE);
// go down and shutdown the server
}
@@ -385,13 +382,13 @@ bool Master::_StartDB()
}
synch_threads = sConfig->GetIntDefault("WorldDatabase.SynchThreads", 1);
///- Initialise the world database
if (!WorldDatabase.Open(dbstring, async_threads, synch_threads))
{
sLog->outError("Cannot connect to world database %s", dbstring.c_str());
return false;
}
///- Get character database info from configuration file
dbstring = sConfig->GetStringDefault("CharacterDatabaseInfo", "");
if (dbstring.empty())
@@ -434,13 +431,13 @@ bool Master::_StartDB()
}
synch_threads = sConfig->GetIntDefault("LoginDatabase.SynchThreads", 1);
///- Initialise the login database
if (!LoginDatabase.Open(dbstring, async_threads, synch_threads))
{
sLog->outError("Cannot connect to login database %s", dbstring.c_str());
return false;
}
///- Get the realm Id from the configuration file
realmID = sConfig->GetIntDefault("RealmID", 0);
if (!realmID)
@@ -484,9 +481,9 @@ void Master::clearOnlineAccounts()
/// \todo Only accounts with characters logged on *this* realm should have online status reset. Move the online column from 'account' to 'realmcharacters'?
LoginDatabase.DirectPExecute(
"UPDATE account SET online = 0 WHERE online > 0 "
"AND id IN (SELECT acctid FROM realmcharacters WHERE realmid = '%d')",realmID);
"AND id IN (SELECT acctid FROM realmcharacters WHERE realmid = '%d')", realmID);
CharacterDatabase.DirectExecute("UPDATE characters SET online = 0 WHERE online<>0");
CharacterDatabase.DirectExecute("UPDATE characters SET online = 0 WHERE online <> 0");
// Battleground instance ids reset at server restart
CharacterDatabase.DirectExecute("UPDATE character_battleground_data SET instance_id = 0");