FCL/sf/app/rndtools: comparison memspyui/ui/avkon/src/MemSpyViewKernelObjects.cpp

equal deleted inserted replaced

-:31fc1277642e
+:41ebde60981f
 }
 void CMemSpyViewKernelObjects::SetListBoxModelL()
 {
-_LIT( KLineFormatSpec, "\t%S" );
+//_LIT( KLineFormatSpec, "\t%S" );
 _LIT( KTab, "\t" );
 iMemSpySession.GetKernelObjectItems( iKernelObjectItems, iObjectType );
 iModel = new (ELeave) CDesC16ArrayFlat( iKernelObjectItems.Count() ); //array for formated items
 	{
 		HBufC* tempName = HBufC::NewL( iKernelObjectItems[i]->Name().Length() + 16 );
 	CleanupStack::PushL( tempName );
 	TPtr tempNamePtr( tempName->Des() );
 	tempNamePtr.Copy( KTab );
-	tempNamePtr.Append( iKernelObjectItems[i]->Name() );
+	TBuf<KMaxName> temp;
+	temp.Copy(iKernelObjectItems[i]->Name());
+	tempNamePtr.Append( temp	 );
 	iModel->AppendL( tempNamePtr );
 	CleanupStack::PopAndDestroy( tempName );
 	}
 return handled;
 }
 TKeyResponse CMemSpyViewKernelObjects::OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType )
 {
-	// TODO: to remove support of tabs
 TKeyResponse resp = EKeyWasNotConsumed;
-if  ( iTabs && ( aKeyEvent.iScanCode == EStdKeyRightArrow || aKeyEvent.iScanCode == EStdKeyLeftArrow ) )
+resp = CMemSpyViewBase::OfferKeyEventL( aKeyEvent, aType );
-{
+//}
-resp = iTabs->OfferKeyEventL( aKeyEvent, aType );
-}
-else
-{
-resp = CMemSpyViewBase::OfferKeyEventL( aKeyEvent, aType );
-}
 return resp;
 }
 void CMemSpyViewKernelObjects::TabChangedL( TInt /*aIndex*/ )
 {
-	/* TODO: tabs removed
-iObjectType = (TMemSpyDriverContainerType)iTabs->ActiveTabId();
-RefreshL();
-*/
 }
 void CMemSpyViewKernelObjects::OnCmdTerminateL()
 {
 switch ( iObjectType )
 {
 case EMemSpyDriverContainerTypeThread:
 {
+TBool err = EFalse;
 TBool doTerminate = ETrue;
 //CMemSpyEngineObjectContainer& container = iEngine.Container();
 //TThreadId id( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
 TThreadId id( iKernelObjectItems[ iListBox->CurrentItemIndex() ]->Id() ); //get id of the current thread
-TBool err;
 iMemSpySession.ThreadSystemPermanentOrCritical( id, err );
 // Try to find the thread in question...
 //CMemSpyProcess* process = NULL;
 //CMemSpyThread* thread = NULL;
 				CAknQueryDialog* importDialog = CAknQueryDialog::NewL();
 				doTerminate = ( importDialog->ExecuteLD( R_MEMSPY_PANIC_SYSTEM_CRITICAL_THREAD_OR_PROCESS ) );
 				if ( doTerminate )
 					{
-					iMemSpySession.TerminateThread( id );
+					iMemSpySession.EndThread( id, ETerminate );
+					RefreshL();
 					}
 	}
 /*
 if ( thread )
 if  ( doTerminate )
 {
 thread->TerminateL();
 }
 }
 */
-RefreshL();
 break;
 }
 case EMemSpyDriverContainerTypeProcess:
 {
+TBool err = EFalse;
 TBool doTerminate = ETrue;
+TProcessId id( iKernelObjectItems[ iListBox->CurrentItemIndex() ]->Id() );
+iMemSpySession.ProcessSystemPermanentOrCritical( id, err );
+if( err )
+	{
+				CAknQueryDialog* importDialog = CAknQueryDialog::NewL();
+doTerminate = ( importDialog->ExecuteLD( R_MEMSPY_PANIC_SYSTEM_CRITICAL_THREAD_OR_PROCESS ) );
+if( doTerminate )
+	{
+iMemSpySession.EndProcess( id, ETerminate );
+RefreshL();
+}
+	}
 // Obtain the process that corresponds to the selected item
-//CMemSpyEngineObjectContainer& container = iEngine.Container();
+/*
-//TProcessId id( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
+CMemSpyEngineObjectContainer& container = iEngine.Container();
-TProcessId id( iKernelObjectItems[ iListBox->CurrentItemIndex() ]->Id() );
+TProcessId id( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
 CMemSpyProcess& process = container.ProcessByIdL( id );
 process.Open();
 if  ( process.IsSystemPermanent() || process.IsSystemCritical() )
 {
 CAknQueryDialog* importDialog = CAknQueryDialog::NewL();
 doTerminate = ( importDialog->ExecuteLD( R_MEMSPY_PANIC_SYSTEM_CRITICAL_THREAD_OR_PROCESS ) );
 }
 //
 if  ( doTerminate )
 {
 process.TerminateL();
 RefreshL();
-}
+}*/
 break;
 }
 default:
 {
 // Programming error
 }
 }
 void CMemSpyViewKernelObjects::OnCmdSwitchToL()
