CloudEdge/wasm-micro-runtime
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix thread termination example (#1915)

Browse Source 
The example wasn't fully implemented the intention - it didn't work as
expected when the trap/proc_exit was executed on the main thread,
because main thread never waited for all the threads to start.
This commit is contained in:
Marcin Kolny 2023-01-25 01:34:36 +00:00 committed by GitHub
parent 9cf55f953b
commit 879563047f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
samples/wasi-threads/wasm-apps/thread_termination.c
View File

@ -35,30 +35,42 @@ run_long_task()
sleep(1);
}
void
start_job()
{
sem_post(&sem);
run_long_task(); // Wait to be interrupted
assert(false && "Unreachable");
}
void
terminate_process()
{
// Wait for all other threads (including main thread) to be ready
printf("Waiting before terminating\n");
for (int i = 0; i < NUM_THREADS; i++)
sem_wait(&sem);
printf("Force termination\n");
#if TEST_TERMINATION_BY_TRAP == 1
__builtin_trap();
#else
__wasi_proc_exit(1);
#endif
}
void
__wasi_thread_start_C(int thread_id, int *start_arg)
{
shared_t *data = (shared_t *)start_arg;
if (data->throw_exception) {
// Wait for all other threads (including main thread) to be ready
printf("Waiting before terminating\n");
for (int i = 0; i < NUM_THREADS; i++)
sem_wait(&sem);
printf("Force termination\n");
#if TEST_TERMINATION_BY_TRAP == 1
__builtin_trap();
#else
__wasi_proc_exit(1);
#endif
terminate_process();
}
else {
printf("Thread running\n");
sem_post(&sem);
run_long_task(); // Wait to be interrupted
assert(false && "Unreachable");
start_job();
}
}
@ -107,22 +119,13 @@ main(int argc, char **argv)
return EXIT_FAILURE;
}
#if TEST_TERMINATION_IN_MAIN_THREAD == 1
printf("Force termination (main thread)\n");
terminate_process();
#else /* TEST_TERMINATION_IN_MAIN_THREAD */
printf("Main thread running\n");
sem_post(&sem);
#if TEST_TERMINATION_IN_MAIN_THREAD == 1
printf("Force termination (main thread)\n");
#if TEST_TERMINATION_BY_TRAP == 1
__builtin_trap();
#else /* TEST_TERMINATION_BY_TRAP */
__wasi_proc_exit(1);
#endif /* TEST_TERMINATION_BY_TRAP */
#else /* TEST_TERMINATION_IN_MAIN_THREAD */
run_long_task(); // Wait to be interrupted
assert(false && "Unreachable");
start_job();
#endif /* TEST_TERMINATION_IN_MAIN_THREAD */
return EXIT_SUCCESS;
}