d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When more than one timer is expired at once, allow for the possibility

Browse Source 
that the first timer ends up doing a timer_Stop() on the second.

When this happens, remove the timer from the pending list so that
we still call any subsequent timers.

This bug has been here for several years, but has only been tickled
recently with my device layering changes.

With enormous thanks for the perseverance of: Ruslan Ermilov <ru@ucb.crimea.ua>
This commit is contained in:
Brian Somers 1999-10-15 20:44:34 +00:00
parent d4d5d2f881
commit c2e1f0e3d7
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
usr.sbin/ppp/timer.c
View File

@ -35,7 +35,7 @@
#include "descriptor.h"
#include "prompt.h"
static struct pppTimer *TimerList = NULL;
static struct pppTimer *TimerList = NULL, *ExpiredList = NULL;
static void StopTimerNoBlock(struct pppTimer *);
@ -117,14 +117,14 @@ StopTimerNoBlock(struct pppTimer *tp)
* A STOPPED timer isn't in any list, but may have a bogus [e]next field.
* An EXPIRED timer is in the ->enext list.
*/
if (tp->state != TIMER_RUNNING) {
tp->next = NULL;
tp->state = TIMER_STOPPED;
if (tp->state == TIMER_STOPPED)
return;
}
pt = NULL;
for (t = TimerList; t != tp && t != NULL; t = t->next)
pt = t;
if (t) {
if (pt) {
pt->next = t->next;
@ -135,10 +135,22 @@ StopTimerNoBlock(struct pppTimer *tp)
}
if (t->next)
t->next->rest += tp->rest;
} else
log_Printf(LogERROR, "Oops, %s timer not found!!\n", tp->name);
} else {
/* Search for any pending expired timers */
pt = NULL;
for (t = ExpiredList; t != tp && t != NULL; t = t->enext)
pt = t;
tp->next = NULL;
if (t) {
if (pt)
pt->enext = t->enext;
else
ExpiredList = t->enext;
} else if (tp->state == TIMER_RUNNING)
log_Printf(LogERROR, "Oops, %s timer not found!!\n", tp->name);
}
tp->next = tp->enext = NULL;
tp->state = TIMER_STOPPED;
}
@ -178,11 +190,11 @@ TimerService(void)
/* Process all expired timers */
while (exp) {
next = exp->enext;
ExpiredList = exp->enext;
exp->enext = NULL;
if (exp->func)
(*exp->func)(exp->arg);
exp = next;
exp = ExpiredList;
}
}
}