christoph/wamr
1
Fork 0
Code Releases Activity

Fix source debugger error handling: continue executing when detached (#1725)

Browse Source 
Change main thread hangs when encounter debugger encounters error to
main thread exits when debugger encounters error
Change main thread blocks when debugger detaches to
main thread continues executing when debugger detaches, and main thread
exits normally when finishing executing
This commit is contained in:
TianlongLiang
2022-11-28 22:12:46 +08:00
committed by GitHub
parent 12bcc20710
commit be7a4abee2
3 changed files with 96 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
core/iwasm/libraries/thread-mgr/thread_manager.c
View File

@ -293,8 +293,9 @@ wasm_cluster_del_exec_env(WASMCluster *cluster, WASMExecEnv *exec_env)
other threads can't fire stop events */
os_mutex_lock(&cluster->debug_inst->wait_lock);
while (cluster->debug_inst->stopped_thread == exec_env) {
os_cond_wait(&cluster->debug_inst->wait_cond,
&cluster->debug_inst->wait_lock);
/* either wakes up by signal or by 1-second timeout */
os_cond_reltimedwait(&cluster->debug_inst->wait_cond,
&cluster->debug_inst->wait_lock, 1000000);
}
os_mutex_unlock(&cluster->debug_inst->wait_lock);
}
@ -593,6 +594,21 @@ notify_debug_instance(WASMExecEnv *exec_env)
on_thread_stop_event(cluster->debug_inst, exec_env);
}
static void
notify_debug_instance_exit(WASMExecEnv *exec_env)
{
WASMCluster *cluster;
cluster = wasm_exec_env_get_cluster(exec_env);
bh_assert(cluster);
if (!cluster->debug_inst) {
return;
}
on_thread_exit_event(cluster->debug_inst, exec_env);
}
void
wasm_cluster_thread_stopped(WASMExecEnv *exec_env)
{
@ -624,7 +640,7 @@ void
wasm_cluster_thread_exited(WASMExecEnv *exec_env)
{
exec_env->current_status->running_status = STATUS_EXIT;
notify_debug_instance(exec_env);
notify_debug_instance_exit(exec_env);
}
void