Don't run pthread key dtors on application exit

It should only be run when a thread is exiting (or when pthread_exit
is called). This reverts commit 6d3e78c and 5c7c713.

Author: kleisauke

src/library_pthread.js

@@ -917,8 +917,10 @@ var LibraryPThread = {
 
   __pthread_exit_js__deps: ['exit'],
   __pthread_exit_js: function(status) {
-    if (!ENVIRONMENT_IS_PTHREAD) _exit(status);
-    else PThread.threadExit(status);
+    if (!ENVIRONMENT_IS_PTHREAD) {
+      PThread.runExitHandlers();
+      _exit(status);
+    } else PThread.threadExit(status);
     // pthread_exit is marked noReturn, so we must not return from it.
     throw 'unwind';
   },

src/postamble_minimal.js

@@ -24,9 +24,6 @@ function run() {
   var ret = _main();
 
 #if EXIT_RUNTIME
-#if USE_PTHREADS
-  PThread.runExitHandlers();
-#endif
   callRuntimeCallbacks(__ATEXIT__);
   <<< ATEXITS >>>
 #endif
@@ -226,7 +223,7 @@ WebAssembly.instantiate(Module['wasm'], imports).then(function(output) {
   initRuntime(asm);
 #if USE_PTHREADS && PTHREAD_POOL_SIZE
   if (!ENVIRONMENT_IS_PTHREAD) loadWasmModuleToWorkers();
-#if !PTHREAD_POOL_DELAY_LOAD  
+#if !PTHREAD_POOL_DELAY_LOAD
   else
 #endif
     ready();

src/preamble.js

@@ -423,9 +423,6 @@ function exitRuntime() {
   <<< ATEXITS >>>
 #endif
 #if USE_PTHREADS
-#if EXIT_RUNTIME
-  PThread.runExitHandlers();
-#endif
   PThread.terminateAllThreads();
 #endif
   runtimeExited = true;

tests/pthread/test_pthread_setspecific_mainthread.c

@@ -8,8 +8,6 @@
 #include <pthread.h>
 
 void destructor(void* arg) {
-  // Note: this is never printed as destructors for thread-specific
-  // data are ran after stdio is shutdown.
   printf("destructor: %ld\n", (long)arg);
   assert(arg == (void*)42);
 }
@@ -22,6 +20,7 @@ int main() {
   pthread_setspecific(key, (void*)42);
   val = pthread_getspecific(key);
   assert(val == (void*)42);
-  printf("done!\n");
-  return 0;
+  // Explicitly call pthread_exit since destructors for thread-specific data
+  // are not called on application exit (it's only called when a thread exits).
+  pthread_exit(0);
 }

tests/pthread/test_pthread_setspecific_mainthread.out

@@ -1 +1 @@
-done!
+destructor: 42

tests/test_core.py

@@ -2335,8 +2335,6 @@ def test_pthread_cleanup(self):
   @node_pthreads
   def test_pthread_setspecific_mainthread(self):
     self.set_setting('EXIT_RUNTIME')
-    # ensure ___stdio_exit is called
-    self.set_setting('FORCE_FILESYSTEM')
     self.do_run_in_out_file_test('pthread/test_pthread_setspecific_mainthread.c')
 
   @node_pthreads