compat/os2threads: support the return value of joined thread
authorKO Myung-Hun <komh78@gmail.com>
Sun, 14 Feb 2016 15:20:34 +0000 (00:20 +0900)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 14 Feb 2016 18:17:36 +0000 (19:17 +0100)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
compat/os2threads.h

index 12cb7b0..3b289df 100644 (file)
 #include <sys/builtin.h>
 #include <sys/fmutex.h>
 
-#include "libavutil/mem.h"
+#include "libavutil/attributes.h"
+
+typedef struct {
+    TID tid;
+    void *(*start_routine)(void *);
+    void *arg;
+    void *result;
+} pthread_t;
 
-typedef TID  pthread_t;
 typedef void pthread_attr_t;
 
 typedef HMTX pthread_mutex_t;
@@ -58,39 +64,30 @@ typedef struct {
 
 #define PTHREAD_ONCE_INIT {0, _FMUTEX_INITIALIZER}
 
-struct thread_arg {
-    void *(*start_routine)(void *);
-    void *arg;
-};
-
 static void thread_entry(void *arg)
 {
-    struct thread_arg *thread_arg = arg;
-
-    thread_arg->start_routine(thread_arg->arg);
+    pthread_t *thread = arg;
 
-    av_free(thread_arg);
+    thread->result = thread->start_routine(thread->arg);
 }
 
 static av_always_inline int pthread_create(pthread_t *thread, const pthread_attr_t *attr, void *(*start_routine)(void*), void *arg)
 {
-    struct thread_arg *thread_arg;
-
-    thread_arg = av_mallocz(sizeof(struct thread_arg));
-    if (!thread_arg)
-        return ENOMEM;
+    thread->start_routine = start_routine;
+    thread->arg = arg;
+    thread->result = NULL;
 
-    thread_arg->start_routine = start_routine;
-    thread_arg->arg = arg;
-
-    *thread = _beginthread(thread_entry, NULL, 256 * 1024, thread_arg);
+    thread->tid = _beginthread(thread_entry, NULL, 1024 * 1024, thread);
 
     return 0;
 }
 
 static av_always_inline int pthread_join(pthread_t thread, void **value_ptr)
 {
-    DosWaitThread((PTID)&thread, DCWW_WAIT);
+    DosWaitThread(&thread.tid, DCWW_WAIT);
+
+    if (value_ptr)
+        *value_ptr = thread.result;
 
     return 0;
 }