server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some code cleanup

Browse Source
This commit is contained in:
H0zen 2015-12-06 03:47:12 +02:00
parent 02237aed8c
commit a3510c5be8
3 changed files with 4 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/game/Maps/MapUpdater.cpp
View File

@ -30,34 +30,6 @@
#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:
@ -93,7 +65,7 @@ MapUpdater::~MapUpdater()
int MapUpdater::activate(size_t num_threads)
{
return m_executor.activate((int)num_threads, new WDBThreadStartReq1, new WDBThreadEndReq1);
return m_executor.activate((int)num_threads);
}
int MapUpdater::deactivate()

25
src/shared/Threading/DelayExecutor.cpp
View File

@ -34,18 +34,12 @@ DelayExecutor* DelayExecutor::instance()
}
DelayExecutor::DelayExecutor()
: pre_svc_hook_(0), post_svc_hook_(0), activated_(false)
: activated_(false)
{
}
DelayExecutor::~DelayExecutor()
{
if (pre_svc_hook_)
delete pre_svc_hook_;
if (post_svc_hook_)
delete post_svc_hook_;
deactivate();
}
@ -63,9 +57,6 @@ int DelayExecutor::deactivate()
int DelayExecutor::svc()
{
if (pre_svc_hook_)
pre_svc_hook_->call();
for (;;)
{
ACE_Method_Request* rq = queue_.dequeue();
@ -77,13 +68,10 @@ int DelayExecutor::svc()
delete rq;
}
if (post_svc_hook_)
post_svc_hook_->call();
return 0;
}
int DelayExecutor::activate(int num_threads, ACE_Method_Request* pre_svc_hook, ACE_Method_Request* post_svc_hook)
int DelayExecutor::activate(int num_threads)
{
if (activated())
return -1;
@ -91,15 +79,6 @@ int DelayExecutor::activate(int num_threads, ACE_Method_Request* pre_svc_hook, A
if (num_threads < 1)
return -1;
if (pre_svc_hook_)
delete pre_svc_hook_;
if (post_svc_hook_)
delete post_svc_hook_;
pre_svc_hook_ = pre_svc_hook;
post_svc_hook_ = post_svc_hook;
queue_.queue()->activate();
if (ACE_Task_Base::activate(THR_NEW_LWP | THR_JOINABLE | THR_INHERIT_SCHED, num_threads) == -1)

4
src/shared/Threading/DelayExecutor.h
View File

@ -40,7 +40,7 @@ class DelayExecutor : protected ACE_Task_Base
int execute(ACE_Method_Request* new_req);
int activate(int num_threads = 1, ACE_Method_Request* pre_svc_hook = NULL, ACE_Method_Request* post_svc_hook = NULL);
int activate(int num_threads = 1);
int deactivate();
@ -51,8 +51,6 @@ class DelayExecutor : protected ACE_Task_Base
private:
ACE_Activation_Queue queue_;
ACE_Method_Request* pre_svc_hook_;
ACE_Method_Request* post_svc_hook_;
bool activated_;
void activated(bool s);