Changeset 370 for branches/samba-3.3.x/source/smbd/blocking.c

Timestamp:

Jan 15, 2010, 8:23:30 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.10 (source)

File:

• branches/samba-3.3.x/source/smbd/blocking.c (modified) (8 diffs)

branches/samba-3.3.x/source/smbd/blocking.c

@@ -95 +95 @@
 
 /****************************************************************************
+ We need a version of timeval_min that treats zero timval as infinite.
+****************************************************************************/
+
+static struct timeval timeval_brl_min(const struct timeval *tv1,
+                                        const struct timeval *tv2)
+{
+        if (timeval_is_zero(tv1)) {
+                return *tv2;
+        }
+        if (timeval_is_zero(tv2)) {
+                return *tv1;
+        }
+        return timeval_min(tv1, tv2);
+}
+
+/****************************************************************************
  After a change to blocking_lock_queue, recalculate the timed_event for the
  next processing.
@@ -117 +133 @@
                         if (brl->blocking_pid == 0xFFFFFFFF) {
                                 struct timeval psx_to = timeval_current_ofs(10, 0);
-                                next_timeout = timeval_min(&next_timeout, &psx_to);
+                                next_timeout = timeval_brl_min(&next_timeout, &psx_to);
                         }
 
@@ -123 +139 @@
                 }
 
-                if (timeval_is_zero(&next_timeout)) {
-                        next_timeout = brl->expire_time;
-                }
-                else {
-                        next_timeout = timeval_min(&next_timeout,
-                                                   &brl->expire_time);
-                }
+                next_timeout = timeval_brl_min(&next_timeout, &brl->expire_time);
         }
 
@@ -687 +697 @@
         struct timeval tv_curr = timeval_current();
         blocking_lock_record *blr, *next = NULL;
-        bool recalc_timeout = False;
 
         /*
@@ -737 +746 @@
                         DLIST_REMOVE(blocking_lock_queue, blr);
                         free_blocking_lock_record(blr);
-                        recalc_timeout = True;
                         continue;
                 }
@@ -762 +770 @@
                         DLIST_REMOVE(blocking_lock_queue, blr);
                         free_blocking_lock_record(blr);
-                        recalc_timeout = True;
                         change_to_root_user();
                         continue;
@@ -788 +795 @@
                         DLIST_REMOVE(blocking_lock_queue, blr);
                         free_blocking_lock_record(blr);
-                        recalc_timeout = True;
                         change_to_root_user();
                         continue;
@@ -824 +830 @@
                         DLIST_REMOVE(blocking_lock_queue, blr);
                         free_blocking_lock_record(blr);
-                        recalc_timeout = True;
-                }
-        }
-
-        if (recalc_timeout) {
-                recalc_brl_timeout();
-        }
+                }
+        }
+
+        recalc_brl_timeout();
 }