Changeset 61

Timestamp:

Aug 20, 2007, 10:37:46 PM (18 years ago)

Author:

Yuri Dario

Message:

More changes for locking problems:

• reopen semaphore handles for new processes;
• remove locks done after using exclusive locks with semaphores;
• more logging;
• upgrade read locks to write (exclusive) locks before writing to file (this makes real

unlocks to fail, fixme);

Location:

trunk/samba/source/tdb/common

Files:

• io.c (modified) (2 diffs)
• lock.c (modified) (8 diffs)
• open.c (modified) (5 diffs)
• transaction.c (modified) (6 diffs)

trunk/samba/source/tdb/common/io.c

@@ -88 +88 @@
                 return -1;
 
+#ifdef __OS2__
+        // YD we must upgrade read locks to write locks (exclusive), otherwise
+        // the owner (us) is not allowed to write to the file (different from unix)
+        TDB_LOG((tdb, TDB_DEBUG_TRACE,"unlocking at %d len=%d before writing.\n", off, len));
+        tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, 1);
+        // if a wider previous lock is in effect, we cannot write lock our segment
+        // (e.g. a lock_upgrade locks all the file), so we hope the previous lock 
+        // is a write lock: do not wait for lock.
+        tdb_brlock( tdb, off, F_WRLCK, F_SETLK, 0, len);
+#endif
+
         if (tdb->map_ptr) {
                 memcpy(off + (char *)tdb->map_ptr, buf, len);
@@ -95 +106 @@
                 TDB_LOG((tdb, TDB_DEBUG_FATAL,"tdb_write failed at %d len=%d (%s)\n",
                            off, len, strerror(errno)));
+#ifdef __OS2__
+                // remove our lock
+                tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, len);
+#endif
                 return TDB_ERRCODE(TDB_ERR_IO, -1);
         }
+#ifdef __OS2__
+        // remove our lock
+        tdb_brlock( tdb, off, F_UNLCK, F_SETLK, 0, len);
+#endif
         return 0;
 }

trunk/samba/source/tdb/common/lock.c

@@ -29 +29 @@
 #include "tdb_private.h"
 
-#if 0 // for debugging...
-#include "tdb/tools/printf.c" 
+
+#if 1 // for debugging...
 
 #if 0
@@ -95 +95 @@
         }
 
+        TDB_LOG((tdb, TDB_DEBUG_TRACE,"_mutex_brlock handle %d, offset %d\n", hSem, offset));
+
         if (lck_type == F_SETLKW)
                 ulTimeout = SEM_INDEFINITE_WAIT;
@@ -120 +122 @@
 
         errno = EINVAL;
-#if 0
-        debug_printf("_mutex_brlock pid %X, failed (fd=%d) at offset %d rw_type=%d lck_type=%d len=%d, rc=%d\n", 
-                 getpid(), tdb->fd, offset, rw_type, lck_type, (int)len, rc);
+#if 1
+        TDB_LOG(( tdb, TDB_DEBUG_ERROR, "_mutex_brlock pid %X, failed (fd=%d) at offset %d rw_type=%d lck_type=%d len=%d, rc=%d\n", 
+                 getpid(), tdb->fd, offset, rw_type, lck_type, (int)len, rc));
 #endif
         return TDB_ERRCODE(TDB_ERR_LOCK, -1);
@@ -149 +151 @@
         off_t       cbRange;
 
+#if 1
+        TDB_LOG((tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, fd %d, lck_type %s, rw_type %s, offset %d, len %d\n",
+                getpid(), tdb->fd, lock_type(lck_type), read_type(rw_type), offset, len));
+#endif
+        
         switch( offset) {
         case GLOBAL_LOCK:
         case ACTIVE_LOCK:
         case TRANSACTION_LOCK:
-                return _mutex_brlock( tdb, offset, 
-                rw_type,  lck_type,  probe, len);
+                return _mutex_brlock( tdb, offset, rw_type,  lck_type,  probe, len);
         }
 
@@ -166 +172 @@
         }
 
