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

Added support for allocating aligned buffers on Unix platforms that don't provide the memalign() function.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@644 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-07-11 03:00:03 +00:00
parent c44e49e82c
commit 82f98d78a8
1 changed files with 46 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
ftk/src/ftkmem.cpp
View File

@@ -77,6 +77,12 @@
#endif
#if defined( FLM_UNIX)
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
#endif
#endif
/************************************************************************
Desc:
*************************************************************************/
@@ -2647,11 +2653,6 @@ void * F_SlabManager::allocSlabFromSystem( void)
return( NULL);
}
#elif defined( FLM_UNIX)
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
#endif
if( (pSlab = mmap( 0, m_uiSlabSize,
PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0)) == MAP_FAILED)
{
@@ -4442,28 +4443,48 @@ RCODE FLMAPI f_allocAlignedBufferImp(
rc = f_mapPlatformError( GetLastError(), NE_FLM_MEM);
goto Exit;
}
f_memset( *ppvAlloc, 0, uiMinSize);
#elif defined( FLM_LINUX)
if( posix_memalign( ppvAlloc, sysconf( _SC_PAGESIZE), uiMinSize) != 0)
{
rc = f_mapPlatformError( errno, NE_FLM_MEM);
goto Exit;
}
f_memset( *ppvAlloc, 0, uiMinSize);
#elif defined( FLM_SOLARIS)
if( (*ppvAlloc = memalign( sysconf( _SC_PAGESIZE), uiMinSize)) == NULL)
{
rc = f_mapPlatformError( errno, NE_FLM_MEM);
goto Exit;
}
f_memset( *ppvAlloc, 0, uiMinSize);
#elif defined( FLM_LINUX)
if( posix_memalign( ppvAlloc, sysconf( _SC_PAGESIZE), uiMinSize) != 0)
{
rc = f_mapPlatformError( errno, NE_FLM_MEM);
goto Exit;
}
#elif defined( FLM_UNIX)
{
FLMUINT uiAllocSize;
FLMUINT uiPageSize = (FLMUINT)sysconf( _SC_PAGESIZE);
FLMBYTE * pucAlloc;
uiAllocSize = f_roundUp( uiMinSize, uiPageSize) + uiPageSize;
if( (pucAlloc = (FLMBYTE *)mmap( 0, uiAllocSize,
PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS,
-1, 0)) == MAP_FAILED)
{
rc = f_mapPlatformError( errno, NE_FLM_MEM);
goto Exit;
}
f_assert( ((FLMUINT)(pucAlloc) % uiPageSize) == 0);
UD2FBA( uiAllocSize, pucAlloc);
*ppvAlloc = (void *)(pucAlloc + uiPageSize);
}
#else
if( RC_BAD( rc = f_calloc( uiMinSize, ppvAlloc)))
if( RC_BAD( rc = f_alloc( uiMinSize, ppvAlloc)))
{
goto Exit;
}
#endif
f_memset( *ppvAlloc, 0, uiMinSize);
Exit:
return( rc);
@@ -4482,6 +4503,16 @@ void FLMAPI f_freeAlignedBufferImp(
*ppvAlloc = NULL;
#elif defined( FLM_LINUX) || defined( FLM_SOLARIS)
free( *ppvAlloc);
*ppvAlloc = NULL;
#elif defined( FLM_UNIX)
{
FLMUINT uiAllocSize;
FLMUINT uiPageSize = (FLMUINT)sysconf( _SC_PAGESIZE);
uiAllocSize = FB2UD( (FLMBYTE *)(*ppvAlloc) - uiPageSize);
munmap( *ppvAlloc, uiAllocSize);
}
*ppvAlloc = NULL;
#else
f_free( ppvAlloc);