py/scheduler: Add assert that scheduler is locked when unlocking.
And add a test that shows how this can happen when multiple threads are accessing the scheduler, which fails if atomic sections are not used.
This commit is contained in:
parent
243805d776
commit
8470cd0be9
|
@ -108,6 +108,7 @@ void mp_sched_lock(void) {
|
||||||
|
|
||||||
void mp_sched_unlock(void) {
|
void mp_sched_unlock(void) {
|
||||||
mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
|
mp_uint_t atomic_state = MICROPY_BEGIN_ATOMIC_SECTION();
|
||||||
|
assert(MP_STATE_VM(sched_state) < 0);
|
||||||
if (++MP_STATE_VM(sched_state) == 0) {
|
if (++MP_STATE_VM(sched_state) == 0) {
|
||||||
// vm became unlocked
|
// vm became unlocked
|
||||||
if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL || mp_sched_num_pending()) {
|
if (MP_STATE_VM(mp_pending_exception) != MP_OBJ_NULL || mp_sched_num_pending()) {
|
||||||
|
|
|
@ -0,0 +1,49 @@
|
||||||
|
# This test ensures that the scheduler doesn't trigger any assertions
|
||||||
|
# while dealing with concurrent access from multiple threads.
|
||||||
|
|
||||||
|
import _thread
|
||||||
|
import utime
|
||||||
|
import micropython
|
||||||
|
import gc
|
||||||
|
|
||||||
|
try:
|
||||||
|
micropython.schedule
|
||||||
|
except AttributeError:
|
||||||
|
print("SKIP")
|
||||||
|
raise SystemExit
|
||||||
|
|
||||||
|
gc.disable()
|
||||||
|
|
||||||
|
n = 0 # How many times the task successfully ran.
|
||||||
|
|
||||||
|
|
||||||
|
def task(x):
|
||||||
|
global n
|
||||||
|
n += 1
|
||||||
|
|
||||||
|
|
||||||
|
def thread():
|
||||||
|
while True:
|
||||||
|
try:
|
||||||
|
micropython.schedule(task, None)
|
||||||
|
except RuntimeError:
|
||||||
|
# Queue full, back off.
|
||||||
|
utime.sleep_ms(10)
|
||||||
|
|
||||||
|
|
||||||
|
for i in range(8):
|
||||||
|
_thread.start_new_thread(thread, ())
|
||||||
|
|
||||||
|
_NUM_TASKS = const(10000)
|
||||||
|
_TIMEOUT_MS = const(10000)
|
||||||
|
|
||||||
|
# Wait up to 10 seconds for 10000 tasks to be scheduled.
|
||||||
|
t = utime.ticks_ms()
|
||||||
|
while n < _NUM_TASKS and utime.ticks_diff(utime.ticks_ms(), t) < _TIMEOUT_MS:
|
||||||
|
pass
|
||||||
|
|
||||||
|
if n < _NUM_TASKS:
|
||||||
|
# Not all the tasks were scheduled, likely the scheduler stopped working.
|
||||||
|
print(n)
|
||||||
|
else:
|
||||||
|
print("PASS")
|
|
@ -0,0 +1 @@
|
||||||
|
PASS
|
Loading…
Reference in New Issue