sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-04 05:18:06 +03:00
Code

r5123: fixed a bug in the timed events handling. It was possible for a timed

Browse Source 
event handler to trigger a free that could cause a timer to be
triggered twice. This changs fixes it properly by marking timer events
to be removed using a zero next_event time.

I also changed the default timeout for events.c to be infinite, so if
there are no events to handle then smbd will sit forever doing
nothing. That allows it to be swapped out completely when idle.
This commit is contained in:
Andrew Tridgell 2005-01-31 08:18:52 +00:00 committed by Gerald (Jerry) Carter
parent 984c737c1b
commit 0f1fb7017e
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/lib/events.c
View File

@ -221,7 +221,7 @@ int event_loop_once(struct event_context *ev)
fd_set r_fds, w_fds;
struct fd_event *fe;
struct loop_event *le;
struct timed_event *te;
struct timed_event *te, *te_next;
int selrtn;
struct timeval tval, t;
uint32_t destruction_count = ev->destruction_count;
@ -253,13 +253,24 @@ int event_loop_once(struct event_context *ev)
}
/* start with a reasonable max timeout */
tval.tv_sec = 600;
tval.tv_sec = 0;
tval.tv_usec = 0;
/* work out the right timeout for all timed events */
for (te=ev->timed_events;te;te=te->next) {
struct timeval tv = timeval_diff(&te->next_event, &t);
tval = timeval_min(&tv, &tval);
for (te=ev->timed_events;te;te=te_next) {
struct timeval tv;
te_next = te->next;
if (timeval_is_zero(&te->next_event)) {
talloc_free(te);
continue;
}
tv = timeval_diff(&te->next_event, &t);
if (timeval_is_zero(&tval)) {
tval = tv;
} else {
tval = timeval_min(&tv, &tval);
}
}
/* only do a select() if there're fd_events
@ -316,18 +327,14 @@ int event_loop_once(struct event_context *ev)
for (te=ev->timed_events;te;) {
struct timed_event *next = te->next;
if (timeval_compare(&te->next_event, &t) >= 0) {
te->next_event = timeval_zero();
te->handler(ev, te, t);
if (destruction_count != ev->destruction_count) {
break;
}
if (timeval_compare(&te->next_event, &t) >= 0) {
/* the handler didn't set a time for the
next event - remove the event */
talloc_free(te);
}
}
te = next;
}
}
return 0;
}

8
source/lib/time.c
View File

@ -401,6 +401,14 @@ struct timeval timeval_zero(void)
return tv;
}
/*
return True if a timeval is zero
*/
BOOL timeval_is_zero(struct timeval *tv)
{
return tv->tv_sec == 0 && tv->tv_usec == 0;
}
/*
return a timeval for the current time
*/