Changeset 829 for branches

Timestamp:

Nov 13, 2013, 2:36:44 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5: backported some code from 3.6

Location:

branches/samba-3.5.x/lib/tdb/common

Files:

• lock.c (modified) (4 diffs)
• open.c (modified) (6 diffs)

branches/samba-3.5.x/lib/tdb/common/lock.c

@@ -138 +138 @@
         APIRET      rc;
         ULONG       fAccess = 0;
-        int         fLock = 0;
-        off_t       cbFile;
-        off_t       offStart;
-        off_t       cbRange;
-
-        TDB_LOG((tdb, TDB_DEBUG_TRACE, "tdb_brlock pid %X, fd %d, lck_type %s, rw_type %s, offset %d, len %d\n",
+        FILELOCK    lockArea = {0}, unlockArea = {0};
+
+        TDB_LOG((tdb, TDB_DEBUG_TRACE, "tdb_brlock in 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));
 
@@ -163 +160 @@
 
         /* flags and order */
-        fAccess = 0; /* exclusive */
         switch (rw_type)
         {
                 case F_UNLCK:
-                        fLock = 0;
+                        unlockArea.lOffset = offset;
+                        unlockArea.lRange  = len ? len : LONG_MAX;
                         break;
                 case F_RDLCK:
+                        lockArea.lOffset = offset;
+                        lockArea.lRange  = len ? len : LONG_MAX;
                         fAccess = 1; /* read-only */
                 case F_WRLCK:
-                        fLock = 1;
+                        lockArea.lOffset = offset;
+                        lockArea.lRange  = len ? len : LONG_MAX;
                         break;
                 default:
@@ -178 +178 @@
         }
                 
-        FILELOCK   aflock[2];
-        bzero(&aflock[(fLock + 1) & 1], sizeof(aflock[0]));
-        aflock[fLock].lOffset = offset;
-        aflock[fLock].lRange  = len ? len : LONG_MAX;
-        rc = DosSetFileLocks(tdb->fd, &aflock[0], &aflock[1], SEM_IMMEDIATE_RETURN, fAccess);
+        rc = DosSetFileLocks(tdb->fd, &unlockArea, &lockArea, SEM_IMMEDIATE_RETURN, fAccess);
 
         if (rc != NO_ERROR && lck_type == F_SETLKW) {
                 int     count = 20;
                 do {
-                        rc = DosSetFileLocks(tdb->fd, &aflock[0], &aflock[1], 100, fAccess);
+                        rc = DosSetFileLocks(tdb->fd, &unlockArea, &lockArea, 100, fAccess);
                         count--;
                 } while( count>0 && rc !=NO_ERROR);
 
         }
+
+        TDB_LOG(( tdb, TDB_DEBUG_TRACE, "tdb_brlock out pid %d, fd %d, lck_type %s, rw_type %s, offset %d, len %d, rc=%d\n",
+                getpid(), tdb->fd, lock_type(lck_type), read_type(rw_type), offset, len, rc));
+
         if (rc != NO_ERROR) {
                 errno  = EINVAL;
@@ -209 +209 @@
                 return -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));
-
 #else
 

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

@@ -185 +185 @@
 
 #ifdef __OS2__
-        if (os2_crtsem(tdb, name, "tdb_open_ex") != 0) {
+        if (os2_CrtSem(tdb, name, "tdb_open_ex") != 0) {
                 goto fail;
         }
@@ -407 +407 @@
         SAFE_FREE(tdb->name);
 #ifdef __OS2__
-        DosCloseMutexSem( tdb->hGlobalLock);
-        tdb->hGlobalLock = 0;
-        DosCloseMutexSem( tdb->hActiveLock);
-        tdb->hActiveLock = 0;
-        DosCloseMutexSem( tdb->hTransactionLock);
-        tdb->hTransactionLock = 0;
+        os2_DltSem(tdb, "tdb_open_ex");
 #endif
         if (tdb->fd != -1)
@@ -465 +460 @@
         SAFE_FREE(tdb->lockrecs);
 #ifdef __OS2__
-        DosCloseMutexSem( tdb->hGlobalLock);
-        tdb->hGlobalLock = 0;
-        DosCloseMutexSem( tdb->hActiveLock);
-        tdb->hActiveLock = 0;
-        DosCloseMutexSem( tdb->hTransactionLock);
-        tdb->hTransactionLock = 0;
+        os2_DltSem(tdb, "tdb_close");   
 #endif
 
@@ -514 +504 @@
 
 #ifdef __OS2__
-        DosCloseMutexSem( tdb->hGlobalLock);
-        tdb->hGlobalLock = 0;
-        DosCloseMutexSem( tdb->hActiveLock);
-        tdb->hActiveLock = 0;
-        DosCloseMutexSem( tdb->hTransactionLock);
-        tdb->hTransactionLock = 0;
-
-        if (os2_crtsem(tdb, tdb->name, "tdb_reopen") != 0) {
+        os2_DltSem(tdb, "tdb_reopen");
+
+        if (os2_CrtSem(tdb, tdb->name, "tdb_reopen") != 0) {
                 goto fail;
         }
@@ -613 +598 @@
 
 #ifdef __OS2__
-int os2_crtsem(struct tdb_context *tdb, const char *name, const char *caller)
+int os2_CrtSem(struct tdb_context *tdb, const char *name, const char *caller)
 {
         // name could be null, so handle it
@@ -661 +646 @@
         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