Skip to content

C
cpython
Kaydet (Commit) 385e7c69 authored tarafından Guido van Rossum's avatar Guido van Rossum
Dosyalara gözat
Seçenekler

implement exit_thread through SystemExit exception

üst fbd30e91
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
Modules/threadmodule.c
Dosyayı görüntüle @ 385e7c69
...@@ -200,8 +200,12 @@ t_bootstrap(args_raw) ...@@ -200,8 +200,12 @@ t_bootstrap(args_raw)
res = call_object(func, arg); res = call_object(func, arg);
DECREF(args); /* Matches the INCREF(args) in thread_start_new_thread */ DECREF(args); /* Matches the INCREF(args) in thread_start_new_thread */
if (res == NULL) { if (res == NULL) {
fprintf(stderr, "Unhandled exception in thread:\n"); if (err_occurred() == SystemExit)
print_error(); /* From pythonmain.c */ err_clear();
else {
fprintf(stderr, "Unhandled exception in thread:\n");
print_error(); /* From pythonmain.c */
}
} }
else else
DECREF(res); DECREF(res);
...@@ -236,13 +240,10 @@ thread_exit_thread(self, args) ...@@ -236,13 +240,10 @@ thread_exit_thread(self, args)
object *self; /* Not used */ object *self; /* Not used */
object *args; object *args;
{ {
object *frame;
if (!getnoarg(args)) if (!getnoarg(args))
return NULL; return NULL;
frame = save_thread(); /* Should never be NULL */ err_set(SystemExit);
DECREF(frame); return NULL;
exit_thread();
for (;;) { } /* Should not be reached */
} }
#ifndef NO_EXIT_PROG #ifndef NO_EXIT_PROG
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment