FCL/sf/os/osrndtools: comparison perfsrv/memspy/MemSpyClient/src/memspysession.cpp

equal deleted inserted replaced

-:aa2539c91954
+:1c2bb2fc7c87
 #include <memspy/engine/memspyserverdata.h>
 // ECom
 #include <memspy/engine/memspyecomdata.h>
 // Window groups
 #include <memspy/engine/memspyenginehelperwindowserver.h>
+// Chunks
+#include <memspy/engine/memspychunkdata.h>
+// Code Segments
+#include <memspy/engine/memspycodesegmentdata.h>
 // IMPLEMENTATION
 EXPORT_C RMemSpySession::RMemSpySession()
 {
 	{
 	TPckgBuf<TInt> count;
 	User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetProcessCount, TIpcArgs(&count)));
 	TInt requestedCount = count();
 	HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyProcessData));
 	TPtr8 bufferPtr(buffer->Des());
 	User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetProcesses, TIpcArgs(&count, &bufferPtr)));
 	aProcesses.Reset();
 	TInt receivedCount = Min(count(), requestedCount);
-	for(TInt i=0, offset = 0; i<requestedCount; i++, offset+=sizeof(TMemSpyProcessData))
+	for(TInt i=0, offset = 0; i<receivedCount; i++, offset+=sizeof(TMemSpyProcessData))
 		{
 		TPckgBuf<TMemSpyProcessData> data;
 		data.Copy(bufferPtr.Ptr()+offset, sizeof(TMemSpyProcessData));
 		aProcesses.AppendL(CMemSpyApiProcess::NewLC(data()));
 		}
 			TIpcArgs(&aProcessName, &procId)));
 	return procId();
 	}
-EXPORT_C TInt RMemSpySession::ProcessSystemPermanentOrCritical( TProcessId aId, TBool aValue )
+EXPORT_C TInt RMemSpySession::ProcessSystemPermanentOrCritical( TProcessId aId, TBool& aValue )
 	{
 	TPckgBuf<TProcessId> arg1( aId );
 	TPckgBuf<TBool> arg2( aValue );
 	TIpcArgs args( &arg1, &arg2 );
 	aValue = arg2();
 	return error;
 	}
+EXPORT_C void RMemSpySession::NotifyEvent(TRequestStatus &aStatus)
+{
+SendReceive(EMemSpyClientServerOpNotifyEvent | KMemSpyOpFlagsAsyncOperation,
+TIpcArgs(), aStatus);
+}
+EXPORT_C void RMemSpySession::CancelEventNotificationL()
+{
+User::LeaveIfError(SendReceive(EMemSpyClientServerOpCancelEventNotification));
+}
 EXPORT_C TInt RMemSpySession::EndProcessL( TProcessId aId, TMemSpyEndType aType )
 	{
 	TPckgBuf<TProcessId> arg1( aId );
 	TPckgBuf<TMemSpyEndType> arg2( aType );
 	TIpcArgs args( &arg1, &arg2 );
 	TPckgBuf<TInt> count;
 	TPckgBuf<TProcessId> pid(aProcessId);
 	User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetThreadCount, TIpcArgs(&count, &pid)));
 	TInt requestedCount = count();
 	HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyThreadData));
 	TPtr8 bufferPtr(buffer->Des());
 	User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetThreads, TIpcArgs(&count, &bufferPtr, &pid)));
 	aThreads.Reset();
 	TInt receivedCount = Min(count(), requestedCount);
-	for(TInt i=0, offset = 0; i<requestedCount; i++, offset+=sizeof(TMemSpyThreadData))
+	for(TInt i=0, offset = 0; i<receivedCount; i++, offset+=sizeof(TMemSpyThreadData))
 		{
 		TPckgBuf<TMemSpyThreadData> data;
 		data.Copy(bufferPtr.Ptr()+offset, sizeof(TMemSpyThreadData));
 		aThreads.AppendL(CMemSpyApiThread::NewLC(data()));
 		}
 	{
 	TPckgBuf<TInt> count;
 	User::LeaveIfError(SendReceive( EMemSpyClientServerOpGetKernelObjectCount, TIpcArgs(&count) ));
 	TInt requestedCount = count();
 	HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyKernelObjectData));
 	TPtr8 bufferPtr(buffer->Des());
 	TIpcArgs args( &count, &bufferPtr );
 	User::LeaveIfError(SendReceive( EMemSpyClientServerOpGetKernelObjects, args ));
 	aKernelObjects.Reset();