-{/*
+{
+	TBool brought = EFalse;
+	/*
 TInt wgCount;
 RWsSession wsSession;
 User::LeaveIfError( wsSession.Connect() );
 CleanupClosePushL( wsSession );
 User::LeaveIfError( wgCount = wsSession.NumWindowGroups() );
 User::LeaveIfError( wsSession.WindowGroupList( &wgArray ) );
 TApaTask task( wsSession );
 TBool brought( EFalse );
 TInt wgId( KErrNotFound );
 TThreadId threadId;
+*/
 switch ( iObjectType )
 {
 case EMemSpyDriverContainerTypeThread:
 {
-TThreadId currentThreadId( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
+TThreadId currentThreadId( iKernelObjectItems[ iListBox->CurrentItemIndex() ]->Id() );
+TInt error = iMemSpySession.SwitchToThread( currentThreadId, brought );
+/*
+TThreadId currentThreadId( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
 // loop trough all window groups and see if a thread id matches
 while( !brought && wgCount-- )
 {
 wgId = wgArray[wgCount].iId;
 task.BringToForeground();
 brought = ETrue;
 }
 CleanupStack::PopAndDestroy( wgName );
 }
 }
+*/
 break;
 }
 case EMemSpyDriverContainerTypeProcess:
 {
-CMemSpyEngineObjectContainer& container = iEngine.Container();
+TProcessId id( iKernelObjectItems[ iListBox->CurrentItemIndex() ]->Id() );
-TProcessId id( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
+TInt error = iMemSpySession.SwitchToProcess( id, brought  );
-CMemSpyProcess& process = container.ProcessByIdL( id );
+/*
+//CMemSpyEngineObjectContainer& container = iEngine.Container();
+//TProcessId id( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
+//CMemSpyProcess& process = container.ProcessByIdL( id );
+TProcessId id( iKernelObjectItems[iListBox->CurrentItemIndex()]->Id() );
 // loop trough threads in a process
 for ( TInt i = 0; i < process.MdcaCount(); i++ )
 {
 TInt wgCountLocal = wgCount;
 }
 CleanupStack::PopAndDestroy( wgName );
 }
 }
 }
+			*/
 break;
 }
 default:
 {
 // Programming error
 if ( !brought )
 {
 // Error handling in HandleCommandL
 User::Leave( KErrGeneral );
 }
-CleanupStack::PopAndDestroy( 2 ); //wgArray,wsSession*/
+CleanupStack::PopAndDestroy( 2 ); //wgArray,wsSession
 }
 void CMemSpyViewKernelObjects::OnCmdEndL()
-{/*
+{
 switch ( iObjectType )
 {
 case EMemSpyDriverContainerTypeThread:
 {
+TBool err = EFalse;
 TBool doTerminate = ETrue;
+TThreadId id( iKernelObjectItems[ iListBox->CurrentItemIndex() ]->Id() ); //get id of the current thread
+iMemSpySession.ThreadSystemPermanentOrCritical( id, err );
+if( err )
+	{
+				CAknQueryDialog* importDialog = CAknQueryDialog::NewL();
+				doTerminate = ( importDialog->ExecuteLD( R_MEMSPY_PANIC_SYSTEM_CRITICAL_THREAD_OR_PROCESS ) );
+				if ( doTerminate )
+					{
+					iMemSpySession.EndThread( id, EKill );
+					RefreshL();
+					}
+	}
+/*
 CMemSpyEngineObjectContainer& container = iEngine.Container();
 TThreadId id( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
 // Try to find the thread in question...
 CMemSpyProcess* process = NULL;
 if  ( doTerminate )
 {
 thread->KillL();
 }
 }
 RefreshL();
+*/
 break;
 }
 case EMemSpyDriverContainerTypeProcess:
 {
+TBool err = EFalse;
+TBool doTerminate = ETrue;
+TProcessId id( iKernelObjectItems[ iListBox->CurrentItemIndex() ]->Id() );
+iMemSpySession.ProcessSystemPermanentOrCritical( id, err );
+if( err )
+	{
+				CAknQueryDialog* importDialog = CAknQueryDialog::NewL();
+				doTerminate = ( importDialog->ExecuteLD( R_MEMSPY_PANIC_SYSTEM_CRITICAL_THREAD_OR_PROCESS ) );
+				if( doTerminate )
+					{
+					iMemSpySession.EndProcess( id, EKill);
+					RefreshL();
+					}
+	}
+/*
 TBool doTerminate = ETrue;
 // Obtain the process that corresponds to the selected item
 CMemSpyEngineObjectContainer& container = iEngine.Container();
 TProcessId id( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
 CMemSpyProcess& process = container.ProcessByIdL( id );
 if  ( doTerminate )
 {
 process.KillL();
 RefreshL();
 }
+			*/
 break;
 }
 default:
 {
 // Programming error
 __ASSERT_ALWAYS( EFalse, User::Panic( _L("MemSpy-View"), 0 ) );
 }
-}    */
+}
 }
 void CMemSpyViewKernelObjects::OnCmdPanicL()
-{/*
+{
 switch ( iObjectType )
 {
 case EMemSpyDriverContainerTypeThread:
 {
+TBool err = EFalse;
 TBool doTerminate = ETrue;
-CMemSpyEngineObjectContainer& container = iEngine.Container();
+TThreadId id( iKernelObjectItems[ iListBox->CurrentItemIndex() ]->Id() ); //get id of the current thread
-TThreadId id( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
+iMemSpySession.ThreadSystemPermanentOrCritical( id, err );
-// Try to find the thread in question...
+if( err )
-CMemSpyProcess* process = NULL;
+	{
-CMemSpyThread* thread = NULL;
+				CAknQueryDialog* importDialog = CAknQueryDialog::NewL();
-User::LeaveIfError( container.ProcessAndThreadByThreadId( id, process, thread ) );
+				doTerminate = ( importDialog->ExecuteLD( R_MEMSPY_PANIC_SYSTEM_CRITICAL_THREAD_OR_PROCESS ) );
-if ( thread )
+				if ( doTerminate )
-{
+					{
-thread->Open();
+					iMemSpySession.EndThread( id, EPanic );
-//
+					RefreshL();
-if  ( thread->IsSystemPermanent() || thread->IsSystemCritical() )
+					}
-{
+	}
-CAknQueryDialog* importDialog = CAknQueryDialog::NewL();
-doTerminate = ( importDialog->ExecuteLD( R_MEMSPY_PANIC_SYSTEM_CRITICAL_THREAD_OR_PROCESS ) );
-}
-//
-if  ( doTerminate )
-{
-thread->PanicL();
-}
-}
-RefreshL();
 break;
 }
 case EMemSpyDriverContainerTypeProcess:
 {
+TBool err = EFalse;
 TBool doTerminate = ETrue;
-// Obtain the process that corresponds to the selected item
+TProcessId id( iKernelObjectItems[ iListBox->CurrentItemIndex() ]->Id() );
-CMemSpyEngineObjectContainer& container = iEngine.Container();
+iMemSpySession.ProcessSystemPermanentOrCritical( id, err );
-TProcessId id( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
-CMemSpyProcess& process = container.ProcessByIdL( id );
+if( err )
-process.Open();
+	{
+				CAknQueryDialog* importDialog = CAknQueryDialog::NewL();
-if  ( process.IsSystemPermanent() || process.IsSystemCritical() )
+				doTerminate = ( importDialog->ExecuteLD( R_MEMSPY_PANIC_SYSTEM_CRITICAL_THREAD_OR_PROCESS ) );
-{
-CAknQueryDialog* importDialog = CAknQueryDialog::NewL();
+				if( doTerminate )
-doTerminate = ( importDialog->ExecuteLD( R_MEMSPY_PANIC_SYSTEM_CRITICAL_THREAD_OR_PROCESS ) );
+					{
-}
+					iMemSpySession.EndProcess( id, EPanic );
-if  ( doTerminate )
+					RefreshL();
-{
+					}
-process.PanicL();
+	}
-RefreshL();
-}
 break;
 }
 default:
 {
 // Programming error
 __ASSERT_ALWAYS( EFalse, User::Panic( _L("MemSpy-View"), 0 ) );
 }
-}*/
+}
 }
 void CMemSpyViewKernelObjects::CreateTabsL()
 {
+	TMemSpyDriverContainerType type = iKernelObjectItems[ iListBox->CurrentItemIndex() ]->Type();
+	const TPtrC pType( TypeAsString( type ) );
 	CEikStatusPane* statusPane = static_cast<CAknAppUi*> ( iEikonEnv->EikAppUi() )->StatusPane();
 	TUid uid;
 	uid.iUid = EEikStatusPaneUidNavi;
 	iNaviPane = ( CAknNavigationControlContainer * ) statusPane->ControlL( TUid::Uid( EEikStatusPaneUidNavi ) );
-	iNavDecorator=iNaviPane->CreateMessageLabelL(_L("Kernel Object Type")); //TODO: To print there kernel object type
+	iNavDecorator=iNaviPane->CreateMessageLabelL( pType );
 	iNaviPane->PushL(*iNavDecorator);
-	/*
+}
-CEikStatusPane* statusPane = static_cast<CAknAppUi*> ( iEikonEnv->EikAppUi() )->StatusPane();
-TUid uid;
+TPtrC CMemSpyViewKernelObjects::TypeAsString( TMemSpyDriverContainerType aType )
-uid.iUid = EEikStatusPaneUidNavi;
+	{
-iNavDecorator = ((CAknNavigationControlContainer*)(statusPane->ControlL(uid)))->Top();
+	 _LIT( KTypeUnknown, "Unknown Type" );
+	 _LIT( KTypeThread, "Thread" );
-if ( !iNavDecorator )
+	 _LIT( KTypeProcess, "Process" );
-{
+	 _LIT( KTypeChunk, "Chunk" );
-iNavContainer = (CAknNavigationControlContainer*)statusPane->ControlL(uid);
+	 _LIT( KTypeLibrary, "Library" );
-iNavDecorator = iNavContainer->CreateTabGroupL();
+	 _LIT( KTypeSemaphore, "Semaphore" );
+	 _LIT( KTypeMutex, "Mutex" );
-iTabs = ( CAknTabGroup* )iNavDecorator->DecoratedControl();
+	 _LIT( KTypeTimer, "Timer" );
-iTabs->SetTabFixedWidthL( KTabWidthWithThreeLongTabs );
+	 _LIT( KTypeServer, "Server" );
+	 _LIT( KTypeSession, "Session" );
-for ( TInt i = 0; i < iModel->Count(); i++ )
+	 _LIT( KTypeLogicalDevice, "Logical Device" );
-{
+	 _LIT( KTypePhysicalDevice, "Physical Device" );
-const CMemSpyEngineGenericKernelObjectList& item = iModel->At( i );
+	 _LIT( KTypeLogicalChannel, "Logical Channel" );
-iTabs->AddTabL( item.Type(), item.TypeAsString( item.Type() ) );
+	 _LIT( KTypeChangeNotifier, "Change Notifier" );
-}
+	 _LIT( KTypeUndertaker, "Undertaker" );
-iTabs->SetActiveTabById( iObjectType );
+	 _LIT( KTypeMsgQueue, "Msg. Queue" );
-iTabs->SetObserver( this );
+	 _LIT( KTypePropertyRef, "Property Ref." );
-iNavContainer->PushL( *iNavDecorator );
+	 _LIT( KTypeCondVar, "Conditional Var." );
-}
+	 //
-*/
+	 TPtrC pType( KTypeUnknown );
-}
+	 //
+	 switch( aType )
+		{
+	    case EMemSpyDriverContainerTypeThread:
+	    	pType.Set( KTypeThread );
+	    	break;
+	    case EMemSpyDriverContainerTypeProcess:
+	        pType.Set( KTypeProcess );
+	        break;
+	    case EMemSpyDriverContainerTypeChunk:
+	        pType.Set( KTypeChunk );
+	        break;
+	    case EMemSpyDriverContainerTypeLibrary:
+	        pType.Set( KTypeLibrary );
+	        break;
+	    case EMemSpyDriverContainerTypeSemaphore:
+	        pType.Set( KTypeSemaphore );
+	        break;
+	    case EMemSpyDriverContainerTypeMutex:
+	        pType.Set( KTypeMutex );
+	        break;
+	    case EMemSpyDriverContainerTypeTimer:
+	        pType.Set( KTypeTimer );
+	        break;
+	    case EMemSpyDriverContainerTypeServer:
+	        pType.Set( KTypeServer );
+	        break;
+	    case EMemSpyDriverContainerTypeSession:
+	        pType.Set( KTypeSession );
+	        break;
+	    case EMemSpyDriverContainerTypeLogicalDevice:
+	        pType.Set( KTypeLogicalDevice );
+	        break;
+	    case EMemSpyDriverContainerTypePhysicalDevice:
+	        pType.Set( KTypePhysicalDevice );
+	        break;
+	    case EMemSpyDriverContainerTypeLogicalChannel:
+	        pType.Set( KTypeLogicalChannel );
+	        break;
+	    case EMemSpyDriverContainerTypeChangeNotifier:
+	        pType.Set( KTypeChangeNotifier );
+	        break;
+	    case EMemSpyDriverContainerTypeUndertaker:
+	        pType.Set( KTypeUndertaker );
+	        break;
+	    case EMemSpyDriverContainerTypeMsgQueue:
+	        pType.Set( KTypeMsgQueue );
+	        break;
+	    case EMemSpyDriverContainerTypePropertyRef:
+	        pType.Set( KTypePropertyRef );
+	        break;
+	    case EMemSpyDriverContainerTypeCondVar:
+	        pType.Set( KTypeCondVar );
+	        break;
+	    default:
+	        break;
+		}
+	    //
+	return pType;
+	}
 void CMemSpyViewKernelObjects::DetailsL()
 {
 HBufC* messageBuf = HBufC::NewLC( 40960 );
 TPtr messagePtr = messageBuf->Des();

changeset 26	41ebde60981f
parent 17	4f2773374eff
child 31	e7a04a6385be