Ensure pthread key dtors run on main thread too

Author: sbc100

src/library_pthread.js

@@ -170,7 +170,10 @@ var LibraryPThread = {
       }
 
       // Call into the musl function that runs destructors of all thread-specific data.
-      if (ENVIRONMENT_IS_PTHREAD && _pthread_self()) ___pthread_tsd_run_dtors();
+#if ASSERTIONS
+      assert(_pthread_self())
+#endif
+      ___pthread_tsd_run_dtors();
     },
 
     runExitHandlersAndDeinitThread: function(tb, exitCode) {

src/postamble_minimal.js

@@ -24,11 +24,11 @@ function run() {
   var ret = _main();
 
 #if EXIT_RUNTIME
-  callRuntimeCallbacks(__ATEXIT__);
-  <<< ATEXITS >>>
 #if USE_PTHREADS
   PThread.runExitHandlers();
 #endif
+  callRuntimeCallbacks(__ATEXIT__);
+  <<< ATEXITS >>>
 #endif
 
 #if IN_TEST_HARNESS

src/preamble.js

@@ -424,14 +424,12 @@ function exitRuntime() {
   checkStackCookie();
 #endif
 #if USE_PTHREADS
+  PThread.runExitHandlers();
   if (ENVIRONMENT_IS_PTHREAD) return; // PThreads reuse the runtime from the main thread.
 #endif
 #if EXIT_RUNTIME
   callRuntimeCallbacks(__ATEXIT__);
   <<< ATEXITS >>>
-#if USE_PTHREADS
-  PThread.runExitHandlers();
-#endif
 #endif
   runtimeExited = true;
 }

tests/pthread/test_pthread_setspecific_mainthread.c

@@ -0,0 +1,25 @@
+// Copyright 2015 The Emscripten Authors.  All rights reserved.
+// Emscripten is available under two separate licenses, the MIT license and the
+// University of Illinois/NCSA Open Source License.  Both these licenses can be
+// found in the LICENSE file.
+
+#include <assert.h>
+#include <stdio.h>
+#include <pthread.h>
+
+
+void destructor(void* arg) {
+  printf("destructor: %d\n", (int)arg);
+  assert(arg == (void*)42);
+}
+
+int main() {
+  pthread_key_t key;
+  pthread_key_create(&key, destructor);
+  void *val = pthread_getspecific(key);
+  assert(val == 0);
+  pthread_setspecific(key, (void*)42);
+  val = pthread_getspecific(key);
+  assert(val == (void*)42);
+  return 0;
+}

tests/pthread/test_pthread_setspecific_mainthread.cpp

@@ -0,0 +1 @@
+destructor: 42

tests/pthread/test_pthread_setspecific_mainthread.out

@@ -3947,7 +3947,7 @@ def test_pthread_unistd_io_bigint(self):
   # Test that the main thread is able to use pthread_set/getspecific.
   @requires_threads
   def test_pthread_setspecific_mainthread(self):
-    self.btest(test_file('pthread/test_pthread_setspecific_mainthread.cpp'), expected='0', args=['-s', 'INITIAL_MEMORY=64MB', '-O3', '-s', 'USE_PTHREADS'], also_asmjs=True)
+    self.btest_exit(test_file('pthread/test_pthread_setspecific_mainthread.c'), args=['-s', 'INITIAL_MEMORY=64MB', '-O3', '-s', 'USE_PTHREADS'], also_asmjs=True)
 
   # Test that pthreads have access to filesystem.
   @requires_threads

tests/test_browser.py

@@ -2342,6 +2342,11 @@ def test_pthread_cleanup(self):
     self.set_setting('PTHREAD_POOL_SIZE', 4)
     self.do_run_in_out_file_test('pthread/test_pthread_cleanup.cpp')
 
+  @node_pthreads
+  def test_pthread_setspecific_mainthread(self):
+    self.set_setting('EXIT_RUNTIME')
+    self.do_run_in_out_file_test('pthread/test_pthread_setspecific_mainthread.c')
+
   def test_tcgetattr(self):
     self.do_runf(test_file('termios/test_tcgetattr.c'), 'success')