diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-03-19 21:52:27 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:18:42 -0500 |
| commit | 496dbdf4350ffc5f53c9f8f734d2c29b312ff11b (patch) | |
| tree | 5bd6688396dd585c4ecacab160b46bcb15496063 /source3/smbd/process.c | |
| parent | 3fdef9433a9e08064b32e34a16ce62a60ce144fb (diff) | |
| download | samba-496dbdf4350ffc5f53c9f8f734d2c29b312ff11b.tar.gz samba-496dbdf4350ffc5f53c9f8f734d2c29b312ff11b.tar.bz2 samba-496dbdf4350ffc5f53c9f8f734d2c29b312ff11b.zip | |
r21879: Move process_blocking_lock_queue to a timed event.
The idea is that we have blocking.c:brl_timeout as a timed
event that is present whenever we do have a blocking lock
pending. It fires brl_timeout_fn() which calls
process_blocking_lock_queue().
Whenever we make changes to blocking_lock_queue, we trigger
a recalc_brl_timeout() which sets a new brl_timout event if
necessary. This makes the call to
blocking_locks_timeout_ms() in setup_select_timeout()
unnecessary, this is implicitly done in
event_add_to_select_args() from the timed events.
Volker
(This used to be commit 7e31b8ce21de803ac1f8967967393341a3f44ac3)
Diffstat (limited to 'source3/smbd/process.c')
| -rw-r--r-- | source3/smbd/process.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index 6497dfa97b..59ad96d880 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -1259,7 +1259,7 @@ static int setup_select_timeout(void) { int select_timeout; - select_timeout = blocking_locks_timeout_ms(SMBD_SELECT_TIMEOUT*1000); + select_timeout = SMBD_SELECT_TIMEOUT*1000; if (print_notify_messages_pending()) { select_timeout = MIN(select_timeout, 1000); @@ -1402,12 +1402,6 @@ machine %s in domain %s.\n", global_myname(), lp_workgroup())); secrets_lock_trust_account_password(lp_workgroup(), False); } - /* - * Check to see if we have any blocking locks - * outstanding on the queue. - */ - process_blocking_lock_queue(); - /* update printer queue caches if necessary */ update_monitored_printq_cache(); |