--- a/memspy/Driver/Kernel/Include/SubChannels/MemSpyDriverLogChanHeapBase.h Tue Aug 31 16:45:49 2010 +0300
+++ b/memspy/Driver/Kernel/Include/SubChannels/MemSpyDriverLogChanHeapBase.h Wed Sep 01 12:37:10 2010 +0100
@@ -61,20 +61,33 @@
protected: // Capability checks for heap access
TDrmMatchType IsDrmThread( DThread& aThread );
-protected: // From MHeapWalkerObserver
+private: // From MHeapWalkerObserver
void HandleHeapWalkInit();
- TBool HandleHeapCell( TMemSpyDriverCellType aCellType, TAny* aCellAddress, TInt aLength, TInt aNestingLevel, TInt aAllocNumber );
+ TBool HandleHeapCell( TInt aCellType, TAny* aCellAddress, TInt aLength, TInt aNestingLevel, TInt aAllocNumber );
protected: // Heap utility functions
TInt OpenKernelHeap( RHeapK*& aHeap, DChunk*& aChunk, TDes8* aClientHeapChunkName = NULL );
+ TInt OpenKernelHeap( RMemSpyDriverRHeapKernelInPlace& aHeap, TDes8* aClientHeapChunkName = NULL );
TInt OpenKernelHeap( RMemSpyDriverRHeapKernelFromCopy& aHeap, TDes8* aClientHeapChunkName = NULL );
- TInt GetHeapInfoKernel(RMemSpyDriverRHeapBase& aHeap, TMemSpyHeapInfo* aHeapInfo, TDes8* aTransferBuffer);
+ TInt OpenUserHeap( DThread& aClientThread, TUint aExpectedHeapVTable, RMemSpyDriverRHeapUser& aHeap, DChunk*& aUserHeapChunk, TDes8* aClientHeapChunkName = NULL );
+ TBool GetUserHeapHandle( DThread& aThread, RMemSpyDriverRHeapUser& aHeap, TUint aExpectedVTable );
+ TBool IsDebugKernel();
+ TBool IsDebugKernel( RMemSpyDriverRHeapKernelInPlace& aHeap );
+ TInt GetHeapInfoKernel( RMemSpyDriverRHeapBase& aHeap, TBool aIsDebugAllocator, const TDesC8& aChunkName, TMemSpyHeapInfo* aHeapInfo, TDes8* aTransferBuffer );
void PrintHeapInfo( const TMemSpyHeapInfo& aInfo );
+protected: // Free cells
+ void ReleaseFreeCells();
+ TInt PrepareFreeCellTransferBuffer();
+ TInt FetchFreeCells( TDes8* aBufferSink );
+ TInt CalculateFreeCellBufferSize() const;
+
private: // Data members
+ RArray< TMemSpyDriverFreeCell > iFreeCells;
// Points to stack-based object whilst walking in progress
RMemSpyMemStreamWriter* iStackStream;
+ RMemSpyMemStreamWriter* iHeapStream;
TInt iFreeCellCount;
};