fix(wasi-threads): restore no_pthread sample and update thread_termination sample to use blocking operations

Author: eloparco

core/shared/platform/include/platform_api_extension.h

@@ -24,7 +24,6 @@ extern "C" {
  * A list is used to handles stack contexts created in nested functions (for the
  * same thread). Stack contexts are used by the signal handler to restore a
  * previously saved state.
- *
  */
 typedef struct {
     void *contexts;

samples/wasi-threads/wasm-apps/no_pthread.c

@@ -12,8 +12,6 @@
 
 #include "wasi_thread_start.h"
 
-#define STOP_FROM_MAIN 1
-
 static const int64_t SECOND = 1000 * 1000 * 1000;
 
 typedef struct {
@@ -31,11 +29,12 @@ __wasi_thread_start_C(int thread_id, int *start_arg)
     printf("New thread ID: %d, starting parameter: %d\n", thread_id,
            data->value);
 
-#if STOP_FROM_MAIN == 1
-    __builtin_wasm_memory_atomic_wait32(0, 0, -1);
-#else
-    __wasi_proc_exit(55);
-#endif
+    data->thread_id = thread_id;
+    data->value += 8;
+    printf("Updated value: %d\n", data->value);
+
+    data->th_ready = 1;
+    __builtin_wasm_memory_atomic_notify(&data->th_ready, 1);
 }
 
 int
@@ -57,11 +56,16 @@ main(int argc, char **argv)
         goto final;
     }
 
-#if STOP_FROM_MAIN == 1
-    __wasi_proc_exit(56);
-#else
-    __builtin_wasm_memory_atomic_wait32(0, 0, -1);
-#endif
+    if (__builtin_wasm_memory_atomic_wait32(&data.th_ready, 0, SECOND) == 2) {
+        printf("Timeout\n");
+        ret = EXIT_FAILURE;
+        goto final;
+    }
+
+    printf("Thread completed, new value: %d, thread id: %d\n", data.value,
+           data.thread_id);
+
+    assert(thread_id == data.thread_id);
 
 final:
     start_args_deinit(&data.base);

samples/wasi-threads/wasm-apps/thread_termination.c

@@ -17,6 +17,7 @@
 
 #define TEST_TERMINATION_BY_TRAP 0 // Otherwise test `proc_exit` termination
 #define TEST_TERMINATION_IN_MAIN_THREAD 1
+#define TEST_ATOMIC_WAIT 1 // Otherwise test `sleep`
 
 #define TIMEOUT_SECONDS 10
 #define NUM_THREADS 3
@@ -30,9 +31,11 @@ typedef struct {
 void
 run_long_task()
 {
-    // Busy waiting to be interruptible by trap or `proc_exit`
-    for (int i = 0; i < TIMEOUT_SECONDS; i++)
-        sleep(1);
+#if TEST_ATOMIC_WAIT == 1
+    __builtin_wasm_memory_atomic_wait32(0, 0, -1);
+#else
+    sleep(TIMEOUT_SECONDS);
+#endif
 }
 
 void