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

Added option in FLAIM to disable direct I/O on Linux and Unix platforms. Re-architected the FTK I/O layer and cleaned up the async interfaces.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@643 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-07-10 23:38:53 +00:00
parent 91816d4c49
commit c44e49e82c
77 changed files with 7192 additions and 9159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
xflaim/src/recover.cpp
View File

@@ -249,7 +249,7 @@ RCODE F_Db::processBeforeImage(
m_pSFileHdl->setMaxAutoExtendSize( m_pDatabase->m_uiMaxFileSize);
m_pSFileHdl->setExtendSize( m_pDatabase->m_uiFileExtendSize);
rc = m_pSFileHdl->writeBlock( uiBlkAddress, uiBlkLength, pBlkHdr,
NULL, &uiBytesWritten);
&uiBytesWritten);
#ifdef FLM_DBG_LOG
flmDbgLogWrite( m_pDatabase, uiBlkAddress, 0, ui64TransID,
"ROLLBACK");
@@ -290,7 +290,6 @@ RCODE F_Database::writeDbHdr(
{
RCODE rc = NE_XFLM_OK;
FLMUINT uiBytesWritten;
IF_FileHdl * pCFileHdl = NULL;
XFLM_DB_HDR * pTmpDbHdr;
F_TMSTAMP StartTime;
@@ -354,13 +353,8 @@ RCODE F_Database::writeDbHdr(
f_timeGetTimeStamp( &StartTime);
}
if( RC_BAD( rc = pSFileHdl->getFileHdl( 0, TRUE, &pCFileHdl)))
{
goto Exit;
}
if( RC_BAD( rc = pCFileHdl->sectorWrite( 0,
uiBytesWritten, pTmpDbHdr, NULL, &uiBytesWritten)))
if( RC_BAD( rc = pSFileHdl->writeBlock( 0,
uiBytesWritten, pTmpDbHdr, &uiBytesWritten)))
{
if (pDbStats)
{
@@ -377,7 +371,7 @@ RCODE F_Database::writeDbHdr(
// Finally, force the header to disk.
if (RC_BAD( rc = pCFileHdl->flush()))
if (RC_BAD( rc = pSFileHdl->flush()))
{
goto Exit;
}
@@ -435,7 +429,6 @@ RCODE F_Db::physRollback(
// blocks along the way.
uiCurrAddr = uiFirstLogBlkAddr;
m_pSFileHdl->enableFlushMinimize();
while (FSAddrIsBelow( uiCurrAddr, uiLogEOF))
{
if (RC_BAD( rc = processBeforeImage( uiLogEOF, &uiCurrAddr,
@@ -454,7 +447,6 @@ RCODE F_Db::physRollback(
}
Exit:
m_pSFileHdl->disableFlushMinimize();
// Free the memory handle, if one was allocated.