Changeset 846 for trunk/server/lib/tdb/common/lock.c

Timestamp:

Feb 14, 2014, 3:12:09 PM (11 years ago)

Author:

Silvan Scherrer

Message:

samba server 3.6: adding mutex again for locks

File:

• trunk/server/lib/tdb/common/lock.c (modified) (3 diffs)

trunk/server/lib/tdb/common/lock.c

@@ -32 +32 @@
         tdb->interrupt_sig_ptr = ptr;
 }
+
+#ifdef __OS2__
+static int handle_mutex_lock(struct tdb_context *tdb, HMTX mutex, int rw, bool waitflag)
+{
+        ULONG   ulTimeout;
+        APIRET  rc;
+
+        if (mutex == 0) {
+                printf( "fcntl_lock: sem not initialised\n");
+                exit(1);
+        }
+
+        if (waitflag)
+                ulTimeout = SEM_INDEFINITE_WAIT;
+        else
+                ulTimeout = SEM_IMMEDIATE_RETURN;
+
+        switch (rw) {
+        case F_UNLCK:
+                rc = DosReleaseMutexSem(mutex);
+                break;
+        case F_RDLCK: // we never wait for a read lock, as several want to hold one 
+                rc = DosRequestMutexSem(mutex, SEM_IMMEDIATE_RETURN);
+                if (rc == ERROR_NOT_OWNER || ERROR_TIMEOUT)
+                        rc = NO_ERROR;
+                break;
+        case F_WRLCK:
+                rc = DosRequestMutexSem(mutex, ulTimeout);
+                break;
+        }
+
+        if (rc == NO_ERROR || rc == ERROR_SEM_OWNER_DIED)
+                return 0;
+
+        TDB_LOG((tdb, TDB_DEBUG_TRACE,"handle_mutex_lock: (fd=%d) rw_type=%d waitflag=%d (rc=%d)\n",
+                tdb->fd, rw, waitflag, rc));
+
+        errno = EINVAL;
+        return -1;
+}
+#endif
 
 static int fcntl_lock(struct tdb_context *tdb,
@@ -49 +90 @@
 
 #ifdef __OS2__
-        int cmd = 0;
-        if (waitflag)
-                cmd = F_SETLKW;
-        else
-                cmd = F_SETLK;
-
-        TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_lock in: (fd=%d) offset=%lld rw_type=%d len=%lld waitflag=%d\n",
-                 tdb->fd, off, rw, len, waitflag));
-
-        int rc = fcntl(tdb->fd, cmd, &fl);
-        // if the first lock doesn't work and it's a complete lock,
-        // we split it in 2 parts. first hash size*4 and then the rest
-        if (rc != 0 && off == FREELIST_TOP && len == 0) { 
-                fl.l_len = tdb->header.hash_size * 4;
+        int rc = 0;
+
+        if (off == ACTIVE_LOCK) {
+                rc = handle_mutex_lock(tdb, tdb->hActiveLock, rw, waitflag);
+        } else {
+                int cmd = 0;
+                if (waitflag)
+                        cmd = F_SETLKW;
+                else
+                        cmd = F_SETLK;
+
                 rc = fcntl(tdb->fd, cmd, &fl);
-                if (rc == 0) {
-                        fl.l_start = off + tdb->header.hash_size * 4;
-                        fl.l_len = LONG_MAX;
+                // if the first lock doesn't work and it's a complete lock,
+                // we split it in 2 parts. first hash size*4 and then the rest
+                if (rc != 0 && off == FREELIST_TOP && len == 0) { 
+                        fl.l_len = tdb->header.hash_size * 4;
                         rc = fcntl(tdb->fd, cmd, &fl);
-                }
-        }
+                        if (rc == 0) {
+                                fl.l_start = off + tdb->header.hash_size * 4;
+                                fl.l_len = LONG_MAX;
+                                rc = fcntl(tdb->fd, cmd, &fl);
+                        }
+                }
+        }
+
+        TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_lock: (fd=%d) offset=%lld rw_type=%d len=%lld waitflag=%d (rc=%d)\n",
+                tdb->fd, off, rw, len, waitflag, rc));
+
         return rc;
 #else
@@ -151 +199 @@
 
 #ifdef __OS2__
-        TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_unlock in: (fd=%d) offset=%lld rw_type=%d len=%lld\n",
-                 tdb->fd, off, rw, len));
-
-        int rc = fcntl(tdb->fd, F_SETLKW, &fl);
-        // if the first unlock doesn't work and it's a complete unlock,
-        // we split it in 2 parts. first hash size*4 and then the rest
-        // as it was locked that way as well. and it seems fcntl() doesn't care
-        if (rc != 0 && off == FREELIST_TOP && len == 0) { 
-                fl.l_len = tdb->header.hash_size * 4;
+        int rc = 0;
+        if (off == ACTIVE_LOCK) {
+                rc = handle_mutex_lock(tdb, tdb->hActiveLock, F_UNLCK, 1);
+        } else {
                 rc = fcntl(tdb->fd, F_SETLKW, &fl);
-                if (rc == 0) {
-                        fl.l_start = off + tdb->header.hash_size * 4;
-                        fl.l_len = LONG_MAX;
+                // if the first unlock doesn't work and it's a complete unlock,
+                // we split it in 2 parts. first hash size*4 and then the rest
+                // as it was locked that way as well. and it seems fcntl() doesn't care
+                if (rc != 0 && off == FREELIST_TOP && len == 0) { 
+                        fl.l_len = tdb->header.hash_size * 4;
                         rc = fcntl(tdb->fd, F_SETLKW, &fl);
-                }
-        }
+                        if (rc == 0) {
+                                fl.l_start = off + tdb->header.hash_size * 4;
+                                fl.l_len = LONG_MAX;
+                                rc = fcntl(tdb->fd, F_SETLKW, &fl);
+                        }
+                }
+        }
+
+        TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_unlock: (fd=%d) offset=%lld rw_type=%d len=%lld (rc=%d)\n",
+                 tdb->fd, off, rw, len, rc));
+
         return rc;
 #else