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

Timestamp:

Jun 7, 2010, 9:08:40 AM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: changes from 3.3

File:

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

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

@@ -27 +27 @@
 
 #include "tdb_private.h"
+
+#ifdef __OS2__
+// nmbd.c sets it to 1
+int global_Sem32Add = 0;
+#endif
 
 /* all contexts, to ensure no double-opens (fcntl locks don't nest!) */
@@ -179 +184 @@
         tdb->hash_fn = hash_fn ? hash_fn : default_tdb_hash;
 
+#ifdef __OS2__
+        if (os2_crtsem(tdb, name, "tdb_open_ex") != 0) {
+                goto fail;
+        }
+#endif
+
         /* cache the page size */
         tdb->page_size = getpagesize();
@@ -250 +261 @@
         /* we need to zero database if we are the only one with it open */
         if ((tdb_flags & TDB_CLEAR_IF_FIRST) &&
-            (!tdb->read_only) &&
-            (locked = (tdb->methods->tdb_brlock(tdb, ACTIVE_LOCK, F_WRLCK, F_SETLK, 0, 1) == 0))) {
+            (!tdb->read_only)
+#ifndef __OS2__
+            && (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) {
@@ -314 +328 @@
         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: "
@@ -321 +336 @@
                 }
 
+#endif
         }
 
@@ -327 +343 @@
            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 */
@@ -332 +349 @@
                         goto fail;
         }
+#endif
 
         /* if needed, run recovery */
@@ -337 +355 @@
                 goto fail;
         }
+
+#ifdef __OS2__
+        // 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;
+#endif
 
 #ifdef TDB_TRACE
@@ -358 +382 @@
          * do with disk files, and resume here by releasing their
          * global lock and hooking into the active list. */
+#ifndef __OS2__
         if (tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLKW, 0, 1) == -1)
                 goto fail;
+#endif
         tdb->next = tdbs;
-        tdbs = tdb;
+                tdbs = tdb;
         return tdb;
 
@@ -380 +406 @@
         }
         SAFE_FREE(tdb->name);
+#ifdef __OS2__
+        DosCloseMutexSem( tdb->hGlobalLock);
+        tdb->hGlobalLock = 0;
+        DosCloseMutexSem( tdb->hActiveLock);
+        tdb->hActiveLock = 0;
+        DosCloseMutexSem( tdb->hTransactionLock);
+        tdb->hTransactionLock = 0;
+#endif
         if (tdb->fd != -1)
                 if (close(tdb->fd) != 0)
@@ -420 +454 @@
         }
         SAFE_FREE(tdb->name);
+#ifdef __OS2__
+        // YD internal databases do not have a global lock
+        if (!(tdb->flags & TDB_INTERNAL))
+                tdb->methods->tdb_brlock(tdb, GLOBAL_LOCK, F_UNLCK, F_SETLK, 0, 1);
+#endif
         if (tdb->fd != -1) {
                 ret = close(tdb->fd);
@@ -425 +464 @@
         }
         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 */
@@ -465 +512 @@
                 return 0; /* Nothing to do. */
         }
+
+#ifdef __OS2__
+        DosCloseMutexSem( tdb->hGlobalLock);
+        tdb->hGlobalLock = 0;
+        DosCloseMutexSem( tdb->hActiveLock);
+        tdb->hActiveLock = 0;
+        DosCloseMutexSem( tdb->hTransactionLock);
+        tdb->hTransactionLock = 0;
+
+        if (os2_crtsem(tdb, tdb->name, "tdb_reopen") != 0) {
+                goto fail;
+        }
+#endif
 
         if (tdb->num_locks != 0 || tdb->global_lock.count) {
@@ -551 +611 @@
         return 0;
 }
+
+#ifdef __OS2__
+int os2_crtsem(struct tdb_context *tdb, const char *name, const char *caller)
+{
+        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%i", dir, fname, ext, global_Sem32Add);
+                rc = DosCreateMutexSem( szSem, &tdb->hGlobalLock, 0, FALSE);
+                if (rc == ERROR_DUPLICATE_NAME)
+                        rc = DosOpenMutexSem( szSem, &tdb->hGlobalLock);
+                if (rc != NO_ERROR) {
+                                TDB_LOG((tdb, TDB_DEBUG_ERROR, "cannot open %s %d\n", szSem, rc));
+                        errno = EINVAL;
+                        return -1;
+                }
+                TDB_LOG((tdb, TDB_DEBUG_TRACE,"%s pid %d global handle %d\n", caller, getpid(), tdb->hGlobalLock));
+
+                sprintf( szSem, "\\SEM32\\TDB_AL_%s%s%s%i", dir, fname, ext, global_Sem32Add);
+                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, "cannot open %s %d\n", szSem, rc));
+                        errno = EINVAL;
+                        return -1;
+                }
+                TDB_LOG((tdb, TDB_DEBUG_TRACE,"%s pid %d active handle %d\n", caller, getpid(), tdb->hActiveLock));
+
+                sprintf( szSem, "\\SEM32\\TDB_TL_%s%s%s%i", dir, fname, ext, global_Sem32Add);
+                rc = DosCreateMutexSem( szSem, &tdb->hTransactionLock, 0, FALSE);
+                if (rc == ERROR_DUPLICATE_NAME)
+                        rc = DosOpenMutexSem( szSem, &tdb->hTransactionLock);
+                if (rc != NO_ERROR) {
+                        TDB_LOG((tdb, TDB_DEBUG_ERROR, "cannot open %s %d\n", szSem, rc));
+                        errno = EINVAL;
+                        return -1;
+                }
+                TDB_LOG((tdb, TDB_DEBUG_TRACE,"%s pid %d transaction handle %d\n", caller, getpid(), tdb->hTransactionLock));
+        }
+        return 0;
+}
+#endif
+