-	for(TInt i=0, offset = 0; i<requestedCount; i++, offset+=sizeof(TMemSpyKernelObjectData))
+	TInt receivedCount = Min(count(), requestedCount);
+	for(TInt i=0, offset = 0; i<receivedCount; i++, offset+=sizeof(TMemSpyKernelObjectData))
 		{
 		TPckgBuf<TMemSpyKernelObjectData> data;
 		data.Copy(bufferPtr.Ptr()+offset, sizeof(TMemSpyKernelObjectData));
 		aKernelObjects.AppendL(CMemSpyApiKernelObject::NewLC(data()));
 		}
 	TPckgBuf<TInt> count;
 	TPckgBuf<TMemSpyDriverContainerType> type(aForContainer);
 	User::LeaveIfError(SendReceive( EMemSpyClientServerOpGetKernelObjectItemCount, TIpcArgs(&count, &type) ));
 	TInt requestedCount = count();
 	HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyDriverHandleInfoGeneric));
 	TPtr8 bufferPtr(buffer->Des());
 	TIpcArgs args( &count, &type, &bufferPtr );
 	User::LeaveIfError(SendReceive( EMemSpyClientServerOpGetKernelObjectItems, args ));
 	aKernelObjectItems.Reset();
-	for(TInt i=0, offset = 0; i<requestedCount; i++, offset+=sizeof(TMemSpyDriverHandleInfoGeneric))
+	TInt receivedCount = Min(count(), requestedCount);
+	for(TInt i=0, offset = 0; i<receivedCount; i++, offset+=sizeof(TMemSpyDriverHandleInfoGeneric))
 		{
 		TPckgBuf<TMemSpyDriverHandleInfoGeneric> data;
 		data.Copy(bufferPtr.Ptr()+offset, sizeof(TMemSpyDriverHandleInfoGeneric));
 		aKernelObjectItems.AppendL( CMemSpyApiKernelObjectItem::NewLC( data() ) );
 		}
 	{
 	TPckgBuf<TInt> count;
 	User::LeaveIfError(SendReceive( EMemSpyClientServerOpGetMemoryTrackingCycleCount, TIpcArgs(&count) ));
 	TInt requestedCount = count();
 	HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyMemoryTrackingCycleData));
 	TPtr8 bufferPtr(buffer->Des());
 	TIpcArgs args( &count, &bufferPtr );
 	User::LeaveIfError(SendReceive( EMemSpyClientServerOpGetMemoryTrackingCycles, args ));
 	aCycles.Reset();
-	for(TInt i=0, offset = 0; i<requestedCount; i++, offset+=sizeof(TMemSpyMemoryTrackingCycleData))
+	TInt receivedCount = Min(count(), requestedCount);
+	for(TInt i=0, offset = 0; i<receivedCount; i++, offset+=sizeof(TMemSpyMemoryTrackingCycleData))
 		{
 		TPckgBuf<TMemSpyMemoryTrackingCycleData> data;
 		data.Copy(bufferPtr.Ptr()+offset, sizeof(TMemSpyMemoryTrackingCycleData));
 		aCycles.AppendL(CMemSpyApiMemoryTrackingCycle::NewLC(data()));
 		}
 //Heap specific operations
 EXPORT_C CMemSpyApiHeap* RMemSpySession::GetHeapL()
 	{
-	CMemSpyApiHeap* aHeap;
 	HBufC8* buffer = HBufC8::NewLC( sizeof(TMemSpyHeapData) );
 	TPtr8 bufferPtr(buffer->Des());
 	TIpcArgs args( &bufferPtr );
 	User::LeaveIfError(SendReceive( EMemSpyClientServerOpGetHeap, args ));
 	TPckgBuf<TMemSpyHeapData> data;
 	data.Copy(bufferPtr.Ptr(), sizeof(TMemSpyHeapData));
-	aHeap = CMemSpyApiHeap::NewL( data() );
+	CMemSpyApiHeap* heap = CMemSpyApiHeap::NewL( data() );
 	CleanupStack::PopAndDestroy(buffer);
-	return aHeap;
+	return heap;
 	}
 EXPORT_C CMemSpyApiHeap* RMemSpySession::GetHeap()
 	{
 	CMemSpyApiHeap *result = NULL;
 {
 TPckgBuf<TInt> count;
 User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetEComCategoryCount, TIpcArgs(&count)));
 TInt requestedCount = count();
 HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyEComCategoryData));
 TPtr8 bufferPtr(buffer->Des());
 User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetEComCategories, TIpcArgs(&count, &bufferPtr)));
 aCategories.Reset();
 TInt receivedCount = Min(count(), requestedCount);
