diff options
| author | Jeremy Allison <jra@samba.org> | 2010-12-22 14:52:50 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-12-23 01:08:11 +0100 |
| commit | 30d29e64cb5e0f1360ff47dd6d074d25fa86e5fd (patch) | |
| tree | 3c3d56a56b041ea869c4e750b59641e9f3495059 /source3/nmbd/nmbd_packets.c | |
| parent | 03b8b8e19952c40eb3eb22e16e7fbae4073b7b4b (diff) | |
| download | samba-30d29e64cb5e0f1360ff47dd6d074d25fa86e5fd.tar.gz samba-30d29e64cb5e0f1360ff47dd6d074d25fa86e5fd.tar.bz2 samba-30d29e64cb5e0f1360ff47dd6d074d25fa86e5fd.zip | |
All calls to event_add_to_select_args() call GetTimeOfDay() and
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
Diffstat (limited to 'source3/nmbd/nmbd_packets.c')
| -rw-r--r-- | source3/nmbd/nmbd_packets.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c index 401eb25267..c6bb205f2d 100644 --- a/source3/nmbd/nmbd_packets.c +++ b/source3/nmbd/nmbd_packets.c @@ -1881,11 +1881,8 @@ bool listen_for_packets(bool run_election) timeout.tv_sec = (run_election||num_response_packets) ? 1 : NMBD_SELECT_LOOP; timeout.tv_usec = 0; - { - struct timeval now = timeval_current(); - event_add_to_select_args(nmbd_event_context(), &now, - &r_fds, &w_fds, &timeout, &maxfd); - } + event_add_to_select_args(nmbd_event_context(), + &r_fds, &w_fds, &timeout, &maxfd); selrtn = sys_select(maxfd+1,&r_fds,&w_fds,NULL,&timeout); |