Removed mtmaps OpenMP

Implement mtmaps based on ACE
For stable work MapUpdate.Threads=2 in config

--HG--
branch : trunk
This commit is contained in:
n0n4m3
2009-12-17 07:34:00 +01:00
parent 8507b7da99
commit 2028f0658b
16 changed files with 371 additions and 94 deletions

126
src/game/MapUpdater.cpp Normal file
View File

@@ -0,0 +1,126 @@
#include "MapUpdater.h"
#include "DelayExecutor.h"
#include "Map.h"
#include "Database/DatabaseEnv.h"
#include <ace/Guard_T.h>
#include <ace/Method_Request.h>
//the reason this things are here is that i want to make
//the netcode patch and the multithreaded maps independant
//once they are merged 1 class should be used
class WDBThreadStartReq1 : public ACE_Method_Request
{
public:
WDBThreadStartReq1(){}
virtual int
call (void)
{
WorldDatabase.ThreadStart();
return 0;
}
};
class WDBThreadEndReq1 : public ACE_Method_Request
{
public:
WDBThreadEndReq1(){}
virtual int
call (void)
{
WorldDatabase.ThreadEnd();
return 0;
}
};
class MapUpdateRequest : public ACE_Method_Request
{
public:
Map& m_map;
MapUpdater& m_updater;
ACE_UINT32 m_diff;
MapUpdateRequest(Map& m, MapUpdater& u, ACE_UINT32 d) : m_map(m), m_updater(u), m_diff(d){}
virtual int
call (void)
{
m_map.Update (m_diff);
m_updater.update_finished ();
return 0;
}
};
MapUpdater::MapUpdater() :
m_mutex(),
m_condition(m_mutex),
m_executor(),
pedning_requests(0)
{
return;
}
MapUpdater::~MapUpdater()
{
this->deactivate();
}
int MapUpdater::activate(size_t num_threads)
{
return this->m_executor.activate(static_cast<int> (num_threads), new WDBThreadStartReq1, new WDBThreadEndReq1);
}
int MapUpdater::deactivate(void)
{
this->wait();
return this->m_executor.deactivate();
}
int MapUpdater::wait()
{
ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, this->m_mutex, -1);
while(this->pedning_requests > 0)
this->m_condition.wait();
return 0;
}
int MapUpdater::schedule_update(Map& map, ACE_UINT32 diff)
{
ACE_GUARD_RETURN(ACE_Thread_Mutex, guard, this->m_mutex, -1);
++this->pedning_requests;
if (this->m_executor.execute(new MapUpdateRequest(map, *this, diff)) == -1)
{
ACE_DEBUG((LM_ERROR, ACE_TEXT("(%t) \n"), ACE_TEXT("Failed to schedule Map Update")));
--this->pedning_requests;
return -1;
}
return 0;
}
bool MapUpdater::activated()
{
return m_executor.activated();
}
void MapUpdater::update_finished()
{
ACE_GUARD(ACE_Thread_Mutex, guard, this->m_mutex);
if (this->pedning_requests == 0)
{
ACE_ERROR((LM_ERROR,ACE_TEXT("(%t)\n"), ACE_TEXT("MapUpdater::update_finished BUG, report to devs")));
return;
}
--this->pedning_requests;
this->m_condition.broadcast();
}