Machiavelli
a9e9a2c884
- DB Threading model update * Get rid of ThreadBundleMask and bundled connection * Implement configurable amount of Synch threads for databasepools * Use modulus based algorithm to check for free synchronous connections instead of previous ¨get connection by thread key or bundlemask¨ feature * Locks on mysql context objects are now managed outside the mysql query methods Fixes issue #4058 Fixes issue #4059 Introduces a ton of more issues. Use at own risk. You were warned. Really. Don´t forget to update your worldserver.conf --HG-- branch : trunk
128 lines
2.2 KiB
C++
128 lines
2.2 KiB
C++
#include "MapUpdater.h"
|
|
#include "DelayExecutor.h"
|
|
#include "Map.h"
|
|
#include "DatabaseEnv.h"
|
|
|
|
#include <ace/Guard_T.h>
|
|
#include <ace/Method_Request.h>
|
|
|
|
class WDBThreadStartReq1 : public ACE_Method_Request
|
|
{
|
|
public:
|
|
|
|
WDBThreadStartReq1()
|
|
{
|
|
}
|
|
|
|
virtual int call()
|
|
{
|
|
return 0;
|
|
}
|
|
};
|
|
|
|
class WDBThreadEndReq1 : public ACE_Method_Request
|
|
{
|
|
public:
|
|
|
|
WDBThreadEndReq1()
|
|
{
|
|
}
|
|
|
|
virtual int call()
|
|
{
|
|
return 0;
|
|
}
|
|
};
|
|
|
|
class MapUpdateRequest : public ACE_Method_Request
|
|
{
|
|
private:
|
|
|
|
Map& m_map;
|
|
MapUpdater& m_updater;
|
|
ACE_UINT32 m_diff;
|
|
|
|
public:
|
|
|
|
MapUpdateRequest(Map& m, MapUpdater& u, ACE_UINT32 d)
|
|
: m_map(m), m_updater(u), m_diff(d)
|
|
{
|
|
}
|
|
|
|
virtual int call()
|
|
{
|
|
m_map.Update (m_diff);
|
|
m_updater.update_finished ();
|
|
return 0;
|
|
}
|
|
};
|
|
|
|
MapUpdater::MapUpdater():
|
|
m_executor(), m_mutex(), m_condition(m_mutex), pending_requests(0)
|
|
{
|
|
}
|
|
|
|
MapUpdater::~MapUpdater()
|
|
{
|
|
deactivate();
|
|
}
|
|
|
|
int MapUpdater::activate(size_t num_threads)
|
|
{
|
|
return m_executor.activate((int)num_threads, new WDBThreadStartReq1, new WDBThreadEndReq1);
|
|
}
|
|
|
|
int MapUpdater::deactivate()
|
|
{
|
|
wait();
|
|
|
|
return m_executor.deactivate();
|
|
}
|
|
|
|
int MapUpdater::wait()
|
|
{
|
|
ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, m_mutex, -1);
|
|
|
|
while (pending_requests > 0)
|
|
m_condition.wait();
|
|
|
|
return 0;
|
|
}
|
|
|
|
int MapUpdater::schedule_update(Map& map, ACE_UINT32 diff)
|
|
{
|
|
ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, m_mutex, -1);
|
|
|
|
++pending_requests;
|
|
|
|
if (m_executor.execute(new MapUpdateRequest(map, *this, diff)) == -1)
|
|
{
|
|
ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) \n"), ACE_TEXT("Failed to schedule Map Update")));
|
|
|
|
--pending_requests;
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
bool MapUpdater::activated()
|
|
{
|
|
return m_executor.activated();
|
|
}
|
|
|
|
void MapUpdater::update_finished()
|
|
{
|
|
ACE_GUARD(ACE_Thread_Mutex, guard, m_mutex);
|
|
|
|
if (pending_requests == 0)
|
|
{
|
|
ACE_ERROR((LM_ERROR, ACE_TEXT("(%t)\n"), ACE_TEXT("MapUpdater::update_finished BUG, report to devs")));
|
|
return;
|
|
}
|
|
|
|
--pending_requests;
|
|
|
|
m_condition.broadcast();
|
|
}
|