perfsrv/memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanContainers.cpp
--- a/perfsrv/memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanContainers.cpp Fri Oct 08 14:56:39 2010 +0300
+++ b/perfsrv/memspy/Driver/Kernel/Source/SubChannels/MemSpyDriverLogChanContainers.cpp Tue Oct 26 16:20:32 2010 +0300
@@ -742,9 +742,10 @@
const TBool isReady = pra.GetIsReady( *object );
TRACE( Kern::Printf("DMemSpyDriverLogChanContainers::GetPAndSInfo() - isReady: %d", isReady ));
+ TMemSpyDriverPAndSInfo params;
if ( isReady )
{
- TMemSpyDriverPAndSInfo params;
+ //TMemSpyDriverPAndSInfo params;
//
params.iType = pra.GetType( *object );
params.iCategory = pra.GetCategory( *object );
@@ -754,7 +755,8 @@
params.iCreatorSID = pra.GetCreatorSID( *object );
//
TRACE( Kern::Printf("DMemSpyDriverLogChanContainers::GetPAndSInfo - writing back to client thread..."));
- r = Kern::ThreadRawWrite( &ClientThread(), aInfo, ¶ms, sizeof( TMemSpyDriverPAndSInfo ) );
+ //r = Kern::ThreadRawWrite( &ClientThread(), aInfo, ¶ms, sizeof( TMemSpyDriverPAndSInfo ) );
+ r = KErrNone; //--
}
else
{
@@ -762,6 +764,13 @@
}
NKern::UnlockSystem();
+ //--
+ if( r == KErrNone )
+ {
+ r = Kern::ThreadRawWrite( &ClientThread(), aInfo, ¶ms, sizeof( TMemSpyDriverPAndSInfo ) );
+ }
+
+ //--
object->Close(NULL);
}
@@ -870,9 +879,7 @@
{
TRACE( Kern::Printf("DMemSpyDriverLogChanMisc::GetCondVarSuspThrInfo() - END - params read error: %d", r));
return r;
- }
-
- DMemSpyDriverOSAdaptionDThread& threadAdaption = OSAdaption().DThread();
+ }
NKern::ThreadEnterCS();