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

Fix place-channel place-object race condition

Browse Source
This commit is contained in:
Kevin Tew 2011-07-07 15:15:56 -06:00
parent 5d66e52fcc
commit 8ed62b715b
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2138,8 +2138,16 @@ static void place_async_send(Scheme_Place_Async_Channel *ch, Scheme_Object *uo)
if (!cnt && ch->wakeup_signal) { if (!cnt && ch->wakeup_signal) {
/*wake up possibly sleeping single receiver */ /*wake up possibly sleeping single receiver */
if (SCHEME_PLACE_OBJECTP(ch->wakeup_signal)) if (SCHEME_PLACE_OBJECTP(ch->wakeup_signal)) {
scheme_signal_received_at(((Scheme_Place_Object *) ch->wakeup_signal)->signal_handle); Scheme_Place_Object *place_obj;
place_obj = ((Scheme_Place_Object *) ch->wakeup_signal);
mzrt_mutex_lock(place_obj->lock);
if (place_obj->signal_handle) {
scheme_signal_received_at(place_obj->signal_handle);
}
mzrt_mutex_unlock(place_obj->lock);
}
/*wake up possibly sleeping multiple receiver */ /*wake up possibly sleeping multiple receiver */
else if (SCHEME_VECTORP(ch->wakeup_signal)) { else if (SCHEME_VECTORP(ch->wakeup_signal)) {
Scheme_Object *v = ch->wakeup_signal; Scheme_Object *v = ch->wakeup_signal;
@ -2149,12 +2157,16 @@ static void place_async_send(Scheme_Place_Async_Channel *ch, Scheme_Object *uo)
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
Scheme_Place_Object *o3; Scheme_Place_Object *o3;
o3 = (Scheme_Place_Object *)SCHEME_VEC_ELS(v)[i]; o3 = (Scheme_Place_Object *)SCHEME_VEC_ELS(v)[i];
if (o3 && o3->signal_handle != NULL) { if (o3) {
scheme_signal_received_at(o3->signal_handle); mzrt_mutex_lock(o3->lock);
alive++; if (o3->signal_handle != NULL) {
scheme_signal_received_at(o3->signal_handle);
alive++;
}
else
SCHEME_VEC_ELS(v)[i] = NULL;
mzrt_mutex_unlock(o3->lock);
} }
else
SCHEME_VEC_ELS(v)[i] = NULL;
} }
/* shrink if more than half are unused */ /* shrink if more than half are unused */
if (alive < (size / 2)) { if (alive < (size / 2)) {