fix various bugs and issues with alarm(2) 1. after 49/2 days, it is possible for a process at the head of the alarm list clearing its alarm with alarm(0) to stop processing of the alarm list for 49/2 days. 2. after 49/2 days, it is possible for processes clearing their alarm with alarm(0) to cause new timers to be inserted out-of-order. 3. it is possible for alarms to be delivered to a different process if the alarm kproc does not hold up-debug when checking the alarm. Reference: /n/atom/patch/applied/alarmnix Date: Fri Jan 3 03:34:30 CET 2014 Signed-off-by: quanstro@quanstro.net --- /sys/src/nix/port/alarm.c Fri Jan 3 03:34:17 2014 +++ /sys/src/nix/port/alarm.c Fri Jan 3 03:34:17 2014 @@ -16,20 +16,19 @@ for(;;){ now = sys->ticks; qlock(&alarms); - while((rp = alarms.head) && (long)(now - rp->alarm) >= 0){ - if(rp->alarm != 0L){ - if(canqlock(&rp->debug)){ - if(!waserror()){ - postnote(rp, 0, "alarm", NUser); - poperror(); - } - qunlock(&rp->debug); - rp->alarm = 0L; - }else - break; - } - alarms.head = rp->palarm; + for(rp = alarms.head; rp != nil; rp = rp->palarm){ + if(rp->alarm == 0) + continue; + if((long)(now - rp->alarm) < 0) + break; + if(canqlock(&rp->debug)) + break; + if(rp->alarm != 0) + postnote(rp, 0, "alarm", NUser); + rp->alarm = 0; + qunlock(&rp->debug); } + alarms.head = rp; qunlock(&alarms); sleep(&alarmr, return0, 0); @@ -48,7 +47,8 @@ p = alarms.head; now = sys->ticks; - if(p != nil && (long)(now - p->alarm) >= 0) + if(p != nil) + if(p->alarm == 0 || (long)(now - p->alarm) >= 0) wakeup(&alarmr); } @@ -79,23 +79,16 @@ } l = &f->palarm; } - up->palarm = 0; - if(alarms.head) { - l = &alarms.head; - for(f = *l; f; f = f->palarm) { - if((long)(f->alarm - when) >= 0) { - up->palarm = f; - *l = up; - goto done; - } - l = &f->palarm; - } - *l = up; + l = &alarms.head; + for(f = *l; f != nil; f = f->palarm) { + time = f->alarm; + if(time != 0 && (long)(time - when) >= 0) + break; + l = &f->palarm; } - else - alarms.head = up; -done: + up->palarm = f; + *l = up; up->alarm = when; qunlock(&alarms); --- /sys/src/nix/port/devproc.c Fri Jan 3 03:34:21 2014 +++ /sys/src/nix/port/devproc.c Fri Jan 3 03:34:23 2014 @@ -1252,8 +1252,10 @@ p->noteid = id; break; } + if(strcmp(p->user, "none") == 0 && !iseve()) + error(Eperm); for(i = 0; (t = psincref(i)) != nil; i++){ - if(t->state == Dead || t->noteid != id){ + if(t->state == Dead || t->kp || t->noteid != id){ psdecref(t); continue; }