suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix race in place termination

Browse Source 
A place claimed to be done according to `place-wait` before its
clean-up actions ran, including flushing output ports. Fix the
order.
This commit is contained in:
Matthew Flatt 2013-12-27 11:06:22 -06:00
parent f6b8f734f3
commit 94771f16ed
1 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
racket/src/racket/src/place.c
View File

@ -2528,7 +2528,7 @@ void scheme_place_check_memory_use()
} }
} }
static void place_set_result(Scheme_Object *result) static void place_set_result(struct Scheme_Place_Object *place_obj, Scheme_Object *result)
/* always called as a place terminates */ /* always called as a place terminates */
{ {
intptr_t status; intptr_t status;
@ -2540,22 +2540,31 @@ static void place_set_result(Scheme_Object *result)
} else } else
status = 0; status = 0;
mzrt_mutex_lock(place_object->lock); mzrt_mutex_lock(place_obj->lock);
place_object->result = status; place_obj->result = status;
scheme_signal_received_at(place_object->parent_signal_handle); scheme_signal_received_at(place_obj->parent_signal_handle);
place_object->parent_signal_handle = NULL; place_obj->parent_signal_handle = NULL;
place_object->signal_handle = NULL; place_obj->signal_handle = NULL;
place_object->dead = 1; place_obj->dead = 1;
mzrt_mutex_unlock(place_object->lock); mzrt_mutex_unlock(place_obj->lock);
} }
static void terminate_current_place() static void terminate_current_place(Scheme_Object *result)
{ {
intptr_t place_obj_die; intptr_t place_obj_die;
intptr_t refcount; intptr_t refcount;
Scheme_Place_Object *place_obj; Scheme_Place_Object *place_obj;
place_obj = place_object; place_obj = place_object;
place_object = NULL;
/*printf("Leavin place: proc thread id%u\n", ptid);*/
/* Beware that the destroy operation might trigger a GC to cooperate
with the master GC: */
scheme_place_instance_destroy(place_obj_die);
place_set_result(place_obj, result);
mzrt_mutex_lock(place_obj->lock); mzrt_mutex_lock(place_obj->lock);
@ -2567,23 +2576,13 @@ static void terminate_current_place()
if (!refcount) if (!refcount)
destroy_place_object_locks(place_obj); destroy_place_object_locks(place_obj);
place_object = NULL;
/*printf("Leavin place: proc thread id%u\n", ptid);*/
/* Beware that the destroy operation might trigger a GC to cooperate
with the master GC: */
scheme_place_instance_destroy(place_obj_die);
} }
static Scheme_Object *def_place_exit_handler_proc(int argc, Scheme_Object *argv[]) static Scheme_Object *def_place_exit_handler_proc(int argc, Scheme_Object *argv[])
{ {
scheme_log(NULL, SCHEME_LOG_DEBUG, 0, "place %d: exiting via (exit)", scheme_current_place_id); scheme_log(NULL, SCHEME_LOG_DEBUG, 0, "place %d: exiting via (exit)", scheme_current_place_id);
place_set_result(argv[0]); terminate_current_place(argv[0]);
terminate_current_place();
mz_proc_thread_exit(NULL); mz_proc_thread_exit(NULL);
@ -2620,7 +2619,7 @@ static void *place_start_proc_after_stack(void *data_arg, void *stack_base) {
Place_Start_Data *place_data; Place_Start_Data *place_data;
Scheme_Place_Object *place_obj; Scheme_Place_Object *place_obj;
Scheme_Object *place_main; Scheme_Object *place_main;
Scheme_Object *a[2], *channel; Scheme_Object *a[2], *channel, *result;
intptr_t mem_limit; intptr_t mem_limit;
place_data = (Place_Start_Data *) data_arg; place_data = (Place_Start_Data *) data_arg;
@ -2728,14 +2727,14 @@ static void *place_start_proc_after_stack(void *data_arg, void *stack_base) {
} }
p->error_buf = saved_error_buf; p->error_buf = saved_error_buf;
place_set_result(rc); result = rc;
} else { } else {
place_set_result(scheme_make_integer(1)); result = scheme_make_integer(1);
} }
scheme_log(NULL, SCHEME_LOG_DEBUG, 0, "place %d: exiting", scheme_current_place_id); scheme_log(NULL, SCHEME_LOG_DEBUG, 0, "place %d: exiting", scheme_current_place_id);
terminate_current_place(); terminate_current_place(result);
return NULL; return NULL;
} }