unix/mpthreadport: Add thread deinit code to stop threads on exit.
Free unused memory for threads and cancel any outstanding threads on interpreter exit to avoid possible segmentaiton fault.
This commit is contained in:
parent
c7ed17bc4b
commit
f8c1be85d1
@ -647,6 +647,10 @@ MP_NOINLINE int main_(int argc, char **argv) {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if MICROPY_PY_THREAD
|
||||||
|
mp_thread_deinit();
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(MICROPY_UNIX_COVERAGE)
|
#if defined(MICROPY_UNIX_COVERAGE)
|
||||||
gc_sweep_all();
|
gc_sweep_all();
|
||||||
#endif
|
#endif
|
||||||
|
@ -93,6 +93,19 @@ void mp_thread_init(void) {
|
|||||||
sigaction(SIGUSR1, &sa, NULL);
|
sigaction(SIGUSR1, &sa, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void mp_thread_deinit(void) {
|
||||||
|
pthread_mutex_lock(&thread_mutex);
|
||||||
|
while (thread->next != NULL) {
|
||||||
|
thread_t *th = thread;
|
||||||
|
thread = thread->next;
|
||||||
|
pthread_cancel(th->id);
|
||||||
|
free(th);
|
||||||
|
}
|
||||||
|
pthread_mutex_unlock(&thread_mutex);
|
||||||
|
assert(thread->id == pthread_self());
|
||||||
|
free(thread);
|
||||||
|
}
|
||||||
|
|
||||||
// This function scans all pointers that are external to the current thread.
|
// This function scans all pointers that are external to the current thread.
|
||||||
// It does this by signalling all other threads and getting them to scan their
|
// It does this by signalling all other threads and getting them to scan their
|
||||||
// own registers and stack. Note that there may still be some edge cases left
|
// own registers and stack. Note that there may still be some edge cases left
|
||||||
@ -127,6 +140,7 @@ void mp_thread_set_state(void *state) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void mp_thread_start(void) {
|
void mp_thread_start(void) {
|
||||||
|
pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
|
||||||
pthread_mutex_lock(&thread_mutex);
|
pthread_mutex_lock(&thread_mutex);
|
||||||
for (thread_t *th = thread; th != NULL; th = th->next) {
|
for (thread_t *th = thread; th != NULL; th = th->next) {
|
||||||
if (th->id == pthread_self()) {
|
if (th->id == pthread_self()) {
|
||||||
|
@ -29,4 +29,5 @@
|
|||||||
typedef pthread_mutex_t mp_thread_mutex_t;
|
typedef pthread_mutex_t mp_thread_mutex_t;
|
||||||
|
|
||||||
void mp_thread_init(void);
|
void mp_thread_init(void);
|
||||||
|
void mp_thread_deinit(void);
|
||||||
void mp_thread_gc_others(void);
|
void mp_thread_gc_others(void);
|
||||||
|
Loading…
Reference in New Issue
Block a user