Changeset 841

Timestamp:

Feb 4, 2014, 7:34:29 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.6: more logging in locking code

Location:

trunk/server/lib/tdb/common

Files:

• io.c (modified) (1 diff)
• lock.c (modified) (2 diffs)

trunk/server/lib/tdb/common/io.c

@@ -101 +101 @@
         // 2. if the write lock wasn't set, we try to unlock the segment
         //    first and add the write lock afterwards 
-        int upgradeLockRC = tdb_brlock(tdb, F_WRLCK, off, len, TDB_LOCK_NOWAIT);
+        int upgradeLockRC = 0;
+        upgradeLockRC = tdb_brlock(tdb, F_WRLCK, off, len, TDB_LOCK_NOWAIT);
         if (upgradeLockRC != 0) {
                 tdb_brunlock(tdb, F_RDLCK, off, len);

trunk/server/lib/tdb/common/lock.c

@@ -54 +54 @@
         else
                 cmd = F_SETLK;
+
+        TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_lock in: (fd=%d) offset=%d rw_type=%d len=%d\n",
+                 tdb->fd, off, rw, len));
 
         int rc = fcntl(tdb->fd, cmd, &fl);
@@ -148 +151 @@
 
 #ifdef __OS2__
+        TDB_LOG((tdb, TDB_DEBUG_TRACE,"fcntl_unlock in: (fd=%d) offset=%d rw_type=%d len=%d\n",
+                 tdb->fd, off, rw, len));
+
         int rc = fcntl(tdb->fd, F_SETLKW, &fl);
         // if the first unlock doesn't work and it's a complete unlock,