FCL/sf/os/osrndtools: comparison memspy/Driver/User/Source/MemSpyDriverClient.cpp

equal deleted inserted replaced

-:e26895079d7c
+:7fdc9a71d314
 // System includes
 #include <e32svr.h>
 // User includes
 #include "MemSpyDriverOpCodes.h"
-#include "RBuildQueryableHeap.h"
 #include <memspy/driver/memspydriverconstants.h>
 #include <memspy/driver/memspydriverobjectsshared.h>
 #include "MemSpyDriverStreamReaderImp.h"
 #include "MemSpyDriverObjectsInternal.h"
+#include "heaputils.h"
 // Constants
 const TInt KMemSpyClientBufferGrowSize = 0x1000 * 8; // 32kb
 // Forward declarations
 if  ( aInfo.Type() == TMemSpyHeapInfo::ETypeRHeap )
 {
 TMemSpyHeapInfoRHeap& rHeapInfo = aInfo.AsRHeap();
 TMemSpyHeapMetaDataRHeap& metaData = rHeapInfo.MetaData();
 metaData.SetVTable( RHeapVTable() );
-metaData.SetClassSize( sizeof( RHeap ) );
+//metaData.SetClassSize( sizeof( RHeap ) );
 }
 }
 else if ( r == KErrNotSupported )
 {
 aInfo.SetType( TMemSpyHeapInfo::ETypeUnknown );
 }
 	//
 	return r;
 }
 EXPORT_C TInt RMemSpyDriverClient::GetHeapInfoUser( TMemSpyHeapInfo& aInfo, TUint aTid, RArray< TMemSpyDriverFreeCell >& aFreeCells )
