Merge branch 'dev' into netbsd-support

1 files changed, 28 insertions, 22 deletions

diff --git a/osdep/Thread.hpp b/osdep/Thread.hpp
index 4f90dc0b..35ea5035 100644
--- a/osdep/Thread.hpp
+++ b/osdep/Thread.hpp
@@ -1,6 +1,6 @@
 /*

  * ZeroTier One - Network Virtualization Everywhere

- * Copyright (C) 2011-2016  ZeroTier, Inc.  https://www.zerotier.com/

+ * Copyright (C) 2011-2018  ZeroTier, Inc.  https://www.zerotier.com/

  *

  * This program is free software: you can redistribute it and/or modify

  * it under the terms of the GNU General Public License as published by

@@ -14,6 +14,14 @@
  *

  * You should have received a copy of the GNU General Public License

  * along with this program.  If not, see <http://www.gnu.org/licenses/>.

+ *

+ * --

+ *

+ * You can be released from the requirements of the license by purchasing

+ * a commercial license. Buying such a license is mandatory as soon as you

+ * develop commercial closed-source software that incorporates or links

+ * directly against ZeroTier software without disclosing the source code

+ * of your own application.

  */

 

 #ifndef ZT_THREAD_HPP

@@ -28,6 +36,7 @@
 #include <WinSock2.h>

 #include <Windows.h>

 #include <string.h>

+

 #include "../node/Mutex.hpp"

 

 namespace ZeroTier {

@@ -45,7 +54,6 @@ class Thread
 {

 public:

 	Thread()

-		throw()

 	{

 		_th = NULL;

 		_tid = 0;

@@ -53,7 +61,6 @@ public:
 

 	template<typename C>

 	static inline Thread start(C *instance)

-		throw(std::runtime_error)

 	{

 		Thread t;

 		t._th = CreateThread(NULL,0,&___zt_threadMain<C>,(LPVOID)instance,0,&t._tid);

@@ -83,11 +90,13 @@ public:
 	// Not available on *nix platforms

 	static inline void cancelIO(const Thread &t)

 	{

+#if !defined(__MINGW32__) && !defined(__MINGW64__) // CancelSynchronousIo not available in MSYS2

 		if (t._th != NULL)

 			CancelSynchronousIo(t._th);

+#endif

 	}

 

-	inline operator bool() const throw() { return (_th != NULL); }

+	inline operator bool() const { return (_th != NULL); }

 

 private:

 	HANDLE _th;

@@ -122,28 +131,18 @@ class Thread
 {

 public:

 	Thread()

-		throw()

 	{

-		memset(&_tid,0,sizeof(_tid));

-		pthread_attr_init(&_tattr);

-#ifdef __LINUX__

-		pthread_attr_setstacksize(&_tattr,8388608); // for MUSL libc and others, has no effect in normal glibc environments

-#endif

-		_started = false;

+		memset(this,0,sizeof(Thread));

 	}

 

 	Thread(const Thread &t)

-		throw()

 	{

-		memcpy(&_tid,&(t._tid),sizeof(_tid));

-		_started = t._started;

+		memcpy(this,&t,sizeof(Thread));

 	}

 

 	inline Thread &operator=(const Thread &t)

-		throw()

 	{

-		memcpy(&_tid,&(t._tid),sizeof(_tid));

-		_started = t._started;

+		memcpy(this,&t,sizeof(Thread));

 		return *this;

 	}

 

@@ -157,12 +156,20 @@ public:
 	 */

 	template<typename C>

 	static inline Thread start(C *instance)

-		throw(std::runtime_error)

 	{

 		Thread t;

-		t._started = true;

-		if (pthread_create(&t._tid,&t._tattr,&___zt_threadMain<C>,instance))

+		pthread_attr_t tattr;

+		pthread_attr_init(&tattr);

+		// This corrects for systems with abnormally small defaults (musl) and also

+		// shrinks the stack on systems with large defaults to save a bit of memory.

+		pthread_attr_setstacksize(&tattr,ZT_THREAD_MIN_STACK_SIZE);

+		if (pthread_create(&t._tid,&tattr,&___zt_threadMain<C>,instance)) {

+			pthread_attr_destroy(&tattr);

 			throw std::runtime_error("pthread_create() failed, unable to create thread");

+		} else {

+			t._started = true;

+			pthread_attr_destroy(&tattr);

+		}

 		return t;

 	}

 

@@ -184,11 +191,10 @@ public:
 	 */

 	static inline void sleep(unsigned long ms) { usleep(ms * 1000); }

 

-	inline operator bool() const throw() { return (_started); }

+	inline operator bool() const { return (_started); }

 

 private:

 	pthread_t _tid;

-	pthread_attr_t _tattr;

 	volatile bool _started;

 };