--- a/connectivitylayer/isce/memmanager_dll/src/memmanager.cpp Wed Apr 21 14:29:55 2010 +0300
+++ b/connectivitylayer/isce/memmanager_dll/src/memmanager.cpp Tue Oct 19 13:16:20 2010 +0300
@@ -124,7 +124,7 @@
C_TRACE( ( _T( "DMemManager::PoolAllocateDfc aPtr 0x%x>" ), aPtr ) );
DMemManager& tmp = *reinterpret_cast<DMemManager*>( aPtr );
- TRACE_ASSERT_ALWAYS;// See below TODO comment, needs a fix
+ TRACE_ASSERT_ALWAYS;
NKern::FMWait( tmp.iFastMutex );
@@ -149,7 +149,7 @@
C_TRACE( ( _T( "DMemManager::PoolDeleteDfc aPtr 0x%x>" ), aPtr ) );
DMemManager& tmp = *reinterpret_cast<DMemManager*>( aPtr );
- TRACE_ASSERT_ALWAYS; // See below TODO comment, needs a fix
+ TRACE_ASSERT_ALWAYS;
NKern::FMWait( tmp.iFastMutex );
ASSERT_RESET_ALWAYS( ( tmp.iPoolDeleteQueue.Count() > 0 ), ( EInvalidQueueCount | EDMemmanagerTraceId << KClassIdentifierShift ) );
@@ -258,7 +258,7 @@
*/
TPtr8* DMemManager::DMemPool::Alloc( const TUint16 aSize )
{
-// TODO : not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Alloc>" ) ) );
+// not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Alloc>" ) ) );
ASSERT_RESET_ALWAYS( (iMemoryArea || iFreeMemBlock), ( EMemBlockAllocationFailed | EDMemmanagerTraceId << KClassIdentifierShift ) );
@@ -282,7 +282,7 @@
iBlockUsage++;
-// TODO : not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Alloc<" ) ) );
+// not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Alloc<" ) ) );
return iAllocatedMemBlock->iMemPtr;
}
@@ -292,7 +292,7 @@
*/
TBool DMemManager::DMemPool::Free( const TUint8* aBlockAddress )
{
-// TODO : not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Free>" ) ) );
+// not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Free>" ) ) );
struct sUnit *pCurUnit = (struct sUnit *)(aBlockAddress - sizeof(struct sUnit) );
@@ -314,7 +314,7 @@
iFreeMemBlock->iMemPtr->Zero();
iBlockUsage--;
-// TODO : not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Free<" ) ) );
+// not when FM C_TRACE( ( _T( "DMemManager::DMemPool::Free<" ) ) );
//If empty & ready to be deleted
return ( iCopyPoolInUse && iBlockUsage == 0 ) ? ETrue : EFalse;
@@ -366,7 +366,8 @@
__ASSERT_NO_FAST_MUTEX;
ASSERT_THREAD_CONTEXT_ALWAYS( ( EDeallocNotThreadContext | EDMemmanagerTraceId << KClassIdentifierShift ) );
-
+ aBlock.FillZ( aBlock.MaxLength() );
+ aBlock.SetLength(0);
TBool removePool = EFalse;
NKern::FMWait( DMemManager::iThisptr->iFastMutex );