-#if 0
-        debug_printf("tdb_brlock pid %X, fd %d, lck_type %s, rw_type %s, offset %d, len %d\n",
-                getpid(), tdb->fd, lock_type(lck_type), read_type(rw_type), offset, len);
-#endif
-        
         /* flags and order */
         fAccess = 0; /* exclusive */
@@ -199 +200 @@
 #if 0
         if (rc != NO_ERROR) {
-                debug_printf("tdb_brlock pid %X, fd %d, rc=%d FAILED\n",
-                        getpid(), tdb->fd, rc);
+                TDB_LOG(( tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, fd %d, rc=%d FAILED\n",
+                        getpid(), tdb->fd, rc));
         }
 #endif
         if (rc != NO_ERROR && lck_type == F_SETLKW) {
 #if 0
-                debug_printf("tdb_brlock pid %X, fd %d, rc=%d RETRY WAIT\n",
-                        getpid(), tdb->fd, rc);
-#endif
-                int     count = 10;
+                TDB_LOG(( tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, fd %d, rc=%d RETRY WAIT\n",
+                        getpid(), tdb->fd, rc));
+#endif
+                int     count = 20;
                 do {
-                        rc = DosSetFileLocks(tdb->fd, &aflock[0], &aflock[1], 1000, fAccess);
+                        rc = DosSetFileLocks(tdb->fd, &aflock[0], &aflock[1], 100, fAccess);
 #if 0
-                        debug_printf("tdb_brlock pid %X, fd %d, rc=%d RETRY WAIT(%d)\n",
-                                getpid(), tdb->fd, rc,count);
+                        TDB_LOG(( tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, fd %d, rc=%d RETRY WAIT(%d)\n",
+                                getpid(), tdb->fd, rc,count));
 #endif
                         count--;
@@ -230 +231 @@
                                  tdb->fd, offset, rw_type, lck_type, (int)len));
                 }
-#if 0
-                debug_printf("tdb_brlock pid %X, failed (fd=%d) at offset %d rw_type=%d lck_type=%d len=%d\n", 
-                         getpid(), tdb->fd, offset, rw_type, lck_type, (int)len);
-#endif
-                return TDB_ERRCODE(TDB_ERR_LOCK, -1);
-        }
-#if 0
-        debug_printf("tdb_brlock pid %X, fd %d, lck_type %s, rw_type %s, offset %d, len %d DONE\n",
-                getpid(), tdb->fd, lock_type(lck_type), read_type(rw_type), offset, len);
+#if 1
+                TDB_LOG(( tdb, TDB_DEBUG_ERROR, "tdb_brlock pid %X, failed (fd=%d) at offset %d rw_type=%d lck_type=%d len=%d\n", 
+                         getpid(), tdb->fd, offset, rw_type, lck_type, (int)len));
+#endif
+                return TDB_ERRCODE(TDB_ERR_LOCK, -1);
+        }
+#if 1
+        TDB_LOG(( tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, fd %d, lck_type %s, rw_type %s, offset %d, len %d DONE\n",
+                getpid(), tdb->fd, lock_type(lck_type), read_type(rw_type), offset, len));
 #endif
 
@@ -291 +292 @@
 int tdb_brlock_upgrade(struct tdb_context *tdb, tdb_off_t offset, size_t len)
 {
+        TDB_LOG(( tdb, TDB_DEBUG_TRACE, "tdb_brlock_upgrade pid %X, fd %d, offset %d, len %d\n",
+                getpid(), tdb->fd, offset, len));
         int count = 1000;
         while (count--) {

trunk/samba/source/tdb/common/open.c

@@ -178 +178 @@
                         goto fail;
                 }
+                TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_open_ex pid %d global handle %d\n", getpid(), tdb->hGlobalLock));
                 sprintf( szSem, "\\SEM32\\TDB_AL_%s%s%s", dir, fname, ext);
                 rc = DosCreateMutexSem( szSem, &tdb->hActiveLock, 0, FALSE);
@@ -187 +188 @@
                         goto fail;
                 }
