diff -r 07b41fa8d1dd -r ca8a1b6995f6 memspy/Engine/Source/Helpers/MemSpyEngineHelperStack.cpp --- a/memspy/Engine/Source/Helpers/MemSpyEngineHelperStack.cpp Thu Aug 19 11:25:43 2010 +0300 +++ b/memspy/Engine/Source/Helpers/MemSpyEngineHelperStack.cpp Tue Aug 31 16:45:49 2010 +0300 @@ -250,36 +250,22 @@ if ( r == KErrNone ) { - if ( aType == EMemSpyDriverDomainUser ) { - while ( r == KErrNone ) + while ( r == KErrNone ) + { + iEngine.Sink().OutputBinaryDataL( KStackDataPrefix, pData.Ptr(), (const TUint8*) info.iUserStackBase, pData.Length() ); + // + if ( remaining > 0 ) { - iEngine.Sink().OutputBinaryDataL( KStackDataPrefix, pData.Ptr(), (const TUint8*) info.iUserStackBase, pData.Length() ); - // - if ( remaining > 0 ) - { - info.iUserStackBase += pData.Length(); - r = iEngine.Driver().GetStackDataNext( aThread.Id(), pData, remaining, aType, aEntireStack ); - } - else - { - break; - } + info.iUserStackBase += pData.Length(); + r = iEngine.Driver().GetStackDataNext( aThread.Id(), pData, remaining, aType, aEntireStack ); } + else + { + break; + } + } } - else if ( aType == EMemSpyDriverDomainKernel ) { - while ( r == KErrNone ) { - - iEngine.Sink().OutputBinaryDataL( KStackDataPrefix, pData.Ptr(), (const TUint8*) info.iSupervisorStackBase, pData.Length() ); - // - if ( remaining > 0 ) { - info.iSupervisorStackBase += pData.Length(); - r = iEngine.Driver().GetStackDataNext( aThread.Id(), pData, remaining, aType, aEntireStack ); - } - else { - break; - } - } - } + } CleanupStack::PopAndDestroy( data ); @@ -290,7 +276,6 @@ iEngine.Sink().OutputLineFormattedL( KMemSpyMarkerStackData, &KMemSpySinkTagClose, (TUint) aThread.Id() ); iEngine.Sink().DataStreamEndL(); } -} EXPORT_C void CMemSpyEngineHelperStack::OutputStackInfoForDeviceL()