From b946b0df22294a82ff6e1f09d37e2ac3c90436aa Mon Sep 17 00:00:00 2001
From: Alex Zolotarev <deathbaba@gmail.com>
Date: Sat, 30 Apr 2011 13:57:38 +0200
Subject: [PATCH] Removed unnecessary shared_ptr from thread class

---
 base/base.pro                    |  1 -
 base/base_tests/threads_test.cpp | 30 ---------------------------
 base/thread.cpp                  | 12 +++++++----
 base/thread.hpp                  | 10 +++++----
 base/threads_pool.hpp            | 35 --------------------------------
 5 files changed, 14 insertions(+), 74 deletions(-)
 delete mode 100644 base/threads_pool.hpp

diff --git a/base/base.pro b/base/base.pro
index 6df29fb82e..ee82058bd1 100644
--- a/base/base.pro
+++ b/base/base.pro
@@ -50,7 +50,6 @@ HEADERS += \
     timer.hpp \
     cache.hpp \
     profiler.hpp \
-    threads_pool.hpp \
     matrix.hpp \
     set_operations.hpp \
     condition.hpp \
diff --git a/base/base_tests/threads_test.cpp b/base/base_tests/threads_test.cpp
index e3ef4f5b87..dd6e5bce4f 100644
--- a/base/base_tests/threads_test.cpp
+++ b/base/base_tests/threads_test.cpp
@@ -1,7 +1,6 @@
 #include "../../testing/testing.hpp"
 
 #include "../thread.hpp"
-#include "../threads_pool.hpp"
 
 #include "../../std/vector.hpp"
 
@@ -60,32 +59,3 @@ UNIT_TEST(Simple_Threads)
   TEST_EQUAL(vec.size(), MAX_COUNT, ("vector size"));
   TEST_EQUAL(summ, checkSumm, ("check summ"));
 }
-
-
-struct PoolThread : public threads::IRoutine
-{
-  PoolThread(int * counter) : m_counter(counter) {}
-
-  virtual void Do()
-  {
-    ++(*m_counter);
-  }
-  int * m_counter;
-};
-
-
-static int gPoolCounter = 0;
-
-UNIT_TEST(Threads_Pool)
-{
-  threads::Pool pool;
-  pool.StartThread(new PoolThread(&gPoolCounter));
-  pool.StartThread(new PoolThread(&gPoolCounter));
-  pool.StartThread(new PoolThread(&gPoolCounter));
-  pool.StartThread(new PoolThread(&gPoolCounter));
-  pool.StartThread(new PoolThread(&gPoolCounter));
-
-  pool.Join();
-
-  TEST_EQUAL(gPoolCounter, 5, ("All pool threads should finish"));
-}
diff --git a/base/thread.cpp b/base/thread.cpp
index 3d738c41ca..4974de7d9d 100644
--- a/base/thread.cpp
+++ b/base/thread.cpp
@@ -124,21 +124,25 @@ namespace threads
 
   /////////////////////////////////////////////////////////////////////
   // Thread wrapper implementation
-  Thread::Thread()
-  : m_impl(new ThreadImpl())
+  Thread::Thread() : m_impl(new ThreadImpl()), m_routine(0)
   {
   }
 
+  Thread::~Thread()
+  {
+    delete m_impl;
+  }
+
   bool Thread::Create(IRoutine * pRoutine)
   {
-    ASSERT_EQUAL(m_routine.get(), 0, ("Current implementation doesn't allow to reuse thread"));
+    ASSERT_EQUAL(m_routine, 0, ("Current implementation doesn't allow to reuse thread"));
     int error = m_impl->Create(pRoutine);
     if (0 != error)
     {
       ASSERT ( !"Thread creation failed with error", (error) );
       return false;
     }
-    m_routine.reset(pRoutine);
+    m_routine = pRoutine;
     return true;
   }
 
diff --git a/base/thread.hpp b/base/thread.hpp
index 06785c87c9..68801e2fd9 100644
--- a/base/thread.hpp
+++ b/base/thread.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "../std/shared_ptr.hpp"
-
 namespace threads
 {
   class IRoutine
@@ -24,11 +22,15 @@ namespace threads
   /// wrapper for Create and Terminate threads API
   class Thread
   {
-    shared_ptr<ThreadImpl> m_impl;
-    shared_ptr<IRoutine> m_routine;
+    ThreadImpl * m_impl;
+    IRoutine * m_routine;
+
+    Thread(Thread const &);
+    Thread & operator=(Thread const &);
 
   public:
     Thread();
+    ~Thread();
 
     /// Run thread immediately
     /// @param pRoutine is owned by Thread class
diff --git a/base/threads_pool.hpp b/base/threads_pool.hpp
deleted file mode 100644
index 20053651ff..0000000000
--- a/base/threads_pool.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-#pragma once
-
-#include "thread.hpp"
-#include "../std/vector.hpp"
-
-namespace threads
-{
-  /// Manages any number of threads
-  /// current implementation is simple and naive
-  class Pool
-  {
-    vector<threads::Thread> m_threadHandles;
-
-  public:
-    /// Takes ownership on pRoutine
-    bool StartThread(threads::IRoutine * pRoutine)
-    {
-      threads::Thread h;
-      if (h.Create(pRoutine))
-      {
-        m_threadHandles.push_back(h);
-        return true;
-      }
-      return false;
-    }
-
-    void Join()
-    {
-      for (size_t i = 0; i < m_threadHandles.size(); ++i)
-      {
-        m_threadHandles[i].Join();
-      }
-    }
-  };
-} // namespace threads