Use pthread instead of C++11 threads for better compatibility.

Newer libuv has cross-platform threads with similar API.

Author: kevinmehall

src/stream.h

@@ -6,7 +6,6 @@
 #include "device.h"
 #include "uv_async_queue.h"
 #include <vector>
-#include <atomic>
 
 namespace NodeUsb {
 
@@ -30,7 +29,7 @@ namespace NodeUsb {
 		void stop();
 
 		enum StreamStatus {STREAM_IDLE, STREAM_ACTIVE, STREAM_CANCELLING, STREAM_ABORTED};
-		std::atomic_uchar state;
+		volatile uint8_t state;
 		unsigned activeTransfers;
 
 		protected:

src/usb.cc

@@ -1,14 +1,16 @@
 #include "usb.h"
 #include "device.h"
-#include <thread>
+#include <uv.h>
+#include <pthread.h>
 
 namespace NodeUsb {
 	libusb_context* usb_context;
-	std::thread usb_thread;
+	pthread_t usb_thread_id;
 	std::vector< Persistent<Object> > Usb::deviceList;
 
-	void USBThreadFn(){
+	void* USBThreadFn(void* v){
 		while(1) libusb_handle_events(usb_context);
+		return NULL;
 	}
 
 	void Usb::Initalize(Handle<Object> target) {
@@ -75,8 +77,8 @@ namespace NodeUsb {
 		// Bindings to nodejs
 		NODE_SET_METHOD(target, "setDebugLevel", Usb::SetDebugLevel);
 
-		usb_thread = std::thread(USBThreadFn);
-		usb_thread.detach();
+		pthread_create(&usb_thread_id, NULL, USBThreadFn, NULL);
+		pthread_detach(usb_thread_id);
 
 		Local<ObjectTemplate> devlist_tpl = ObjectTemplate::New();
 		devlist_tpl->SetAccessor(V8STR("length"), DeviceListLength);

src/uv_async_queue.h

@@ -4,49 +4,50 @@
 #include <uv.h>
 #include <functional>
 #include <queue>
-#include <thread>
-#include <mutex>
+#include <pthread.h>
 
 template <class T>
 class UVQueue{
 	public:
 		UVQueue(std::function<void(T&)> cb, bool _keep_alive=false): callback(cb), keep_alive(_keep_alive) {
 			uv_async_init(uv_default_loop(), &async, UVQueue::internal_callback);
+			pthread_mutex_init(&mutex, NULL);
 			async.data = this;
 			if (!keep_alive) uv_unref(uv_default_loop());
 		}
 
 		void post(T value){
-			mutex.lock();
+			pthread_mutex_lock(&mutex);
 			queue.push(value);
-			mutex.unlock();
+			pthread_mutex_unlock(&mutex);
 			uv_async_send(&async);
 		}
 
 		~UVQueue(){
 			if (!keep_alive) uv_ref(uv_default_loop());
 			uv_close((uv_handle_t*)&async, NULL); //TODO: maybe we can't delete UVQueue until callback?
+			pthread_mutex_destroy(&mutex);
 		}
 
 	private:
 		std::function<void(T&)> callback;
 		std::queue<T> queue;
-		std::mutex mutex;
+		pthread_mutex_t mutex;
 		uv_async_t async;
 		bool keep_alive;
 
 		static void internal_callback(uv_async_t *handle, int status){
 			UVQueue* uvqueue = static_cast<UVQueue*>(handle->data);
 
 			while(1){
-				uvqueue->mutex.lock();
+				pthread_mutex_lock(&uvqueue->mutex);
 				if (uvqueue->queue.empty()){
-					uvqueue->mutex.unlock();
+					pthread_mutex_unlock(&uvqueue->mutex);
 					break;
 				}
 				T item = uvqueue->queue.front();
 				uvqueue->queue.pop();
-				uvqueue->mutex.unlock();
+				pthread_mutex_unlock(&uvqueue->mutex);
 				uvqueue->callback(item);
 			}
 		}

wscript

@@ -21,7 +21,7 @@ def configure(conf):
 
 	conf.check_cfg(package='libusb-1.0', uselib_store='USB10', mandatory=1, args='--cflags --libs')
 	conf.env.append_unique('CPPFLAGS', ["-D_FILE_OFFSET_BITS=64", "-D_LARGEFILE_SOURCE"])
-	conf.env.append_unique('CXXFLAGS', ["-Wall", "-std=gnu++0x"])
+	conf.env.append_unique('CXXFLAGS', ["-Wall", "-std=c++0x"])
 	conf.env.append_value('CPPFLAGS_NODE', ['-DEV_MULTIPLICITY=1'])
 
 def build(bld):