mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Got rid of XFLM_NO_TIMEOUT and replaced it with FLM_NO_TIMEOUT from FTK.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@486 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-05-30 22:32:41 +00:00
parent 2c520933ae
commit d07c2efb64
18 changed files with 34 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xflaim/sample/sample.cpp
+3 -3
View File
@@ -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:
// .
// </disc>
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;
}
xflaim/src/fdbcnfig.cpp
+4 -6
View File
@@ -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;
}
xflaim/src/fdbcopy.cpp
+2 -2
View File
@@ -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;
}
xflaim/src/flaimsys.h
+2 -2
View File
@@ -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);
xflaim/src/flbackup.cpp
+1 -1
View File
@@ -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;
}
xflaim/src/flblddb.cpp
+2 -2
View File
@@ -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;
}
xflaim/src/flchkdb.cpp
+1 -1
View File
@@ -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;
}
xflaim/src/flchkix.cpp
+3 -3
View File
@@ -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))
{
xflaim/src/flconvrt.cpp
+3 -3
View File
@@ -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;
}
xflaim/src/flreduce.cpp
+2 -2
View File
@@ -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;
}
xflaim/src/flsweep.cpp
+3 -3
View File
@@ -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;
}
xflaim/src/fltrbeg.cpp
+2 -2
View File
@@ -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.
)
{
xflaim/src/flverify.cpp
+1 -1
View File
@@ -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;
xflaim/src/fslfileu.cpp
+1 -1
View File
@@ -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)
{
xflaim/src/fstructs.h
+1 -1
View File
@@ -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);
xflaim/src/rfl.cpp
+1 -1
View File
@@ -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;
}
xflaim/src/xflaim.h
+1 -5
View File
@@ -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;
xflaim/util/view.cpp
+1 -1
View File
@@ -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;