Changeset 105 for branches/samba-3.0/source/tdb/common

Timestamp:

Nov 26, 2007, 9:24:27 AM (18 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.27a

Location:

branches/samba-3.0/source/tdb/common

Files:

• lock.c (modified) (2 diffs)
• tdb_private.h (modified) (2 diffs)

branches/samba-3.0/source/tdb/common/lock.c

@@ -131 +131 @@
 #endif
 
+void tdb_setalarm_sigptr(struct tdb_context *tdb, volatile sig_atomic_t *ptr)
+{
+        tdb->interrupt_sig_ptr = ptr;
+}
+
 /* a byte range locking function - return 0 on success
    this functions locks/unlocks 1 byte at the specified offset.
@@ -264 +269 @@
         do {
                 ret = fcntl(tdb->fd,lck_type,&fl);
+
+                /* Check for a sigalarm break. */
+                if (ret == -1 && errno == EINTR &&
+                                tdb->interrupt_sig_ptr &&
+                                *tdb->interrupt_sig_ptr) {
+                        break;
+                }
         } while (ret == -1 && errno == EINTR);
 

branches/samba-3.0/source/tdb/common/tdb_private.h

@@ -36 +36 @@
 #include "system/shmem.h"
 #include "system/select.h"
+#include "system/wait.h"
 #include "tdb.h"
 
@@ -177 +178 @@
         int page_size;
         int max_dead_records;
+        volatile sig_atomic_t *interrupt_sig_ptr;
 #ifdef __OS2__
         HMTX    hGlobalLock;