-for(TInt i=0, offset = 0; i<requestedCount; i++, offset+=sizeof(TMemSpyEComCategoryData))
+for(TInt i=0, offset = 0; i<receivedCount; i++, offset+=sizeof(TMemSpyEComCategoryData))
 {
 TPckgBuf<TMemSpyEComCategoryData> data;
 data.Copy(bufferPtr.Ptr()+offset, sizeof(TMemSpyEComCategoryData));
 aCategories.AppendL(CMemSpyApiEComCategory::NewLC(data()));
 }
 TPckgBuf<TInt> count;
 TPckgBuf<TUid> category(aCategory);
 User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetEComInterfaceCount, TIpcArgs(&count, &category)));
 TInt requestedCount = count();
 HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyEComInterfaceData));
 TPtr8 bufferPtr(buffer->Des());
 User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetEComInterfaces, TIpcArgs(&count, &category, &bufferPtr)));
 aInterfaces.Reset();
 TInt receivedCount = Min(count(), requestedCount);
-for(TInt i=0, offset = 0; i<requestedCount; i++, offset+=sizeof(TMemSpyEComInterfaceData))
+for(TInt i=0, offset = 0; i<receivedCount; i++, offset+=sizeof(TMemSpyEComInterfaceData))
 {
 TPckgBuf<TMemSpyEComInterfaceData> data;
 data.Copy(bufferPtr.Ptr()+offset, sizeof(TMemSpyEComInterfaceData));
 aInterfaces.AppendL(CMemSpyApiEComInterface::NewLC(data()));
 }
 TPckgBuf<TInt> count;
 TPckgBuf<TUid> interface(aInterface);
 User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetEComImplementationCount, TIpcArgs(&count, &interface)));
 TInt requestedCount = count();
 HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyEComImplementationData));
 TPtr8 bufferPtr(buffer->Des());
 User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetEComImplementations, TIpcArgs(&count, &interface, &bufferPtr)));
 aImplementations.Reset();
 TInt receivedCount = Min(count(), requestedCount);
-for(TInt i=0, offset = 0; i<requestedCount; i++, offset+=sizeof(TMemSpyEComImplementationData))
+for(TInt i=0, offset = 0; i<receivedCount; i++, offset+=sizeof(TMemSpyEComImplementationData))
 {
 TPckgBuf<TMemSpyEComImplementationData> data;
 data.Copy(bufferPtr.Ptr()+offset, sizeof(TMemSpyEComImplementationData));
 aImplementations.AppendL(CMemSpyApiEComImplementation::NewLC(data()));
 }
 {
 TPckgBuf<TInt> count;
 User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetWindowGroupCount, TIpcArgs(&count)));
 TInt requestedCount = count();
 HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyEngineWindowGroupDetails));
 TPtr8 bufferPtr(buffer->Des());
 User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetWindowGroups, TIpcArgs(&count, &bufferPtr)));
 aGroups.Reset();
 TInt receivedCount = Min(count(), requestedCount);
-for(TInt i=0, offset = 0; i<requestedCount; i++, offset+=sizeof(TMemSpyEngineWindowGroupDetails))
+for(TInt i=0, offset = 0; i<receivedCount; i++, offset+=sizeof(TMemSpyEngineWindowGroupDetails))
 {
 TPckgBuf<TMemSpyEngineWindowGroupDetails> data;
 data.Copy(bufferPtr.Ptr()+offset, sizeof(TMemSpyEngineWindowGroupDetails));
 aGroups.AppendL(CMemSpyApiWindowGroup::NewLC(data()));
 }
 CleanupStack::Pop(aGroups.Count());
 CleanupStack::PopAndDestroy(buffer);
 }
+EXPORT_C void RMemSpySession::SwitchToWindowGroupL( TInt aId )
+	{
+TPckgBuf<TInt> id( aId );
+TIpcArgs args(&id);
+	User::LeaveIfError(SendReceive(EMemSpyClientServerOpSwitchToWindowGroup, args));
+	}
 EXPORT_C void RMemSpySession::DumpKernelHeap()
 	{
 	SendReceive( EMemSpyClientServerOpDumpKernelHeap );
 	}
 {
 TPckgBuf<TInt> count;
 User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetServerCount, TIpcArgs(&count)));
 TInt requestedCount = count();
+if( requestedCount < 0 )
+	requestedCount = 0;
 HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyServerData));
 TPtr8 bufferPtr(buffer->Des());
 User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetServers, TIpcArgs(&count, &bufferPtr)));
 aServers.Reset();
 	TPckgBuf<TInt> count;
 	TPckgBuf<TSortType> sort( aSortType );
 	User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetServerCount, TIpcArgs(&count)));
 	TInt requestedCount = count();
 	HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyServerData));
 	TPtr8 bufferPtr(buffer->Des());
 	User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetSortedServers, TIpcArgs(&count, &bufferPtr, &sort)));
 	aServers.Reset();
 	TInt receivedCount = Min(count(), requestedCount);
