Changeset 836 for branches/samba-3.5.x/lib/tdb/common/open.c

Timestamp:

Nov 25, 2013, 6:40:10 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: use fcntl and friends for locking

File:

• branches/samba-3.5.x/lib/tdb/common/open.c (modified) (14 diffs)

branches/samba-3.5.x/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!) */
@@ -184 +179 @@
         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();
@@ -262 +251 @@
         if ((tdb_flags & TDB_CLEAR_IF_FIRST) &&
             (!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;
@@ -328 +315 @@
         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: "
@@ -335 +321 @@
                         goto fail;
                 }
-
-#endif
         }
 
@@ -343 +327 @@
            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 */
@@ -349 +332 @@
                         goto fail;
         }
-#endif
 
         /* if needed, run recovery */
@@ -355 +337 @@
                 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
@@ -382 +358 @@
          * 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;
@@ -406 +380 @@
         }
         SAFE_FREE(tdb->name);
-#ifdef __OS2__
-        os2_DltSem(tdb, "tdb_open_ex");
-#endif
         if (tdb->fd != -1)
                 if (close(tdb->fd) != 0)
@@ -449 +420 @@
         }
         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);
@@ -459 +425 @@
         }
         SAFE_FREE(tdb->lockrecs);
-#ifdef __OS2__
-        os2_DltSem(tdb, "tdb_close");   
-#endif
 
         /* Remove from contexts list */
@@ -502 +465 @@
                 return 0; /* Nothing to do. */
         }
-
-#ifdef __OS2__
-        os2_DltSem(tdb, "tdb_reopen");
-
-        if (os2_CrtSem(tdb, tdb->name, "tdb_reopen") != 0) {
-                goto fail;
-        }
-#endif
 
         if (tdb->num_locks != 0 || tdb->global_lock.count) {
@@ -596 +551 @@
         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;
-
-        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;
-}
-
-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
-