-{
+	{
+	return GetHeapInfoUser(aInfo, aTid, aFreeCells, EFalse);
+	}
+// For the record I don't think this function should be exported, but since the one above was I'm going with the flow. -TomS
+EXPORT_C TInt RMemSpyDriverClient::GetHeapInfoUser(TMemSpyHeapInfo& aInfo, TUint aTid, RArray<TMemSpyDriverCell>& aCells, TBool aCollectAllocatedCellsAsWellAsFree)
+	{
 TMemSpyDriverInternalHeapRequestParameters params;
 //
 params.iTid = aTid;
 params.iRHeapVTable = RHeapVTable();
 params.iDebugAllocator = DebugEUser();
 params.iMasterInfo = &aInfo;
 params.iBuildFreeCellList = ETrue;
-//
+	params.iBuildAllocCellList = aCollectAllocatedCellsAsWellAsFree;
-aFreeCells.Reset();
+//
+aCells.Reset();
 ResetStreamBuffer();
 	TInt r = DoControl( EMemSpyDriverOpCodeHeapInfoGetUser, &params );
 	//
 	if  ( r >= KErrNone )
 	{
 if  ( aInfo.Type() == TMemSpyHeapInfo::ETypeRHeap )
 {
 TMemSpyHeapInfoRHeap& rHeapInfo = aInfo.AsRHeap();
 TMemSpyHeapMetaDataRHeap& metaData = rHeapInfo.MetaData();
 metaData.SetVTable( RHeapVTable() );
-metaData.SetClassSize( sizeof( RHeap ) );
+//metaData.SetClassSize( sizeof( RHeap ) );
 }
 // Resize transfer buffer to make room for free cells. We only make the buffer
 // bigger, not smaller.
 if  ( iBuffer.Size() < r )
 }
 // Now fetch the heap data
 if  ( r == KErrNone )
 {
-r = DoControl( EMemSpyDriverOpCodeHeapInfoFetchFreeCells, &iBuffer );
+r = DoControl( EMemSpyDriverOpCodeHeapInfoFetchCellList, &iBuffer );
 if  ( r == KErrNone )
 {
-TRAP( r, ReadHeapInfoFreeCellsFromXferBufferL( aFreeCells ) );
+TRAP( r, ReadHeapInfoFreeCellsFromXferBufferL( aCells ) );
 }
 }
 }
 else if ( r == KErrNotSupported )
 {
 params.iRHeapVTable = RHeapVTable();
 params.iDebugAllocator = DebugEUser();
 params.iDes = &aDest;
 params.iChecksum = aFreeCellChecksum;
 params.iRemaining = -1;
+	params.iReadAddress = 0;
 aDest.Zero();
 //
 	TInt r = DoControl( EMemSpyDriverOpCodeHeapDataGetUser, &params, NULL );
 	//
 	if  ( r >= KErrNone )
 params.iRHeapVTable = RHeapVTable();
 params.iDebugAllocator = DebugEUser();
 params.iDes = &aDest;
 params.iChecksum = 0;
 params.iRemaining = aAmountRemaining;
+	params.iReadAddress = aReadAddress;
 aDest.Zero();
 //
 	TInt r = DoControl( EMemSpyDriverOpCodeHeapDataGetUser, &params, NULL );
 	//
 	if  ( r >= KErrNone )
 }
 EXPORT_C TInt RMemSpyDriverClient::WalkHeapNextCell( TUint aTid, TMemSpyDriverCellType& aCellType, TAny*& aCellAddress, TInt& aLength, TInt& aNestingLevel, TInt& aAllocNumber, TInt& aCellHeaderSize, TAny*& aCellPayloadAddress )
 {
-aCellType = EMemSpyDriverGoodAllocatedCell;
+aCellType = EMemSpyDriverBadCellMask;
 aCellAddress = NULL;
 aLength = 0;
 aNestingLevel = 0;
 aAllocNumber = 0;
 aCellHeaderSize = 0;
 TMemSpyDriverInternalWalkHeapParamsCell params;
 	const TInt r = DoControl( EMemSpyDriverOpCodeWalkHeapNextCell, (TAny*) aTid, &params );
 //
 	if  ( r == KErrNone )
 	    {
-RBuildQueryableHeap* heap = static_cast< RBuildQueryableHeap* >( &User::Allocator() );
-//
 aCellType = (TMemSpyDriverCellType) params.iCellType;
 aCellAddress = params.iCellAddress;
 aLength = params.iLength;
 aNestingLevel = params.iNestingLevel;
 aAllocNumber = params.iAllocNumber;
-aCellHeaderSize = heap->CellHeaderSize( aCellType );
 aCellPayloadAddress = ((TUint8*) aCellAddress) + aCellHeaderSize;
 }
 //
 	return r;
 }
 }
 EXPORT_C TInt RMemSpyDriverClient::WalkHeapGetCellInfo( TAny*& aCellAddress, TMemSpyDriverCellType& aCellType, TInt& aLength, TInt& aNestingLevel, TInt& aAllocNumber, TInt& aCellHeaderSize, TAny*& aCellPayloadAddress )
 {
-aCellType = EMemSpyDriverGoodAllocatedCell;
+aCellType = EMemSpyDriverBadCellMask;
 aLength = 0;
 aNestingLevel = 0;
 aAllocNumber = 0;
 aCellHeaderSize = 0;
 aCellPayloadAddress = NULL;
 TMemSpyDriverInternalWalkHeapParamsCell params;
 	const TInt r = DoControl( EMemSpyDriverOpCodeWalkHeapGetCellInfo, aCellAddress, &params );
 //
 	if  ( r == KErrNone )
 	    {
-RBuildQueryableHeap* heap = static_cast< RBuildQueryableHeap* >( &User::Allocator() );
-//
 aCellAddress = params.iCellAddress;
 aCellType = (TMemSpyDriverCellType) params.iCellType;
 aLength = params.iLength;
 aNestingLevel = params.iNestingLevel;
 aAllocNumber = params.iAllocNumber;
-aCellHeaderSize = heap->CellHeaderSize( aCellType );
 aCellPayloadAddress = ((TUint8*) aCellAddress) + aCellHeaderSize;
 }
 //
 	return r;
 }
 }
 TBool RMemSpyDriverClient::DebugEUser()
 {
-RHeap* heap = static_cast< RHeap* >( &User::Allocator() );
+	LtkUtils::RAllocatorHelper allocHelper;
-RBuildQueryableHeap* queryHeap = static_cast< RBuildQueryableHeap* >( heap );
+	TBool result = EFalse;
-const TBool isDebugEUser = queryHeap->IsDebugEUser();
+	TInt err = allocHelper.Open(&User::Allocator());
-return isDebugEUser;
+	if (!err)
+		{
+		result = allocHelper.AllocatorIsUdeb();
+		allocHelper.Close();
+		}
+	return result;
 }
 void RMemSpyDriverClient::ResetStreamBuffer()
 {
 #endif
 for( TInt i=0; i<count; i++ )
 {
 TMemSpyDriverFreeCell entry;
-entry.iType = stream.ReadInt32L();
+entry.iType = (TMemSpyDriverCellType)stream.ReadInt32L();
 entry.iAddress = reinterpret_cast< TAny* >( stream.ReadUint32L() );
 entry.iLength = stream.ReadInt32L();
 aFreeCells.AppendL( entry );
 }
 static void PrintHeapInfo( const TMemSpyHeapInfo& aInfo )
 {
 #if defined( _DEBUG ) && !defined( __WINS__ )
 const TMemSpyHeapInfoRHeap& rHeapInfo = aInfo.AsRHeap();
-const TMemSpyHeapObjectDataRHeap& rHeapObjectData = rHeapInfo.ObjectData();
+//const TMemSpyHeapObjectDataRHeap& rHeapObjectData = rHeapInfo.ObjectData();
 const TMemSpyHeapStatisticsRHeap& rHeapStats = rHeapInfo.Statistics();
 const TMemSpyHeapMetaDataRHeap& rHeapMetaData = rHeapInfo.MetaData();
+	/*
+	 * TODO update to reflect new memory allocator structs etc
+	 *
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() ---------------------------------------------------");
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - RAllocator                                      -");
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() ---------------------------------------------------");
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - RAllocator::iAccessCount:       %d", rHeapObjectData.iAccessCount);
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - RAllocator::iHandleCount:       %d", rHeapObjectData.iHandleCount);
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - RHeap::iFailed:                 %d", rHeapObjectData.iFailed);
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - RHeap::iFailAllocCount:         %d", rHeapObjectData.iFailAllocCount);
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - RHeap::iRand:                   %d", rHeapObjectData.iRand);
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - RHeap::iTestData:               0x%08x", rHeapObjectData.iTestData);
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - ");
+	*/
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() ---------------------------------------------------");
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - Stats (Free)                                    -");
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() ---------------------------------------------------");
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - cell count:                     %d", rHeapStats.StatsFree().TypeCount());
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() ---------------------------------------------------");
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - cell count:                     %d", rHeapStats.StatsAllocated().TypeCount());
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - cell size:                      %d", rHeapStats.StatsAllocated().TypeSize());
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - cell largest:                   0x%08x", rHeapStats.StatsAllocated().LargestCellAddress());
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - cell largest size:              %d", rHeapStats.StatsAllocated().LargestCellSize());
-RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - ");
-RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() ---------------------------------------------------");
-RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - Stats (Common)                                  -");
-RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() ---------------------------------------------------");
-RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - total cell count:               %d", rHeapStats.StatsCommon().TotalCellCount());
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - ");
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() ---------------------------------------------------");
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - Misc. Info                                      -");
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() ---------------------------------------------------");
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - debug allocator:                %d", rHeapMetaData.IsDebugAllocator());
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - shared heap:                    %d", rHeapMetaData.IsSharedHeap() );
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - user thread:                    %d", rHeapMetaData.IsUserThread() );
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - thread id:                      %d", aInfo.Tid() );
 RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - process id:                     %d", aInfo.Pid() );
-RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - cell header size (free):        %d", rHeapMetaData.HeaderSizeFree());
+//RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - cell header size (free):        %d", rHeapMetaData.HeaderSizeFree());
-RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - cell header size (alloc):       %d", rHeapMetaData.HeaderSizeAllocated());
+//RDebug::Printf("RMemSpyDriverClient::PrintHeapInfo() - cell header size (alloc):       %d", rHeapMetaData.HeaderSizeAllocated());
 #else
 (void) aInfo;
 #endif
 }

branch	RCL_3
changeset 49	7fdc9a71d314
parent 44	52e343bb8f80
child 59	8ad140f3dd41