diff options
| author | Jeremy Allison <jra@samba.org> | 1999-01-07 19:21:56 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1999-01-07 19:21:56 +0000 |
| commit | 6ad70f0d9202f00df714f36edfbddb99d2bba83c (patch) | |
| tree | 6d1f427a1ecf89f4a605a9f9638a5a2b5efdc88b /source/include | |
| parent | de3999f8e79c7e137dea7e070d599a57bde38f82 (diff) | |
| download | samba-6ad70f0d9202f00df714f36edfbddb99d2bba83c.tar.gz samba-6ad70f0d9202f00df714f36edfbddb99d2bba83c.tar.xz samba-6ad70f0d9202f00df714f36edfbddb99d2bba83c.zip | |
Removed 'counter' from timeout processing. Timeouts now depend on actual
time calculations, not by incrementing a counter.
The select timeout is set to the old (lower) value of 10 seconds if there
are blocking locks pending, and to the newer 60 second value if not.
Jeremy.
Diffstat (limited to 'source/include')
| -rw-r--r-- | source/include/local.h | 3 | ||||
| -rw-r--r-- | source/include/proto.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/source/include/local.h b/source/include/local.h index cdff63aa8e5..7a444a8b247 100644 --- a/source/include/local.h +++ b/source/include/local.h @@ -129,7 +129,8 @@ #define SMBD_RELOAD_CHECK (180) #define IDLE_CLOSED_TIMEOUT (60) #define DPTR_IDLE_TIMEOUT (120) -#define SMBD_SELECT_LOOP (60) +#define SMBD_SELECT_TIMEOUT (60) +#define SMBD_SELECT_TIMEOUT_WITH_PENDING_LOCKS (10) #define NMBD_SELECT_LOOP (10) #define BROWSE_INTERVAL (60) #define REGISTRATION_INTERVAL (10*60) diff --git a/source/include/proto.h b/source/include/proto.h index 1f4f522ac77..f357a5b1926 100644 --- a/source/include/proto.h +++ b/source/include/proto.h @@ -2261,6 +2261,7 @@ void rpcclient_init(void); BOOL push_blocking_lock_request( char *inbuf, int length, int lock_timeout, int lock_num); void remove_pending_lock_requests_by_fid(files_struct *fsp); void remove_pending_lock_requests_by_mid(int mid); +BOOL blocking_locks_pending(void); void process_blocking_lock_queue(time_t t); /*The following definitions come from smbd/chgpasswd.c */ |