diff options
author | Damien George <damien.p.george@gmail.com> | 2016-05-26 10:53:34 +0000 |
---|---|---|
committer | Damien George <damien.p.george@gmail.com> | 2016-06-28 11:28:50 +0100 |
commit | a1c93a62b1d1020c5ef3ce1744469a118433d0e5 (patch) | |
tree | 1c03b8e373477e46581a046b8c7dede182d6fbaa | |
parent | 4cec63a9dbed86c4332b9e7fcd56d092046193e4 (diff) | |
download | micropython-a1c93a62b1d1020c5ef3ce1744469a118433d0e5.tar.gz micropython-a1c93a62b1d1020c5ef3ce1744469a118433d0e5.zip |
py: Don't use gc or qstr mutex when the GIL is enabled.
There is no need since the GIL already makes gc and qstr operations
atomic.
-rw-r--r-- | py/gc.c | 2 | ||||
-rw-r--r-- | py/qstr.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -94,7 +94,7 @@ #define FTB_CLEAR(block) do { MP_STATE_MEM(gc_finaliser_table_start)[(block) / BLOCKS_PER_FTB] &= (~(1 << ((block) & 7))); } while (0) #endif -#if MICROPY_PY_THREAD +#if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL #define GC_ENTER() mp_thread_mutex_lock(&MP_STATE_MEM(gc_mutex), 1) #define GC_EXIT() mp_thread_mutex_unlock(&MP_STATE_MEM(gc_mutex)) #else @@ -72,7 +72,7 @@ #error unimplemented qstr length decoding #endif -#if MICROPY_PY_THREAD +#if MICROPY_PY_THREAD && !MICROPY_PY_THREAD_GIL #define QSTR_ENTER() mp_thread_mutex_lock(&MP_STATE_VM(qstr_mutex), 1) #define QSTR_EXIT() mp_thread_mutex_unlock(&MP_STATE_VM(qstr_mutex)) #else |