Changeset 61 for trunk/samba/source/tdb/common/transaction.c

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);

File:

• trunk/samba/source/tdb/common/transaction.c (modified) (6 diffs)

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