From d07c2efb64d5672a9b1d9ded4ea33b587139fbbc Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Tue, 30 May 2006 22:32:41 +0000 Subject: [PATCH] Got rid of XFLM_NO_TIMEOUT and replaced it with FLM_NO_TIMEOUT from FTK. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@486 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- xflaim/sample/sample.cpp | 6 +++--- xflaim/src/fdbcnfig.cpp | 10 ++++------ xflaim/src/fdbcopy.cpp | 4 ++-- xflaim/src/flaimsys.h | 4 ++-- xflaim/src/flbackup.cpp | 2 +- xflaim/src/flblddb.cpp | 4 ++-- xflaim/src/flchkdb.cpp | 2 +- xflaim/src/flchkix.cpp | 6 +++--- xflaim/src/flconvrt.cpp | 6 +++--- xflaim/src/flreduce.cpp | 4 ++-- xflaim/src/flsweep.cpp | 6 +++--- xflaim/src/fltrbeg.cpp | 4 ++-- xflaim/src/flverify.cpp | 2 +- xflaim/src/fslfileu.cpp | 2 +- xflaim/src/fstructs.h | 2 +- xflaim/src/rfl.cpp | 2 +- xflaim/src/xflaim.h | 6 +----- xflaim/util/view.cpp | 2 +- 18 files changed, 34 insertions(+), 40 deletions(-) diff --git a/xflaim/sample/sample.cpp b/xflaim/sample/sample.cpp index ce44cb3..b3ad1b7 100644 --- a/xflaim/sample/sample.cpp +++ b/xflaim/sample/sample.cpp @@ -163,7 +163,7 @@ RetryCreate: // made to the database, an UPDATE transaction is required. It is best to // keep transactions small if possible. - if( RC_BAD( rc = pDb->transBegin( XFLM_UPDATE_TRANS, XFLM_NO_TIMEOUT))) + if( RC_BAD( rc = pDb->transBegin( XFLM_UPDATE_TRANS, FLM_NO_TIMEOUT))) { goto Exit; } @@ -500,7 +500,7 @@ RetryCreate: // from... // Start an update transaction - if( RC_BAD( rc = pDb->transBegin( XFLM_UPDATE_TRANS, XFLM_NO_TIMEOUT))) + if( RC_BAD( rc = pDb->transBegin( XFLM_UPDATE_TRANS, FLM_NO_TIMEOUT))) { goto Exit; } @@ -542,7 +542,7 @@ RetryCreate: // . // - if( RC_BAD( rc = pDb->transBegin( XFLM_UPDATE_TRANS, XFLM_NO_TIMEOUT))) + if( RC_BAD( rc = pDb->transBegin( XFLM_UPDATE_TRANS, FLM_NO_TIMEOUT))) { goto Exit; } diff --git a/xflaim/src/fdbcnfig.cpp b/xflaim/src/fdbcnfig.cpp index 29f8ea2..9a31770 100644 --- a/xflaim/src/fdbcnfig.cpp +++ b/xflaim/src/fdbcnfig.cpp @@ -64,8 +64,7 @@ RCODE FLMAPI F_Db::setRflKeepFilesFlag( if (!(m_uiFlags & (FDB_HAS_FILE_LOCK | FDB_FILE_LOCK_SHARED))) { - if (RC_BAD( rc = dbLock( FLM_LOCK_EXCLUSIVE, 0, - XFLM_NO_TIMEOUT))) + if (RC_BAD( rc = dbLock( FLM_LOCK_EXCLUSIVE, 0, FLM_NO_TIMEOUT))) { goto Exit; } @@ -88,7 +87,7 @@ RCODE FLMAPI F_Db::setRflKeepFilesFlag( // go to a new RFL file so that the new RFL file gets new // serial numbers and a new keep or no-keep flag. - if (RC_BAD( rc = doCheckpoint( XFLM_NO_TIMEOUT))) + if (RC_BAD( rc = doCheckpoint( FLM_NO_TIMEOUT))) { goto Exit; } @@ -175,8 +174,7 @@ RCODE FLMAPI F_Db::setRflDir( if (!(m_uiFlags & (FDB_HAS_FILE_LOCK | FDB_FILE_LOCK_SHARED))) { - if( RC_BAD( rc = dbLock( FLM_LOCK_EXCLUSIVE, 0, - XFLM_NO_TIMEOUT))) + if( RC_BAD( rc = dbLock( FLM_LOCK_EXCLUSIVE, 0, FLM_NO_TIMEOUT))) { goto Exit; } @@ -192,7 +190,7 @@ RCODE FLMAPI F_Db::setRflDir( // ensures that no more transactions will be logged to the current // RFL file. - if (RC_BAD( rc = doCheckpoint( XFLM_NO_TIMEOUT))) + if (RC_BAD( rc = doCheckpoint( FLM_NO_TIMEOUT))) { goto Exit; } diff --git a/xflaim/src/fdbcopy.cpp b/xflaim/src/fdbcopy.cpp index 6fccd3d..121e817 100644 --- a/xflaim/src/fdbcopy.cpp +++ b/xflaim/src/fdbcopy.cpp @@ -99,7 +99,7 @@ RCODE F_DbSystem::dbCopy( // threads have the opportunity to get in and update the // database. - if (RC_BAD( rc = pDb->dbLock( FLM_LOCK_EXCLUSIVE, 0, XFLM_NO_TIMEOUT))) + if (RC_BAD( rc = pDb->dbLock( FLM_LOCK_EXCLUSIVE, 0, FLM_NO_TIMEOUT))) { goto Exit; } @@ -107,7 +107,7 @@ RCODE F_DbSystem::dbCopy( // Force a checkpoint - if (RC_BAD( rc = pDb->doCheckpoint( XFLM_NO_TIMEOUT))) + if (RC_BAD( rc = pDb->doCheckpoint( FLM_NO_TIMEOUT))) { goto Exit; } diff --git a/xflaim/src/flaimsys.h b/xflaim/src/flaimsys.h index 8c2d42c..b558262 100644 --- a/xflaim/src/flaimsys.h +++ b/xflaim/src/flaimsys.h @@ -1856,7 +1856,7 @@ public: RCODE FLMAPI transBegin( eDbTransType eTransType, - FLMUINT uiMaxLockWait = XFLM_NO_TIMEOUT, + FLMUINT uiMaxLockWait = FLM_NO_TIMEOUT, FLMUINT uiFlags = 0, XFLM_DB_HDR * pDbHeader = NULL); @@ -2700,7 +2700,7 @@ private: RCODE beginTrans( eDbTransType eTransType, - FLMUINT uiMaxLockWait = XFLM_NO_TIMEOUT, + FLMUINT uiMaxLockWait = FLM_NO_TIMEOUT, FLMUINT uiFlags = 0, XFLM_DB_HDR * pDbHdr = NULL); diff --git a/xflaim/src/flbackup.cpp b/xflaim/src/flbackup.cpp index 64402ba..9a54686 100644 --- a/xflaim/src/flbackup.cpp +++ b/xflaim/src/flbackup.cpp @@ -618,7 +618,7 @@ RCODE F_Backup::backup( if ((m_pDb->m_uiFlags & FDB_HAS_FILE_LOCK) == 0) { if (RC_BAD( rc = m_pDb->dbLock( FLM_LOCK_EXCLUSIVE, - 0, XFLM_NO_TIMEOUT))) + 0, FLM_NO_TIMEOUT))) { goto Exit; } diff --git a/xflaim/src/flblddb.cpp b/xflaim/src/flblddb.cpp index 9893ef9..d646486 100644 --- a/xflaim/src/flblddb.cpp +++ b/xflaim/src/flblddb.cpp @@ -440,7 +440,7 @@ Retry: pDatabaseLockObj->AddRef(); if (RC_BAD( rc = pDatabaseLockObj->lock( hWaitSem, - TRUE, XFLM_NO_TIMEOUT, 0))) + TRUE, FLM_NO_TIMEOUT, 0))) { goto Exit; } @@ -642,7 +642,7 @@ Retry: if( pWrappingKey) { if( RC_BAD( rc = m_pDb->transBegin( - XFLM_UPDATE_TRANS, XFLM_NO_TIMEOUT, 0))) + XFLM_UPDATE_TRANS, FLM_NO_TIMEOUT, 0))) { goto Exit; } diff --git a/xflaim/src/flchkdb.cpp b/xflaim/src/flchkdb.cpp index 2e07a16..6d45999 100644 --- a/xflaim/src/flchkdb.cpp +++ b/xflaim/src/flchkdb.cpp @@ -512,7 +512,7 @@ RCODE F_DbCheck::getDictInfo() // to the file's dictionary structures. if (RC_BAD( rc = m_pDb->transBegin( XFLM_READ_TRANS, - XFLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE, &m_pDbInfo->m_dbHdr))) + FLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE, &m_pDbInfo->m_dbHdr))) { goto Exit; } diff --git a/xflaim/src/flchkix.cpp b/xflaim/src/flchkix.cpp index 3858d64..e50f5dc 100644 --- a/xflaim/src/flchkix.cpp +++ b/xflaim/src/flchkix.cpp @@ -905,7 +905,7 @@ RCODE F_DbCheck::startUpdate( void) // Try to start an update transaction - if (RC_BAD( rc = m_pDb->transBegin( XFLM_UPDATE_TRANS, XFLM_NO_TIMEOUT, + if (RC_BAD( rc = m_pDb->transBegin( XFLM_UPDATE_TRANS, FLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) { goto Exit; @@ -948,7 +948,7 @@ Exit: RCODE rc2; m_pIxd = NULL; - if (RC_BAD( rc2 = m_pDb->transBegin( XFLM_READ_TRANS, XFLM_NO_TIMEOUT, + if (RC_BAD( rc2 = m_pDb->transBegin( XFLM_READ_TRANS, FLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) { if (RC_OK( rc)) @@ -1003,7 +1003,7 @@ Exit: RCODE rc2; if (RC_BAD( rc2 = m_pDb->transBegin( - XFLM_READ_TRANS, XFLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) + XFLM_READ_TRANS, FLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) { if (RC_OK( rc)) { diff --git a/xflaim/src/flconvrt.cpp b/xflaim/src/flconvrt.cpp index e846865..6506daf 100644 --- a/xflaim/src/flconvrt.cpp +++ b/xflaim/src/flconvrt.cpp @@ -241,7 +241,7 @@ RCODE FLMAPI F_Db::enableEncryption( void) if (!(m_uiFlags & FDB_HAS_FILE_LOCK)) { - if ( RC_BAD( rc = dbLock( FLM_LOCK_EXCLUSIVE, 0, XFLM_NO_TIMEOUT))) + if ( RC_BAD( rc = dbLock( FLM_LOCK_EXCLUSIVE, 0, FLM_NO_TIMEOUT))) { goto Exit; } @@ -372,7 +372,7 @@ RCODE FLMAPI F_Db::wrapKey( if( !(m_uiFlags & FDB_HAS_FILE_LOCK)) { - if ( RC_BAD( rc = dbLock( FLM_LOCK_EXCLUSIVE, 0, XFLM_NO_TIMEOUT))) + if ( RC_BAD( rc = dbLock( FLM_LOCK_EXCLUSIVE, 0, FLM_NO_TIMEOUT))) { goto Exit; } @@ -578,7 +578,7 @@ RCODE FLMAPI F_Db::rollOverDbKey( void) if (!(m_uiFlags & FDB_HAS_FILE_LOCK)) { - if ( RC_BAD( rc = dbLock( FLM_LOCK_EXCLUSIVE, 0, XFLM_NO_TIMEOUT))) + if ( RC_BAD( rc = dbLock( FLM_LOCK_EXCLUSIVE, 0, FLM_NO_TIMEOUT))) { goto Exit; } diff --git a/xflaim/src/flreduce.cpp b/xflaim/src/flreduce.cpp index 86717a1..49b33e3 100644 --- a/xflaim/src/flreduce.cpp +++ b/xflaim/src/flreduce.cpp @@ -80,7 +80,7 @@ RCODE FLMAPI F_Db::reduceSize( if (!(m_uiFlags & FDB_HAS_FILE_LOCK)) { if (RC_BAD( rc = m_pDatabase->m_pDatabaseLockObj->lock( m_hWaitSem, - TRUE, XFLM_NO_TIMEOUT, 0, m_pDbStats ? &m_pDbStats->LockStats : NULL))) + TRUE, FLM_NO_TIMEOUT, 0, m_pDbStats ? &m_pDbStats->LockStats : NULL))) { goto Exit; } @@ -105,7 +105,7 @@ RCODE FLMAPI F_Db::reduceSize( // Start a database transaction if( RC_BAD(rc = beginTrans( XFLM_UPDATE_TRANS, - XFLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) + FLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) { goto Exit; } diff --git a/xflaim/src/flsweep.cpp b/xflaim/src/flsweep.cpp index d502950..c4c941b 100644 --- a/xflaim/src/flsweep.cpp +++ b/xflaim/src/flsweep.cpp @@ -73,7 +73,7 @@ RCODE F_Db::sweep( // Start a read transaction if (RC_BAD( rc = beginTrans( XFLM_READ_TRANS, - XFLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) + FLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) { goto Exit; } @@ -664,7 +664,7 @@ RCODE F_Db::sweepCheckElementState( // Restart the read transaction. if( RC_BAD( rc = beginTrans( XFLM_READ_TRANS, - XFLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) + FLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) { goto Exit; } @@ -914,7 +914,7 @@ RCODE F_Db::sweepCheckAttributeStates( // Restart the read transaction. if( RC_BAD( rc = beginTrans( XFLM_READ_TRANS, - XFLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) + FLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) { goto Exit; } diff --git a/xflaim/src/fltrbeg.cpp b/xflaim/src/fltrbeg.cpp index 6af77ad..31f1dd6 100644 --- a/xflaim/src/fltrbeg.cpp +++ b/xflaim/src/fltrbeg.cpp @@ -719,7 +719,7 @@ RCODE FLMAPI F_Db::dbLock( FLMINT iPriority, // [IN] Priority to be assigned to lock. FLMUINT uiTimeout - // [IN] Seconds to wait for lock to be granted. XFLM_NO_TIMEOUT + // [IN] Seconds to wait for lock to be granted. FLM_NO_TIMEOUT // means that it will wait forever for the lock to be granted. ) { @@ -903,7 +903,7 @@ Desc : Forces a checkpoint on the database. RCODE FLMAPI F_Db::doCheckpoint( FLMUINT uiTimeout // [IN] Seconds to wait to obtain lock on the database. - // XFLM_NO_TIMEOUT means that it will wait forever for + // FLM_NO_TIMEOUT means that it will wait forever for // the lock to be granted. ) { diff --git a/xflaim/src/flverify.cpp b/xflaim/src/flverify.cpp index 429d9c1..45f0933 100644 --- a/xflaim/src/flverify.cpp +++ b/xflaim/src/flverify.cpp @@ -1514,7 +1514,7 @@ Reset: // Try to start a new read transaction if (RC_BAD( rc = m_pDb->transBegin( XFLM_READ_TRANS, - XFLM_NO_TIMEOUT, + FLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) { goto Exit; diff --git a/xflaim/src/fslfileu.cpp b/xflaim/src/fslfileu.cpp index ce98535..ff25a2d 100644 --- a/xflaim/src/fslfileu.cpp +++ b/xflaim/src/fslfileu.cpp @@ -2577,7 +2577,7 @@ RetryLock: // Start an update transaction if( RC_BAD( rc = beginTrans( - XFLM_UPDATE_TRANS, XFLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) + XFLM_UPDATE_TRANS, FLM_NO_TIMEOUT, XFLM_DONT_POISON_CACHE))) { if( rc == NE_XFLM_DATABASE_LOCK_REQ_TIMEOUT) { diff --git a/xflaim/src/fstructs.h b/xflaim/src/fstructs.h index b1e45fb..90b10d1 100644 --- a/xflaim/src/fstructs.h +++ b/xflaim/src/fstructs.h @@ -724,7 +724,7 @@ public: RCODE dbWriteLock( F_SEM hWaitSem, XFLM_DB_STATS * pDbStats = NULL, - FLMUINT uiTimeout = XFLM_NO_TIMEOUT); + FLMUINT uiTimeout = FLM_NO_TIMEOUT); void dbWriteUnlock( void); diff --git a/xflaim/src/rfl.cpp b/xflaim/src/rfl.cpp index 9d3e460..e6e3c5b 100644 --- a/xflaim/src/rfl.cpp +++ b/xflaim/src/rfl.cpp @@ -2027,7 +2027,7 @@ RCODE F_Rfl::finishCurrFile( // Lock the database - need to prevent update // transactions and checkpoint thread from running. - if (RC_BAD( rc = pDb->lockExclusive( XFLM_NO_TIMEOUT))) + if (RC_BAD( rc = pDb->lockExclusive( FLM_NO_TIMEOUT))) { goto Exit; } diff --git a/xflaim/src/xflaim.h b/xflaim/src/xflaim.h index 5cf9484..6f3722e 100644 --- a/xflaim/src/xflaim.h +++ b/xflaim/src/xflaim.h @@ -398,10 +398,6 @@ #define XFLM_DONT_KILL_TRANS 0x1 #define XFLM_DONT_POISON_CACHE 0x2 - // Defines used for uiMaxLockWait parameter - - #define XFLM_NO_TIMEOUT 0xFF - // Backup types typedef enum @@ -2447,7 +2443,7 @@ { virtual RCODE FLMAPI transBegin( eDbTransType eTransType, - FLMUINT uiMaxLockWait = XFLM_NO_TIMEOUT, + FLMUINT uiMaxLockWait = FLM_NO_TIMEOUT, FLMUINT uiFlags = 0, XFLM_DB_HDR * pDbHeader = NULL) = 0; diff --git a/xflaim/util/view.cpp b/xflaim/util/view.cpp index af6f37e..ce410fb 100644 --- a/xflaim/util/view.cpp +++ b/xflaim/util/view.cpp @@ -684,7 +684,7 @@ RCODE ViewGetDictInfo( void) uiFlags = DBF_BEING_OPENED; // VISIT: This needs the other flags... // Start a read transaction. - if (RC_BAD( rc = pDb->transBegin( XFLM_READ_TRANS, XFLM_NO_TIMEOUT, + if (RC_BAD( rc = pDb->transBegin( XFLM_READ_TRANS, FLM_NO_TIMEOUT, uiFlags, NULL))) { gv_bViewHaveDictInfo = FALSE;