o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix race.

Browse source
This commit is contained in:
rsc 2004-05-20 21:39:24 +00:00
parent 52aeb2f9b9
commit 1c39bb5919
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/lib9/rendez-signal.c
View file

@ -45,6 +45,7 @@ struct Vous
Vous *link; Vous *link;
Lock lk; Lock lk;
int pid; int pid;
int wakeup;
ulong val; ulong val;
ulong tag; ulong tag;
}; };
@ -149,8 +150,20 @@ rendezvous(ulong tag, ulong val)
sigaddset(&mask, SIGUSR1); sigaddset(&mask, SIGUSR1);
sigprocmask(SIG_SETMASK, &mask, NULL); sigprocmask(SIG_SETMASK, &mask, NULL);
sigdelset(&mask, SIGUSR1); sigdelset(&mask, SIGUSR1);
v->wakeup = 0;
unlock(&v->lk); unlock(&v->lk);
sigsuspend(&mask); for(;;){
/*
* There may well be random signals flying around,
* so we can't be sure why we woke up. If we weren't
* properly awakened, we need to go back to sleep.
*/
sigsuspend(&mask);
lock(&v->lk); /* do some memory synchronization */
unlock(&v->lk);
if(v->wakeup == 1)
break;
}
rval = v->val; rval = v->val;
if(DBG)fprint(2, "pid is %d, awake\n", me); if(DBG)fprint(2, "pid is %d, awake\n", me);
putvous(v); putvous(v);
@ -169,6 +182,7 @@ rendezvous(ulong tag, ulong val)
lock(&v->lk); lock(&v->lk);
rval = v->val; rval = v->val;
v->val = val; v->val = val;
v->wakeup = 1;
unlock(&v->lk); unlock(&v->lk);
if(kill(vpid, SIGUSR1) < 0){ if(kill(vpid, SIGUSR1) < 0){
if(DBG)fprint(2, "pid is %d, kill %d failed: %r\n", me, vpid); if(DBG)fprint(2, "pid is %d, kill %d failed: %r\n", me, vpid);