1 files changed, 41 insertions, 7 deletions

diff --git a/common/thread.c b/common/thread.c
index fdc8112..eb535ab 100644
--- a/common/thread.c
+++ b/common/thread.c
@@ -1,8 +1,8 @@
 /*
  * thread.c
  *
- * Copyright (c) 2012 Martin Szulecki All Rights Reserved.
- * Copyright (c) 2012 Nikias Bassen All Rights Reserved.
+ * Copyright (c) 2012-2019 Nikias Bassen, All Rights Reserved.
+ * Copyright (c) 2012 Martin Szulecki, All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,9 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "thread.h"
 
-int thread_new(thread_t *thread, thread_func_t thread_func, void* data)
+int thread_new(THREAD_T *thread, thread_func_t thread_func, void* data)
 {
 #ifdef WIN32
         HANDLE th = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)thread_func, data, 0, NULL);
@@ -36,20 +39,51 @@ int thread_new(thread_t *thread, thread_func_t thread_func, void* data)
 #endif
 }
 
-void thread_free(thread_t thread)
+void thread_detach(THREAD_T thread)
 {
 #ifdef WIN32
         CloseHandle(thread);
+#else
+        pthread_detach(thread);
 #endif
 }
 
-void thread_join(thread_t thread)
+void thread_free(THREAD_T thread)
+{
+#ifdef WIN32
+        CloseHandle(thread);
+#endif
+}
+
+int thread_join(THREAD_T thread)
 {
         /* wait for thread to complete */
 #ifdef WIN32
-        WaitForSingleObject(thread, INFINITE);
+        return (int)WaitForSingleObject(thread, INFINITE);
+#else
+        return pthread_join(thread, NULL);
+#endif
+}
+
+int thread_alive(THREAD_T thread)
+{
+#ifdef WIN32
+        return WaitForSingleObject(thread, 0) == WAIT_TIMEOUT;
 #else
-        pthread_join(thread, NULL);
+        return pthread_kill(thread, 0) == 0;
+#endif
+}
+
+int thread_cancel(THREAD_T thread)
+{
+#ifdef WIN32
+        return -1;
+#else
+#ifdef HAVE_PTHREAD_CANCEL
+        return pthread_cancel(thread);
+#else
+        return -1;
+#endif
 #endif
 }