Changeset 10 for trunk/samba-3.0.25pre1/source/tdb/common/open.c

Timestamp:

Mar 25, 2007, 1:33:05 PM (18 years ago)

Author:

Yuri Dario

Message:

Rewrote of locking code, closes ticket:4.

File:

• trunk/samba-3.0.25pre1/source/tdb/common/open.c (modified) (11 diffs)

trunk/samba-3.0.25pre1/source/tdb/common/open.c

@@ -160 +160 @@
         tdb->hash_fn = hash_fn ? hash_fn : default_tdb_hash;
 
+#ifdef __OS2__
+        if (!(tdb->flags & TDB_INTERNAL))
+        {
+                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_GL_%s%s%s", dir, fname, ext);
+                rc = DosCreateMutexSem( szSem, &tdb->hGlobalLock, 0, FALSE);
+                if (rc == ERROR_DUPLICATE_NAME)
+                        rc = DosOpenMutexSem( szSem, &tdb->hGlobalLock);
+                if (rc != NO_ERROR) {
+                        printf( "cannot open %s %d\n", szSem, rc);
+                        errno = EINVAL;
+                        goto fail;
+                }
+                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) {
+                        printf( "cannot open %s %d\n", szSem, rc);
+                        errno = EINVAL;
+                        goto fail;
+                }
+                sprintf( szSem, "\\SEM32\\TDB_TL_%s%s%s", dir, fname, ext);
+                rc = DosCreateMutexSem( szSem, &tdb->hTransactionLock, 0, FALSE);
+                if (rc == ERROR_DUPLICATE_NAME)
+                        rc = DosOpenMutexSem( szSem, &tdb->hTransactionLock);
+                if (rc != NO_ERROR) {
+                        printf( "cannot open %s %d\n", szSem, rc);
+                        errno = EINVAL;
+                        goto fail;
+                }
+        }
+#endif
+
         /* cache the page size */
         tdb->page_size = getpagesize();
@@ -207 +246 @@
 
         /* we need to zero database if we are the only one with it open */
-        if ((tdb_flags & TDB_CLEAR_IF_FIRST) &&
-            (locked = (tdb->methods->tdb_brlock(tdb, ACTIVE_LOCK, F_WRLCK, F_SETLK, 0, 1) == 0))) {
+        if ((tdb_flags & TDB_CLEAR_IF_FIRST)
+#ifndef __OS2__ // we already have global lock
+            && (locked = (tdb->methods->tdb_brlock(tdb, ACTIVE_LOCK, F_WRLCK, F_SETLK, 0, 1) == 0))
+#endif
+        ) {
                 open_flags |= O_CREAT;
                 if (ftruncate(tdb->fd, 0) == -1) {
@@ -266 +308 @@
         tdb_mmap(tdb);
         if (locked) {
+#ifndef __OS2__
                 if (tdb->methods->tdb_brlock(tdb, ACTIVE_LOCK, F_UNLCK, F_SETLK, 0, 1) == -1) {
                         TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: "
@@ -272 +315 @@
                         goto fail;
                 }
-
+#endif
         }
 
@@ -279 +322 @@
            users know we're using it. */
 
+#ifndef __OS2__
         if (tdb_flags & TDB_CLEAR_IF_FIRST) {
                 /* leave this lock in place to indicate it's in use */
@@ -284 +328 @@
                         goto fail;
         }
+#endif
 
         /* if needed, run recovery */
@@ -289 +334 @@
                 goto fail;
         }
+
+        // YD internal databases do not get global lock!
+        if (tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1) == -1)
+                goto fail;
 
  internal:
@@ -294 +343 @@
          * do with disk files, and resume here by releasing their
          * global lock and hooking into the active list. */
-        if (tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1) == -1)
-                goto fail;
         tdb->next = tdbs;
         tdbs = tdb;
@@ -302 +349 @@
  fail:
         { int save_errno = errno;
+        tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1);
 
         if (!tdb)
@@ -313 +361 @@
         }
         SAFE_FREE(tdb->name);
+#ifdef __OS2__
+        DosCloseMutexSem( tdb->hGlobalLock);
+        DosCloseMutexSem( tdb->hActiveLock);
+        DosCloseMutexSem( tdb->hTransactionLock);
+#endif
         if (tdb->fd != -1)
                 if (close(tdb->fd) != 0)
@@ -343 +396 @@
         }
         SAFE_FREE(tdb->name);
+        tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLK, 0, 1);
         if (tdb->fd != -1)
                 ret = close(tdb->fd);
         SAFE_FREE(tdb->lockrecs);
+#ifdef __OS2__
+        DosCloseMutexSem( tdb->hGlobalLock);
+        tdb->hGlobalLock = 0;
+        DosCloseMutexSem( tdb->hActiveLock);
+        tdb->hActiveLock = 0;
+        DosCloseMutexSem( tdb->hTransactionLock);
+        tdb->hTransactionLock = 0;
+#endif
 
         /* Remove from contexts list */