py: Implement a simple global interpreter lock.
This makes the VM/runtime thread safe, at the cost of not being able to run code in parallel.
This commit is contained in:
parent
1f54ad2aed
commit
4cec63a9db
|
@ -146,6 +146,8 @@ typedef struct _thread_entry_args_t {
|
||||||
} thread_entry_args_t;
|
} thread_entry_args_t;
|
||||||
|
|
||||||
STATIC void *thread_entry(void *args_in) {
|
STATIC void *thread_entry(void *args_in) {
|
||||||
|
// Execution begins here for a new thread. We do not have the GIL.
|
||||||
|
|
||||||
thread_entry_args_t *args = (thread_entry_args_t*)args_in;
|
thread_entry_args_t *args = (thread_entry_args_t*)args_in;
|
||||||
|
|
||||||
mp_state_thread_t ts;
|
mp_state_thread_t ts;
|
||||||
|
@ -154,6 +156,8 @@ STATIC void *thread_entry(void *args_in) {
|
||||||
mp_stack_set_top(&ts + 1); // need to include ts in root-pointer scan
|
mp_stack_set_top(&ts + 1); // need to include ts in root-pointer scan
|
||||||
mp_stack_set_limit(16 * 1024); // fixed stack limit for now
|
mp_stack_set_limit(16 * 1024); // fixed stack limit for now
|
||||||
|
|
||||||
|
MP_THREAD_GIL_ENTER();
|
||||||
|
|
||||||
// signal that we are set up and running
|
// signal that we are set up and running
|
||||||
mp_thread_start();
|
mp_thread_start();
|
||||||
|
|
||||||
|
@ -188,6 +192,8 @@ STATIC void *thread_entry(void *args_in) {
|
||||||
// signal that we are finished
|
// signal that we are finished
|
||||||
mp_thread_finish();
|
mp_thread_finish();
|
||||||
|
|
||||||
|
MP_THREAD_GIL_EXIT();
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -829,6 +829,12 @@ typedef double mp_float_t;
|
||||||
#define MICROPY_PY_THREAD (0)
|
#define MICROPY_PY_THREAD (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Whether to make the VM/runtime thread-safe using a global lock
|
||||||
|
// If not enabled then thread safety must be provided at the Python level
|
||||||
|
#ifndef MICROPY_PY_THREAD_GIL
|
||||||
|
#define MICROPY_PY_THREAD_GIL (MICROPY_PY_THREAD)
|
||||||
|
#endif
|
||||||
|
|
||||||
// Extended modules
|
// Extended modules
|
||||||
|
|
||||||
#ifndef MICROPY_PY_UCTYPES
|
#ifndef MICROPY_PY_UCTYPES
|
||||||
|
|
|
@ -175,6 +175,11 @@ typedef struct _mp_state_vm_t {
|
||||||
#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF && MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE == 0
|
#if MICROPY_ENABLE_EMERGENCY_EXCEPTION_BUF && MICROPY_EMERGENCY_EXCEPTION_BUF_SIZE == 0
|
||||||
mp_int_t mp_emergency_exception_buf_size;
|
mp_int_t mp_emergency_exception_buf_size;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if MICROPY_PY_THREAD_GIL
|
||||||
|
// This is a global mutex used to make the VM/runtime thread-safe.
|
||||||
|
mp_thread_mutex_t gil_mutex;
|
||||||
|
#endif
|
||||||
} mp_state_vm_t;
|
} mp_state_vm_t;
|
||||||
|
|
||||||
// This structure holds state that is specific to a given thread.
|
// This structure holds state that is specific to a given thread.
|
||||||
|
|
|
@ -38,6 +38,14 @@
|
||||||
|
|
||||||
struct _mp_state_thread_t;
|
struct _mp_state_thread_t;
|
||||||
|
|
||||||
|
#if MICROPY_PY_THREAD_GIL
|
||||||
|
#define MP_THREAD_GIL_ENTER() mp_thread_mutex_lock(&MP_STATE_VM(gil_mutex), 1)
|
||||||
|
#define MP_THREAD_GIL_EXIT() mp_thread_mutex_unlock(&MP_STATE_VM(gil_mutex))
|
||||||
|
#else
|
||||||
|
#define MP_THREAD_GIL_ENTER()
|
||||||
|
#define MP_THREAD_GIL_EXIT()
|
||||||
|
#endif
|
||||||
|
|
||||||
struct _mp_state_thread_t *mp_thread_get_state(void);
|
struct _mp_state_thread_t *mp_thread_get_state(void);
|
||||||
void mp_thread_set_state(void *state);
|
void mp_thread_set_state(void *state);
|
||||||
void mp_thread_create(void *(*entry)(void*), void *arg, size_t stack_size);
|
void mp_thread_create(void *(*entry)(void*), void *arg, size_t stack_size);
|
||||||
|
|
|
@ -91,6 +91,12 @@ void mp_init(void) {
|
||||||
// start with no extensions to builtins
|
// start with no extensions to builtins
|
||||||
MP_STATE_VM(mp_module_builtins_override_dict) = NULL;
|
MP_STATE_VM(mp_module_builtins_override_dict) = NULL;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if MICROPY_PY_THREAD_GIL
|
||||||
|
mp_thread_mutex_init(&MP_STATE_VM(gil_mutex));
|
||||||
|
#endif
|
||||||
|
|
||||||
|
MP_THREAD_GIL_ENTER();
|
||||||
}
|
}
|
||||||
|
|
||||||
void mp_deinit(void) {
|
void mp_deinit(void) {
|
||||||
|
|
Loading…
Reference in New Issue