Lerking/micropython
1
0
Fork 0
mirror of https://github.com/micropython/micropython.git synced 2025-12-16 09:50:15 +01:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

py: Add optional support for recursive mutexes, use for gc mutex.

Browse Source 
Enabled by default if using threading and no GIL

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <angus@redyak.com.au>
This commit is contained in:
Angus Gratton
2024-12-10 14:50:42 +11:00
committed by Damien George
parent 40e1c111e1
commit 4bcbe88e74
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
py/gc.c
View File

@@ -113,9 +113,12 @@
#endif #endif
#if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL #if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
#define GC_ENTER() mp_thread_mutex_lock(&MP_STATE_MEM(gc_mutex), 1) #define GC_MUTEX_INIT() mp_thread_recursive_mutex_init(&MP_STATE_MEM(gc_mutex))
#define GC_EXIT() mp_thread_mutex_unlock(&MP_STATE_MEM(gc_mutex)) #define GC_ENTER() mp_thread_recursive_mutex_lock(&MP_STATE_MEM(gc_mutex), 1)
#define GC_EXIT() mp_thread_recursive_mutex_unlock(&MP_STATE_MEM(gc_mutex))
#else #else
// Either no threading, or assume callers to gc_collect() hold the GIL
#define GC_MUTEX_INIT()
#define GC_ENTER() #define GC_ENTER()
#define GC_EXIT() #define GC_EXIT()
#endif #endif
@@ -210,9 +213,7 @@ void gc_init(void *start, void *end) {
MP_STATE_MEM(gc_alloc_amount) = 0; MP_STATE_MEM(gc_alloc_amount) = 0;
#endif #endif
#if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL GC_MUTEX_INIT();
mp_thread_mutex_init(&MP_STATE_MEM(gc_mutex));
#endif
} }
#if MICROPY_GC_SPLIT_HEAP #if MICROPY_GC_SPLIT_HEAP

5
py/mpconfig.h
View File

@@ -1629,6 +1629,11 @@ typedef double mp_float_t;
#define MICROPY_PY_THREAD_GIL_VM_DIVISOR (32) #define MICROPY_PY_THREAD_GIL_VM_DIVISOR (32)
#endif #endif
// Is a recursive mutex type in use?
#ifndef MICROPY_PY_THREAD_RECURSIVE_MUTEX
#define MICROPY_PY_THREAD_RECURSIVE_MUTEX (MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL)
#endif
// Extended modules // Extended modules
#ifndef MICROPY_PY_ASYNCIO #ifndef MICROPY_PY_ASYNCIO

2
py/mpstate.h
View File

@@ -145,7 +145,7 @@ typedef struct _mp_state_mem_t {
#if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL #if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL
// This is a global mutex used to make the GC thread-safe. // This is a global mutex used to make the GC thread-safe.
mp_thread_mutex_t gc_mutex; mp_thread_recursive_mutex_t gc_mutex;
#endif #endif
} mp_state_mem_t; } mp_state_mem_t;

6
py/mpthread.h
View File

@@ -48,6 +48,12 @@ void mp_thread_mutex_init(mp_thread_mutex_t *mutex);
int mp_thread_mutex_lock(mp_thread_mutex_t *mutex, int wait); int mp_thread_mutex_lock(mp_thread_mutex_t *mutex, int wait);
void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex); void mp_thread_mutex_unlock(mp_thread_mutex_t *mutex);
#if MICROPY_PY_THREAD_RECURSIVE_MUTEX
void mp_thread_recursive_mutex_init(mp_thread_recursive_mutex_t *mutex);
int mp_thread_recursive_mutex_lock(mp_thread_recursive_mutex_t *mutex, int wait);
void mp_thread_recursive_mutex_unlock(mp_thread_recursive_mutex_t *mutex);
#endif
#endif // MICROPY_PY_THREAD #endif // MICROPY_PY_THREAD
#if MICROPY_PY_THREAD && MICROPY_PY_THREAD_GIL #if MICROPY_PY_THREAD && MICROPY_PY_THREAD_GIL