From 6929f0a986a919aa1280ae8e79745d475f5b770c Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Fri, 3 Jan 2014 02:16:18 +0100 Subject: [PATCH] kernel: simplify procalarm() --- sys/src/9/port/alarm.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/sys/src/9/port/alarm.c b/sys/src/9/port/alarm.c index 320b66e60..bd834cecc 100644 --- a/sys/src/9/port/alarm.c +++ b/sys/src/9/port/alarm.c @@ -83,24 +83,15 @@ procalarm(ulong time) } l = &f->palarm; } - - up->palarm = 0; - if(alarms.head) { - l = &alarms.head; - for(f = *l; f; f = f->palarm) { - time = f->alarm; - if(time != 0 && (long)(time - when) >= 0) { - up->palarm = f; - *l = up; - goto done; - } - l = &f->palarm; - } - *l = up; + l = &alarms.head; + for(f = *l; f; 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);