Merge my adamierymenko-dev into the new master that incorporates Raspberry Pi build changes in order to keep everything in sync.

1 files changed, 1 insertions, 11 deletions

diff --git a/node/Thread.cpp b/node/Thread.cpp
index 37a1a5a5..f650f6fc 100644
--- a/node/Thread.cpp
+++ b/node/Thread.cpp
@@ -47,7 +47,6 @@ static void *__m_thread_main(void *ptr)
 namespace ZeroTier {

 

 Thread::Thread() :

-	suicidalThread(false),

 	_impl(malloc(sizeof(pthread_t))),

 	_running()

 {

@@ -76,7 +75,7 @@ void Thread::join()
 

 void Thread::sleep(unsigned long ms)

 {

-	usleep(ms);

+	usleep(ms * 1000);

 }

 

 void Thread::__intl_run()

@@ -84,10 +83,6 @@ void Thread::__intl_run()
 	for(;;) {

 		_notInit = false;

 		this->main();

-		if (suicidalThread) {

-			delete this;

-			return;

-		}

 		if (_notInit) // UGLY ASS HACK: see main()

 			usleep(50);

 		else break;

@@ -127,7 +122,6 @@ struct __m_thread_info
 namespace ZeroTier {

 

 Thread::Thread() :

-	suicidalThread(false),

 	_impl(malloc(sizeof(__m_thread_info))),

 	_running()

 {

@@ -162,10 +156,6 @@ void Thread::__intl_run()
 	for(;;) {

 		_notInit = false;

 		this->main();

-		if (suicidalThread) {

-			delete this;

-			return;

-		}

 		if (_notInit)

 			Thread::sleep(50);

 		else break;