summaryrefslogtreecommitdiff
path: root/src/caffe
diff options
context:
space:
mode:
authorRyota Tomioka <tomioka@ttic.edu>2014-10-20 09:35:20 -0500
committerRyota Tomioka <tomioka@ttic.edu>2014-10-20 09:55:46 -0500
commit293347196a81f68046b30984448cc4883d6c5aa5 (patch)
tree451bc55037da64a4db36d820e2a3b361be549681 /src/caffe
parent51be3523b8fe883d86600fbf3531b6ef7a6290fe (diff)
downloadcaffeonacl-293347196a81f68046b30984448cc4883d6c5aa5.tar.gz
caffeonacl-293347196a81f68046b30984448cc4883d6c5aa5.tar.bz2
caffeonacl-293347196a81f68046b30984448cc4883d6c5aa5.zip
Fixed a memory leak issue in InternalThread (and removed caffe::Thread calss).
Diffstat (limited to 'src/caffe')
-rw-r--r--src/caffe/internal_thread.cpp8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/caffe/internal_thread.cpp b/src/caffe/internal_thread.cpp
index d7b6ae20..62a4c1fa 100644
--- a/src/caffe/internal_thread.cpp
+++ b/src/caffe/internal_thread.cpp
@@ -1,14 +1,9 @@
#include "caffe/internal_thread.hpp"
-#include "caffe/util/thread.hpp"
-
namespace caffe {
InternalThread::~InternalThread() {
WaitForInternalThreadToExit();
- if (thread_ != NULL) {
- delete thread_;
- }
}
bool InternalThread::StartInternalThread() {
@@ -16,8 +11,7 @@ bool InternalThread::StartInternalThread() {
return false;
}
try {
- thread_ = new caffe::Thread
- (&InternalThread::InternalThreadEntry, this);
+ thread_.reset(new boost::thread(&InternalThread::InternalThreadEntry, this));
} catch (...) {
return false;
}