diff -r 7fdc9a71d314 -r 8ad140f3dd41 memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanHeapInfo.cpp --- a/memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanHeapInfo.cpp Wed Sep 15 13:53:27 2010 +0300 +++ b/memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanHeapInfo.cpp Wed Oct 13 16:17:58 2010 +0300 @@ -46,18 +46,24 @@ DMemSpyDriverLogChanHeapInfo::~DMemSpyDriverLogChanHeapInfo() { TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::~DMemSpyDriverLogChanHeapInfo() - START - this: 0x%08x", this )); - ReleaseCellList(); TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::~DMemSpyDriverLogChanHeapInfo() - END - this: 0x%08x", this )); } + + + + + + + TInt DMemSpyDriverLogChanHeapInfo::Request( TInt aFunction, TAny* a1, TAny* a2 ) { TInt r = DMemSpyDriverLogChanHeapBase::Request( aFunction, a1, a2 ); if ( r == KErrNone ) { - if ( aFunction != EMemSpyDriverOpCodeHeapInfoFetchCellList ) + if ( aFunction != EMemSpyDriverOpCodeHeapInfoFetchFreeCells ) { - ReleaseCellList(); + ReleaseFreeCells(); } // switch( aFunction ) @@ -69,10 +75,10 @@ r = GetHeapInfoKernel( (TMemSpyDriverInternalHeapRequestParameters*) a1, (TDes8*) a2 ); break; case EMemSpyDriverOpCodeHeapInfoGetIsDebugKernel: - r = GetIsDebugKernel(a1); + r = GetIsDebugKernel( (TBool*) a1 ); break; - case EMemSpyDriverOpCodeHeapInfoFetchCellList: - r = FetchCellList( (TDes8*) a1 ); + case EMemSpyDriverOpCodeHeapInfoFetchFreeCells: + r = FetchFreeCells( (TDes8*) a1 ); break; default: @@ -126,42 +132,50 @@ DThread* thread = (DThread*) TempObject(); if ( SuspensionManager().IsSuspended( *thread ) ) { + TFullName chunkName; + // Open client's heap RMemSpyDriverRHeapUser rHeap( OSAdaption() ); - r = rHeap.OpenUserHeap(*thread, iHeapInfoParams.iDebugAllocator); + DChunk* userHeapChunk = NULL; + r = OpenUserHeap( *thread, iHeapInfoParams.iRHeapVTable, rHeap, userHeapChunk, &chunkName ); TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoUser - opening client heap returned: %d", r) ); if ( r == KErrNone ) { // This object holds all of the info we will accumulate for the client. TMemSpyHeapInfo masterHeapInfo; - masterHeapInfo.SetType(rHeap.GetTypeFromHelper()); + masterHeapInfo.SetType( TMemSpyHeapInfo::ETypeRHeap ); masterHeapInfo.SetTid( iHeapInfoParams.iTid ); masterHeapInfo.SetPid( OSAdaption().DThread().GetOwningProcessId( *thread ) ); // This is the RHeap-specific object that contains all RHeap info TMemSpyHeapInfoRHeap& rHeapInfo = masterHeapInfo.AsRHeap(); + // This is the object data for the RHeap instance + TMemSpyHeapObjectDataRHeap& rHeapObjectData = rHeapInfo.ObjectData(); + rHeap.CopyObjectDataTo( rHeapObjectData ); // We must walk the client's heap in order to build statistics TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoUser - calling heap walker constructor...")); - RMemSpyDriverHeapWalker heapWalker(rHeap); - if (iHeapInfoParams.iBuildFreeCellList || iHeapInfoParams.iBuildAllocCellList) + TMemSpyHeapWalkerNullObserver observer; + RMemSpyDriverHeapWalker heapWalker( rHeap, iHeapInfoParams.iDebugAllocator ); + if ( iHeapInfoParams.iBuildFreeCellList ) { heapWalker.SetObserver( this ); - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoUser - collecting cells")); + TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoUser - collecting free cells")); } else { - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoUser - not collecting cells")); + heapWalker.SetObserver( &observer ); + TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoUser - not collecting free cells")); } - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoUser - starting traversal openerr: %d...", r)); + TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoUser - starting traversal..." )); #if ( defined( TRACE_TYPE_USERHEAP ) && defined( TRACE_TYPE_HEAPWALK ) ) heapWalker.SetPrintDebug(); #endif - if (r == KErrNone) r = heapWalker.Traverse(); + r = heapWalker.Traverse(); TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoUser - finished traversal - err: %d", r )); TMemSpyHeapStatisticsRHeap& rHeapStats = rHeapInfo.Statistics(); @@ -169,26 +183,24 @@ // Get remaining meta data that isn't stored elsewhere TMemSpyHeapMetaDataRHeap& rHeapMetaData = rHeapInfo.MetaData(); - DChunk& userHeapChunk = rHeap.Chunk(); - TFullName chunkName; - userHeapChunk.FullName(chunkName); - rHeapMetaData.SetChunkName( chunkName ); - rHeapMetaData.SetChunkSize( (TUint) OSAdaption().DChunk().GetSize( userHeapChunk ) ); - rHeapMetaData.SetChunkHandle( &userHeapChunk ); - rHeapMetaData.SetChunkBaseAddress( OSAdaption().DChunk().GetBase( userHeapChunk ) ); - rHeapMetaData.SetDebugAllocator(rHeap.Helper()->AllocatorIsUdeb()); + rHeapMetaData.SetChunkName( chunkName ); + rHeapMetaData.SetChunkSize( (TUint) OSAdaption().DChunk().GetSize( *userHeapChunk ) ); + rHeapMetaData.SetChunkHandle( userHeapChunk ); + rHeapMetaData.SetChunkBaseAddress( OSAdaption().DChunk().GetBase( *userHeapChunk ) ); + rHeapMetaData.SetDebugAllocator( iHeapInfoParams.iDebugAllocator ); + rHeapMetaData.SetHeaderSizeFree( RMemSpyDriverRHeapBase::FreeCellHeaderSize() ); + rHeapMetaData.SetHeaderSizeAllocated( RMemSpyDriverRHeapBase::AllocatedCellHeaderSize( iHeapInfoParams.iDebugAllocator ) ); rHeapMetaData.SetUserThread( ETrue ); - rHeapMetaData.iHeapSize = rHeap.Helper()->CommittedSize(); - rHeapMetaData.iAllocatorAddress = (TAny*)rHeap.Helper()->AllocatorAddress(); - rHeapMetaData.iMinHeapSize = rHeap.Helper()->MinCommittedSize(); - rHeapMetaData.iMaxHeapSize = rHeap.Helper()->MaxCommittedSize(); + + // Get any heap-specific info + rHeap.GetHeapSpecificInfo( masterHeapInfo ); PrintHeapInfo( masterHeapInfo ); // Write free cells if requested - if ( r == KErrNone && (iHeapInfoParams.iBuildFreeCellList || iHeapInfoParams.iBuildAllocCellList)) + if ( r == KErrNone && iHeapInfoParams.iBuildFreeCellList ) { - r = PrepareCellListTransferBuffer(); + r = PrepareFreeCellTransferBuffer(); } // Update info ready for writing back to the user-side @@ -205,7 +217,7 @@ } // Release resources - rHeap.Close(); + rHeap.DisassociateWithKernelChunk(); } } else @@ -237,23 +249,24 @@ if ( r == KErrNone ) { // Open kernel heap + TFullName heapChunkName; RMemSpyDriverRHeapKernelInPlace rHeap; - r = rHeap.OpenKernelHeap(); + r = OpenKernelHeap( rHeap, &heapChunkName ); TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoKernel() - open err: %d", r ) ); if ( r == KErrNone ) { - r = DMemSpyDriverLogChanHeapBase::GetHeapInfoKernel(rHeap, params.iMasterInfo, aTransferBuffer); + // We must identify if we have a debug kernel allocator + const TBool debugAllocator = IsDebugKernel( rHeap ); + TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoKernel() - debugAllocator: %d", debugAllocator ) ); + + r = DMemSpyDriverLogChanHeapBase::GetHeapInfoKernel( rHeap, debugAllocator, heapChunkName, params.iMasterInfo, aTransferBuffer ); TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoKernel() - base class get heap info: %d", r) ); } - else - { - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoKernel() - open err: %d", r ) ); - } } else { - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoKernel() - params read error: %d", r) ); + Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoKernel() - params read error: %d", r); } TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetHeapInfoKernel() - END - ret: %d", r) ); @@ -265,7 +278,7 @@ -TInt DMemSpyDriverLogChanHeapInfo::GetIsDebugKernel(TAny* aResult) +TInt DMemSpyDriverLogChanHeapInfo::GetIsDebugKernel( TBool* aIsDebugKernel ) { TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetIsDebugKernel() - START") ); @@ -275,22 +288,22 @@ NKern::ThreadEnterCS(); RMemSpyDriverRHeapKernelInPlace rHeap; - r = rHeap.OpenKernelHeap(); + r = OpenKernelHeap( rHeap ); TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetIsDebugKernel() - open kernel heap returned: %d", r) ); if ( r == KErrNone ) { - debugKernel = rHeap.Helper()->AllocatorIsUdeb(); + debugKernel = IsDebugKernel( rHeap ); // Tidy up - rHeap.Close(); + rHeap.DisassociateWithKernelChunk(); } TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetIsDebugKernel() - debugKernel: %d", debugKernel) ); // Write back to user-land TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::GetIsDebugKernel() - writing to user-side...") ); - r = Kern::ThreadRawWrite( &ClientThread(), aResult, &debugKernel, sizeof(TBool) ); + r = Kern::ThreadRawWrite( &ClientThread(), aIsDebugKernel, &debugKernel, sizeof(TBool) ); NKern::ThreadLeaveCS(); @@ -298,121 +311,39 @@ return r; } -TInt DMemSpyDriverLogChanHeapInfo::PrepareCellListTransferBuffer() - { - // Transfer free cells immediately from xfer stream - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::PrepareCellListTransferBuffer() - START - iHeapStream: 0x%08x", iHeapStream )); - __ASSERT_ALWAYS( !iHeapStream, MemSpyDriverUtils::PanicThread( ClientThread(), EPanicHeapFreeCellStreamNotClosed ) ); - // - TInt r = KErrNoMemory; - // - NKern::ThreadEnterCS(); - // - iHeapStream = new RMemSpyMemStreamWriter(); - if ( iHeapStream ) - { - const TInt requiredMemory = CalculateCellListBufferSize(); - r = OpenXferStream( *iHeapStream, requiredMemory ); - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::PrepareCellListTransferBuffer() - requested %d bytes for free cell list, r: %d", requiredMemory, r )); + + - if ( r == KErrNone ) - { - const TInt count = iCellList.Count(); - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::PrepareCellListTransferBuffer() - cell count: %d", count )); - // - iHeapStream->WriteInt32( count ); - for( TInt i=0; iWriteInt32( cell.iType ); - iHeapStream->WriteUint32( reinterpret_cast( cell.iAddress ) ); - iHeapStream->WriteInt32( cell.iLength ); - } + - // Finished with the array now - iCellList.Reset(); - // We return the amount of client-side memory that needs to be allocated to hold the buffer - r = requiredMemory; - } - } - // - NKern::ThreadLeaveCS(); - - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::PrepareCellListTransferBuffer() - END - r: %d", r)); - return r; - } -TInt DMemSpyDriverLogChanHeapInfo::FetchCellList( TDes8* aBufferSink ) - { - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::FetchCellList() - START - iHeapStream: 0x%08x", iHeapStream )); - __ASSERT_ALWAYS( iHeapStream, MemSpyDriverUtils::PanicThread( ClientThread(), EPanicHeapFreeCellStreamNotOpen ) ); + - TInt r = KErrNone; + - // Write buffer to client - NKern::ThreadEnterCS(); - r = iHeapStream->WriteAndClose( aBufferSink ); + - // Tidy up - ReleaseCellList(); - NKern::ThreadLeaveCS(); - // - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::FetchCellList() - END - r: %d", r)); - return r; - } -TInt DMemSpyDriverLogChanHeapInfo::CalculateCellListBufferSize() const - { - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::CalculateCellListBufferSize() - START" )); + + - const TInt count = iCellList.Count(); - const TInt entrySize = sizeof( TInt32 ) + sizeof( TInt32 ) + sizeof( TUint32 ); - const TInt r = ( count * entrySize ) + sizeof( TInt ); // Extra TInt to hold count - - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::CalculateCellListBufferSize() - END - r: %d, count: %d, entrySize: %d", r, count, entrySize )); - return r; - } + + + -void DMemSpyDriverLogChanHeapInfo::ReleaseCellList() - { - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::ReleaseCellList() - START - this: 0x%08x", this )); + - NKern::ThreadEnterCS(); - iCellList.Reset(); - delete iHeapStream; - iHeapStream = NULL; - NKern::ThreadLeaveCS(); - TRACE( Kern::Printf("DMemSpyDriverLogChanHeapInfo::ReleaseCellList() - END - this: 0x%08x", this )); - } + -TBool DMemSpyDriverLogChanHeapInfo::HandleHeapCell(TMemSpyDriverCellType aCellType, TAny* aCellAddress, TInt aLength, TInt /*aNestingLevel*/, TInt /*aAllocNumber*/) - { - TInt err = KErrNone; - if (((aCellType & EMemSpyDriverFreeCellMask) && iHeapInfoParams.iBuildFreeCellList) || - ((aCellType & EMemSpyDriverAllocatedCellMask) && iHeapInfoParams.iBuildAllocCellList)) - { - TMemSpyDriverCell cell; - cell.iType = aCellType; - cell.iAddress = aCellAddress; - cell.iLength = aLength; + - NKern::ThreadEnterCS(); - err = iCellList.Append(cell); - NKern::ThreadLeaveCS(); - } - return err == KErrNone; - } -void DMemSpyDriverLogChanHeapInfo::HandleHeapWalkInit() - { - } +