mirrors/micropython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cc3200/mpthreadport: Move mem alloc outside the thread_mutex lock.

Browse Source 
Otherwise there could be a deadlock, with the GC's mutex and
thread_mutex.
This commit is contained in:
Damien George 2016-05-31 17:34:13 +01:00
parent 757146efe3
commit fa2ac93c3a
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cc3200/mpthreadport.c
View File

@ -120,22 +120,21 @@ void mp_thread_create(void *(*entry)(void*), void *arg, size_t *stack_size) {
*stack_size = 2048; // minimum stack size *stack_size = 2048; // minimum stack size
} }
// allocate TCB, stack and linked-list node (must be outside thread_mutex lock)
StaticTask_t *tcb = m_new(StaticTask_t, 1);
StackType_t *stack = m_new(StackType_t, *stack_size / sizeof(StackType_t));
thread_t *th = m_new_obj(thread_t);
mp_thread_mutex_lock(&thread_mutex, 1); mp_thread_mutex_lock(&thread_mutex, 1);
// create thread // create thread
StackType_t *stack = m_new(StackType_t, *stack_size / sizeof(StackType_t)); TaskHandle_t id = xTaskCreateStatic(freertos_entry, "Thread", *stack_size / sizeof(void*), arg, 2, stack, tcb);
StaticTask_t *task_buf = m_new(StaticTask_t, 1);
TaskHandle_t id = xTaskCreateStatic(freertos_entry, "Thread", *stack_size / sizeof(void*), arg, 2, stack, task_buf);
if (id == NULL) { if (id == NULL) {
mp_thread_mutex_unlock(&thread_mutex); mp_thread_mutex_unlock(&thread_mutex);
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "can't create thread")); nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "can't create thread"));
} }
// adjust stack_size to provide room to recover from hitting the limit
*stack_size -= 512;
// add thread to linked list of all threads // add thread to linked list of all threads
thread_t *th = m_new_obj(thread_t);
th->id = id; th->id = id;
th->ready = 0; th->ready = 0;
th->arg = arg; th->arg = arg;
@ -145,6 +144,9 @@ void mp_thread_create(void *(*entry)(void*), void *arg, size_t *stack_size) {
thread = th; thread = th;
mp_thread_mutex_unlock(&thread_mutex); mp_thread_mutex_unlock(&thread_mutex);
// adjust stack_size to provide room to recover from hitting the limit
*stack_size -= 512;
} }
void mp_thread_finish(void) { void mp_thread_finish(void) {