sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

- make the recalculation of ev->maxfd a bit more efficient.

Browse Source 
- fix the case when we have no fd_events left on the event_context
  we now exit after doing the timed events and not block in select()
  waiting for no fd's to become ready...

metze
This commit is contained in:
Stefan Metzmacher 0001-01-01 00:00:00 +00:00
parent f3b917402a
commit 857e76ef6b
1 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/lib/events.c
View File

@ -118,6 +118,11 @@ static void calc_maxfd(struct event_context *ev)
} }
} }
/* to mark the ev->maxfd invalid
* this means we need to recalculate it
*/
#define EVENT_INVALID_MAXFD (-1)
/* /*
remove a fd based event remove a fd based event
the event to remove is matched by looking at the handler the event to remove is matched by looking at the handler
@ -132,8 +137,6 @@ BOOL event_remove_fd(struct event_context *ev, struct fd_event *e1)
e->fd == e1->fd && e->fd == e1->fd &&
e->handler == e1->handler) { e->handler == e1->handler) {
e->ref_count--; e->ref_count--;
/* possibly calculate the new maxfd */
calc_maxfd(ev);
return True; return True;
} }
} }
@ -151,7 +154,6 @@ void event_remove_fd_all(struct event_context *ev, int fd)
e->ref_count--; e->ref_count--;
} }
} }
calc_maxfd(ev);
} }
/* /*
@ -166,7 +168,6 @@ void event_remove_fd_all_handler(struct event_context *ev, void *handler)
e->ref_count--; e->ref_count--;
} }
} }
calc_maxfd(ev);
} }
@ -289,6 +290,9 @@ int event_loop_wait(struct event_context *ev)
struct fd_event *next = fe->next; struct fd_event *next = fe->next;
if (fe->ref_count == 0) { if (fe->ref_count == 0) {
DLIST_REMOVE(ev->fd_events, fe); DLIST_REMOVE(ev->fd_events, fe);
if (ev->maxfd == fe->fd) {
ev->maxfd = EVENT_INVALID_MAXFD;
}
free(fe); free(fe);
} else { } else {
if (fe->flags & EVENT_FD_READ) { if (fe->flags & EVENT_FD_READ) {
@ -316,13 +320,23 @@ int event_loop_wait(struct event_context *ev)
} }
} }
/* only do a select() if there're fd_events
* otherwise we would block for a the time in tval,
* and if there're no fd_events present anymore we want to
* leave the event loop directly
*/
if (ev->fd_events) {
/* we maybe need to recalculate the maxfd */
if (ev->maxfd == EVENT_INVALID_MAXFD) {
calc_maxfd(ev);
}
/* TODO: /* TODO:
* we don't use sys_select() as it isn't thread
we don't use sys_select() as it isn't thread * safe. We need to replace the magic pipe handling in
safe. We need to replace the magic pipe handling in * sys_select() with something in the events
sys_select() with something in the events * structure - for now just use select()
structure - for now just use select() */ */
selrtn = select(ev->maxfd+1, &r_fds, &w_fds, NULL, &tval); selrtn = select(ev->maxfd+1, &r_fds, &w_fds, NULL, &tval);
t = time(NULL); t = time(NULL);
@ -352,6 +366,7 @@ int event_loop_wait(struct event_context *ev)
} }
} }
} }
}
/* call any timed events that are now due */ /* call any timed events that are now due */
for (te=ev->timed_events;te;) { for (te=ev->timed_events;te;) {