Changeset 41

Timestamp:

Jun 18, 2007, 3:08:20 PM (18 years ago)

Author:

Yuri Dario

Message:

Do not use exclusive locks always, try to use shared mode for read locks.

File:

• trunk/samba/source/tdb/common/lock.c (modified) (3 diffs)

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

@@ -185 +185 @@
                         break;
                 case F_RDLCK:
+                        fAccess = 1; /* read-only */
                 case F_WRLCK:
                         fLock = 1;
@@ -296 +297 @@
 int tdb_brlock_upgrade(struct tdb_context *tdb, tdb_off_t offset, size_t len)
 {
-#ifdef __OS2__
-        // YD we use exclusive locks, no need to upgrade.
-        return 0;
-#else
         int count = 1000;
         while (count--) {
                 struct timeval tv;
+#ifdef __OS2__
+                // YD we cannot upgrade without an unlock first...
+                tdb_brlock(tdb, offset, F_UNLCK, F_SETLKW, 1, len);
+#endif
                 if (tdb_brlock(tdb, offset, F_WRLCK, F_SETLKW, 1, len) == 0) {
                         return 0;
@@ -318 +319 @@
         TDB_LOG((tdb, TDB_DEBUG_TRACE,"tdb_brlock_upgrade failed at offset %d\n", offset));
         return -1;
-#endif
 }