Changeset 857 for trunk/server/lib/tdb/common/open.c

Timestamp:

Mar 18, 2014, 4:51:05 PM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: remove mutex sem and do it with a filelock

File:

• trunk/server/lib/tdb/common/open.c (modified) (7 diffs)

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

@@ -293 +293 @@
         }
 
-#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",
@@ -314 +309 @@
                 goto fail;      /* errno set by tdb_brlock */
         }
+
+#ifdef __OS2__
+        if (os2_crtActiveLock(tdb, name, 1, mode) != 0)
+                goto fail;
+#endif
 
         /* we need to zero database if we are the only one with it open */
@@ -476 +476 @@
 
 #ifdef __OS2__
-        DosCloseMutexSem(tdb->hActiveLock);
-        tdb->hActiveLock = 0;
+        close(tdb->hActiveLock);
+        tdb->hActiveLock = -1;
 #endif
         if (!tdb)
@@ -548 +548 @@
 
 #ifdef __OS2__
-        DosCloseMutexSem(tdb->hActiveLock);
-        tdb->hActiveLock = 0;
+        close(tdb->hActiveLock);
+        tdb->hActiveLock = -1;
 #endif
 
@@ -620 +620 @@
 
 #ifdef __OS2__
-        DosCloseMutexSem(tdb->hActiveLock);
-        tdb->hActiveLock = 0;
-
-        if (os2_crtSem(tdb, tdb->name, "tdb_reopen") != 0)
+        close(tdb->hActiveLock);
+        tdb->hActiveLock = -1;
+
+        if (os2_crtActiveLock(tdb, tdb->name, 0, 0) != 0)
                 goto fail;
 #endif
@@ -680 +680 @@
 }
 #ifdef __OS2__
-int os2_crtSem(struct tdb_context *tdb, const char *name, const char *caller)
+int os2_crtActiveLock(struct tdb_context *tdb, const char *name, const int truncate, const int mode)
 {
         // name could be null, so handle it
@@ -686 +686 @@
                 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));
+        char activeLockName[_MAX_PATH];
+        sprintf(activeLockName, "%s_AL", name);
+        tdb->hActiveLock = open(activeLockName, tdb->open_flags, mode);
+        if (tdb->hActiveLock == -1) {
+                TDB_LOG((tdb, TDB_DEBUG_ERROR, "os2_crtSem: cannot create activeLock %s called from %s\n",
+                        activeLockName, truncate?"tdb_open_ex":"tdb_reopen"));
                 errno = EINVAL;
                 return -1;
         }
+
+        if (truncate) { 
+                if (lseek(tdb->hActiveLock, 0, SEEK_SET) == -1)
+                        return -1;
+
+                if (ftruncate(tdb->hActiveLock, 0) == -1)
+                        return -1;
+
+                tdb_write_all(tdb->hActiveLock, "used for active lock\n", 21);
+        }
+
         return 0;
 }