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

Timestamp:

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

Author:

Silvan Scherrer

Message:

samba server 3.6: adding mutex again for locks

File:

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

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

@@ -292 +292 @@
                 goto internal;
         }
+
+#ifdef __OS2__
+        if (os2_crtSem(tdb, name, "tdb_open_ex") != 0)
+                goto fail;
+#endif
 
         if ((tdb->fd = open(name, open_flags, mode)) == -1) {
@@ -470 +475 @@
         { int save_errno = errno;
 
+#ifdef __OS2__
+        DosCloseMutexSem(tdb->hActiveLock);
+        tdb->hActiveLock = 0;
+#endif
         if (!tdb)
                 return NULL;
@@ -538 +547 @@
         }
 
+#ifdef __OS2__
+        DosCloseMutexSem(tdb->hActiveLock);
+        tdb->hActiveLock = 0;
+#endif
+
 #ifdef TDB_TRACE
         close(tdb->tracefd);
@@ -605 +619 @@
 #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
         /* We may still think we hold the active lock. */
         tdb->num_lockrecs = 0;
@@ -658 +679 @@
         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