Changeset 847

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

Location:

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

Files:

• io.c (modified) (2 diffs)
• lock.c (modified) (4 diffs)
• open.c (modified) (5 diffs)
• tdb_private.h (modified) (2 diffs)

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

@@ -91 +91 @@
 
 #ifdef __OS2__
-        // YD we must upgrade read locks to write locks (exclusive), otherwise
+        // YD we must upgrade read locks to write locks (exclusive), as otherwise
         // the owner (us) is not allowed to write to the file (different from unix)
         // if a wider previous lock is in effect, we cannot write lock our segment
         // (e.g. a lock_upgrade locks all the file), so we hope the previous lock 
         // is a write lock: do not wait for lock.
-        int upgradeLockRC = tdb_brlock( tdb, off, F_WRLCK, F_SETLK, 0, len);
+        // so this is what we try here:
+        // 1. add a write lock and see if it works
+        // 2. if the write lock wasn't set, we try to unlock the segment
+        //    first and add the write lock afterwards 
+        int upgradeLockRC = 0;
+        upgradeLockRC = tdb_brlock( tdb, off, F_WRLCK, F_SETLK, 0, len);
+        if (upgradeLockRC != 0) {
+                tdb_brlock(tdb, off, F_UNLCK, F_SETLK, 0, len);
+                upgradeLockRC = tdb_brlock(tdb, off, F_WRLCK, F_SETLK, 0, len);
+        }
         TDB_LOG((tdb, TDB_DEBUG_TRACE,"upgrading lock at %d len=%d "
                 "before writing %s (rc=%d).\n", off, len,
-                 upgradeLockRC ? "was successfull":"failed", upgradeLockRC));
+                 upgradeLockRC ? "failed":"was successfull", upgradeLockRC));
 #endif
 
@@ -137 +146 @@
 
 #ifdef __OS2__ // remove our lock, if upgrade succeded
-                        if (upgradeLockRC == 0)
-                                tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, len);
+        if (upgradeLockRC == 0)
+                tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, len);
 #endif
 

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;

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

@@ -231 +231 @@
         }
 
+#ifdef __OS2__
+        if (os2_crtSem(tdb, name, "tdb_open_ex") != 0)
+                goto fail;
+#endif
+
         if ((tdb->fd = open(name, open_flags, mode)) == -1) {
                 TDB_LOG((tdb, TDB_DEBUG_WARNING, "tdb_open_ex: could not open file %s: %s\n",
@@ -367 +372 @@
         { int save_errno = errno;
 
+#ifdef __OS2__
+        DosCloseMutexSem(tdb->hActiveLock);
+        tdb->hActiveLock = 0;
+#endif
         if (!tdb)
                 return NULL;
@@ -434 +443 @@
         }
 
+#ifdef __OS2__
+        DosCloseMutexSem(tdb->hActiveLock);
+        tdb->hActiveLock = 0;
+#endif
+
 #ifdef TDB_TRACE
         close(tdb->tracefd);
@@ -500 +514 @@
         tdb_mmap(tdb);
 #endif /* fake pread or pwrite */
+
+#ifdef __OS2__
+        DosCloseMutexSem(tdb->hActiveLock);
+        tdb->hActiveLock = 0;
+
+        if (os2_crtSem(tdb, tdb->name, "tdb_reopen") != 0)
+                goto fail;
+#endif
 
         if (active_lock &&
@@ -551 +573 @@
         return 0;
 }
+#ifdef __OS2__
+int os2_crtSem(struct tdb_context *tdb, const char *name, const char *caller)
+{
+        // name could be null, so handle it
+        if (name == NULL)
+                return -1;
+
+        char    szSem[_MAX_PATH];
+        char    drive[_MAX_DRIVE], dir[_MAX_DIR];
+        char    fname[_MAX_FNAME], ext[_MAX_EXT];
+        APIRET  rc;
+        // extract path info
+        _splitpath(name, drive, dir, fname, ext);
+        sprintf(szSem, "\\SEM32\\TDB_AL_%s%s%s", dir, fname, ext);
+        rc = DosCreateMutexSem(szSem, &tdb->hActiveLock, 0, FALSE);
+        if (rc == ERROR_DUPLICATE_NAME)
+                rc = DosOpenMutexSem(szSem, &tdb->hActiveLock);
+        if (rc != NO_ERROR) {
+                TDB_LOG((tdb, TDB_DEBUG_ERROR, "os2_crtSem: cannot create sem32 %s (rc=%d) called from %s\n",
+                        szSem, rc, caller));
+                errno = EINVAL;
+                return -1;
+        }
+        return 0;
+} 
+#endif

branches/samba-3.5.x/lib/tdb/common/tdb_private.h

@@ -23 +23 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
+#ifdef __OS2__
+#define INCL_ERRORS
+#define INCL_DOS
+#include <os2.h>
+#endif
 
 #include "replace.h"
@@ -204 +209 @@
 #endif
         volatile sig_atomic_t *interrupt_sig_ptr;
+#ifdef __OS2__
+        HMTX    hActiveLock;
+#endif
 };