Changeset 39 for trunk/samba/source/smbd/blocking.c

Timestamp:

May 27, 2007, 12:26:26 AM (18 years ago)

Author:

Paul Smedley

Message:

Upgrade source to 3.0.25a

File:

• trunk/samba/source/smbd/blocking.c (modified) (8 diffs)

trunk/samba/source/smbd/blocking.c

@@ -40 +40 @@
         SMB_BIG_UINT count;
         uint32 lock_pid;
+        uint32 blocking_pid; /* PID that blocks us. */
         enum brl_flavour lock_flav;
         enum brl_type lock_type;
@@ -87 +88 @@
                 enum brl_type lock_type,
                 enum brl_flavour lock_flav,
-                SMB_BIG_UINT offset, SMB_BIG_UINT count)
+                SMB_BIG_UINT offset,
+                SMB_BIG_UINT count,
+                uint32 blocking_pid)
 {
         static BOOL set_lock_msg;
@@ -128 +131 @@
         blr->lock_num = lock_num;
         blr->lock_pid = lock_pid;
+        blr->blocking_pid = blocking_pid;
         blr->lock_flav = lock_flav;
         blr->lock_type = lock_type;
@@ -143 +147 @@
                         lock_type == READ_LOCK ? PENDING_READ_LOCK : PENDING_WRITE_LOCK,
                         blr->lock_flav,
-                        lock_timeout ? True : False); /* blocking_lock. */
+                        lock_timeout ? True : False, /* blocking_lock. */
+                        NULL);
 
         if (!NT_STATUS_IS_OK(status)) {
@@ -381 +386 @@
                                 WINDOWS_LOCK,
                                 True,
-                                &status);
+                                &status,
+                                &blr->blocking_pid);
 
                 TALLOC_FREE(br_lck);
@@ -441 +447 @@
                                                 blr->lock_flav,
                                                 True,
-                                                &status);
+                                                &status,
+                                                &blr->blocking_pid);
         TALLOC_FREE(br_lck);
 
@@ -599 +606 @@
         unsigned int timeout_ms = default_timeout_ms;
         struct timeval tv_curr;
-        SMB_BIG_INT min_tv_dif_us = 0x7FFFFFFF; /* A large +ve number. */
+        SMB_BIG_INT min_tv_dif_us = default_timeout_ms * 1000;
         blocking_lock_record *blr = blocking_lock_queue;
 
@@ -613 +620 @@
 
                 if (timeval_is_zero(&blr->expire_time)) {
+                        /*
+                         * If we're blocked on pid 0xFFFFFFFF this is
+                         * a POSIX lock, so calculate a timeout of
+                         * 10 seconds.
+                         */
+                        if (blr->blocking_pid == 0xFFFFFFFF) {
+                                tv_dif_us = 10 * 1000 * 1000;
+                                min_tv_dif_us = MIN(min_tv_dif_us, tv_dif_us);
+                        }
                         continue; /* Never timeout. */
                 }