Changeset 847 for branches/samba-3.5.x/lib/tdb/common/lock.c

Timestamp:

Feb 14, 2014, 7:01:54 PM (11 years ago)

Author:

Silvan Scherrer

Message:

samba server 3.5: bring 3.5 code base in line with 3.6

File:

• branches/samba-3.5.x/lib/tdb/common/lock.c (modified) (4 diffs)

branches/samba-3.5.x/lib/tdb/common/lock.c

@@ -36 +36 @@
 }
 
+#ifdef __OS2__
+static int handle_mutex_lock(struct tdb_context *tdb, HMTX mutex, int rw, int waitflag)
+{
+        ULONG   ulTimeout;
+        APIRET  rc;
+
+        if (mutex == 0) {
+                printf( "fcntl_lock: sem not initialised\n");
+                exit(1);
+        }
+
+        if (waitflag == F_SETLKW)
+                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
+
 /* a byte range locking function - return 0 on success
    this functions locks/unlocks 1 byte at the specified offset.
@@ -70 +111 @@
         fl.l_pid = 0;
 
+#ifdef __OS2__
+        TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_brlock: (fd=%d) offset=%d rw_type=%d len=%d lock_type=%d\n",
+                tdb->fd, offset, rw_type, len, lck_type));
+
+        if (offset == ACTIVE_LOCK) {
+                ret = handle_mutex_lock(tdb, tdb->hActiveLock, rw_type, lck_type);
+        } else {
+
+#endif
         do {
                 ret = fcntl(tdb->fd,lck_type,&fl);
@@ -81 +131 @@
         } while (ret == -1 && errno == EINTR);
 
+#ifdef __OS2__
+        }
+#endif
         if (ret == -1) {
                 tdb->ecode = TDB_ERR_LOCK;
@@ -109 +162 @@
                 struct timeval tv;
 
+#ifdef __OS2__
+                // we need to remove locks, as upgrade doesn't work
+                tdb_brlock(tdb, offset, F_UNLCK, F_SETLK, 1, len);
+#endif
                 if (tdb_brlock(tdb, offset, F_WRLCK, F_SETLKW, 1, len) == 0) {
                         return 0;