-	for(TInt i=0, offset = 0; i<requestedCount; i++, offset+=sizeof(TMemSpyServerData))
+	for(TInt i=0, offset = 0; i<receivedCount; i++, offset+=sizeof(TMemSpyServerData))
 		{
 		TPckgBuf<TMemSpyServerData> data;
 		data.Copy(bufferPtr.Ptr()+offset, sizeof(TMemSpyServerData));
 		aServers.AppendL(CMemSpyApiServer::NewLC(data()));
 		}
 	TPckgBuf<TBool> detailed( aDetailed );
 	TIpcArgs args( &detailed );
 	User::LeaveIfError( SendReceive( EMemSpyClientServerOpServerListOutputGeneric, args ) );
 	}
+// Chunks
+EXPORT_C void RMemSpySession::GetChunksL(RArray<CMemSpyApiChunk*> &aChunks, TSortType aSortType)
+{
+TPckgBuf<TInt> count;
+TPckgBuf<TSortType> sort( aSortType );
+User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetChunksCount, TIpcArgs(&count)));
+TInt requestedCount = count();
+HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyChunkData));
+TPtr8 bufferPtr(buffer->Des());
+User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetSortedChunks, TIpcArgs(&count, &bufferPtr, &sort)));
+aChunks.Reset();
+TInt receivedCount = Min(count(), requestedCount);
+for(TInt i=0, offset = 0; i<receivedCount; i++, offset+=sizeof(TMemSpyChunkData))
+{
+TPckgBuf<TMemSpyChunkData> data;
+data.Copy(bufferPtr.Ptr()+offset, sizeof(TMemSpyChunkData));
+aChunks.AppendL(CMemSpyApiChunk::NewLC(data()));
+}
+CleanupStack::Pop(aChunks.Count());
+CleanupStack::PopAndDestroy(buffer);
+}
+EXPORT_C void RMemSpySession::ChunkListOutputL()
+	{
+	User::LeaveIfError(SendReceive(EMemSpyClientServerOpChunkListOutput));
+	}
+// RAM info
+EXPORT_C void RMemSpySession::IsAknIconCacheConfigurable( TBool& aValue )
+	{
+	TPckgBuf<TBool> arg( aValue );
+	TIpcArgs args( &arg );
+	User::LeaveIfError(SendReceive( EMemSpyClientServerOpIsAknIconCacheConfigurable, args ));
+	aValue = arg();
+	}
+EXPORT_C void RMemSpySession::SetAknIconCacheStatusL( TBool aEnabled, TInt64& aValue )
+	{
+	TPckgBuf<TBool> arg1( aEnabled );
+	TPckgBuf<TInt64> arg2( aValue );
+	TIpcArgs args( &arg1, &arg2 );
+	User::LeaveIfError(SendReceive( EMemSpyClientServerOpSetAknIconCacheStatus, args ));
+	aValue=arg2();
+	}
+// Code Segments
+EXPORT_C void RMemSpySession::GetCodeSegmentsL(RArray<CMemSpyApiCodeSegment*> &aCodeSegments, TSortType aSortType)
+	{
+TPckgBuf<TInt> count;
+TPckgBuf<TSortType> sort( aSortType );
+User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetCodeSegmentsCount, TIpcArgs(&count)));
+TInt requestedCount = count();
+HBufC8* buffer = HBufC8::NewLC(requestedCount * sizeof(TMemSpyCodeSegmentData));
+TPtr8 bufferPtr(buffer->Des());
+User::LeaveIfError(SendReceive(EMemSpyClientServerOpGetSortedCodeSegments, TIpcArgs(&count, &bufferPtr, &sort)));
+aCodeSegments.Reset();
+TInt receivedCount = Min(count(), requestedCount);
+for(TInt i=0, offset = 0; i<receivedCount; i++, offset+=sizeof(TMemSpyCodeSegmentData))
+{
+TPckgBuf<TMemSpyCodeSegmentData> data;
+data.Copy(bufferPtr.Ptr()+offset, sizeof(TMemSpyCodeSegmentData));
+aCodeSegments.AppendL(CMemSpyApiCodeSegment::NewLC(data()));
+}
+CleanupStack::Pop(aCodeSegments.Count());
+CleanupStack::PopAndDestroy(buffer);
+	}
+EXPORT_C void RMemSpySession::CodeSegmentsListOutputL()
+	{
+	User::LeaveIfError(SendReceive(EMemSpyClientServerOpCodeSegmentsOutput));
+	}

changeset 62	1c2bb2fc7c87
parent 54	a151135b0cf9