Merge pull request #1335 from ryotat/master

Fix leaking thread and groom internal thread implementation.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/caffe/internal_thread.cpp b/src/caffe/internal_thread.cpp
index d7b6ae20..58772e36 100644
--- a/src/caffe/internal_thread.cpp
+++ b/src/caffe/internal_thread.cpp
@@ -1,23 +1,23 @@
+#include <boost/thread.hpp>
 #include "caffe/internal_thread.hpp"
 
-#include "caffe/util/thread.hpp"
-
 namespace caffe {
 
 InternalThread::~InternalThread() {
   WaitForInternalThreadToExit();
-  if (thread_ != NULL) {
-    delete thread_;
-  }
 }
 
+bool InternalThread::is_started() const {
+  return thread_.get() != NULL && thread_->joinable();
+}
+
+
 bool InternalThread::StartInternalThread() {
   if (!WaitForInternalThreadToExit()) {
     return false;
   }
   try {
-    thread_ = new caffe::Thread
-        (&InternalThread::InternalThreadEntry, this);
+    thread_.reset(new boost::thread(&InternalThread::InternalThreadEntry, this));
   } catch (...) {
     return false;
   }