From 4a5ee4d53eabfd221e0e1429882dd8ac0e3cf255 Mon Sep 17 00:00:00 2001 From: ahodgkinson Date: Wed, 19 Jul 2006 19:09:30 +0000 Subject: [PATCH] Renamed F_NOTIFY to F_NOTIFY_LIST_ITEM to avoid a conflict on Linux. git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@681 0109f412-320b-0410-ab79-c3e0c5ffbbe6 --- flaim/src/flopen.cpp | 18 ++++++------ flaim/src/fstructs.h | 55 +++++++++++++++++++------------------ flaim/src/fsysdata.cpp | 14 ++-------- flaim/src/rcache.cpp | 62 +++++++++++++++++++++--------------------- flaim/src/recover.cpp | 6 ++-- flaim/src/scache.cpp | 34 +++++++++++------------ ftk/src/ftk.h | 10 +++---- ftk/src/ftksem.cpp | 30 ++++++++++---------- xflaim/src/fcache.h | 10 +++---- xflaim/src/flopen.cpp | 14 +++++----- xflaim/src/fstructs.h | 12 ++++---- xflaim/src/ncache.cpp | 33 +++++++++++----------- xflaim/src/scache.cpp | 28 +++++++++---------- 13 files changed, 159 insertions(+), 167 deletions(-) diff --git a/flaim/src/flopen.cpp b/flaim/src/flopen.cpp index 8069814..cb8ec52 100644 --- a/flaim/src/flopen.cpp +++ b/flaim/src/flopen.cpp @@ -894,8 +894,8 @@ Exit: if (bNotifyWaiters) { - F_NOTIFY * pNotify; - F_SEM hSem; + F_NOTIFY_LIST_ITEM * pNotify; + F_SEM hSem; // Notify any thread waiting on the lock what its status is @@ -1071,8 +1071,8 @@ RCODE flmNewFileFinish( FFILE * pFile, RCODE OpenRc) { - F_NOTIFY * pNotify; - F_SEM hSem; + F_NOTIFY_LIST_ITEM * pNotify; + F_SEM hSem; if (!pFile) { @@ -1270,12 +1270,12 @@ RCODE flmAllocFile( // Allocate a buffer for writing the database header if( RC_BAD( rc = f_allocAlignedBuffer( MAX_BLOCK_SIZE, - (void **)&pFile->pucLogHdrWriteBuf))) + (void **)&pFile->pucLogHdrIOBuf))) { goto Exit; } - f_memset( pFile->pucLogHdrWriteBuf, 0, MAX_BLOCK_SIZE); + f_memset( pFile->pucLogHdrIOBuf, 0, MAX_BLOCK_SIZE); // If a password was passed in, allocate a buffer for it. @@ -1384,7 +1384,7 @@ FSTATIC RCODE flmReadFileHdr( } if (RC_BAD( rc = flmReadAndVerifyHdrInfo( pDbStats, - pFileHdl, pFile->pucLogHdrWriteBuf, + pFileHdl, pFile->pucLogHdrIOBuf, &pFile->FileHdr, pLogHdr, NULL))) { goto Exit; @@ -1393,10 +1393,10 @@ FSTATIC RCODE flmReadFileHdr( // Shove stuff into the log header area of the pFile. // IMPORTANT NOTE! - This code assumes that DB_LOG_HEADER_START // is found in the first 2K of the file - i.e., it will be inside - // the pFile->pucLogHdrWriteBuf that we read above. + // the pFile->pucLogHdrIOBuf that we read above. f_memcpy( pFile->ucLastCommittedLogHdr, - &pFile->pucLogHdrWriteBuf[ DB_LOG_HEADER_START], LOG_HEADER_SIZE); + &pFile->pucLogHdrIOBuf[ DB_LOG_HEADER_START], LOG_HEADER_SIZE); // Create the database wrapping key from the data in Log Header diff --git a/flaim/src/fstructs.h b/flaim/src/fstructs.h index 70f021b..c06e698 100644 --- a/flaim/src/fstructs.h +++ b/flaim/src/fstructs.h @@ -354,7 +354,8 @@ typedef struct SCACHE // just different versions of the same // block. The next block is an older // version of the block. - F_NOTIFY * pNotifyList; // This is a pointer to a list of threads + F_NOTIFY_LIST_ITEM * pNotifyList; + // This is a pointer to a list of threads // that want to be notified when a pending // I/O is complete. This pointer is only // non-null if the block is currently being @@ -571,7 +572,7 @@ typedef struct RCACHE // memory was allocated on the heap RCACHE * pNextInHeapList; // Next in the list of records whose // memory was allocated on the heap - F_NOTIFY * pNotifyList; // This is a pointer to a list of + F_NOTIFY_LIST_ITEM * pNotifyList; // This is a pointer to a list of // threads that want to be notified // when a pending I/O is complete. // This pointer is only non-null if the @@ -1421,14 +1422,14 @@ typedef struct FFILE // belonging to this file that need // to be logged to the rollback log // for the current transaction. - F_NOTIFY * pOpenNotifies; // Pointer to a list of notifies to + F_NOTIFY_LIST_ITEM * pOpenNotifies; // Pointer to a list of notifies to // perform when this file is finally // opened (points to a linked list of - // F_NOTIFY structures). - F_NOTIFY * pCloseNotifies; // Pointer to a list of notifies to + // F_NOTIFY_LIST_ITEM structures). + F_NOTIFY_LIST_ITEM * pCloseNotifies; // Pointer to a list of notifies to // perform when this file is finally // closed (points to a linked list of - // F_NOTIFY structures). + // F_NOTIFY_LIST_ITEM structures). FDICT * pDictList; // Pointer to linked list of // dictionaries currently being used // for this file. The linked list @@ -1516,15 +1517,15 @@ typedef struct FFILE FLMUINT uiCurrLogWriteOffset;// Offset in current write buffer FLMUINT uiCurrLogBlkAddr; // Address of first block in the current // buffer. - FLMBYTE * pucLogHdrWriteBuf; // Aligned buffer (on win) for writing + FLMBYTE * pucLogHdrIOBuf; // Aligned buffer for reading and writing // the log header. IF_LockObject * pFileLockObj; // Object for locking the file. IF_LockObject * pWriteLockObj; // Object for locking to do writing. IF_FileHdl * pLockFileHdl; // Lock file handle for 3.x databases. - F_NOTIFY * pLockNotifies; // Pointer to a list of notifies to + F_NOTIFY_LIST_ITEM * pLockNotifies; // Pointer to a list of notifies to // perform when this file is finally // locked (points to a linked list of - // F_NOTIFY structures). + // F_NOTIFY_LIST_ITEM structures). FLMBOOL bBeingLocked; // Flag indicating whether or not this // file is in the process of being // locked for exclusive access. @@ -1855,29 +1856,29 @@ public: private: RCODE lockSession( - FLMBOOL bWait = TRUE); + FLMBOOL bWait = TRUE); - void unlockSession(); + void unlockSession( void); void signalLockWaiters( - RCODE rc, - FLMBOOL bMutexLocked); + RCODE rc, + FLMBOOL bMutexLocked); - F_SessionMgr * m_pSessionMgr; - F_Session * m_pNext; - F_Session * m_pPrev; - FLMUINT m_uiLastUsed; - FLMUINT m_uiThreadId; - FLMUINT m_uiThreadLockCount; - F_MUTEX m_hMutex; - F_NOTIFY * m_pNotifyList; - F_NameTable * m_pNameTable; - FLMUINT m_uiDictSeqNum; - FLMUINT m_uiNameTableFFileId; - FLMUINT m_uiNextToken; - F_HashTable * m_pDbTable; + F_SessionMgr * m_pSessionMgr; + F_Session * m_pNext; + F_Session * m_pPrev; + FLMUINT m_uiLastUsed; + FLMUINT m_uiThreadId; + FLMUINT m_uiThreadLockCount; + F_MUTEX m_hMutex; + F_NOTIFY_LIST_ITEM * m_pNotifyList; + F_NameTable * m_pNameTable; + FLMUINT m_uiDictSeqNum; + FLMUINT m_uiNameTableFFileId; + FLMUINT m_uiNextToken; + F_HashTable * m_pDbTable; #define F_SESSION_KEY_LEN ((sizeof( FLMUINT) * 5)) - FLMBYTE m_ucKey[ F_SESSION_KEY_LEN]; + FLMBYTE m_ucKey[ F_SESSION_KEY_LEN]; friend class F_SessionMgr; }; diff --git a/flaim/src/fsysdata.cpp b/flaim/src/fsysdata.cpp index 2acb0ad..e717cf5 100644 --- a/flaim/src/fsysdata.cpp +++ b/flaim/src/fsysdata.cpp @@ -311,19 +311,11 @@ FLMEXP RCODE FLMAPI FlmStartup( void) // Set the default file open flags -#ifdef FLM_UNIX - gv_FlmSysData.uiFileOpenFlags = - FLM_IO_RDWR | FLM_IO_SH_DENYNONE; - - gv_FlmSysData.uiFileCreateFlags = - gv_FlmSysData.uiFileOpenFlags | FLM_IO_EXCL | FLM_IO_CREATE_DIR; -#else gv_FlmSysData.uiFileOpenFlags = FLM_IO_RDWR | FLM_IO_SH_DENYNONE | FLM_IO_DIRECT; gv_FlmSysData.uiFileCreateFlags = gv_FlmSysData.uiFileOpenFlags | FLM_IO_EXCL | FLM_IO_CREATE_DIR; -#endif #ifdef FLM_DBG_LOG flmDbgLogInit(); @@ -2007,7 +1999,7 @@ Notes: The global mutex is assumed to be locked when entering the void flmFreeFile( FFILE * pFile) { - F_NOTIFY * pCloseNotifies; + F_NOTIFY_LIST_ITEM * pCloseNotifies; // See if another thread is in the process of closing // this FFILE. It is possible for this to happen, since @@ -2139,9 +2131,9 @@ void flmFreeFile( // Free the log header write buffer - if( pFile->pucLogHdrWriteBuf) + if( pFile->pucLogHdrIOBuf) { - f_freeAlignedBuffer( (void **)&pFile->pucLogHdrWriteBuf); + f_freeAlignedBuffer( (void **)&pFile->pucLogHdrIOBuf); } pFile->krefPool.poolFree(); diff --git a/flaim/src/rcache.cpp b/flaim/src/rcache.cpp index 7fb8681..9b4d66e 100644 --- a/flaim/src/rcache.cpp +++ b/flaim/src/rcache.cpp @@ -175,9 +175,9 @@ FSTATIC RCODE flmRcaSetMemLimit( FLMUINT uiMaxCacheBytes); FSTATIC void flmRcaNotify( - F_NOTIFY * pNotify, - RCACHE * pUseRCache, - RCODE NotifyRc); + F_NOTIFY_LIST_ITEM * pNotify, + RCACHE * pUseRCache, + RCODE NotifyRc); FSTATIC RCODE flmRcaAllocCacheStruct( RCACHE ** ppRCache); @@ -1184,9 +1184,9 @@ Desc: This routine notifies threads waiting for a pending read to complete. locked. ****************************************************************************/ FSTATIC void flmRcaNotify( - F_NOTIFY * pNotify, - RCACHE * pUseRCache, - RCODE NotifyRc) + F_NOTIFY_LIST_ITEM * pNotify, + RCACHE * pUseRCache, + RCODE NotifyRc) { while (pNotify) { @@ -1943,32 +1943,32 @@ FSTATIC void flmRcaLinkToFFILE( Desc: This routine retrieves a record from the record cache. ****************************************************************************/ RCODE flmRcaRetrieveRec( - FDB * pDb, - FLMBOOL * pbTransStarted, - FLMUINT uiContainer, // Container record is in. - FLMUINT uiDrn, // DRN of record. - FLMBOOL bOkToGetFromDisk, // If not in cache, OK to get from disk? - BTSK * pStack, // Use stack to retrieve, if NON-NULL. - LFILE * pLFile, // LFILE to use, if retrieving with stack - FlmRecord ** ppRecord) + FDB * pDb, + FLMBOOL * pbTransStarted, + FLMUINT uiContainer, // Container record is in. + FLMUINT uiDrn, // DRN of record. + FLMBOOL bOkToGetFromDisk, // If not in cache, OK to get from disk? + BTSK * pStack, // Use stack to retrieve, if NON-NULL. + LFILE * pLFile, // LFILE to use, if retrieving with stack + FlmRecord ** ppRecord) { - RCODE rc = FERR_OK; - FLMBOOL bRCacheMutexLocked = FALSE; - FFILE * pFile = pDb->pFile; - RCACHE * pRCache; - RCACHE * pNewerRCache; - RCACHE * pOlderRCache; - FlmRecord * pRecord = NULL; - FLMBOOL bGotFromDisk = FALSE; - FlmRecord * pNewRecord = NULL; - FlmRecord * pOldRecord = NULL; - FLMUINT uiLowTransId; - FLMBOOL bMostCurrent; - FLMUINT uiCurrTransId; - F_NOTIFY * pNotify; - FLMUINT uiNumLooks; - FLMBOOL bInitializedFdb = FALSE; - FLMBOOL bDontPoisonCache = pDb->uiFlags & FDB_DONT_POISON_CACHE + RCODE rc = FERR_OK; + FLMBOOL bRCacheMutexLocked = FALSE; + FFILE * pFile = pDb->pFile; + RCACHE * pRCache; + RCACHE * pNewerRCache; + RCACHE * pOlderRCache; + FlmRecord * pRecord = NULL; + FLMBOOL bGotFromDisk = FALSE; + FlmRecord * pNewRecord = NULL; + FlmRecord * pOldRecord = NULL; + FLMUINT uiLowTransId; + FLMBOOL bMostCurrent; + FLMUINT uiCurrTransId; + F_NOTIFY_LIST_ITEM * pNotify; + FLMUINT uiNumLooks; + FLMBOOL bInitializedFdb = FALSE; + FLMBOOL bDontPoisonCache = pDb->uiFlags & FDB_DONT_POISON_CACHE ? TRUE : FALSE; diff --git a/flaim/src/recover.cpp b/flaim/src/recover.cpp index 5fbd131..1ae2d69 100644 --- a/flaim/src/recover.cpp +++ b/flaim/src/recover.cpp @@ -311,14 +311,14 @@ RCODE flmWriteLogHdr( goto Exit; } - pucTmpLogHdr = &pFile->pucLogHdrWriteBuf[ 16]; + pucTmpLogHdr = &pFile->pucLogHdrIOBuf[ 16]; uiBytesToWrite = LOG_HEADER_SIZE + 16; // Very Important Note: FlmDbConfig relies on the fact that we will // write out the prefix area of the database header. Do not remove // this code. - flmSetFilePrefix( pFile->pucLogHdrWriteBuf, pFile->FileHdr.uiAppMajorVer, + flmSetFilePrefix( pFile->pucLogHdrIOBuf, pFile->FileHdr.uiAppMajorVer, pFile->FileHdr.uiAppMinorVer); // Only copy the part of the header that is relevant for this @@ -406,7 +406,7 @@ RCODE flmWriteLogHdr( if( RC_BAD( rc = pSFileHdl->writeBlock( 0, (FLMUINT)f_roundUp( uiBytesToWrite, 512), - pFile->pucLogHdrWriteBuf, NULL))) + pFile->pucLogHdrIOBuf, NULL))) { if (pDbStats) { diff --git a/flaim/src/scache.cpp b/flaim/src/scache.cpp index fbc1c98..d900563 100644 --- a/flaim/src/scache.cpp +++ b/flaim/src/scache.cpp @@ -92,9 +92,9 @@ FSTATIC void _ScaDbgReleaseForThread( #endif FSTATIC void ScaNotify( - F_NOTIFY * pNotify, - SCACHE * pUseSCache, - RCODE NotifyRc); + F_NOTIFY_LIST_ITEM * pNotify, + SCACHE * pUseSCache, + RCODE NotifyRc); FSTATIC void ScaFree( SCACHE * pSCache); @@ -1334,9 +1334,9 @@ Desc: This routine notifies threads waiting for a pending read or write locked. ****************************************************************************/ FSTATIC void ScaNotify( - F_NOTIFY * pNotify, - SCACHE * pUseSCache, - RCODE NotifyRc) + F_NOTIFY_LIST_ITEM * pNotify, + SCACHE * pUseSCache, + RCODE NotifyRc) { while( pNotify) { @@ -4530,17 +4530,17 @@ FSTATIC RCODE ScaReadIntoCache( FLMBOOL * pbGotFromDisk) // Returns TRUE if block was read // from disk { - RCODE rc = FERR_OK; - SCACHE * pSCache; - SCACHE * pTmpSCache; - F_NOTIFY * pNotify; - FLMUINT uiFilePos; - FLMUINT uiNewerBlkLowTransID = 0; - FLMUINT uiExpectedLowTransID = 0; - FLMBOOL bFoundVer; - FLMBOOL bDiscard; - FLMUINT uiSavePrevLowTransID; - FLMUINT uiSavePrevHighTransID; + RCODE rc = FERR_OK; + SCACHE * pSCache; + SCACHE * pTmpSCache; + F_NOTIFY_LIST_ITEM * pNotify; + FLMUINT uiFilePos; + FLMUINT uiNewerBlkLowTransID = 0; + FLMUINT uiExpectedLowTransID = 0; + FLMBOOL bFoundVer; + FLMBOOL bDiscard; + FLMUINT uiSavePrevLowTransID; + FLMUINT uiSavePrevHighTransID; *pbGotFromDisk = FALSE; diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h index 3d67496..9578064 100644 --- a/ftk/src/ftk.h +++ b/ftk/src/ftk.h @@ -2212,9 +2212,9 @@ Desc: Notify Lists ****************************************************************************/ - typedef struct F_NOTIFY + typedef struct F_NOTIFY_LIST_ITEM { - F_NOTIFY * pNext; ///< Pointer to next F_NOTIFY structure in list. + F_NOTIFY_LIST_ITEM * pNext; ///< Pointer to next F_NOTIFY_LIST_ITEM structure in list. FLMUINT uiThreadId; ///< ID of thread requesting the notify RCODE * pRc; ///< Pointer to a return code variable that is to ///< be filled in when the operation is completed. @@ -2224,16 +2224,16 @@ ///< notify routine F_SEM hSem; ///< Semaphore that will be signaled when the ///< operation is complete. - } F_NOTIFY; + } F_NOTIFY_LIST_ITEM; RCODE FLMAPI f_notifyWait( F_MUTEX hMutex, F_SEM hSem, void * pvData, - F_NOTIFY ** ppNotifyList); + F_NOTIFY_LIST_ITEM ** ppNotifyList); void FLMAPI f_notifySignal( - F_NOTIFY * pNotifyList, + F_NOTIFY_LIST_ITEM * pNotifyList, RCODE notifyRc); /**************************************************************************** diff --git a/ftk/src/ftksem.cpp b/ftk/src/ftksem.cpp index 3fc2fea..54875cc 100644 --- a/ftk/src/ftksem.cpp +++ b/ftk/src/ftksem.cpp @@ -31,7 +31,7 @@ Desc: typedef struct { F_MUTEX hMutex; - F_NOTIFY * pNotifyList; + F_NOTIFY_LIST_ITEM * pNotifyList; FLMUINT uiWriteThread; FLMINT iRefCnt; } F_RWLOCK_IMP; @@ -889,10 +889,10 @@ void FLMAPI f_semSignal( Desc: ****************************************************************************/ FSTATIC void f_rwlockNotify( - F_RWLOCK_IMP * pReadWriteLock) + F_RWLOCK_IMP * pReadWriteLock) { - F_NOTIFY * pNotify = pReadWriteLock->pNotifyList; - FLMBOOL bFoundWriter = FALSE; + F_NOTIFY_LIST_ITEM * pNotify = pReadWriteLock->pNotifyList; + FLMBOOL bFoundWriter = FALSE; f_assertMutexLocked( pReadWriteLock->hMutex); @@ -1159,18 +1159,18 @@ Desc: This routine links a request into a notification list and is assumed to protect the notify list. ****************************************************************************/ RCODE FLMAPI f_notifyWait( - F_MUTEX hMutex, - F_SEM hSem, - void * pvData, - F_NOTIFY ** ppNotifyList) + F_MUTEX hMutex, + F_SEM hSem, + void * pvData, + F_NOTIFY_LIST_ITEM ** ppNotifyList) { - RCODE rc = NE_FLM_OK; - RCODE tmpRc; - F_NOTIFY stackNotify; - F_NOTIFY * pNotify = &stackNotify; + RCODE rc = NE_FLM_OK; + RCODE tmpRc; + F_NOTIFY_LIST_ITEM stackNotify; + F_NOTIFY_LIST_ITEM * pNotify = &stackNotify; f_assertMutexLocked( hMutex); - f_memset( &stackNotify, 0, sizeof( F_NOTIFY)); + f_memset( &stackNotify, 0, sizeof( F_NOTIFY_LIST_ITEM)); pNotify->uiThreadId = f_threadId(); pNotify->hSem = F_SEM_NULL; @@ -1224,8 +1224,8 @@ Desc: This routine notifies threads waiting for a pending read or write is already locked. ****************************************************************************/ void FLMAPI f_notifySignal( - F_NOTIFY * pNotifyList, - RCODE notifyRc) + F_NOTIFY_LIST_ITEM * pNotifyList, + RCODE notifyRc) { while( pNotifyList) { diff --git a/xflaim/src/fcache.h b/xflaim/src/fcache.h index 3c7875d..e08cc62 100644 --- a/xflaim/src/fcache.h +++ b/xflaim/src/fcache.h @@ -1380,7 +1380,7 @@ private: // just different versions of the same // block. The next block is an older // version of the block. - F_NOTIFY * m_pNotifyList; // This is a pointer to a list of threads + F_NOTIFY_LIST_ITEM * m_pNotifyList; // This is a pointer to a list of threads // that want to be notified when a pending // I/O is complete. This pointer is only // non-null if the block is currently being @@ -1668,9 +1668,9 @@ private: F_CachedNode ** ppNode); void notifyWaiters( - F_NOTIFY * pNotify, - F_CachedNode * pUseNode, - RCODE NotifyRc); + F_NOTIFY_LIST_ITEM * pNotify, + F_CachedNode * pUseNode, + RCODE NotifyRc); void linkIntoNodeCache( F_CachedNode * pNewerNode, @@ -3486,7 +3486,7 @@ private: FLMUINT64 m_ui64LowTransId; FLMUINT64 m_ui64HighTransId; - F_NOTIFY * m_pNotifyList; + F_NOTIFY_LIST_ITEM * m_pNotifyList; FLMUINT m_uiCacheFlags; FLMUINT m_uiStreamUseCount; diff --git a/xflaim/src/flopen.cpp b/xflaim/src/flopen.cpp index c06c6e7..151b432 100644 --- a/xflaim/src/flopen.cpp +++ b/xflaim/src/flopen.cpp @@ -633,8 +633,8 @@ Exit: if (bNotifyWaiters) { - F_NOTIFY * pNotify; - F_SEM hSem; + F_NOTIFY_LIST_ITEM * pNotify; + F_SEM hSem; // Notify any thread waiting on the lock what its status is. @@ -767,8 +767,8 @@ void F_Database::newDatabaseFinish( RCODE OpenRc) // Return code to send to other threads that are // waiting for the open to complete. { - F_NOTIFY * pNotify; - F_SEM hSem; + F_NOTIFY_LIST_ITEM * pNotify; + F_SEM hSem; // Notify anyone waiting on the operation what its status is. @@ -1071,9 +1071,9 @@ Notes: The global mutex is assumed to be locked when entering the ****************************************************************************/ F_Database::~F_Database() { - F_NOTIFY * pCloseNotifies; - F_Dict * pDict; - F_Dict * pTmpDict; + F_NOTIFY_LIST_ITEM * pCloseNotifies; + F_Dict * pDict; + F_Dict * pTmpDict; // At this point, the use count better be zero diff --git a/xflaim/src/fstructs.h b/xflaim/src/fstructs.h index cf3da58..29c0de3 100644 --- a/xflaim/src/fstructs.h +++ b/xflaim/src/fstructs.h @@ -1155,14 +1155,14 @@ private: // belonging to this database that need // to be logged to the rollback log // for the current transaction. - F_NOTIFY * m_pOpenNotifies; // Pointer to a list of notifies to + F_NOTIFY_LIST_ITEM * m_pOpenNotifies; // Pointer to a list of notifies to // perform when this database is finally // opened (points to a linked list of - // F_NOTIFY structures). - F_NOTIFY * m_pCloseNotifies; // Pointer to a list of notifies to + // F_NOTIFY_LIST_ITEM structures). + F_NOTIFY_LIST_ITEM * m_pCloseNotifies; // Pointer to a list of notifies to // perform when this database is finally // closed (points to a linked list of - // F_NOTIFY structures). + // F_NOTIFY_LIST_ITEM structures). F_Dict * m_pDictList; // Pointer to linked list of // dictionaries currently being used // for this database. The linked list @@ -1225,10 +1225,10 @@ private: IF_LockObject * m_pDatabaseLockObj; // Object for locking the database. IF_LockObject * m_pWriteLockObj; // Object for locking to do writing. IF_FileHdl * m_pLockFileHdl; // Lock file handle. - F_NOTIFY * m_pLockNotifies; // Pointer to a list of notifies to + F_NOTIFY_LIST_ITEM * m_pLockNotifies; // Pointer to a list of notifies to // perform when this database is finally // locked (points to a linked list of - // F_NOTIFY structures). + // F_NOTIFY_LIST_ITEM structures). FLMBOOL m_bBeingLocked; // Flag indicating whether or not this // database is in the process of being // locked for exclusive access. diff --git a/xflaim/src/ncache.cpp b/xflaim/src/ncache.cpp index 1c2c6f4..0a33da2 100644 --- a/xflaim/src/ncache.cpp +++ b/xflaim/src/ncache.cpp @@ -875,9 +875,9 @@ Desc: This routine notifies threads waiting for a pending read to complete. NOTE: This routine assumes that the node cache mutex is already locked. ****************************************************************************/ void F_NodeCacheMgr::notifyWaiters( - F_NOTIFY * pNotify, - F_CachedNode * pUseNode, - RCODE NotifyRc) + F_NOTIFY_LIST_ITEM * pNotify, + F_CachedNode * pUseNode, + RCODE NotifyRc) { while (pNotify) { @@ -1914,21 +1914,20 @@ RCODE F_NodeCacheMgr::retrieveNode( F_Db * pDb, FLMUINT uiCollection, // Collection node is in. FLMUINT64 ui64NodeId, // Node ID - F_DOMNode ** ppDOMNode - ) + F_DOMNode ** ppDOMNode) { - RCODE rc = NE_XFLM_OK; - FLMBOOL bMutexLocked = FALSE; - F_Database * pDatabase = pDb->m_pDatabase; - F_CachedNode * pNode; - F_CachedNode * pNewerNode; - F_CachedNode * pOlderNode; - FLMUINT64 ui64LowTransId; - FLMBOOL bMostCurrent; - FLMUINT64 ui64CurrTransId; - F_NOTIFY * pNotify; - FLMUINT uiNumLooks; - FLMBOOL bDontPoisonCache = pDb->m_uiFlags & FDB_DONT_POISON_CACHE + RCODE rc = NE_XFLM_OK; + FLMBOOL bMutexLocked = FALSE; + F_Database * pDatabase = pDb->m_pDatabase; + F_CachedNode * pNode; + F_CachedNode * pNewerNode; + F_CachedNode * pOlderNode; + FLMUINT64 ui64LowTransId; + FLMBOOL bMostCurrent; + FLMUINT64 ui64CurrTransId; + F_NOTIFY_LIST_ITEM * pNotify; + FLMUINT uiNumLooks; + FLMBOOL bDontPoisonCache = pDb->m_uiFlags & FDB_DONT_POISON_CACHE ? TRUE : FALSE; diff --git a/xflaim/src/scache.cpp b/xflaim/src/scache.cpp index 2c6b824..4d77729 100644 --- a/xflaim/src/scache.cpp +++ b/xflaim/src/scache.cpp @@ -29,9 +29,9 @@ #define FLM_MAX_IO_BUFFER_BLOCKS 16 FSTATIC void ScaNotify( - F_NOTIFY * pNotify, - F_CachedBlock * pUseSCache, - RCODE NotifyRc); + F_NOTIFY_LIST_ITEM * pNotify, + F_CachedBlock * pUseSCache, + RCODE NotifyRc); #ifdef SCACHE_LINK_CHECKING FSTATIC void scaVerify( @@ -573,9 +573,9 @@ Desc: This routine notifies threads waiting for a pending read or write locked. ****************************************************************************/ FSTATIC void ScaNotify( - F_NOTIFY * pNotify, - F_CachedBlock * pUseSCache, - RCODE NotifyRc) + F_NOTIFY_LIST_ITEM * pNotify, + F_CachedBlock * pUseSCache, + RCODE NotifyRc) { while( pNotify) { @@ -3417,14 +3417,14 @@ RCODE F_Database::readIntoCache( FLMBOOL * pbGotFromDisk) // Returns TRUE if block was read // from disk { - RCODE rc = NE_XFLM_OK; - F_CachedBlock * pSCache; - F_CachedBlock * pTmpSCache; - F_NOTIFY * pNotify; - FLMUINT uiFilePos; - FLMUINT64 ui64NewerBlkLowTransID = 0; - FLMBOOL bFoundVer; - FLMBOOL bDiscard; + RCODE rc = NE_XFLM_OK; + F_CachedBlock * pSCache; + F_CachedBlock * pTmpSCache; + F_NOTIFY_LIST_ITEM * pNotify; + FLMUINT uiFilePos; + FLMUINT64 ui64NewerBlkLowTransID = 0; + FLMBOOL bFoundVer; + FLMBOOL bDiscard; flmAssert( this == pDb->m_pDatabase);