sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-21 12:23:50 +03:00
Code Activity

r15084: Try and squeeze more out of the non-read/write code path.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison
2006-04-14 03:55:42 +00:00
committed by Gerald (Jerry) Carter
parent 1c99aed563
commit 23dcff4d50
3 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source/smbd/process.c
View File

@@ -357,7 +357,7 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
{
fd_set fds;
int selrtn;
struct timeval to = timeval_set(SMBD_SELECT_TIMEOUT, 0);
struct timeval to;
int maxfd = 0;
smb_read_error = 0;
@@ -367,6 +367,9 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
if (timeout >= 0) {
to.tv_sec = timeout / 1000;
to.tv_usec = (timeout % 1000) * 1000;
} else {
to.tv_sec = SMBD_SELECT_TIMEOUT;
to.tv_usec = 0;
}
/*
@@ -441,14 +444,20 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
goto again;
}
/*
* Are there any timed events waiting ? If so, ensure we don't
* select for longer than it would take to wait for them.
*/
{
struct timeval tmp;
struct timeval *tp = get_timed_events_timeout(&tmp,SMBD_SELECT_TIMEOUT);
struct timeval *tp = get_timed_events_timeout(&tmp);
if (tp) {
to = timeval_min(&to, tp);
if (timeval_is_zero(&to)) {
return True;
/* Process a timed event now... */
run_events();
}
}
}