sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-03 04:22:09 +03:00
Code Activity

All calls to event_add_to_select_args() call GetTimeOfDay() and

Browse Source 
pass this in as the &now parameter. Push this call inside of
event_add_to_select_args() to the correct point so it doesn't
get called unless needed.

Jeremy.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Dec 23 01:08:11 CET 2010 on sn-devel-104
This commit is contained in:
Jeremy Allison
2010-12-22 14:52:50 -08:00
parent 03b8b8e199
commit 30d29e64cb
5 changed files with 10 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source3/lib/events.c
View File

@ -27,10 +27,10 @@
*/
bool event_add_to_select_args(struct tevent_context *ev,
const struct timeval *now,
fd_set *read_fds, fd_set *write_fds,
struct timeval *timeout, int *maxfd)
{
struct timeval now;
struct tevent_fd *fde;
struct timeval diff;
bool ret = false;
@ -60,7 +60,8 @@ bool event_add_to_select_args(struct tevent_context *ev,
return ret;
}
diff = timeval_until(now, &ev->timer_events->next_event);
now = timeval_current();
diff = timeval_until(&now, &ev->timer_events->next_event);
*timeout = timeval_min(timeout, &diff);
return true;
@ -167,7 +168,7 @@ struct timeval *get_timed_events_timeout(struct tevent_context *ev,
static int s3_event_loop_once(struct tevent_context *ev, const char *location)
{
struct timeval now, to;
struct timeval to;
fd_set r_fds, w_fds;
int maxfd = 0;
int ret = 0;
@ -182,9 +183,7 @@ static int s3_event_loop_once(struct tevent_context *ev, const char *location)
return 0;
}
GetTimeOfDay(&now);
if (!event_add_to_select_args(ev, &now, &r_fds, &w_fds, &to, &maxfd)) {
if (!event_add_to_select_args(ev, &r_fds, &w_fds, &to, &maxfd)) {
return -1;
}