fix internal thread interface confusion

thanks @ronghanghu for pointing this out in #964

diff --git a/include/caffe/internal_thread.hpp b/include/caffe/internal_thread.hpp
index 8520899..bb0f932 100644 (file)
--- a/include/caffe/internal_thread.hpp
+++ b/include/caffe/internal_thread.hpp
@@ -15,9 +15,9 @@ class InternalThread {
   InternalThread() {}
   virtual ~InternalThread() {}
 
-  /** Returns true if the thread was successfully started **/
+  /** Returns true if the thread was successfully started. **/
   bool StartInternalThread() {
-    return pthread_create(&_thread, NULL, InternalThreadEntryFunc, this);
+    return (pthread_create(&_thread, NULL, InternalThreadEntryFunc, this) == 0);
   }
 
   /** Will not return until the internal thread has exited. */

diff --git a/src/caffe/layers/data_layer.cpp b/src/caffe/layers/data_layer.cpp
index b6ac5d6..0cc2769 100644 (file)
--- a/src/caffe/layers/data_layer.cpp
+++ b/src/caffe/layers/data_layer.cpp
@@ -244,7 +244,7 @@ void DataLayer<Dtype>::CreatePrefetchThread() {
 
   data_transformer_.InitRand();
 
-  CHECK(!StartInternalThread()) << "Pthread execution failed";
+  CHECK(StartInternalThread()) << "Pthread execution failed";
 }
 
 template <typename Dtype>

diff --git a/src/caffe/layers/image_data_layer.cpp b/src/caffe/layers/image_data_layer.cpp
index 85ee988..dc39e69 100644 (file)
--- a/src/caffe/layers/image_data_layer.cpp
+++ b/src/caffe/layers/image_data_layer.cpp
@@ -159,7 +159,7 @@ void ImageDataLayer<Dtype>::CreatePrefetchThread() {
   data_transformer_.InitRand();
 
   // Create the thread.
-  CHECK(!StartInternalThread()) << "Pthread execution failed";
+  CHECK(StartInternalThread()) << "Pthread execution failed";
 }
 
 template <typename Dtype>

diff --git a/src/caffe/layers/window_data_layer.cpp b/src/caffe/layers/window_data_layer.cpp
index 8138234..bed03d8 100644 (file)
--- a/src/caffe/layers/window_data_layer.cpp
+++ b/src/caffe/layers/window_data_layer.cpp
@@ -408,7 +408,7 @@ void WindowDataLayer<Dtype>::CreatePrefetchThread() {
     prefetch_rng_.reset();
   }
   // Create the thread.
-  CHECK(!StartInternalThread()) << "Pthread execution failed.";
+  CHECK(StartInternalThread()) << "Pthread execution failed.";
 }
 
 template <typename Dtype>