diff --git a/flaim/Makefile b/flaim/Makefile index 03f7d86..30ad6da 100644 --- a/flaim/Makefile +++ b/flaim/Makefile @@ -971,7 +971,7 @@ ifdef unix_target ifeq ($(target_os_family),aix) ifeq ($(usenativecc),yes) - ccflags += -qthreaded + ccflags += -qthreaded -qstrict ifeq ($(target_word_size),64) ccflags += -q64 else @@ -1020,6 +1020,7 @@ ifdef unix_target shared_link_flags = link_flags = -o $@ + libr_flags = ifeq ($(compiler),g++) ifneq ($(target_processor_family),ia64) @@ -1055,6 +1056,14 @@ ifdef unix_target endif ifeq ($(target_os_family),aix) + ifeq ($(target_word_size),64) + link_flags += -q64 + libr_flags = -X64 + else + link_flags += -q32 + libr_flags = -X32 + endif + lib_link_libs += -lm -lc -lcurses exe_link_libs += -lm -lc -lcurses endif @@ -1550,7 +1559,7 @@ ifdef unix_target ifeq ($(target_os_family),osx) $(ec)$(libr) -static -o $@ $+ else - $(ec)$(libr) -rcs $@ $+ + $(ec)$(libr) $(libr_flags) -rcs $@ $+ endif endif ifdef netware_target diff --git a/flaim/src/fblob.cpp b/flaim/src/fblob.cpp index 776c083..e1dfbe9 100644 --- a/flaim/src/fblob.cpp +++ b/flaim/src/fblob.cpp @@ -254,7 +254,7 @@ RCODE FlmBlobImp::closeFile() { if( m_pFileHdl) { - m_pFileHdl->close(); + m_pFileHdl->closeFile(); m_bFileAccessed = FALSE; m_pFileHdl->Release(); diff --git a/flaim/src/fdbcopy.cpp b/flaim/src/fdbcopy.cpp index ae399df..159382e 100644 --- a/flaim/src/fdbcopy.cpp +++ b/flaim/src/fdbcopy.cpp @@ -1101,7 +1101,7 @@ FSTATIC RCODE flmCopyFile( if (!bCreatedDestFile && bOkToTruncate) { - if (RC_BAD( rc = pDestFileHdl->truncate( uiOffset))) + if (RC_BAD( rc = pDestFileHdl->truncateFile( uiOffset))) { goto Exit; } diff --git a/flaim/src/flbackup.cpp b/flaim/src/flbackup.cpp index 152f4af..295059b 100644 --- a/flaim/src/flbackup.cpp +++ b/flaim/src/flbackup.cpp @@ -2233,7 +2233,7 @@ FSTATIC RCODE flmDefaultBackerWriteHook( goto Exit; } - if( RC_BAD( rc = pState->pMultiFileHdl->create( pState->szPath))) + if( RC_BAD( rc = pState->pMultiFileHdl->createFile( pState->szPath))) { pState->pMultiFileHdl->Release(); pState->pMultiFileHdl = NULL; @@ -2260,10 +2260,8 @@ Exit: return( rc); } -// F_BackerStream methods - /**************************************************************************** -Desc: Constructor +Desc: ****************************************************************************/ F_BackerStream::F_BackerStream( void) { @@ -2291,7 +2289,7 @@ F_BackerStream::F_BackerStream( void) } /**************************************************************************** -Desc: Destructor +Desc: ****************************************************************************/ F_BackerStream::~F_BackerStream( void) { @@ -2318,9 +2316,8 @@ F_BackerStream::~F_BackerStream( void) } } - /**************************************************************************** -Desc: Start any background threads +Desc: Start any background threads ****************************************************************************/ RCODE F_BackerStream::startThreads( void) { @@ -2386,7 +2383,7 @@ Exit: } /**************************************************************************** -Desc: Shut down any background threads +Desc: Shut down any background threads ****************************************************************************/ void F_BackerStream::shutdownThreads( void) { @@ -2407,7 +2404,7 @@ void F_BackerStream::shutdownThreads( void) } /**************************************************************************** -Desc: Setup method to use the backer stream as an input stream +Desc: Setup method to use the backer stream as an input stream ****************************************************************************/ RCODE F_BackerStream::setup( FLMUINT uiMTUSize, @@ -2441,7 +2438,7 @@ Exit: } /**************************************************************************** -Desc: Setup method to use the backer stream as an output stream +Desc: Setup method to use the backer stream as an output stream ****************************************************************************/ RCODE F_BackerStream::setup( FLMUINT uiMTUSize, @@ -2477,7 +2474,7 @@ Exit: } /**************************************************************************** -Desc: Performs setup operations common to read and write streams +Desc: Performs setup operations common to read and write streams ****************************************************************************/ RCODE F_BackerStream::_setup( void) { @@ -2516,7 +2513,7 @@ Exit: } /**************************************************************************** -Desc: Reads data from the input stream +Desc: Reads data from the input stream ****************************************************************************/ RCODE F_BackerStream::read( FLMUINT uiLength, @@ -2603,7 +2600,7 @@ Exit: } /**************************************************************************** -Desc: Writes data to the output stream +Desc: Writes data to the output stream ****************************************************************************/ RCODE F_BackerStream::write( FLMUINT uiLength, @@ -2661,7 +2658,7 @@ Exit: } /**************************************************************************** -Desc: Flushes any pending writes to the output stream +Desc: Flushes any pending writes to the output stream ****************************************************************************/ RCODE F_BackerStream::flush( void) { @@ -2715,8 +2712,8 @@ Exit: } /**************************************************************************** -Desc: Signals the read or write thread indicating that data is needed or - that data is available. +Desc: Signals the read or write thread indicating that data is needed or + that data is available. ****************************************************************************/ RCODE F_BackerStream::signalThread( void) { @@ -2791,7 +2788,7 @@ Exit: } /**************************************************************************** -Desc: This thread reads data in the background +Desc: This thread reads data in the background ****************************************************************************/ RCODE FLMAPI F_BackerStream::readThread( IF_Thread * pThread) @@ -2835,7 +2832,7 @@ Exit: } /**************************************************************************** -Desc: This thread writes data in the background +Desc: This thread writes data in the background ****************************************************************************/ RCODE FLMAPI F_BackerStream::writeThread( IF_Thread * pThread) @@ -2955,7 +2952,7 @@ RCODE F_FSRestore::openBackupSet( void) goto Exit; } - if( RC_BAD( rc = m_pMultiFileHdl->open( m_szBackupSetPath))) + if( RC_BAD( rc = m_pMultiFileHdl->openFile( m_szBackupSetPath))) { m_pMultiFileHdl->Release(); m_pMultiFileHdl = NULL; @@ -3086,7 +3083,7 @@ RCODE F_FSRestore::openIncFile( goto Exit; } - if( RC_BAD( rc = m_pMultiFileHdl->open( szIncPath))) + if( RC_BAD( rc = m_pMultiFileHdl->openFile( szIncPath))) { m_pMultiFileHdl->Release(); m_pMultiFileHdl = NULL; diff --git a/flaim/src/rfl.cpp b/flaim/src/rfl.cpp index 090a0f3..d8440b3 100644 --- a/flaim/src/rfl.cpp +++ b/flaim/src/rfl.cpp @@ -1161,7 +1161,7 @@ RCODE F_Rfl::createFile( } else { - if( RC_BAD( rc = m_pFileHdl->truncate( m_pFile->uiFileExtendSize))) + if( RC_BAD( rc = m_pFileHdl->truncateFile( m_pFile->uiFileExtendSize))) { goto Exit; } @@ -2119,7 +2119,7 @@ RCODE F_Rfl::seeIfNeedNewFile( uiCurrFileEOF = ROUND_DOWN_TO_NEAREST_512( uiCurrFileEOF) + 512; } - if (RC_BAD( rc = m_pFileHdl->truncate( uiCurrFileEOF))) + if (RC_BAD( rc = m_pFileHdl->truncateFile( uiCurrFileEOF))) { goto Exit; } @@ -2317,7 +2317,7 @@ RCODE F_Rfl::finishCurrFile( uiTruncateSize = ROUND_DOWN_TO_NEAREST_512( uiTruncateSize) + 512; } - if (RC_BAD( rc = m_pFileHdl->truncate( uiTruncateSize))) + if (RC_BAD( rc = m_pFileHdl->truncateFile( uiTruncateSize))) { goto Exit; } @@ -2550,7 +2550,7 @@ RCODE F_Rfl::truncate( goto Exit; } - if (RC_BAD( rc = m_pFileHdl->truncate( uiTruncateSize))) + if (RC_BAD( rc = m_pFileHdl->truncateFile( uiTruncateSize))) { m_bRflVolumeOk = FALSE; goto Exit; diff --git a/flaim/util/flm_dlst.cpp b/flaim/util/flm_dlst.cpp index 3fc98aa..0c051d9 100644 --- a/flaim/util/flm_dlst.cpp +++ b/flaim/util/flm_dlst.cpp @@ -678,7 +678,7 @@ RCODE F_DynamicList::dumpToFile() pTmp = pTmp->pNext; } - pFileHdl->close(); + pFileHdl->closeFile(); } Exit_local: diff --git a/ftk/Makefile b/ftk/Makefile index 354cf79..7a896f7 100644 --- a/ftk/Makefile +++ b/ftk/Makefile @@ -938,7 +938,7 @@ ifdef unix_target ifeq ($(target_os_family),aix) ifeq ($(usenativecc),yes) - ccflags += -qthreaded + ccflags += -qthreaded -qstrict ifeq ($(target_word_size),64) ccflags += -q64 else @@ -987,6 +987,7 @@ ifdef unix_target shared_link_flags = link_flags = -o $@ + libr_flags = ifeq ($(compiler),g++) ifneq ($(target_processor_family),ia64) @@ -1019,6 +1020,13 @@ ifdef unix_target endif ifeq ($(target_os_family),aix) + ifeq ($(target_word_size),64) + link_flags += -q64 + libr_flags = -X64 + else + link_flags += -q32 + libr_flags = -X32 + endif link_libs += -lm -lc -lcurses endif @@ -1407,7 +1415,7 @@ ifdef unix_target ifeq ($(target_os_family),osx) $(ec)$(libr) -static -o $@ $+ else - $(ec)$(libr) -rcs $@ $+ + $(ec)$(libr) $(libr_flags) -rcs $@ $+ endif endif ifdef netware_target @@ -1467,6 +1475,7 @@ srcdist: status clean dircheck docs spec $(ec)$(call copycmd,COPYING,$(package_stage_dir)) $(ec)$(call copycmd,Doxyfile,$(package_stage_dir)) $(ec)$(call dircopycmd,src,$(package_stage_dir)/src) + $(ec)$(call dircopycmd,util,$(package_stage_dir)/util) $(ec)$(call dircopycmd,$(docs_output_dir),$(package_stage_dir)/docs) $(ec)$(call dircopycmd,$(dir $(topdir))tools,$(package_stage_dir)/tools) ifneq ($(host_os_family),win) diff --git a/ftk/src/ftk.h b/ftk/src/ftk.h index ff96390..b916492 100644 --- a/ftk/src/ftk.h +++ b/ftk/src/ftk.h @@ -1165,7 +1165,7 @@ FLMUINT uiBytesToRead, FLMUINT * puiBytesRead = NULL) = 0; - virtual RCODE FLMAPI close( void) = 0; + virtual RCODE FLMAPI closeStream( void) = 0; }; /**************************************************************************** @@ -1188,7 +1188,7 @@ ****************************************************************************/ flminterface FLMEXP IF_BufferIStream : public IF_PosIStream { - virtual RCODE FLMAPI open( + virtual RCODE FLMAPI openStream( const char * pucBuffer, FLMUINT uiLength, char ** ppucAllocatedBuffer = NULL) = 0; @@ -1197,14 +1197,14 @@ virtual FLMUINT64 FLMAPI remainingSize( void) = 0; - virtual RCODE FLMAPI close( void) = 0; + virtual RCODE FLMAPI closeStream( void) = 0; virtual RCODE FLMAPI positionTo( FLMUINT64 ui64Position) = 0; virtual FLMUINT64 FLMAPI getCurrPosition( void) = 0; - virtual void FLMAPI truncate( + virtual void FLMAPI truncateStream( FLMUINT64 ui64Offset = 0) = 0; virtual RCODE FLMAPI read( @@ -1291,14 +1291,14 @@ flminterface FLMEXP IF_CollIStream : public IF_PosIStream { - virtual RCODE FLMAPI open( + virtual RCODE FLMAPI openStream( IF_PosIStream * pIStream, FLMBOOL bUnicodeStream, FLMUINT uiLanguage, FLMUINT uiCompareRules, FLMBOOL bMayHaveWildCards) = 0; - virtual RCODE FLMAPI close( void) = 0; + virtual RCODE FLMAPI closeStream( void) = 0; virtual RCODE FLMAPI read( void * pvBuffer, @@ -1339,7 +1339,7 @@ FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten = NULL) = 0; - virtual RCODE FLMAPI close( void) = 0; + virtual RCODE FLMAPI closeStream( void) = 0; }; /**************************************************************************** @@ -1624,10 +1624,10 @@ virtual RCODE FLMAPI tell( FLMUINT64 * pui64Offset) = 0; - virtual RCODE FLMAPI truncate( + virtual RCODE FLMAPI truncateFile( FLMUINT64 ui64Offset = 0) = 0; - virtual RCODE FLMAPI close( void) = 0; + virtual RCODE FLMAPI closeFile( void) = 0; virtual FLMBOOL FLMAPI canDoAsync( void) = 0; @@ -1679,14 +1679,14 @@ ****************************************************************************/ flminterface FLMEXP IF_MultiFileHdl : public F_Object { - virtual RCODE FLMAPI create( + virtual RCODE FLMAPI createFile( const char * pszPath) = 0; - virtual RCODE FLMAPI createUnique( + virtual RCODE FLMAPI createUniqueFile( const char * pszPath, const char * pszFileExtension) = 0; - virtual RCODE FLMAPI open( + virtual RCODE FLMAPI openFile( const char * pszPath) = 0; virtual RCODE FLMAPI deleteMultiFile( @@ -1712,10 +1712,10 @@ virtual RCODE FLMAPI size( FLMUINT64 * pui64FileSize) = 0; - virtual RCODE FLMAPI truncate( + virtual RCODE FLMAPI truncateFile( FLMUINT64 ui64Offset = 0) = 0; - virtual void FLMAPI close( + virtual void FLMAPI closeFile( FLMBOOL bDelete = FALSE) = 0; }; @@ -5681,7 +5681,7 @@ virtual ~F_BufferIStream(); - RCODE FLMAPI open( + RCODE FLMAPI openStream( const char * pucBuffer, FLMUINT uiLength, char ** ppucAllocatedBuffer = NULL); @@ -5698,7 +5698,7 @@ return( m_uiBufferLen - m_uiOffset); } - RCODE FLMAPI close( void); + RCODE FLMAPI closeStream( void); FINLINE RCODE FLMAPI positionTo( FLMUINT64 ui64Position) @@ -5723,7 +5723,7 @@ return( m_uiOffset); } - FINLINE void FLMAPI truncate( + FINLINE void FLMAPI truncateStream( FLMUINT64 ui64Offset = 0) { f_assert( m_bIsOpen); @@ -5785,10 +5785,10 @@ } } - RCODE FLMAPI open( + RCODE FLMAPI openStream( const char * pszPath); - RCODE FLMAPI close( void); + RCODE FLMAPI closeStream( void); RCODE FLMAPI positionTo( FLMUINT64 ui64Position); @@ -5825,10 +5825,10 @@ virtual ~F_BufferedIStream() { - close(); + closeStream(); } - RCODE FLMAPI open( + RCODE FLMAPI openStream( IF_IStream * pIStream, FLMUINT uiBufferSize); @@ -5837,7 +5837,7 @@ FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - RCODE FLMAPI close( void); + RCODE FLMAPI closeStream( void); FINLINE FLMUINT64 FLMAPI totalSize( void) { @@ -5917,10 +5917,10 @@ virtual ~F_BufferedOStream() { - close(); + closeStream(); } - RCODE FLMAPI open( + RCODE FLMAPI openStream( IF_OStream * pOStream, FLMUINT uiBufferSize); @@ -5929,7 +5929,7 @@ FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten); - RCODE FLMAPI close( void); + RCODE FLMAPI closeStream( void); RCODE FLMAPI flush( void); @@ -5955,10 +5955,10 @@ virtual ~F_FileOStream() { - close(); + closeStream(); } - RCODE FLMAPI open( + RCODE FLMAPI openStream( const char * pszFilePath, FLMBOOL bTruncateIfExists); @@ -5967,7 +5967,7 @@ FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten); - RCODE FLMAPI close( void); + RCODE FLMAPI closeStream( void); private: @@ -5990,10 +5990,10 @@ virtual ~F_MultiFileIStream() { - close(); + closeStream(); } - RCODE FLMAPI open( + RCODE FLMAPI openStream( const char * pszDirectory, const char * pszBaseName); @@ -6002,7 +6002,7 @@ FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - RCODE FLMAPI close( void); + RCODE FLMAPI closeStream( void); private: @@ -6032,10 +6032,10 @@ virtual ~F_MultiFileOStream() { - close(); + closeStream(); } - RCODE create( + RCODE createStream( const char * pszDirectory, const char * pszBaseName, FLMUINT uiMaxFileSize, @@ -6046,7 +6046,7 @@ FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten); - RCODE FLMAPI close( void); + RCODE FLMAPI closeStream( void); RCODE processDirectory( const char * pszDirectory, @@ -6090,7 +6090,7 @@ } } - RCODE FLMAPI open( + RCODE FLMAPI openStream( IF_PosIStream * pIStream, FLMBOOL bUnicodeStream, FLMUINT uiLanguage, @@ -6115,7 +6115,7 @@ return( NE_FLM_OK); } - RCODE FLMAPI close( void) + RCODE FLMAPI closeStream( void) { if( m_pIStream) { @@ -6253,10 +6253,10 @@ virtual ~F_Base64DecoderIStream() { - close(); + closeStream(); } - RCODE FLMAPI open( + RCODE FLMAPI openStream( IF_IStream * pIStream); RCODE FLMAPI read( @@ -6264,7 +6264,7 @@ FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - FINLINE RCODE FLMAPI close( void) + FINLINE RCODE FLMAPI closeStream( void) { RCODE rc = NE_FLM_OK; @@ -6272,7 +6272,7 @@ { if( m_pIStream->getRefCount() == 1) { - rc = m_pIStream->close(); + rc = m_pIStream->closeStream(); } m_pIStream->Release(); @@ -6307,10 +6307,10 @@ virtual ~F_Base64EncoderIStream() { - close(); + closeStream(); } - RCODE FLMAPI open( + RCODE FLMAPI openStream( IF_IStream * pIStream, FLMBOOL bLineBreaks); @@ -6319,7 +6319,7 @@ FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - FINLINE RCODE FLMAPI close( void) + FINLINE RCODE FLMAPI closeStream( void) { RCODE rc = NE_FLM_OK; @@ -6327,7 +6327,7 @@ { if( m_pIStream->getRefCount() == 1) { - rc = m_pIStream->close(); + rc = m_pIStream->closeStream(); } m_pIStream->Release(); @@ -6376,10 +6376,10 @@ virtual ~F_CompressingOStream() { - close(); + closeStream(); } - RCODE FLMAPI open( + RCODE FLMAPI openStream( IF_OStream * pOStream); RCODE FLMAPI write( @@ -6387,7 +6387,7 @@ FLMUINT uiBytesToWrite, FLMUINT * puiBytesWritten); - RCODE FLMAPI close( void); + RCODE FLMAPI closeStream( void); private: @@ -6441,10 +6441,10 @@ virtual ~F_UncompressingIStream() { - close(); + closeStream(); } - RCODE FLMAPI open( + RCODE FLMAPI openStream( IF_IStream * pIStream); RCODE FLMAPI read( @@ -6452,7 +6452,7 @@ FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - RCODE FLMAPI close( void); + RCODE FLMAPI closeStream( void); private: diff --git a/ftk/src/ftkdynbtree.cpp b/ftk/src/ftkdynbtree.cpp index feabf9f..029358d 100644 --- a/ftk/src/ftkdynbtree.cpp +++ b/ftk/src/ftkdynbtree.cpp @@ -1194,7 +1194,7 @@ void F_BtreeRoot::closeFile( void) { F_FileSystem fileSystem; - m_pFileHdl->close(); + m_pFileHdl->closeFile(); fileSystem.deleteFile( m_pszFileName); m_pFileHdl->Release(); m_pFileHdl = NULL; diff --git a/ftk/src/ftkfsys.cpp b/ftk/src/ftkfsys.cpp index 2973758..d443ea1 100644 --- a/ftk/src/ftkfsys.cpp +++ b/ftk/src/ftkfsys.cpp @@ -453,7 +453,7 @@ RCODE FLMAPI F_FileSystem::createFile( goto Exit; } - if (RC_BAD( rc = pFileHdl->create( pszFileName, uiIoFlags))) + if (RC_BAD( rc = pFileHdl->createFile( pszFileName, uiIoFlags))) { goto Exit; } @@ -488,7 +488,7 @@ RCODE FLMAPI F_FileSystem::createUniqueFile( goto Exit; } - if( RC_BAD( rc = pFileHdl->createUnique( pszPath, + if( RC_BAD( rc = pFileHdl->createUniqueFile( pszPath, pszFileExtension, uiIoFlags))) { goto Exit; @@ -523,7 +523,7 @@ RCODE FLMAPI F_FileSystem::openFile( goto Exit; } - if (RC_BAD( rc = pFileHdl->open( pszFileName, uiIoFlags))) + if (RC_BAD( rc = pFileHdl->openFile( pszFileName, uiIoFlags))) { goto Exit; } @@ -1119,13 +1119,13 @@ Exit: if( pSrcFileHdl) { - pSrcFileHdl->close(); + pSrcFileHdl->closeFile(); pSrcFileHdl->Release(); } if( pDestFileHdl) { - pDestFileHdl->close(); + pDestFileHdl->closeFile(); pDestFileHdl->Release(); } @@ -1612,7 +1612,7 @@ Exit: if( pFileHdl) { - pFileHdl->close(); + pFileHdl->closeFile(); pFileHdl->Release(); pFileHdl = NULL; } @@ -2560,7 +2560,7 @@ RCODE F_FileHdlCache::openOrCreate( if( bCreate) { - if( RC_BAD( rc = pFileHdl->truncate())) + if( RC_BAD( rc = pFileHdl->truncateFile())) { goto Exit; } @@ -2784,7 +2784,7 @@ void F_FileHdl::freeCommonData( void) /**************************************************************************** Desc: Open a file ****************************************************************************/ -RCODE F_FileHdl::open( +RCODE F_FileHdl::openFile( const char * pszFileName, FLMUINT uiIoFlags) { @@ -2794,7 +2794,7 @@ RCODE F_FileHdl::open( /**************************************************************************** Desc: Create a file ****************************************************************************/ -RCODE F_FileHdl::create( +RCODE F_FileHdl::createFile( const char * pszFileName, FLMUINT uiIoFlags) { @@ -2804,7 +2804,7 @@ RCODE F_FileHdl::create( /**************************************************************************** Desc: Create a unique file name in the specified directory ****************************************************************************/ -RCODE F_FileHdl::createUnique( +RCODE F_FileHdl::createUniqueFile( char * pszDirName, const char * pszFileExtension, FLMUINT uiIoFlags) @@ -2884,7 +2884,7 @@ RCODE F_FileHdl::createUnique( f_strcpy( szTmpPath, szDirPath); pFileSystem->pathAppend( szTmpPath, szFileName); - rc = create( szTmpPath, uiIoFlags | FLM_IO_EXCL); + rc = createFile( szTmpPath, uiIoFlags | FLM_IO_EXCL); } while( rc != NE_FLM_OK && (uiCount++ < 10)); diff --git a/ftk/src/ftkini.cpp b/ftk/src/ftkini.cpp index 914aa76..6451b0e 100644 --- a/ftk/src/ftkini.cpp +++ b/ftk/src/ftkini.cpp @@ -337,7 +337,7 @@ Exit: if( m_pFileHdl) { - m_pFileHdl->close(); + m_pFileHdl->closeFile(); m_pFileHdl->Release(); m_pFileHdl = NULL; } @@ -477,7 +477,7 @@ Exit: if (m_pFileHdl) { - m_pFileHdl->close(); + m_pFileHdl->closeFile(); m_pFileHdl->Release(); m_pFileHdl = NULL; } diff --git a/ftk/src/ftkmem.cpp b/ftk/src/ftkmem.cpp index 711e269..fa615b2 100644 --- a/ftk/src/ftkmem.cpp +++ b/ftk/src/ftkmem.cpp @@ -87,6 +87,10 @@ #include #endif +#if defined( FLM_AIX) + typedef int (* VMGETINFO_FUNC)(void *, int, int); +#endif + /************************************************************************ Desc: *************************************************************************/ @@ -1451,7 +1455,8 @@ void logMemLeak( { (void)pFileHdl->flush(); } - pFileHdl->close(); + + pFileHdl->closeFile(); } } @@ -2573,6 +2578,10 @@ void * F_SlabManager::allocSlabFromSystem( void) pSlab = VirtualAlloc( NULL, (DWORD)m_uiSlabSize, MEM_COMMIT, PAGE_READWRITE); +#elif defined( FLM_RING_ZERO_NLM) + + pSlab = Alloc( m_uiSlabSize, gv_lAllocRTag) + #elif defined( FLM_SOLARIS) pSlab = memalign( sysconf( _SC_PAGESIZE), m_uiSlabSize); @@ -2587,7 +2596,7 @@ void * F_SlabManager::allocSlabFromSystem( void) #elif defined( FLM_UNIX) pSlab = valloc( m_uiSlabSize); - + #else if( RC_BAD( f_alloc( m_uiSlabSize, &pSlab))) @@ -2610,6 +2619,8 @@ void F_SlabManager::releaseSlabToSystem( #ifdef FLM_WIN VirtualFree( pSlab, 0, MEM_RELEASE); +#elif defined( FLM_RING_ZERO_NLM) + Free( pSlab); #elif defined( FLM_UNIX) free( pSlab); #else @@ -4770,51 +4781,64 @@ RCODE FLMAPI f_allocAlignedBufferImp( { RCODE rc = NE_FLM_OK; -#ifdef FLM_WIN +#if defined( FLM_WIN) + if ((*ppvAlloc = (void *)VirtualAlloc( NULL, uiMinSize, MEM_COMMIT, PAGE_READWRITE)) == NULL) { rc = f_mapPlatformError( GetLastError(), NE_FLM_MEM); goto Exit; } + #elif defined( FLM_SOLARIS) + if( (*ppvAlloc = memalign( sysconf( _SC_PAGESIZE), uiMinSize)) == NULL) { rc = RC_SET( NE_FLM_MEM); goto Exit; } -#elif defined( FLM_LINUX) + +#elif defined( FLM_LINUX) + if( posix_memalign( ppvAlloc, sysconf( _SC_PAGESIZE), uiMinSize) != 0) { rc = RC_SET( NE_FLM_MEM); goto Exit; } + #elif defined( FLM_UNIX) + + if( (*ppvAlloc = valloc( uiMinSize)) == NULL) { + rc = RC_SET( NE_FLM_MEM); + goto Exit; + } + +#else + + { + FLMUINT uiPageSize = 512; FLMUINT uiAllocSize; - FLMUINT uiPageSize = (FLMUINT)sysconf( _SC_PAGESIZE); FLMBYTE * pucAlloc; + FLMBYTE * pucStartOfAlloc; uiAllocSize = f_roundUp( uiMinSize, uiPageSize) + uiPageSize; - if( (pucAlloc = (FLMBYTE *)mmap( 0, uiAllocSize, - PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, - -1, 0)) == MAP_FAILED) + if( RC_BAD( rc = f_alloc( uiAllocSize, &pucAlloc))) { - rc = RC_SET( NE_FLM_MEM); goto Exit; } - f_assert( ((FLMUINT)(pucAlloc) % uiPageSize) == 0); + pucStartOfAlloc = pucAlloc; + pucAlloc += (uiPageSize - (((FLMUINT)pucAlloc) % uiPageSize)); - UD2FBA( uiAllocSize, pucAlloc); - *ppvAlloc = (void *)(pucAlloc + uiPageSize); - } -#else - if( RC_BAD( rc = f_alloc( uiMinSize, ppvAlloc))) - { - goto Exit; + f_assert( ((FLMUINT)(pucAlloc) % uiPageSize) == 0); + + U642FBA( (FLMUINT64)pucStartOfAlloc, pucAlloc - 8); + *ppvAlloc = pucAlloc; } + + #endif f_memset( *ppvAlloc, 0, uiMinSize); @@ -4832,25 +4856,26 @@ void FLMAPI f_freeAlignedBufferImp( { if( *ppvAlloc) { -#ifdef FLM_WIN +#if defined( FLM_WIN) + (void)VirtualFree( *ppvAlloc, 0, MEM_RELEASE); *ppvAlloc = NULL; -#elif defined( FLM_LINUX) || defined( FLM_SOLARIS) + +#elif defined( FLM_UNIX) + free( *ppvAlloc); *ppvAlloc = NULL; -#elif defined( FLM_UNIX) - { - FLMUINT uiAllocSize; - FLMUINT uiPageSize = (FLMUINT)sysconf( _SC_PAGESIZE); - - *ppvAlloc = ((FLMBYTE *)(*ppvAlloc)) - uiPageSize; - uiAllocSize = FB2UD( (FLMBYTE *)(*ppvAlloc)); - munmap( *ppvAlloc, uiAllocSize); - } - *ppvAlloc = NULL; #else - f_free( ppvAlloc); + + { + FLMBYTE * pucAlloc; + + pucAlloc = (FLMBYTE *)FB2U64( ((FLMBYTE *)(*ppvAlloc)) - 8); + f_free( &pucAlloc); + *ppvAlloc = NULL; + } + #endif } } @@ -4946,30 +4971,9 @@ RCODE FLMAPI f_getMemoryInfo( #endif #ifdef FLM_AIX - struct vminfo tmpvminfo; - #ifdef _SC_PAGESIZE - long iPageSize = sysconf(_SC_PAGESIZE); - #else - long iPageSize = 4096; - #endif + + f_getAIXMemInfo( &ui64TotalPhysMem, &ui64AvailPhysMem); - if( iPageSize == -1) - { - // If sysconf returned an error, resort to using the default - // page size for the Power architecture. - - iPageSize = 4096; - } - - ui64TotalPhysMem = HIGH_FLMUINT; - ui64AvailPhysMem = HIGH_FLMUINT; - - if( vmgetinfo( &tmpvminfo, VMINFO, sizeof( tmpvminfo)) != -1) - { - ui64TotalPhysMem = tmpvminfo.memsizepgs * iPageSize; - ui64AvailPhysMem = tmpvminfo.numfrb * iPageSize; - } - #elif defined( FLM_LINUX) f_getLinuxMemInfo( &ui64TotalPhysMem, &ui64AvailPhysMem); @@ -5164,6 +5168,65 @@ Exit: } #endif +/*************************************************************************** +Desc: +***************************************************************************/ +#ifdef FLM_AIX +void f_getAIXMemInfo( + FLMUINT64 * pui64TotalMem, + FLMUINT64 * pui64AvailMem) +{ + struct vminfo tmpvminfo; + FLMUINT64 ui64TotalPhysMem; + FLMUINT64 ui64AvailPhysMem; + void * pvModule = NULL; + VMGETINFO_FUNC fnVMGetInfo; + +#ifdef _SC_PAGESIZE + long iPageSize = sysconf(_SC_PAGESIZE); +#else + long iPageSize = 4096; +#endif + + if( iPageSize == -1) + { + // If sysconf returned an error, resort to using the default + // page size for the Power architecture. + + iPageSize = 4096; + } + + ui64TotalPhysMem = FLM_MAX_UINT; + ui64AvailPhysMem = FLM_MAX_UINT; + + if( (pvModule = dlopen( "/unix", RTLD_NOW | RTLD_GLOBAL)) == NULL) + { + goto Exit; + } + + if( (fnVMGetInfo = (VMGETINFO_FUNC)dlsym( pvModule, "vmgetinfo")) == NULL) + { + goto Exit; + } + + if( fnVMGetInfo( &tmpvminfo, VMINFO, sizeof( tmpvminfo)) != -1) + { + ui64TotalPhysMem = tmpvminfo.memsizepgs * iPageSize; + ui64AvailPhysMem = tmpvminfo.numfrb * iPageSize; + } + +Exit: + + if( pvModule) + { + dlclose( pvModule); + } + + *pui64TotalMem = ui64TotalPhysMem; + *pui64AvailMem = ui64AvailPhysMem; +} +#endif + /**************************************************************************** Desc: ****************************************************************************/ diff --git a/ftk/src/ftkmfh.cpp b/ftk/src/ftkmfh.cpp index 5d9f622..b398f43 100644 --- a/ftk/src/ftkmfh.cpp +++ b/ftk/src/ftkmfh.cpp @@ -50,21 +50,20 @@ public: virtual ~F_MultiFileHdl(); - void FLMAPI close( + void FLMAPI closeFile( FLMBOOL bDelete = FALSE); - - RCODE FLMAPI create( + RCODE FLMAPI createFile( const char * pszPath); - RCODE FLMAPI createUnique( + RCODE FLMAPI createUniqueFile( const char * pszPath, const char * pszFileExtension); RCODE FLMAPI deleteMultiFile( const char * pszPath); - RCODE FLMAPI open( + RCODE FLMAPI openFile( const char * pszPath); RCODE FLMAPI flush( void); @@ -91,7 +90,7 @@ public: return( NE_FLM_OK); } - RCODE FLMAPI truncate( + RCODE FLMAPI truncateFile( FLMUINT64 ui64NewSize); private: @@ -118,7 +117,7 @@ private: // Release the lock file - (void)m_pLockFileHdl->close(); + (void)m_pLockFileHdl->closeFile(); m_pLockFileHdl->Release(); m_pLockFileHdl = NULL; @@ -221,7 +220,7 @@ F_MultiFileHdl::~F_MultiFileHdl() { if( m_bOpen) { - close(); + closeFile(); } f_assert( !m_pLockFileHdl); @@ -230,7 +229,7 @@ F_MultiFileHdl::~F_MultiFileHdl() /**************************************************************************** Desc: Closes all data files associated with the object ****************************************************************************/ -void F_MultiFileHdl::close( +void F_MultiFileHdl::closeFile( FLMBOOL bDelete) { RCODE rc = NE_FLM_OK; @@ -252,7 +251,7 @@ void F_MultiFileHdl::close( { (void)m_pFileHdlList[ uiLoop].pFileHdl->flush(); } - m_pFileHdlList[ uiLoop].pFileHdl->close(); + m_pFileHdlList[ uiLoop].pFileHdl->closeFile(); m_pFileHdlList[ uiLoop].pFileHdl->Release(); f_memset( &m_pFileHdlList[ uiLoop], 0, sizeof( FH_INFO)); } @@ -368,7 +367,7 @@ Exit: /**************************************************************************** Desc: Creates a new 64-bit "file" ****************************************************************************/ -RCODE F_MultiFileHdl::create( +RCODE F_MultiFileHdl::createFile( const char * pszPath) { RCODE rc = NE_FLM_OK; @@ -420,7 +419,7 @@ Exit: /**************************************************************************** Desc: Creates a new 64-bit file with a unique, generated name ****************************************************************************/ -RCODE F_MultiFileHdl::createUnique( +RCODE F_MultiFileHdl::createUniqueFile( const char * pszPath, // Directory where the file is to be created const char * pszFileExtension) // Extension to be used on the new file. { @@ -513,7 +512,7 @@ Exit: /**************************************************************************** Desc: Opens an existing 64-bit file ****************************************************************************/ -RCODE F_MultiFileHdl::open( +RCODE F_MultiFileHdl::openFile( const char * pszPath) { RCODE rc = NE_FLM_OK; @@ -821,7 +820,7 @@ RCODE F_MultiFileHdl::getFileHdl( goto Exit; } - pTmpHdl->close(); + pTmpHdl->closeFile(); pTmpHdl->Release(); pTmpHdl = NULL; @@ -956,7 +955,7 @@ RCODE F_MultiFileHdl::createLockFile( uiIoFlags |= FLM_IO_DELETE_ON_RELEASE; #endif - if( RC_BAD( pLockFileHdl->create( szLockPath, uiIoFlags))) + if( RC_BAD( pLockFileHdl->createFile( szLockPath, uiIoFlags))) { #ifndef FLM_UNIX if (RC_BAD( pFileSystem->deleteFile( szLockPath))) @@ -964,14 +963,14 @@ RCODE F_MultiFileHdl::createLockFile( rc = RC_SET( NE_FLM_IO_ACCESS_DENIED); goto Exit; } - else if (RC_BAD( pLockFileHdl->create( szLockPath, uiIoFlags))) + else if (RC_BAD( pLockFileHdl->createFile( szLockPath, uiIoFlags))) { rc = RC_SET( NE_FLM_IO_ACCESS_DENIED); goto Exit; } #else - if( RC_BAD( pLockFileHdl->open( szLockPath, uiIoFlags))) + if( RC_BAD( pLockFileHdl->openFile( szLockPath, uiIoFlags))) { rc = RC_SET( NE_FLM_IO_ACCESS_DENIED); goto Exit; @@ -994,7 +993,7 @@ Exit: if (pLockFileHdl) { - (void)pLockFileHdl->close(); + (void)pLockFileHdl->closeFile(); pLockFileHdl->Release(); pLockFileHdl = NULL; } @@ -1005,7 +1004,7 @@ Exit: Desc: This is a private method that will truncate the spill file back to the specified size. ****************************************************************************/ -RCODE F_MultiFileHdl::truncate( +RCODE F_MultiFileHdl::truncateFile( FLMUINT64 ui64NewSize) { RCODE rc = NE_FLM_OK; @@ -1017,7 +1016,7 @@ RCODE F_MultiFileHdl::truncate( goto Exit; } - if (RC_BAD( rc = pFileHdl->truncate( getFileOffset( ui64NewSize)))) + if (RC_BAD( rc = pFileHdl->truncateFile( getFileOffset( ui64NewSize)))) { goto Exit; } diff --git a/ftk/src/ftknlm.cpp b/ftk/src/ftknlm.cpp index a435e57..f7e9bf9 100644 --- a/ftk/src/ftknlm.cpp +++ b/ftk/src/ftknlm.cpp @@ -1104,7 +1104,7 @@ F_FileHdl::~F_FileHdl( void) { if( m_bFileOpened) { - (void)close(); + (void)closeFile(); } freeCommonData(); @@ -1492,7 +1492,7 @@ Exit: if( RC_BAD( rc)) { - close(); + closeFile(); } if( pszQualifiedPath) @@ -1508,7 +1508,7 @@ Exit: Desc: Close a file ****************************************************************************/ #if defined( FLM_RING_ZERO_NLM) -RCODE FLMAPI F_FileHdl::close( void) +RCODE FLMAPI F_FileHdl::closeFile( void) { if( m_bNSS) { diff --git a/ftk/src/ftkrset.cpp b/ftk/src/ftkrset.cpp index 37c8c9b..80174e5 100644 --- a/ftk/src/ftkrset.cpp +++ b/ftk/src/ftkrset.cpp @@ -958,11 +958,11 @@ RCODE F_ResultSet::setupFromFile( void) goto Exit; } - if( RC_BAD( rc = m_pMultiFileHdl1->open( m_szIoFilePath1))) + if( RC_BAD( rc = m_pMultiFileHdl1->openFile( m_szIoFilePath1))) { if( rc == NE_FLM_IO_PATH_NOT_FOUND) { - if( RC_BAD( rc = m_pMultiFileHdl1->create( m_szIoFilePath1))) + if( RC_BAD( rc = m_pMultiFileHdl1->createFile( m_szIoFilePath1))) { rc = NE_FLM_OK; m_pMultiFileHdl1->Release(); @@ -1394,7 +1394,7 @@ Exit: { if( m_bFile1Opened) { - m_pMultiFileHdl1->close( TRUE); + m_pMultiFileHdl1->closeFile( TRUE); m_bFile1Opened = FALSE; } @@ -1409,7 +1409,7 @@ Exit: { if( m_bFile2Opened) { - m_pMultiFileHdl2->close( TRUE); + m_pMultiFileHdl2->closeFile( TRUE); m_bFile2Opened = FALSE; } @@ -2386,7 +2386,7 @@ void F_ResultSet::closeFile( { if( m_bFile1Opened) { - m_pMultiFileHdl1->close( bDelete); + m_pMultiFileHdl1->closeFile( bDelete); m_bFile1Opened = FALSE; } @@ -2400,7 +2400,7 @@ void F_ResultSet::closeFile( { if( m_bFile2Opened) { - m_pMultiFileHdl2->close( TRUE); + m_pMultiFileHdl2->closeFile( TRUE); m_bFile2Opened = FALSE; } @@ -2444,7 +2444,7 @@ RCODE F_ResultSet::openFile( goto Exit; } - if( RC_BAD( rc = (*ppMultiFileHdl)->createUnique( pszDirPath, + if( RC_BAD( rc = (*ppMultiFileHdl)->createUniqueFile( pszDirPath, FRSET_FILENAME_EXTENSION))) { (*ppMultiFileHdl)->Release(); @@ -2459,25 +2459,6 @@ Exit: return( rc); } -///***************************************************************************** -//Desc: Create and empty data vector and return it's interface... -//*****************************************************************************/ -//RCODE FLMAPI F_DbSystem::createIFResultSet( -// IF_ResultSet ** ppResultSet) -//{ -// RCODE rc = NE_FLM_OK; -// -// if( (*ppResultSet = f_new FResultSet) == NULL) -// { -// rc = RC_SET( NE_FLM_MEM); -// goto Exit; -// } -// -//Exit: -// -// return( rc); -//} - /***************************************************************************** Desc: ******************************************************************************/ @@ -3834,15 +3815,15 @@ RCODE F_ResultSetBlk::truncate( { RCODE rc = NE_FLM_OK; - if( RC_BAD( rc = (*m_ppMultiFileHdl)->truncate( + if( RC_BAD( rc = (*m_ppMultiFileHdl)->truncateFile( m_BlockHeader.ui64FilePos))) { goto Exit; } - (*m_ppMultiFileHdl)->close( FALSE); + (*m_ppMultiFileHdl)->closeFile( FALSE); - if( RC_BAD( rc = (*m_ppMultiFileHdl)->open( ( char *)pszPath))) + if( RC_BAD( rc = (*m_ppMultiFileHdl)->openFile( ( char *)pszPath))) { goto Exit; } diff --git a/ftk/src/ftkstrm.cpp b/ftk/src/ftkstrm.cpp index 42215f1..e76c5cd 100644 --- a/ftk/src/ftkstrm.cpp +++ b/ftk/src/ftkstrm.cpp @@ -173,7 +173,7 @@ public: RCODE setTcpDelay( FLMBOOL bOn); - RCODE FLMAPI close( void); + RCODE FLMAPI closeStream( void); private: @@ -230,7 +230,7 @@ RCODE FLMAPI FlmOpenBufferIStream( goto Exit; } - if( RC_BAD( rc = pIStream->open( pucBuffer, uiLength))) + if( RC_BAD( rc = pIStream->openStream( pucBuffer, uiLength))) { goto Exit; } @@ -265,7 +265,7 @@ RCODE FLMAPI FlmOpenBase64EncoderIStream( goto Exit; } - if( RC_BAD( rc = pIStream->open( pSourceIStream, bLineBreaks))) + if( RC_BAD( rc = pIStream->openStream( pSourceIStream, bLineBreaks))) { goto Exit; } @@ -299,7 +299,7 @@ RCODE FLMAPI FlmOpenBase64DecoderIStream( goto Exit; } - if( RC_BAD( rc = pIStream->open( pSourceIStream))) + if( RC_BAD( rc = pIStream->openStream( pSourceIStream))) { goto Exit; } @@ -333,7 +333,7 @@ RCODE FLMAPI FlmOpenFileIStream( goto Exit; } - if( RC_BAD( rc = pIStream->open( pszPath))) + if( RC_BAD( rc = pIStream->openStream( pszPath))) { goto Exit; } @@ -368,7 +368,7 @@ RCODE FLMAPI FlmOpenMultiFileIStream( goto Exit; } - if( RC_BAD( rc = pIStream->open( pszDirectory, pszBaseName))) + if( RC_BAD( rc = pIStream->openStream( pszDirectory, pszBaseName))) { goto Exit; } @@ -403,7 +403,7 @@ RCODE FLMAPI FlmOpenBufferedIStream( goto Exit; } - if( RC_BAD( rc = pIStream->open( pSourceIStream, uiBufferSize))) + if( RC_BAD( rc = pIStream->openStream( pSourceIStream, uiBufferSize))) { goto Exit; } @@ -437,7 +437,7 @@ RCODE FLMAPI FlmOpenUncompressingIStream( goto Exit; } - if( RC_BAD( rc = pIStream->open( pSourceIStream))) + if( RC_BAD( rc = pIStream->openStream( pSourceIStream))) { goto Exit; } @@ -472,7 +472,7 @@ RCODE FLMAPI FlmOpenFileOStream( goto Exit; } - if( RC_BAD( rc = pOStream->open( pszPath, bTruncateIfExists))) + if( RC_BAD( rc = pOStream->openStream( pszPath, bTruncateIfExists))) { goto Exit; } @@ -509,7 +509,7 @@ RCODE FLMAPI FlmOpenMultiFileOStream( goto Exit; } - if( RC_BAD( rc = pOStream->create( pszDirectory, pszBaseName, + if( RC_BAD( rc = pOStream->createStream( pszDirectory, pszBaseName, uiMaxFileSize, bOkToOverwrite))) { goto Exit; @@ -545,7 +545,7 @@ RCODE FLMAPI FlmOpenBufferedOStream( goto Exit; } - if( RC_BAD( rc = pOStream->open( pDestOStream, uiBufferSize))) + if( RC_BAD( rc = pOStream->openStream( pDestOStream, uiBufferSize))) { goto Exit; } @@ -579,7 +579,7 @@ RCODE FLMAPI FlmOpenCompressingOStream( goto Exit; } - if( RC_BAD( rc = pOStream->open( pDestOStream))) + if( RC_BAD( rc = pOStream->openStream( pDestOStream))) { goto Exit; } @@ -632,12 +632,12 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_FileIStream::open( +RCODE FLMAPI F_FileIStream::openStream( const char * pszFilePath) { RCODE rc = NE_FLM_OK; - close(); + closeStream(); if( RC_BAD( rc = f_getFileSysPtr()->openFile( (char *)pszFilePath, FLM_IO_RDONLY | FLM_IO_SH_DENYNONE, &m_pFileHdl))) @@ -653,13 +653,13 @@ Exit: /**************************************************************************** Desc: Closes the input stream and frees any resources *****************************************************************************/ -RCODE F_FileIStream::close( void) +RCODE F_FileIStream::closeStream( void) { RCODE rc = NE_FLM_OK; if( m_pFileHdl) { - rc = m_pFileHdl->close(); + rc = m_pFileHdl->closeFile(); m_pFileHdl->Release(); m_pFileHdl = NULL; } @@ -756,7 +756,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_BufferedIStream::open( +RCODE FLMAPI F_BufferedIStream::openStream( IF_IStream * pIStream, FLMUINT uiBufferSize) { @@ -784,7 +784,7 @@ Exit: if (RC_BAD( rc)) { - close(); + closeStream(); } return( rc); @@ -857,7 +857,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_BufferedIStream::close( void) +RCODE FLMAPI F_BufferedIStream::closeStream( void) { RCODE rc = NE_FLM_OK; @@ -865,7 +865,7 @@ RCODE FLMAPI F_BufferedIStream::close( void) { if( m_pIStream->getRefCount() == 1) { - rc = m_pIStream->close(); + rc = m_pIStream->closeStream(); } m_pIStream->Release(); @@ -887,7 +887,7 @@ RCODE FLMAPI F_BufferedIStream::close( void) /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_FileOStream::open( +RCODE FLMAPI F_FileOStream::openStream( const char * pszFilePath, FLMBOOL bTruncateIfExists) { @@ -941,9 +941,9 @@ RCODE FLMAPI F_FileOStream::open( Exit: - if (RC_BAD( rc)) + if( RC_BAD( rc)) { - close(); + closeStream(); } return( rc); @@ -987,7 +987,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_FileOStream::close( void) +RCODE FLMAPI F_FileOStream::closeStream( void) { RCODE rc = NE_FLM_OK; @@ -1004,7 +1004,7 @@ RCODE FLMAPI F_FileOStream::close( void) /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_MultiFileIStream::open( +RCODE FLMAPI F_MultiFileIStream::openStream( const char * pszDirectory, const char * pszBaseName) { @@ -1078,7 +1078,7 @@ RCODE F_MultiFileIStream::rollToNextFile( void) goto Exit; } - if( RC_BAD( rc = pFileIStream->open( (const char *)szFilePath))) + if( RC_BAD( rc = pFileIStream->openStream( (const char *)szFilePath))) { if (rc == NE_FLM_IO_PATH_NOT_FOUND) { @@ -1094,7 +1094,7 @@ RCODE F_MultiFileIStream::rollToNextFile( void) goto Exit; } - if( RC_BAD( rc = pBufferedIStream->open( pFileIStream, 16384))) + if( RC_BAD( rc = pBufferedIStream->openStream( pFileIStream, 16384))) { goto Exit; } @@ -1194,7 +1194,7 @@ Exit: /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_MultiFileIStream::close( void) +RCODE FLMAPI F_MultiFileIStream::closeStream( void) { if( m_pIStream) { @@ -1215,7 +1215,7 @@ RCODE FLMAPI F_MultiFileIStream::close( void) /**************************************************************************** Desc: *****************************************************************************/ -RCODE F_MultiFileOStream::create( +RCODE F_MultiFileOStream::createStream( const char * pszDirectory, const char * pszBaseName, FLMUINT uiMaxFileSize, @@ -1365,7 +1365,7 @@ RCODE F_MultiFileOStream::rollToNextFile( void) if( m_pOStream) { - if( RC_BAD( rc = m_pOStream->close())) + if( RC_BAD( rc = m_pOStream->closeStream())) { goto Exit; } @@ -1405,7 +1405,7 @@ RCODE F_MultiFileOStream::rollToNextFile( void) goto Exit; } - if( RC_BAD( rc = pFileOStream->open( (const char *)szFilePath, TRUE))) + if( RC_BAD( rc = pFileOStream->openStream( (const char *)szFilePath, TRUE))) { goto Exit; } @@ -1416,7 +1416,7 @@ RCODE F_MultiFileOStream::rollToNextFile( void) goto Exit; } - if( RC_BAD( rc = pBufferedOStream->open( pFileOStream, 16384))) + if( RC_BAD( rc = pBufferedOStream->openStream( pFileOStream, 16384))) { goto Exit; } @@ -1513,13 +1513,13 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_MultiFileOStream::close( void) +RCODE FLMAPI F_MultiFileOStream::closeStream( void) { RCODE rc = NE_FLM_OK; if( m_pOStream) { - rc = m_pOStream->close(); + rc = m_pOStream->closeStream(); m_pOStream->Release(); m_pOStream = NULL; } @@ -1537,7 +1537,7 @@ RCODE FLMAPI F_MultiFileOStream::close( void) /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_BufferedOStream::open( +RCODE FLMAPI F_BufferedOStream::openStream( IF_OStream * pOStream, FLMUINT uiBufferSize) { @@ -1635,7 +1635,7 @@ Exit: /**************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_BufferedOStream::close( void) +RCODE FLMAPI F_BufferedOStream::closeStream( void) { RCODE rc = NE_FLM_OK; @@ -1645,7 +1645,7 @@ RCODE FLMAPI F_BufferedOStream::close( void) { if( m_pOStream->getRefCount() == 1) { - rc = m_pOStream->close(); + rc = m_pOStream->closeStream(); } } @@ -1669,13 +1669,13 @@ Desc: ******************************************************************************/ F_BufferIStream::~F_BufferIStream() { - close(); + closeStream(); } /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_BufferIStream::open( +RCODE FLMAPI F_BufferIStream::openStream( const char * pucBuffer, FLMUINT uiLength, char ** ppucAllocatedBuffer) @@ -1715,7 +1715,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_BufferIStream::close( void) +RCODE FLMAPI F_BufferIStream::closeStream( void) { if( m_bIsOpen) { @@ -1786,7 +1786,7 @@ Exit: /***************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_Base64DecoderIStream::open( +RCODE FLMAPI F_Base64DecoderIStream::openStream( IF_IStream * pIStream) { RCODE rc = NE_FLM_OK; @@ -1922,7 +1922,7 @@ Exit: /***************************************************************************** Desc: *****************************************************************************/ -RCODE FLMAPI F_Base64EncoderIStream::open( +RCODE FLMAPI F_Base64EncoderIStream::openStream( IF_IStream * pIStream, FLMBOOL bLineBreaks) { @@ -2084,7 +2084,7 @@ Exit: /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_CompressingOStream::open( +RCODE FLMAPI F_CompressingOStream::openStream( IF_OStream * pOStream) { RCODE rc = NE_FLM_OK; @@ -2128,7 +2128,7 @@ Exit: if( RC_BAD( rc)) { - close(); + closeStream(); } return( rc); @@ -2336,7 +2336,7 @@ Exit: /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_CompressingOStream::close( void) +RCODE FLMAPI F_CompressingOStream::closeStream( void) { RCODE rc = NE_FLM_OK; FLMBYTE ucOut[ 2]; @@ -2365,11 +2365,11 @@ RCODE FLMAPI F_CompressingOStream::close( void) { if (RC_OK( rc)) { - rc = m_pOStream->close(); + rc = m_pOStream->closeStream(); } else { - m_pOStream->close(); + m_pOStream->closeStream(); } } @@ -2391,7 +2391,7 @@ RCODE FLMAPI F_CompressingOStream::close( void) /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_UncompressingIStream::open( +RCODE FLMAPI F_UncompressingIStream::openStream( IF_IStream * pIStream) { RCODE rc = NE_FLM_OK; @@ -2448,7 +2448,7 @@ Exit: if( RC_BAD( rc)) { - close(); + closeStream(); } return( rc); @@ -2637,7 +2637,7 @@ Exit: /****************************************************************************** Desc: ******************************************************************************/ -RCODE FLMAPI F_UncompressingIStream::close( void) +RCODE FLMAPI F_UncompressingIStream::closeStream( void) { if( m_pIStream) { @@ -2688,7 +2688,7 @@ F_TCPStream::~F_TCPStream( void) { if( m_bConnected) { - close(); + closeStream(); } #ifndef FLM_UNIX @@ -3287,7 +3287,7 @@ Exit: /******************************************************************** Desc: Closes any open connections *********************************************************************/ -RCODE FLMAPI F_TCPStream::close( void) +RCODE FLMAPI F_TCPStream::closeStream( void) { if( m_iSocket == INVALID_SOCKET) { diff --git a/ftk/src/ftksupr.cpp b/ftk/src/ftksupr.cpp index 5523c5f..de6969d 100644 --- a/ftk/src/ftksupr.cpp +++ b/ftk/src/ftksupr.cpp @@ -168,7 +168,7 @@ RCODE FLMAPI F_SuperFileHdl::createFile( } else { - if( RC_BAD( rc = pFileHdl->truncate())) + if( RC_BAD( rc = pFileHdl->truncateFile())) { goto Exit; } @@ -383,7 +383,7 @@ RCODE FLMAPI F_SuperFileHdl::truncateFile( goto Exit; } - if( RC_BAD( rc = pFileHdl->truncate( uiBlockOffset))) + if( RC_BAD( rc = pFileHdl->truncateFile( uiBlockOffset))) { goto Exit; } @@ -400,7 +400,7 @@ RCODE FLMAPI F_SuperFileHdl::truncateFile( break; } - if( RC_BAD( rc = pFileHdl->truncate())) + if( RC_BAD( rc = pFileHdl->truncateFile())) { goto Exit; } @@ -431,7 +431,7 @@ RCODE FLMAPI F_SuperFileHdl::truncateFile( goto Exit; } - if( RC_BAD( rc = pFileHdl->truncate( uiOffset))) + if( RC_BAD( rc = pFileHdl->truncateFile( uiOffset))) { goto Exit; } @@ -463,7 +463,7 @@ void FLMAPI F_SuperFileHdl::truncateFiles( { if( RC_OK( getFileHdl( uiFileNumber, TRUE, &pFileHdl))) { - pFileHdl->truncate(); + pFileHdl->truncateFile(); pFileHdl->Release(); } } diff --git a/ftk/src/ftksys.h b/ftk/src/ftksys.h index f4505f3..fb14408 100644 --- a/ftk/src/ftksys.h +++ b/ftk/src/ftksys.h @@ -126,6 +126,7 @@ #define _LARGE_FILES #endif #include + #include #endif #include @@ -603,10 +604,10 @@ RCODE FLMAPI tell( FLMUINT64 * pui64Offset); - RCODE FLMAPI truncate( + RCODE FLMAPI truncateFile( FLMUINT64 ui64Offset = 0); - RCODE FLMAPI close( void); + RCODE FLMAPI closeFile( void); FINLINE FLMBOOL FLMAPI canDoAsync( void) { @@ -684,16 +685,16 @@ void freeCommonData( void); - RCODE create( + RCODE createFile( const char * pszFileName, FLMUINT uiIoFlags); - RCODE createUnique( + RCODE createUniqueFile( char * pszDirName, const char * pszFileExtension, FLMUINT uiIoFlags); - RCODE open( + RCODE openFile( const char * pszFileName, FLMUINT uiIoFlags); @@ -1175,7 +1176,6 @@ FLMBYTE * pszFileName); #if defined( FLM_LINUX) - void f_setupLinuxKernelVersion( void); void f_getLinuxKernelVersion( @@ -1190,6 +1190,12 @@ FLMUINT64 * pui64AvailMem); #endif + #if defined( FLM_AIX) + void f_getAIXMemInfo( + FLMUINT64 * pui64TotalMem, + FLMUINT64 * pui64AvailMem); + #endif + void f_memoryInit( void); void f_memoryCleanup( void); diff --git a/ftk/src/ftktext.cpp b/ftk/src/ftktext.cpp index e2a1116..176abbe 100644 --- a/ftk/src/ftktext.cpp +++ b/ftk/src/ftktext.cpp @@ -7223,7 +7223,7 @@ RCODE f_verifyMetaphoneRoutines( void) break; } - if( RC_BAD( rc = pBufferStream->open( + if( RC_BAD( rc = pBufferStream->openStream( pMetaMap->pszWord, f_strlen( pMetaMap->pszWord)))) { goto Exit; @@ -7242,7 +7242,7 @@ RCODE f_verifyMetaphoneRoutines( void) goto Exit; } - pBufferStream->close(); + pBufferStream->closeStream(); pMetaMap++; } @@ -7371,25 +7371,25 @@ RCODE FLMAPI f_compareUnicodeStrings( F_CollIStream lStream; F_CollIStream rStream; - if( RC_BAD( rc = bufferLStream.open( + if( RC_BAD( rc = bufferLStream.openStream( (const char *)puzLString, uiLStrBytes))) { goto Exit; } - if( RC_BAD( rc = bufferRStream.open( + if( RC_BAD( rc = bufferRStream.openStream( (const char *)puzRString, uiRStrBytes))) { goto Exit; } - if( RC_BAD( rc = lStream.open( &bufferLStream, TRUE, uiLanguage, + if( RC_BAD( rc = lStream.openStream( &bufferLStream, TRUE, uiLanguage, uiCompareRules, bLeftWild))) { goto Exit; } - if( RC_BAD( rc = rStream.open( &bufferRStream, TRUE, uiLanguage, + if( RC_BAD( rc = rStream.openStream( &bufferRStream, TRUE, uiLanguage, uiCompareRules, bRightWild))) { goto Exit; @@ -7427,25 +7427,25 @@ RCODE FLMAPI f_compareUTF8Strings( F_CollIStream lStream; F_CollIStream rStream; - if (RC_BAD( rc = bufferLStream.open( + if (RC_BAD( rc = bufferLStream.openStream( (const char *)pucLString, uiLStrBytes))) { goto Exit; } - if( RC_BAD( rc = bufferRStream.open( + if( RC_BAD( rc = bufferRStream.openStream( (const char *)pucRString, uiRStrBytes))) { goto Exit; } - if( RC_BAD( rc = lStream.open( &bufferLStream, FALSE, uiLanguage, + if( RC_BAD( rc = lStream.openStream( &bufferLStream, FALSE, uiLanguage, uiCompareRules, bLeftWild))) { goto Exit; } - if( RC_BAD( rc = rStream.open( &bufferRStream, FALSE, uiLanguage, + if( RC_BAD( rc = rStream.openStream( &bufferRStream, FALSE, uiLanguage, uiCompareRules, bRightWild))) { goto Exit; @@ -7480,13 +7480,13 @@ RCODE FLMAPI f_compareUTF8Streams( F_CollIStream lStream; F_CollIStream rStream; - if( RC_BAD( rc = lStream.open( pLStream, FALSE, uiLanguage, + if( RC_BAD( rc = lStream.openStream( pLStream, FALSE, uiLanguage, uiCompareRules, bLeftWild))) { goto Exit; } - if( RC_BAD( rc = rStream.open( pRStream, FALSE, uiLanguage, + if( RC_BAD( rc = rStream.openStream( pRStream, FALSE, uiLanguage, uiCompareRules, bRightWild))) { goto Exit; @@ -7520,13 +7520,13 @@ RCODE FLMAPI f_compareUnicodeStreams( F_CollIStream lStream; F_CollIStream rStream; - if( RC_BAD( rc = lStream.open( pLStream, TRUE, uiLanguage, + if( RC_BAD( rc = lStream.openStream( pLStream, TRUE, uiLanguage, uiCompareRules, bLeftWild))) { goto Exit; } - if( RC_BAD( rc = rStream.open( pRStream, TRUE, uiLanguage, + if( RC_BAD( rc = rStream.openStream( pRStream, TRUE, uiLanguage, uiCompareRules, bRightWild))) { goto Exit; diff --git a/ftk/src/ftkunix.cpp b/ftk/src/ftkunix.cpp index 19a8e5c..30d19b5 100644 --- a/ftk/src/ftkunix.cpp +++ b/ftk/src/ftkunix.cpp @@ -94,7 +94,7 @@ F_FileHdl::~F_FileHdl() { if( m_bFileOpened) { - (void)close(); + (void)closeFile(); } freeCommonData(); @@ -322,7 +322,7 @@ Exit: if( RC_BAD( rc)) { - close(); + closeFile(); } return( rc); @@ -331,7 +331,7 @@ Exit: /****************************************************************************** Desc: Close a file ******************************************************************************/ -RCODE FLMAPI F_FileHdl::close( void) +RCODE FLMAPI F_FileHdl::closeFile( void) { if( m_fd != -1) { @@ -458,7 +458,7 @@ Exit: /****************************************************************************** Desc: Truncate the file to the indicated size ******************************************************************************/ -RCODE FLMAPI F_FileHdl::truncate( +RCODE FLMAPI F_FileHdl::truncateFile( FLMUINT64 ui64NewSize) { RCODE rc = NE_FLM_OK; diff --git a/ftk/src/ftkwin.cpp b/ftk/src/ftkwin.cpp index d9ca9fb..4e0dfef 100644 --- a/ftk/src/ftkwin.cpp +++ b/ftk/src/ftkwin.cpp @@ -44,7 +44,7 @@ Desc: ****************************************************************************/ F_FileHdl::~F_FileHdl() { - close(); + closeFile(); } /*************************************************************************** @@ -297,7 +297,7 @@ Exit: if( RC_BAD( rc)) { - close(); + closeFile(); } return( rc); @@ -306,7 +306,7 @@ Exit: /**************************************************************************** Desc: Close a file ****************************************************************************/ -RCODE FLMAPI F_FileHdl::close( void) +RCODE FLMAPI F_FileHdl::closeFile( void) { if( m_bFlushRequired) { @@ -734,8 +734,8 @@ Desc: Truncate the file to the indicated size WARNING: Direct IO methods are calling this method. Make sure that all changes to this method work in direct IO mode. ****************************************************************************/ -RCODE FLMAPI F_FileHdl::truncate( - FLMUINT64 ui64NewSize) +RCODE FLMAPI F_FileHdl::truncateFile( + FLMUINT64 ui64NewSize) { RCODE rc = NE_FLM_OK; LARGE_INTEGER liTmp; diff --git a/sql/src/fdbcopy.cpp b/sql/src/fdbcopy.cpp index edb8cee..4355cc9 100644 --- a/sql/src/fdbcopy.cpp +++ b/sql/src/fdbcopy.cpp @@ -679,7 +679,7 @@ Exit: if (pLockFileHdl) { - (void)pLockFileHdl->close(); + (void)pLockFileHdl->closeFile(); pLockFileHdl->Release(); pLockFileHdl = NULL; } @@ -891,7 +891,7 @@ FSTATIC RCODE flmCopyFile( if (!bCreatedDestFile && bOkToTruncate) { - if (RC_BAD( rc = pDestFileHdl->truncate( uiOffset))) + if (RC_BAD( rc = pDestFileHdl->truncateFile( uiOffset))) { goto Exit; } diff --git a/sql/src/flaimsys.h b/sql/src/flaimsys.h index 233ef2b..cc16b82 100644 --- a/sql/src/flaimsys.h +++ b/sql/src/flaimsys.h @@ -3450,14 +3450,14 @@ public: m_uiDataLength = 0; } - RCODE open( + RCODE openStream( F_Db * pDb, FLMUINT uiTableNum, FLMUINT64 ui64RowId, FLMUINT32 ui32BlkAddr = 0, FLMUINT uiOffsetIndex = 0); - RCODE open( + RCODE openStream( F_Db * pDb, F_Btree * pBTree, FLMUINT uiFlags, @@ -3476,7 +3476,7 @@ public: return( m_uiStreamSize - (m_uiBufferStartOffset + m_uiBufferOffset)); } - FINLINE RCODE FLMAPI close( void) + FINLINE RCODE FLMAPI closeStream( void) { reset(); return( NE_SFLM_OK); diff --git a/sql/src/flbackup.cpp b/sql/src/flbackup.cpp index d1e7a09..6595891 100644 --- a/sql/src/flbackup.cpp +++ b/sql/src/flbackup.cpp @@ -1861,7 +1861,7 @@ F_DefaultBackupClient::~F_DefaultBackupClient() { if (m_pMultiFileHdl) { - m_pMultiFileHdl->close(); + m_pMultiFileHdl->closeFile(); m_pMultiFileHdl->Release(); } } @@ -1900,7 +1900,7 @@ RCODE F_DefaultBackupClient::WriteData( goto Exit; } - if( RC_BAD( rc = m_pMultiFileHdl->create( m_szPath))) + if( RC_BAD( rc = m_pMultiFileHdl->createFile( m_szPath))) { m_pMultiFileHdl->Release(); m_pMultiFileHdl = NULL; diff --git a/sql/src/frestore.cpp b/sql/src/frestore.cpp index 8b37aa4..9b3d191 100644 --- a/sql/src/frestore.cpp +++ b/sql/src/frestore.cpp @@ -93,7 +93,7 @@ RCODE F_FSRestore::openBackupSet( void) goto Exit; } - if( RC_BAD( rc = m_pMultiFileHdl->open( m_szBackupSetPath))) + if( RC_BAD( rc = m_pMultiFileHdl->openFile( m_szBackupSetPath))) { m_pMultiFileHdl->Release(); m_pMultiFileHdl = NULL; @@ -141,7 +141,6 @@ RCODE F_FSRestore::openRflFile( goto Exit; } - pFileHdl->close(); pFileHdl->Release(); pFileHdl = NULL; @@ -213,7 +212,7 @@ RCODE F_FSRestore::openIncFile( goto Exit; } - if( RC_BAD( rc = m_pMultiFileHdl->open( szIncPath))) + if( RC_BAD( rc = m_pMultiFileHdl->openFile( szIncPath))) { m_pMultiFileHdl->Release(); m_pMultiFileHdl = NULL; diff --git a/sql/src/frow.cpp b/sql/src/frow.cpp index 5a9e882..80bc8ae 100644 --- a/sql/src/frow.cpp +++ b/sql/src/frow.cpp @@ -1691,7 +1691,7 @@ FLMINT F_BTreeIStream::Release( void) if (m_refCnt == 0) { - close(); + closeStream(); if( gv_SFlmSysData.pBTreeIStreamPool) { m_refCnt = 1; @@ -1710,7 +1710,7 @@ FLMINT F_BTreeIStream::Release( void) /***************************************************************************** Desc: ******************************************************************************/ -RCODE F_BTreeIStream::open( +RCODE F_BTreeIStream::openStream( F_Db * pDb, FLMUINT uiTableNum, FLMUINT64 ui64RowId, @@ -1734,7 +1734,7 @@ RCODE F_BTreeIStream::open( goto Exit; } - if (RC_BAD( rc = open( pDb, pBTree, FLM_EXACT, uiTableNum, ui64RowId, + if (RC_BAD( rc = openStream( pDb, pBTree, FLM_EXACT, uiTableNum, ui64RowId, ui32BlkAddr, uiOffsetIndex))) { goto Exit; @@ -1752,7 +1752,7 @@ Exit: if( RC_BAD( rc)) { - close(); + closeStream(); } return( rc); @@ -1761,7 +1761,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE F_BTreeIStream::open( +RCODE F_BTreeIStream::openStream( F_Db * pDb, F_Btree * pBTree, FLMUINT uiFlags, @@ -1818,7 +1818,7 @@ Exit: if( RC_BAD( rc)) { - close(); + closeStream(); } return( rc); @@ -2459,7 +2459,7 @@ RCODE F_RowCacheMgr::readRowFromDisk( { goto Exit; } - if (RC_BAD( rc = btreeIStream.open( pDb, pBTree, FLM_EXACT, + if (RC_BAD( rc = btreeIStream.openStream( pDb, pBTree, FLM_EXACT, uiTableNum, ui64RowId, 0, 0))) { goto Exit; @@ -2488,7 +2488,7 @@ Exit: if (bCloseIStream) { - btreeIStream.close(); + btreeIStream.closeStream(); } if (pBTree) @@ -3572,8 +3572,9 @@ RCODE F_Row::getIStream( pColumn = pDb->m_pDict->getColumn( pTable, uiColumnNum); *peDataType = pColumn->eDataTyp; } - if (RC_BAD( rc = pBufferIStream->open( (const char *)getColumnDataPtr( uiColumnNum), - pColumnItem->uiDataLen, NULL))) + if (RC_BAD( rc = pBufferIStream->openStream( + (const char *)getColumnDataPtr( uiColumnNum), + pColumnItem->uiDataLen, NULL))) { goto Exit; } diff --git a/sql/src/fsysdata.cpp b/sql/src/fsysdata.cpp index 27892e7..bf72c1b 100644 --- a/sql/src/fsysdata.cpp +++ b/sql/src/fsysdata.cpp @@ -1289,7 +1289,7 @@ RCODE F_DbSystem::init( void) } gv_SFlmSysData.uiFileOpenFlags = - FLM_IO_RDWR | FLM_IO_SH_DENYNONE | FLM_IO_DIRECT | FLM_IO_MISALIGNED_OK; + FLM_IO_RDWR | FLM_IO_SH_DENYNONE | FLM_IO_DIRECT; gv_SFlmSysData.uiFileCreateFlags = gv_SFlmSysData.uiFileOpenFlags | FLM_IO_EXCL | FLM_IO_CREATE_DIR; diff --git a/sql/src/fvector.cpp b/sql/src/fvector.cpp index 2c43abe..8274e8c 100644 --- a/sql/src/fvector.cpp +++ b/sql/src/fvector.cpp @@ -790,7 +790,7 @@ RCODE F_DataVector::outputKey( goto Exit; } - if (RC_BAD( rc = bufferIStream.open( + if (RC_BAD( rc = bufferIStream.openStream( (const char *)pucDataPtr, uiDataLen))) { goto Exit; @@ -804,7 +804,8 @@ RCODE F_DataVector::outputKey( } goto Exit; } - bufferIStream.close(); + + bufferIStream.closeStream(); } else if (pVector->eDataTyp == SFLM_NUMBER_TYPE) { @@ -828,7 +829,7 @@ RCODE F_DataVector::outputKey( goto Exit; } - if (RC_BAD( rc = bufferIStream.open( + if (RC_BAD( rc = bufferIStream.openStream( (const char *)ucStorageBuf, uiStorageLen))) { goto Exit; @@ -845,7 +846,8 @@ RCODE F_DataVector::outputKey( { goto Exit; } - bufferIStream.close(); + + bufferIStream.closeStream(); } } else @@ -867,7 +869,7 @@ RCODE F_DataVector::outputKey( if (uiDataLen) { - if (RC_BAD( rc = bufferIStream.open( + if (RC_BAD( rc = bufferIStream.openStream( (const char *)pucDataPtr, uiDataLen))) { goto Exit; @@ -888,7 +890,7 @@ RCODE F_DataVector::outputKey( goto Exit; } - bufferIStream.close(); + bufferIStream.closeStream(); } } diff --git a/sql/src/kybldkey.cpp b/sql/src/kybldkey.cpp index de11f55..fe706a7 100644 --- a/sql/src/kybldkey.cpp +++ b/sql/src/kybldkey.cpp @@ -213,7 +213,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( } pucFromBuf = &ucFromNumberBuf [0]; - if (RC_BAD( rc = bufferIStream.open( + if (RC_BAD( rc = bufferIStream.openStream( (const char *)pucFromBuf, uiFromBufLen))) { goto Exit; @@ -234,7 +234,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( goto Exit; } - bufferIStream.close(); + bufferIStream.closeStream(); // Key component needs to fit in both the from and until // buffers. If it will not, we simply set it up to search @@ -569,7 +569,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( } else { - if (RC_BAD( rc = bufferIStream.open( + if (RC_BAD( rc = bufferIStream.openStream( (const char *)pucFromBuf, uiFromBufLen))) { goto Exit; @@ -590,7 +590,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( goto Exit; } - bufferIStream.close(); + bufferIStream.closeStream(); if (bDataTruncated) { @@ -656,7 +656,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( } else { - if (RC_BAD( rc = bufferIStream.open( + if (RC_BAD( rc = bufferIStream.openStream( (const char *)pucUntilBuf, uiUntilBufLen))) { goto Exit; @@ -676,7 +676,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( goto Exit; } - bufferIStream.close(); + bufferIStream.closeStream(); if (bDataTruncated) { @@ -1538,7 +1538,7 @@ FSTATIC RCODE flmAddTextKeyPiece( } else { - if (RC_BAD( rc = bufferIStream.open( + if (RC_BAD( rc = bufferIStream.openStream( (const char *)pucFromUTF8Buf, uiFromBufLen))) { goto Exit; @@ -1561,7 +1561,7 @@ FSTATIC RCODE flmAddTextKeyPiece( goto Exit; } - bufferIStream.close(); + bufferIStream.closeStream(); if (bFromDataTruncated) { @@ -1639,7 +1639,7 @@ FSTATIC RCODE flmAddTextKeyPiece( } else { - if (RC_BAD( rc = bufferIStream.open( + if (RC_BAD( rc = bufferIStream.openStream( (const char *)pucUntilUTF8Buf, uiUntilBufLen))) { goto Exit; @@ -1662,7 +1662,7 @@ FSTATIC RCODE flmAddTextKeyPiece( goto Exit; } - bufferIStream.close(); + bufferIStream.closeStream(); if (bUntilDataTruncated) { @@ -1777,7 +1777,7 @@ FSTATIC RCODE flmAddTextKeyPiece( } else // pucFromUTF8Buf != pucUntilUTF8Buf { - if (RC_BAD( rc = bufferIStream.open( + if (RC_BAD( rc = bufferIStream.openStream( (const char *)pucUntilUTF8Buf, uiUntilBufLen))) { goto Exit; @@ -1800,7 +1800,7 @@ FSTATIC RCODE flmAddTextKeyPiece( goto Exit; } - bufferIStream.close(); + bufferIStream.closeStream(); if (bUntilDataTruncated) { diff --git a/sql/src/kybuild.cpp b/sql/src/kybuild.cpp index 6fd45ab..09073d8 100644 --- a/sql/src/kybuild.cpp +++ b/sql/src/kybuild.cpp @@ -381,8 +381,9 @@ FSTATIC RCODE getColumnIStream( pColumn = pDb->getDict()->getColumn( pTable, uiColumnNum); *peDataType = pColumn->eDataTyp; } - if (RC_BAD( rc = pBufferIStream->open( (const char *)pColumnValue->pucColumnValue, - pColumnValue->uiValueLen, NULL))) + if (RC_BAD( rc = pBufferIStream->openStream( + (const char *)pColumnValue->pucColumnValue, + pColumnValue->uiValueLen, NULL))) { goto Exit; } @@ -571,7 +572,7 @@ No_Strings: break; } - if (RC_BAD( rc = bufferIStream.open( + if (RC_BAD( rc = bufferIStream.openStream( (const char *)*ppucTmpBuf, uiStrBytes))) { goto Exit; @@ -590,7 +591,7 @@ No_Strings: NULL, NULL, m_keyGenInfo.pIndex->uiLanguage, FALSE, FALSE, &bDataTruncated, NULL); - bufferIStream.close(); + bufferIStream.closeStream(); if( RC_BAD( rc)) { @@ -625,7 +626,7 @@ No_Strings: goto Exit; } - if (RC_BAD( rc = bufferIStream.open( + if (RC_BAD( rc = bufferIStream.openStream( (const char *)ucStorageBuf, uiStorageLen))) { goto Exit; @@ -642,7 +643,7 @@ No_Strings: NULL, NULL, m_keyGenInfo.pIndex->uiLanguage, FALSE, FALSE, NULL, NULL); - bufferIStream.close(); + bufferIStream.closeStream(); if( RC_BAD( rc)) { @@ -686,7 +687,7 @@ No_Strings: break; } - if (RC_BAD( rc = bufferIStream.open( + if (RC_BAD( rc = bufferIStream.openStream( (const char *)*ppucTmpBuf, uiStrBytes))) { goto Exit; @@ -707,7 +708,7 @@ No_Strings: bHadAtLeastOneString ? FALSE : TRUE, FALSE, &bDataTruncated, NULL); - bufferIStream.close(); + bufferIStream.closeStream(); if( RC_BAD( rc)) { diff --git a/sql/src/kycollat.cpp b/sql/src/kycollat.cpp index db73a7d..e38b27d 100644 --- a/sql/src/kycollat.cpp +++ b/sql/src/kycollat.cpp @@ -127,7 +127,7 @@ RCODE KYCollateValue( goto Exit; } - if (RC_BAD( rc = pBufferIStream->open( + if (RC_BAD( rc = pBufferIStream->openStream( (const char *)dynaBuf.getBufferPtr(), dynaBuf.getDataLength()))) { goto Exit; diff --git a/sql/src/opendatabase.cpp b/sql/src/opendatabase.cpp index cda6cfd..8b3fcb8 100644 --- a/sql/src/opendatabase.cpp +++ b/sql/src/opendatabase.cpp @@ -562,7 +562,7 @@ Exit: if (pLockFileHdl) { - (void)pLockFileHdl->close(); + (void)pLockFileHdl->closeFile(); pLockFileHdl->Release(); pLockFileHdl = NULL; } @@ -1217,7 +1217,7 @@ F_Database::~F_Database() if (m_pLockFileHdl) { - (void)m_pLockFileHdl->close(); + (void)m_pLockFileHdl->closeFile(); m_pLockFileHdl->Release(); m_pLockFileHdl = NULL; } diff --git a/sql/src/rfl.cpp b/sql/src/rfl.cpp index 8a6f6e6..38c1364 100644 --- a/sql/src/rfl.cpp +++ b/sql/src/rfl.cpp @@ -126,7 +126,7 @@ F_Rfl::~F_Rfl() if (m_pFileHdl) { - m_pFileHdl->close(); + m_pFileHdl->closeFile(); m_pFileHdl->Release(); m_pFileHdl = NULL; m_pDatabase = NULL; @@ -1894,14 +1894,14 @@ RCODE F_Rfl::seeIfNeedNewFile( uiCurrFileEOF = ROUND_DOWN_TO_NEAREST_512( uiCurrFileEOF) + 512; } - if (RC_BAD( rc = m_pFileHdl->truncate( uiCurrFileEOF))) + if (RC_BAD( rc = m_pFileHdl->truncateFile( uiCurrFileEOF))) { goto Exit; } // Close the file handle. - m_pFileHdl->close(); + m_pFileHdl->closeFile(); m_pFileHdl->Release(); m_pFileHdl = NULL; @@ -2079,14 +2079,14 @@ RCODE F_Rfl::finishCurrFile( { uiTruncateSize = ROUND_DOWN_TO_NEAREST_512( uiTruncateSize) + 512; } - if (RC_BAD( rc = m_pFileHdl->truncate( uiTruncateSize))) + if (RC_BAD( rc = m_pFileHdl->truncateFile( uiTruncateSize))) { goto Exit; } // Close the file handle. - m_pFileHdl->close(); + m_pFileHdl->closeFile(); m_pFileHdl->Release(); m_pFileHdl = NULL; @@ -2290,7 +2290,7 @@ RCODE F_Rfl::truncate( goto Exit; } - if (RC_BAD( rc = m_pFileHdl->truncate( uiTruncateSize))) + if (RC_BAD( rc = m_pFileHdl->truncateFile( uiTruncateSize))) { m_bRflVolumeOk = FALSE; goto Exit; diff --git a/sql/src/rfl.h b/sql/src/rfl.h index d1fcdbe..39db386 100644 --- a/sql/src/rfl.h +++ b/sql/src/rfl.h @@ -438,7 +438,7 @@ public: } if (m_pFileHdl) { - m_pFileHdl->close(); + m_pFileHdl->closeFile(); m_pFileHdl->Release(); m_pFileHdl = NULL; m_pCurrentBuf->uiCurrFileNum = 0; diff --git a/sql/src/scache.cpp b/sql/src/scache.cpp index 090d0e7..12f872c 100644 --- a/sql/src/scache.cpp +++ b/sql/src/scache.cpp @@ -6840,7 +6840,7 @@ RCODE F_Database::finishCheckpoint( if (RC_OK( pSFileHdl->getFileHdl( 0, TRUE, &pCFileHdl))) { - (void)pCFileHdl->truncate( LOG_THRESHOLD_SIZE); + (void)pCFileHdl->truncateFile( LOG_THRESHOLD_SIZE); } } diff --git a/sql/src/sqleval.cpp b/sql/src/sqleval.cpp index 046a7c4..82f67d0 100644 --- a/sql/src/sqleval.cpp +++ b/sql/src/sqleval.cpp @@ -236,16 +236,16 @@ FSTATIC RCODE sqlCompareText( // Open the streams - if (RC_BAD( rc = bufferLStream.open( (const char *)pLValue->val.str.pszStr, - pLValue->val.str.uiByteLen))) + if (RC_BAD( rc = bufferLStream.openStream( + (const char *)pLValue->val.str.pszStr, pLValue->val.str.uiByteLen))) { goto Exit; } pLStream = &bufferLStream; - if( RC_BAD( rc = bufferRStream.open( (const char *)pRValue->val.str.pszStr, - pRValue->val.str.uiByteLen))) + if( RC_BAD( rc = bufferRStream.openStream( + (const char *)pRValue->val.str.pszStr, pRValue->val.str.uiByteLen))) { goto Exit; } @@ -294,14 +294,14 @@ FSTATIC RCODE sqlApproxCompare( // Open the streams - if (RC_BAD( rc = bufferLStream.open( + if (RC_BAD( rc = bufferLStream.openStream( (const char *)pLValue->val.str.pszStr, pLValue->val.str.uiByteLen))) { goto Exit; } pLStream = &bufferLStream; - if( RC_BAD( rc = bufferRStream.open( + if( RC_BAD( rc = bufferRStream.openStream( (const char *)pRValue->val.str.pszStr, pRValue->val.str.uiByteLen))) { goto Exit; @@ -431,15 +431,15 @@ FSTATIC RCODE sqlCompareBinary( // Open the streams - if (RC_BAD( rc = bufferLStream.open( (const char *)pLValue->val.str.pszStr, - pLValue->val.str.uiByteLen))) + if (RC_BAD( rc = bufferLStream.openStream( + (const char *)pLValue->val.str.pszStr, pLValue->val.str.uiByteLen))) { goto Exit; } pLStream = &bufferLStream; - if( RC_BAD( rc = bufferRStream.open( (const char *)pRValue->val.str.pszStr, - pRValue->val.str.uiByteLen))) + if( RC_BAD( rc = bufferRStream.openStream( + (const char *)pRValue->val.str.pszStr, pRValue->val.str.uiByteLen))) { goto Exit; } diff --git a/xflaim/Makefile b/xflaim/Makefile index c58ea2f..b339476 100644 --- a/xflaim/Makefile +++ b/xflaim/Makefile @@ -995,7 +995,7 @@ ifdef unix_target ifeq ($(target_os_family),aix) ifeq ($(usenativecc),yes) - ccflags += -qthreaded + ccflags += -qthreaded -qstrict ifeq ($(target_word_size),64) ccflags += -q64 else @@ -1045,6 +1045,7 @@ ifdef unix_target shared_link_flags = link_flags = -o $@ + libr_flags = ifeq ($(compiler),g++) ifneq ($(target_processor_family),ia64) @@ -1080,6 +1081,14 @@ ifdef unix_target endif ifeq ($(target_os_family),aix) + ifeq ($(target_word_size),64) + link_flags += -q64 + libr_flags = -X64 + else + link_flags += -q32 + libr_flags = -X32 + endif + lib_link_libs += -lm -lc -lcurses exe_link_libs += -lm -lc -lcurses endif @@ -1647,7 +1656,7 @@ ifdef unix_target ifeq ($(target_os_family),osx) $(ec)$(libr) -static -o $@ $+ else - $(ec)$(libr) -rcs $@ $+ + $(ec)$(libr) $(libr_flags) -rcs $@ $+ endif endif ifdef netware_target diff --git a/xflaim/src/fdbcopy.cpp b/xflaim/src/fdbcopy.cpp index 8d9b009..a87a5a4 100644 --- a/xflaim/src/fdbcopy.cpp +++ b/xflaim/src/fdbcopy.cpp @@ -682,7 +682,7 @@ Exit: if (pLockFileHdl) { - (void)pLockFileHdl->close(); + (void)pLockFileHdl->closeFile(); pLockFileHdl->Release(); pLockFileHdl = NULL; } @@ -891,7 +891,7 @@ FSTATIC RCODE flmCopyFile( if (!bCreatedDestFile && bOkToTruncate) { - if (RC_BAD( rc = pDestFileHdl->truncate( uiOffset))) + if (RC_BAD( rc = pDestFileHdl->truncateFile( uiOffset))) { goto Exit; } diff --git a/xflaim/src/fdict.cpp b/xflaim/src/fdict.cpp index 39290f6..878bdfc 100644 --- a/xflaim/src/fdict.cpp +++ b/xflaim/src/fdict.cpp @@ -9971,7 +9971,7 @@ RCODE F_Db::dictCreate( goto Exit; } - if (RC_BAD( rc = pStream->open( pszDictBuf, 0))) + if (RC_BAD( rc = pStream->openStream( pszDictBuf, 0))) { goto Exit; } @@ -9992,7 +9992,7 @@ Exit: if( bFileOpen) { - pDictFileHdl->close(); + pDictFileHdl->closeFile(); } if( pDictFileHdl) diff --git a/xflaim/src/fdom.cpp b/xflaim/src/fdom.cpp index af83f98..a9b21ca 100644 --- a/xflaim/src/fdom.cpp +++ b/xflaim/src/fdom.cpp @@ -85,7 +85,7 @@ public: FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - FINLINE RCODE FLMAPI close( void) + FINLINE RCODE FLMAPI closeStream( void) { return( NE_XFLM_OK); } @@ -108,7 +108,7 @@ FLMINT FLMAPI F_BTreeIStream::Release( void) if (m_refCnt == 0) { - close(); + closeStream(); if( gv_XFlmSysData.pNodePool) { m_refCnt = 1; @@ -2809,7 +2809,7 @@ public: ~F_AsciiStorageStream() { - close(); + closeStream(); } RCODE FLMAPI read( @@ -2817,7 +2817,7 @@ public: FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - FINLINE RCODE FLMAPI close( void) + FINLINE RCODE FLMAPI closeStream( void) { if( m_pIStream) { @@ -2828,7 +2828,7 @@ public: return( NE_XFLM_OK); } - RCODE open( + RCODE openStream( IF_IStream * pIStream); private: @@ -2839,7 +2839,7 @@ private: /***************************************************************************** Desc: Open an Ascii storage stream. ******************************************************************************/ -RCODE F_AsciiStorageStream::open( +RCODE F_AsciiStorageStream::openStream( IF_IStream * pIStream) { RCODE rc = NE_XFLM_OK; @@ -2847,7 +2847,7 @@ RCODE F_AsciiStorageStream::open( FLMUINT uiLen; FLMUINT uiSENLen; - close(); + closeStream(); m_pIStream = pIStream; m_pIStream->AddRef(); @@ -2879,7 +2879,7 @@ Exit: if( RC_BAD( rc)) { - close(); + closeStream(); } return( rc); @@ -2962,7 +2962,7 @@ public: ~F_BinaryToTextStream() { - close(); + closeStream(); } RCODE FLMAPI read( @@ -2970,7 +2970,7 @@ public: FLMUINT uiBytesToRead, FLMUINT * puiBytesRead); - FINLINE RCODE FLMAPI close( void) + FINLINE RCODE FLMAPI closeStream( void) { if( m_pEncoderStream) { @@ -2981,7 +2981,7 @@ public: return( NE_XFLM_OK); } - RCODE open( + RCODE openStream( IF_IStream * pIStream, FLMUINT uiDataLen, FLMUINT * puiTextLength); @@ -2997,7 +2997,7 @@ private: /***************************************************************************** Desc: Open a binary-to-text stream. ******************************************************************************/ -RCODE F_BinaryToTextStream::open( +RCODE F_BinaryToTextStream::openStream( IF_IStream * pIStream, FLMUINT uiDataLen, FLMUINT * puiTextLength) @@ -3006,7 +3006,7 @@ RCODE F_BinaryToTextStream::open( FLMBYTE * pucSen; FLMUINT uiOutputLen; - close(); + closeStream(); // Set up the SEN buffer. Calculate length to be 4 bytes for every 3 // binary bytes. @@ -3042,7 +3042,7 @@ Exit: if( RC_BAD( rc)) { - close(); + closeStream(); } return( rc); @@ -4971,7 +4971,7 @@ RCODE F_CachedNode::getIStream( } pIStream = pBTreeIStream; - if( RC_BAD( rc = pBTreeIStream->open( pDb, getCollection(), + if( RC_BAD( rc = pBTreeIStream->openStream( pDb, getCollection(), getNodeId(), getBlkAddr(), getOffsetIndex()))) { goto Exit; @@ -5060,7 +5060,7 @@ RCODE F_CachedNode::getIStream( pIStream = pNodeBufferIStream; - if( RC_BAD( rc = pNodeBufferIStream->open( + if( RC_BAD( rc = pNodeBufferIStream->openStream( (const char *)pCachedNode->getDataPtr(), pCachedNode->getDataLength()))) { @@ -5137,7 +5137,7 @@ RCODE F_CachedNode::getRawIStream( } pIStream = pBTreeIStream; - if( RC_BAD( rc = pBTreeIStream->open( pDb, getCollection(), + if( RC_BAD( rc = pBTreeIStream->openStream( pDb, getCollection(), getNodeId(), getBlkAddr(), getOffsetIndex()))) { goto Exit; @@ -5917,7 +5917,7 @@ RCODE FLMAPI F_DOMNode::getBinary( { F_AsciiStorageStream asciiStream; - if( RC_BAD( rc = asciiStream.open( pIStream))) + if( RC_BAD( rc = asciiStream.openStream( pIStream))) { goto Exit; } @@ -10880,7 +10880,8 @@ RCODE flmReadStorageAsText( goto Exit; } - if( RC_BAD( rc = pConvStream->open( (const char *)ucConvBuf, uiDataLen))) + if( RC_BAD( rc = pConvStream->openStream( + (const char *)ucConvBuf, uiDataLen))) { goto Exit; } @@ -10897,7 +10898,7 @@ RCODE flmReadStorageAsText( goto Exit; } - if( RC_BAD( rc = pConvStream->open( + if( RC_BAD( rc = pConvStream->openStream( (const char *)pucStorageData, uiDataLen))) { goto Exit; @@ -10906,7 +10907,7 @@ RCODE flmReadStorageAsText( pStream = pConvStream; } - if( RC_BAD( rc = binaryToTextStream.open( pStream, + if( RC_BAD( rc = binaryToTextStream.openStream( pStream, uiDataLen, &uiDataLen))) { goto Exit; @@ -11717,7 +11718,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE F_BTreeIStream::open( +RCODE F_BTreeIStream::openStream( F_Db * pDb, FLMUINT uiCollection, FLMUINT64 ui64NodeId, @@ -11746,8 +11747,8 @@ RCODE F_BTreeIStream::open( goto Exit; } - if( RC_BAD( rc = open( pDb, pBTree, XFLM_EXACT, uiCollection, ui64NodeId, - ui32BlkAddr, uiOffsetIndex))) + if( RC_BAD( rc = openStream( pDb, pBTree, XFLM_EXACT, + uiCollection, ui64NodeId, ui32BlkAddr, uiOffsetIndex))) { goto Exit; } @@ -11764,7 +11765,7 @@ Exit: if( RC_BAD( rc)) { - close(); + closeStream(); } return( rc); @@ -11773,7 +11774,7 @@ Exit: /***************************************************************************** Desc: ******************************************************************************/ -RCODE F_BTreeIStream::open( +RCODE F_BTreeIStream::openStream( F_Db * pDb, F_Btree * pBTree, FLMUINT uiFlags, @@ -11830,7 +11831,7 @@ Exit: if( RC_BAD( rc)) { - close(); + closeStream(); } return( rc); @@ -14800,7 +14801,7 @@ RCODE F_Db::findNode( // XFLM_INCL, XFLM_EXCL, XFLM_FIRST, or XFLM_LAST. So we will // need to reassign ui64NodeId once we have located the node. - if( RC_BAD( rc = btreeIStream.open( this, pBTree, + if( RC_BAD( rc = btreeIStream.openStream( this, pBTree, uiFlags, uiCollection, *pui64NodeId, 0, 0))) { goto Exit; @@ -14809,7 +14810,7 @@ RCODE F_Db::findNode( // Close the input stream - btreeIStream.close(); + btreeIStream.closeStream(); Exit: @@ -17709,7 +17710,7 @@ RCODE F_CachedNode::getIStream( { flmAssert( pAttrItem->m_uiIVLen); - if( RC_BAD( rc = pNodeBufferIStream->open( NULL, + if( RC_BAD( rc = pNodeBufferIStream->openStream( NULL, pAttrItem->getAttrDataBufferSize(), (char **)&pucAllocatedBuffer))) { goto Exit; @@ -17727,7 +17728,7 @@ RCODE F_CachedNode::getIStream( } else { - if( RC_BAD( rc = pNodeBufferIStream->open( + if( RC_BAD( rc = pNodeBufferIStream->openStream( (const char *)pAttrItem->getAttrDataPtr(), pAttrItem->getAttrDataLength()))) { @@ -17963,7 +17964,7 @@ Exit: /**************************************************************************** Desc: ****************************************************************************/ -RCODE FLMAPI F_NodeBufferIStream::open( +RCODE FLMAPI F_NodeBufferIStream::openStream( const char * pucBuffer, FLMUINT uiLength, char ** ppucAllocatedBuffer) @@ -17976,7 +17977,7 @@ RCODE FLMAPI F_NodeBufferIStream::open( goto Exit; } - if( RC_BAD( rc = pBufferIStream->open( pucBuffer, + if( RC_BAD( rc = pBufferIStream->openStream( pucBuffer, uiLength, ppucAllocatedBuffer))) { goto Exit; diff --git a/xflaim/src/flaimsys.h b/xflaim/src/flaimsys.h index a9554c5..c120a59 100644 --- a/xflaim/src/flaimsys.h +++ b/xflaim/src/flaimsys.h @@ -5383,14 +5383,14 @@ public: m_uiEncDefId = 0; } - RCODE open( + RCODE openStream( F_Db * pDb, FLMUINT uiCollection, FLMUINT64 ui64NodeId, FLMUINT32 ui32BlkAddr = 0, FLMUINT uiOffsetIndex = 0); - RCODE open( + RCODE openStream( F_Db * pDb, F_Btree * pBTree, FLMUINT uiFlags, @@ -5409,7 +5409,7 @@ public: return( m_uiStreamSize - (m_uiBufferStartOffset + m_uiBufferOffset)); } - FINLINE RCODE FLMAPI close( void) + FINLINE RCODE FLMAPI closeStream( void) { reset(); return( NE_XFLM_OK); @@ -5489,7 +5489,7 @@ public: reset(); } - RCODE FLMAPI open( + RCODE FLMAPI openStream( const char * pucBuffer, FLMUINT uiLength, char ** ppucAllocatedBuffer = NULL); @@ -5504,7 +5504,7 @@ public: return( m_pBufferIStream->remainingSize()); } - FINLINE RCODE FLMAPI close( void) + FINLINE RCODE FLMAPI closeStream( void) { RCODE rc = NE_FLM_OK; @@ -5539,7 +5539,7 @@ public: FINLINE void FLMAPI truncate( FLMUINT uiOffset) { - m_pBufferIStream->truncate( uiOffset); + m_pBufferIStream->truncateStream( uiOffset); } FINLINE void reset( void) diff --git a/xflaim/src/flbackup.cpp b/xflaim/src/flbackup.cpp index 6be3b9f..31a7b1d 100644 --- a/xflaim/src/flbackup.cpp +++ b/xflaim/src/flbackup.cpp @@ -1859,7 +1859,7 @@ F_DefaultBackupClient::~F_DefaultBackupClient() { if (m_pMultiFileHdl) { - m_pMultiFileHdl->close(); + m_pMultiFileHdl->closeFile(); m_pMultiFileHdl->Release(); } } @@ -1898,7 +1898,7 @@ RCODE F_DefaultBackupClient::WriteData( goto Exit; } - if( RC_BAD( rc = m_pMultiFileHdl->create( m_szPath))) + if( RC_BAD( rc = m_pMultiFileHdl->createFile( m_szPath))) { m_pMultiFileHdl->Release(); m_pMultiFileHdl = NULL; diff --git a/xflaim/src/flblddb.cpp b/xflaim/src/flblddb.cpp index 6b7c552..4035aca 100644 --- a/xflaim/src/flblddb.cpp +++ b/xflaim/src/flblddb.cpp @@ -114,14 +114,14 @@ public: ~F_RebuildNodeIStream() { - close(); + closeStream(); } - RCODE open( + RCODE openStream( F_DbRebuild * pRebuild, FLMBOOL bRecovDictionary); - RCODE FLMAPI close( void); + RCODE FLMAPI closeStream( void); RCODE FLMAPI read( void * pvBuffer, @@ -790,7 +790,7 @@ Exit: if( pLockFileHdl) { - pLockFileHdl->close(); + pLockFileHdl->closeFile(); pLockFileHdl->Release(); pLockFileHdl = NULL; } @@ -990,7 +990,7 @@ RCODE F_DbRebuild::recoverNodes( goto Exit; } - if( RC_BAD( rc = pIStream->open( this, bRecoverDictionary))) + if( RC_BAD( rc = pIStream->openStream( this, bRecoverDictionary))) { goto Exit; } @@ -1822,9 +1822,9 @@ Exit: /*************************************************************************** Desc: *****************************************************************************/ -RCODE F_RebuildNodeIStream::open( - F_DbRebuild * pDbRebuild, - FLMBOOL bRecovDictionary) +RCODE F_RebuildNodeIStream::openStream( + F_DbRebuild * pDbRebuild, + FLMBOOL bRecovDictionary) { RCODE rc = NE_XFLM_OK; @@ -1862,7 +1862,7 @@ Exit: if( RC_BAD( rc)) { - close(); + closeStream(); } return( rc); @@ -1871,7 +1871,7 @@ Exit: /*************************************************************************** Desc: *****************************************************************************/ -RCODE F_RebuildNodeIStream::close( void) +RCODE F_RebuildNodeIStream::closeStream( void) { if( m_pucFirstElmBlk) { diff --git a/xflaim/src/flopen.cpp b/xflaim/src/flopen.cpp index 151b432..1c14c16 100644 --- a/xflaim/src/flopen.cpp +++ b/xflaim/src/flopen.cpp @@ -558,7 +558,7 @@ Exit: if (pLockFileHdl) { - (void)pLockFileHdl->close(); + (void)pLockFileHdl->closeFile(); pLockFileHdl->Release(); pLockFileHdl = NULL; } @@ -1221,7 +1221,7 @@ F_Database::~F_Database() if (m_pLockFileHdl) { - (void)m_pLockFileHdl->close(); + (void)m_pLockFileHdl->closeFile(); m_pLockFileHdl->Release(); m_pLockFileHdl = NULL; } diff --git a/xflaim/src/flverify.cpp b/xflaim/src/flverify.cpp index 74cdb98..0b8650a 100644 --- a/xflaim/src/flverify.cpp +++ b/xflaim/src/flverify.cpp @@ -4430,7 +4430,7 @@ RCODE F_NodeVerifier::finalize( goto Exit; } - if( RC_BAD( rc = pBufferStream->open( + if( RC_BAD( rc = pBufferStream->openStream( (const char *)m_pucBuf, m_uiBytesInBuf))) { goto Exit; diff --git a/xflaim/src/fqeval.cpp b/xflaim/src/fqeval.cpp index 9433ea2..abfb7f2 100644 --- a/xflaim/src/fqeval.cpp +++ b/xflaim/src/fqeval.cpp @@ -1073,7 +1073,7 @@ FSTATIC RCODE fqCompareText( goto Exit; } - if (RC_BAD( rc = pBufferLStream->open( + if (RC_BAD( rc = pBufferLStream->openStream( (const char *)pLValue->val.pucBuf, pLValue->uiDataLen))) { goto Exit; @@ -1093,7 +1093,7 @@ FSTATIC RCODE fqCompareText( goto Exit; } - if( RC_BAD( rc = pBufferRStream->open( + if( RC_BAD( rc = pBufferRStream->openStream( (const char *)pRValue->val.pucBuf, pRValue->uiDataLen))) { goto Exit; @@ -1171,7 +1171,7 @@ FSTATIC RCODE fqApproxCompare( goto Exit; } - if (RC_BAD( rc = pBufferLStream->open( + if (RC_BAD( rc = pBufferLStream->openStream( (const char *)pLValue->val.pucBuf, pLValue->uiDataLen))) { goto Exit; @@ -1191,7 +1191,7 @@ FSTATIC RCODE fqApproxCompare( goto Exit; } - if( RC_BAD( rc = pBufferRStream->open( + if( RC_BAD( rc = pBufferRStream->openStream( (const char *)pRValue->val.pucBuf, pRValue->uiDataLen))) { goto Exit; @@ -1345,7 +1345,7 @@ FSTATIC RCODE fqCompareBinary( goto Exit; } - if (RC_BAD( rc = pBufferLStream->open( + if (RC_BAD( rc = pBufferLStream->openStream( (const char *)pLValue->val.pucBuf, pLValue->uiDataLen))) { goto Exit; @@ -1360,7 +1360,7 @@ FSTATIC RCODE fqCompareBinary( if( !(pRValue->uiFlags & VAL_IS_STREAM)) { - if( RC_BAD( rc = pBufferRStream->open( + if( RC_BAD( rc = pBufferRStream->openStream( (const char *)pRValue->val.pucBuf, pRValue->uiDataLen))) { goto Exit; diff --git a/xflaim/src/fquery.cpp b/xflaim/src/fquery.cpp index 4a7ab12..ba7186d 100644 --- a/xflaim/src/fquery.cpp +++ b/xflaim/src/fquery.cpp @@ -4955,7 +4955,7 @@ RCODE F_Query::optimizePredicate( } uiCost = 0; - if (RC_BAD( rc = pBufferIStream->open( + if (RC_BAD( rc = pBufferIStream->openStream( (const char *)pPred->pFromValue->val.pucBuf, pPred->pFromValue->uiDataLen))) { diff --git a/xflaim/src/frestore.cpp b/xflaim/src/frestore.cpp index 8c8183a..1793e3a 100644 --- a/xflaim/src/frestore.cpp +++ b/xflaim/src/frestore.cpp @@ -93,7 +93,7 @@ RCODE F_FSRestore::openBackupSet( void) goto Exit; } - if( RC_BAD( rc = m_pMultiFileHdl->open( m_szBackupSetPath))) + if( RC_BAD( rc = m_pMultiFileHdl->openFile( m_szBackupSetPath))) { m_pMultiFileHdl->Release(); m_pMultiFileHdl = NULL; @@ -141,7 +141,6 @@ RCODE F_FSRestore::openRflFile( goto Exit; } - pFileHdl->close(); pFileHdl->Release(); pFileHdl = NULL; @@ -213,7 +212,7 @@ RCODE F_FSRestore::openIncFile( goto Exit; } - if( RC_BAD( rc = m_pMultiFileHdl->open( szIncPath))) + if( RC_BAD( rc = m_pMultiFileHdl->openFile( szIncPath))) { m_pMultiFileHdl->Release(); m_pMultiFileHdl = NULL; diff --git a/xflaim/src/fvector.cpp b/xflaim/src/fvector.cpp index be8ca59..92563d5 100644 --- a/xflaim/src/fvector.cpp +++ b/xflaim/src/fvector.cpp @@ -996,7 +996,7 @@ RCODE F_DataVector::outputKey( } } - if (RC_BAD( rc = pBufferStream->open( + if (RC_BAD( rc = pBufferStream->openStream( (const char *)pucDataPtr, uiDataLen))) { goto Exit; @@ -1011,7 +1011,7 @@ RCODE F_DataVector::outputKey( goto Exit; } - pBufferStream->close(); + pBufferStream->closeStream(); } else if (pVector->uiDataType == XFLM_NUMBER_TYPE) { @@ -1043,7 +1043,7 @@ RCODE F_DataVector::outputKey( } } - if (RC_BAD( rc = pBufferStream->open( + if (RC_BAD( rc = pBufferStream->openStream( (const char *)ucStorageBuf, uiStorageLen))) { goto Exit; @@ -1061,7 +1061,7 @@ RCODE F_DataVector::outputKey( goto Exit; } - pBufferStream->close(); + pBufferStream->closeStream(); } } else @@ -1090,7 +1090,7 @@ RCODE F_DataVector::outputKey( } } - if (RC_BAD( rc = pBufferStream->open( + if (RC_BAD( rc = pBufferStream->openStream( (const char *)pucDataPtr, uiDataLen))) { goto Exit; @@ -1111,7 +1111,7 @@ RCODE F_DataVector::outputKey( goto Exit; } - pBufferStream->close(); + pBufferStream->closeStream(); } } diff --git a/xflaim/src/fxpath.cpp b/xflaim/src/fxpath.cpp index 8594d2d..65a8952 100644 --- a/xflaim/src/fxpath.cpp +++ b/xflaim/src/fxpath.cpp @@ -2451,7 +2451,7 @@ RCODE F_XPath::parseQuery( goto Exit; } - if( RC_BAD( rc = pBufferStream->open( + if( RC_BAD( rc = pBufferStream->openStream( (const char *)pszQuery, f_strlen( pszQuery)))) { goto Exit; diff --git a/xflaim/src/kybldkey.cpp b/xflaim/src/kybldkey.cpp index 5d2f1a6..89d7bd5 100644 --- a/xflaim/src/kybldkey.cpp +++ b/xflaim/src/kybldkey.cpp @@ -267,7 +267,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( } } - if (RC_BAD( rc = pBufferIStream->open( + if (RC_BAD( rc = pBufferIStream->openStream( (const char *)pucFromBuf, uiFromBufLen))) { goto Exit; @@ -288,7 +288,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( goto Exit; } - pBufferIStream->close(); + pBufferIStream->closeStream(); if (bDataTruncated) { @@ -638,7 +638,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( } } - if (RC_BAD( rc = pBufferIStream->open( + if (RC_BAD( rc = pBufferIStream->openStream( (const char *)pucFromBuf, uiFromBufLen))) { goto Exit; @@ -659,7 +659,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( goto Exit; } - pBufferIStream->close(); + pBufferIStream->closeStream(); if (bDataTruncated) { @@ -730,7 +730,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( } } - if (RC_BAD( rc = pBufferIStream->open( + if (RC_BAD( rc = pBufferIStream->openStream( (const char *)pucUntilBuf, uiUntilBufLen))) { goto Exit; @@ -750,7 +750,7 @@ FSTATIC RCODE flmAddNonTextKeyPiece( goto Exit; } - pBufferIStream->close(); + pBufferIStream->closeStream(); if (bDataTruncated) { @@ -1615,7 +1615,7 @@ FSTATIC RCODE flmAddTextKeyPiece( } } - if (RC_BAD( rc = pBufferIStream->open( + if (RC_BAD( rc = pBufferIStream->openStream( (const char *)pucFromUTF8Buf, uiFromBufLen))) { goto Exit; @@ -1638,7 +1638,7 @@ FSTATIC RCODE flmAddTextKeyPiece( goto Exit; } - pBufferIStream->close(); + pBufferIStream->closeStream(); if (bDataTruncated) { @@ -1855,7 +1855,7 @@ FSTATIC RCODE flmAddTextKeyPiece( } } - if (RC_BAD( rc = pBufferIStream->open( + if (RC_BAD( rc = pBufferIStream->openStream( (const char *)pucUntilUTF8Buf, uiUntilBufLen))) { goto Exit; @@ -1878,7 +1878,7 @@ FSTATIC RCODE flmAddTextKeyPiece( goto Exit; } - pBufferIStream->close(); + pBufferIStream->closeStream(); if (bDataTruncated) { diff --git a/xflaim/src/kybuild.cpp b/xflaim/src/kybuild.cpp index 00d405b..ca16e28 100644 --- a/xflaim/src/kybuild.cpp +++ b/xflaim/src/kybuild.cpp @@ -1228,7 +1228,7 @@ No_Strings: break; } - if (RC_BAD( rc = pBufferIStream->open( + if (RC_BAD( rc = pBufferIStream->openStream( (const char *)*ppucTmpBuf, uiStrBytes))) { goto Exit; @@ -1247,7 +1247,7 @@ No_Strings: NULL, NULL, m_keyGenInfo.pIxd->uiLanguage, FALSE, FALSE, &bDataTruncated, NULL); - pBufferIStream->close(); + pBufferIStream->closeStream(); if( RC_BAD( rc)) { @@ -1282,7 +1282,7 @@ No_Strings: goto Exit; } - if (RC_BAD( rc = pBufferIStream->open( + if (RC_BAD( rc = pBufferIStream->openStream( (const char *)ucStorageBuf, uiStorageLen))) { goto Exit; @@ -1299,7 +1299,7 @@ No_Strings: NULL, NULL, m_keyGenInfo.pIxd->uiLanguage, FALSE, FALSE, NULL, NULL); - pBufferIStream->close(); + pBufferIStream->closeStream(); if( RC_BAD( rc)) { @@ -1343,7 +1343,7 @@ No_Strings: break; } - if (RC_BAD( rc = pBufferIStream->open( + if (RC_BAD( rc = pBufferIStream->openStream( (const char *)*ppucTmpBuf, uiStrBytes))) { goto Exit; @@ -1364,7 +1364,7 @@ No_Strings: bHadAtLeastOneString ? FALSE : TRUE, FALSE, &bDataTruncated, NULL); - pBufferIStream->close(); + pBufferIStream->closeStream(); if( RC_BAD( rc)) { diff --git a/xflaim/src/kycollat.cpp b/xflaim/src/kycollat.cpp index 0a6f36f..c15384a 100644 --- a/xflaim/src/kycollat.cpp +++ b/xflaim/src/kycollat.cpp @@ -127,7 +127,7 @@ RCODE KYCollateValue( goto Exit; } - if (RC_BAD( rc = pBufferIStream->open( + if (RC_BAD( rc = pBufferIStream->openStream( (const char *)dynaBuf.getBufferPtr(), dynaBuf.getDataLength()))) { goto Exit; diff --git a/xflaim/src/ncache.cpp b/xflaim/src/ncache.cpp index 0a33da2..29b38f2 100644 --- a/xflaim/src/ncache.cpp +++ b/xflaim/src/ncache.cpp @@ -1866,7 +1866,7 @@ RCODE F_NodeCacheMgr::readNodeFromDisk( { goto Exit; } - if (RC_BAD( rc = btreeIStream.open( pDb, pBTree, XFLM_EXACT, + if (RC_BAD( rc = btreeIStream.openStream( pDb, pBTree, XFLM_EXACT, uiCollection, ui64NodeId, 0, 0))) { goto Exit; @@ -1894,12 +1894,12 @@ RCODE F_NodeCacheMgr::readNodeFromDisk( Exit: - if (bCloseIStream) + if( bCloseIStream) { - btreeIStream.close(); + btreeIStream.closeStream(); } - if (pBTree) + if( pBTree) { pBTree->Release(); } diff --git a/xflaim/src/rfl.cpp b/xflaim/src/rfl.cpp index b0cb23f..5d8706f 100644 --- a/xflaim/src/rfl.cpp +++ b/xflaim/src/rfl.cpp @@ -79,7 +79,7 @@ public: RCODE write( IF_PosIStream * pIStream); - FINLINE RCODE FLMAPI close( void) + FINLINE RCODE FLMAPI closeStream( void) { if( m_pRfl) { @@ -175,7 +175,7 @@ F_Rfl::~F_Rfl() if (m_pFileHdl) { - m_pFileHdl->close(); + m_pFileHdl->closeFile(); m_pFileHdl->Release(); m_pFileHdl = NULL; m_pDatabase = NULL; @@ -1940,14 +1940,14 @@ RCODE F_Rfl::seeIfNeedNewFile( uiCurrFileEOF = ROUND_DOWN_TO_NEAREST_512( uiCurrFileEOF) + 512; } - if (RC_BAD( rc = m_pFileHdl->truncate( uiCurrFileEOF))) + if (RC_BAD( rc = m_pFileHdl->truncateFile( uiCurrFileEOF))) { goto Exit; } // Close the file handle. - m_pFileHdl->close(); + m_pFileHdl->closeFile(); m_pFileHdl->Release(); m_pFileHdl = NULL; @@ -2125,14 +2125,14 @@ RCODE F_Rfl::finishCurrFile( { uiTruncateSize = ROUND_DOWN_TO_NEAREST_512( uiTruncateSize) + 512; } - if (RC_BAD( rc = m_pFileHdl->truncate( uiTruncateSize))) + if (RC_BAD( rc = m_pFileHdl->truncateFile( uiTruncateSize))) { goto Exit; } // Close the file handle. - m_pFileHdl->close(); + m_pFileHdl->closeFile(); m_pFileHdl->Release(); m_pFileHdl = NULL; @@ -2336,7 +2336,7 @@ RCODE F_Rfl::truncate( goto Exit; } - if (RC_BAD( rc = m_pFileHdl->truncate( uiTruncateSize))) + if (RC_BAD( rc = m_pFileHdl->truncateFile( uiTruncateSize))) { m_bRflVolumeOk = FALSE; goto Exit; @@ -6939,7 +6939,7 @@ RCODE F_Rfl::recovAttrSetValue( if( !uiHaveDataPackets) { - if( RC_BAD( rc = pBufferIStream->open( + if( RC_BAD( rc = pBufferIStream->openStream( (const char *)pucPacketBody, uiPayloadLen))) { goto Exit; @@ -6952,7 +6952,7 @@ RCODE F_Rfl::recovAttrSetValue( FLMUINT uiDataPacketBodyLen; const FLMBYTE * pucDataPacketBody; - if( RC_BAD( rc = pBufferIStream->open( NULL, uiPayloadLen, + if( RC_BAD( rc = pBufferIStream->openStream( NULL, uiPayloadLen, (char **)&pucData))) { goto Exit; @@ -7006,7 +7006,7 @@ RCODE F_Rfl::recovAttrSetValue( goto Exit; } - pBufferIStream->truncate( + pBufferIStream->truncateStream( (FLMUINT)(pBufferIStream->getCurrPosition() + uiDecryptedDataLen)); } diff --git a/xflaim/src/rfl.h b/xflaim/src/rfl.h index 26d53ed..fcfaae3 100644 --- a/xflaim/src/rfl.h +++ b/xflaim/src/rfl.h @@ -435,7 +435,7 @@ public: } if (m_pFileHdl) { - m_pFileHdl->close(); + m_pFileHdl->closeFile(); m_pFileHdl->Release(); m_pFileHdl = NULL; m_pCurrentBuf->uiCurrFileNum = 0; diff --git a/xflaim/util/flm_dlst.cpp b/xflaim/util/flm_dlst.cpp index 796e185..40aeec7 100644 --- a/xflaim/util/flm_dlst.cpp +++ b/xflaim/util/flm_dlst.cpp @@ -703,7 +703,7 @@ RCODE F_DynamicList::dumpToFile() pTmp = pTmp->pNext; } - (void)pFileHdl->close(); + (void)pFileHdl->closeFile(); } diff --git a/xflaim/util/fshell.cpp b/xflaim/util/fshell.cpp index 236eee3..689a998 100644 --- a/xflaim/util/fshell.cpp +++ b/xflaim/util/fshell.cpp @@ -1291,9 +1291,10 @@ RCODE FlmShell::executeCmdLine( void) } } - pBufIStream->open( m_ppCurrArgV[ 2], f_strlen( m_ppCurrArgV[ 2])); + pBufIStream->openStream( m_ppCurrArgV[ 2], + f_strlen( m_ppCurrArgV[ 2])); tmpRc = xpathObj.parseQuery( pDb, pBufIStream, &query); - pBufIStream->close(); + pBufIStream->closeStream(); con_printf( "Result: 0x%08X\n\n", (unsigned)tmpRc); } @@ -1318,7 +1319,7 @@ RCODE FlmShell::executeCmdLine( void) } } - pBufIStream->open( m_ppCurrArgV[ 1], f_strlen( m_ppCurrArgV[ 1])); + pBufIStream->openStream( m_ppCurrArgV[ 1], f_strlen( m_ppCurrArgV[ 1])); for( ;;) { RCODE tmpRc; @@ -1340,7 +1341,7 @@ MetaExit: if( pBufIStream) { - pBufIStream->close(); + pBufIStream->closeStream(); } } } @@ -3959,7 +3960,7 @@ FLMINT fshellFileSystemTest( pShell->con_printf( "\nFinished random scan.\n"); - if( RC_BAD( rc = pFileHdl->close())) + if( RC_BAD( rc = pFileHdl->closeFile())) { goto Exit; } diff --git a/xflaim/util/rebuild.cpp b/xflaim/util/rebuild.cpp index 132792f..866fbae 100644 --- a/xflaim/util/rebuild.cpp +++ b/xflaim/util/rebuild.cpp @@ -373,7 +373,6 @@ Exit: if( gv_bLoggingEnabled) { bldLogFlush(); - gv_pLogFile->close(); gv_pLogFile->Release(); gv_pLogFile = NULL; }