djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rp2/mpthreadport: Ensure core1 doesn't hold gc lock in deinit.

Browse Source 
Prior to this commit the following code would lock up the device when
Ctrl-D is entered at the REPL:

    import gc, _thread

    def collect_thread():
        while True:
            gc.collect()

    _thread.start_new_thread(collect_thread, [])

Fixes part of #8494.

Signed-off-by: Jim Mussared <jim.mussared@gmail.com>
This commit is contained in:
Jim Mussared 2022-06-29 13:56:12 +10:00 committed by Damien George
parent b004e7e397
commit 797a83ac3e
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ports/rp2/mpthreadport.c
View File

@ -47,8 +47,13 @@ void mp_thread_init(void) {
} }
void mp_thread_deinit(void) { void mp_thread_deinit(void) {
assert(get_core_num() == 0);
// Must ensure that core1 is not currently holding the GC lock, otherwise
// it will be terminated while holding the lock.
mp_thread_mutex_lock(&MP_STATE_MEM(gc_mutex), 1);
multicore_reset_core1(); multicore_reset_core1();
core1_entry = NULL; core1_entry = NULL;
mp_thread_mutex_unlock(&MP_STATE_MEM(gc_mutex));
} }
void mp_thread_gc_others(void) { void mp_thread_gc_others(void) {