Revert NFC changes from pthread_create.c

Author: kleisauke

system/lib/pthread/pthread_create.c

@@ -22,7 +22,7 @@
 
 // See musl's pthread_create.c
 
-extern int __pthread_create_js(pthread_t thread, const pthread_attr_t *attr, void *(*start_routine) (void *), void *arg);
+extern int __pthread_create_js(struct pthread *thread, const pthread_attr_t *attr, void *(*start_routine) (void *), void *arg);
 extern void _emscripten_thread_init(int, int, int);
 extern int _emscripten_default_pthread_stack_size();
 extern void __pthread_detached_exit();
@@ -76,7 +76,7 @@ int __pthread_create(pthread_t* restrict res,
                      void* (*entry)(void*),
                      void* restrict arg) {
   // Note on LSAN: lsan intercepts/wraps calls to pthread_create so any
-  // allocation we do here should be considered as leak.
+  // allocation we we do here should be considered leaks.
   // See: lsan_interceptors.cpp.
   if (!res) {
     return EINVAL;
@@ -188,11 +188,11 @@ static void free_tls_data() {
 }
 
 void _emscripten_thread_exit(void* result) {
-  pthread_t self = __pthread_self();
+  struct pthread *self = __pthread_self();
   assert(self);
 
-  self->canceldisable = 1;
-  self->cancelasync = 0;
+  self->canceldisable = PTHREAD_CANCEL_DISABLE;
+  self->cancelasync = PTHREAD_CANCEL_DEFERRED;
   self->result = result;
 
   // Run any handlers registered with pthread_cleanup_push
@@ -219,16 +219,16 @@ void _emscripten_thread_exit(void* result) {
     return;
   }
 
-  // We have the call the builtin free here since lsan handling for this thread
+  // We have the call the buildin free here since lsan handling for this thread
   // gets shut down during __pthread_tsd_run_dtors.
   emscripten_builtin_free(self->tsd);
   self->tsd = NULL;
 
   // Not hosting a pthread anymore in this worker set __pthread_self to NULL
   _emscripten_thread_init(0, 0, 0);
 
-  // This atomic potentially competes with a concurrent pthread_detach
-  // call; the loser is responsible for freeing thread resources.
+  /* This atomic potentially competes with a concurrent pthread_detach
+   * call; the loser is responsible for freeing thread resources. */
   int state = a_cas(&self->detach_state, DT_JOINABLE, DT_EXITING);
 
   // Mark the thread as no longer running.
@@ -244,7 +244,7 @@ void _emscripten_thread_exit(void* result) {
   }
 }
 
-// Mark as `no_sanitize("address")` since emscripten_pthread_exit destroys
+// Mark as `no_sanitize("address"` since emscripten_pthread_exit destroys
 // the current thread and runs its exit handlers.  Without this asan injects
 // a call to __asan_handle_no_return before emscripten_unwind_to_js_event_loop
 // which seem to cause a crash later down the line.