Improve exit logic. NFC.

- Don't call `exitRuntime()` when `ENVIRONMENT_IS_PTHREAD` is true.
- Remove the early return from `exitRuntime()`.
- Collapse if/else statements in `exit()`.

Author: kleisauke

src/postamble.js

@@ -406,27 +406,30 @@ function exit(status, implicit) {
 #endif // ASSERTIONS && !EXIT_RUNTIME
 
 #if USE_PTHREADS
-  if (!implicit) {
-    if (ENVIRONMENT_IS_PTHREAD) {
-#if PTHREADS_DEBUG
-      err('Pthread 0x' + _pthread_self().toString(16) + ' called exit(), posting exitOnMainThread.');
-#endif
-      // When running in a pthread we propagate the exit back to the main thread
-      // where it can decide if the whole process should be shut down or not.
-      // The pthread may have decided not to exit its own runtime, for example
-      // because it runs a main loop, but that doesn't affect the main thread.
-      exitOnMainThread(status);
-      throw 'unwind';
-    } else {
+  if (ENVIRONMENT_IS_PTHREAD) {
+#if ASSERTIONS
+    assert(!implicit, "exit should never be called implicitly in a pthread");
+#endif
 #if PTHREADS_DEBUG
-      err('main thread called exit: keepRuntimeAlive=' + keepRuntimeAlive() + ' (counter=' + runtimeKeepaliveCounter + ')');
+    err('Pthread 0x' + _pthread_self().toString(16) + ' called exit(), posting exitOnMainThread.');
+#endif
+    // When running in a pthread we propagate the exit back to the main thread
+    // where it can decide if the whole process should be shut down or not.
+    // The pthread may have decided not to exit its own runtime, for example
+    // because it runs a main loop, but that doesn't affect the main thread.
+    exitOnMainThread(status);
+    throw 'unwind';
+#if ASSERTIONS
+  } else if (!implicit) {
+    err('main thread called exit: keepRuntimeAlive=' + keepRuntimeAlive() + ' (counter=' + runtimeKeepaliveCounter + ')');
 #endif
-    }
   }
-#endif
+#endif // USE_PTHREADS
 
-  if (keepRuntimeAlive()) {
+  if (!keepRuntimeAlive()) {
+    exitRuntime();
 #if ASSERTIONS
+  } else {
     // if exit() was called, we may warn the user if the runtime isn't actually being shut down
     if (!implicit) {
 #if EXIT_RUNTIME == 0
@@ -440,8 +443,6 @@ function exit(status, implicit) {
       err(msg);
     }
 #endif // ASSERTIONS
-  } else {
-    exitRuntime();
   }
 
   procExit(status);

src/preamble.js

@@ -426,9 +426,6 @@ function exitRuntime() {
 #if STACK_OVERFLOW_CHECK
   checkStackCookie();
 #endif
-#if USE_PTHREADS
-  if (ENVIRONMENT_IS_PTHREAD) return; // PThreads reuse the runtime from the main thread.
-#endif
 #if EXIT_RUNTIME
 #if !STANDALONE_WASM
   ___funcs_on_exit(); // Native atexit() functions

src/worker.js

@@ -259,7 +259,7 @@ self.onmessage = (e) => {
           }
 #if ASSERTIONS
         } else {
-          // else e == 'unwind', and we should fall through here and keep the pthread alive for asynchronous events.
+          // else ex == 'unwind', and we should fall through here and keep the pthread alive for asynchronous events.
           err('Pthread 0x' + Module['_pthread_self']().toString(16) + ' completed its main entry point with an `unwind`, keeping the worker alive for asynchronous operation.');
 #endif
         }