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

Timestamp:

Nov 25, 2013, 4:35:16 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.6: use fcntl and friends for locking

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!) */
@@ -242 +237 @@
         }
 
-#ifdef __OS2__
-        if (os2_CrtSem(tdb, "tdb_open_ex") != 0) {
-                goto fail;
-        }
-#endif
         /* cache the page size */
         tdb->page_size = getpagesize();
@@ -322 +312 @@
         /* we need to zero database if we are the only one with it open */
         if ((tdb_flags & TDB_CLEAR_IF_FIRST) &&
-#ifndef __OS2__
             (!tdb->read_only) &&
             (locked = (tdb_nest_lock(tdb, ACTIVE_LOCK, F_WRLCK, TDB_LOCK_NOWAIT|TDB_LOCK_PROBE) == 0))) {
-#else
-            (!tdb->read_only) ) {
-#endif
                 int ret;
                 ret = tdb_brlock(tdb, F_WRLCK, FREELIST_TOP, 0,
@@ -429 +415 @@
         tdb_mmap(tdb);
         if (locked) {
-#ifndef __OS2__
                 if (tdb_nest_unlock(tdb, ACTIVE_LOCK, F_WRLCK, false) == -1) {
                         TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: "
@@ -437 +422 @@
                 }
 
-#endif
         }
 
@@ -444 +428 @@
            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 */
@@ -451 +434 @@
                 }
         }
-#endif
 
         /* if needed, run recovery */
@@ -457 +439 @@
                 goto fail;
         }
-
-#ifdef __OS2__
-        // YD internal databases do not get global lock!
-        if (tdb_nest_unlock(tdb, OPEN_LOCK, F_WRLCK, false) == -1)
-                goto fail;
-#endif
 
 #ifdef TDB_TRACE
@@ -484 +460 @@
          * do with disk files, and resume here by releasing their
          * open lock and hooking into the active list. */
-#ifndef __OS2__
         if (tdb_nest_unlock(tdb, OPEN_LOCK, F_WRLCK, false) == -1) {
                 goto fail;
         }
-#endif
         tdb->next = tdbs;
         tdbs = tdb;
@@ -511 +485 @@
                 if (close(tdb->fd) != 0)
                         TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_open_ex: failed to close tdb->fd on error!\n"));
-#ifdef __OS2__
-        os2_DltSem(tdb, "tdb_open_ex");
-#endif
         SAFE_FREE(tdb->lockrecs);
         SAFE_FREE(tdb->name);
@@ -553 +524 @@
         }
         SAFE_FREE(tdb->name);
-#ifdef __OS2__
-        // YD internal databases do not have a global lock
-        if (!(tdb->flags & TDB_INTERNAL))
-        tdb_nest_unlock(tdb, OPEN_LOCK, F_WRLCK, false);
-#endif
         if (tdb->fd != -1) {
                 ret = close(tdb->fd);
@@ -564 +530 @@
         SAFE_FREE(tdb->lockrecs);
 
-#ifdef __OS2__
-        os2_DltSem(tdb, "tdb_close");   
-#endif
         /* Remove from contexts list */
         for (i = &tdbs; *i; i = &(*i)->next) {
@@ -606 +569 @@
                 return 0; /* Nothing to do. */
         }
-
-#ifdef __OS2__
-        os2_DltSem(tdb, "tdb_reopen");
-
-        if (os2_CrtSem(tdb, "tdb_reopen") != 0) {
-                goto fail;
-        }
-#endif
 
         if (tdb_have_extra_locks(tdb)) {
@@ -703 +658 @@
         return 0;
 }
-
-#ifdef __OS2__
-int os2_CrtSem(struct tdb_context *tdb, const char *caller)
-{
-        // tbd->name could be null, so handle it 
-        if (tdb->name == NULL) return -1;
-        
-        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( tdb->name, drive, dir, fname, ext);
-                sprintf( szSem, "\\SEM32\\TDB_OL_%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 open 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;
-}
-
-int os2_DltSem(struct tdb_context *tdb, const char *caller)
-{
-        DosCloseMutexSem( tdb->hGlobalLock);
-        tdb->hGlobalLock = 0;
-        DosCloseMutexSem( tdb->hActiveLock);
-        tdb->hActiveLock = 0;
-        DosCloseMutexSem( tdb->hTransactionLock);
-        tdb->hTransactionLock = 0;
-
-        return 0;
-}
-#endif