From a3510c5be8bd9e1e8094ee0e4cacccad70194389 Mon Sep 17 00:00:00 2001
From: H0zen <H0zen@users.noreply.github.com>
Date: Sun, 6 Dec 2015 03:47:12 +0200
Subject: [PATCH] Some code cleanup

---
 src/game/Maps/MapUpdater.cpp           | 30 +-------------------------
 src/shared/Threading/DelayExecutor.cpp | 25 ++-------------------
 src/shared/Threading/DelayExecutor.h   |  4 +---
 3 files changed, 4 insertions(+), 55 deletions(-)

diff --git a/src/game/Maps/MapUpdater.cpp b/src/game/Maps/MapUpdater.cpp
index 244305e3..62b594f1 100644
--- a/src/game/Maps/MapUpdater.cpp
+++ b/src/game/Maps/MapUpdater.cpp
@@ -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()
diff --git a/src/shared/Threading/DelayExecutor.cpp b/src/shared/Threading/DelayExecutor.cpp
index 52c6c2e1..0be1c0d5 100644
--- a/src/shared/Threading/DelayExecutor.cpp
+++ b/src/shared/Threading/DelayExecutor.cpp
@@ -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)
diff --git a/src/shared/Threading/DelayExecutor.h b/src/shared/Threading/DelayExecutor.h
index f86a6e83..57a2ba6c 100644
--- a/src/shared/Threading/DelayExecutor.h
+++ b/src/shared/Threading/DelayExecutor.h
@@ -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);