+                TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_open_ex pid %d active handle %d\n", getpid(), tdb->hActiveLock));
                 sprintf( szSem, "\\SEM32\\TDB_TL_%s%s%s", dir, fname, ext);
                 rc = DosCreateMutexSem( szSem, &tdb->hTransactionLock, 0, FALSE);
@@ -196 +198 @@
                         goto fail;
                 }
+                TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_open_ex pid %d transaction handle %d\n", getpid(), tdb->hTransactionLock));
         }
 #endif
@@ -456 +459 @@
         struct stat st;
 
+        TDB_LOG((tdb, TDB_DEBUG_TRACE, "tdb_reopen pid %d\n", getpid()));
+
         if (tdb->flags & TDB_INTERNAL) {
                 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 (!(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_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;
+                }
+                TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_reopen pid %d global handle %d\n", getpid(), tdb->hGlobalLock));
+                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;
+                }
+                TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_reopen pid %d active handle %d\n", getpid(), tdb->hActiveLock));
+                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;
+                }
+                TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_reopen pid %d transaction handle %d\n", getpid(), tdb->hTransactionLock));
+        }
+#endif
 
         if (tdb->num_locks != 0 || tdb->global_lock.count) {
@@ -483 +538 @@
         if ((tdb->flags & TDB_CLEAR_IF_FIRST) && 
             (tdb->methods->tdb_brlock(tdb, ACTIVE_LOCK, F_RDLCK, F_SETLKW, 0, 1) == -1)) {
-#ifndef __OS2__ // PS 20070511 hack for WINS server crash
+// YD sem handle was wrong, testme #ifndef __OS2__ // PS 20070511 hack for WINS server crash
                 TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_reopen: failed to obtain active lock\n"));
                 goto fail;
-#endif
+//#endif
         }
         if (fstat(tdb->fd, &st) != 0) {

trunk/samba/source/tdb/common/transaction.c

@@ -436 +436 @@
         /* get a read lock from the freelist to the end of file. This
            is upgraded to a write lock during the commit */
+#ifndef __OS2__ // YD the transation lock is an exclusive lock for us, it is enough.
         if (tdb_brlock(tdb, FREELIST_TOP, F_RDLCK, F_SETLKW, 0, 0) == -1) {
                 TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_start: failed to get hash locks\n"));
@@ -441 +442 @@
                 goto fail;
         }
+#endif
 
         /* setup a copy of the hash table heads so the hash scan in
@@ -479 +481 @@
         
 fail:
+#ifndef __OS2__ // YD the transation lock is an exclusive lock for us, it is enough.
         tdb_brlock(tdb, FREELIST_TOP, F_UNLCK, F_SETLKW, 0, 0);
+#endif
         tdb_brlock(tdb, TRANSACTION_LOCK, F_UNLCK, F_SETLKW, 0, 1);
         SAFE_FREE(tdb->transaction->hash_heads);
@@ -534 +538 @@
         tdb->methods = tdb->transaction->io_methods;
 
+#ifndef __OS2__ // YD the transation lock is an exclusive lock for us, it is enough.
         tdb_brlock(tdb, FREELIST_TOP, F_UNLCK, F_SETLKW, 0, 0);
+#endif
         tdb_brlock(tdb, TRANSACTION_LOCK, F_UNLCK, F_SETLKW, 0, 1);
         SAFE_FREE(tdb->transaction->hash_heads);
@@ -822 +828 @@
 
         /* upgrade the main transaction lock region to a write lock */
+#ifndef __OS2__ // YD the global lock is an exclusive lock for us, it is enough.
         if (tdb_brlock_upgrade(tdb, FREELIST_TOP, 0) == -1) {
                 TDB_LOG((tdb, TDB_DEBUG_ERROR, "tdb_transaction_start: failed to upgrade hash locks\n"));
@@ -828 +835 @@
                 return -1;
         }
+#endif
 
         /* get the global lock - this prevents new users attaching to the database