--- a/memspyui/ui/avkon/src/MemSpyViewKernelObjects.cpp Fri May 14 15:53:02 2010 +0300
+++ b/memspyui/ui/avkon/src/MemSpyViewKernelObjects.cpp Thu May 27 12:52:19 2010 +0300
@@ -165,7 +165,7 @@
void CMemSpyViewKernelObjects::SetListBoxModelL()
{
- _LIT( KLineFormatSpec, "\t%S" );
+ //_LIT( KLineFormatSpec, "\t%S" );
_LIT( KTab, "\t" );
iMemSpySession.GetKernelObjectItems( iKernelObjectItems, iObjectType );
@@ -178,7 +178,10 @@
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 );
@@ -248,27 +251,15 @@
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 = iTabs->OfferKeyEventL( aKeyEvent, aType );
- }
- else
- {
- resp = CMemSpyViewBase::OfferKeyEventL( aKeyEvent, aType );
- }
+ resp = CMemSpyViewBase::OfferKeyEventL( aKeyEvent, aType );
+ //}
return resp;
}
-
void CMemSpyViewKernelObjects::TabChangedL( TInt /*aIndex*/ )
{
- /* TODO: tabs removed
- iObjectType = (TMemSpyDriverContainerType)iTabs->ActiveTabId();
- RefreshL();
- */
}
@@ -278,13 +269,13 @@
{
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...
@@ -299,7 +290,8 @@
if ( doTerminate )
{
- iMemSpySession.TerminateThread( id );
+ iMemSpySession.EndThread( id, ETerminate );
+ RefreshL();
}
}
@@ -319,21 +311,35 @@
thread->TerminateL();
}
}
- */
- RefreshL();
+ */
break;
}
case EMemSpyDriverContainerTypeProcess:
{
+ TBool err = EFalse;
TBool doTerminate = ETrue;
- // Obtain the process that corresponds to the selected item
- //CMemSpyEngineObjectContainer& container = iEngine.Container();
- //TProcessId id( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
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 );
CMemSpyProcess& process = container.ProcessByIdL( id );
- process.Open();
-
+ process.Open();
+
if ( process.IsSystemPermanent() || process.IsSystemCritical() )
{
CAknQueryDialog* importDialog = CAknQueryDialog::NewL();
@@ -344,7 +350,8 @@
{
process.TerminateL();
RefreshL();
- }
+ }*/
+
break;
}
default:
@@ -357,7 +364,9 @@
void CMemSpyViewKernelObjects::OnCmdSwitchToL()
- {/*
+ {
+ TBool brought = EFalse;
+ /*
TInt wgCount;
RWsSession wsSession;
User::LeaveIfError( wsSession.Connect() );
@@ -370,11 +379,15 @@
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-- )
@@ -392,14 +405,21 @@
}
CleanupStack::PopAndDestroy( wgName );
}
- }
+ }
+ */
break;
}
case EMemSpyDriverContainerTypeProcess:
- {
- CMemSpyEngineObjectContainer& container = iEngine.Container();
- TProcessId id( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
- CMemSpyProcess& process = container.ProcessByIdL( id );
+ {
+ TProcessId id( iKernelObjectItems[ iListBox->CurrentItemIndex() ]->Id() );
+ TInt error = iMemSpySession.SwitchToProcess( id, brought );
+ /*
+ //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++ )
@@ -424,7 +444,7 @@
}
}
}
-
+ */
break;
}
default:
@@ -438,18 +458,36 @@
// 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 );
@@ -473,11 +511,31 @@
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();
@@ -495,7 +553,63 @@
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;
+
+ 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, EPanic );
+ 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, EPanic );
+ RefreshL();
+ }
+ }
+
break;
}
default:
@@ -503,108 +617,106 @@
// Programming error
__ASSERT_ALWAYS( EFalse, User::Panic( _L("MemSpy-View"), 0 ) );
}
- } */
- }
-
-
-void CMemSpyViewKernelObjects::OnCmdPanicL()
- {/*
- switch ( iObjectType )
- {
- case EMemSpyDriverContainerTypeThread:
- {
- TBool doTerminate = ETrue;
-
- CMemSpyEngineObjectContainer& container = iEngine.Container();
- TThreadId id( iObjectList->At( iListBox->CurrentItemIndex() ).iId );
-
- // Try to find the thread in question...
- CMemSpyProcess* process = NULL;
- CMemSpyThread* thread = NULL;
- User::LeaveIfError( container.ProcessAndThreadByThreadId( id, process, thread ) );
-
- if ( thread )
- {
- thread->Open();
- //
- 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 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 );
- 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.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
- iNaviPane->PushL(*iNavDecorator);
- /*
- CEikStatusPane* statusPane = static_cast<CAknAppUi*> ( iEikonEnv->EikAppUi() )->StatusPane();
- TUid uid;
- uid.iUid = EEikStatusPaneUidNavi;
- iNavDecorator = ((CAknNavigationControlContainer*)(statusPane->ControlL(uid)))->Top();
-
- if ( !iNavDecorator )
- {
- iNavContainer = (CAknNavigationControlContainer*)statusPane->ControlL(uid);
- iNavDecorator = iNavContainer->CreateTabGroupL();
-
- iTabs = ( CAknTabGroup* )iNavDecorator->DecoratedControl();
- iTabs->SetTabFixedWidthL( KTabWidthWithThreeLongTabs );
-
- for ( TInt i = 0; i < iModel->Count(); i++ )
- {
- const CMemSpyEngineGenericKernelObjectList& item = iModel->At( i );
- iTabs->AddTabL( item.Type(), item.TypeAsString( item.Type() ) );
- }
- iTabs->SetActiveTabById( iObjectType );
- iTabs->SetObserver( this );
- iNavContainer->PushL( *iNavDecorator );
- }
- */
+ iNavDecorator=iNaviPane->CreateMessageLabelL( pType );
+ iNaviPane->PushL(*iNavDecorator);
}
+TPtrC CMemSpyViewKernelObjects::TypeAsString( TMemSpyDriverContainerType aType )
+ {
+ _LIT( KTypeUnknown, "Unknown Type" );
+ _LIT( KTypeThread, "Thread" );
+ _LIT( KTypeProcess, "Process" );
+ _LIT( KTypeChunk, "Chunk" );
+ _LIT( KTypeLibrary, "Library" );
+ _LIT( KTypeSemaphore, "Semaphore" );
+ _LIT( KTypeMutex, "Mutex" );
+ _LIT( KTypeTimer, "Timer" );
+ _LIT( KTypeServer, "Server" );
+ _LIT( KTypeSession, "Session" );
+ _LIT( KTypeLogicalDevice, "Logical Device" );
+ _LIT( KTypePhysicalDevice, "Physical Device" );
+ _LIT( KTypeLogicalChannel, "Logical Channel" );
+ _LIT( KTypeChangeNotifier, "Change Notifier" );
+ _LIT( KTypeUndertaker, "Undertaker" );
+ _LIT( KTypeMsgQueue, "Msg. Queue" );
+ _LIT( KTypePropertyRef, "Property Ref." );
+ _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()
{