Skip to content

Fix: thread-mgr: prevent an already detached thread from being detached again #1487

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 15, 2022
Merged

Fix: thread-mgr: prevent an already detached thread from being detached again #1487

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccb60a8
thread-mgr: prevent an already detached thread from being detached again
shengyun-zhou Sep 15, 2022
c6d6bc8
thread-mgr: check if a thread has been detached with mutex protection
shengyun-zhou Sep 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions core/iwasm/libraries/thread-mgr/thread_manager.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,9 @@ wasm_cluster_join_thread(WASMExecEnv *exec_env, void **ret_val)
int32
wasm_cluster_detach_thread(WASMExecEnv *exec_env)
{
if (exec_env->thread_is_detached)
return 0;
Copy link
Contributor

@wenyongh wenyongh Sep 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should move the code into the lock/unlock code piece, e.g. :

    os_mutex_lock(&cluster_list_lock);
    if (exec_env->thread_is_detached) {
        os_mutex_unlock(&cluster_list_lock);
        return 0;
    }
    if (!clusters_have_exec_env(exec_env)) {
    ...
    os_mutex_unlock(&cluster_list_lock);

Or if another thread changes the state when current thread runs between L701 and L705, current thread will change again.

Copy link
Contributor Author

@shengyun-zhou shengyun-zhou Sep 15, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I have moved it into lock protection.


int32 ret = 0;

os_mutex_lock(&cluster_list_lock);
Expand Down