# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284701691 -10800 # Node ID 63cf70d3ecd8735de156bde6be78d174385baf85 # Parent a5deb6b966757adb8ab8eecb0d558493c69d4638 Revision: 201035 Kit: 201037 diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/group/sbeclient.mmp --- a/backupandrestore/backupengine/group/sbeclient.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/group/sbeclient.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -29,6 +29,7 @@ USERINCLUDE . ../inc +USERINCLUDE . ../traces SOURCEPATH ../src SOURCE sbheapwrapper.cpp SOURCE sbeclient.cpp diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/group/sbencrypt.mmp --- a/backupandrestore/backupengine/group/sbencrypt.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/group/sbencrypt.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -29,6 +29,7 @@ USERINCLUDE . ../inc +USERINCLUDE . ../traces SOURCEPATH ../src SOURCE sbencrypt.cpp SOURCE sbencryptimpl.cpp diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/group/sbengine.mmh --- a/backupandrestore/backupengine/group/sbengine.mmh Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/group/sbengine.mmh Fri Sep 17 08:34:51 2010 +0300 @@ -22,38 +22,4 @@ #ifndef __SBENGINE_MMH__ #define __SBENGINE_MMH__ - -/** By default, the SBE logs only in DEBUG builds. If you want - both release and debug logging, then comment this line out */ -#define __SBE_DISABLE_RELEASE_LOGGING - - -#if defined(__SBE_DISABLE_RELEASE_LOGGING) - - MACRO SBE_LOGGING_DEBUG_ONLY - -#else - - MACRO SBE_LOGGING_DEBUG_AND_RELEASE - #endif - - -/** The following macros are used (when logging is enabled) to - configure the type of logging to perform */ - - -/** Uncomment this line to enable FLOGGER (File) logging */ -MACRO SBE_LOGGING_METHOD_FLOGGER - -/** Uncomment this line to enable RDEBUG logging */ -//MACRO SBE_LOGGING_METHOD_RDEBUG - -/** Uncomment this line to enable UI (User::InfoPrint) logging. This - can cause UI deadlock in some UI systems. */ -//MACRO SBE_LOGGING_METHOD_UI - - - - -#endif \ No newline at end of file diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/group/sbengine.mmp --- a/backupandrestore/backupengine/group/sbengine.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/group/sbengine.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -39,7 +39,6 @@ SOURCE sbedataownermanager.cpp SOURCE sbebufferhandler.cpp SOURCE sbmain.cpp -SOURCE sblog.cpp SOURCE abserver.cpp SOURCE absession.cpp SOURCE absessionmap.cpp @@ -54,7 +53,7 @@ USERINCLUDE . ../inc -USERINCLUDE . +USERINCLUDE ../traces MW_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib efsrv.lib ecom.lib bafl.lib estor.lib @@ -63,18 +62,6 @@ LIBRARY apgrfx.lib apmime.lib LIBRARY ezlib.lib sbencrypt.lib cryptography.lib -#ifdef __SBE_DISABLE_RELEASE_LOGGING - - // Flogger will not be linked do this binary in UREL builds -DEBUGLIBRARY flogger.lib - -#else - - // Flogger always statically linked to this binary. -LIBRARY flogger.lib - -#endif - CAPABILITY ProtServ AllFiles WriteDeviceData ReadUserData TrustedUi START WINS diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/group/sbenginenojava.mmp --- a/backupandrestore/backupengine/group/sbenginenojava.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/group/sbenginenojava.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -54,6 +54,7 @@ SOURCE sbepanic.cpp USERINCLUDE . ../inc +USERINCLUDE . ../traces MW_LAYER_SYSTEMINCLUDE_SYMBIAN @@ -63,18 +64,6 @@ LIBRARY apgrfx.lib apmime.lib estor.lib LIBRARY ezlib.lib sbencrypt.lib cryptography.lib -#ifdef __SBE_DISABLE_RELEASE_LOGGING - - // Flogger will not be linked do this binary in UREL builds - DEBUGLIBRARY flogger.lib - -#else - - // Flogger always statically linked to this binary. - LIBRARY flogger.lib - -#endif - CAPABILITY ProtServ AllFiles WriteDeviceData ReadUserData START WINS diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/inc/sblog.h --- a/backupandrestore/backupengine/inc/sblog.h Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,103 +0,0 @@ -/** -* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: -* Logging utilities -* -* -*/ - - - -/** - @file -*/ - -#ifndef __SBLOG_H__ -#define __SBLOG_H__ - -#include -#include - -/** -@defgroup Log Log - -This module implements logging utilities. Information is currently -logged via flogger, but this can be easily changed as logging is -hidden by global macros. - -A nested namespace, log, contains the class and global function that -performs the logging operations: TLog, OpenLog(), CloseLog() and TLog -operator() - which accepts a variable number of arguments. There is -macro for each of these functions. - -OpenLog() and CloseLog() must be called only once and this is done by -MainL(). -*/ - -namespace conn - { - - /** LOG CONTROL MACROS */ - - /** @{ */ - - #if (defined(SBE_LOGGING_DEBUG_ONLY) && defined(_DEBUG)) || defined(SBE_LOGGING_DEBUG_AND_RELEASE) - - #define SBE_LOGGING_ENABLED - - namespace securebackuplog - /** - @ingroup Log - This namespace hides the internal of logging from the rest of the system. - */ - { - void __LogRaw( TDes& aData ); - void __Log(TRefByValue aFmt,...); - void __DebugDump( const TDesC& aFormat, const TUint8* aAddress, TInt aLength ); - }//securebackuplog - - /** Logs a message */ - #define __LOG(TXT) { _LIT(__KText,TXT); securebackuplog::__Log(__KText); } - - /** Logs a message plus an additional value. The text must - contain an appropriate printf alike indication, e.g. %d if the additional - value is an integer. */ - #define __LOG1(TXT, A) { _LIT(__KText,TXT); securebackuplog::__Log(__KText, A); } - #define __LOG2(TXT, A, B) { _LIT(__KText,TXT); securebackuplog::__Log(__KText, A, B); } - #define __LOG3(TXT, A, B, C ) { _LIT(__KText,TXT); securebackuplog::__Log(__KText, A, B, C); } - #define __LOG4(TXT, A, B, C, D ) { _LIT(__KText,TXT); securebackuplog::__Log(__KText, A, B, C, D); } - #define __LOG5(TXT, A, B, C, D, E ) { _LIT(__KText,TXT); securebackuplog::__Log(__KText, A, B, C, D, E); } - #define __LOG6(TXT, A, B, C, D, E, F ) { _LIT(__KText,TXT); securebackuplog::__Log(__KText, A, B, C, D, E, F); } - - /** Logs data as ascii text (hex encoded) */ - #define __LOGDATA(TXT, DATAPOINTER, LEN) { _LIT(__KText,TXT); securebackuplog::__DebugDump(__KText, DATAPOINTER, LEN); } - - #else - - #define __LOG(TXT) - #define __LOG1(TXT, A) - #define __LOG2(TXT, A, B) - #define __LOG3(TXT, A, B, C ) - #define __LOG4(TXT, A, B, C, D ) - #define __LOG5(TXT, A, B, C, D, E ) - #define __LOG6(TXT, A, B, C, D, E, F ) - #define __LOGDATA(TXT, DATAPOINTER, LEN) - - #endif - - /** @} */ - - }//conn - -#endif //__SBLOG_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/inc/sbtrace.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/backupandrestore/backupengine/inc/sbtrace.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,39 @@ +/** +* Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* Main entry point in the process. +* +* +*/ + + + +/** + @file +*/ + +#ifndef __SBTRACE_H__ +#define __SBTRACE_H__ + +#define LEAVEIFERROR(err, trace) \ +{ \ +TInt munged_err=(err); \ +if (munged_err < 0) \ +{ \ +trace; \ +User::Leave(munged_err);\ +}\ +} + +#endif //__SBTRACE_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/abserver.cpp --- a/backupandrestore/backupengine/src/abserver.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/abserver.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,12 +27,14 @@ #include "absessionmap.h" #include "sbedataownermanager.h" #include "sbepanic.h" -#include "sblog.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "abserverTraces.h" +#endif namespace conn { - - /** Active Backup security request ranges This is a breakdown of the active backup requests into ranges @@ -87,7 +89,9 @@ Class constructor */ { + OstTraceFunctionEntry0( CABSERVER_CABSERVER_CONS_ENTRY ); __ASSERT_DEBUG(iDOM, Panic(KErrArgument)); + OstTraceFunctionExit0( CABSERVER_CABSERVER_CONS_EXIT ); } CABServer::~CABServer() @@ -95,7 +99,9 @@ Class destructor */ { + OstTraceFunctionEntry0( CABSERVER_CABSERVER_DES_ENTRY ); delete iSessionMap; + OstTraceFunctionExit0( CABSERVER_CABSERVER_DES_EXIT ); } CABServer* CABServer::NewLC(CDataOwnerManager* aDOM) @@ -106,9 +112,11 @@ @return The new instance of CABServer. */ { + OstTraceFunctionEntry0( CABSERVER_NEWLC_ENTRY ); CABServer* pSelf = new (ELeave) CABServer(aDOM); CleanupStack::PushL(pSelf); pSelf->ConstructL(); + OstTraceFunctionExit0( CABSERVER_NEWLC_EXIT ); return pSelf; } @@ -117,10 +125,12 @@ Construct this instance of CABServer. */ { + OstTraceFunctionEntry0( CABSERVER_CONSTRUCTL_ENTRY ); iSessionMap = CABSessionMap::NewL(); // // Start the server StartL(KABServerName); + OstTraceFunctionExit0( CABSERVER_CONSTRUCTL_EXIT ); } void CABServer::AddSession() @@ -150,7 +160,9 @@ @param aSecureId The key of the element to be removed */ { + OstTraceFunctionEntry0( CABSERVER_REMOVEELEMENT_ENTRY ); iSessionMap->Delete(aSecureId); + OstTraceFunctionExit0( CABSERVER_REMOVEELEMENT_EXIT ); } void CABServer::SupplyDataL(TSecureId aSID, TDriveNumber aDriveNumber, TTransferDataType aTransferType, @@ -167,9 +179,11 @@ @param aProxySID The secure ID of the proxy */ { + OstTraceFunctionEntry0( CABSERVER_SUPPLYDATAL_ENTRY ); CABSession& session = iSessionMap->SessionL(aSID); session.SupplyDataL(aDriveNumber, aTransferType, aBuffer, aLastSection, aSuppressInitDataOwner, aProxySID); + OstTraceFunctionExit0( CABSERVER_SUPPLYDATAL_EXIT ); } void CABServer::RequestDataL(TSecureId aSID, TDriveNumber aDriveNumber, TTransferDataType aTransferType, @@ -186,9 +200,11 @@ @param aProxySID The secure ID of the proxy */ { + OstTraceFunctionEntry0( CABSERVER_REQUESTDATAL_ENTRY ); CABSession& session = iSessionMap->SessionL(aSID); session.RequestDataL(aDriveNumber, aTransferType, aBuffer, aLastSection, aSuppressInitDataOwner, aProxySID); + OstTraceFunctionExit0( CABSERVER_REQUESTDATAL_EXIT ); } void CABServer::GetExpectedDataSizeL(TSecureId aSID, TDriveNumber aDriveNumber, TUint& aSize) @@ -200,9 +216,11 @@ @param aSize The size of the data owner's data */ { + OstTraceFunctionEntry0( CABSERVER_GETEXPECTEDDATASIZEL_ENTRY ); CABSession& session = iSessionMap->SessionL(aSID); session.GetExpectedDataSizeL(aDriveNumber, aSize); + OstTraceFunctionExit0( CABSERVER_GETEXPECTEDDATASIZEL_EXIT ); } void CABServer::AllSnapshotsSuppliedL(TSecureId aSID) @@ -211,9 +229,11 @@ @param aSID The secure ID of the data owner to signal */ { + OstTraceFunctionEntry0( CABSERVER_ALLSNAPSHOTSSUPPLIEDL_ENTRY ); CABSession& session = iSessionMap->SessionL(aSID); session.AllSnapshotsSuppliedL(); + OstTraceFunctionExit0( CABSERVER_ALLSNAPSHOTSSUPPLIEDL_EXIT ); } void CABServer::InvalidateABSessions() @@ -223,7 +243,9 @@ * this session can not be used for another backup/restore. */ { + OstTraceFunctionEntry0( CABSERVER_INVALIDATEABSESSIONS_ENTRY ); iSessionMap->InvalidateABSessions(); + OstTraceFunctionExit0( CABSERVER_INVALIDATEABSESSIONS_EXIT ); } TDataOwnerStatus CABServer::SessionReadyStateL(TSecureId aSID) @@ -234,21 +256,23 @@ @return Data owner status of the session */ { + OstTraceFunctionEntry0( CABSERVER_SESSIONREADYSTATEL_ENTRY ); CABSession& session = iSessionMap->SessionL(aSID); TDataOwnerStatus doStatus = EDataOwnerNotConnected; if (session.Invalidated()) { - __LOG1("CABServer::SessionReadyStateL session for 0x%08x has been invalidated, return NotConnected", - aSID.iId); + OstTrace1(TRACE_NORMAL, CABSERVER_SESSIONREADYSTATEL, "session for 0x%08x has been invalidated, return NotConnected", + aSID.iId); + OstTraceFunctionExit0( CABSERVER_SESSIONREADYSTATEL_EXIT ); return doStatus; } if (session.CallbackInterfaceAvailable()) { - __LOG2("CABServer::SessionReadyStateL session for 0x%08x already have interface, confirmed:%d ", - aSID.iId, session.ConfirmedReadyForBUR()); + OstTraceExt2(TRACE_NORMAL, DUP1_CABSERVER_SESSIONREADYSTATEL, "session for 0x%08x already have interface, confirmed:%d ", + aSID.iId, static_cast(session.ConfirmedReadyForBUR())); doStatus = EDataOwnerNotReady; @@ -259,8 +283,8 @@ } else { - __LOG2("CABServer::SessionReadyStateL session for 0x%08x does not have interface, confimed:%d", - aSID.iId, session.ConfirmedReadyForBUR()); + OstTraceExt2(TRACE_NORMAL, DUP2_CABSERVER_SESSIONREADYSTATEL, "session for 0x%08x does not have interface, confimed:%d", + aSID.iId, static_cast(session.ConfirmedReadyForBUR())); doStatus = EDataOwnerNotReady; @@ -270,6 +294,7 @@ } } + OstTraceFunctionExit0( DUP1_CABSERVER_SESSIONREADYSTATEL_EXIT ); return doStatus; } @@ -281,9 +306,11 @@ @param aDrive The drive number for which the restore has completed */ { + OstTraceFunctionEntry0( CABSERVER_RESTORECOMPLETEL_ENTRY ); CABSession& session = iSessionMap->SessionL(aSID); session.RestoreCompleteL(aDrive); + OstTraceFunctionExit0( CABSERVER_RESTORECOMPLETEL_EXIT ); } CSession2* CABServer::NewSessionL(const TVersion& aVersion, @@ -299,19 +326,23 @@ @leave KErrNotSupported if the version passed in aVersion is not the same as this one */ { + OstTraceFunctionEntry0( CABSERVER_NEWSESSIONL_ENTRY ); TVersion thisVersion(KABMajorVersionNumber, KABMinorVersionNumber, KABBuildVersionNumber); if (!User::QueryVersionSupported(thisVersion, aVersion)) { + OstTrace0(TRACE_ERROR, CABSERVER_NEWSESSIONL, "Leave: KErrNotSupported"); User::Leave(KErrNotSupported); } TSecureId sid = aMessage.SecureId(); // The map creates the session and a map entry, then session ownership is passed to the server - return &(iSessionMap->CreateL(sid)); + CSession2* newSession = &(iSessionMap->CreateL(sid)); + OstTraceFunctionExit0( CABSERVER_NEWSESSIONL_EXIT ); + return newSession; } TInt CABServer::RunError(TInt aError) @@ -325,6 +356,7 @@ @return The error code to be passed back to the active scheduler framework. */ { + OstTraceFunctionEntry0( CABSERVER_RUNERROR_ENTRY ); // // A Bad descriptor is a bad client - panic it. if(aError == KErrBadDescriptor) @@ -336,6 +368,7 @@ // Complete the message and continue handling requests. Message().Complete(aError); ReStart(); + OstTraceFunctionExit0( CABSERVER_RUNERROR_EXIT ); return KErrNone; } @@ -345,11 +378,13 @@ @param aPanic The panic code. */ { + OstTraceFunctionEntry0( CABSERVER_PANICCLIENT_ENTRY ); __DEBUGGER() _LIT(KPanicCategory,"AB Server"); RThread client; Message().Client(client); client.Panic(KPanicCategory, aPanic); + OstTraceFunctionExit0( CABSERVER_PANICCLIENT_EXIT ); } } // end namespace diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/absession.cpp --- a/backupandrestore/backupengine/src/absession.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/absession.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,7 +27,11 @@ #include "sbedataowner.h" #include #include "sbepanic.h" -#include "sblog.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "absessionTraces.h" +#endif namespace conn { @@ -38,10 +42,12 @@ @param aSecureId The SID of the client that's connecting to this session */ { + OstTraceFunctionEntry0( CABSESSION_NEWL_ENTRY ); CABSession* self = new (ELeave) CABSession(aSecureId); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CABSESSION_NEWL_EXIT ); return self; } @@ -50,8 +56,10 @@ Symbian second phase constructor. Initialise some more of the data members */ { + OstTraceFunctionEntry0( CABSESSION_CONSTRUCTL_ENTRY ); iActiveSchedulerWait = new (ELeave) CActiveSchedulerWait; - __LOG1("CABSession::ConstructL() [0x%08x]", iClientSID.iId); + OstTrace1(TRACE_NORMAL, CABSESSION_CONSTRUCTL , "[0x%08x]", iClientSID.iId); + OstTraceFunctionExit0( CABSESSION_CONSTRUCTL_EXIT ); } CABSession::CABSession(TSecureId aSecureId) : iClientSID(aSecureId), @@ -65,6 +73,8 @@ @param aSecureId The SID of the client that's connecting to this session */ { + OstTraceFunctionEntry0( CABSESSION_CABSESSION_CONS_ENTRY ); + OstTraceFunctionExit0( CABSESSION_CABSESSION_CONS_EXIT ); } CDataOwner& CABSession::DataOwnerL() const @@ -99,7 +109,8 @@ @return An error code */ { - __LOG1("CABSession::WatchdogExpired() - [0x%08x] Watchdog expired on session", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_WATCHDOGEXPIRED_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_WATCHDOGEXPIRED, "[0x%08x] Watchdog expired on session", iClientSID.iId); iMisbehavingClient = ETrue; // Flag the client as having not responded @@ -117,6 +128,7 @@ Panic(KErrTimedOut); } + OstTraceFunctionExit0( CABSESSION_WATCHDOGEXPIRED_EXIT ); return KErrTimedOut; } @@ -143,7 +155,8 @@ Class destructor */ { - __LOG1("~CABSession for sid:0x%08x", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_CABSESSION_DES_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_CABSESSION, "~CABSession for sid:0x%08x", iClientSID.iId); delete iCallbackWatchdog; iCallbackWatchdog = NULL; @@ -159,6 +172,7 @@ HandleIPCClosingDownCallback(); delete iActiveSchedulerWait; + iActiveSchedulerWait = NULL; // // If the client has detached properly, they should @@ -168,6 +182,7 @@ { pServer->DropSession(); } + OstTraceFunctionExit0( CABSESSION_CABSESSION_DES_EXIT ); } void CABSession::CreateL() @@ -176,9 +191,11 @@ Increments the server's session count */ { + OstTraceFunctionEntry0( CABSESSION_CREATEL_ENTRY ); // // Increase the servers session count. Server().AddSession(); + OstTraceFunctionExit0( CABSESSION_CREATEL_EXIT ); } void CABSession::RestoreCompleteL(TDriveNumber aDriveNumber) @@ -188,7 +205,9 @@ @param aDriveNumber The drive that has finished being backed up */ { + OstTraceFunctionEntry0( CABSESSION_RESTORECOMPLETEL_ENTRY ); MakeCallbackRestoreCompleteL(aDriveNumber); + OstTraceFunctionExit0( CABSESSION_RESTORECOMPLETEL_EXIT ); } void CABSession::AllSnapshotsSuppliedL() @@ -197,7 +216,9 @@ */ { + OstTraceFunctionEntry0( CABSESSION_ALLSNAPSHOTSSUPPLIEDL_ENTRY ); MakeCallbackAllSnapshotsSuppliedL(); + OstTraceFunctionExit0( CABSESSION_ALLSNAPSHOTSSUPPLIEDL_EXIT ); } void CABSession::GetExpectedDataSizeL(TDriveNumber aDriveNumber, TUint& aSize) @@ -208,7 +229,9 @@ @param aSize Upon exit, this parameter will indicate the expected data size */ { + OstTraceFunctionEntry0( CABSESSION_GETEXPECTEDDATASIZEL_ENTRY ); aSize = MakeCallbackGetExpectedDataSizeL(aDriveNumber); + OstTraceFunctionExit0( CABSESSION_GETEXPECTEDDATASIZEL_EXIT ); } void CABSession::SupplyDataL(TDriveNumber aDriveNumber, TTransferDataType aTransferType, TDesC8& aBuffer, @@ -224,6 +247,7 @@ @param aProxySID The secure ID of the proxy */ { + OstTraceFunctionEntry0( CABSESSION_SUPPLYDATAL_ENTRY ); TInt dataSizeTransferred = 0; TInt remainingBlockSize = 0; TBool lastSection; @@ -259,7 +283,7 @@ lastSection = aLastSection; } - __LOG2("CABSession::SupplyDataL() - [0x%08x] Supplying data to ABClient, %d bytes transferred", iClientSID.iId, dataSizeTransferred); + OstTraceExt2(TRACE_NORMAL, CABSESSION_SUPPLYDATAL, "[0x%08x] Supplying data to ABClient, %d bytes transferred", iClientSID.iId, static_cast(dataSizeTransferred)); switch(aTransferType) { @@ -292,6 +316,7 @@ } break; default: { + OstTrace0(TRACE_ERROR, DUP1_CABSESSION_SUPPLYDATAL, "Leave: KErrNotSupported"); User::Leave(KErrNotSupported); } } @@ -300,6 +325,7 @@ // shouldn't be sent again aSuppressInitDataOwner = ETrue; } + OstTraceFunctionExit0( CABSESSION_SUPPLYDATAL_EXIT ); } void CABSession::RequestDataL(TDriveNumber aDriveNumber, TTransferDataType aTransferType, TPtr8& aBuffer, @@ -315,8 +341,9 @@ @param aProxySID The secure ID of the proxy */ { - __LOG5("CABSession::RequestDataL() - START - aDrive: %c, aTType: %d, aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d, aProxySID: 0x%08x", - aDriveNumber + 'A', aTransferType, aBuffer.Ptr(), aBuffer.Length(), aProxySID.iId ); + OstTraceFunctionEntry0( CABSESSION_REQUESTDATAL_ENTRY ); + OstTraceExt5(TRACE_NORMAL, CABSESSION_REQUESTDATAL, "aDrive: %c, aTType: %d, aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d, aProxySID: 0x%08x", + static_cast(aDriveNumber + 'A'), static_cast(aTransferType), reinterpret_cast(aBuffer.Ptr()), static_cast(aBuffer.Length()), aProxySID.iId ); TInt dataSizeTransferred = 0; TInt remainingBlockSize = 0; @@ -330,7 +357,7 @@ aBuffer.SetMax(); remainingBlockSize = aBuffer.MaxSize() - dataSizeTransferred; - __LOG2("CABSession::RequestDataL() - dataSizeTransferred: %d, remainingBlockSize: %d", dataSizeTransferred, remainingBlockSize); + OstTraceExt2(TRACE_NORMAL, DUP1_CABSESSION_REQUESTDATAL, "dataSizeTransferred: %d, remainingBlockSize: %d", dataSizeTransferred, remainingBlockSize); if (remainingBlockSize > KIPCMessageSize) { @@ -338,7 +365,7 @@ } transferBlock.Set(aBuffer.MidTPtr(dataSizeTransferred, remainingBlockSize)); - __LOG2("CABSession::RequestDataL() - transferBlock: 0x%08x (%d)", transferBlock.Ptr(), transferBlock.Length()); + OstTraceExt2(TRACE_NORMAL, DUP2_CABSESSION_REQUESTDATAL, "transferBlock: 0x%08x (%d)", reinterpret_cast(transferBlock.Ptr()), static_cast(transferBlock.Length())); switch(aTransferType) { @@ -364,6 +391,7 @@ } break; default: { + OstTrace0(TRACE_ERROR, DUP5_CABSESSION_REQUESTDATAL, "Leave: KErrNotSupported"); User::Leave(KErrNotSupported); } } @@ -375,15 +403,15 @@ // update our count to reflect the new data supplied by the client dataSizeTransferred += transferBlock.Size(); - __LOG2("CABSession::RequestDataL() - received data so far: %d, buffer start address: 0x%08x", dataSizeTransferred, aBuffer.Ptr()); - //__LOGDATA("CABSession::RequestDataL() - total received data - %S", aBuffer.Ptr(), dataSizeTransferred); + OstTraceExt2(TRACE_NORMAL, DUP3_CABSESSION_REQUESTDATAL, "received data so far: %d, buffer start address: 0x%08x", static_cast(dataSizeTransferred), reinterpret_cast(aBuffer.Ptr())); - __LOG2("CABSession::RequestDataL() - [0x%08x] Requesting data from ABClient %d bytes so far)", iClientSID.iId, dataSizeTransferred); + OstTraceExt2(TRACE_NORMAL, DUP4_CABSESSION_REQUESTDATAL, "[0x%08x] Requesting data from ABClient %d bytes so far)", iClientSID.iId, static_cast(dataSizeTransferred)); aBuffer.SetLength(dataSizeTransferred); } while (!lastSection && (dataSizeTransferred < aBuffer.MaxSize())); aLastSection = lastSection; + OstTraceFunctionExit0( CABSESSION_REQUESTDATAL_EXIT ); } void CABSession::TerminateMultiStageOperationL() @@ -391,7 +419,9 @@ Instruct the client that copying of data has been aborted and it should clean up */ { + OstTraceFunctionEntry0( CABSESSION_TERMINATEMULTISTAGEOPERATIONL_ENTRY ); MakeCallbackTerminateMultiStageOperationL(); + OstTraceFunctionExit0( CABSESSION_TERMINATEMULTISTAGEOPERATIONL_EXIT ); } TUint CABSession::GetDataChecksumL(TDriveNumber aDrive) @@ -423,6 +453,7 @@ @see CDataOwner::ReturnFromActiveCall() */ { + OstTraceFunctionEntry0( CABSESSION_MADECALLBACK_ENTRY ); // Reset the leave flag iABClientLeaveCode = KErrNone; @@ -440,10 +471,11 @@ // Send the message back to the callback handler iMessage.Complete(KErrNone); - __LOG1("CABSession::MadeCallback() - [0x%08x] Calling ABClient to process callback", iClientSID.iId); + OstTrace1(TRACE_NORMAL, CABSESSION_MADECALLBACK, "[0x%08x] Calling ABClient to process callback", iClientSID.iId); // Set the timeout for the callback iActiveSchedulerWait->Start(); + OstTraceFunctionExit0( CABSESSION_MADECALLBACK_EXIT ); } void CABSession::ReturnFromCallback() @@ -452,6 +484,7 @@ so that the Data Owner appears to have made a synchronous call into the ABServer */ { + OstTraceFunctionEntry0( CABSESSION_RETURNFROMCALLBACK_ENTRY ); if (iCallbackWatchdog) { if (iCallbackWatchdog->IsActive()) @@ -465,9 +498,10 @@ if (iActiveSchedulerWait->IsStarted()) { - __LOG1("CABSession::MadeCallback() - [0x%08x] has returned from callback - CASW::AsyncStop()", iClientSID.iId); + OstTrace1(TRACE_NORMAL, CABSESSION_RETURNFROMCALLBACK, "[0x%08x] has returned from callback - CASW::AsyncStop()", iClientSID.iId); iActiveSchedulerWait->AsyncStop(); } + OstTraceFunctionExit0( CABSESSION_RETURNFROMCALLBACK_EXIT ); } void CABSession::TakeOwnershipOfIPCMessage(const RMessage2& aMessage) @@ -487,7 +521,8 @@ @param aMessage The IPC message */ { - __LOG1("CABSession::HandleIPCBURModeInfoL() - [0x%08x] Received IPC IPCBURModeInfo", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_HANDLEIPCBURMODEINFOL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_HANDLEIPCBURMODEINFOL, "[0x%08x] Received IPC IPCBURModeInfo", iClientSID.iId); TPckgC partType(Server().DataOwnerManager().BURType()); TPckgC incType(Server().DataOwnerManager().IncType()); @@ -496,6 +531,7 @@ aMessage.WriteL(0, Server().DataOwnerManager().DriveList()); aMessage.WriteL(1, partType); aMessage.WriteL(2, incType); + OstTraceFunctionExit0( CABSESSION_HANDLEIPCBURMODEINFOL_EXIT ); } void CABSession::HandleIPCDoesPartialBURAffectMeL(const RMessage2& aMessage) @@ -505,10 +541,12 @@ @param aMessage The IPC message */ { - __LOG1("CABSession::HandleIPCDoesPartialBURAffectMeL() - [0x%08x] Received IPC DoesPartialBURAffectMe", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_HANDLEIPCDOESPARTIALBURAFFECTMEL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_HANDLEIPCDOESPARTIALBURAFFECTMEL, "[0x%08x] Received IPC DoesPartialBURAffectMe", iClientSID.iId); TPckgC resultPkg(Server().DataOwnerManager().IsSetForPartialL(iClientSID)); aMessage.WriteL(0, resultPkg); + OstTraceFunctionExit0( CABSESSION_HANDLEIPCDOESPARTIALBURAFFECTMEL_EXIT ); } void CABSession::HandleIPCConfirmReadyForBURL(const RMessage2& aMessage) @@ -518,8 +556,9 @@ @param aMessage The IPC message */ { + OstTraceFunctionEntry0( CABSESSION_HANDLEIPCCONFIRMREADYFORBURL_ENTRY ); TInt errorCode = aMessage.Int0(); - __LOG2("CABSession::HandleIPCConfirmReadyForBURL() - [0x%08x] Received IPC ConfirmReadyForBUR, errorCode: %d", iClientSID.iId, errorCode); + OstTraceExt2(TRACE_NORMAL, CABSESSION_HANDLEIPCCONFIRMREADYFORBURL, "[0x%08x] Received IPC ConfirmReadyForBUR, errorCode: %d", iClientSID.iId, static_cast(errorCode)); // Set our internal state to indicate that the client has confirmed ready for BUR iConfirmedReadyForBUR = ETrue; @@ -544,6 +583,7 @@ // Inform the Data Owner of the new status TRAP_IGNORE(DataOwnerL().SetReadyState(status)); + OstTraceFunctionExit0( CABSESSION_HANDLEIPCCONFIRMREADYFORBURL_EXIT ); } void CABSession::HandleIPCPropagateLeaveL(const RMessage2& aMessage) @@ -552,12 +592,14 @@ @param aMessage The IPC message */ { + OstTraceFunctionEntry0( CABSESSION_HANDLEIPCPROPAGATELEAVEL_ENTRY ); // Leave with the propagated leave code, but not inside this ServiceL, it'll leave to the client again // We need to ensure that it leaves through SBEngine back to SBEClient. Leave code will be checked // after the callback has been made and leave will be made then if necessary iABClientLeaveCode = aMessage.Int0(); - __LOG2("CABSession::HandleIPCPropagateLeaveL() - [0x%08x] Received IPC Leave(%d)", iClientSID.iId, iABClientLeaveCode); + OstTraceExt2(TRACE_NORMAL, CABSESSION_HANDLEIPCPROPAGATELEAVEL, "[0x%08x] Received IPC Leave(%d)", iClientSID.iId, static_cast(iABClientLeaveCode)); + OstTraceFunctionExit0( CABSESSION_HANDLEIPCPROPAGATELEAVEL_EXIT ); } TInt CABSession::HandleIPCGetDataSyncL(const RMessage2& aMessage) @@ -568,7 +610,8 @@ @return KErrNone if OK, standard error code otherwise */ { - __LOG1("CABSession::HandleIPCGetDataSyncL() - [0x%08x] has requested data over IPC", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_HANDLEIPCGETDATASYNCL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_HANDLEIPCGETDATASYNCL, "[0x%08x] has requested data over IPC", iClientSID.iId); TInt completionCode = KErrNone; @@ -582,7 +625,8 @@ completionCode = KErrCorrupt; } - __LOG2("CABSession::HandleIPCGetDataSyncL() - [0x%08x] completion code: %d", iClientSID.iId, completionCode); + OstTraceExt2(TRACE_NORMAL, DUP1_CABSESSION_HANDLEIPCGETDATASYNCL, "[0x%08x] completion code: %d", iClientSID.iId, static_cast(completionCode)); + OstTraceFunctionExit0( CABSESSION_HANDLEIPCGETDATASYNCL_EXIT ); return completionCode; } @@ -594,7 +638,8 @@ @return KErrNone if OK, standard error code otherwise */ { - __LOG1("CABSession::HandleIPCSendDataLengthL() - [0x%08x] is informing server of the data length coming back", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_HANDLEIPCSENDDATALENGTHL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_HANDLEIPCSENDDATALENGTHL, "[0x%08x] is informing server of the data length coming back", iClientSID.iId); TInt completionCode = KErrNone; @@ -610,6 +655,7 @@ completionCode = KErrCorrupt; } + OstTraceFunctionExit0( CABSESSION_HANDLEIPCSENDDATALENGTHL_EXIT ); return completionCode; } @@ -620,14 +666,16 @@ @return KErrNone if OK, standard error code otherwise */ { + OstTraceFunctionEntry0( CABSESSION_HANDLEIPCCLOSINGDOWNCALLBACK_ENTRY ); TInt completionCode = KErrNotFound; - __LOG1("CABSession::HandleIPCClosingDownCallback() - [0x%08x] is closing down the callback interface", iClientSID.iId); + OstTrace1(TRACE_NORMAL, CABSESSION_HANDLEIPCCLOSINGDOWNCALLBACK, "[0x%08x] is closing down the callback interface", iClientSID.iId); if (!iMessage.IsNull()) { completionCode = KErrNone; iMessage.Complete(KErrCancel); } + OstTraceFunctionExit0( CABSESSION_HANDLEIPCCLOSINGDOWNCALLBACK_EXIT ); return completionCode; } @@ -639,33 +687,32 @@ @param aMessage Reference to a RMessage2 object */ { + OstTraceFunctionEntry0( CABSESSION_SERVICEL_ENTRY ); const TInt ipcMessageFn = aMessage.Function(); TInt completionCode = KErrNone; // Complete the aMessage with this code - #if defined(SBE_LOGGING_ENABLED) RThread client; aMessage.Client(client); const TFullName name(client.FullName()); client.Close(); - __LOG5("CABSession::ServiceL() - START - [0x%08x] function: %d from client: %S, iMisbehavingClient: %d, iConfirmedReadyForBUR: %d", iClientSID.iId, ipcMessageFn, &name, iMisbehavingClient, iConfirmedReadyForBUR); - #endif + OstTraceExt5(TRACE_NORMAL, CABSESSION_SERVICEL, "[0x%08x] function: %d from client: %S, iMisbehavingClient: %d, iConfirmedReadyForBUR: %d", iClientSID.iId, static_cast(ipcMessageFn), name, static_cast(iMisbehavingClient), static_cast(iConfirmedReadyForBUR)); switch(ipcMessageFn) { case EABMsgBURModeInfo: - __LOG("CABSession::ServiceL() - EABMsgBURModeInfo"); + OstTrace0(TRACE_NORMAL, DUP1_CABSESSION_SERVICEL, "EABMsgBURModeInfo"); { HandleIPCBURModeInfoL(aMessage); break; } case EABMsgDoesPartialAffectMe: - __LOG("CABSession::ServiceL() - EABMsgDoesPartialAffectMe"); + OstTrace0(TRACE_NORMAL, DUP2_CABSESSION_SERVICEL, "EABMsgDoesPartialAffectMe"); { HandleIPCDoesPartialBURAffectMeL(aMessage); break; } case EABMsgConfirmReadyForBUR: - __LOG("CABSession::ServiceL() - EABMsgConfirmReadyForBUR"); + OstTrace0(TRACE_NORMAL, DUP3_CABSESSION_SERVICEL, "EABMsgConfirmReadyForBUR"); { if (iMisbehavingClient) { @@ -681,7 +728,7 @@ case EABMsgPrimeForCallback: case EABMsgPrimeForCallbackAndResponse: case EABMsgPrimeForCallbackAndResponseDes: - __LOG("CABSession::ServiceL() - EABMsgPrimeForCallback/EABMsgPrimeForCallbackAndResponse/EABMsgPrimeForCallbackAndResponseDes"); + OstTrace0(TRACE_NORMAL, DUP4_CABSESSION_SERVICEL, "EABMsgPrimeForCallback/EABMsgPrimeForCallbackAndResponse/EABMsgPrimeForCallbackAndResponseDes"); { CDataOwner* dataOwner = NULL; TRAPD(err, dataOwner = &DataOwnerL()); @@ -697,6 +744,7 @@ { if (err != KErrNotFound) { + OstTrace1(TRACE_ERROR, DUP12_CABSESSION_SERVICEL, "Leave: %d", err); User::Leave(err); } } @@ -715,6 +763,7 @@ { if (err != KErrNotFound) { + OstTrace1(TRACE_ERROR, DUP13_CABSESSION_SERVICEL, "Leave: %d", err); User::Leave(err); } } @@ -726,7 +775,7 @@ break; } case EABMsgPropagateLeave: - __LOG("CABSession::ServiceL() - EABMsgPropagateLeave"); + OstTrace0(TRACE_NORMAL, DUP5_CABSESSION_SERVICEL, "EABMsgPropagateLeave"); { if (iMisbehavingClient) { @@ -739,7 +788,7 @@ break; } case EABMsgGetDataSync: - __LOG("CABSession::ServiceL() - EABMsgGetDataSync"); + OstTrace0(TRACE_NORMAL, DUP6_CABSESSION_SERVICEL, "EABMsgGetDataSync"); { if (iMisbehavingClient) { @@ -752,7 +801,7 @@ break; } case EABMsgSendDataLength: - __LOG("CABSession::ServiceL() - EABMsgSendDataLength"); + OstTrace0(TRACE_NORMAL, DUP7_CABSESSION_SERVICEL, "EABMsgSendDataLength"); { if (iMisbehavingClient) { @@ -765,7 +814,7 @@ break; } case EABMsgClosingDownCallback: - __LOG("CABSession::ServiceL() - EABMsgClosingDownCallback"); + OstTrace0(TRACE_NORMAL, DUP8_CABSESSION_SERVICEL, "EABMsgClosingDownCallback"); { completionCode = HandleIPCClosingDownCallback(); @@ -778,7 +827,7 @@ break; } case EABMsgGetDriveNumForSuppliedSnapshot: - __LOG("CABSession::ServiceL() - EABMsgGetDriveNumForSuppliedSnapshot"); + OstTrace0(TRACE_NORMAL, DUP9_CABSESSION_SERVICEL, "EABMsgGetDriveNumForSuppliedSnapshot"); { // Return the drive number to the client completionCode = static_cast(iSuppliedSnapshotDriveNum); @@ -801,16 +850,16 @@ if (!aMessage.IsNull()) { aMessage.Complete(completionCode); - __LOG3("CABSession::ServiceL() - END - function: %d from client: %S - COMPLETED (%d)", aMessage.Function(), &name, completionCode); + OstTraceExt3(TRACE_NORMAL, DUP10_CABSESSION_SERVICEL, "function: %d from client: %S - COMPLETED (%d)", aMessage.Function(), name, completionCode); } } - #if defined(SBE_LOGGING_ENABLED) if (!aMessage.IsNull()) { - __LOG2("CABSession::ServiceL() - END - function: %d from client: %S - ASYNCH -> NOT COMPLETED", aMessage.Function(), &name); + OstTraceExt2(TRACE_NORMAL, DUP11_CABSESSION_SERVICEL, "function: %d from client: %S - ASYNCH -> NOT COMPLETED", aMessage.Function(), name); } - #endif + + OstTraceFunctionExit0( CABSESSION_SERVICEL_EXIT ); } inline CABServer& CABSession::Server() const @@ -820,6 +869,7 @@ @return The non-const reference to this. */ { + OstTraceFunctionEntry0( CABSESSION_SERVER_ENTRY ); return *static_cast(const_cast(CSession2::Server())); } @@ -830,19 +880,23 @@ @leave KErrNotReady if the callback hasn't been primed */ { + OstTraceFunctionEntry0( CABSESSION_CHECKCALLBACKAVAILABLEL_ENTRY ); TBool primed = !iMessage.IsNull(); - __LOG2("CABSession::CheckCallbackAvailableL() - [0x%08x] primed: %d", iClientSID.iId, static_cast(primed)); + OstTraceExt2(TRACE_NORMAL, CABSESSION_CHECKCALLBACKAVAILABLEL, "[0x%08x] primed: %d", iClientSID.iId, static_cast(primed)); if (iMisbehavingClient) { + OstTrace0(TRACE_ERROR, DUP1_CABSESSION_CHECKCALLBACKAVAILABLEL, "Leave: KErrAccessDenied"); User::Leave(KErrAccessDenied); } if (!primed) { + OstTrace0(TRACE_ERROR, DUP2_CABSESSION_CHECKCALLBACKAVAILABLEL, "Leave: KErrNotReady"); User::Leave(KErrNotReady); } + OstTraceFunctionExit0( CABSESSION_CHECKCALLBACKAVAILABLEL_EXIT ); } void CABSession::MakeCallbackAllSnapshotsSuppliedL() @@ -851,7 +905,8 @@ */ { - __LOG1("CABSession::MakeCallbackAllSnapshotsSuppliedL() - [0x%08x] Calling AllSnapshotsSuppliedL", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKALLSNAPSHOTSSUPPLIEDL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKALLSNAPSHOTSSUPPLIEDL, "[0x%08x] Calling AllSnapshotsSuppliedL", iClientSID.iId); TPckgC callbackPkg(EABCallbackAllSnapshotsSupplied); @@ -860,6 +915,7 @@ // Make the callback iMessage.WriteL(0, callbackPkg); MadeCallback(); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKALLSNAPSHOTSSUPPLIEDL_EXIT ); } void CABSession::MakeCallbackReceiveSnapshotDataL(TDriveNumber aDrive, TDesC8& aBuffer, @@ -872,7 +928,8 @@ @param aLastSection Flag to indicate to the client whether this is the last of a multipart snapshot */ { - __LOG1("CABSession::MakeCallbackReceiveSnapshotDataL() - [0x%08x] Calling ReceiveSnapshotData", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKRECEIVESNAPSHOTDATAL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKRECEIVESNAPSHOTDATAL, "[0x%08x] Calling ReceiveSnapshotData", iClientSID.iId); iSuppliedSnapshotDriveNum = aDrive; @@ -890,7 +947,8 @@ iMessage.WriteL(2, lastSectionPkg); MadeCallback(); - User::LeaveIfError(iABClientLeaveCode); + LEAVEIFERROR(iABClientLeaveCode, OstTrace1(TRACE_ERROR, DUP1_CABSESSION_MAKECALLBACKRECEIVESNAPSHOTDATAL, "Leave: %d", iABClientLeaveCode)); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKRECEIVESNAPSHOTDATAL_EXIT ); } TUint CABSession::MakeCallbackGetExpectedDataSizeL(TDriveNumber aDrive) @@ -901,7 +959,8 @@ @return The size of the data that will be transferred */ { - __LOG1("CABSession::MakeCallbackGetExpectedDataSizeL() - [0x%08x] Calling GetExpectedDataSize", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKGETEXPECTEDDATASIZEL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKGETEXPECTEDDATASIZEL, "[0x%08x] Calling GetExpectedDataSize", iClientSID.iId); TPckgC callbackPkg(EABCallbackGetExpectedDataSize); TPckgC drivePkg(aDrive); @@ -918,6 +977,7 @@ CheckCallbackAvailableL(); returnedSize = iMessage.Int3(); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKGETEXPECTEDDATASIZEL_EXIT ); return returnedSize; } @@ -930,7 +990,8 @@ @param aFinished Flag to indicate to the client whether this is the last of a multipart snapshot */ { - __LOG1("CABSession::MakeCallbackGetSnapshotDataL() - [0x%08x] Calling GetSnapshotData", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKGETSNAPSHOTDATAL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKGETSNAPSHOTDATAL, "[0x%08x] Calling GetSnapshotData", iClientSID.iId); TPckgC callbackPkg(EABCallbackGetSnapshotData); TPckgC drivePkg(aDrive); @@ -944,7 +1005,7 @@ iMessage.WriteL(2, drivePkg); MadeCallback(); - User::LeaveIfError(iABClientLeaveCode); + LEAVEIFERROR(iABClientLeaveCode, OstTrace1(TRACE_ERROR, DUP1_CABSESSION_MAKECALLBACKGETSNAPSHOTDATAL, "Leave: %d", iABClientLeaveCode)); // Read the buffer from the client CheckCallbackAvailableL(); @@ -954,6 +1015,7 @@ iMessage.ReadL(3, aBuffer); aFinished = iReceiveFromClientFinished; + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKGETSNAPSHOTDATAL_EXIT ); } void CABSession::MakeCallbackInitialiseGetBackupDataL(TDriveNumber aDrive) @@ -963,7 +1025,8 @@ @param aDrive the Drive Number */ { - __LOG1("CABSession::MakeCallbackInitialiseGetBackupDataL() - [0x%08x] Calling InitGetBackupData", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKINITIALISEGETBACKUPDATAL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKINITIALISEGETBACKUPDATAL, "[0x%08x] Calling InitGetBackupData", iClientSID.iId); TPckgC callbackPkg(EABCallbackInitialiseGetBackupData); TPckgC drivePkg(aDrive); @@ -975,7 +1038,8 @@ iMessage.WriteL(1, drivePkg); MadeCallback(); - User::LeaveIfError(iABClientLeaveCode); + LEAVEIFERROR(iABClientLeaveCode, OstTrace1(TRACE_ERROR, DUP1_CABSESSION_MAKECALLBACKINITIALISEGETBACKUPDATAL, "Leave: %d", iABClientLeaveCode)); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKINITIALISEGETBACKUPDATAL_EXIT ); } void CABSession::MakeCallbackGetBackupDataSectionL(TPtr8& aBuffer, TBool& aFinished) @@ -986,9 +1050,10 @@ @param aFinished Does the client have more data to send? */ { - __LOG2("CABSession::MakeCallbackGetBackupDataSectionL() - START - aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d", aBuffer.Ptr(), aBuffer.Length()); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKGETBACKUPDATASECTIONL_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CABSESSION_MAKECALLBACKGETBACKUPDATASECTIONL, "aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d", reinterpret_cast(aBuffer.Ptr()), static_cast(aBuffer.Length())); - __LOG1("CABSession::MakeCallbackGetBackupDataSectionL() - [0x%08x] Calling GetBackupDataSection", iClientSID.iId); + OstTrace1(TRACE_NORMAL, DUP1_CABSESSION_MAKECALLBACKGETBACKUPDATASECTIONL, "[0x%08x] Calling GetBackupDataSection", iClientSID.iId); TPckgC callbackPkg(EABCallbackGetBackupDataSection); TPckgC sizePkg(aBuffer.Size()); @@ -1000,17 +1065,16 @@ iMessage.WriteL(1, sizePkg); MadeCallback(); - User::LeaveIfError(iABClientLeaveCode); + LEAVEIFERROR(iABClientLeaveCode, OstTrace1(TRACE_ERROR, DUP3_CABSESSION_MAKECALLBACKGETBACKUPDATASECTIONL, "Leave: %d", iABClientLeaveCode)); CheckCallbackAvailableL(); TInt bufLength = iMessage.GetDesLengthL(3); aBuffer.SetLength(bufLength); iMessage.ReadL(3, aBuffer); aFinished = iReceiveFromClientFinished; - - //__LOGDATA("CABSession::MakeCallbackGetBackupDataSectionL() - received %S", aBuffer.Ptr(), aBuffer.Length()); - __LOG2("CABSession::MakeCallbackGetBackupDataSectionL() - END - aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d", aBuffer.Ptr(), aBuffer.Length()); + OstTraceExt2(TRACE_NORMAL, DUP2_CABSESSION_MAKECALLBACKGETBACKUPDATASECTIONL, "aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d", reinterpret_cast(aBuffer.Ptr()), static_cast(aBuffer.Length())); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKGETBACKUPDATASECTIONL_EXIT ); } void CABSession::MakeCallbackInitialiseRestoreBaseDataL(TDriveNumber aDrive) @@ -1020,7 +1084,8 @@ @param aDrive The drive that's affected by the operation */ { - __LOG1("CABSession::MakeCallbackInitialiseRestoreBaseDataL() - [0x%08x] Calling InitRestoreBaseData", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKINITIALISERESTOREBASEDATAL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKINITIALISERESTOREBASEDATAL, "[0x%08x] Calling InitRestoreBaseData", iClientSID.iId); TPckgC callbackPkg(EABCallbackInitialiseRestoreBaseDataSection); TPckgC drivePkg(aDrive); @@ -1032,7 +1097,8 @@ iMessage.WriteL(1, drivePkg); MadeCallback(); - User::LeaveIfError(iABClientLeaveCode); + LEAVEIFERROR(iABClientLeaveCode, OstTrace1(TRACE_ERROR, DUP1_CABSESSION_MAKECALLBACKINITIALISERESTOREBASEDATAL, "Leave: %d", iABClientLeaveCode)); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKINITIALISERESTOREBASEDATAL_EXIT ); } void CABSession::MakeCallbackRestoreBaseDataSectionL(TDesC8& aBuffer, TBool aFinished) @@ -1043,7 +1109,8 @@ @param aFinished Is this the last of a multi-part data call */ { - __LOG1("CABSession::MakeCallbackRestoreBaseDataSectionL() - [0x%08x] Calling RestoreBaseDataSection", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKRESTOREBASEDATASECTIONL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKRESTOREBASEDATASECTIONL, "[0x%08x] Calling RestoreBaseDataSection", iClientSID.iId); TPckgC callbackPkg(EABCallbackRestoreBaseDataSection); TPckgC sizePkg(aBuffer.Size()); @@ -1059,7 +1126,8 @@ iMessage.WriteL(2, lastSectionPkg); MadeCallback(); - User::LeaveIfError(iABClientLeaveCode); + LEAVEIFERROR(iABClientLeaveCode, OstTrace1(TRACE_ERROR, DUP1_CABSESSION_MAKECALLBACKRESTOREBASEDATASECTIONL, "Leave: %d", iABClientLeaveCode)); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKRESTOREBASEDATASECTIONL_EXIT ); } void CABSession::MakeCallbackInitialiseRestoreIncrementDataL(TDriveNumber aDrive) @@ -1069,7 +1137,8 @@ @param aDrive The drive that's affected by the operation */ { - __LOG1("CABSession::MakeCallbackInitialiseRestoreIncrementDataL() - [0x%08x] Calling InitRestoreIncrementData", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKINITIALISERESTOREINCREMENTDATAL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKINITIALISERESTOREINCREMENTDATAL, "[0x%08x] Calling InitRestoreIncrementData", iClientSID.iId); TPckgC callbackPkg(EABCallbackInitialiseRestoreIncrementData); TPckgC drivePkg(aDrive); @@ -1081,7 +1150,8 @@ iMessage.WriteL(1, drivePkg); MadeCallback(); - User::LeaveIfError(iABClientLeaveCode); + LEAVEIFERROR(iABClientLeaveCode, OstTrace1(TRACE_ERROR, DUP1_CABSESSION_MAKECALLBACKINITIALISERESTOREINCREMENTDATAL, "Leave: %d", iABClientLeaveCode)); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKINITIALISERESTOREINCREMENTDATAL_EXIT ); } void CABSession::MakeCallbackRestoreIncrementDataSectionL(TDesC8& aBuffer, TBool aFinished) @@ -1092,7 +1162,8 @@ @param aFinished Is this the last of a multi-part data call */ { - __LOG1("CABSession::MakeCallbackRestoreIncrementDataSectionL() - [0x%08x] Calling RestoreIncrementData", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKRESTOREINCREMENTDATASECTIONL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKRESTOREINCREMENTDATASECTIONL, "[0x%08x] Calling RestoreIncrementData", iClientSID.iId); TPckgC callbackPkg(EABCallbackRestoreIncrementDataSection); TPckgC sizePkg(aBuffer.Size()); @@ -1108,7 +1179,8 @@ iMessage.WriteL(2, lastSectionPkg); MadeCallback(); - User::LeaveIfError(iABClientLeaveCode); + LEAVEIFERROR(iABClientLeaveCode, OstTrace1(TRACE_ERROR, DUP1_CABSESSION_MAKECALLBACKRESTOREINCREMENTDATASECTIONL, "Leave: %d", iABClientLeaveCode)); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKRESTOREINCREMENTDATASECTIONL_EXIT ); } void CABSession::MakeCallbackRestoreCompleteL(TDriveNumber aDrive) @@ -1118,7 +1190,8 @@ @param aDrive The drive that's affected by the operation */ { - __LOG1("CABSession::MakeCallbackRestoreCompleteL() - [0x%08x] Calling RestoreComplete", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKRESTORECOMPLETEL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKRESTORECOMPLETEL, "[0x%08x] Calling RestoreComplete", iClientSID.iId); TPckgC callbackPkg(EABCallbackRestoreComplete); TPckgC drivePkg(aDrive); @@ -1129,6 +1202,7 @@ iMessage.WriteL(0, callbackPkg); iMessage.WriteL(1, drivePkg); MadeCallback(); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKRESTORECOMPLETEL_EXIT ); } void CABSession::MakeCallbackInitialiseGetProxyBackupDataL(TSecureId aSID, TDriveNumber aDrive) @@ -1139,7 +1213,8 @@ @param aDrive The drive that's affected by the operation */ { - __LOG1("CABSession::MakeCallbackInitialiseGetProxyBackupDataL() - [0x%08x] Calling InitGetProxyBackupData", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKINITIALISEGETPROXYBACKUPDATAL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKINITIALISEGETPROXYBACKUPDATAL, "[0x%08x] Calling InitGetProxyBackupData", iClientSID.iId); TPckgC callbackPkg(EABCallbackInitialiseGetProxyBackupData); TPckgC sidPkg(aSID); @@ -1153,7 +1228,8 @@ iMessage.WriteL(2, drivePkg); MadeCallback(); - User::LeaveIfError(iABClientLeaveCode); + LEAVEIFERROR(iABClientLeaveCode, OstTrace1(TRACE_ERROR, DUP1_CABSESSION_MAKECALLBACKINITIALISEGETPROXYBACKUPDATAL, "Leave: %d", iABClientLeaveCode)); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKINITIALISEGETPROXYBACKUPDATAL_EXIT ); } void CABSession::MakeCallbackInitialiseRestoreProxyBaseDataL(TSecureId aSID, TDriveNumber aDrive) @@ -1164,7 +1240,8 @@ @param aDrive The drive that's affected by the operation */ { - __LOG1("CABSession::MakeCallbackInitialiseRestoreProxyBaseDataL() - [0x%08x] Calling InitRestoreProxyBaseData", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKINITIALISERESTOREPROXYBASEDATAL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKINITIALISERESTOREPROXYBASEDATAL, "[0x%08x] Calling InitRestoreProxyBaseData", iClientSID.iId); TPckgC callbackPkg(EABCallbackInitialiseRestoreProxyBaseData); TPckgC sidPkg(aSID); @@ -1178,7 +1255,8 @@ iMessage.WriteL(2, drivePkg); MadeCallback(); - User::LeaveIfError(iABClientLeaveCode); + LEAVEIFERROR(iABClientLeaveCode, OstTrace1(TRACE_ERROR, DUP1_CABSESSION_MAKECALLBACKINITIALISERESTOREPROXYBASEDATAL, "Leave: %d", iABClientLeaveCode)); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKINITIALISERESTOREPROXYBASEDATAL_EXIT ); } void CABSession::MakeCallbackTerminateMultiStageOperationL() @@ -1187,7 +1265,8 @@ */ { - __LOG1("CABSession::MakeCallbackTerminateMultiStageOperationL() - [0x%08x] Calling TermiateMultiStageOp", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKTERMINATEMULTISTAGEOPERATIONL_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKTERMINATEMULTISTAGEOPERATIONL, "[0x%08x] Calling TermiateMultiStageOp", iClientSID.iId); TPckgC callbackPkg(EABCallbackTerminateMultiStageOperation); @@ -1196,6 +1275,7 @@ CheckCallbackAvailableL(); iMessage.WriteL(0, callbackPkg); MadeCallback(); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKTERMINATEMULTISTAGEOPERATIONL_EXIT ); } TUint CABSession::MakeCallbackGetDataChecksumL(TDriveNumber aDrive) @@ -1206,7 +1286,8 @@ @return The checksum of the data */ { - __LOG1("CABSession::MakeCallbackGetDataChecksumL() - [0x%08x] Calling GetDataChecksum", iClientSID.iId); + OstTraceFunctionEntry0( CABSESSION_MAKECALLBACKGETDATACHECKSUML_ENTRY ); + OstTrace1(TRACE_NORMAL, CABSESSION_MAKECALLBACKGETDATACHECKSUML, "[0x%08x] Calling GetDataChecksum", iClientSID.iId); TPckgC callbackPkg(EABCallbackGetDataChecksum); TPckgC drivePkg(aDrive); @@ -1221,7 +1302,9 @@ iMessage.ReadL(3, returnPkg); - return returnPkg(); + TUint ret = returnPkg(); + OstTraceFunctionExit0( CABSESSION_MAKECALLBACKGETDATACHECKSUML_EXIT ); + return ret; } void CABSession::SetInvalid() diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/absessionmap.cpp --- a/backupandrestore/backupengine/src/absessionmap.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/absessionmap.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,10 +23,14 @@ #include "absessionmap.h" #include "sbedataowner.h" #include "sbepanic.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "absessionmapTraces.h" +#endif namespace conn - { - + { CABSessionElement::CABSessionElement(TSecureId aSecureId) : iKey(aSecureId), iValue(NULL) /** Class Constructor @@ -34,6 +38,8 @@ @param aSecureId The secure Id of the data owner that the session has been created for */ { + OstTraceFunctionEntry0( CABSESSIONELEMENT_CABSESSIONELEMENT_CONS_ENTRY ); + OstTraceFunctionExit0( CABSESSIONELEMENT_CABSESSIONELEMENT_CONS_EXIT ); } CABSessionElement::~CABSessionElement() @@ -41,6 +47,8 @@ Class destructor */ { + OstTraceFunctionEntry0( CABSESSIONELEMENT_CABSESSIONELEMENT_DES_ENTRY ); + OstTraceFunctionExit0( CABSESSIONELEMENT_CABSESSIONELEMENT_DES_EXIT ); } CABSessionElement* CABSessionElement::NewL(TSecureId aSecureId) @@ -49,10 +57,12 @@ @param aSecureId The secure Id of the data owner that the session has been created for */ { + OstTraceFunctionEntry0( CABSESSIONELEMENT_NEWL_ENTRY ); CABSessionElement* self = new (ELeave) CABSessionElement(aSecureId); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CABSESSIONELEMENT_NEWL_EXIT ); return self; } @@ -61,8 +71,10 @@ Create the session for the data owner specified by iKey */ { + OstTraceFunctionEntry0( CABSESSIONELEMENT_CONSTRUCTL_ENTRY ); // Note that the server takes ownership of the session, not this object iValue = CABSession::NewL(iKey); + OstTraceFunctionExit0( CABSESSIONELEMENT_CONSTRUCTL_EXIT ); } CABSessionMap* CABSessionMap::NewL() @@ -72,7 +84,9 @@ @return Pointer to a created CABSessionMap object */ { + OstTraceFunctionEntry0( CABSESSIONMAP_NEWL_ENTRY ); CABSessionMap* self = new (ELeave) CABSessionMap; + OstTraceFunctionExit0( CABSESSIONMAP_NEWL_EXIT ); return self; } @@ -84,11 +98,15 @@ @return Reference to the created session */ { + OstTraceFunctionEntry0( CABSESSIONMAP_CREATEL_ENTRY ); CABSessionElement* element = CABSessionElement::NewL(aSecureId); CleanupStack::PushL(element); iMapElements.AppendL(element); CleanupStack::Pop(element); - return element->Value(); + + CABSession& session = element->Value(); + OstTraceFunctionExit0( CABSESSIONMAP_CREATEL_EXIT ); + return session; } void CABSessionMap::Delete(TSecureId aSecureId) @@ -98,6 +116,7 @@ @param aSecureId The key to the session to be deleted */ { + OstTraceFunctionEntry0( CABSESSIONMAP_DELETE_ENTRY ); TInt count = iMapElements.Count(); for (TInt index = 0; index < count; index++) @@ -110,6 +129,7 @@ break; } } + OstTraceFunctionExit0( CABSESSIONMAP_DELETE_EXIT ); } CABSession& CABSessionMap::SessionL(TSecureId aSecureId) @@ -121,6 +141,7 @@ @return The session that the DO with SID aSecureId is connected to */ { + OstTraceFunctionEntry0( CABSESSIONMAP_SESSIONL_ENTRY ); TInt count = iMapElements.Count(); CABSession* pSession = NULL; @@ -136,9 +157,11 @@ if (!pSession) { + OstTrace0(TRACE_ERROR, CABSESSIONMAP_SESSIONL, "Leave: KErrNotFound"); User::Leave(KErrNotFound); } + OstTraceFunctionExit0( CABSESSIONMAP_SESSIONL_EXIT ); return *pSession; } @@ -147,6 +170,8 @@ Class Constructor */ { + OstTraceFunctionEntry0( CABSESSIONMAP_CABSESSIONMAP_CONS_ENTRY ); + OstTraceFunctionExit0( CABSESSIONMAP_CABSESSIONMAP_CONS_EXIT ); } CABSessionMap::~CABSessionMap() @@ -154,8 +179,10 @@ Class destructor */ { + OstTraceFunctionEntry0( CABSESSIONMAP_CABSESSIONMAP_DES_ENTRY ); iMapElements.ResetAndDestroy(); iMapElements.Close(); + OstTraceFunctionExit0( CABSESSIONMAP_CABSESSIONMAP_DES_EXIT ); } void CABSessionMap::InvalidateABSessions() @@ -163,6 +190,7 @@ Set each CABSession currently hold in the map as invalid */ { + OstTraceFunctionEntry0( CABSESSIONMAP_INVALIDATEABSESSIONS_ENTRY ); TInt count = iMapElements.Count(); CABSession* pSession = NULL; @@ -174,5 +202,6 @@ pSession->SetInvalid(); } } + OstTraceFunctionExit0( CABSESSIONMAP_INVALIDATEABSESSIONS_EXIT ); } } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbebufferhandler.cpp --- a/backupandrestore/backupengine/src/sbebufferhandler.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbebufferhandler.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,8 +21,12 @@ #include "sbebufferhandler.h" -#include "sblog.h" #include "sbepanic.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbebufferhandlerTraces.h" +#endif namespace conn { @@ -36,6 +40,7 @@ @return ETrue if read succesfully. EFalse if a retry is needed. */ { + OstTraceFunctionEntry0( _CONN_READFROMBUFFERF_ENTRY ); static TBuf8 SBuffer; // Static buffer used for buffering! TBool ret = EFalse; @@ -79,6 +84,7 @@ SBuffer.SetLength(0); } + OstTraceFunctionExit0( _CONN_READFROMBUFFERF_EXIT ); return ret; } @@ -96,6 +102,7 @@ @return ETrue on success. EFalse on failure. */ { + OstTraceFunctionEntry0( _CONN_WRITETOBUFFERF_ENTRY ); TBool ret = EFalse; if ((aPtr.MaxSize() - aPtr.Size()) >= static_cast(sizeof(T))) @@ -104,6 +111,7 @@ ret = ETrue; } // if + OstTraceFunctionExit0( _CONN_WRITETOBUFFERF_EXIT ); return ret; } @@ -117,6 +125,7 @@ @return ETrue on success. EFalse on failure. */ { + OstTraceFunctionEntry0( _CONN_READFROMBUFFERV_ENTRY ); TBool ret = EFalse; // Does into already contain data? @@ -143,6 +152,7 @@ } // else } // else + OstTraceFunctionExit0( _CONN_READFROMBUFFERV_EXIT ); return ret; } @@ -157,6 +167,7 @@ @return ETrue on success. EFalse on failure. */ { + OstTraceFunctionEntry0( _CONN_WRITETOBUFFERV_ENTRY ); TBool ret = EFalse; if ((aBuffer.MaxSize() - aBuffer.Size()) >= aSize) @@ -166,6 +177,7 @@ } // if + OstTraceFunctionExit0( _CONN_WRITETOBUFFERV_EXIT ); return ret; } @@ -177,11 +189,13 @@ @return a CBufferFileWriter. */ { + OstTraceFunctionEntry0( CBUFFERFILEWRITER_NEWL_ENTRY ); CBufferFileWriter* self = new(ELeave) CBufferFileWriter(aFs, aFileNames); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CBUFFERFILEWRITER_NEWL_EXIT ); return self; } // NewL @@ -192,14 +206,18 @@ @param aFs an RFS to use in this class. */ { + OstTraceFunctionEntry0( CBUFFERFILEWRITER_CBUFFERFILEWRITER_CONS_ENTRY ); + OstTraceFunctionExit0( CBUFFERFILEWRITER_CBUFFERFILEWRITER_CONS_EXIT ); } // CBufferFileWriter CBufferFileWriter::~CBufferFileWriter() /** Standard C++ destructor */ { + OstTraceFunctionEntry0( CBUFFERFILEWRITER_CBUFFERFILEWRITER_DES_ENTRY ); delete iFileNames; iFileHandle.Close(); + OstTraceFunctionExit0( CBUFFERFILEWRITER_CBUFFERFILEWRITER_DES_EXIT ); } void CBufferFileWriter::ConstructL() @@ -208,18 +226,18 @@ @param aFileNames list of files to write */ { - #if defined(SBE_LOGGING_ENABLED) + OstTraceFunctionEntry0( CBUFFERFILEWRITER_CONSTRUCTL_ENTRY ); if (iFileNames) { TUint count = iFileNames->Count(); while(count--) { const TDesC& fileName = (*iFileNames)[count]; - __LOG2("CBufferFileWriter::ConstructL() - file[%04d] is: %S", count, &fileName); + OstTraceExt2(TRACE_NORMAL, CBUFFERFILEWRITER_CONSTRUCTL, "file[%04d] is: %S", static_cast(count), fileName); } } - #endif + OstTraceFunctionExit0( CBUFFERFILEWRITER_CONSTRUCTL_EXIT ); } void CBufferFileWriter::StartL(TPtr8& aBuffer, TBool& aCompleted) @@ -229,9 +247,9 @@ @param aCompleted on return if we have finished. */ { - __LOG("CBufferFileWriter::StartL() - START"); - WriteToBufferL(aBuffer, aCompleted); - __LOG("CBufferFileWriter::StartL() - END"); + OstTraceFunctionEntry0( CBUFFERFILEWRITER_STARTL_ENTRY ); + WriteToBufferL(aBuffer, aCompleted); + OstTraceFunctionExit0( CBUFFERFILEWRITER_STARTL_EXIT ); } // StartL void CBufferFileWriter::ContinueL(TPtr8& aBuffer, TBool& aCompleted) @@ -241,9 +259,9 @@ @param aCompleted on return if we have finished. */ { - __LOG("CBufferFileWriter::ContinueL() - START"); - WriteToBufferL(aBuffer, aCompleted); - __LOG("CBufferFileWriter::ContinueL() - END"); + OstTraceFunctionEntry0( CBUFFERFILEWRITER_CONTINUEL_ENTRY ); + WriteToBufferL(aBuffer, aCompleted); + OstTraceFunctionExit0( CBUFFERFILEWRITER_CONTINUEL_EXIT ); } void CBufferFileWriter::WriteToBufferL(TPtr8& aBuffer, TBool& aCompleted) @@ -253,6 +271,7 @@ @param aCompleted on return if we have finished. */ { + OstTraceFunctionEntry0( CBUFFERFILEWRITER_WRITETOBUFFERL_ENTRY ); aCompleted = EFalse; const TUint count = iFileNames->Count(); @@ -264,13 +283,13 @@ if (name.Right(1) == KTrailingBackSlash() ) { // Directory entry - __LOG1("CBufferFileWriter::WriteToBufferL() - empty directory: %S ", &name); + OstTraceExt1(TRACE_NORMAL, CBUFFERFILEWRITER_WRITETOBUFFERL, "empty directory: %S ", name); if(!iHeaderWritten) { TFileFixedHeader header(name.Length(), 0, 0, 0); if (WriteToBufferF(header, aBuffer) == EFalse) { - __LOG("CBufferFileReader::WriteToBufferL() - WriteToBufferF() returned False so breaking!"); + OstTrace0(TRACE_NORMAL, DUP1_CBUFFERFILEWRITER_WRITETOBUFFERL, "WriteToBufferF() returned False so breaking!"); break; } iHeaderWritten = ETrue; @@ -280,7 +299,7 @@ if (WriteToBufferV(ptr, ptr.Size(), aBuffer) == EFalse) { - __LOG("CBufferFileReader::WriteToBufferL() - WriteToBufferV() returned False so breaking!"); + OstTrace0(TRACE_NORMAL, DUP2_CBUFFERFILEWRITER_WRITETOBUFFERL, "WriteToBufferV() returned False so breaking!"); break; } @@ -291,11 +310,11 @@ { if (!iFileOpen) // File needs to be opened { - __LOG1("CBufferFileWriter::WriteToBufferL() - trying to open: %S for reading", &name); + OstTraceExt1(TRACE_NORMAL, DUP3_CBUFFERFILEWRITER_WRITETOBUFFERL, "trying to open: %S for reading", name); const TInt error = iFileHandle.Open(iFs, name, EFileRead | EFileShareReadersOnly); if (error != KErrNone) { - __LOG2("CBufferFileWriter::WriteToBufferL() - opening: %S for reading failed with error: %d", &name, error); + OstTraceExt2(TRACE_ERROR, DUP4_CBUFFERFILEWRITER_WRITETOBUFFERL, "opening: %S for reading failed with error: %d", name, error); User::Leave(error); } @@ -307,17 +326,17 @@ // File size TInt size; TInt err = iFileHandle.Size(size); - __LOG2("CBufferFileWriter::WriteToBufferL() - size of file is: %d (err: %d)", size, err); + OstTraceExt2(TRACE_NORMAL, DUP5_CBUFFERFILEWRITER_WRITETOBUFFERL, "size of file is: %d (err: %d)", size, err); TUint att; err = iFileHandle.Att(att); - __LOG2("CBufferFileWriter::WriteToBufferL() - attributes: %d (err: %d)", size, err); + OstTraceExt2(TRACE_NORMAL, DUP6_CBUFFERFILEWRITER_WRITETOBUFFERL, "attributes: %d (err: %d)", att, err); TTime modified; - err = iFileHandle.Modified(modified); - __LOG2("CBufferFileWriter::WriteToBufferL() - modified: %d (err: %d)", size, err); + err = iFileHandle.Modified(modified); + OstTraceExt4(TRACE_NORMAL, DUP7_CBUFFERFILEWRITER_WRITETOBUFFERL, "modified: %d-%d-%d (err: %d)", static_cast(modified.DateTime().Year()), static_cast(modified.DateTime().Month() + 1), static_cast(modified.DateTime().Day()), err); TFileFixedHeader header((*iFileNames)[iCurrentFile].Length(), size, att, modified.Int64()); if (WriteToBufferF(header, aBuffer) == EFalse) { - __LOG("CBufferFileReader::WriteToBufferL() - WriteToBufferF() returned False so breaking!"); + OstTrace0(TRACE_NORMAL, DUP8_CBUFFERFILEWRITER_WRITETOBUFFERL, "WriteToBufferF() returned False so breaking!"); break; } @@ -332,13 +351,13 @@ if (WriteToBufferV(ptr, ptr.Size(), aBuffer) == EFalse) { - __LOG("CBufferFileReader::WriteToBufferV() - WriteToBufferF() returned False so breaking!"); + OstTrace0(TRACE_NORMAL, DUP9_CBUFFERFILEWRITER_WRITETOBUFFERL, "WriteToBufferF() returned False so breaking!"); break; } iFileNameWritten = ETrue; } - __LOG1("CBufferFileWriter::WriteToBufferL() - buffer is of length: %d", aBuffer.Length()); + OstTrace1(TRACE_NORMAL, DUP10_CBUFFERFILEWRITER_WRITETOBUFFERL, "buffer is of length: %d", aBuffer.Length()); TInt bufferLeft = aBuffer.MaxSize() - aBuffer.Size(); TPtr8 ptr(const_cast(aBuffer.Ptr()) + aBuffer.Size(), bufferLeft); @@ -347,24 +366,26 @@ TInt fileLeft = fileSize - iOffset; if (bufferLeft < fileLeft) { - __LOG("CBufferFileWriter::WriteToBufferL() - buffer space available is less than file size!"); + OstTrace0(TRACE_NORMAL, DUP11_CBUFFERFILEWRITER_WRITETOBUFFERL, "buffer space available is less than file size!"); // Write buffer size - User::LeaveIfError(iFileHandle.Read(iOffset, ptr, bufferLeft)); // TODO: Is this correct? + TInt err = iFileHandle.Read(iOffset, ptr, bufferLeft); // TODO: Is this correct? + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP14_CBUFFERFILEWRITER_WRITETOBUFFERL, "Leave: %d", err)); aBuffer.SetLength(aBuffer.Length() + bufferLeft); iOffset += bufferLeft; break; } // if else { - __LOG("CBufferFileWriter::WriteToBufferL() - enough space in buffer for whole file..."); + OstTrace0(TRACE_NORMAL, DUP12_CBUFFERFILEWRITER_WRITETOBUFFERL, "enough space in buffer for whole file..."); // Write file size - User::LeaveIfError(iFileHandle.Read(ptr, fileLeft)); // TODO: Is this correct? + TInt err = iFileHandle.Read(ptr, fileLeft); // TODO: Is this correct? + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP15_CBUFFERFILEWRITER_WRITETOBUFFERL, "Leave: %d", err)); aBuffer.SetLength(aBuffer.Length() + fileLeft); } // else - __LOG1("CBufferFileWriter::WriteToBufferL() - After read from file, buffer is now of length: %d", aBuffer.Length()); + OstTrace1(TRACE_NORMAL, DUP13_CBUFFERFILEWRITER_WRITETOBUFFERL, "After read from file, buffer is now of length: %d", aBuffer.Length()); iFileHandle.Close(); iFileOpen = EFalse; @@ -379,6 +400,7 @@ { aCompleted = ETrue; } // if + OstTraceFunctionExit0( CBUFFERFILEWRITER_WRITETOBUFFERL_EXIT ); } // WriteToBufferL CBufferFileReader* CBufferFileReader::NewL(RFs& aFs, RSnapshots* apSnapshots, MValidationHandler* aValidationHandler) @@ -388,29 +410,26 @@ @param apSnapshots list of snapshots. */ { - __LOG("CBufferFileReader::NewL() - START"); + OstTraceFunctionEntry0( CBUFFERFILEREADER_NEWL_ENTRY ); CBufferFileReader* self = new(ELeave) CBufferFileReader(aFs, apSnapshots, aValidationHandler); CleanupStack::PushL( self ); - #ifdef SBE_LOGGING_ENABLED if (apSnapshots) { const TInt count = apSnapshots->Count(); - __LOG1("CBufferFileReader::NewL() - Got %d snapshots to compare against during restore...", count); + OstTrace1(TRACE_NORMAL, CBUFFERFILEREADER_NEWL, "Got %d snapshots to compare against during restore...", count); for(TInt x = 0; x < count; ++x) { const TDesC& snapshot = (*apSnapshots)[x]->FileName(); - __LOG3("CBufferFileReader::NewL() - snapshot[%4d/%4d] is: %S", x+1, count, &snapshot); + OstTraceExt3(TRACE_NORMAL, DUP1_CBUFFERFILEREADER_NEWL, "snapshot[%4d/%4d] is: %S", x+1, count, snapshot); } // for x } - #endif - - __LOG("CBufferFileReader::NewL() - END"); CleanupStack::Pop( self ); + OstTraceFunctionExit0( CBUFFERFILEREADER_NEWL_EXIT ); return self; } // NewL @@ -422,6 +441,8 @@ @param apSnapshots list of snapshots. */ { + OstTraceFunctionEntry0( CBUFFERFILEREADER_CBUFFERFILEREADER_CONS_ENTRY ); + OstTraceFunctionExit0( CBUFFERFILEREADER_CBUFFERFILEREADER_CONS_EXIT ); } // CBufferFileReader void CBufferFileReader::StartL(const TDesC8& aBuffer, TBool aLastSection) @@ -431,13 +452,13 @@ @param aLastSection Is this the last section? */ { - __LOG("CBufferFileReader::StartL() - START"); + OstTraceFunctionEntry0( CBUFFERFILEREADER_STARTL_ENTRY ); if (iSnapshots) { iSnapshots->Sort(CSnapshot::Compare); } - ReadFromBufferL(aBuffer, aLastSection); - __LOG("CBufferFileReader::StartL() - END"); + ReadFromBufferL(aBuffer, aLastSection); + OstTraceFunctionExit0( CBUFFERFILEREADER_STARTL_EXIT ); } // StartL void CBufferFileReader::ContinueL(const TDesC8& aBuffer, TBool aLastSection) @@ -447,9 +468,9 @@ @param aLastSection Is this the last section? */ { - __LOG("CBufferFileReader::ContinueL() - START"); - ReadFromBufferL(aBuffer, aLastSection); - __LOG("CBufferFileReader::ContinueL() - END"); + OstTraceFunctionEntry0( CBUFFERFILEREADER_CONTINUEL_ENTRY ); + ReadFromBufferL(aBuffer, aLastSection); + OstTraceFunctionExit0( CBUFFERFILEREADER_CONTINUEL_EXIT ); } // ContinueL void CBufferFileReader::CheckFileInSnapshotL() @@ -457,7 +478,8 @@ Checks to see if a given file is in a snapshot. */ { - __LOG2("CBufferFileReader::CheckFileInSnapshot() - START - ipSnapshots: 0x%08x, iSnapshotChecked: %d", iSnapshots, iSnapshotChecked); + OstTraceFunctionEntry0( CBUFFERFILEREADER_CHECKFILEINSNAPSHOTL_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CBUFFERFILEREADER_CHECKFILEINSNAPSHOTL, "ipSnapshots: 0x%08x, iSnapshotChecked: %d", reinterpret_cast(iSnapshots), static_cast(iSnapshotChecked)); iRestore = ETrue; @@ -474,7 +496,8 @@ iSnapshotChecked = ETrue; - __LOG2("CBufferFileReader::CheckFileInSnapshot() - END - iSnapshotChecked: %d, iRestore: %d", iSnapshotChecked, iRestore); + OstTraceExt2(TRACE_NORMAL, DUP1_CBUFFERFILEREADER_CHECKFILEINSNAPSHOTL, "iSnapshotChecked: %d, iRestore: %d", iSnapshotChecked, iRestore); + OstTraceFunctionExit0( CBUFFERFILEREADER_CHECKFILEINSNAPSHOTL_EXIT ); } void CBufferFileReader::RecreateDirL() @@ -482,16 +505,17 @@ Recreates a directory path on disk. */ { - __LOG1("CBufferFileReader::RecreateDirL() - START - iFileName: %S", &iFileName); + OstTraceFunctionEntry0( CBUFFERFILEREADER_RECREATEDIRL_ENTRY ); + OstTraceExt1(TRACE_NORMAL, CBUFFERFILEREADER_RECREATEDIRL, "iFileName: %S", iFileName); // Create the path TInt err = iFs.MkDirAll(iFileName); if ((err != KErrNone) && (err != KErrAlreadyExists)) { - __LOG1("CBufferFileReader::WriteToFile() - making directory resulted in fatal error: %d", err); + OstTrace1(TRACE_ERROR, DUP1_CBUFFERFILEREADER_RECREATEDIRL, "making directory resulted in fatal error: %d", err); User::Leave(err); } // if - __LOG("CBufferFileReader::RecreateDirL() - END"); + OstTraceFunctionExit0( CBUFFERFILEREADER_RECREATEDIRL_EXIT ); } @@ -500,12 +524,13 @@ Recreates a file on disk. Deletes the original if it still exists. */ { - __LOG1("CBufferFileReader::RecreateFileL() - START - iFileName: %S", &iFileName); + OstTraceFunctionEntry0( CBUFFERFILEREADER_RECREATEFILEL_ENTRY ); + OstTraceExt1(TRACE_NORMAL, CBUFFERFILEREADER_RECREATEFILEL, "iFileName: %S", iFileName); // Create the path TInt err = iFs.MkDirAll(iFileName); if ((err != KErrNone) && (err != KErrAlreadyExists)) { - __LOG1("CBufferFileReader::WriteToFile() - making directory resulted in fatal error: %d", err); + OstTrace1(TRACE_ERROR, DUP1_CBUFFERFILEREADER_RECREATEFILEL, "making directory resulted in fatal error: %d", err); User::Leave(err); } // if @@ -523,8 +548,8 @@ } err = iFileHandle.Replace(iFs, iFileName, EFileWrite); - __LOG1("CBufferFileReader::WriteToFile() - replacing file returned err: %d", err); - User::LeaveIfError( err ); + OstTrace1(TRACE_NORMAL, DUP2_CBUFFERFILEREADER_RECREATEFILEL, "CBufferFileReader::WriteToFile() - replacing file returned err: %d", err); + LEAVEIFERROR( err, OstTrace1(TRACE_ERROR, DUP3_CBUFFERFILEREADER_RECREATEFILEL, "Leave: %d", err) ); if(isReadOnly) { @@ -532,8 +557,8 @@ iFs.SetAtt(iFileName, entry.iAtt, ~entry.iAtt); } - iFileOpen = ETrue; - __LOG("CBufferFileReader::RecreateFileL() - END"); + iFileOpen = ETrue; + OstTraceFunctionExit0( CBUFFERFILEREADER_RECREATEFILEL_EXIT ); } @@ -546,25 +571,26 @@ @return ETrue if write finished. EFalse if there is more data to write. */ { - __LOG2("CBufferFileReader::WriteToFile() - START - iFileHandle: 0x%08x, iFixedHeader.iFileSize: %d", iFileHandle.SubSessionHandle(), iFixedHeader.iFileSize); + OstTraceFunctionEntry0( CBUFFERFILEREADER_WRITETOFILEL_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CBUFFERFILEREADER_WRITETOFILEL, "iFileHandle: 0x%08x, iFixedHeader.iFileSize: %d", iFileHandle.SubSessionHandle(), iFixedHeader.iFileSize); TBool retVal = ETrue; TInt filesize; const TInt err1 = iFileHandle.Size(filesize); - __LOG2("CBufferFileReader::WriteToFile() - fileSize: %d (err: %d)", filesize, err1); - User::LeaveIfError(err1); + OstTraceExt2(TRACE_NORMAL, DUP1_CBUFFERFILEREADER_WRITETOFILEL, "fileSize: %d (err: %d)", filesize, err1); + LEAVEIFERROR(err1, OstTrace1(TRACE_ERROR, DUP6_CBUFFERFILEREADER_WRITETOFILEL, "Leave: %d", err1)); if ((aEnd - aCurrent) >= (iFixedHeader.iFileSize - filesize)) { TPtr8 ptr(aCurrent, iFixedHeader.iFileSize -filesize, iFixedHeader.iFileSize - filesize); const TInt err2 = iFileHandle.Write(ptr); - __LOG2("CBufferFileReader::WriteToFile() - writing %d bytes returned error: %d", ptr.Length(), err2); - User::LeaveIfError(err2); + OstTraceExt2(TRACE_NORMAL, DUP2_CBUFFERFILEREADER_WRITETOFILEL, "writing %d bytes returned error: %d", ptr.Length(), err2); + LEAVEIFERROR(err2, OstTrace1(TRACE_ERROR, DUP7_CBUFFERFILEREADER_WRITETOFILEL, "Leave: %d", err2)); // Write the attributes & modified time const TInt err3 = iFileHandle.Set(iFixedHeader.iModified, iFixedHeader.iAttributes, KEntryAttNormal); - __LOG1("CBufferFileReader::WriteToFile() - setting attribs returned error: %d", err3); - User::LeaveIfError(err3); + OstTrace1(TRACE_NORMAL, DUP3_CBUFFERFILEREADER_WRITETOFILEL, "setting attribs returned error: %d", err3); + LEAVEIFERROR(err3, OstTrace1(TRACE_ERROR, DUP8_CBUFFERFILEREADER_WRITETOFILEL, "Leave: %d", err3)); // Move current along aCurrent += iFixedHeader.iFileSize - filesize; @@ -577,12 +603,13 @@ TInt size = aEnd - aCurrent; TPtr8 ptr(aCurrent, size, size); const TInt err2 = iFileHandle.Write(ptr); - __LOG2("CBufferFileReader::WriteToFile() - writing %d bytes returned error: %d", ptr.Length(), err2); + OstTraceExt2(TRACE_NORMAL, DUP4_CBUFFERFILEREADER_WRITETOFILEL, "writing %d bytes returned error: %d", ptr.Length(), err2); retVal = EFalse; } // else - __LOG1("CBufferFileReader::WriteToFile() - END - finished: %d", retVal); + OstTrace1(TRACE_NORMAL, DUP5_CBUFFERFILEREADER_WRITETOFILEL, "finished: %d", retVal); + OstTraceFunctionExit0( CBUFFERFILEREADER_WRITETOFILEL_EXIT ); return retVal; } @@ -594,7 +621,8 @@ @leave KErrUnderflow More data is needed. */ { - __LOG5("CBufferFileReader::ReadFromBufferL() - START - iFileNameRead: %d, iSnapshotChecked: %d, iRestore: %d, iFileOpen: %d, iFileName: %S", iFileNameRead, iSnapshotChecked, iRestore, iFileOpen, &iFileName); + OstTraceFunctionEntry0( CBUFFERFILEREADER_READFROMBUFFERL_ENTRY ); + OstTraceExt5(TRACE_NORMAL, CBUFFERFILEREADER_READFROMBUFFERL, "iFileNameRead: %d, iSnapshotChecked: %d, iRestore: %d, iFileOpen: %d, iFileName: %S", iFileNameRead, iSnapshotChecked, iRestore, iFileOpen, iFileName); TUint8* current = const_cast(aBuffer.Ptr()); const TUint8* end = current + aBuffer.Size(); @@ -616,31 +644,31 @@ if(workAroundNeeded) { - __LOG("CBufferFileReader::ReadFromBufferL() - Dual header was detected, workaround!!!"); + OstTrace0(TRACE_NORMAL, DUP1_CBUFFERFILEREADER_READFROMBUFFERL, "Dual header was detected, workaround!!!"); iFixedHeaderRead = EFalse; // Mark that the processing loop reads the fixed header again } } while (current < end) { - __LOG2("CBufferFileReader::ReadFromBufferL() - iFixedHeaderRead: %d, iLeftToSkip: %d", iFixedHeaderRead, iLeftToSkip); + OstTraceExt2(TRACE_NORMAL, DUP2_CBUFFERFILEREADER_READFROMBUFFERL, "iFixedHeaderRead: %d, iLeftToSkip: %d", iFixedHeaderRead, iLeftToSkip); // Do we have the fixed header? if (!iFixedHeaderRead) { if (ReadFromBufferF(iFixedHeader, current, end) == EFalse) { - __LOG("CBufferFileReader::ReadFromBufferL() - ReadFromBufferF() returned False so breaking!"); + OstTrace0(TRACE_NORMAL, DUP3_CBUFFERFILEREADER_READFROMBUFFERL, "ReadFromBufferF() returned False so breaking!"); break; } // if - __LOG1("CBufferFileReader::ReadFromBufferL() - fixed header - iFileNameLength: %d", iFixedHeader.iFileNameLength); - __LOG1("CBufferFileReader::ReadFromBufferL() - fixed header - iFileSize: %d", iFixedHeader.iFileSize); - __LOG1("CBufferFileReader::ReadFromBufferL() - fixed header - iAttributes: %d", iFixedHeader.iAttributes); + OstTrace1(TRACE_NORMAL, DUP4_CBUFFERFILEREADER_READFROMBUFFERL, "fixed header - iFileNameLength: %d", iFixedHeader.iFileNameLength); + OstTrace1(TRACE_NORMAL, DUP5_CBUFFERFILEREADER_READFROMBUFFERL, "fixed header - iFileSize: %d", iFixedHeader.iFileSize); + OstTrace1(TRACE_NORMAL, DUP6_CBUFFERFILEREADER_READFROMBUFFERL, "fixed header - iAttributes: %d", iFixedHeader.iAttributes); if ((iFixedHeader.iFileNameLength > KMaxFileName) || (!iFixedHeader.iFileNameLength)) { - __LOG1("CBufferFileReader::ReadFromBufferL() - Leaving - iFileNameLength: %d more then MaxLength", iFixedHeader.iFileNameLength); + OstTrace1(TRACE_ERROR, DUP7_CBUFFERFILEREADER_READFROMBUFFERL, "Leaving - iFileNameLength: %d more then MaxLength", iFixedHeader.iFileNameLength); User::Leave(KErrOverflow); } @@ -648,7 +676,7 @@ } // if - __LOG1("CBufferFileReader::ReadFromBufferL() - iFileNameRead: %d", iFileNameRead); + OstTrace1(TRACE_NORMAL, DUP8_CBUFFERFILEREADER_READFROMBUFFERL, "iFileNameRead: %d", iFileNameRead); if (!iFileNameRead) { TPtr8 ptr(reinterpret_cast(const_cast(iFileName.Ptr())), iBytesRead, iFixedHeader.iFileNameLength * KCharWidthInBytes); @@ -656,46 +684,46 @@ if (ReadFromBufferV(ptr, iFixedHeader.iFileNameLength * KCharWidthInBytes, current, end) == EFalse) { iBytesRead = ptr.Size(); - __LOG1("CBufferFileReader::ReadFromBufferL() - ReadFromBufferV() returned False - Filename bytes read: %d", iBytesRead); + OstTrace1(TRACE_NORMAL, DUP9_CBUFFERFILEREADER_READFROMBUFFERL, "ReadFromBufferV() returned False - Filename bytes read: %d", iBytesRead); break; } // if iFileName.SetLength(iFixedHeader.iFileNameLength); iFileNameRead = ETrue; - __LOG1("CBufferFileReader::ReadFromBufferL() - Got filename: %S", &iFileName); + OstTraceExt1(TRACE_NORMAL, DUP10_CBUFFERFILEREADER_READFROMBUFFERL, "Got filename: %S", iFileName); } // Is the file in the snapshot, if not it was deleted in an increment and does not need restoring - __LOG1("CBufferFileReader::ReadFromBufferL() - iSnapshotChecked: %d", iSnapshotChecked); + OstTrace1(TRACE_NORMAL, DUP11_CBUFFERFILEREADER_READFROMBUFFERL, "iSnapshotChecked: %d", iSnapshotChecked); if (!iSnapshotChecked) { CheckFileInSnapshotL(); } // if - __LOG2("CBufferFileReader::ReadFromBufferL() - iValidationHandler: 0x%08x, iRestore: %d", iValidationHandler, iRestore); + OstTraceExt2(TRACE_NORMAL, DUP12_CBUFFERFILEREADER_READFROMBUFFERL, "iValidationHandler: 0x%08x, iRestore: %d", reinterpret_cast(iValidationHandler), static_cast(iRestore)); if (iValidationHandler != NULL) { if (iRestore) { iRestore = iValidationHandler->ValidFileL(iFileName); - __LOG1("CBufferFileReader::ReadFromBufferL() - validation handler result: %d", iRestore); + OstTrace1(TRACE_NORMAL, DUP13_CBUFFERFILEREADER_READFROMBUFFERL, "validation handler result: %d", iRestore); } } if (!iRestore && !iLeftToSkip) { - __LOG1("CBufferFileReader::ReadFromBufferL() - restore not permitted, skipping file data (%d bytes)", iFixedHeader.iFileSize); + OstTrace1(TRACE_NORMAL, DUP14_CBUFFERFILEREADER_READFROMBUFFERL, "restore not permitted, skipping file data (%d bytes)", iFixedHeader.iFileSize); iLeftToSkip = iFixedHeader.iFileSize; // So we can skip the bytes } - __LOG1("CBufferFileReader::ReadFromBufferL() - iFileOpen: %d", iFileOpen); + OstTrace1(TRACE_NORMAL, DUP15_CBUFFERFILEREADER_READFROMBUFFERL, "iFileOpen: %d", iFileOpen); if (iRestore) { // Check if it is a directory or file _LIT( KTrailingBackSlash, "\\" ); if (iFileName.Right(1) == KTrailingBackSlash()) { - __LOG("CBufferFileReader::ReadFromBufferL() - Attempting to recreate directory path..."); + OstTrace0(TRACE_NORMAL, DUP16_CBUFFERFILEREADER_READFROMBUFFERL, "Attempting to recreate directory path..."); RecreateDirL(); Reset(); } @@ -704,15 +732,15 @@ // Have we opened the file? if (!iFileOpen) { - __LOG("CBufferFileReader::ReadFromBufferL() - Attempting to recreate file..."); + OstTrace0(TRACE_NORMAL, DUP17_CBUFFERFILEREADER_READFROMBUFFERL, "Attempting to recreate file..."); RecreateFileL(); } // Write to the file - __LOG("CBufferFileReader::ReadFromBufferL() - Attempting to write to file..."); + OstTrace0(TRACE_NORMAL, DUP18_CBUFFERFILEREADER_READFROMBUFFERL, "Attempting to write to file..."); if (!WriteToFileL(current, end)) { - __LOG("CBufferFileReader::ReadFromBufferL() - WriteToFileL() returned False so breaking!"); + OstTrace0(TRACE_NORMAL, DUP19_CBUFFERFILEREADER_READFROMBUFFERL, "WriteToFileL() returned False so breaking!"); break; } }//if @@ -720,34 +748,34 @@ else { // We need to skip the bytes in the data - __LOG2("CBufferFileReader::ReadFromBufferL() - We\'re in skip mode. EndPos: %8d, CurrentPos: %8d", end, current); + OstTraceExt2(TRACE_NORMAL, DUP20_CBUFFERFILEREADER_READFROMBUFFERL, "We\'re in skip mode. EndPos: %8d, CurrentPos: %8d", reinterpret_cast(end), reinterpret_cast(current)); if ((end - current) >= iLeftToSkip) { current += iLeftToSkip; // Finished reset state - __LOG("CBufferFileReader::ReadFromBufferL() - Finished skipping"); + OstTrace0(TRACE_NORMAL, DUP21_CBUFFERFILEREADER_READFROMBUFFERL, "Finished skipping"); Reset(); } // if else { - __LOG1("CBufferFileReader::ReadFromBufferL() - Still more data to skip...: %d bytes", iLeftToSkip); + OstTrace1(TRACE_NORMAL, DUP22_CBUFFERFILEREADER_READFROMBUFFERL, "Still more data to skip...: %d bytes", iLeftToSkip); iLeftToSkip = iLeftToSkip - (end - current); break; } // else } // else } // while - __LOG3("CBufferFileReader::ReadFromBufferL() - aLastSection: %d, iFileOpen: %d, iLeftToSkip: %d", aLastSection, iFileOpen, iLeftToSkip); + OstTraceExt3(TRACE_NORMAL, DUP23_CBUFFERFILEREADER_READFROMBUFFERL, "aLastSection: %d, iFileOpen: %d, iLeftToSkip: %d", aLastSection, iFileOpen, iLeftToSkip); if ((aLastSection && iFileOpen) || (aLastSection && (iLeftToSkip > 0))) { - __LOG("CBufferFileReader::ReadFromBufferL() - Leaving with KErrUnderflow because not all skipped data was consumed!"); + OstTrace0(TRACE_ERROR, DUP24_CBUFFERFILEREADER_READFROMBUFFERL, "Leaving with KErrUnderflow because not all skipped data was consumed!"); User::Leave(KErrUnderflow); } // if - - __LOG("CBufferFileReader::ReadFromBufferL() - END"); + + OstTraceFunctionExit0( CBUFFERFILEREADER_READFROMBUFFERL_EXIT ); } // ReadFromBufferL void CBufferFileReader::RedirectMIDletRestorePathL(const TDesC& aOriginal, CDesCArray& aRedirected) @@ -757,6 +785,7 @@ @param aRedirected the redirected path */ { + OstTraceFunctionEntry0( CBUFFERFILEREADER_REDIRECTMIDLETRESTOREPATHL_ENTRY ); TFileName redirectedFilename(KMIDletTempRestorePath); // Backslash used to isolate the filename from aOriginal's absolute path const TChar KTCharBackslash('\\'); @@ -764,6 +793,7 @@ // Isolate the filename from aOriginal and Append it to our temp path redirectedFilename.Append(aOriginal.Mid(aOriginal.LocateReverseF(KTCharBackslash) + 1)); aRedirected.AppendL(redirectedFilename); + OstTraceFunctionExit0( CBUFFERFILEREADER_REDIRECTMIDLETRESTOREPATHL_EXIT ); } void CBufferFileReader::ReadMIDletsFromBufferL(const TDesC8& aBuffer, TBool aLastSection, @@ -775,6 +805,7 @@ @leave KErrUnderflow More data is needed. */ { + OstTraceFunctionEntry0( CBUFFERFILEREADER_READMIDLETSFROMBUFFERL_ENTRY ); TUint8* current = const_cast(aBuffer.Ptr()); const TUint8* end = current + aBuffer.Size(); TInt fileIndex = 0; @@ -785,16 +816,16 @@ { if (ReadFromBufferF(iFixedHeader, current, end) == EFalse) { - __LOG("CBufferFileReader::ReadMIDletsFromBufferL() - ReadFromBufferF() returned False so breaking!"); + OstTrace0(TRACE_NORMAL, CBUFFERFILEREADER_READMIDLETSFROMBUFFERL, "ReadFromBufferF() returned False so breaking!"); break; } // if - __LOG1("CBufferFileReader::ReadMIDletsFromBufferL() - fixed header - iFileNameLength: %d", iFixedHeader.iFileNameLength); - __LOG1("CBufferFileReader::ReadMIDletsFromBufferL() - fixed header - iFileSize: %d", iFixedHeader.iFileSize); - __LOG1("CBufferFileReader::ReadMIDletsFromBufferL() - fixed header - iAttributes: %d", iFixedHeader.iAttributes); + OstTrace1(TRACE_NORMAL, DUP1_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL, "fixed header - iFileNameLength: %d", iFixedHeader.iFileNameLength); + OstTrace1(TRACE_NORMAL, DUP2_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL, "fixed header - iFileSize: %d", iFixedHeader.iFileSize); + OstTrace1(TRACE_NORMAL, DUP3_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL, "fixed header - iAttributes: %d", iFixedHeader.iAttributes); if ((iFixedHeader.iFileNameLength > KMaxFileName) || (!iFixedHeader.iAttributes) || (!iFixedHeader.iFileNameLength)) { - __LOG1("CBufferFileReader::ReadMIDletsFromBufferL() - Leaving - iFileNameLength: %d more then MaxLength", iFixedHeader.iFileNameLength); + OstTrace1(TRACE_ERROR, DUP4_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL, "Leaving - iFileNameLength: %d more then MaxLength", iFixedHeader.iFileNameLength); User::Leave(KErrOverflow); } @@ -808,7 +839,7 @@ if (ReadFromBufferV(ptr, iFixedHeader.iFileNameLength * KCharWidthInBytes, current, end) == EFalse) { iBytesRead = ptr.Size(); - __LOG1("CBufferFileReader::ReadMIDletsFromBufferL() - ReadFromBufferV() returned False - Filename bytes read: %d", iBytesRead); + OstTrace1(TRACE_NORMAL, DUP5_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL, "ReadFromBufferV() returned False - Filename bytes read: %d", iBytesRead); break; } // if @@ -835,7 +866,7 @@ if (!iRestore && !iLeftToSkip) { - __LOG1("CBufferFileReader::ReadMIDletsFromBufferL() - restore not permitted, skipping file data (%d bytes)", iFixedHeader.iFileSize); + OstTrace1(TRACE_NORMAL, DUP6_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL, "restore not permitted, skipping file data (%d bytes)", iFixedHeader.iFileSize); iLeftToSkip = iFixedHeader.iFileSize; // So we can skip the bytes } @@ -850,7 +881,7 @@ // Write to the file if (!WriteToFileL(current, end)) { - __LOG("CBufferFileReader::ReadMIDletsFromBufferL() - WriteToFileL() returned False so breaking!"); + OstTrace0(TRACE_NORMAL, DUP7_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL, "WriteToFileL() returned False so breaking!"); break; } } // if @@ -866,7 +897,7 @@ } // if else { - __LOG1("CBufferFileReader::ReadMIDletsFromBufferL() - Still more data to skip...: %d bytes", iLeftToSkip); + OstTrace1(TRACE_NORMAL, DUP8_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL, "Still more data to skip...: %d bytes", iLeftToSkip); iLeftToSkip = iLeftToSkip - (end - current); break; } // else @@ -876,14 +907,17 @@ if ((aLastSection && iFileOpen) || (aLastSection && (iLeftToSkip > 0))) { + OstTrace0(TRACE_ERROR, DUP9_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL, "Leave: KErrUnderflow"); User::Leave(KErrUnderflow); } // if + OstTraceFunctionExit0( CBUFFERFILEREADER_READMIDLETSFROMBUFFERL_EXIT ); } // ReadMIDletsFromBufferL void CBufferFileReader::Reset() /** Resets the state of the object. */ { + OstTraceFunctionEntry0( CBUFFERFILEREADER_RESET_ENTRY ); iFileHandle.Close(); iFileOpen = EFalse; iFileNameRead = EFalse; @@ -892,13 +926,16 @@ iFileName.SetLength(0); iFixedHeaderRead = EFalse; iBytesRead = 0; + OstTraceFunctionExit0( CBUFFERFILEREADER_RESET_EXIT ); } CBufferFileReader::~CBufferFileReader() /** destructor */ { + OstTraceFunctionEntry0( CBUFFERFILEREADER_CBUFFERFILEREADER_DES_ENTRY ); iFileHandle.Close(); + OstTraceFunctionExit0( CBUFFERFILEREADER_CBUFFERFILEREADER_DES_EXIT ); } @@ -909,11 +946,13 @@ @param aFiles File information to write to the buffer.ownernship transfer */ { + OstTraceFunctionEntry0( CBUFFERSNAPSHOTWRITER_NEWL_ENTRY ); CBufferSnapshotWriter* self = new(ELeave) CBufferSnapshotWriter(aSnapshots); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CBUFFERSNAPSHOTWRITER_NEWL_EXIT ); return self; } // NewL @@ -921,6 +960,8 @@ /** Standard C++ constructor */ { + OstTraceFunctionEntry0( CBUFFERSNAPSHOTWRITER_CBUFFERSNAPSHOTWRITER_CONS_ENTRY ); + OstTraceFunctionExit0( CBUFFERSNAPSHOTWRITER_CBUFFERSNAPSHOTWRITER_CONS_EXIT ); } void CBufferSnapshotWriter::ConstructL() @@ -929,29 +970,32 @@ @param aFiles File information to write to the buffer. */ { + OstTraceFunctionEntry0( CBUFFERSNAPSHOTWRITER_CONSTRUCTL_ENTRY ); __ASSERT_DEBUG(iSnapshots, Panic(KErrArgument)); - #ifdef SBE_LOGGING_ENABLED + const TInt count = iSnapshots->Count(); - __LOG1("CBufferFileReader::NewL() - Got %d snapshots to compare against during restore...", count); + OstTrace1(TRACE_NORMAL, CBUFFERSNAPSHOTWRITER_CONSTRUCTL, "Got %d snapshots to compare against during restore...", count); for(TInt x = 0; x < count; ++x) { const TDesC& snapshot = (*iSnapshots)[x]->FileName(); - __LOG3("CBufferFileReader::NewL() - snapshot[%4d/%4d] is: %S", x+1, count, &snapshot); + OstTraceExt3(TRACE_NORMAL, DUP1_CBUFFERSNAPSHOTWRITER_CONSTRUCTL, "snapshot[%4d/%4d] is: %S", x+1, count, snapshot); } // for x - #endif + OstTraceFunctionExit0( CBUFFERSNAPSHOTWRITER_CONSTRUCTL_EXIT ); } // ConstructL CBufferSnapshotWriter::~CBufferSnapshotWriter() /** Standard C++ destructor */ { + OstTraceFunctionEntry0( CBUFFERSNAPSHOTWRITER_CBUFFERSNAPSHOTWRITER_DES_ENTRY ); if(iSnapshots) { iSnapshots->ResetAndDestroy(); delete iSnapshots; } + OstTraceFunctionExit0( CBUFFERSNAPSHOTWRITER_CBUFFERSNAPSHOTWRITER_DES_EXIT ); } // ~CBufferSnapshotWriter void CBufferSnapshotWriter::StartL(TPtr8& aBuffer, TBool& aCompleted) @@ -961,9 +1005,9 @@ @param aCompleted On return if we have finished writing data. */ { - __LOG("CBufferSnapshotWriter::StartL() - START"); - WriteToBufferL(aBuffer, aCompleted); - __LOG("CBufferSnapshotWriter::StartL() - END"); + OstTraceFunctionEntry0( CBUFFERSNAPSHOTWRITER_STARTL_ENTRY ); + WriteToBufferL(aBuffer, aCompleted); + OstTraceFunctionExit0( CBUFFERSNAPSHOTWRITER_STARTL_EXIT ); } // WriteToBufferL void CBufferSnapshotWriter::ContinueL(TPtr8& aBuffer, TBool& aCompleted) @@ -973,9 +1017,9 @@ @param aCompleted On return if we have finished writing data. */ { - __LOG("CBufferSnapshotWriter::ContinueL() - START"); - WriteToBufferL(aBuffer, aCompleted); - __LOG("CBufferSnapshotWriter::ContinueL() - END"); + OstTraceFunctionEntry0( CBUFFERSNAPSHOTWRITER_CONTINUEL_ENTRY ); + WriteToBufferL(aBuffer, aCompleted); + OstTraceFunctionExit0( CBUFFERSNAPSHOTWRITER_CONTINUEL_EXIT ); } // WriteToBufferL void CBufferSnapshotWriter::WriteToBufferL(TPtr8& aBuffer, TBool& aCompleted) @@ -985,25 +1029,26 @@ @param aCompleted On return if we have finished writing data. */ { - __LOG1("CBufferSnapshotWriter::WriteToBufferL() - START - aBuffer length: %d", aBuffer.Length()); + OstTraceFunctionEntry0( CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL_ENTRY ); + OstTrace1(TRACE_NORMAL, CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL, "aBuffer length: %d", aBuffer.Length()); aCompleted = EFalse; const TUint count = iSnapshots->Count(); while (iCurrentSnapshot < count) { - __LOG1("CBufferSnapshotWriter::WriteToBufferL() - iCurrentSnapshot: %d", iCurrentSnapshot); + OstTrace1(TRACE_NORMAL, DUP1_CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL, "iCurrentSnapshot: %d", iCurrentSnapshot); // Check there is enough room if (sizeof(TSnapshot) > static_cast(aBuffer.MaxSize() - aBuffer.Size())) { - __LOG("CBufferSnapshotWriter::WriteToBufferL() - Snapshot size is more than buffer available - break"); + OstTrace0(TRACE_NORMAL, DUP2_CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL, "Snapshot size is more than buffer available - break"); break; } // if // Write modified TSnapshot snapshot; (*iSnapshots)[iCurrentSnapshot]->Snapshot(snapshot); - __LOG1("CBufferSnapshotWriter::WriteToBufferL() - writing snapshot for file: %S", &snapshot.iFileName); + OstTraceExt1(TRACE_NORMAL, DUP3_CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL, "writing snapshot for file: %S", snapshot.iFileName); WriteToBufferF(snapshot, aBuffer); @@ -1015,7 +1060,8 @@ aCompleted = ETrue; } // if - __LOG1("CBufferSnapshotWriter::WriteToBufferL() - END - aCompleted: %d", aCompleted); + OstTrace1(TRACE_NORMAL, DUP4_CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL, "aCompleted: %d", aCompleted); + OstTraceFunctionExit0( CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL_EXIT ); } // WriteToBufferL CBufferSnapshotReader* CBufferSnapshotReader::NewL(RSnapshots& aSnapshots) @@ -1024,7 +1070,10 @@ @param aFiles Locaton to store files read from buffer. */ { - return new (ELeave) CBufferSnapshotReader(aSnapshots); + OstTraceFunctionEntry0( CBUFFERSNAPSHOTREADER_NEWL_ENTRY ); + CBufferSnapshotReader* reader = new (ELeave) CBufferSnapshotReader(aSnapshots); + OstTraceFunctionExit0( CBUFFERSNAPSHOTREADER_NEWL_EXIT ); + return reader; } CBufferSnapshotReader::CBufferSnapshotReader(RSnapshots& aSnapshots) : @@ -1034,6 +1083,8 @@ @param aSnapshots snapshots of files. */ { + OstTraceFunctionEntry0( CBUFFERSNAPSHOTREADER_CBUFFERSNAPSHOTREADER_CONS_ENTRY ); + OstTraceFunctionExit0( CBUFFERSNAPSHOTREADER_CBUFFERSNAPSHOTREADER_CONS_EXIT ); } CBufferSnapshotReader::~CBufferSnapshotReader() @@ -1041,6 +1092,8 @@ C++ destructor */ { + OstTraceFunctionEntry0( CBUFFERSNAPSHOTREADER_CBUFFERSNAPSHOTREADER_DES_ENTRY ); + OstTraceFunctionExit0( CBUFFERSNAPSHOTREADER_CBUFFERSNAPSHOTREADER_DES_EXIT ); } void CBufferSnapshotReader::StartL(const TDesC8& aBuffer, TBool aLastSection) @@ -1050,11 +1103,12 @@ @param aLastSection is this the last section. */ { - __LOG2("CBufferSnapshotReader::StartL() - START - buffer len: %d, aLastSection: %d", aBuffer.Length(), aLastSection); + OstTraceFunctionEntry0( CBUFFERSNAPSHOTREADER_STARTL_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CBUFFERSNAPSHOTREADER_STARTL, "buffer len: %d, aLastSection: %d", aBuffer.Length(), aLastSection); ReadFromBufferL(aBuffer, aLastSection); - - __LOG("CBufferSnapshotReader::StartL() - END"); + + OstTraceFunctionExit0( CBUFFERSNAPSHOTREADER_STARTL_EXIT ); } void CBufferSnapshotReader::ContinueL(const TDesC8& aBuffer, TBool aLastSection) @@ -1064,11 +1118,12 @@ @param aLastSection is this the last section. */ { - __LOG2("CBufferSnapshotReader::ContinueL() - START - buffer len: %d, aLastSection: %d", aBuffer.Length(), aLastSection); + OstTraceFunctionEntry0( CBUFFERSNAPSHOTREADER_CONTINUEL_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CBUFFERSNAPSHOTREADER_CONTINUEL, "buffer len: %d, aLastSection: %d", aBuffer.Length(), aLastSection); ReadFromBufferL(aBuffer, aLastSection); - __LOG("CBufferSnapshotReader::ContinueL() - END"); + OstTraceFunctionExit0( CBUFFERSNAPSHOTREADER_CONTINUEL_EXIT ); } void CBufferSnapshotReader::ReadFromBufferL(const TDesC8& aBuffer, TBool /*aLastSection*/) @@ -1078,7 +1133,7 @@ @param aLastSection is this the last section. */ { - __LOG("CBufferSnapshotReader::ReadFromBufferL() - START"); + OstTraceFunctionEntry0( CBUFFERSNAPSHOTREADER_READFROMBUFFERL_ENTRY ); TUint8* current = const_cast(aBuffer.Ptr()); const TUint8* end = current + aBuffer.Size(); @@ -1086,17 +1141,17 @@ { if (ReadFromBufferF(iSnapshot, current, end) == EFalse) { - __LOG("CBufferSnapshotReader::ReadFromBufferL() - returned EFalse breaking!"); + OstTrace0(TRACE_NORMAL, CBUFFERSNAPSHOTREADER_READFROMBUFFERL, "returned EFalse breaking!"); break; } - __LOG1("CBufferSnapshotReader::ReadFromBufferL() - read snapshot info for file: %S", &iSnapshot.iFileName); + OstTraceExt1(TRACE_NORMAL, DUP1_CBUFFERSNAPSHOTREADER_READFROMBUFFERL, "read snapshot info for file: %S", iSnapshot.iFileName); CSnapshot* snapshot = CSnapshot::NewLC(iSnapshot); iSnapshots.AppendL(snapshot); CleanupStack::Pop(snapshot); } // while - - __LOG("CBufferSnapshotReader::ReadFromBufferL() - END"); + + OstTraceFunctionExit0( CBUFFERSNAPSHOTREADER_READFROMBUFFERL_EXIT ); } // ReadFromBufferL @@ -1112,9 +1167,11 @@ */ CSnapshot* CSnapshot::NewLC(const TInt64& aModified, const TDesC& aFileName) { + OstTraceFunctionEntry0( CSNAPSHOT_NEWLC_ENTRY ); CSnapshot* self = new (ELeave) CSnapshot(aModified); CleanupStack::PushL(self); self->ConstructL(aFileName); + OstTraceFunctionExit0( CSNAPSHOT_NEWLC_EXIT ); return self; } @@ -1127,6 +1184,7 @@ */ CSnapshot* CSnapshot::NewLC(const TSnapshot& aSnapshot) { + OstTraceFunctionEntry0( DUP1_CSNAPSHOT_NEWLC_ENTRY ); return CSnapshot::NewLC(aSnapshot.iModified, aSnapshot.iFileName); } @@ -1135,7 +1193,9 @@ */ CSnapshot::~CSnapshot() { + OstTraceFunctionEntry0( CSNAPSHOT_CSNAPSHOT_DES_ENTRY ); delete iFileName; + OstTraceFunctionExit0( CSNAPSHOT_CSNAPSHOT_DES_EXIT ); } /** @@ -1143,6 +1203,8 @@ */ CSnapshot::CSnapshot(const TInt64& aModified) : iModified(aModified) { + OstTraceFunctionEntry0( CSNAPSHOT_CSNAPSHOT_CONS_ENTRY ); + OstTraceFunctionExit0( CSNAPSHOT_CSNAPSHOT_CONS_EXIT ); } /** @@ -1150,7 +1212,9 @@ */ void CSnapshot::ConstructL(const TDesC& aFileName) { + OstTraceFunctionEntry0( CSNAPSHOT_CONSTRUCTL_ENTRY ); iFileName = aFileName.AllocL(); + OstTraceFunctionExit0( CSNAPSHOT_CONSTRUCTL_EXIT ); } /** @@ -1181,8 +1245,10 @@ */ void CSnapshot::Snapshot(TSnapshot& aSnapshot) { + OstTraceFunctionEntry0( CSNAPSHOT_SNAPSHOT_ENTRY ); aSnapshot.iFileName = *iFileName; aSnapshot.iModified = iModified; + OstTraceFunctionExit0( CSNAPSHOT_SNAPSHOT_EXIT ); } /** diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbeclient.cpp --- a/backupandrestore/backupengine/src/sbeclient.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbeclient.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,13 +23,19 @@ #include "sbeclient.h" #include "sbeclientsession.h" #include "sbepanic.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbeclientTraces.h" +#endif namespace conn { - CSBEClient::CSBEClient() /** Class constructor. */ { + OstTraceFunctionEntry0( CSBECLIENT_CSBECLIENT_CONS_ENTRY ); + OstTraceFunctionExit0( CSBECLIENT_CSBECLIENT_CONS_EXIT ); } @@ -40,10 +46,12 @@ @return a new CSBEClient. */ { + OstTraceFunctionEntry0( CSBECLIENT_NEWL_ENTRY ); CSBEClient* self = new (ELeave) CSBEClient(); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSBECLIENT_NEWL_EXIT ); return self; } @@ -52,9 +60,12 @@ Construct this instance of CSBEClient */ { + OstTraceFunctionEntry0( CSBECLIENT_CONSTRUCTL_ENTRY ); iClientSession = RSBEClientSession::NewL(); - User::LeaveIfError(iClientSession->Connect()); + TInt err = iClientSession->Connect(); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, CSBECLIENT_CONSTRUCTL, "Leave: %d", err)); + OstTraceFunctionExit0( CSBECLIENT_CONSTRUCTL_EXIT ); } @@ -63,6 +74,7 @@ Standard destructor */ { + OstTraceFunctionEntry0( CSBECLIENT_CSBECLIENT_DES_ENTRY ); if (iClientSession) { iClientSession->Close(); @@ -70,6 +82,7 @@ delete iClientSession; iClientSession = NULL; + OstTraceFunctionExit0( CSBECLIENT_CSBECLIENT_DES_EXIT ); } @@ -86,7 +99,9 @@ @param aDataOwners on return an array of information about backup data owners. */ { + OstTraceFunctionEntry0( CSBECLIENT_LISTOFDATAOWNERSL_ENTRY ); iClientSession->ListOfDataOwnersL(aDataOwners); + OstTraceFunctionExit0( CSBECLIENT_LISTOFDATAOWNERSL_EXIT ); } EXPORT_C void CSBEClient::PublicFileListL(TDriveNumber aDrive, CSBGenericDataType& aGenericDataType, RFileArray& aFiles) @@ -106,7 +121,9 @@ @param aFiles on return an array of information about files. */ { + OstTraceFunctionEntry0( CSBECLIENT_PUBLICFILELISTL_ENTRY ); iClientSession->PublicFileListL(aDrive, aGenericDataType, aFiles); + OstTraceFunctionExit0( CSBECLIENT_PUBLICFILELISTL_EXIT ); } EXPORT_C void CSBEClient::RawPublicFileListL(TDriveNumber aDrive, CSBGenericDataType& aGenericDataType, @@ -132,7 +149,9 @@ @param aFileFilter on return an array of names of files or directories for restore. */ { + OstTraceFunctionEntry0( CSBECLIENT_RAWPUBLICFILELISTL_ENTRY ); iClientSession->RawPublicFileListL(aDrive, aGenericDataType, aFileFilter); + OstTraceFunctionExit0( CSBECLIENT_RAWPUBLICFILELISTL_EXIT ); } EXPORT_C void CSBEClient::PublicFileListXMLL(TDriveNumber aDrive, TSecureId aSID, HBufC*& aFileList) @@ -152,8 +171,10 @@ @param aFileList on return a description of the list of files and directories. Must be NULL */ { + OstTraceFunctionEntry0( CSBECLIENT_PUBLICFILELISTXMLL_ENTRY ); __ASSERT_DEBUG(aFileList == NULL, Panic(KErrArgument)); iClientSession->PublicFileListXMLL(aDrive, aSID, aFileList); + OstTraceFunctionExit0( CSBECLIENT_PUBLICFILELISTXMLL_EXIT ); } EXPORT_C void CSBEClient::SetBURModeL(const TDriveList& aDriveList, TBURPartType aBURType, @@ -166,7 +187,9 @@ @param aBackupIncType is a backup base or incremental (ignored for restore operations). */ { + OstTraceFunctionEntry0( CSBECLIENT_SETBURMODEL_ENTRY ); iClientSession->SetBURModeL(aDriveList, aBURType, aBackupIncType); + OstTraceFunctionExit0( CSBECLIENT_SETBURMODEL_EXIT ); } EXPORT_C void CSBEClient::SetSIDListForPartialBURL(RSIDArray& aSIDs) @@ -178,7 +201,9 @@ @param aSIDs array of affected data owners. */ { + OstTraceFunctionEntry0( CSBECLIENT_SETSIDLISTFORPARTIALBURL_ENTRY ); iClientSession->SetSIDListForPartialBURL(aSIDs); + OstTraceFunctionExit0( CSBECLIENT_SETSIDLISTFORPARTIALBURL_EXIT ); } @@ -194,7 +219,9 @@ the status information is filled in. */ { + OstTraceFunctionEntry0( CSBECLIENT_SIDSTATUSL_ENTRY ); iClientSession->SIDStatusL(aSIDStatus); + OstTraceFunctionExit0( CSBECLIENT_SIDSTATUSL_EXIT ); } @@ -219,7 +246,10 @@ @return Pointer to the start of the buffer for writing */ { - return iClientSession->TransferDataAddressL(); + OstTraceFunctionEntry0( CSBECLIENT_TRANSFERDATAADDRESSL_ENTRY ); + TPtr8& ptr = iClientSession->TransferDataAddressL(); + OstTraceFunctionExit0( CSBECLIENT_TRANSFERDATAADDRESSL_EXIT ); + return ptr; } EXPORT_C TPtrC8& CSBEClient::TransferDataInfoL(CSBGenericTransferType*& aGenericTransferType, @@ -235,8 +265,11 @@ @return read only pointer to the global heap. */ { + OstTraceFunctionEntry0( CSBECLIENT_TRANSFERDATAINFOL_ENTRY ); __ASSERT_DEBUG(aGenericTransferType == NULL, Panic(KErrArgument)); - return iClientSession->TransferDataInfoL(aGenericTransferType, aFinished); + TPtrC8& ptr = iClientSession->TransferDataInfoL(aGenericTransferType, aFinished); + OstTraceFunctionExit0( CSBECLIENT_TRANSFERDATAINFOL_EXIT ); + return ptr; } EXPORT_C void CSBEClient::RequestDataL(CSBGenericTransferType& aGenericTransferType, @@ -253,7 +286,9 @@ @param aStatus the request status of an Active Object to be completed when the data has been received */ { + OstTraceFunctionEntry0( CSBECLIENT_REQUESTDATAL_ENTRY ); iClientSession->RequestDataL(aGenericTransferType, aStatus); + OstTraceFunctionExit0( CSBECLIENT_REQUESTDATAL_EXIT ); } EXPORT_C void CSBEClient::RequestDataL(CSBGenericTransferType& aGenericTransferType) @@ -268,7 +303,9 @@ @param aGenericTransferType Reference to a CSBGenericTransferType object */ { + OstTraceFunctionEntry0( DUP1_CSBECLIENT_REQUESTDATAL_ENTRY ); iClientSession->RequestDataL(aGenericTransferType); + OstTraceFunctionExit0( DUP1_CSBECLIENT_REQUESTDATAL_EXIT ); } EXPORT_C void CSBEClient::SupplyDataL(CSBGenericTransferType& aGenericTransferType, @@ -288,7 +325,9 @@ @param aStatus the request status of an Active Object to be completed when the data has been transferred */ { + OstTraceFunctionEntry0( CSBECLIENT_SUPPLYDATAL_ENTRY ); iClientSession->SupplyDataL(aGenericTransferType, aFinished, aStatus); + OstTraceFunctionExit0( CSBECLIENT_SUPPLYDATAL_EXIT ); } EXPORT_C void CSBEClient::SupplyDataL(CSBGenericTransferType& aGenericTransferType, @@ -306,7 +345,9 @@ @param aFinished ETrue if this buffer is the last one for this package uid, drive and data type */ { + OstTraceFunctionEntry0( DUP1_CSBECLIENT_SUPPLYDATAL_ENTRY ); iClientSession->SupplyDataL(aGenericTransferType, aFinished); + OstTraceFunctionExit0( DUP1_CSBECLIENT_SUPPLYDATAL_EXIT ); } EXPORT_C void CSBEClient::AllSnapshotsSuppliedL() @@ -320,7 +361,9 @@ It must only be called once for a SID for a backup operation. */ { + OstTraceFunctionEntry0( CSBECLIENT_ALLSNAPSHOTSSUPPLIEDL_ENTRY ); iClientSession->AllSnapshotsSuppliedL(); + OstTraceFunctionExit0( CSBECLIENT_ALLSNAPSHOTSSUPPLIEDL_EXIT ); } EXPORT_C TUint CSBEClient::ExpectedDataSizeL(CSBGenericTransferType& aGenericTransferType) @@ -337,7 +380,10 @@ @return KErrNone if successful. */ { - return (iClientSession->ExpectedDataSizeL(aGenericTransferType)); + OstTraceFunctionEntry0( CSBECLIENT_EXPECTEDDATASIZEL_ENTRY ); + TUint ret = (iClientSession->ExpectedDataSizeL(aGenericTransferType)); + OstTraceFunctionExit0( CSBECLIENT_EXPECTEDDATASIZEL_EXIT ); + return ret; } EXPORT_C void CSBEClient::AllSystemFilesRestored() @@ -346,7 +392,9 @@ Backup Engine to start active data owners. */ { + OstTraceFunctionEntry0( CSBECLIENT_ALLSYSTEMFILESRESTORED_ENTRY ); iClientSession->AllSystemFilesRestored(); + OstTraceFunctionExit0( CSBECLIENT_ALLSYSTEMFILESRESTORED_EXIT ); } /** @@ -363,7 +411,9 @@ */ EXPORT_C void CSBEClient::ListOfDataOwnersL(RPointerArray& aDataOwners, TRequestStatus& aStatus) { + OstTraceFunctionEntry0( DUP1_CSBECLIENT_LISTOFDATAOWNERSL_ENTRY ); iClientSession->ListOfDataOwnersL(aDataOwners, aStatus); + OstTraceFunctionExit0( DUP1_CSBECLIENT_LISTOFDATAOWNERSL_EXIT ); } /** @@ -384,7 +434,9 @@ */ EXPORT_C void CSBEClient::PublicFileListL(TDriveNumber aDrive, CSBGenericDataType& aGenericDataType, RFileArray& aFiles, TRequestStatus& aStatus) { + OstTraceFunctionEntry0( DUP1_CSBECLIENT_PUBLICFILELISTL_ENTRY ); iClientSession->PublicFileListL(aDrive, aGenericDataType, aFiles, aStatus); + OstTraceFunctionExit0( DUP1_CSBECLIENT_PUBLICFILELISTL_EXIT ); } /** @@ -398,7 +450,9 @@ EXPORT_C void CSBEClient::SetBURModeL(const TDriveList& aDriveList, TBURPartType aBURType, TBackupIncType aBackupIncType, TRequestStatus& aStatus) { + OstTraceFunctionEntry0( DUP1_CSBECLIENT_SETBURMODEL_ENTRY ); iClientSession->SetBURModeL(aDriveList, aBURType, aBackupIncType, aStatus); + OstTraceFunctionExit0( DUP1_CSBECLIENT_SETBURMODEL_EXIT ); } /** @@ -414,7 +468,9 @@ */ EXPORT_C void CSBEClient::AllSnapshotsSuppliedL(TRequestStatus& aStatus) { + OstTraceFunctionEntry0( DUP1_CSBECLIENT_ALLSNAPSHOTSSUPPLIEDL_ENTRY ); iClientSession->AllSnapshotsSuppliedL(aStatus); + OstTraceFunctionExit0( DUP1_CSBECLIENT_ALLSNAPSHOTSSUPPLIEDL_EXIT ); } /** @@ -425,7 +481,9 @@ */ EXPORT_C void CSBEClient::AllSystemFilesRestoredL(TRequestStatus& aStatus) { + OstTraceFunctionEntry0( CSBECLIENT_ALLSYSTEMFILESRESTOREDL_ENTRY ); iClientSession->AllSystemFilesRestoredL(aStatus); + OstTraceFunctionExit0( CSBECLIENT_ALLSYSTEMFILESRESTOREDL_EXIT ); } // Test Methods // @@ -441,6 +499,8 @@ @return the 32-bit checksum */ { + OstTraceFunctionEntry0( CSBECLIENT_DATACHECKSUM_ENTRY ); + OstTraceFunctionExit0( CSBECLIENT_DATACHECKSUM_EXIT ); return 0; } @@ -461,7 +521,9 @@ @param aStatus The TRequestStatus that will be completed once the engine has fully processed this request */ { + OstTraceFunctionEntry0( DUP2_CSBECLIENT_PUBLICFILELISTL_ENTRY ); iClientSession->PublicFileListL(aDrive, aGenericDataType, aFileList, aFinished, aTotalListCursor, aMaxResponseSize, aStatus); + OstTraceFunctionExit0( DUP2_CSBECLIENT_PUBLICFILELISTL_EXIT ); } } // end of conn namespace diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbeclientsession.cpp --- a/backupandrestore/backupengine/src/sbeclientsession.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbeclientsession.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,44 +23,58 @@ #include "sbeclientserver.h" #include #include "sbepanic.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbeclientsessionTraces.h" +#endif namespace conn { - RSBEClientSession* RSBEClientSession::NewL() /** Symbian OS constructor @return pointer to an instantiated RSBEClientSession object */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_NEWL_ENTRY ); RSBEClientSession* self = new (ELeave) RSBEClientSession(); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( RSBECLIENTSESSION_NEWL_EXIT ); return self; } void RSBEClientSession::ConstructL() /** Symbian second phase constructor */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_CONSTRUCTL_ENTRY ); iGSHInterface = CHeapWrapper::NewL(); + OstTraceFunctionExit0( RSBECLIENTSESSION_CONSTRUCTL_EXIT ); } RSBEClientSession::RSBEClientSession() : iCallbackHandler(NULL) /** Class constructor. */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_RSBECLIENTSESSION_CONS_ENTRY ); + OstTraceFunctionExit0( RSBECLIENTSESSION_RSBECLIENTSESSION_CONS_EXIT ); } RSBEClientSession::~RSBEClientSession() /** Class destructor. */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_RSBECLIENTSESSION_DES_ENTRY ); delete iGSHInterface; delete iCallbackHandler; + OstTraceFunctionExit0( RSBECLIENTSESSION_RSBECLIENTSESSION_DES_EXIT ); } void RSBEClientSession::Close() /** Closes the Secure Backup Engine handle. */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_CLOSE_ENTRY ); iGlobalSharedHeap.Close(); RSessionBase::Close(); + OstTraceFunctionExit0( RSBECLIENTSESSION_CLOSE_EXIT ); } TInt RSBEClientSession::Connect() @@ -69,6 +83,7 @@ @return KErrNone if successful, KErrCouldNotConnect otherwise */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_CONNECT_ENTRY ); TInt nRetry = KSBERetryCount; TInt nRet = KErrNotFound; @@ -89,6 +104,7 @@ nRet = GetGlobalSharedHeapHandle(); } + OstTraceFunctionExit0( RSBECLIENTSESSION_CONNECT_EXIT ); return nRet; } @@ -114,6 +130,7 @@ @return Standard Symbian OS code from RProcess/RThread create. */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_STARTSERVER_ENTRY ); // // Servers UID const TUidType serverUid(KNullUid, KNullUid, KSBServerUID3); @@ -123,6 +140,7 @@ TInt nRet=server.Create(KSBImageName,KNullDesC,serverUid); if (nRet != KErrNone) { + OstTraceFunctionExit0( RSBECLIENTSESSION_STARTSERVER_EXIT ); return nRet; } @@ -137,7 +155,9 @@ server.Resume(); } User::WaitForRequest(stat); - return (server.ExitType() == EExitPanic) ? KErrGeneral : stat.Int(); + nRet = (server.ExitType() == EExitPanic) ? KErrGeneral : stat.Int(); + OstTraceFunctionExit0( DUP1_RSBECLIENTSESSION_STARTSERVER_EXIT ); + return nRet; } @@ -151,14 +171,16 @@ Any items present in this array will be lost */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_LISTOFDATAOWNERSL_ENTRY ); // Get the server to construct the flattened array and return the size of it TInt result = SendReceive(ESBEMsgPrepDataOwnerInfo); - User::LeaveIfError(result); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, RSBECLIENTSESSION_LISTOFDATAOWNERSL, "Leave: %d", result)); iDataOwnersArray = &aDataOwners; PopulateListOfDataOwnersL(result); + OstTraceFunctionExit0( RSBECLIENTSESSION_LISTOFDATAOWNERSL_EXIT ); } void RSBEClientSession::PublicFileListL(TDriveNumber aDrive, CSBGenericDataType& aGenericDataType, @@ -172,15 +194,17 @@ @leave If a synchronous IPC call to the SBEngine returns an error code (i.e. if SBEngine leaves) */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_PUBLICFILELISTL_ENTRY ); // request the public file list TInt result = SendReceive(ESBEMsgPrepPublicFiles, TIpcArgs(aDrive, &(aGenericDataType.Externalise()))); - User::LeaveIfError(result); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, RSBECLIENTSESSION_PUBLICFILELISTL, "Leave: %d", result)); iFileArray = &aFiles; PopulatePublicFileListL(result); + OstTraceFunctionExit0( RSBECLIENTSESSION_PUBLICFILELISTL_EXIT ); } void RSBEClientSession::RawPublicFileListL( TDriveNumber aDrive, @@ -197,6 +221,7 @@ @leave If a synchronous IPC call to the SBEngine returns an error code (i.e. if SBEngine leaves) */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_RAWPUBLICFILELISTL_ENTRY ); // ensure that the array is cleared out before populating with externalised data aFileFilter.Reset(); @@ -206,14 +231,15 @@ TInt result = SendReceive(ESBEMsgPrepPublicFilesRaw, TIpcArgs(&drive, &(aGenericDataType.Externalise()))); - User::LeaveIfError(result); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, RSBECLIENTSESSION_RAWPUBLICFILELISTL, "Leave: %d", result)); // Create a descriptor big enough for the array to be externalised into HBufC8* pFileArray = HBufC8::NewL(result); CleanupStack::PushL(pFileArray); TPtr8 fileArray(pFileArray->Des()); - User::LeaveIfError(SendReceive(ESBEMsgGetPublicFilesRaw, TIpcArgs(&fileArray))); + result = SendReceive(ESBEMsgGetPublicFilesRaw, TIpcArgs(&fileArray)); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, DUP1_RSBECLIENTSESSION_RAWPUBLICFILELISTL, "Leave: %d", result)); RRestoreFileFilterArray* pFileFilter = RRestoreFileFilterArray::InternaliseL(fileArray); CleanupStack::PushL(pFileFilter); @@ -228,6 +254,7 @@ CleanupStack::PopAndDestroy(pFileFilter); // CleanupClosePushL(*pFileFilter) CleanupStack::PopAndDestroy(pFileFilter); // CleanupStack::PushL(pFileFilter) CleanupStack::PopAndDestroy(pFileArray); + OstTraceFunctionExit0( RSBECLIENTSESSION_RAWPUBLICFILELISTL_EXIT ); } void RSBEClientSession::PublicFileListXMLL(TDriveNumber aDrive, TSecureId aSID, HBufC*& aFileList) @@ -240,19 +267,22 @@ @leave If a synchronous IPC call to the SBEngine returns an error code (i.e. if SBEngine leaves) */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_PUBLICFILELISTXMLL_ENTRY ); TPckgC drive(aDrive); TPckgC sid(aSID); // request the public file list TInt result = SendReceive(ESBEMsgPrepPublicFilesXML, TIpcArgs(&drive, &sid)); - User::LeaveIfError(result); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, RSBECLIENTSESSION_PUBLICFILELISTXMLL, "Leave: %d", result)); // Create a descriptor big enough for the array to be externalised into aFileList = HBufC::NewL(result); TPtr fileList(aFileList->Des()); - User::LeaveIfError(SendReceive(ESBEMsgPrepPublicFilesXML, TIpcArgs(&fileList))); + result = SendReceive(ESBEMsgPrepPublicFilesXML, TIpcArgs(&fileList)); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, DUP1_RSBECLIENTSESSION_PUBLICFILELISTXMLL, "Leave: %d", result)); + OstTraceFunctionExit0( RSBECLIENTSESSION_PUBLICFILELISTXMLL_EXIT ); } void RSBEClientSession::SetBURModeL(const TDriveList& aDriveList, TBURPartType aBURType, @@ -266,7 +296,10 @@ @leave If a synchronous IPC call to the SBEngine returns an error code (i.e. if SBEngine leaves) */ { - User::LeaveIfError(SendReceive(ESBEMsgSetBURMode, TIpcArgs(&aDriveList, aBURType, aBackupIncType))); + OstTraceFunctionEntry0( RSBECLIENTSESSION_SETBURMODEL_ENTRY ); + TInt result = SendReceive(ESBEMsgSetBURMode, TIpcArgs(&aDriveList, aBURType, aBackupIncType)); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, RSBECLIENTSESSION_SETBURMODEL, "Leave: %d", result)); + OstTraceFunctionExit0( RSBECLIENTSESSION_SETBURMODEL_EXIT ); } void RSBEClientSession::SetSIDListForPartialBURL(RSIDArray& aSIDs) @@ -279,14 +312,17 @@ @leave If a synchronous IPC call to the SBEngine returns an error code (i.e. if SBEngine leaves) */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_SETSIDLISTFORPARTIALBURL_ENTRY ); HBufC8* pFlattenedArray = aSIDs.ExternaliseL(); CleanupStack::PushL(pFlattenedArray); TPtrC8 flatArray(pFlattenedArray->Des()); - User::LeaveIfError(SendReceive(ESBEMsgSetSIDListPartial, TIpcArgs(&flatArray))); + TInt result = SendReceive(ESBEMsgSetSIDListPartial, TIpcArgs(&flatArray)); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, RSBECLIENTSESSION_SETSIDLISTFORPARTIALBURL, "Leave: %d", result)); CleanupStack::PopAndDestroy(pFlattenedArray); + OstTraceFunctionExit0( RSBECLIENTSESSION_SETSIDLISTFORPARTIALBURL_EXIT ); } void RSBEClientSession::SIDStatusL(RSIDStatusArray& aSIDStatus) @@ -299,16 +335,19 @@ @leave If a synchronous IPC call to the SBEngine returns an error code (i.e. if SBEngine leaves) */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_SIDSTATUSL_ENTRY ); HBufC8* pExternalisedArray = aSIDStatus.ExternaliseL(); CleanupStack::PushL(pExternalisedArray); TPtr8 externArray(pExternalisedArray->Des()); - User::LeaveIfError(SendReceive(ESBEMsgPrepSIDStatus, TIpcArgs(&externArray))); + TInt result = SendReceive(ESBEMsgPrepSIDStatus, TIpcArgs(&externArray)); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, RSBECLIENTSESSION_SIDSTATUSL, "Leave: %d", result)); // Reset the descriptor, ready for getting the returned externalised array externArray.Zero(); - User::LeaveIfError(SendReceive(ESBEMsgGetSIDStatus, TIpcArgs(&externArray))); + result = SendReceive(ESBEMsgGetSIDStatus, TIpcArgs(&externArray)); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, DUP1_RSBECLIENTSESSION_SIDSTATUSL, "Leave: %d", result)); RSIDStatusArray* pInternalisedArray = RSIDStatusArray::InternaliseL(externArray); CleanupStack::PopAndDestroy(pExternalisedArray); // pExternalisedArray @@ -326,6 +365,7 @@ } CleanupStack::PopAndDestroy(pInternalisedArray); // pInternalisedArray->Close() CleanupStack::PopAndDestroy(pInternalisedArray); // pInternalisedArray + OstTraceFunctionExit0( RSBECLIENTSESSION_SIDSTATUSL_EXIT ); } TPtr8& RSBEClientSession::TransferDataAddressL() @@ -363,11 +403,13 @@ @return Pointer to the start of the buffer for reading */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_TRANSFERDATAINFOL_ENTRY ); TPtrC8& returnedBuf = iGSHInterface->ReadBufferL(iGlobalSharedHeap); TDesC8& genTypeBuffer = iGSHInterface->Header(iGlobalSharedHeap).GenericTransferTypeBuffer(); if (genTypeBuffer.Size() == 0) { + OstTrace0(TRACE_ERROR, RSBECLIENTSESSION_TRANSFERDATAINFOL, "Leave: KErrNotReady"); User::Leave(KErrNotReady); } @@ -379,6 +421,7 @@ CleanupStack::Pop(aGenericTransferType); + OstTraceFunctionExit0( RSBECLIENTSESSION_TRANSFERDATAINFOL_EXIT ); return returnedBuf; } @@ -390,6 +433,7 @@ @return An error code resulting from the server request for the handle, KErrNone if ok */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_GETGLOBALSHAREDHEAPHANDLE_ENTRY ); TInt ret = SendReceive(ESBEMsgGetGSHHandle); // ret is negative if an error has ocurred @@ -401,6 +445,7 @@ ret = KErrNone; } + OstTraceFunctionExit0( RSBECLIENTSESSION_GETGLOBALSHAREDHEAPHANDLE_EXIT ); return ret; } @@ -416,8 +461,10 @@ is ready */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_REQUESTDATAL_ENTRY ); const TDesC8& transBuf = aGenericTransferType.Externalise(); SendReceive(ESBEMsgRequestDataAsync, TIpcArgs(&transBuf), aStatus); + OstTraceFunctionExit0( RSBECLIENTSESSION_REQUESTDATAL_EXIT ); } void RSBEClientSession::RequestDataL(CSBGenericTransferType& aGenericTransferType) @@ -430,8 +477,10 @@ @leave If a synchronous IPC call to the SBEngine returns an error code (i.e. if SBEngine leaves) */ { - User::LeaveIfError(SendReceive(ESBEMsgRequestDataSync, - TIpcArgs(&(aGenericTransferType.Externalise())))); + OstTraceFunctionEntry0( DUP1_RSBECLIENTSESSION_REQUESTDATAL_ENTRY ); + TInt result = SendReceive(ESBEMsgRequestDataSync, TIpcArgs(&(aGenericTransferType.Externalise()))); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, DUP1_RSBECLIENTSESSION_REQUESTDATAL, "Leave: %d", result)); + OstTraceFunctionExit0( DUP1_RSBECLIENTSESSION_REQUESTDATAL_EXIT ); } void RSBEClientSession::SupplyDataL(CSBGenericTransferType& aGenericTransferType, @@ -446,10 +495,12 @@ @leave If a synchronous IPC call to the SBEngine returns an error code (i.e. if SBEngine leaves) */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_SUPPLYDATAL_ENTRY ); iGSHInterface->Header(iGlobalSharedHeap).GenericTransferTypeBuffer() = aGenericTransferType.Externalise(); SendReceive(ESBEMsgSupplyDataSync, TIpcArgs(aFinished), aStatus); + OstTraceFunctionExit0( RSBECLIENTSESSION_SUPPLYDATAL_EXIT ); } void RSBEClientSession::SupplyDataL(CSBGenericTransferType& aGenericTransferType, @@ -464,10 +515,13 @@ @leave If a synchronous IPC call to the SBEngine returns an error code (i.e. if SBEngine leaves) */ { + OstTraceFunctionEntry0( DUP1_RSBECLIENTSESSION_SUPPLYDATAL_ENTRY ); iGSHInterface->Header(iGlobalSharedHeap).GenericTransferTypeBuffer() = aGenericTransferType.Externalise(); - - User::LeaveIfError(SendReceive(ESBEMsgSupplyDataSync, TIpcArgs(aFinished))); + + TInt result = SendReceive(ESBEMsgSupplyDataSync, TIpcArgs(aFinished)); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, DUP1_RSBECLIENTSESSION_SUPPLYDATAL, "Leave: %d", result)); + OstTraceFunctionExit0( DUP1_RSBECLIENTSESSION_SUPPLYDATAL_EXIT ); } void RSBEClientSession::AllSnapshotsSuppliedL() @@ -477,8 +531,11 @@ @leave If a synchronous IPC call to the SBEngine returns an error code (i.e. if SBEngine leaves) */ { - User::LeaveIfError(SendReceive(ESBEMsgAllSnapshotsSupplied)); + OstTraceFunctionEntry0( RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL_ENTRY ); + TInt result = SendReceive(ESBEMsgAllSnapshotsSupplied); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL, "Leave: %d", result)); + OstTraceFunctionExit0( RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL_EXIT ); } TUint RSBEClientSession::ExpectedDataSizeL(CSBGenericTransferType& aGenericTransferType) @@ -490,13 +547,17 @@ @leave If a synchronous IPC call to the SBEngine returns an error code (i.e. if SBEngine leaves) */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_EXPECTEDDATASIZEL_ENTRY ); TPckgBuf sizePkg; TPtrC8 genType(aGenericTransferType.Externalise()); - User::LeaveIfError(SendReceive(ESBEMsgGetExpectedDataSize, TIpcArgs(&genType, &sizePkg))); + TInt result = SendReceive(ESBEMsgGetExpectedDataSize, TIpcArgs(&genType, &sizePkg)); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, RSBECLIENTSESSION_EXPECTEDDATASIZEL, "Leave: %d", result)); - return sizePkg(); + TUint size = sizePkg(); + OstTraceFunctionExit0( RSBECLIENTSESSION_EXPECTEDDATASIZEL_EXIT ); + return size; } void RSBEClientSession::AllSystemFilesRestored() @@ -505,7 +566,9 @@ are to be started */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_ALLSYSTEMFILESRESTORED_ENTRY ); SendReceive(ESBEMsgAllSystemFilesRestored); + OstTraceFunctionExit0( RSBECLIENTSESSION_ALLSYSTEMFILESRESTORED_EXIT ); } /** @@ -518,6 +581,7 @@ */ void RSBEClientSession::ListOfDataOwnersL(RPointerArray& aDataOwners, TRequestStatus& aStatus) { + OstTraceFunctionEntry0( DUP1_RSBECLIENTSESSION_LISTOFDATAOWNERSL_ENTRY ); if (iCallbackHandler == NULL) { iCallbackHandler = CSBECallbackHandler::NewL(*this); @@ -525,6 +589,7 @@ if (iCallbackHandler->IsActive()) { + OstTrace0(TRACE_ERROR, DUP1_RSBECLIENTSESSION_LISTOFDATAOWNERSL, "Leave: KErrInUse"); User::Leave(KErrInUse); } else @@ -533,6 +598,7 @@ SendReceive(ESBEMsgPrepDataOwnerInfo, iCallbackHandler->iStatus); iCallbackHandler->StartL(aStatus, EListOfDataOwners); } + OstTraceFunctionExit0( DUP1_RSBECLIENTSESSION_LISTOFDATAOWNERSL_EXIT ); } /** @@ -546,6 +612,7 @@ */ void RSBEClientSession::PublicFileListL(TDriveNumber aDrive, CSBGenericDataType& aGenericDataType, RFileArray& aFiles, TRequestStatus& aStatus) { + OstTraceFunctionEntry0( DUP1_RSBECLIENTSESSION_PUBLICFILELISTL_ENTRY ); if (iCallbackHandler == NULL) { iCallbackHandler = CSBECallbackHandler::NewL(*this); @@ -553,6 +620,7 @@ if (iCallbackHandler->IsActive()) { + OstTrace0(TRACE_ERROR, DUP1_RSBECLIENTSESSION_PUBLICFILELISTL, "Leave: KErrInUse"); User::Leave(KErrInUse); } else @@ -562,6 +630,7 @@ SendReceive(ESBEMsgPrepPublicFiles, TIpcArgs(aDrive, &(aGenericDataType.Externalise())), iCallbackHandler->iStatus); iCallbackHandler->StartL(aStatus,EPublicFileList); } + OstTraceFunctionExit0( DUP1_RSBECLIENTSESSION_PUBLICFILELISTL_EXIT ); } void RSBEClientSession::SetBURModeL(const TDriveList& aDriveList, TBURPartType aBURType, @@ -576,7 +645,9 @@ */ { + OstTraceFunctionEntry0( DUP1_RSBECLIENTSESSION_SETBURMODEL_ENTRY ); SendReceive(ESBEMsgSetBURMode, TIpcArgs(&aDriveList, aBURType, aBackupIncType), aStatus); + OstTraceFunctionExit0( DUP1_RSBECLIENTSESSION_SETBURMODEL_EXIT ); } /** @@ -586,7 +657,9 @@ */ void RSBEClientSession::AllSnapshotsSuppliedL(TRequestStatus& aStatus) { + OstTraceFunctionEntry0( DUP1_RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL_ENTRY ); SendReceive(ESBEMsgAllSnapshotsSupplied, aStatus); + OstTraceFunctionExit0( DUP1_RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL_EXIT ); } /** @@ -597,7 +670,9 @@ */ void RSBEClientSession::AllSystemFilesRestoredL(TRequestStatus& aStatus) { + OstTraceFunctionEntry0( RSBECLIENTSESSION_ALLSYSTEMFILESRESTOREDL_ENTRY ); SendReceive(ESBEMsgAllSystemFilesRestored, aStatus); + OstTraceFunctionExit0( RSBECLIENTSESSION_ALLSYSTEMFILESRESTOREDL_EXIT ); } @@ -609,6 +684,7 @@ */ void RSBEClientSession::PopulateListOfDataOwnersL(TUint aBufferSize) { + OstTraceFunctionEntry0( RSBECLIENTSESSION_POPULATELISTOFDATAOWNERSL_ENTRY ); __ASSERT_DEBUG(iDataOwnersArray, Panic(KErrBadHandle)); iDataOwnersArray->ResetAndDestroy(); @@ -620,7 +696,7 @@ TPtr8 returnedBuf(pReturnedBuf->Des()); // Request that the server returns the previously packed array TInt result = SendReceive(ESBEMsgGetDataOwnerInfo, TIpcArgs(&returnedBuf)); - User::LeaveIfError(result); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, RSBECLIENTSESSION_POPULATELISTOFDATAOWNERSL, "Leave: %d", result)); TInt offset = 0; @@ -637,6 +713,7 @@ } CleanupStack::PopAndDestroy(pReturnedBuf); + OstTraceFunctionExit0( RSBECLIENTSESSION_POPULATELISTOFDATAOWNERSL_EXIT ); } /** @@ -647,6 +724,7 @@ */ void RSBEClientSession::PopulatePublicFileListL(TUint aBufferSize) { + OstTraceFunctionEntry0( RSBECLIENTSESSION_POPULATEPUBLICFILELISTL_ENTRY ); __ASSERT_DEBUG(iFileArray, Panic(KErrBadHandle)); iFileArray->Reset(); @@ -655,7 +733,8 @@ CleanupStack::PushL(pFileArray); TPtr8 fileArray(pFileArray->Des()); - User::LeaveIfError(SendReceive(ESBEMsgGetPublicFiles, TIpcArgs(&fileArray))); + TInt result = SendReceive(ESBEMsgGetPublicFiles, TIpcArgs(&fileArray)); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, RSBECLIENTSESSION_POPULATEPUBLICFILELISTL, "Leave: %d", result)); RFileArray* pFiles = RFileArray::InternaliseL(fileArray); CleanupStack::PopAndDestroy(pFileArray); @@ -671,6 +750,7 @@ CleanupStack::PopAndDestroy(pFiles); // CleanupClosePushL(*pFiles) CleanupStack::PopAndDestroy(pFiles); // CleanupStack::PushL(pFiles) + OstTraceFunctionExit0( RSBECLIENTSESSION_POPULATEPUBLICFILELISTL_EXIT ); } void RSBEClientSession::PublicFileListL(TDriveNumber aDrive, CSBGenericDataType& aGenericDataType, @@ -691,6 +771,7 @@ @param aStatus The TRequestStatus that will be completed once the engine has fully processed this request */ { + OstTraceFunctionEntry0( DUP2_RSBECLIENTSESSION_PUBLICFILELISTL_ENTRY ); if (iCallbackHandler == NULL) { iCallbackHandler = CSBECallbackHandler::NewL(*this); @@ -698,6 +779,7 @@ if (iCallbackHandler->IsActive()) { + OstTrace0(TRACE_ERROR, DUP2_RSBECLIENTSESSION_PUBLICFILELISTL, "Leave: KErrInUse"); User::Leave(KErrInUse); } else @@ -713,6 +795,7 @@ iCallbackHandler->iStatus); iCallbackHandler->StartL(aStatus,ELargePublicFileList); } + OstTraceFunctionExit0( DUP2_RSBECLIENTSESSION_PUBLICFILELISTL_EXIT ); } void RSBEClientSession::PopulateLargePublicFileListL(TInt aResult) @@ -721,6 +804,7 @@ @param aResult The error code returned by the engine as a result of the initial request */ { + OstTraceFunctionEntry0( RSBECLIENTSESSION_POPULATELARGEPUBLICFILELISTL_ENTRY ); // Retrieve the return parameters (finished flag and entry count) from SBE if (KErrNone == aResult) { @@ -728,7 +812,8 @@ TInt numEntries; TPckg finishPkg(finishedFlag); TPckg numEntriesPkg(numEntries); - User::LeaveIfError(SendReceive(ESBEMsgGetLargePublicFiles, TIpcArgs(&finishPkg, &numEntriesPkg))); + TInt result = SendReceive(ESBEMsgGetLargePublicFiles, TIpcArgs(&finishPkg, &numEntriesPkg)); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, RSBECLIENTSESSION_POPULATELARGEPUBLICFILELISTL, "Leave: %d", result)); *iFinished = finishPkg(); TInt numberOfReturnedEntries = numEntriesPkg(); @@ -752,6 +837,7 @@ { *iFinished = EFalse; } + OstTraceFunctionExit0( RSBECLIENTSESSION_POPULATELARGEPUBLICFILELISTL_EXIT ); } @@ -765,28 +851,36 @@ */ CSBECallbackHandler* CSBECallbackHandler::NewL(RSBEClientSession& aClientSession) { + OstTraceFunctionEntry0( CSBECALLBACKHANDLER_NEWL_ENTRY ); CSBECallbackHandler* self = new (ELeave) CSBECallbackHandler(aClientSession); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSBECALLBACKHANDLER_NEWL_EXIT ); return self; } /** Symbian second phase constructor */ void CSBECallbackHandler::ConstructL() { + OstTraceFunctionEntry0( CSBECALLBACKHANDLER_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CSBECALLBACKHANDLER_CONSTRUCTL_EXIT ); } /** Class constructor. */ CSBECallbackHandler::CSBECallbackHandler(RSBEClientSession& aClientSession) : CActive(EPriorityNormal), iClientSession(aClientSession) { + OstTraceFunctionEntry0( CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_CONS_ENTRY ); CActiveScheduler::Add(this); + OstTraceFunctionExit0( CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_CONS_EXIT ); } /** Class destructor. */ CSBECallbackHandler::~CSBECallbackHandler() { + OstTraceFunctionEntry0( CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_DES_ENTRY ); Cancel(); + OstTraceFunctionExit0( CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_DES_EXIT ); } /** Starts Callback Handler @@ -797,10 +891,12 @@ */ void CSBECallbackHandler::StartL(TRequestStatus& aStatus, TState aState) { + OstTraceFunctionEntry0( CSBECALLBACKHANDLER_STARTL_ENTRY ); aStatus = KRequestPending; iObserver = &aStatus; iState = aState; SetActive(); + OstTraceFunctionExit0( CSBECALLBACKHANDLER_STARTL_EXIT ); } /** @@ -808,13 +904,16 @@ */ void CSBECallbackHandler::CancelRequest() { + OstTraceFunctionEntry0( CSBECALLBACKHANDLER_CANCELREQUEST_ENTRY ); Cancel(); + OstTraceFunctionExit0( CSBECALLBACKHANDLER_CANCELREQUEST_EXIT ); } /** CActive::RunL() implementation */ void CSBECallbackHandler::RunL() { + OstTraceFunctionEntry0( CSBECALLBACKHANDLER_RUNL_ENTRY ); TInt result = iStatus.Int(); if (result >= KErrNone) { @@ -835,9 +934,10 @@ } //switch } // if - User::LeaveIfError(result); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, CSBECALLBACKHANDLER_RUNL, "Leave: %d", result)); CompleteObserver(KErrNone); + OstTraceFunctionExit0( CSBECALLBACKHANDLER_RUNL_EXIT ); } /** @@ -846,9 +946,11 @@ */ void CSBECallbackHandler::DoCancel() { + OstTraceFunctionEntry0( CSBECALLBACKHANDLER_DOCANCEL_ENTRY ); iState = ENone; // just to avoid repeating the code CompleteObserver(KErrCancel); + OstTraceFunctionExit0( CSBECALLBACKHANDLER_DOCANCEL_EXIT ); } /** @@ -857,11 +959,13 @@ */ void CSBECallbackHandler::CompleteObserver(TInt aError) { + OstTraceFunctionEntry0( CSBECALLBACKHANDLER_COMPLETEOBSERVER_ENTRY ); if(iObserver) { User::RequestComplete(iObserver, aError); iObserver = NULL; } + OstTraceFunctionExit0( CSBECALLBACKHANDLER_COMPLETEOBSERVER_EXIT ); } /** @@ -871,7 +975,9 @@ */ TInt CSBECallbackHandler::RunError(TInt aError) { + OstTraceFunctionEntry0( CSBECALLBACKHANDLER_RUNERROR_ENTRY ); CompleteObserver(aError); + OstTraceFunctionExit0( CSBECALLBACKHANDLER_RUNERROR_EXIT ); return KErrNone; } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbecompressionandencryption.cpp --- a/backupandrestore/backupengine/src/sbecompressionandencryption.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbecompressionandencryption.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,12 +20,16 @@ */ #include "sbencrypt.h" #include "sbecompressionandencryption.h" -#include "sblog.h" #include "sbtypes.h" #include #include #include +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbecompressionandencryptionTraces.h" +#endif // Uncomment the next line if you want to turn off compression & encryption, ignore the warnings. //#define TURN_OFF_COMPRESSION_AND_ENCRYPTION @@ -55,12 +59,14 @@ @param aToCopy the amount of data to copy */ { + OstTraceFunctionEntry0( _CONN_READL_ENTRY ); TUint8* inData = const_cast(aBuffer.Ptr()); TUint8* outData = (reinterpret_cast(&aT)) + aStartAt; for (TInt x = 0; x < aToCopy; x++) { *(outData++) = *(inData++); } // for + OstTraceFunctionExit0( _CONN_READL_EXIT ); } @@ -73,6 +79,7 @@ @param aToCopy the amount of data to copy */ { + OstTraceFunctionEntry0( _CONN_WRITEL_ENTRY ); TUint8* inData = reinterpret_cast(&aT); TUint8* outData = (const_cast(aBuffer.Ptr())) + aStartAt; for (TInt x = 0; x < aToCopy; x++) @@ -81,6 +88,7 @@ } // for aBuffer.SetLength(aBuffer.Length() + sizeof(T)); + OstTraceFunctionExit0( _CONN_WRITEL_EXIT ); } CSBECompressAndEncrypt* CSBECompressAndEncrypt::NewLC(CSBGenericTransferType*& apTransferType, TPtr8& aInputData) @@ -90,10 +98,12 @@ @param aInputData data block to be used. Start point will be changed to allow for compression. */ { + OstTraceFunctionEntry0( CSBECOMPRESSANDENCRYPT_NEWLC_ENTRY ); CSBECompressAndEncrypt* self = new(ELeave) CSBECompressAndEncrypt(); CleanupStack::PushL(self); self->ConstructL(apTransferType, aInputData); + OstTraceFunctionExit0( CSBECOMPRESSANDENCRYPT_NEWLC_EXIT ); return self; } @@ -102,18 +112,22 @@ /** Standard C++ Constructor */ { + OstTraceFunctionEntry0( CSBECOMPRESSANDENCRYPT_CSBECOMPRESSANDENCRYPT_CONS_ENTRY ); + OstTraceFunctionExit0( CSBECOMPRESSANDENCRYPT_CSBECOMPRESSANDENCRYPT_CONS_EXIT ); } CSBECompressAndEncrypt::~CSBECompressAndEncrypt() /** Standard C++ Destructor */ { +OstTraceFunctionEntry0( CSBECOMPRESSANDENCRYPT_CSBECOMPRESSANDENCRYPT_DES_ENTRY ); #ifndef TURN_OFF_COMPRESSION_AND_ENCRYPTION if( ! iIsFreed ) iOffsetStart->Set(iActualStart); // free reserved space when leave occurs. #endif delete iCipher; + OstTraceFunctionExit0( CSBECOMPRESSANDENCRYPT_CSBECOMPRESSANDENCRYPT_DES_EXIT ); } void CSBECompressAndEncrypt::ConstructL(CSBGenericTransferType*& apTransferType, TPtr8& aOutputData) @@ -124,7 +138,8 @@ @param aInputData data block to be used. Start point will be changed to allow for compression. */ { - __LOG2("CSBECompressAndEncrypt::ConstructL() - START - aOutputData: 0x%08x (%d)", aOutputData.Ptr(), aOutputData.Length()); + OstTraceFunctionEntry0( CSBECOMPRESSANDENCRYPT_CONSTRUCTL_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CSBECOMPRESSANDENCRYPT_CONSTRUCTL, "aOutputData: 0x%08x (%d)", reinterpret_cast(aOutputData.Ptr()), static_cast(aOutputData.Length())); #ifndef TURN_OFF_COMPRESSION_AND_ENCRYPTION // Do we need a key source and cipher? @@ -170,7 +185,7 @@ // Create the cipher, if needed. if (iDoEncrypt) { - __LOG1("Key length: %d", iKey.Length() * 4); + OstTrace1(TRACE_NORMAL, DUP1_CSBECOMPRESSANDENCRYPT_CONSTRUCTL, "Key length: %d", iKey.Length() * 4); iCipher = CARC4::NewL(iKey); } // if @@ -180,7 +195,7 @@ // Reserve the space required TInt numberBlocks = (aOutputData.MaxSize() / KCompressionBlockSize) + (((aOutputData.MaxSize() % KCompressionBlockSize) == 0) ? 0 : 1); TInt reservedSpace = (numberBlocks * iCompressionGrowthSize) + extraToReserve; - __LOG2("CSBECompressAndEncrypt::ConstructL() - numberBlocks: %d, reservedSpace: %d", numberBlocks, reservedSpace); + OstTraceExt2(TRACE_NORMAL, DUP2_CSBECOMPRESSANDENCRYPT_CONSTRUCTL, "numberBlocks: %d, reservedSpace: %d", numberBlocks, reservedSpace); // Keep a copy of the acutual data block iActualStart.Set(const_cast(aOutputData.Ptr()), 0, aOutputData.MaxSize()); @@ -188,12 +203,14 @@ // Reserve the space in the input data if (reservedSpace > aOutputData.MaxSize()) { + OstTrace0(TRACE_ERROR, DUP4_CSBECOMPRESSANDENCRYPT_CONSTRUCTL, "Leave: KErrOverflow"); User::Leave(KErrOverflow); } aOutputData.Set((const_cast(aOutputData.Ptr()) + reservedSpace), 0, aOutputData.MaxSize() - reservedSpace); iOffsetStart = &aOutputData; #endif - __LOG2("CSBECompressAndEncrypt::ConstructL() - END - aOutputData: 0x%08x (%d)", aOutputData.Ptr(), aOutputData.Length()); + OstTraceExt2(TRACE_NORMAL, DUP3_CSBECOMPRESSANDENCRYPT_CONSTRUCTL, "aOutputData: 0x%08x (%d)", reinterpret_cast(aOutputData.Ptr()), static_cast(aOutputData.Length())); + OstTraceFunctionExit0( CSBECOMPRESSANDENCRYPT_CONSTRUCTL_EXIT ); } void CSBECompressAndEncrypt::PackL(TPtr8& aOutputData) @@ -202,7 +219,8 @@ @param aOutputData the compressed data */ { - __LOG4("CSBECompressAndEncrypt::PackL() - START - aOutputData: 0x%08x (%d), iActualStart: 0x%08x (%d)", aOutputData.Ptr(), aOutputData.Length(), iActualStart.Ptr(), iActualStart.Length()); + OstTraceFunctionEntry0( CSBECOMPRESSANDENCRYPT_PACKL_ENTRY ); + OstTraceExt4(TRACE_NORMAL, CSBECOMPRESSANDENCRYPT_PACKL, "aOutputData: 0x%08x (%d), iActualStart: 0x%08x (%d)", reinterpret_cast(aOutputData.Ptr()), static_cast(aOutputData.Length()), reinterpret_cast(iActualStart.Ptr()), static_cast(iActualStart.Length())); #ifndef TURN_OFF_COMPRESSION_AND_ENCRYPTION // Add the encryption header TEncryptionHeader encryptionHeader; @@ -210,9 +228,9 @@ encryptionHeader.iBufferSize = iBuffer.Size(); encryptionHeader.iTotalSize = sizeof(TEncryptionHeader) + encryptionHeader.iBufferSize; - __LOG1("CSBECompressAndEncrypt::PackL() - Encryption Header: Encryption supported %d", encryptionHeader.iEncrypted); - __LOG1("CSBECompressAndEncrypt::PackL() - Encryption Header: BufferSize %d", encryptionHeader.iBufferSize); - __LOG1("CSBECompressAndEncrypt::PackL() - Encryption Header: Total Size %d",encryptionHeader.iTotalSize); + OstTrace1(TRACE_NORMAL, DUP1_CSBECOMPRESSANDENCRYPT_PACKL, "Encryption Header: Encryption supported %d", encryptionHeader.iEncrypted); + OstTrace1(TRACE_NORMAL, DUP2_CSBECOMPRESSANDENCRYPT_PACKL, "Encryption Header: BufferSize %d", encryptionHeader.iBufferSize); + OstTrace1(TRACE_NORMAL, DUP3_CSBECOMPRESSANDENCRYPT_PACKL, "Encryption Header: Total Size %d",encryptionHeader.iTotalSize); // Move along TPtr8 encryptionOffset(const_cast(iActualStart.Ptr()), 0, sizeof(TEncryptionHeader)); @@ -253,8 +271,8 @@ compressionHeader.iCompressedSize = compressionBuffer->Size(); compressionHeader.iUncompressedSize = toCompressSize; - __LOG1("CSBECompressAndEncrypt::PackL() - Compression Header: Compressed %d", compressionHeader.iCompressedSize); - __LOG1("CSBECompressAndEncrypt::PackL() - Compression Header: UnCompressed %d", compressionHeader.iUncompressedSize); + OstTrace1(TRACE_NORMAL, DUP4_CSBECOMPRESSANDENCRYPT_PACKL, "Compression Header: Compressed %d", compressionHeader.iCompressedSize); + OstTrace1(TRACE_NORMAL, DUP5_CSBECOMPRESSANDENCRYPT_PACKL, "Compression Header: UnCompressed %d", compressionHeader.iUncompressedSize); if (iDoEncrypt) { @@ -291,7 +309,8 @@ aOutputData.Set(iActualStart); iIsFreed = ETrue; #endif - __LOG("CSBECompressAndEncrypt::PackL() - END"); + + OstTraceFunctionExit0( CSBECOMPRESSANDENCRYPT_PACKL_EXIT ); } void CSBECompressAndEncrypt::FreeReservedSpace(TPtr8& aOutputData) /* @@ -299,26 +318,28 @@ @param aOutputData the compressed data */ { - __LOG("CSBECompressAndEncrypt::FreeReservedSpace() - START"); + OstTraceFunctionEntry0( CSBECOMPRESSANDENCRYPT_FREERESERVEDSPACE_ENTRY ); #ifndef TURN_OFF_COMPRESSION_AND_ENCRYPTION - __LOG1("CSBECompressAndEncrypt::FreeReservedSpace() aOutputData.Length(): %d", aOutputData.Length()); + OstTrace1(TRACE_NORMAL, CSBECOMPRESSANDENCRYPT_FREERESERVEDSPACE, "aOutputData.Length(): %d", aOutputData.Length()); aOutputData.Set(iActualStart); iIsFreed = ETrue; #endif - __LOG("CSBECompressAndEncrypt::FreeReservedSpace() - END"); + OstTraceFunctionExit0( CSBECOMPRESSANDENCRYPT_FREERESERVEDSPACE_EXIT ); } CSBEDecompressAndEncrypt* CSBEDecompressAndEncrypt::NewL() /** Standard Symbian constructor */ { + OstTraceFunctionEntry0( CSBEDECOMPRESSANDENCRYPT_NEWL_ENTRY ); CSBEDecompressAndEncrypt* self = CSBEDecompressAndEncrypt::NewLC(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSBEDECOMPRESSANDENCRYPT_NEWL_EXIT ); return self; } @@ -326,9 +347,11 @@ /** Standard Symbian constructor */ { + OstTraceFunctionEntry0( CSBEDECOMPRESSANDENCRYPT_NEWLC_ENTRY ); CSBEDecompressAndEncrypt* self = new(ELeave) CSBEDecompressAndEncrypt(); CleanupStack::PushL(self); + OstTraceFunctionExit0( CSBEDECOMPRESSANDENCRYPT_NEWLC_EXIT ); return self; } @@ -337,26 +360,33 @@ /** Stanard C++ Constructor */ { + OstTraceFunctionEntry0( CSBEDECOMPRESSANDENCRYPT_CSBEDECOMPRESSANDENCRYPT_ENTRY ); Reset(); + OstTraceFunctionExit0( CSBEDECOMPRESSANDENCRYPT_CSBEDECOMPRESSANDENCRYPT_EXIT ); } CSBEDecompressAndEncrypt::~CSBEDecompressAndEncrypt() /** Standard C++ Destructor */ { + OstTraceFunctionEntry0( DUP1_CSBEDECOMPRESSANDENCRYPT_CSBEDECOMPRESSANDENCRYPT_ENTRY ); delete iCipher; delete iJavaHash; delete iBuffer; + OstTraceFunctionExit0( DUP1_CSBEDECOMPRESSANDENCRYPT_CSBEDECOMPRESSANDENCRYPT_EXIT ); } void CSBEDecompressAndEncrypt::SetBuffer(TDesC8& aOutputData) { + OstTraceFunctionEntry0( CSBEDECOMPRESSANDENCRYPT_SETBUFFER_ENTRY ); iCurrentPtr.Set(const_cast(aOutputData.Ptr()), aOutputData.Size(), aOutputData.Size()); + OstTraceFunctionExit0( CSBEDECOMPRESSANDENCRYPT_SETBUFFER_EXIT ); } void CSBEDecompressAndEncrypt::SetGenericTransferTypeL(CSBGenericTransferType*& apTransferType) { - __LOG("CSBEDecompressAndEncrypt::SetGenericTransferTypeL() - START"); + OstTraceFunctionEntry0( CSBEDECOMPRESSANDENCRYPT_SETGENERICTRANSFERTYPEL_ENTRY ); + #ifndef TURN_OFF_COMPRESSION_AND_ENCRYPTION TSBDerivedType derivedType = apTransferType->DerivedTypeL(); if (derivedType == ESIDTransferDerivedType) @@ -374,7 +404,7 @@ iDriveNumber = pSIDTransferType->DriveNumberL(); iSecureId = pSIDTransferType->SecureIdL(); - __LOG1("CSBEDecompressAndEncrypt::SetGenericTransferTypeL() - SecureId ID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, CSBEDECOMPRESSANDENCRYPT_SETGENERICTRANSFERTYPEL, "SecureId ID 0x%08x", iSecureId.iId); iType = ESid; } // if CleanupStack::PopAndDestroy(pSIDTransferType); @@ -387,7 +417,7 @@ // Do we need to perform a reset const TDesC& javahash = pJavaTransferType->SuiteHashL(); - __LOG1("CSBEDecompressAndEncrypt::SetGenericTransferTypeL() - JavaHash %S", &javahash); + OstTraceExt1(TRACE_NORMAL, DUP1_CSBEDECOMPRESSANDENCRYPT_SETGENERICTRANSFERTYPEL, "JavaHash %S", javahash); if ((iType != EJava) || (iDriveNumber != pJavaTransferType->DriveNumberL()) || (iJavaHash->Des() != javahash)) @@ -419,7 +449,7 @@ { Reset(); iPackageId = pPackageTransferType->PackageIdL(); - __LOG1("CSBEDecompressAndEncrypt::SetGenericTransferTypeL() - Package ID 0x%08x", iPackageId.iUid); + OstTrace1(TRACE_NORMAL, DUP2_CSBEDECOMPRESSANDENCRYPT_SETGENERICTRANSFERTYPEL, "Package ID 0x%08x", iPackageId.iUid); iType = EPackage; } @@ -427,18 +457,19 @@ } // else if else { - __LOG("CSBEDecompressAndEncrypt::SetGenericTransferTypeL() - DerivedType not supported"); + OstTrace0(TRACE_ERROR, DUP3_CSBEDECOMPRESSANDENCRYPT_SETGENERICTRANSFERTYPEL, "DerivedType not supported"); User::Leave(KErrNotSupported); } // else #endif - __LOG("CSBEDecompressAndEncrypt::SetGenericTransferTypeL() - END"); + + OstTraceFunctionExit0( CSBEDECOMPRESSANDENCRYPT_SETGENERICTRANSFERTYPEL_EXIT ); } void CSBEDecompressAndEncrypt::Reset() /** Resets the data */ { - __LOG("CSBEDecompressAndEncrypt::Reset()"); + OstTraceFunctionEntry0( CSBEDECOMPRESSANDENCRYPT_RESET_ENTRY ); iCount = 0; iType = ENotSet; iDoDecrypt = EFalse; @@ -450,6 +481,7 @@ iGotCipher = EFalse; delete iBuffer; iBuffer = NULL; + OstTraceFunctionExit0( CSBEDECOMPRESSANDENCRYPT_RESET_EXIT ); } void CSBEDecompressAndEncrypt::MoveAlongL(TPtr8& aPtr, TInt aAmount) @@ -459,15 +491,17 @@ @param aAmount amount to move */ { + OstTraceFunctionEntry0( CSBEDECOMPRESSANDENCRYPT_MOVEALONGL_ENTRY ); TInt newSize = aPtr.Size() - aAmount; // Check if (newSize < 0) { - __LOG("CSBEDecompressAndEncrypt::MoveAlong() - Overflow"); + OstTrace0(TRACE_ERROR, CSBEDECOMPRESSANDENCRYPT_MOVEALONGL, "Overflow"); User::Leave(KErrOverflow); } aPtr.Set(const_cast(aPtr.Ptr()) + aAmount, newSize, newSize); + OstTraceFunctionExit0( CSBEDECOMPRESSANDENCRYPT_MOVEALONGL_EXIT ); } TBool CSBEDecompressAndEncrypt::NextLC(HBufC8*& apOutput, TBool& aMoreData) @@ -477,20 +511,21 @@ @param aMoreData is there more data left in the compressed block. */ { - __LOG("CSBEDecompressAndEncrypt::NextLC() - START"); + OstTraceFunctionEntry0( CSBEDECOMPRESSANDENCRYPT_NEXTLC_ENTRY ); #ifndef TURN_OFF_COMPRESSION_AND_ENCRYPTION if (!iGotCipher) { iGotCipher = CreateCipherL(); if (!iGotCipher) { + OstTraceFunctionExit0( CSBEDECOMPRESSANDENCRYPT_NEXTLC_EXIT ); return EFalse; } // if } if (!iGotCompressionHeader) { - __LOG("CSBEDecompressAndEncrypt::NextLC - No Header read yet"); + OstTrace0(TRACE_NORMAL, CSBEDECOMPRESSANDENCRYPT_NEXTLC, "No Header read yet"); // Determine how much data we need to read to complete the header TInt dataAvail = iCurrentPtr.Size(); @@ -507,24 +542,25 @@ if (iCompressionSizeRead < sizeof(TCompressionHeader)) { - __LOG1("CSBEDecompressAndEncrypt::NextLC - Got partial compression header (%d bytes)",iCompressionSizeRead ); + OstTrace1(TRACE_NORMAL, DUP1_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "Got partial compression header (%d bytes)",iCompressionSizeRead ); + OstTraceFunctionExit0( DUP1_CSBEDECOMPRESSANDENCRYPT_NEXTLC_EXIT ); return EFalse; } - __LOG2("CSBEDecompressAndEncrypt::NextLC - Got compression header (compressed size=%d, uncompressed=%d)", + OstTraceExt2(TRACE_NORMAL, DUP2_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "Got compression header (compressed size=%d, uncompressed=%d)", iCompressionHeader.iCompressedSize, iCompressionHeader.iUncompressedSize); // Was the header encrypted? if (iEncryptionHeader.iEncrypted) { - __LOG("CSBEDecompressAndEncrypt::NextLC - Header Encrypted!"); + OstTrace0(TRACE_NORMAL, DUP3_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "Header Encrypted!"); TCompressionHeader compressionHeader; TPtr8 inData(reinterpret_cast(&iCompressionHeader), sizeof(TCompressionHeader), sizeof(TCompressionHeader)); TPtr8 outData(reinterpret_cast(&compressionHeader), 0, sizeof(TCompressionHeader)); iCipher->Process(inData, outData); iCompressionHeader = compressionHeader; - __LOG2("CSBEDecompressAndEncrypt::NextLC - unencrypted header, compressed size %d, uncompressed %d", iCompressionHeader.iCompressedSize, iCompressionHeader.iUncompressedSize); + OstTraceExt2(TRACE_NORMAL, DUP4_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "unencrypted header, compressed size %d, uncompressed %d", iCompressionHeader.iCompressedSize, iCompressionHeader.iUncompressedSize); } iCompressionSizeRead = 0; @@ -537,7 +573,7 @@ (iCompressionHeader.iCompressedSize >= KMaxHeapSize) || (iCompressionHeader.iUncompressedSize >= KMaxHeapSize)) { - __LOG("CSBEDecompressAndEncrypt::NextLC() - Compression header is corrupt"); + OstTrace0(TRACE_ERROR, DUP5_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "Compression header is corrupt"); User::Leave(KErrCorrupt); } @@ -545,24 +581,25 @@ { // Do we have enough data to decompress? TInt dataSize = iCurrentPtr.Size(); - __LOG1("CSBEDecompressAndEncrypt::NextLC() - Doing Decompression - data size %d", dataSize); + OstTrace1(TRACE_NORMAL, DUP6_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "Doing Decompression - data size %d", dataSize); if (iBuffer != NULL) { dataSize += iBuffer->Size(); - __LOG1("CSBEDecompressAndEncrypt::NextLC() - iBuffer not NULL new data size %d", dataSize) + OstTrace1(TRACE_NORMAL, DUP7_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "iBuffer not NULL new data size %d", dataSize); } if (dataSize < iCompressionHeader.iCompressedSize) { - __LOG("CSBEDecompressAndEncrypt::NextLC() - data size < compressed size"); + OstTrace0(TRACE_NORMAL, DUP8_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "data size < compressed size"); // Need to buffer the buffer if (iBuffer == NULL) { - __LOG1("CSBEDecompressAndEncrypt::NextLC() - Creating internal buffer of size %d",iCompressionHeader.iCompressedSize); + OstTrace1(TRACE_NORMAL, DUP9_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "Creating internal buffer of size %d",iCompressionHeader.iCompressedSize); iBuffer = HBufC8::NewL(iCompressionHeader.iCompressedSize); } iBuffer->Des().Append(const_cast(iCurrentPtr.Ptr()), iCurrentPtr.Size()); - __LOG("CSBEDecompressAndEncrypt::NextLC() - Appending data to internal buffer"); + OstTrace0(TRACE_NORMAL, DUP10_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "Appending data to internal buffer"); + OstTraceFunctionExit0( DUP2_CSBEDECOMPRESSANDENCRYPT_NEXTLC_EXIT ); return EFalse; } // if @@ -571,7 +608,7 @@ TInt toAppend = 0; if (iBuffer != NULL) { - __LOG("CSBEDecompressAndEncrypt::NextLC() - Preparing inData from internal buffer"); + OstTrace0(TRACE_NORMAL, DUP11_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "Preparing inData from internal buffer"); toAppend = iCompressionHeader.iCompressedSize - iBuffer->Des().Size(); iBuffer->Des().Append(const_cast(iCurrentPtr.Ptr()), toAppend); @@ -579,16 +616,16 @@ } // if else { - __LOG("CSBEDecompressAndEncrypt::NextLC() - Preparing inData"); + OstTrace0(TRACE_NORMAL, DUP12_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "Preparing inData"); inData.Set(const_cast(iCurrentPtr.Ptr()), iCompressionHeader.iCompressedSize, iCompressionHeader.iCompressedSize); } // else // Uncompress + Decrypt the buffer apOutput = HBufC8::NewLC(iCompressionHeader.iUncompressedSize); - __LOG1("CSBEDecompressAndEncrypt::NextLC() - Allocated Output data for uncompressed data of size %d", iCompressionHeader.iUncompressedSize); + OstTrace1(TRACE_NORMAL, DUP13_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "Allocated Output data for uncompressed data of size %d", iCompressionHeader.iUncompressedSize); if (iEncryptionHeader.iEncrypted) { - __LOG("CSBEDecompressAndEncrypt::NextLC() Encrypted data, trying to allocate temp"); + OstTrace0(TRACE_NORMAL, DUP14_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "Encrypted data, trying to allocate temp"); // Need another temp buffer HBufC8* temp = HBufC8::NewLC(iCompressionHeader.iCompressedSize); @@ -601,14 +638,14 @@ // Cleanup CleanupStack::PopAndDestroy(temp); - __LOG("CSBEDecompressAndEncrypt::NextLC() Decryption and decompresson done"); + OstTrace0(TRACE_NORMAL, DUP15_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "Decryption and decompresson done"); } // if else { // Decompress TPtr8 ptrOutput = apOutput->Des(); CEZDecompressor::DecompressL(ptrOutput, inData); - __LOG("CSBEDecompressAndEncrypt::NextLC() decompresson done"); + OstTrace0(TRACE_NORMAL, DUP16_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "decompresson done"); } // else iCount += iCompressionHeader.iCompressedSize; @@ -627,7 +664,7 @@ iDoneDecompression = ETrue; } // if - __LOG2("CSBEDecompressAndEncrypt::NextLC() - encryption buffer done %d of %d", iCount, iEncryptionHeader.iTotalSize); + OstTraceExt2(TRACE_NORMAL, DUP17_CSBEDECOMPRESSANDENCRYPT_NEXTLC, "encryption buffer done %d of %d", iCount, iEncryptionHeader.iTotalSize); // If the entire encrypted block has been read, prepare to read the next one if (iCount >= iEncryptionHeader.iTotalSize) @@ -674,7 +711,8 @@ aMoreData = ETrue; } #endif - __LOG("CSBEDecompressAndEncrypt::NextLC() - END"); + + OstTraceFunctionExit0( DUP3_CSBEDECOMPRESSANDENCRYPT_NEXTLC_EXIT ); return ETrue; } @@ -685,7 +723,7 @@ @return ETrue if cipher created, otherwise EFalse. */ { - __LOG("CSBEDecompressAndEncrypt::CreateCipherL() - START"); + OstTraceFunctionEntry0( CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL_ENTRY ); TInt dataAvail = iCurrentPtr.Size(); if (iEncryptionSizeRead + dataAvail > sizeof(TEncryptionHeader)) @@ -701,18 +739,19 @@ if (iEncryptionSizeRead < sizeof(TEncryptionHeader)) { - __LOG1("CSBEDecompressAndEncrypt::CreateCipherL - Got partial encryption header (%d bytes)",iEncryptionSizeRead); + OstTrace1(TRACE_NORMAL, CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL, "Got partial encryption header (%d bytes)",iEncryptionSizeRead); + OstTraceFunctionExit0( CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL_EXIT ); return EFalse; } - __LOG3("CSBEDecompressAndEncrypt::CreateCipherL - Got encryption header (encrypted=%d, buffer size=%d, total size=%d)", + OstTraceExt3(TRACE_NORMAL, DUP1_CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL, "Got encryption header (encrypted=%d, buffer size=%d, total size=%d)", iEncryptionHeader.iEncrypted, iEncryptionHeader.iBufferSize, iEncryptionHeader.iTotalSize); // Check we have a sensible encryption header if ((iEncryptionHeader.iBufferSize < 0) || (iEncryptionHeader.iBufferSize >= KMaxTInt/2) || (iEncryptionHeader.iTotalSize < 0)) { - __LOG("CSBEDecompressAndEncrypt::CreateCipherL() - Corrupt data"); + OstTrace0(TRACE_ERROR, DUP2_CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL, "Corrupt data"); User::Leave(KErrCorrupt); } if (iEncryptionHeader.iEncrypted) @@ -741,6 +780,7 @@ keySource->GetRestoreKeyL(iDriveNumber, iSecureId, gotBuffer, ptrAlignedBuffer, gotKey, key); if (!gotKey) { + OstTrace0(TRACE_ERROR, DUP3_CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL, "Leave: KErrCorrupt"); User::Leave(KErrCorrupt); } @@ -760,8 +800,8 @@ // Set iCount iCount += iEncryptionHeader.iBufferSize; // Move current pointer along - MoveAlongL(iCurrentPtr, iEncryptionHeader.iBufferSize); - __LOG("CSBEDecompressAndEncrypt::CreateCipherL() - END"); + MoveAlongL(iCurrentPtr, iEncryptionHeader.iBufferSize); + OstTraceFunctionExit0( DUP1_CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL_EXIT ); return ETrue; } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbeconfig.cpp --- a/backupandrestore/backupengine/src/sbeconfig.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbeconfig.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,8 +21,12 @@ #include #include "sbepanic.h" #include "sbeconfig.h" -#include "sblog.h" #include +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbeconfigTraces.h" +#endif namespace conn { @@ -66,7 +70,9 @@ */ CSBEConfig* CSBEConfig::NewL(RFs& aRFs) { + OstTraceFunctionEntry0( CSBECONFIG_NEWL_ENTRY ); CSBEConfig* self = new (ELeave) CSBEConfig(aRFs); + OstTraceFunctionExit0( CSBECONFIG_NEWL_EXIT ); return self; } @@ -75,14 +81,18 @@ */ CSBEConfig::CSBEConfig(RFs& aRFs) : iRFs(aRFs), iFileName(KConfigFile), iConfigTagVisited(EFalse) { + OstTraceFunctionEntry0( CSBECONFIG_CSBECONFIG_CONS_ENTRY ); SetDefault(); + OstTraceFunctionExit0( CSBECONFIG_CSBECONFIG_CONS_EXIT ); } /** Destructor */ CSBEConfig::~CSBEConfig() { + OstTraceFunctionEntry0( CSBECONFIG_CSBECONFIG_DES_ENTRY ); delete iConverter; + OstTraceFunctionExit0( CSBECONFIG_CSBECONFIG_DES_EXIT ); } /** @@ -93,9 +103,11 @@ */ void CSBEConfig::HeapValues(TInt& aMaxSize, TInt& aReductionFactor, TInt& aMaxRetries) const { + OstTraceFunctionEntry0( CSBECONFIG_HEAPVALUES_ENTRY ); aMaxSize = iSBEGSHMaxSize; aReductionFactor = iReductionFactor; aMaxRetries = iMaxRetries; + OstTraceFunctionExit0( CSBECONFIG_HEAPVALUES_EXIT ); } /** @@ -130,6 +142,7 @@ */ void CSBEConfig::SetDefault() { + OstTraceFunctionEntry0( CSBECONFIG_SETDEFAULT_ENTRY ); iSBEGSHMaxSize = KSBEGSHDefaultSize; iCentRepId = KCentRepSID; iDrives.SetLength(KMaxDrives); @@ -138,6 +151,7 @@ iReductionFactor = KSBEGSHReductionFactor; iMaxRetries = KSBEGSHMaxRetries; iAppCloseDelay = KDefaultDelay; + OstTraceFunctionExit0( CSBECONFIG_SETDEFAULT_EXIT ); } /** @@ -146,6 +160,7 @@ */ TInt CSBEConfig::StringToDrives(const TDesC8& aDes) { + OstTraceFunctionEntry0( CSBECONFIG_STRINGTODRIVES_ENTRY ); iDrives.SetLength(KMaxDrives); iDrives.FillZ(); @@ -161,6 +176,7 @@ } iDrives[pos] = ETrue; } + OstTraceFunctionExit0( CSBECONFIG_STRINGTODRIVES_EXIT ); return err; } @@ -170,9 +186,11 @@ */ void CSBEConfig::ParseL() { + OstTraceFunctionEntry0( CSBECONFIG_PARSEL_ENTRY ); iRFs.PrivatePath(iFileName); TFindFile findFile(iRFs); - User::LeaveIfError(findFile.FindByPath(KConfigFile, &iFileName)); + TInt err = findFile.FindByPath(KConfigFile, &iFileName); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, CSBECONFIG_PARSEL, "Leave: %d", err)); iFileName = findFile.File(); // Connect to the parser @@ -182,6 +200,7 @@ Xml::ParseL(*parser, iRFs, iFileName); CleanupStack::PopAndDestroy(parser); + OstTraceFunctionExit0( CSBECONFIG_PARSEL_EXIT ); } /** @@ -191,6 +210,7 @@ */ TInt CSBEConfig::HandleAttributesElement(const RAttributeArray& aAttributes) { + OstTraceFunctionEntry0( CSBECONFIG_HANDLEATTRIBUTESELEMENT_ENTRY ); TInt err = KErrNone; // Loop through reading out attribute values const TUint count = aAttributes.Count(); @@ -205,7 +225,7 @@ err = lex.Val(appCloseDelay); if (appCloseDelay < 0) { - __LOG("CSBEConfig::HandleAttributesElement() - Configuration Error: the time delay is negative"); + OstTrace0(TRACE_NORMAL, CSBECONFIG_HANDLEATTRIBUTESELEMENT, "Configuration Error: the time delay is negative"); err = KErrCorrupt; } else @@ -219,7 +239,7 @@ err = lex.Val(iReductionFactor); if (iReductionFactor < 0) { - __LOG("CSBEConfig::HandleAttributesElement() - Configuration Error: the reductionFactor is negative"); + OstTrace0(TRACE_NORMAL, DUP1_CSBECONFIG_HANDLEATTRIBUTESELEMENT, "Configuration Error: the reductionFactor is negative"); err = KErrCorrupt; } } @@ -229,7 +249,7 @@ err = lex.Val(iMaxRetries); if (iMaxRetries < 0) { - __LOG("CSBEConfig::HandleAttributesElement() - Configuration Error: the maxRetries is negative"); + OstTrace0(TRACE_NORMAL, DUP2_CSBECONFIG_HANDLEATTRIBUTESELEMENT, "Configuration Error: the maxRetries is negative"); err = KErrCorrupt; } } @@ -239,7 +259,7 @@ err = lex.Val(iSBEGSHMaxSize); if (iSBEGSHMaxSize < KMinHeapSize) { - __LOG1("CSBEConfig::HandleAttributesElement() - Configuration Error: heap size is less then minimum %d", KMinHeapSize); + OstTrace1(TRACE_NORMAL, DUP3_CSBECONFIG_HANDLEATTRIBUTESELEMENT, "Configuration Error: heap size is less then minimum %d", KMinHeapSize); err = KErrCorrupt; } } // if @@ -257,7 +277,7 @@ } if (err != KErrNone) { - __LOG("CSBEConfig::HandleAttributesElement() - Configuration Error: central_repostiory is NOT a HEX number"); + OstTrace0(TRACE_NORMAL, DUP4_CSBECONFIG_HANDLEATTRIBUTESELEMENT, "Configuration Error: central_repostiory is NOT a HEX number"); err = KErrCorrupt; } } // else if @@ -266,11 +286,12 @@ err = StringToDrives(value); if (err != KErrNone) { - __LOG("CSBEConfig::HandleAttributesElement() - Configuration Error: list doesn't have valid characters from a-z"); + OstTrace0(TRACE_NORMAL, DUP5_CSBECONFIG_HANDLEATTRIBUTESELEMENT, "Configuration Error: list doesn't have valid characters from a-z"); } } // else if } // for x + OstTraceFunctionExit0( CSBECONFIG_HANDLEATTRIBUTESELEMENT_EXIT ); return err; } @@ -283,14 +304,17 @@ @leave if fails to set encoding */ { + OstTraceFunctionEntry0( CSBECONFIG_ONSTARTDOCUMENTL_ENTRY ); // Create a converter for converting strings to Unicode iConverter = CCnvCharacterSetConverter::NewL(); // We only convert from UTF-8 to UTF-16 if (iConverter->PrepareToConvertToOrFromL(KCharacterSetIdentifierUtf8, iRFs) == CCnvCharacterSetConverter::ENotAvailable) { + OstTrace0(TRACE_ERROR, CSBECONFIG_ONSTARTDOCUMENTL, "Leave: KErrNotFound"); User::Leave(KErrNotFound); } + OstTraceFunctionExit0( CSBECONFIG_ONSTARTDOCUMENTL_EXIT ); } void CSBEConfig::OnEndDocumentL(TInt /*aErrorCode*/) @@ -300,9 +324,11 @@ @see MContentHandler::OnEndDocumentL() */ { + OstTraceFunctionEntry0( CSBECONFIG_ONENDDOCUMENTL_ENTRY ); // We've finished parsing the document, hence destroy the converter object delete iConverter; iConverter = NULL; + OstTraceFunctionExit0( CSBECONFIG_ONENDDOCUMENTL_EXIT ); } void CSBEConfig::OnStartElementL(const RTagInfo& aElement, const RAttributeArray& aAttributes, TInt /*aErrCode*/) @@ -315,6 +341,7 @@ @param aAttributes RAttributeArray& */ { + OstTraceFunctionEntry0( CSBECONFIG_ONSTARTELEMENTL_ENTRY ); TInt err = KErrNone; TPtrC8 localName(aElement.LocalName().DesC()); if (!localName.CompareF(KConfig)) @@ -336,7 +363,8 @@ { err = KErrCorrupt; } - User::LeaveIfError(err); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, CSBECONFIG_ONSTARTELEMENTL, "Leave: %d", err)); + OstTraceFunctionExit0( CSBECONFIG_ONSTARTELEMENTL_EXIT ); } void CSBEConfig::OnEndElementL(const RTagInfo& /*aElement*/, TInt /*aErrorCode*/) diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbedataowner.cpp --- a/backupandrestore/backupengine/src/sbedataowner.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbedataowner.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,9 +23,13 @@ #include "sbedataowner.h" #include "abserver.h" #include "sbtypes.h" -#include "sblog.h" #include "sbeparserdefs.h" #include "sbepanic.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbedataownerTraces.h" +#endif namespace conn { @@ -47,9 +51,11 @@ void CleanupRPointerArray(TAny* aPtr) { + OstTraceFunctionEntry0( _CONN_CLEANUPRPOINTERARRAY_ENTRY ); RPointerArray* array = static_cast*>(aPtr); array->ResetAndDestroy(); delete array; + OstTraceFunctionExit0( _CONN_CLEANUPRPOINTERARRAY_EXIT ); } // CSelection // @@ -64,9 +70,11 @@ */ CSelection* CSelection::NewLC(TSelectionType aType, const TDesC& aSelection) { + OstTraceFunctionEntry0( CSELECTION_NEWLC_ENTRY ); CSelection* self = new (ELeave) CSelection(aType); CleanupStack::PushL(self); self->ConstructL(aSelection); + OstTraceFunctionExit0( CSELECTION_NEWLC_EXIT ); return self; } @@ -75,7 +83,9 @@ */ CSelection::~CSelection() { + OstTraceFunctionEntry0( CSELECTION_CSELECTION_DES_ENTRY ); delete iSelection; + OstTraceFunctionExit0( CSELECTION_CSELECTION_DES_EXIT ); } /** @@ -83,6 +93,8 @@ */ CSelection::CSelection(TSelectionType aType) : iType(aType) { + OstTraceFunctionEntry0( CSELECTION_CSELECTION_CONS_ENTRY ); + OstTraceFunctionExit0( CSELECTION_CSELECTION_CONS_EXIT ); } /** @@ -90,7 +102,9 @@ */ void CSelection::ConstructL(const TDesC& aSelection) { + OstTraceFunctionEntry0( CSELECTION_CONSTRUCTL_ENTRY ); iSelection = aSelection.AllocL(); + OstTraceFunctionExit0( CSELECTION_CONSTRUCTL_EXIT ); } /** @@ -123,9 +137,11 @@ @return a CDataOwner object */ { + OstTraceFunctionEntry0( CDATAOWNER_NEWL_ENTRY ); CDataOwner* self = CDataOwner::NewLC(aSID, apDataOwnerManager); CleanupStack::Pop(self); + OstTraceFunctionExit0( CDATAOWNER_NEWL_EXIT ); return self; } @@ -137,11 +153,13 @@ @return a CDataOwner object */ { + OstTraceFunctionEntry0( CDATAOWNER_NEWLC_ENTRY ); CDataOwner* self = new(ELeave) CDataOwner(aSID, apDataOwnerManager); CleanupStack::PushL(self); self->ConstructL(); + OstTraceFunctionExit0( CDATAOWNER_NEWLC_EXIT ); return self; } @@ -156,23 +174,28 @@ @param apDataOwnerManager data owner manager to access resources */ { + OstTraceFunctionEntry0( CDATAOWNER_CDATAOWNER_CONS_ENTRY ); + OstTraceFunctionExit0( CDATAOWNER_CDATAOWNER_CONS_EXIT ); } void CDataOwner::ConstructL() /** Symbian 2nd stage constructor */ { + OstTraceFunctionEntry0( CDATAOWNER_CONSTRUCTL_ENTRY ); iRegistrationFiles = new (ELeave) CDesCArrayFlat(KDesCArrayGranularity); iPrivatePath = HBufC::NewL(0); iProxyInformationArray.Reset(); iPublicDirStack.Reset(); iPublicDirNameStack.Reset(); iPublicExcludes.Reset(); + OstTraceFunctionExit0( CDATAOWNER_CONSTRUCTL_EXIT ); } CDataOwner::~CDataOwner() /** Standard C++ destructor */ { + OstTraceFunctionEntry0( CDATAOWNER_CDATAOWNER_DES_ENTRY ); // Close the RArrays iProxyInformationArray.Close(); iStateByDrive.Close(); @@ -199,6 +222,7 @@ delete iBufferSnapshotReader; delete iTempSnapshotHolder; delete iRegistrationFiles; + OstTraceFunctionExit0( CDATAOWNER_CDATAOWNER_DES_EXIT ); } void CDataOwner::AddRegistrationFilesL(const TDesC& aFileName) @@ -209,7 +233,9 @@ @param aFileName the filename of the */ { + OstTraceFunctionEntry0( CDATAOWNER_ADDREGISTRATIONFILESL_ENTRY ); iRegistrationFiles->AppendL(aFileName); + OstTraceFunctionExit0( CDATAOWNER_ADDREGISTRATIONFILESL_EXIT ); } void CDataOwner::StartProcessIfNecessaryL() @@ -217,6 +243,7 @@ Start the active process */ { + OstTraceFunctionEntry0( CDATAOWNER_STARTPROCESSIFNECESSARYL_ENTRY ); // Do we need to check that the process is started? if (iActiveInformation.iSupported && iActiveInformation.iActiveDataOwner) { @@ -233,15 +260,15 @@ if (process.SecureId() == iSecureId) { // Process already exists - see if it's previuosly connected and has a current session - __LOG1("Process %S already exists - not starting", &processName); + OstTraceExt1(TRACE_NORMAL, CDATAOWNER_STARTPROCESSIFNECESSARYL, "Process %S already exists - not starting", processName); TRAPD(err, iStatus = ipDataOwnerManager->ABServer().SessionReadyStateL(iSecureId)); if (err == KErrNone) { - __LOG2("Existing session for process %S has status %d", &processName, iStatus); + OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNER_STARTPROCESSIFNECESSARYL, "Existing session for process %S has status %d", processName, iStatus); } // if else { - __LOG1("Existing process %S hasn't yet connected to a session", &processName); + OstTraceExt1(TRACE_NORMAL, DUP2_CDATAOWNER_STARTPROCESSIFNECESSARYL, "Existing process %S hasn't yet connected to a session", processName); iStatus = EDataOwnerNotConnected;//ReadyState only check session state when this status not equal to 'EDataOwnerReadyNoImpl' and 'EDataOwnerReady' } // else @@ -262,18 +289,19 @@ TInt createErr = process.Create(iActiveInformation.iProcessName, KNullDesC, uidType); if (createErr != KErrNone) { - __LOG2("Process %S failed to start(%d)", &iActiveInformation.iProcessName, createErr); + OstTraceExt2(TRACE_NORMAL, DUP3_CDATAOWNER_STARTPROCESSIFNECESSARYL, "Process %S failed to start(%d)", iActiveInformation.iProcessName, createErr); iStatus = EDataOwnerFailed; } // if else { - __LOG1("Process %S started.", &iActiveInformation.iProcessName); + OstTraceExt1(TRACE_NORMAL, DUP4_CDATAOWNER_STARTPROCESSIFNECESSARYL, "Process %S started.", iActiveInformation.iProcessName); process.Resume(); } // else CleanupStack::PopAndDestroy(&process); } // if } // if + OstTraceFunctionExit0( CDATAOWNER_STARTPROCESSIFNECESSARYL_EXIT ); } @@ -283,6 +311,7 @@ @leave KErrGeneral data owner has no primary registration file */ { + OstTraceFunctionEntry0( CDATAOWNER_PARSEFILESL_ENTRY ); if (!iFilesParsed) { TUint count = iRegistrationFiles->Count(); @@ -300,15 +329,15 @@ // Parse file - __LOG2("CDataOwner::ParseFilesL() - [0x%08x] - parsing reg file: %S...", iSecureId.iId, &fileName); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_PARSEFILESL, "[0x%08x] - parsing reg file: %S...", iSecureId.iId, fileName); TRAPD(err, ParseFileL(fileName)); if (err == KErrNone) { - __LOG1("CDataOwner::ParseFilesL() - [0x%08x] - ...file parsed okay", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNER_PARSEFILESL, "[0x%08x] - ...file parsed okay", iSecureId.iId); } else { - __LOG2("CDataOwner::ParseFilesL() - [0x%08x] - ...*** PARSING FAILED *** - error: %d", iSecureId.iId, err); + OstTraceExt2(TRACE_ERROR, DUP2_CDATAOWNER_PARSEFILESL, "[0x%08x] - ...*** PARSING FAILED *** - error: %d", iSecureId.iId, static_cast(err)); User::Leave(err); } @@ -321,6 +350,7 @@ // Check that a primary file was found, as there must be one if (!foundPrimaryFile) { + OstTrace0(TRACE_ERROR, DUP3_CDATAOWNER_PARSEFILESL, "Leave: KErrGeneral"); User::Leave(KErrGeneral); } // if @@ -331,6 +361,7 @@ { iStatus = EDataOwnerReady; } + OstTraceFunctionExit0( CDATAOWNER_PARSEFILESL_EXIT ); } void CDataOwner::GetExpectedDataSizeL(TTransferDataType aTransferType, @@ -343,12 +374,13 @@ @leave KErrNotReady the snapshot has not been set */ { + OstTraceFunctionEntry0( CDATAOWNER_GETEXPECTEDDATASIZEL_ENTRY ); aSize = 0; switch (aTransferType) { case EPassiveSnapshotData: { - __LOG1("CDataOwner::GetExpectedDataSizeL() - START - EPassiveSnapshotData - aDriveNumber: %c", aDriveNumber + 'A'); + OstTraceExt1(TRACE_NORMAL, CDATAOWNER_GETEXPECTEDDATASIZEL, "EPassiveSnapshotData - aDriveNumber: %c", aDriveNumber + 'A'); CDesCArray* files = new(ELeave) CDesC16ArrayFlat(KDesCArrayGranularity); CleanupStack::PushL(files); @@ -360,7 +392,7 @@ TUint count = files->Count(); aSize = count * sizeof(TSnapshot); - __LOG2("CDataOwner::GetExpectedDataSizeL() - passive snapshot count: %d, expected size: %d", count, aSize); + OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNER_GETEXPECTEDDATASIZEL, "passive snapshot count: %d, expected size: %d", count, aSize); CleanupStack::PopAndDestroy(files); break; @@ -368,7 +400,7 @@ case EPassiveBaseData: case EPassiveIncrementalData: { - __LOG1("CDataOwner::GetExpectedDataSizeL() - START - EPassiveBaseData/EPassiveIncrementalData - aDriveNumber: %c", aDriveNumber + 'A'); + OstTraceExt1(TRACE_NORMAL, DUP2_CDATAOWNER_GETEXPECTEDDATASIZEL, "EPassiveBaseData/EPassiveIncrementalData - aDriveNumber: %c", aDriveNumber + 'A'); RFileArray files; CleanupClosePushL(files); @@ -376,7 +408,7 @@ // Find all the files if (aTransferType == EPassiveBaseData) { - __LOG("CDataOwner::GetExpectedDataSizeL() - EPassiveBaseData"); + OstTrace0(TRACE_NORMAL, DUP3_CDATAOWNER_GETEXPECTEDDATASIZEL, "EPassiveBaseData"); BuildFileListL(iPassiveSelections, aDriveNumber, aTransferType, EFalse, NULL, &files, NULL); // Do we need to add the DBMS file? @@ -384,7 +416,7 @@ } // if else { - __LOG("CDataOwner::GetExpectedDataSizeL() - EPassiveIncrementalData"); + OstTrace0(TRACE_NORMAL, DUP4_CDATAOWNER_GETEXPECTEDDATASIZEL, "EPassiveIncrementalData"); // Do we have a snapshot? const TUint count = iSnapshots.Count(); @@ -405,13 +437,13 @@ // Calculate the expected data size const TUint count = files.Count(); - __LOG1("CDataOwner::GetExpectedDataSizeL() - passive file count: %d", count); + OstTrace1(TRACE_NORMAL, DUP5_CDATAOWNER_GETEXPECTEDDATASIZEL, "passive file count: %d", count); aSize = (count * sizeof(TFileFixedHeader)); for (TInt x = 0; x < count; x++) { const TEntry& fileEntry = files[x]; const TInt fileSize = fileEntry.iSize; - __LOG2("CDataOwner::GetExpectedDataSizeL() - passive file: %S, size: %d", &fileEntry.iName, fileSize); + OstTraceExt2(TRACE_NORMAL, DUP6_CDATAOWNER_GETEXPECTEDDATASIZEL, "passive file: %S, size: %d", fileEntry.iName, fileSize); aSize += fileEntry.iName.Length(); aSize += fileSize; @@ -422,7 +454,7 @@ case EActiveBaseData: case EActiveIncrementalData: { - __LOG1("CDataOwner::GetExpectedDataSizeL() - START - EActiveBaseData/EActiveIncrementalData - aDriveNumber: %c", aDriveNumber + 'A'); + OstTraceExt1(TRACE_NORMAL, DUP7_CDATAOWNER_GETEXPECTEDDATASIZEL, "EActiveBaseData/EActiveIncrementalData - aDriveNumber: %c", aDriveNumber + 'A'); // Only request expected data size if it's for this data owner, not the proxies if (iActiveInformation.iSupported && iActiveInformation.iActiveDataOwner && (iActiveInformation.iActiveType != EProxyImpOnly)) { @@ -431,21 +463,22 @@ else { aSize = 0; - __LOG1("CDataOwner::GetExpectedDataSizeL() - ACTIVE BASE - DO 0x%08x is PROXY, so setting size to 0!", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP8_CDATAOWNER_GETEXPECTEDDATASIZEL, "ACTIVE BASE - DO 0x%08x is PROXY, so setting size to 0!", iSecureId.iId); } } break; case EActiveSnapshotData: { - __LOG1("CDataOwner::GetExpectedDataSizeL() - START - EActiveSnapshotData - aDriveNumber: %c", aDriveNumber + 'A'); + OstTraceExt1(TRACE_NORMAL, DUP9_CDATAOWNER_GETEXPECTEDDATASIZEL, "EActiveSnapshotData - aDriveNumber: %c", aDriveNumber + 'A'); aSize = 0; // ABClient M class doesn't provide retrieval of snapshot data size } break; default: - __LOG1("CDataOwner::GetExpectedDataSizeL() - START - ERROR - UNSUPPORTED TYPE! => KErrNotSupported - aDriveNumber: %c", aDriveNumber + 'A'); + OstTraceExt1(TRACE_ERROR, DUP10_CDATAOWNER_GETEXPECTEDDATASIZEL, "ERROR - UNSUPPORTED TYPE! => KErrNotSupported - aDriveNumber: %c", aDriveNumber + 'A'); User::Leave(KErrNotSupported); } // switch - __LOG2("CDataOwner::GetExpectedDataSizeL() - END - size is: %d, data owner 0x%08x", aSize, iSecureId.iId); + OstTraceExt2(TRACE_NORMAL, DUP11_CDATAOWNER_GETEXPECTEDDATASIZEL, "size is: %d, data owner 0x%08x", static_cast(aSize), iSecureId.iId); + OstTraceFunctionExit0( CDATAOWNER_GETEXPECTEDDATASIZEL_EXIT ); } @@ -457,7 +490,9 @@ @param aFiles on return a list of public files */ { + OstTraceFunctionEntry0( CDATAOWNER_GETPUBLICFILELISTL_ENTRY ); BuildFileListL(iPublicSelections, aDriveNumber, EPassiveBaseData, ETrue, NULL, &aFiles, NULL); + OstTraceFunctionExit0( CDATAOWNER_GETPUBLICFILELISTL_EXIT ); } @@ -469,9 +504,11 @@ @param aRestoreFileFilter on return the file filter */ { + OstTraceFunctionEntry0( CDATAOWNER_GETRAWPUBLICFILELISTL_ENTRY ); // Convert drive number to letter TChar drive; - User::LeaveIfError(ipDataOwnerManager->GetRFs().DriveToChar(aDriveNumber, drive)); + TInt err = ipDataOwnerManager->GetRFs().DriveToChar(aDriveNumber, drive); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, CDATAOWNER_GETRAWPUBLICFILELISTL, "Leave: %d", err)); const TUint count = iPublicSelections.Count(); for (TInt x = 0; x < count; x++) @@ -513,6 +550,7 @@ aRestoreFileFilter.AppendL(TRestoreFileFilter(include, filename)); } // if } // for x + OstTraceFunctionExit0( CDATAOWNER_GETRAWPUBLICFILELISTL_EXIT ); } void CDataOwner::ProcessSupplyDataL(TDriveNumber aDriveNumber, TTransferDataType aTransferType, @@ -528,19 +566,20 @@ @leave KErrCorrupt If commands have been issued that violate the allowed sequence */ { + OstTraceFunctionEntry0( CDATAOWNER_PROCESSSUPPLYDATAL_ENTRY ); TBURPartType burType = ipDataOwnerManager->BURType(); - __LOG2("CDataOwner::ProcessSupplyDataL() - START - drive: %c, aTransferType: %d", aDriveNumber + 'A', aTransferType); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_PROCESSSUPPLYDATAL, "drive: %c, aTransferType: %d", aDriveNumber + 'A', aTransferType); switch (aTransferType) { case EPassiveSnapshotData: { - __LOG1("CDataOwner::ProcessSupplyDataL() - Supplying passive snapshot data to data owner with SID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNER_PROCESSSUPPLYDATAL, "Supplying passive snapshot data to data owner with SID 0x%08x", iSecureId.iId); // Check that no passive data has been received for a data owner that doesn't support it if (!iPassiveInformation.iSupported) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Passive restore has been requested but isn't supported"); + OstTrace0(TRACE_ERROR, DUP2_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Passive restore has been requested but isn't supported"); User::Leave(KErrCorrupt); } @@ -549,14 +588,14 @@ (StateByDriveL(aDriveNumber).iPassiveBaseDataRequested || StateByDriveL(aDriveNumber).iPassiveIncDataRequested)) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Snapshot has been supplied after data has been requested"); + OstTrace0(TRACE_ERROR, DUP3_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Snapshot has been supplied after data has been requested"); User::Leave(KErrCorrupt); } // Check that no snapshot is supplied for a data owner expecting base backup if (iPassiveInformation.iBaseBackupOnly) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Snapshot data has been supplied for a base data owner"); + OstTrace0(TRACE_ERROR, DUP4_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Snapshot data has been supplied for a base data owner"); User::Leave(KErrCorrupt); } @@ -565,7 +604,7 @@ && (StateByDriveL(aDriveNumber).iPassiveBaseDataReceived || StateByDriveL(aDriveNumber).iPassiveIncDataReceived)) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Snapshot has been supplied after restore data has been supplied"); + OstTrace0(TRACE_ERROR, DUP5_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Snapshot has been supplied after restore data has been supplied"); User::Leave(KErrCorrupt); } @@ -582,45 +621,45 @@ { if (aTransferType == EPassiveBaseData) { - __LOG1("CDataOwner::ProcessSupplyDataL() - Supplying passive base data to data owner with SID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP6_CDATAOWNER_PROCESSSUPPLYDATAL, "Supplying passive base data to data owner with SID 0x%08x", iSecureId.iId); } else if (aTransferType == EPassiveIncrementalData) { - __LOG1("CDataOwner::ProcessSupplyDataL() - Supplying passive inc data to data owner with SID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP7_CDATAOWNER_PROCESSSUPPLYDATAL, "Supplying passive inc data to data owner with SID 0x%08x", iSecureId.iId); } // Check that no passive data has been received for a data owner that doesn't support it if (!iPassiveInformation.iSupported) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Passive restore data has been supplied but isn't supported"); + OstTrace0(TRACE_ERROR, DUP8_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Passive restore data has been supplied but isn't supported"); User::Leave(KErrCorrupt); } // Check that no incremental data has been received for a SID that doesn't support it if (iPassiveInformation.iBaseBackupOnly && (aTransferType == EPassiveIncrementalData)) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Incremental restore data has been received for a base only data owner"); + OstTrace0(TRACE_ERROR, DUP9_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Incremental restore data has been received for a base only data owner"); User::Leave(KErrCorrupt); } // Passive Base data should only have been provided once for a SID if ((aTransferType == EPassiveBaseData) && StateByDriveL(aDriveNumber).iPassiveBaseDataReceived) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Data is being restored more than once to a DO"); + OstTrace0(TRACE_ERROR, DUP10_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Data is being restored more than once to a DO"); User::Leave(KErrCorrupt); } // A snapshot should already have been supplied if we're incremental if (!StateByDriveL(aDriveNumber).iPassiveSnapshotReceived && (aTransferType == EPassiveIncrementalData)) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Snapshot has not yet been supplied and should have whether we're base or inc"); + OstTrace0(TRACE_ERROR, DUP11_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Snapshot has not yet been supplied and should have whether we're base or inc"); User::Leave(KErrCorrupt); } // If incremental data is being supplied, then base data must already have been supplied if ((aTransferType == EPassiveIncrementalData) && !StateByDriveL(aDriveNumber).iPassiveBaseDataReceived) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Incremental data supplied before base data"); + OstTrace0(TRACE_ERROR, DUP12_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Incremental data supplied before base data"); User::Leave(KErrCorrupt); } @@ -639,33 +678,33 @@ } case EActiveSnapshotData: { - __LOG1("CDataOwner::ProcessSupplyDataL() - Supplying active snapshot data to data owner with SID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP13_CDATAOWNER_PROCESSSUPPLYDATAL, "Supplying active snapshot data to data owner with SID 0x%08x", iSecureId.iId); // Check that no active data has been received for a data owner that doesn't support it if (!iActiveInformation.iSupported) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Active snapshot data has been supplied for a DO that doesn't support it"); + OstTrace0(TRACE_ERROR, DUP14_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Active snapshot data has been supplied for a DO that doesn't support it"); User::Leave(KErrCorrupt); } // Check that no active data has been received for a data owner that doesn't support it if (!iActiveInformation.iSupportsIncremental) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Active snapshot data has been supplied for a base only Data Owner"); + OstTrace0(TRACE_ERROR, DUP15_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Active snapshot data has been supplied for a base only Data Owner"); User::Leave(KErrCorrupt); } // Check that no snapshot is supplied after backup data has been requested during a backup if (((burType == EBURBackupFull) || (burType == EBURBackupPartial)) && StateByDriveL(aDriveNumber).iActiveBaseDataRequested) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Active snapshot has been supplied after backup data has been requested"); + OstTrace0(TRACE_ERROR, DUP16_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Active snapshot has been supplied after backup data has been requested"); User::Leave(KErrCorrupt); } // Check that no snapshot data is provided after backup data has been supplied during a restore if (((burType == EBURRestorePartial) || (burType == EBURRestoreFull)) && StateByDriveL(aDriveNumber).iActiveBaseDataReceived) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Active snapshot data has been supplied after restore data"); + OstTrace0(TRACE_ERROR, DUP17_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Active snapshot data has been supplied after restore data"); User::Leave(KErrCorrupt); } @@ -682,11 +721,11 @@ { if (aTransferType == EActiveBaseData) { - __LOG1("CDataOwner::ProcessSupplyDataL() - Supplying active base data to data owner with SID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP18_CDATAOWNER_PROCESSSUPPLYDATAL, "Supplying active base data to data owner with SID 0x%08x", iSecureId.iId); } else if (aTransferType == EActiveIncrementalData) { - __LOG1("CDataOwner::ProcessSupplyDataL() - Supplying active incremental data to data owner with SID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP19_CDATAOWNER_PROCESSSUPPLYDATAL, "Supplying active incremental data to data owner with SID 0x%08x", iSecureId.iId); } const TUint supportedProxyCount = iProxyInformationArray.Count(); @@ -699,14 +738,14 @@ TInt proxyCountCheck = 0; UnpackTypeAdvance(proxyCountCheck, aBuffer, offset); StateByDriveL(aDriveNumber).iFirstActiveTransaction = EFalse; - __LOG1("CDataOwner::ProcessSupplyDataL() - Proxy Info : Unpacked TotalProxyCount = %d", proxyCountCheck); + OstTrace1(TRACE_NORMAL, DUP20_CDATAOWNER_PROCESSSUPPLYDATAL, "Proxy Info : Unpacked TotalProxyCount = %d", proxyCountCheck); // If the backup stream specifies a different number of proxy's to the registration file, // then we're looking at different reg file versions. This isn't supported as far as proxy's // are concerned if (supportedProxyCount != proxyCountCheck) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Number of proxies supported (reg file) differs from backed up data"); + OstTrace0(TRACE_ERROR, DUP21_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Number of proxies supported (reg file) differs from backed up data"); User::Leave(KErrCorrupt); } @@ -714,7 +753,7 @@ if ((!iActiveInformation.iSupported) && (supportedProxyCount == 0)) { // No proxies or active data - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Active data has been received but this DO doesn't support Active/Proxies"); + OstTrace0(TRACE_ERROR, DUP22_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Active data has been received but this DO doesn't support Active/Proxies"); User::Leave(KErrCorrupt); } @@ -732,30 +771,31 @@ } } - __LOG1("CDataOwner::ProcessSupplyDataL() - Supplying active base data of size = %D", aBuffer.Length()); + OstTrace1(TRACE_NORMAL, DUP23_CDATAOWNER_PROCESSSUPPLYDATAL, "Supplying active base data of size = %d", aBuffer.Length()); // Restore the proxy data first TBool currentBufferConsumed = EFalse; while ( (iCurrentProxy < supportedProxyCount) && (!currentBufferConsumed)) { - __LOG2("CDataOwner::ProcessSupplyDataL() - Proxy Info : Unpacking proxy info %d of %d", iCurrentProxy + 1, supportedProxyCount); + OstTraceExt2(TRACE_NORMAL, DUP24_CDATAOWNER_PROCESSSUPPLYDATAL, "Proxy Info : Unpacking proxy info %d of %d", iCurrentProxy + 1, supportedProxyCount); // Unpack the proxy's finished flag, len and sid if we are handling the proxy for the first time if ( iProxyInformationArray[iCurrentProxy].iDataSupplied == 0) { UnpackTypeAdvance(iProxyInformationArray[iCurrentProxy].iOpInProgress, aBuffer, offset); - __LOG1("CDataOwner::ProcessSupplyDataL() - Proxy Info : FinishedFlag = %d", iProxyInformationArray[iCurrentProxy].iOpInProgress); + OstTrace1(TRACE_NORMAL, DUP25_CDATAOWNER_PROCESSSUPPLYDATAL, "Proxy Info : FinishedFlag = %d", iProxyInformationArray[iCurrentProxy].iOpInProgress); UnpackTypeAdvance(iProxyInformationArray[iCurrentProxy].iDataRequested, aBuffer, offset); - __LOG1("CDataOwner::ProcessSupplyDataL() - Proxy Info : ProxyDataStreamLength = %d", iProxyInformationArray[iCurrentProxy].iDataRequested); + OstTrace1(TRACE_NORMAL, DUP26_CDATAOWNER_PROCESSSUPPLYDATAL, "Proxy Info : ProxyDataStreamLength = %d", iProxyInformationArray[iCurrentProxy].iDataRequested); TSecureId proxySecureId; UnpackTypeAdvance(proxySecureId, aBuffer, offset); if ( iProxyInformationArray[iCurrentProxy].iSecureId.iId != proxySecureId.iId ) { + OstTrace0(TRACE_ERROR, DUP38_CDATAOWNER_PROCESSSUPPLYDATAL, "Leave: KErrCorrupt"); User::Leave(KErrCorrupt); } - __LOG1("CDataOwner::ProcessSupplyDataL() - Proxy Info : ProxySID = 0x%08x", proxySecureId.iId); + OstTrace1(TRACE_NORMAL, DUP27_CDATAOWNER_PROCESSSUPPLYDATAL, "Proxy Info : ProxySID = 0x%08x", proxySecureId.iId); } // Is no more data coming , either from the buffer manager or from the server @@ -772,6 +812,7 @@ // more data was expected but both server and data mgr have finished, then leave if (proxyFinished && dataLengthRemaining > aBuffer.Length()-offset) { + OstTrace0(TRACE_ERROR, DUP39_CDATAOWNER_PROCESSSUPPLYDATAL, "Leave: KErrCorrupt"); User::Leave(KErrCorrupt); } @@ -788,7 +829,7 @@ // Create a pointer to the data of this proxy TPtrC8 buffer(aBuffer.Mid(offset, currentBufferLen)); iProxyInformationArray[iCurrentProxy].iDataSupplied += currentBufferLen; - __LOG1("CDataOwner::ProcessSupplyDataL() - iProxyConsumedLength = %D",iProxyInformationArray[iCurrentProxy].iDataSupplied); + OstTrace1(TRACE_NORMAL, DUP28_CDATAOWNER_PROCESSSUPPLYDATAL, "iProxyConsumedLength = %d",iProxyInformationArray[iCurrentProxy].iDataSupplied); offset += currentBufferLen; @@ -797,7 +838,7 @@ // If the data to send is the last section, set proxyLastSection with true. if ((iProxyInformationArray[iCurrentProxy].iOpInProgress == (TInt)ETrue) && (iProxyInformationArray[iCurrentProxy].iDataSupplied == iProxyInformationArray[iCurrentProxy].iDataRequested)) { - __LOG("CDataOwner::ProcessSupplyDataL() - Last Section to Proxy"); + OstTrace0(TRACE_NORMAL, DUP29_CDATAOWNER_PROCESSSUPPLYDATAL, "Last Section to Proxy"); proxyLastSection = ETrue; } else @@ -821,21 +862,21 @@ // data server or datamanager can supply again. if (!proxyFinished) { - __LOG("CDataOwner::ProcessSupplyDataL() - Proxy Info : Multipart send not complete, expecting more proxy data"); + OstTrace0(TRACE_NORMAL, DUP30_CDATAOWNER_PROCESSSUPPLYDATAL, "Proxy Info : Multipart send not complete, expecting more proxy data"); ProxyStateByDriveL(aDriveNumber,iCurrentProxy).iOpInProgress = ETrue; } else { - __LOG("CDataOwner::ProcessSupplyDataL() - Proxy Info : Send complete"); + OstTrace0(TRACE_NORMAL, DUP31_CDATAOWNER_PROCESSSUPPLYDATAL, "Proxy Info : Send complete"); ProxyStateByDriveL(aDriveNumber,iCurrentProxy).iOpInProgress = EFalse; ProxyStateByDriveL(aDriveNumber,iCurrentProxy).iDataSupplied = ETrue; } - __LOG2("CDataOwner::ProcessSupplyDataL() - Check proxyConsumedLength = %D & proxyTotalDataLength = %D",iProxyInformationArray[iCurrentProxy].iDataSupplied,iProxyInformationArray[iCurrentProxy].iDataRequested); + OstTraceExt2(TRACE_NORMAL, DUP32_CDATAOWNER_PROCESSSUPPLYDATAL, "Check proxyConsumedLength = %d & proxyTotalDataLength = %d",iProxyInformationArray[iCurrentProxy].iDataSupplied,iProxyInformationArray[iCurrentProxy].iDataRequested); if (iProxyInformationArray[iCurrentProxy].iDataSupplied == iProxyInformationArray[iCurrentProxy].iDataRequested) { - __LOG("CDataOwner::ProcessSupplyDataL() - Resetting internal variables"); + OstTrace0(TRACE_NORMAL, DUP33_CDATAOWNER_PROCESSSUPPLYDATAL, "Resetting internal variables"); // when whole packet from server is read. iProxyInformationArray[iCurrentProxy].iDataSupplied = 0; iProxyInformationArray[iCurrentProxy].iDataRequested = 0; @@ -844,7 +885,7 @@ // Check if ( (iProxyInformationArray[iCurrentProxy].iOpInProgress == (TInt)ETrue) && (iProxyInformationArray[iCurrentProxy].iDataSupplied == iProxyInformationArray[iCurrentProxy].iDataRequested) ) { - __LOG("CDataOwner::ProcessSupplyDataL() - Proxy Finished"); + OstTrace0(TRACE_NORMAL, DUP34_CDATAOWNER_PROCESSSUPPLYDATAL, "Proxy Finished"); iCurrentProxy++; } @@ -853,11 +894,11 @@ // Active data can be sent under 2 circumstances, data for a proxy and data for an actual active client if (iActiveInformation.iSupported && iActiveInformation.iActiveDataOwner && (offset < aBuffer.Size())) { - __LOG("CDataOwner::ProcessSupplyDataL() - State iActiveInformation.iSupported"); + OstTrace0(TRACE_NORMAL, DUP35_CDATAOWNER_PROCESSSUPPLYDATAL, "State iActiveInformation.iSupported"); // Active Base data should only have been provided once for a SID if ((aTransferType == EActiveBaseData) && StateByDriveL(aDriveNumber).iActiveBaseDataReceived) { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - Active restore data has been provided more than once for this DO"); + OstTrace0(TRACE_ERROR, DUP36_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - Active restore data has been provided more than once for this DO"); User::Leave(KErrCorrupt); } @@ -893,10 +934,11 @@ } break; default: { - __LOG("CDataOwner::ProcessSupplyDataL() - State Error - An unsupported transfer type has been supplied"); + OstTrace0(TRACE_ERROR, DUP37_CDATAOWNER_PROCESSSUPPLYDATAL, "State Error - An unsupported transfer type has been supplied"); User::Leave(KErrNotSupported); } } // switch + OstTraceFunctionExit0( CDATAOWNER_PROCESSSUPPLYDATAL_EXIT ); } void CDataOwner::SupplyDataL(TDriveNumber aDriveNumber, TTransferDataType aTransferType, @@ -912,12 +954,14 @@ @leave KErrCorrupt If commands have been issued that violate the allowed sequence */ { - __LOG5("CDataOwner::SupplyDataL() - START - SID: 0x%08x, aDrive: %c, aTransferType: %d, aLastSection: %d, iState: %d", iSecureId.iId, aDriveNumber + 'A', aTransferType, aLastSection, iState.iState); + OstTraceFunctionEntry0( CDATAOWNER_SUPPLYDATAL_ENTRY ); + OstTraceExt5(TRACE_NORMAL, CDATAOWNER_SUPPLYDATAL, "SID: 0x%08x, aDrive: %c, aTransferType: %d, aLastSection: %d, iState: %d", iSecureId.iId, static_cast(aDriveNumber + 'A'), static_cast(aTransferType), static_cast(aLastSection), static_cast(iState.iState)); // Check our state if (!((iState.iState == ENone) || ((iState.iState == ESupply) && (iState.iDriveNumber == aDriveNumber) && (iState.iTransferType == aTransferType)))) { + OstTrace0(TRACE_ERROR, DUP2_CDATAOWNER_SUPPLYDATAL, "Leave: KErrNotReady"); User::Leave(KErrNotReady); } @@ -943,7 +987,7 @@ } if (err != KErrNone) { - __LOG2("CDataOwner::SupplyDataL() - Data owner 0x%08x, drive %d could not cleanup before restore", iSecureId.iId, aDriveNumber); + OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNER_SUPPLYDATAL, "Data owner 0x%08x, drive %d could not cleanup before restore", iSecureId.iId, static_cast(aDriveNumber)); } TRAP(err, ProcessSupplyDataL(aDriveNumber, aTransferType, aBuffer, aLastSection)); @@ -957,14 +1001,15 @@ iBufferFileReader = NULL; delete iBufferSnapshotReader; iBufferSnapshotReader = NULL; + OstTrace1(TRACE_ERROR, DUP3_CDATAOWNER_SUPPLYDATAL, "Leave: %d", err); User::Leave(err); } // if if (aLastSection) // If last section reset state { iState.iState = ENone; - } // if - __LOG("CDataOwner::SupplyDataL() - END"); + } // if + OstTraceFunctionExit0( CDATAOWNER_SUPPLYDATAL_EXIT ); } // SupplyDataL @@ -974,27 +1019,26 @@ So that the TRAPD isn't massive, this switch statement has been moved to this function */ { - __LOG4("CDataOwner::ProcessRequestDataL() - START - aDrive: %c, aTransferType: %d, aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d", aDriveNumber + 'A', aTransferType, aBuffer.Ptr(), aBuffer.Length()); - //__LOGDATA("CDataOwner::ProcessRequestDataL() - %S", aBuffer.Ptr(), aBuffer.Length() ); + OstTraceFunctionEntry0( CDATAOWNER_PROCESSREQUESTDATAL_ENTRY ); + OstTraceExt4(TRACE_NORMAL, CDATAOWNER_PROCESSREQUESTDATAL, "aDrive: %c, aTransferType: %d, aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d", static_cast(aDriveNumber + 'A'), static_cast(aTransferType), reinterpret_cast(aBuffer.Ptr()), static_cast(aBuffer.Length())); - // switch (aTransferType) { case EPassiveSnapshotData: { - __LOG1("CDataOwner::ProcessRequestDataL() - Requesting passive snapshot data from data owner with SID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNER_PROCESSREQUESTDATAL, "Requesting passive snapshot data from data owner with SID 0x%08x", iSecureId.iId); // Check that no passive data has been requested for a data owner that doesn't support it if (!iPassiveInformation.iSupported) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Passive snapshot data has been requested for a non-passive data owner"); + OstTrace0(TRACE_ERROR, DUP2_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Passive snapshot data has been requested for a non-passive data owner"); User::Leave(KErrCorrupt); } // Check that snapshot data is only requested once if (StateByDriveL(aDriveNumber).iPassiveSnapshotRequested) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Passive snapshot data has been requested more than once"); + OstTrace0(TRACE_ERROR, DUP3_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Passive snapshot data has been requested more than once"); User::Leave(KErrCorrupt); } @@ -1011,24 +1055,24 @@ { if (aTransferType == EPassiveBaseData) { - __LOG1("CDataOwner::ProcessRequestDataL() - Requesting passive base data from data owner with SID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP4_CDATAOWNER_PROCESSREQUESTDATAL, "Requesting passive base data from data owner with SID 0x%08x", iSecureId.iId); } else if (aTransferType == EPassiveIncrementalData) { - __LOG1("CDataOwner::ProcessRequestDataL() - Requesting passive inc data from data owner with SID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP5_CDATAOWNER_PROCESSREQUESTDATAL, "Requesting passive inc data from data owner with SID 0x%08x", iSecureId.iId); } // Check that no passive data has been requested for a data owner that doesn't support it if (!iPassiveInformation.iSupported) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Passive backup data has been requested for a non-passive data owner"); + OstTrace0(TRACE_ERROR, DUP6_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Passive backup data has been requested for a non-passive data owner"); User::Leave(KErrCorrupt); } // Check that if this is an incremental backup, complete snapshot data has been received if ((aTransferType == EPassiveIncrementalData) && !StateByDriveL(aDriveNumber).iPassiveSnapshotReceived) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Incremental data has been requested without a snapshot being supplied"); + OstTrace0(TRACE_ERROR, DUP7_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Incremental data has been requested without a snapshot being supplied"); User::Leave(KErrCorrupt); } @@ -1036,14 +1080,14 @@ if (((aTransferType == EPassiveBaseData) && StateByDriveL(aDriveNumber).iPassiveBaseDataRequested) || ((aTransferType == EPassiveIncrementalData) && StateByDriveL(aDriveNumber).iPassiveIncDataRequested)) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Passive data has been requested more than once for this data owner"); + OstTrace0(TRACE_ERROR, DUP8_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Passive data has been requested more than once for this data owner"); User::Leave(KErrCorrupt); } // Check that for base backup, no snapshot data has been supplied if ((aTransferType == EPassiveBaseData) && StateByDriveL(aDriveNumber).iPassiveSnapshotReceived) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Snapshot data has been received for a base only data owner"); + OstTrace0(TRACE_ERROR, DUP9_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Snapshot data has been received for a base only data owner"); User::Leave(KErrCorrupt); } @@ -1051,7 +1095,7 @@ if (((aTransferType == EPassiveBaseData) && StateByDriveL(aDriveNumber).iPassiveIncDataRequested) || ((aTransferType == EPassiveIncrementalData) && StateByDriveL(aDriveNumber).iPassiveBaseDataRequested)) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Base and Incremental data have been requested in the same session"); + OstTrace0(TRACE_ERROR, DUP10_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Base and Incremental data have been requested in the same session"); User::Leave(KErrCorrupt); } @@ -1070,33 +1114,33 @@ } case EActiveSnapshotData: { - __LOG1("CDataOwner::ProcessRequestDataL() - Requesting active snapshot data from data owner with SID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP11_CDATAOWNER_PROCESSREQUESTDATAL, "Requesting active snapshot data from data owner with SID 0x%08x", iSecureId.iId); // Check that active data hasn't been requested for a data owner that doesn't support it if (!iActiveInformation.iSupported) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Active snapshot data has been requested from a non-active data owner"); + OstTrace0(TRACE_ERROR, DUP12_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Active snapshot data has been requested from a non-active data owner"); User::Leave(KErrCorrupt); } // Check that no active snapshot data has been requested for a base only active data owner if (!iActiveInformation.iSupportsIncremental) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Active snapshot data has been requested from a base only data owner"); + OstTrace0(TRACE_ERROR, DUP13_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Active snapshot data has been requested from a base only data owner"); User::Leave(KErrCorrupt); } // Check that the Active client has prepared it's data and is ready if (iStatus != EDataOwnerReady) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Active Snapshot data has been requested from a data owner that isn't ready"); + OstTrace0(TRACE_ERROR, DUP14_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Active Snapshot data has been requested from a data owner that isn't ready"); User::Leave(KErrNotReady); } // Check that snapshot data is only requested once if (StateByDriveL(aDriveNumber).iActiveSnapshotRequested) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Active Snapshot data has been requested more than once"); + OstTrace0(TRACE_ERROR, DUP15_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Active Snapshot data has been requested more than once"); User::Leave(KErrCorrupt); } @@ -1114,11 +1158,11 @@ { if (aTransferType == EActiveBaseData) { - __LOG1("CDataOwner::ProcessRequestDataL() - Requesting active base data from data owner with SID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP16_CDATAOWNER_PROCESSREQUESTDATAL, "Requesting active base data from data owner with SID 0x%08x", iSecureId.iId); } else if (aTransferType == EActiveIncrementalData) { - __LOG1("CDataOwner::ProcessRequestDataL() - Requesting active inc data from data owner with SID 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP17_CDATAOWNER_PROCESSREQUESTDATAL, "Requesting active inc data from data owner with SID 0x%08x", iSecureId.iId); } TInt supportedProxyCount = iProxyInformationArray.Count(); @@ -1131,17 +1175,16 @@ if ((!iActiveInformation.iSupported) && (supportedProxyCount == 0)) { // No proxies or active data - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Active data has been requested from a non-active/no proxy data owner"); + OstTrace0(TRACE_ERROR, DUP18_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Active data has been requested from a non-active/no proxy data owner"); User::Leave(KErrCorrupt); } StateByDriveL(aDriveNumber).iFirstActiveTransaction = EFalse; PackTypeAdvance(supportedProxyCount, aBuffer, offset); - __LOG1("CDataOwner::ProcessRequestDataL() - Proxy Info : Packing TotalProxyCount = %d", supportedProxyCount); + OstTrace1(TRACE_NORMAL, DUP19_CDATAOWNER_PROCESSREQUESTDATAL, "Proxy Info : Packing TotalProxyCount = %d", supportedProxyCount); - aBuffer.SetLength(offset); - //__LOGDATA( "CDataOwner::ProcessRequestDataL() - after adding proxy info - %S", aBuffer.Ptr(), aBuffer.Length() ); + aBuffer.SetLength(offset); // Reset proxy state information for this drive for (TInt numProxy=0; numProxy < supportedProxyCount; numProxy++) @@ -1153,7 +1196,7 @@ // Proxy data is always at the beginning of the data block for (TInt index = 0; index < supportedProxyCount; index++) { - __LOG2("CDataOwner::ProcessRequestDataL() - Proxy Info : Packing proxy info %d of %d", index + 1, supportedProxyCount); + OstTraceExt2(TRACE_NORMAL, DUP20_CDATAOWNER_PROCESSREQUESTDATAL, "Proxy Info : Packing proxy info %d of %d", index + 1, supportedProxyCount); // Request data from each of the data owners that haven't yet been added // If the buffer's overflowed, then let the PC request again @@ -1194,13 +1237,13 @@ // Write the proxy protocol block to the active backup data stream PackType(aLastSection, finishedBuf, 0); - __LOG1("CDataOwner::ProcessRequestDataL() - Proxy Info : FinishedFlag = %d", aLastSection); + OstTrace1(TRACE_NORMAL, DUP21_CDATAOWNER_PROCESSREQUESTDATAL, "Proxy Info : FinishedFlag = %d", aLastSection); PackType(size, lengthBuf, 0); - __LOG1("CDataOwner::ProcessRequestDataL() - Proxy Info : ProxyStreamSize= %d", size); + OstTrace1(TRACE_NORMAL, DUP22_CDATAOWNER_PROCESSREQUESTDATAL, "Proxy Info : ProxyStreamSize= %d", size); PackType(iProxyInformationArray[index].iSecureId, sidBuf, 0); - __LOG1("CDataOwner::ProcessRequestDataL() - Proxy Info : ProxySID = 0x%08x", iProxyInformationArray[index].iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP23_CDATAOWNER_PROCESSREQUESTDATAL, "Proxy Info : ProxySID = 0x%08x", iProxyInformationArray[index].iSecureId.iId); // Update the offset and main buffer size offset += size; @@ -1230,14 +1273,14 @@ // Check that if this is a base backup, no snapshot has been provided if ((aTransferType == EActiveBaseData) && StateByDriveL(aDriveNumber).iActiveSnapshotReceived) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - A snapshot has been provided before a request for base data"); + OstTrace0(TRACE_ERROR, DUP24_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - A snapshot has been provided before a request for base data"); User::Leave(KErrCorrupt); } // Check that if this is an incremental backup that at least one complete snapshot has been sent if ((aTransferType == EActiveIncrementalData) && !StateByDriveL(aDriveNumber).iActiveSnapshotReceived) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - No snapshot has been supplied, yet incremental data has been requested"); + OstTrace0(TRACE_ERROR, DUP25_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - No snapshot has been supplied, yet incremental data has been requested"); User::Leave(KErrCorrupt); } @@ -1245,7 +1288,7 @@ if (((aTransferType == EActiveBaseData) && StateByDriveL(aDriveNumber).iActiveBaseDataRequested) || ((aTransferType == EActiveIncrementalData) && StateByDriveL(aDriveNumber).iActiveIncDataRequested)) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Active data has been requested more than once (not counting multi-part)"); + OstTrace0(TRACE_ERROR, DUP26_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Active data has been requested more than once (not counting multi-part)"); User::Leave(KErrCorrupt); } @@ -1253,7 +1296,7 @@ if (((aTransferType == EActiveBaseData) && StateByDriveL(aDriveNumber).iActiveIncDataRequested) || ((aTransferType == EActiveIncrementalData) && StateByDriveL(aDriveNumber).iActiveBaseDataRequested)) { - __LOG("CDataOwner::ProcessRequestDataL() - State Error - Only active base or incremental data can be requested in the same session"); + OstTrace0(TRACE_ERROR, DUP27_CDATAOWNER_PROCESSREQUESTDATAL, "State Error - Only active base or incremental data can be requested in the same session"); User::Leave(KErrCorrupt); } @@ -1297,18 +1340,19 @@ } break; default: { + OstTrace0(TRACE_ERROR, DUP29_CDATAOWNER_PROCESSREQUESTDATAL, "Leave: KErrNotSupported"); User::Leave(KErrNotSupported); } } // switch - __LOG2("CDataOwner::ProcessRequestDataL() - NEAR END - aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d", aBuffer.Ptr(), aBuffer.Length()); - //__LOGDATA( "CDataOwner::ProcessRequestDataL() - %S", aBuffer.Ptr(), aBuffer.Length() ); - __LOG("CDataOwner::ProcessRequestDataL() - END"); + OstTraceExt2(TRACE_NORMAL, DUP28_CDATAOWNER_PROCESSREQUESTDATAL, "aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d", reinterpret_cast(aBuffer.Ptr()), static_cast(aBuffer.Length())); + OstTraceFunctionExit0( CDATAOWNER_PROCESSREQUESTDATAL_EXIT ); } void CDataOwner::RequestDataL(TDriveNumber aDriveNumber, TTransferDataType aTransferType, TPtr8& aBuffer, TBool& aLastSection) { + OstTraceFunctionEntry0( CDATAOWNER_REQUESTDATAL_ENTRY ); aLastSection = ETrue; // Set the last section to be true by default // Check our state @@ -1316,6 +1360,7 @@ ((iState.iState == ERequest) && (iState.iDriveNumber == aDriveNumber) && (iState.iTransferType == aTransferType)))) { + OstTrace0(TRACE_ERROR, DUP1_CDATAOWNER_REQUESTDATAL, "Leave: KErrNotReady"); User::Leave(KErrNotReady); } @@ -1333,12 +1378,13 @@ if (err != KErrNone) { - __LOG4("CDataOwner::RequestDataL() - drive: %c:, aTransferType: %d, secureId: 0x%08x - ERROR: %d", 'a' + aDriveNumber, aTransferType, iSecureId.iId, err); + OstTraceExt4(TRACE_NORMAL, CDATAOWNER_REQUESTDATAL, "drive: %c:, aTransferType: %d, secureId: 0x%08x - ERROR: %d", static_cast('a' + aDriveNumber), static_cast(aTransferType), static_cast(iSecureId.iId), static_cast(err)); iState.iState = ENone; delete iBufferFileWriter; iBufferFileWriter = NULL; delete iBufferSnapshotWriter; iBufferSnapshotWriter = NULL; + OstTrace1(TRACE_ERROR, DUP2_CDATAOWNER_REQUESTDATAL, "Leave: %d", err); User::Leave(err); } // if @@ -1346,12 +1392,14 @@ { iState.iState = ENone; } // if + OstTraceFunctionExit0( CDATAOWNER_REQUESTDATAL_EXIT ); } // RequestDataL void CDataOwner::RestoreCompleteL() /** Indicate to the active client that the restore operation has been completed */ { + OstTraceFunctionEntry0( CDATAOWNER_RESTORECOMPLETEL_ENTRY ); // Find all of the drives that this data owner could have stored data on TDriveList driveList; GetDriveListL(driveList); @@ -1364,6 +1412,7 @@ ipDataOwnerManager->ABServer().RestoreCompleteL(iSecureId, static_cast(driveCountIndex)); } } + OstTraceFunctionExit0( CDATAOWNER_RESTORECOMPLETEL_EXIT ); } @@ -1382,6 +1431,7 @@ @return The ready state */ { + OstTraceFunctionEntry0( CDATAOWNER_READYSTATE_ENTRY ); TDataOwnerStatus status = EDataOwnerReady; TInt proxyIndex = 0; const TUint proxyCount = iProxyInformationArray.Count(); @@ -1445,8 +1495,9 @@ } - __LOG2("CDataOwner::ReadyState() - Ready status for data owner 0x%08x is %d", iSecureId.iId, static_cast(status)); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_READYSTATE, "Ready status for data owner 0x%08x is %d", iSecureId.iId, static_cast(status)); + OstTraceFunctionExit0( CDATAOWNER_READYSTATE_EXIT ); return status; } @@ -1455,12 +1506,14 @@ Set upon a ConfirmReadyForBUR IPC call from an active backup client */ { - __LOG2("CDataOwner::SetReadyState() - Setting ready state of data owner 0x%08x to %d", iSecureId.iId, static_cast(aDataOwnerStatus)); + OstTraceFunctionEntry0( CDATAOWNER_SETREADYSTATE_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_SETREADYSTATE, "Setting ready state of data owner 0x%08x to %d", iSecureId.iId, static_cast(aDataOwnerStatus)); iStatus = aDataOwnerStatus; if (aDataOwnerStatus == EDataOwnerReady && iActiveInformation.iActiveType == EProxyImpOnly) { iStatus = EDataOwnerReadyNoImpl; } + OstTraceFunctionExit0( CDATAOWNER_SETREADYSTATE_EXIT ); } TCommonBURSettings CDataOwner::CommonSettingsL() @@ -1471,44 +1524,46 @@ @leave KErrNotReady if CDataOwner::ParseFilesL() not called */ { - __LOG2("CDataOwner::CommonSettingsL() - START - sid: 0x%08x, iFilesParsed: %d", iSecureId.iId, iFilesParsed); + OstTraceFunctionEntry0( CDATAOWNER_COMMONSETTINGSL_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_COMMONSETTINGSL, "sid: 0x%08x, iFilesParsed: %d", iSecureId.iId, static_cast(iFilesParsed)); if (!iFilesParsed) { + OstTrace0(TRACE_ERROR, DUP6_CDATAOWNER_COMMONSETTINGSL, "Leave: KErrNotReady"); User::Leave(KErrNotReady); } - __LOG2("CDataOwner::CommonSettingsL() - Active Supported: %d, proxyCount: %d", iActiveInformation.iSupported, iProxyInformationArray.Count()); + OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNER_COMMONSETTINGSL, "Active Supported: %d, proxyCount: %d", iActiveInformation.iSupported, iProxyInformationArray.Count()); TCommonBURSettings settings = ENoOptions; if (iActiveInformation.iSupported || iProxyInformationArray.Count()) { settings |= EActiveBUR; } // if - __LOG1("CDataOwner::CommonSettingsL() - Passive Supported: %d", iPassiveInformation.iSupported); + OstTrace1(TRACE_NORMAL, DUP2_CDATAOWNER_COMMONSETTINGSL, "Passive Supported: %d", iPassiveInformation.iSupported); if (iPassiveInformation.iSupported) { settings |= EPassiveBUR; } - __LOG1("CDataOwner::CommonSettingsL() - System Supported: %d", iSystemInformation.iSupported); + OstTrace1(TRACE_NORMAL, DUP3_CDATAOWNER_COMMONSETTINGSL, "System Supported: %d", iSystemInformation.iSupported); if (iSystemInformation.iSupported) { settings |= EHasSystemFiles; } - __LOG2("CDataOwner::CommonSettingsL() - SelActive: %d, SelPassive: %d", iActiveInformation.iSupportsSelective, iPassiveInformation.iSupportsSelective); + OstTraceExt2(TRACE_NORMAL, DUP4_CDATAOWNER_COMMONSETTINGSL, "SelActive: %d, SelPassive: %d", iActiveInformation.iSupportsSelective, iPassiveInformation.iSupportsSelective); if (iActiveInformation.iSupportsSelective && iPassiveInformation.iSupportsSelective) { settings |= ESupportsSelective; } - __LOG1("CDataOwner::CommonSettingsL() - Reboot required: %d", iRestoreInformation.iRequiresReboot); + OstTrace1(TRACE_NORMAL, DUP5_CDATAOWNER_COMMONSETTINGSL, "Reboot required: %d", iRestoreInformation.iRequiresReboot); if (iRestoreInformation.iRequiresReboot) { settings |= ERequiresReboot; } - __LOG("CDataOwner::CommonSettingsL() - END"); + OstTraceFunctionExit0( CDATAOWNER_COMMONSETTINGSL_EXIT ); return settings; } @@ -1520,8 +1575,10 @@ @leave KErrNotReady if CDataOwner::ParseFilesL() not called */ { + OstTraceFunctionEntry0( CDATAOWNER_PASSIVESETTINGSL_ENTRY ); if (!iFilesParsed) { + OstTrace0(TRACE_ERROR, CDATAOWNER_PASSIVESETTINGSL, "Leave: KErrNotReady"); User::Leave(KErrNotReady); } @@ -1543,6 +1600,7 @@ } // if + OstTraceFunctionExit0( CDATAOWNER_PASSIVESETTINGSL_EXIT ); return settings; } @@ -1554,8 +1612,10 @@ @leave KErrNotReady if CDataOwner::ParseFilesL() not called */ { + OstTraceFunctionEntry0( CDATAOWNER_ACTIVESETTINGSL_ENTRY ); if (!iFilesParsed) { + OstTrace0(TRACE_ERROR, CDATAOWNER_ACTIVESETTINGSL, "Leave: KErrNotReady"); User::Leave(KErrNotReady); } @@ -1572,6 +1632,7 @@ } // if } // if + OstTraceFunctionExit0( CDATAOWNER_ACTIVESETTINGSL_EXIT ); return settings; } @@ -1593,9 +1654,11 @@ @leave KErrNotReady if CDataOwner::ParseFilesL() not called */ { - __LOG2("CDataOwner::GetDriveListL() - SID: 0x%08x, iFilesParsed: %d", iSecureId.iId, iFilesParsed); + OstTraceFunctionEntry0( CDATAOWNER_GETDRIVELISTL_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_GETDRIVELISTL, "SID: 0x%08x, iFilesParsed: %d", iSecureId.iId, static_cast(iFilesParsed)); if (!iFilesParsed) { + OstTrace0(TRACE_ERROR, DUP13_CDATAOWNER_GETDRIVELISTL, "Leave: KErrNotReady"); User::Leave(KErrNotReady); } @@ -1604,9 +1667,9 @@ const TInt error = ipDataOwnerManager->GetRFs().DriveList(existingDrives); if ( error != KErrNone ) { - __LOG1("CDataOwner::GetDriveListL() - couldnt get drive list: %d", error); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNER_GETDRIVELISTL, "couldnt get drive list: %d", error); } - User::LeaveIfError(error); + LEAVEIFERROR(error, OstTrace1(TRACE_ERROR, DUP12_CDATAOWNER_GETDRIVELISTL, "Leave: %d", error)); // We now no longer return the Z drive, it has been decided that the Z drive will always be the // ROM. Backing up and restoring the ROM drive should not be possible, as what is the point @@ -1626,7 +1689,7 @@ // have to say all drives if ((iActiveInformation.iSupported) || (iDBMSSelections.Count())) { - __LOG("CDataOwner::GetDriveListL() - active DO, so using all existing drives"); + OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNER_GETDRIVELISTL, "active DO, so using all existing drives"); aDriveList = existingDrives; } // if else @@ -1640,7 +1703,7 @@ // Loop through passive files TInt count = iPassiveSelections.Count(); - __LOG1("CDataOwner::GetDriveListL() - checking %d passive file entries...", count); + OstTrace1(TRACE_NORMAL, DUP3_CDATAOWNER_GETDRIVELISTL, "checking %d passive file entries...", count); for (TInt x = 0; !allDrives && x < count; x++) { const TDesC& selection = iPassiveSelections[x]->SelectionName(); @@ -1650,23 +1713,23 @@ if (drive == -1) { - __LOG3("CDataOwner::GetDriveListL() - passive[%2d/%2d] => all drives (no specific drive letter) - fullName: %S", x+1, count, &selection); + OstTraceExt3(TRACE_NORMAL, DUP4_CDATAOWNER_GETDRIVELISTL, "passive[%2d/%2d] => all drives (no specific drive letter) - fullName: %S", x+1, count, selection); allDrives = ETrue; } else if (existingDrives[drive] != 0) { - __LOG4("CDataOwner::GetDriveListL() - passive[%2d/%2d] => drive: %c, fullName: %S", x+1, count, drive + 'A', &selection); + OstTraceExt4(TRACE_NORMAL, DUP5_CDATAOWNER_GETDRIVELISTL, "passive[%2d/%2d] => drive: %c, fullName: %S", x+1, count, drive + 'A', selection); aDriveList[drive] = ETrue; } } } // for - __LOG(" "); + OstTrace0(TRACE_NORMAL, DUP6_CDATAOWNER_GETDRIVELISTL, " "); // Loop through public files count = iPublicSelections.Count(); - __LOG1("CDataOwner::GetDriveListL() - checking %d public file entries...", count); + OstTrace1(TRACE_NORMAL, DUP7_CDATAOWNER_GETDRIVELISTL, "checking %d public file entries...", count); for (TInt x = 0; !allDrives && (x < count); x++) { @@ -1677,12 +1740,12 @@ if (drive == -1) { - __LOG3("CDataOwner::GetDriveListL() - public[%2d/%2d] => all drives (no specific drive letter) - fullName: %S", x+1, count, &selection); + OstTraceExt3(TRACE_NORMAL, DUP8_CDATAOWNER_GETDRIVELISTL, "public[%2d/%2d] => all drives (no specific drive letter) - fullName: %S", x+1, count, selection); allDrives = ETrue; } else if (existingDrives[drive] != 0) { - __LOG4("CDataOwner::GetDriveListL() - public[%2d/%2d] => drive: %c, fullName: %S", x+1, count, drive + 'A', &selection); + OstTraceExt4(TRACE_NORMAL, DUP9_CDATAOWNER_GETDRIVELISTL, "public[%2d/%2d] => drive: %c, fullName: %S", x+1, count, drive + 'A', selection); aDriveList[drive] = ETrue; } } @@ -1690,12 +1753,11 @@ if (allDrives) { - __LOG("CDataOwner::GetDriveListL() - using all drives!"); + OstTrace0(TRACE_NORMAL, DUP10_CDATAOWNER_GETDRIVELISTL, "using all drives!"); aDriveList = existingDrives; } // if } // else - #ifdef SBE_LOGGING_ENABLED TBuf<256> drivePrint; // for(TInt i=0; iParserProxy().ParseL(aFileName, *this); + OstTraceFunctionExit0( CDATAOWNER_PARSEFILEL_EXIT ); } void CDataOwner::PrivatePathL(const TDesC& aFileName) @@ -1753,9 +1817,11 @@ @param aPath The path to extract the drive from */ { + OstTraceFunctionEntry0( CDATAOWNER_PRIVATEPATHL_ENTRY ); delete iPrivatePath; TParsePtrC parse(aFileName); iPrivatePath = parse.Path().AllocL(); + OstTraceFunctionExit0( CDATAOWNER_PRIVATEPATHL_EXIT ); } TInt CDataOwner::GetDrive(const TDesC& aPath) const @@ -1765,6 +1831,7 @@ @return A TDriveNumber or -1 if a drive is not specified */ { + OstTraceFunctionEntry0( CDATAOWNER_GETDRIVE_ENTRY ); TInt ret = KErrNotFound; if (aPath.Length() > 0) @@ -1775,6 +1842,7 @@ } // if } + OstTraceFunctionExit0( CDATAOWNER_GETDRIVE_EXIT ); return ret; } @@ -1798,8 +1866,9 @@ @param apFileNames Array of file names to populate */ { + OstTraceFunctionEntry0( CDATAOWNER_BUILDFILELISTL_ENTRY ); TInt count = aFileSelection.Count(); - __LOG4("CDataOwner::BuildFileListL() - START - aDriveNumber: %c, count: %d, aIsPublic: %d, aTransferType: %d", aDriveNumber + 'A', count, aIsPublic, aTransferType); + OstTraceExt4(TRACE_NORMAL, CDATAOWNER_BUILDFILELISTL, "aDriveNumber: %c, count: %d, aIsPublic: %d, aTransferType: %d", static_cast(aDriveNumber + 'A'), static_cast(count), static_cast(aIsPublic), static_cast(aTransferType)); // Split selections into include and exclude RArray include; CleanupClosePushL(include); @@ -1811,11 +1880,11 @@ apSnapshots->Sort(CSnapshot::Compare); } - __LOG("CDataOwner::BuildFileListL() - file selection listing...:"); + OstTrace0(TRACE_NORMAL, DUP1_CDATAOWNER_BUILDFILELISTL, "file selection listing...:"); for (TInt x = 0; x < count; x++) { const TDesC& selectionName = aFileSelection[x]->SelectionName(); - __LOG3("CDataOwner::BuildFileListL() - selection[%03d]: %S, type: %d", x, &selectionName, aFileSelection[x]->SelectionType()); + OstTraceExt3(TRACE_NORMAL, DUP2_CDATAOWNER_BUILDFILELISTL, "selection[%03d]: %S, type: %d", x, selectionName, aFileSelection[x]->SelectionType()); if (aFileSelection[x]->SelectionType() == EInclude) { include.AppendL(selectionName); @@ -1828,17 +1897,18 @@ // Loop through all includes count = include.Count(); - __LOG("CDataOwner::BuildFileListL() - include listing...:"); + OstTrace0(TRACE_NORMAL, DUP3_CDATAOWNER_BUILDFILELISTL, "include listing...:"); TFileName* fileName = new(ELeave) TFileName(); CleanupStack::PushL(fileName); for (TInt x = 0; x < count; x++) { fileName->Zero(); TChar drive; - User::LeaveIfError(ipDataOwnerManager->GetRFs().DriveToChar(aDriveNumber, drive)); + TInt err = ipDataOwnerManager->GetRFs().DriveToChar(aDriveNumber, drive); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP14_CDATAOWNER_BUILDFILELISTL, "Leave: %d", err)); const TDesC& includeEntry( include[x] ); - __LOG2("CDataOwner::BuildFileListL() - entry[%03d] is: %S", x, &includeEntry); + OstTraceExt2(TRACE_NORMAL, DUP4_CDATAOWNER_BUILDFILELISTL, "entry[%03d] is: %S", x, includeEntry); // See if the drive is specified if (includeEntry[0] == KBackSlash()[0]) @@ -1854,7 +1924,7 @@ } // else - __LOG2("CDataOwner::BuildFileListL() - entry[%03d] filename is therefore: %S", x, fileName); + OstTraceExt2(TRACE_NORMAL, DUP5_CDATAOWNER_BUILDFILELISTL, "entry[%03d] filename is therefore: %S", x, *fileName); if (fileName->Length() > 0) { @@ -1864,7 +1934,7 @@ (fileName->MatchF(KDriveAndSlash) != KErrNotFound)) { isDrive = ETrue; - __LOG("CDataOwner::BuildFileListL() - filename is a drive"); + OstTrace0(TRACE_NORMAL, DUP6_CDATAOWNER_BUILDFILELISTL, "filename is a drive"); } // if TEntry entry; @@ -1872,7 +1942,7 @@ if (!isDrive) { TInt err = ipDataOwnerManager->GetRFs().Entry(*fileName, entry); - __LOG1("CDataOwner::BuildFileListL() - get entry error: %d", err); + OstTrace1(TRACE_NORMAL, DUP7_CDATAOWNER_BUILDFILELISTL, "get entry error: %d", err); entry.iName = *fileName; switch (err) { @@ -1884,28 +1954,27 @@ case KErrBadName: break; default: + OstTrace1(TRACE_ERROR, DUP13_CDATAOWNER_BUILDFILELISTL, "Leave: %d", err); User::Leave(err); } // switch } // if if (isDrive || (isEntry && entry.IsDir())) { - __LOG("CDataOwner::BuildFileListL() - parsing directory..."); + OstTrace0(TRACE_NORMAL, DUP8_CDATAOWNER_BUILDFILELISTL, "parsing directory..."); ParseDirL(*fileName, exclude, aTransferType, aIsPublic, apSnapshots, apFileEntries, apFileNames); - #ifdef SBE_LOGGING_ENABLED if (apFileNames) { const TInt fNameCount = apFileNames->Count(); for(TInt k=0; kGetRFs().GetDir(*path, KEntryAttMatchMask, ESortNone, pFiles); if ((err != KErrNone) && (err != KErrNotFound)) // Do we need to leave? { + OstTrace1(TRACE_ERROR, CDATAOWNER_PARSEDIRL, "Leave: %d", err); User::Leave(err); } // if @@ -2068,6 +2139,7 @@ CleanupStack::PopAndDestroy(fileName); CleanupStack::PopAndDestroy(pFiles); CleanupStack::PopAndDestroy(path); + OstTraceFunctionExit0( CDATAOWNER_PARSEDIRL_EXIT ); } @@ -2079,12 +2151,14 @@ @param aEntry on return the next entry in the list, an empty entry indicates the end of the list has been reached */ { + OstTraceFunctionEntry0( CDATAOWNER_GETNEXTPUBLICFILEL_ENTRY ); TInt stackCount; TFileName fileName; TBool endOfList = EFalse; TBool gotEntry = EFalse; TChar drive; - User::LeaveIfError(ipDataOwnerManager->GetRFs().DriveToChar(aDriveNumber, drive)); + TInt err = ipDataOwnerManager->GetRFs().DriveToChar(aDriveNumber, drive); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP8_CDATAOWNER_GETNEXTPUBLICFILEL, "Leave: %d", err)); if (aReset) { @@ -2106,7 +2180,7 @@ for (TInt x = 0; x < selectionCount; ++x) { const TDesC& selectionName = iPublicSelections[x]->SelectionName(); - __LOG3("CDataOwner::GetNextPublicFileL() - selection[%03d]: %S, type: %d", x, &selectionName, iPublicSelections[x]->SelectionType()); + OstTraceExt3(TRACE_NORMAL, CDATAOWNER_GETNEXTPUBLICFILEL, "selection[%03d]: %S, type: %d", x, selectionName, iPublicSelections[x]->SelectionType()); if (iPublicSelections[x]->SelectionType() == EExclude) { iPublicExcludes.AppendL(selectionName); @@ -2160,7 +2234,7 @@ } // else - __LOG1("CDataOwner::GetNextPublicFileL() - next include entry filename is therefore: %S", &fileName); + OstTraceExt1(TRACE_NORMAL, DUP1_CDATAOWNER_GETNEXTPUBLICFILEL, "next include entry filename is therefore: %S", fileName); if (fileName.Length() > 0) { @@ -2170,14 +2244,14 @@ (fileName.MatchF(KDriveAndSlash) != KErrNotFound)) { isDrive = ETrue; - __LOG("CDataOwner::GetNextPublicFileL() - filename is a drive"); + OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNER_GETNEXTPUBLICFILEL, "filename is a drive"); } // if TBool isEntry = EFalse; if (!isDrive) { TInt err = ipDataOwnerManager->GetRFs().Entry(fileName, aEntry); - __LOG1("CDataOwner::GetNextPublicFileL() - get entry error: %d", err); + OstTrace1(TRACE_NORMAL, DUP3_CDATAOWNER_GETNEXTPUBLICFILEL, "get entry error: %d", err); aEntry.iName = fileName; switch (err) { @@ -2189,6 +2263,7 @@ case KErrBadName: break; default: + OstTrace1(TRACE_ERROR, DUP6_CDATAOWNER_GETNEXTPUBLICFILEL, "Leave: %d", err); User::Leave(err); } // switch @@ -2201,7 +2276,7 @@ if (isDrive || (isEntry && aEntry.IsDir())) { - __LOG("CDataOwner::GetNextPublicFileL() - parsing directory..."); + OstTrace0(TRACE_NORMAL, DUP4_CDATAOWNER_GETNEXTPUBLICFILEL, "parsing directory..."); RDir dir; dir.Open(ipDataOwnerManager->GetRFs(), fileName, KEntryAttMaskSupported); iPublicDirStack.AppendL(dir); @@ -2216,7 +2291,7 @@ } else { - __LOG("CDataOwner::BuildFileListL() - file is excluded!"); + OstTrace0(TRACE_NORMAL, DUP5_CDATAOWNER_GETNEXTPUBLICFILEL, "file is excluded!"); } } // if } // else if @@ -2261,7 +2336,8 @@ // Open the directory and push it onto the dir stack RDir dir; - User::LeaveIfError(dir.Open(ipDataOwnerManager->GetRFs(), fileName, KEntryAttMaskSupported)); + TInt err = dir.Open(ipDataOwnerManager->GetRFs(), fileName, KEntryAttMaskSupported); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP10_CDATAOWNER_GETNEXTPUBLICFILEL, "Leave: %d", err)); iPublicDirStack.AppendL(dir); iPublicDirNameStack.AppendL(aEntry.iName.AllocL()); ++stackCount; @@ -2288,6 +2364,7 @@ } else { + OstTrace1(TRACE_ERROR, DUP7_CDATAOWNER_GETNEXTPUBLICFILEL, "Leave: %d", err); User::Leave(err); } } // if (stackCount > 0) @@ -2298,6 +2375,7 @@ // If the end of the list has been reached, make sure that an empty TEntry is returned aEntry = TEntry(); } + OstTraceFunctionExit0( CDATAOWNER_GETNEXTPUBLICFILEL_EXIT ); } @@ -2311,6 +2389,7 @@ @return ETrue if excluded otherwise EFalse */ { + OstTraceFunctionEntry0( CDATAOWNER_ISEXCLUDED_ENTRY ); TBool ret = EFalse; // Check it is not in sys, resource, system or backwards path @@ -2358,7 +2437,7 @@ const TInt count = aExclude.Count(); for (TInt x = 0; !ret && x < count; x++) { - __LOG1("file name: %S",&aFileName); + OstTraceExt1(TRACE_NORMAL, CDATAOWNER_ISEXCLUDED, "file name: %S",aFileName); if (aExclude[x][0] == KBackSlash()[0]) { // Compare with out drive @@ -2375,7 +2454,8 @@ } // for x } // if - __LOG2("CDataOwner::IsExcluded() - END - returns excluded: %d for file: %S", ret, &aFileName); + OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNER_ISEXCLUDED, "returns excluded: %d for file: %S", ret, aFileName); + OstTraceFunctionExit0( CDATAOWNER_ISEXCLUDED_EXIT ); return ret; } @@ -2386,25 +2466,26 @@ @param aLastSection Is this the last section? */ { - __LOG2("CDataOwner::SupplyPassiveSnapshotDataL() - START - aDriveNumber: %c, aLastSection: %d", aDriveNumber + 'A', aLastSection); + OstTraceFunctionEntry0( CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL, "aDriveNumber: %c, aLastSection: %d", aDriveNumber + 'A', aLastSection); TInt err = KErrNone; if (iBufferSnapshotReader == NULL) { - __LOG("CDataOwner::SupplyPassiveSnapshotDataL() - making temporary snapshot holder.."); + OstTrace0(TRACE_NORMAL, DUP1_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL, "making temporary snapshot holder.."); iTempSnapshotHolder = CSnapshotHolder::NewL(); iTempSnapshotHolder->iDriveNumber = aDriveNumber; iBufferSnapshotReader = CBufferSnapshotReader::NewL(iTempSnapshotHolder->iSnapshots); - __LOG("CDataOwner::SupplyPassiveSnapshotDataL() - trying to unpack snapshots from buffer..."); + OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL, "trying to unpack snapshots from buffer..."); TRAP(err, iBufferSnapshotReader->StartL(aBuffer, aLastSection)); - __LOG1("CDataOwner::SupplyPassiveSnapshotDataL() - unpack result was: %d", err); + OstTrace1(TRACE_NORMAL, DUP3_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL, "unpack result was: %d", err); } // if else { - __LOG("CDataOwner::SupplyPassiveSnapshotDataL() - continuing unpack operation..."); + OstTrace0(TRACE_NORMAL, DUP4_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL, "continuing unpack operation..."); TRAP(err, iBufferSnapshotReader->ContinueL(aBuffer, aLastSection)); - __LOG1("CDataOwner::SupplyPassiveSnapshotDataL() - continued unpack operation result was: %d", err); + OstTrace1(TRACE_NORMAL, DUP5_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL, "continued unpack operation result was: %d", err); } if ((err != KErrNone) || aLastSection) @@ -2414,26 +2495,27 @@ if (err == KErrNone) { - __LOG("CDataOwner::SupplyPassiveSnapshotDataL() - Snapshots identified ok!"); + OstTrace0(TRACE_NORMAL, DUP6_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL, "Snapshots identified ok!"); iSnapshots.AppendL(iTempSnapshotHolder); iTempSnapshotHolder = NULL; } // if else { - __LOG1("CDataOwner::SupplyPassiveSnapshotDataL() - END - leaving with error: %d", err); + OstTrace1(TRACE_ERROR, DUP7_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL, "leaving with error: %d", err); User::Leave(err); } // else } // if - __LOG("CDataOwner::SupplyPassiveSnapshotDataL() - END"); + OstTraceFunctionExit0( CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL_EXIT ); } void CDataOwner::SupplyPassiveBaseDataL(const TDriveNumber aDriveNumber, TDesC8& aBuffer, TBool aLastSection) /** Handles the supply of passive base data */ { - __LOG3("CDataOwner::SupplyPassiveBaseDataL() - START - drive: %c, aLastSection: %d, iBufferFileReader: 0x%08x", aDriveNumber + 'A', aLastSection, iBufferFileReader); + OstTraceFunctionEntry0( CDATAOWNER_SUPPLYPASSIVEBASEDATAL_ENTRY ); + OstTraceExt3(TRACE_NORMAL, CDATAOWNER_SUPPLYPASSIVEBASEDATAL, "drive: %c, aLastSection: %d, iBufferFileReader: 0x%08x", static_cast(aDriveNumber + 'A'), static_cast(aLastSection), reinterpret_cast(iBufferFileReader)); TInt err = KErrNone; if (iBufferFileReader == NULL) @@ -2451,16 +2533,16 @@ { if ( err != KErrNone ) { - __LOG1("CDataOwner::SupplyPassiveBaseDataL() - ERROR - error: %d", err); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNER_SUPPLYPASSIVEBASEDATAL, "error: %d", err); } delete iBufferFileReader; iBufferFileReader = NULL; - User::LeaveIfError(err); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP2_CDATAOWNER_SUPPLYPASSIVEBASEDATAL, "Leave: %d", err)); } // if - __LOG("CDataOwner::SupplyPassiveBaseDataL() - END"); + OstTraceFunctionExit0( CDATAOWNER_SUPPLYPASSIVEBASEDATAL_EXIT ); } void CDataOwner::RequestPassiveSnapshotDataL(TDriveNumber aDriveNumber, TPtr8& aBuffer, @@ -2472,7 +2554,8 @@ @param aLastSection On return set to true if finished. */ { - __LOG3("CDataOwner::RequestPassiveSnapshotDataL() - START - aDriveNumber: %c, owner: 0x%08x, bufferLen: %d", aDriveNumber + 'A', iSecureId.iId, aBuffer.Length() ); + OstTraceFunctionEntry0( CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL_ENTRY ); + OstTraceExt3(TRACE_NORMAL, CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL, "aDriveNumber: %c, owner: 0x%08x, bufferLen: %d", static_cast(aDriveNumber + 'A'), iSecureId.iId, static_cast(aBuffer.Length())); if (iBufferSnapshotWriter == NULL) { @@ -2490,7 +2573,7 @@ const TInt count = fileinfos.Count(); if (count > 0) { - __LOG1("CDataOwner::SupplyPassiveBaseDataL() - got %d entries...", count); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL, "got %d entries...", count); // Create a tempory snapshot holder RSnapshots* tempSnapshots = new(ELeave) RSnapshots(); @@ -2501,7 +2584,7 @@ { const TDesC& fileName = (*filenames)[x]; CSnapshot* snapshot = CSnapshot::NewLC(fileinfos[x].iModified.Int64(), fileName); - __LOG3("CDataOwner::RequestPassiveSnapshotDataL() - snapshot[%2d/%2d] = %S", x+1, count, &fileName); + OstTraceExt3(TRACE_NORMAL, DUP2_CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL, "snapshot[%2d/%2d] = %S", x+1, count, fileName); tempSnapshots->AppendL(snapshot); CleanupStack::Pop(snapshot); } // for x @@ -2510,7 +2593,7 @@ iBufferSnapshotWriter = CBufferSnapshotWriter::NewL(tempSnapshots); CleanupStack::Pop(tempSnapshots); - __LOG("CDataOwner::RequestPassiveSnapshotDataL() - writing snapshots to buffer..."); + OstTrace0(TRACE_NORMAL, DUP3_CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL, "writing snapshots to buffer..."); iBufferSnapshotWriter->StartL(aBuffer, aLastSection); if (aLastSection) { @@ -2538,7 +2621,8 @@ } // if } // else - __LOG2("CDataOwner::RequestPassiveSnapshotDataL() - END - aLastSection: %d, bufferLen: %d", aLastSection, aBuffer.Length()); + OstTraceExt2(TRACE_NORMAL, DUP4_CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL, "aLastSection: %d, bufferLen: %d", aLastSection, aBuffer.Length()); + OstTraceFunctionExit0( CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL_EXIT ); } // RequestPassiveSnapShotDataL void CDataOwner::RequestPassiveDataL(TTransferDataType aTransferType, @@ -2551,7 +2635,8 @@ @param aLastSection On return set to true if finished. */ { - __LOG4("CDataOwner::RequestPassiveDataL() - START - aDrive: %c, aTransferType: %d, iSecureId: 0x%08x, iBufferFileWriter: 0x%08x", aDriveNumber + 'A', aTransferType, iSecureId.iId, iBufferFileWriter); + OstTraceFunctionEntry0( CDATAOWNER_REQUESTPASSIVEDATAL_ENTRY ); + OstTraceExt4(TRACE_NORMAL, CDATAOWNER_REQUESTPASSIVEDATAL, "aDrive: %c, aTransferType: %d, iSecureId: 0x%08x, iBufferFileWriter: 0x%08x", static_cast(aDriveNumber + 'A'), static_cast(aTransferType), iSecureId.iId, reinterpret_cast(iBufferFileWriter)); // Build the list of files if (iBufferFileWriter == NULL) @@ -2561,7 +2646,7 @@ if (aTransferType == EPassiveBaseData) { - __LOG("CDataOwner::RequestPassiveDataL() - EPassiveBaseData..."); + OstTrace0(TRACE_NORMAL, DUP1_CDATAOWNER_REQUESTPASSIVEDATAL, "EPassiveBaseData..."); BuildFileListL(iPassiveSelections, aDriveNumber, aTransferType, EFalse, NULL, NULL, filenames); // Add the DBMS file @@ -2587,7 +2672,7 @@ } // else - __LOG1("CDataOwner::RequestPassiveDataL() - Got %d files...", filenames->Count()); + OstTrace1(TRACE_NORMAL, DUP2_CDATAOWNER_REQUESTPASSIVEDATAL, "Got %d files...", filenames->Count()); if (filenames->Count() > 0) { // Create a file writer @@ -2618,7 +2703,7 @@ } // if } // else - __LOG("CDataOwner::RequestPassiveDataL() - END"); + OstTraceFunctionExit0( CDATAOWNER_REQUESTPASSIVEDATAL_EXIT ); } void CDataOwner::IsNewerL(const TDesC& aFileName, const TEntry& aFile, const RSnapshots* aSnapshots, TBool& aNewer) @@ -2632,10 +2717,11 @@ @leave KErrNotFound if aFile does not exist in aFiles. */ { + OstTraceFunctionEntry0( CDATAOWNER_ISNEWERL_ENTRY ); CSnapshot* snapshot = CSnapshot::NewLC(TTime().Int64(), aFileName); TInt res = aSnapshots->Find(snapshot, CSnapshot::Match); CleanupStack::PopAndDestroy(snapshot); - User::LeaveIfError(res); + LEAVEIFERROR(res, OstTrace1(TRACE_ERROR, CDATAOWNER_ISNEWERL, "Leave: %d", res)); if (aFile.iModified.Int64() > (*aSnapshots)[res]->Modified()) { aNewer = ETrue; @@ -2644,6 +2730,7 @@ { aNewer = EFalse; } + OstTraceFunctionExit0( CDATAOWNER_ISNEWERL_EXIT ); } RSnapshots* CDataOwner::FindSnapshot(TDriveNumber aDriveNumber) @@ -2653,8 +2740,9 @@ @return The snapshot or NULL */ { + OstTraceFunctionEntry0( CDATAOWNER_FINDSNAPSHOT_ENTRY ); const TInt count = iSnapshots.Count(); - __LOG3("CDataOwner::FindSnapshot() - START - aDriveNumber: %c, count: %d, iSecureId: 0x%08x", aDriveNumber + 'A', count, iSecureId.iId); + OstTraceExt3(TRACE_NORMAL, CDATAOWNER_FINDSNAPSHOT, "aDriveNumber: %c, count: %d, iSecureId: 0x%08x", static_cast(aDriveNumber + 'A'), static_cast(count), iSecureId.iId); RSnapshots* pRet = NULL; @@ -2662,16 +2750,14 @@ { CSnapshotHolder* snapshotHolder = iSnapshots[x]; - #ifdef SBE_LOGGING_ENABLED const TInt entryCount = snapshotHolder->iSnapshots.Count(); - __LOG4("CDataOwner::FindSnapshot() - snapshot[%02d] - drive: %c, entry Count: %d, addr: 0x%08x", x, snapshotHolder->iDriveNumber + 'A', entryCount, &snapshotHolder->iSnapshots); + OstTraceExt4(TRACE_NORMAL, DUP1_CDATAOWNER_FINDSNAPSHOT, "snapshot[%02d] - drive: %c, entry Count: %d, addr: 0x%08x", static_cast(x), static_cast(snapshotHolder->iDriveNumber + 'A'), static_cast(entryCount), reinterpret_cast(&snapshotHolder->iSnapshots)); for(TInt i=0; iiSnapshots[i]->FileName(); - __LOG2("CDataOwner::FindSnapshot() - file[%04d]: %S", i+1, &snapshot); + OstTraceExt2(TRACE_NORMAL, DUP2_CDATAOWNER_FINDSNAPSHOT, "file[%04d]: %S", i+1, snapshot); } - #endif if (snapshotHolder->iDriveNumber == aDriveNumber) { @@ -2679,7 +2765,8 @@ } // if } // for x - __LOG1("CDataOwner::FindSnapshot() - END - ret: 0x%08x", pRet); + OstTrace1(TRACE_NORMAL, DUP3_CDATAOWNER_FINDSNAPSHOT, "ret: 0x%08x", pRet); + OstTraceFunctionExit0( CDATAOWNER_FINDSNAPSHOT_EXIT ); return pRet; } @@ -2689,6 +2776,7 @@ */ TDataOwnerStateByDrive& CDataOwner::StateByDriveL(TDriveNumber& aDrive) { + OstTraceFunctionEntry0( CDATAOWNER_STATEBYDRIVEL_ENTRY ); TBool found = EFalse; const TInt count = iStateByDrive.Count(); TInt index = 0; @@ -2709,9 +2797,11 @@ // We must have found, otherwise error if (!found) { + OstTrace0(TRACE_ERROR, CDATAOWNER_STATEBYDRIVEL, "Leave: KErrNotFound"); User::Leave(KErrNotFound); } + OstTraceFunctionExit0( CDATAOWNER_STATEBYDRIVEL_EXIT ); return iStateByDrive[index]; } @@ -2722,6 +2812,7 @@ */ TProxyStateByDrive& CDataOwner::ProxyStateByDriveL(TDriveNumber& aDrive, TInt aProxy) { + OstTraceFunctionEntry0( CDATAOWNER_PROXYSTATEBYDRIVEL_ENTRY ); TBool found = EFalse; const TInt count = iProxyStateByDrive.Count(); TInt index = 0; @@ -2747,6 +2838,7 @@ index = count; } + OstTraceFunctionExit0( CDATAOWNER_PROXYSTATEBYDRIVEL_EXIT ); return iProxyStateByDrive[index]; } @@ -2757,11 +2849,12 @@ */ void CDataOwner::BuildDriveStateArrayL() { + OstTraceFunctionEntry0( CDATAOWNER_BUILDDRIVESTATEARRAYL_ENTRY ); TDriveList driveList; driveList.SetMax(); TRAPD(err, GetDriveListL(driveList)); - __LOG2("CDataOwner::BuildDriveStateArrayL() - START - SID: 0x%08x, error: %d", iSecureId.iId, err); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_BUILDDRIVESTATEARRAYL, "SID: 0x%08x, error: %d", iSecureId.iId, static_cast(err)); if (err == KErrNone) { @@ -2776,8 +2869,9 @@ } else { - __LOG1("CDataOwner::BuildDriveStateArrayL() - Warning! error ocurred whilst getting the drivelist from data owner %08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNER_BUILDDRIVESTATEARRAYL, "Warning! error ocurred whilst getting the drivelist from data owner %08x", iSecureId.iId); } + OstTraceFunctionExit0( CDATAOWNER_BUILDDRIVESTATEARRAYL_EXIT ); } @@ -2786,14 +2880,16 @@ */ void CDataOwner::AddDBMSFilesL(TDriveNumber aDriveNumber, CDesCArray* apFileNames, RFileArray* apEntries) { + OstTraceFunctionEntry0( CDATAOWNER_ADDDBMSFILESL_ENTRY ); const TInt count = iDBMSSelections.Count(); - __LOG3("CDataOwner::AddDBMSFilesL() - START - aDriveNumber: %c, owner: 0x%08x, count: %d", aDriveNumber + 'A', iSecureId.iId, count); + OstTraceExt3(TRACE_NORMAL, CDATAOWNER_ADDDBMSFILESL, "aDriveNumber: %c, owner: 0x%08x, count: %d", static_cast(aDriveNumber + 'A'), iSecureId.iId, static_cast(count)); if (count > 0) { // Get DB connection RDbs dbs; - User::LeaveIfError(dbs.Connect()); + TInt err = dbs.Connect(); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP10_CDATAOWNER_ADDDBMSFILESL, "Leave: %d", err)); CleanupClosePushL(dbs); for (TInt x = 0; x < count; x++) @@ -2807,13 +2903,13 @@ { CleanupStack::PushL(pFilenames); - __LOG1("CDataOwner::AddDBMSFilesL() - getting backup paths for owner returned error: %d", err); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNER_ADDDBMSFILESL, "getting backup paths for owner returned error: %d", err); const TInt count = pFilenames->Count(); for (TInt x = 0; x < count; x++) { const TDesC& pFileName = (*pFilenames)[x]; - __LOG3("CDataOwner::AddDBMSFilesL() - file[%3d/%3d] = %S", x + 1, count, &pFileName); + OstTraceExt3(TRACE_NORMAL, DUP2_CDATAOWNER_ADDDBMSFILESL, "file[%3d/%3d] = %S", x + 1, count, pFileName); TInt drive = -1; TInt driveerr = RFs::CharToDrive( pFileName[0], drive); @@ -2821,28 +2917,28 @@ { if (apFileNames) { - __LOG1("CDataOwner::AddDBMSFilesL() - adding validated filename: %S", &pFileName); + OstTraceExt1(TRACE_NORMAL, DUP3_CDATAOWNER_ADDDBMSFILESL, "adding validated filename: %S", pFileName); apFileNames->AppendL( pFileName ); } if (apEntries) { TEntry entry; TInt entryError = ipDataOwnerManager->GetRFs().Entry( pFileName, entry); - __LOG2("CDataOwner::AddDBMSFilesL() - drive entry result for file \'%S\' is: %d", &pFileName, entryError); + OstTraceExt2(TRACE_NORMAL, DUP4_CDATAOWNER_ADDDBMSFILESL, "drive entry result for file \'%S\' is: %d", pFileName, entryError); if (entryError == KErrNone) { - __LOG1("CDataOwner::AddDBMSFilesL() - adding validated entry: %S", &pFileName); + OstTraceExt1(TRACE_NORMAL, DUP5_CDATAOWNER_ADDDBMSFILESL, "adding validated entry: %S", pFileName); apEntries->AppendL(entry); } // if else if (entryError != KErrNotFound) { - __LOG2("CDataOwner::AddDBMSFilesL() - Could not get entry for 0x%08x, error: %d", iSecureId.iId, entryError); + OstTraceExt2(TRACE_NORMAL, DUP6_CDATAOWNER_ADDDBMSFILESL, "Could not get entry for 0x%08x, error: %d", iSecureId.iId, static_cast(entryError)); } // else if } // if } // if else { - __LOG("CDataOwner::AddDBMSFilesL() - File is not applicable for this drive => file ignored"); + OstTrace0(TRACE_NORMAL, DUP7_CDATAOWNER_ADDDBMSFILESL, "File is not applicable for this drive => file ignored"); } } // for x @@ -2851,7 +2947,7 @@ } else { - __LOG2("CDataOwner::AddDBMSFilesL() - RDbs error %d SID: 0x%08x", err, iSecureId.iId); + OstTraceExt2(TRACE_NORMAL, DUP8_CDATAOWNER_ADDDBMSFILESL, "RDbs error %d SID: 0x%08x", static_cast(err), iSecureId.iId); } // else } // for x @@ -2859,7 +2955,8 @@ CleanupStack::PopAndDestroy(&dbs); } // if - __LOG2("CDataOwner::AddDBMSFilesL() - END - aDriveNumber: %c, owner: 0x%08x", aDriveNumber + 'A', iSecureId.iId); + OstTraceExt2(TRACE_NORMAL, DUP9_CDATAOWNER_ADDDBMSFILESL, "aDriveNumber: %c, owner: 0x%08x", static_cast(aDriveNumber + 'A'), iSecureId.iId); + OstTraceFunctionExit0( CDATAOWNER_ADDDBMSFILESL_EXIT ); } // AddDBMSFiles /** Disables system data @@ -2875,6 +2972,7 @@ @return error if Append failes */ { + OstTraceFunctionEntry0( CDATAOWNER_ADDPROXYTOLIST_ENTRY ); TInt count = iProxyInformationArray.Count(); TBool found = EFalse; @@ -2891,8 +2989,9 @@ if (!found) { err = iProxyInformationArray.Append(aProxy); - __LOG2("Data owner(0x%08x): Adding Proxy(0x%08x) to the list", iSecureId.iId,aProxy.iSecureId.iId); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_ADDPROXYTOLIST, "Data owner(0x%08x): Adding Proxy(0x%08x) to the list", iSecureId.iId,aProxy.iSecureId.iId); } + OstTraceFunctionExit0( CDATAOWNER_ADDPROXYTOLIST_EXIT ); return err; } @@ -2901,10 +3000,11 @@ @param aDriveNumber drive to clear */ { + OstTraceFunctionEntry0( CDATAOWNER_CLEANUPBEFORERESTOREL_ENTRY ); const TBool passiveDeleteBeforeRestore = iPassiveInformation.iDeleteBeforeRestore; const TBool driveAlreadyCleaned = StateByDriveL(aDriveNumber).iDeleteBeforeRestorePerformed; - __LOG4("CDataOwner::CleanupBeforeRestoreL() - START - aDriveNumber: %c, owner: 0x%08x, passiveDeleteBeforeRestore: %d, driveAlreadyCleaned: %d", aDriveNumber + 'A', iSecureId.iId, passiveDeleteBeforeRestore, driveAlreadyCleaned); + OstTraceExt4(TRACE_NORMAL, CDATAOWNER_CLEANUPBEFORERESTOREL, "aDriveNumber: %c, owner: 0x%08x, passiveDeleteBeforeRestore: %d, driveAlreadyCleaned: %d", static_cast(aDriveNumber + 'A'), static_cast(iSecureId.iId), static_cast(passiveDeleteBeforeRestore), static_cast(driveAlreadyCleaned)); if ( passiveDeleteBeforeRestore && !driveAlreadyCleaned ) { @@ -2938,7 +3038,7 @@ { const TDesC& fileName = (*toDelete)[x]; - __LOG3("CDataOwner::CleanupBeforeRestoreL() - checking file[%2d/%2d] for match = %S", x + 1, count, &fileName); + OstTraceExt3(TRACE_NORMAL, DUP1_CDATAOWNER_CLEANUPBEFORERESTOREL, "checking file[%2d/%2d] for match = %S", x + 1, count, fileName); // Check it is not a backup registration file if ( fileName.MatchF(KBackupRegistrationFile) == KErrNotFound ) @@ -2952,8 +3052,8 @@ { deleteError = ipDataOwnerManager->GetRFs().Delete( fileName ); } - __LOG2("CDataOwner::CleanupBeforeRestoreL() - trying to deleting file %S (error was: %d)", &fileName, deleteError); - User::LeaveIfError(deleteError); + OstTraceExt2(TRACE_NORMAL, DUP2_CDATAOWNER_CLEANUPBEFORERESTOREL, "trying to deleting file %S (error was: %d)", fileName, deleteError); + LEAVEIFERROR(deleteError, OstTrace1(TRACE_ERROR, DUP4_CDATAOWNER_CLEANUPBEFORERESTOREL, "Leave: %d", deleteError)); } // if } // for @@ -2965,7 +3065,8 @@ CleanupStack::PopAndDestroy(selections); } // if - __LOG2("CDataOwner::CleanupBeforeRestoreL() - END - aDriveNumber: %c, owner: 0x%08x", aDriveNumber + 'A', iSecureId.iId); + OstTraceExt2(TRACE_NORMAL, DUP3_CDATAOWNER_CLEANUPBEFORERESTOREL, "aDriveNumber: %c, owner: 0x%08x", static_cast(aDriveNumber + 'A'), iSecureId.iId); + OstTraceFunctionExit0( CDATAOWNER_CLEANUPBEFORERESTOREL_EXIT ); } /** Check if the file is in the include list @@ -2975,7 +3076,8 @@ */ TBool CDataOwner::ValidFileL(const TDesC& aFileName) { - __LOG2("CDataOwner::ValidFileL() - START - owner: 0x%08x, aFileName: %S", iSecureId.iId, &aFileName); + OstTraceFunctionEntry0( CDATAOWNER_VALIDFILEL_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_VALIDFILEL, "owner: 0x%08x, aFileName: %S", iSecureId.iId, aFileName); TInt include = EFalse; @@ -2984,18 +3086,18 @@ { const TDesC& selectionName = iPassiveSelections[i]->SelectionName(); TInt match = aFileName.FindF(selectionName); - __LOG5("CDataOwner::ValidFileL() - match result against file[%3d/%3d], selectionType: %d, matchResult: %d, name: %S", i+1, count, iPassiveSelections[i]->SelectionType(), match, &selectionName); + OstTraceExt5(TRACE_NORMAL, DUP1_CDATAOWNER_VALIDFILEL, "match result against file[%3d/%3d], selectionType: %d, matchResult: %d, name: %S", i+1, count, iPassiveSelections[i]->SelectionType(), match, selectionName); if (match >= 0) { if (iPassiveSelections[i]->SelectionType() == EInclude) { - __LOG("CDataOwner::ValidFileL() - file included"); + OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNER_VALIDFILEL, "file included"); include = ETrue; } else { - __LOG("CDataOwner::ValidFileL() - file excluded"); + OstTrace0(TRACE_NORMAL, DUP3_CDATAOWNER_VALIDFILEL, "file excluded"); include = EFalse; break; } // else if @@ -3007,25 +3109,26 @@ const TInt dbmsSelectionCount = iDBMSSelections.Count(); if (dbmsSelectionCount && !include) { - __LOG1("CDataOwner::ValidFileL() - checking against %d DBMS files...", dbmsSelectionCount); + OstTrace1(TRACE_NORMAL, DUP4_CDATAOWNER_VALIDFILEL, "checking against %d DBMS files...", dbmsSelectionCount); for (TInt j = 0; j < dbmsSelectionCount; j++) { const TDesC& pDbmsFileName = iDBMSSelections[j].Name(); const TInt matchResult = aFileName.FindF( pDbmsFileName ); - __LOG4("CDataOwner::ValidFileL() - checking against DBMS file[%2d/%2d] with result: %d (%S)...", j+1, dbmsSelectionCount, matchResult, &pDbmsFileName); + OstTraceExt4(TRACE_NORMAL, DUP5_CDATAOWNER_VALIDFILEL, "checking against DBMS file[%2d/%2d] with result: %d (%S)...", j+1, dbmsSelectionCount, matchResult, pDbmsFileName); if ( matchResult ) { - __LOG("CDataOwner::ValidFileL() - DBMS file included"); + OstTrace0(TRACE_NORMAL, DUP6_CDATAOWNER_VALIDFILEL, "DBMS file included"); include = ETrue; break; } // if }//for } // if - __LOG1("CDataOwner::ValidFileL() - END - valid file result is: %d", include); + OstTrace1(TRACE_NORMAL, DUP7_CDATAOWNER_VALIDFILEL, "valid file result is: %d", include); + OstTraceFunctionExit0( CDATAOWNER_VALIDFILEL_EXIT ); return include; } @@ -3039,23 +3142,27 @@ /** MContentHandler::OnStartDocumentL() */ { + OstTraceFunctionEntry0( CDATAOWNER_ONSTARTDOCUMENTL_ENTRY ); if (aErrorCode != KErrNone) { - __LOG1("CDataOwner::OnStartDocumentL() - error = %d", aErrorCode); + OstTrace1(TRACE_ERROR, CDATAOWNER_ONSTARTDOCUMENTL, "error = %d", aErrorCode); User::Leave(aErrorCode); } + OstTraceFunctionExit0( CDATAOWNER_ONSTARTDOCUMENTL_EXIT ); } void CDataOwner::OnEndDocumentL(TInt aErrorCode) /** MContentHandler::OnEndDocumentL() */ { + OstTraceFunctionEntry0( CDATAOWNER_ONENDDOCUMENTL_ENTRY ); if (aErrorCode != KErrNone) { // just to satifsy UREL compiler (void) aErrorCode; - __LOG1("CDataOwner::OnEndDocumentL() - error = %d", aErrorCode); + OstTrace1(TRACE_NORMAL, CDATAOWNER_ONENDDOCUMENTL, "error = %d", aErrorCode); } + OstTraceFunctionExit0( CDATAOWNER_ONENDDOCUMENTL_EXIT ); } void CDataOwner::OnStartElementL(const RTagInfo& aElement, @@ -3066,12 +3173,14 @@ @leave KErrUnknown an unknown element */ { + OstTraceFunctionEntry0( CDATAOWNER_ONSTARTELEMENTL_ENTRY ); if (aErrorCode != KErrNone) { - __LOG1("CDataOwner::OnStartElementL() - error = %d", aErrorCode); - User::LeaveIfError(aErrorCode); + OstTrace1(TRACE_NORMAL, CDATAOWNER_ONSTARTELEMENTL, "error = %d", aErrorCode); + LEAVEIFERROR(aErrorCode, OstTrace1(TRACE_ERROR, DUP2_CDATAOWNER_ONSTARTELEMENTL, "Leave: %d", aErrorCode)); } + TInt err; TBool unknownElement = EFalse; const TDesC8& localName = aElement.LocalName().DesC(); if (localName == KIncludeFile) @@ -3092,24 +3201,29 @@ } else if (!localName.CompareF(KDBMSBackup)) { - User::LeaveIfError(HandleDBMSBackupL(aAttributes)); + err = HandleDBMSBackupL(aAttributes); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP3_CDATAOWNER_ONSTARTELEMENTL, "Leave: %d", err)); } else if (!localName.CompareF(KSystemBackup)) { - User::LeaveIfError(HandleSystemBackup(aAttributes)); + err = HandleSystemBackup(aAttributes); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP4_CDATAOWNER_ONSTARTELEMENTL, "Leave: %d", err)); } else if (!localName.CompareF(KProxyDataManager)) { - User::LeaveIfError(HandleProxyDataManager(aAttributes)); + err = HandleProxyDataManager(aAttributes); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP5_CDATAOWNER_ONSTARTELEMENTL, "Leave: %d", err)); } else if (!localName.CompareF(KCenrepBackup)) { - User::LeaveIfError(HandleCenrepBackup(aAttributes)); + err = HandleCenrepBackup(aAttributes); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP6_CDATAOWNER_ONSTARTELEMENTL, "Leave: %d", err)); } else if (!localName.CompareF(KPublicBackup)) { iCurrentElement = EPublic; - User::LeaveIfError(HandlePublicBackup(aAttributes)); + err = HandlePublicBackup(aAttributes); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP7_CDATAOWNER_ONSTARTELEMENTL, "Leave: %d", err)); } else if (!localName.CompareF(KPassiveBackup)) { @@ -3117,7 +3231,8 @@ // Only allow passive to be switched on in primary files if (iPrimaryFile) { - User::LeaveIfError(HandlePassiveBackup(aAttributes)); + err = HandlePassiveBackup(aAttributes); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP8_CDATAOWNER_ONSTARTELEMENTL, "Leave: %d", err)); } } else if (iPrimaryFile) @@ -3125,11 +3240,13 @@ // These remaining elements are only allowed in primary files if (!localName.CompareF(KActiveBackup)) { - User::LeaveIfError(HandleActiveBackupL(aAttributes)); + err = HandleActiveBackupL(aAttributes); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP9_CDATAOWNER_ONSTARTELEMENTL, "Leave: %d", err)); } else if (!localName.CompareF(KRestore)) { - User::LeaveIfError(HandleRestore(aAttributes)); + err = HandleRestore(aAttributes); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP10_CDATAOWNER_ONSTARTELEMENTL, "Leave: %d", err)); } else { @@ -3143,8 +3260,9 @@ if (unknownElement) { - __LOG1("CDataOwner::OnStartElementL() - Unknown element while parsing 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNER_ONSTARTELEMENTL, "Unknown element while parsing 0x%08x", iSecureId.iId); } + OstTraceFunctionExit0( CDATAOWNER_ONSTARTELEMENTL_EXIT ); } @@ -3152,9 +3270,10 @@ /** MContentHandler::OnEndElementL() */ { + OstTraceFunctionEntry0( CDATAOWNER_ONENDELEMENTL_ENTRY ); if (aErrorCode != KErrNone) { - __LOG1("CDataOwner::OnEndElementL() - error = %d", aErrorCode); + OstTrace1(TRACE_ERROR, CDATAOWNER_ONENDELEMENTL, "error = %d", aErrorCode); User::Leave(aErrorCode); } @@ -3167,6 +3286,7 @@ { iCurrentElement = ENoElement; } // else if + OstTraceFunctionExit0( CDATAOWNER_ONENDELEMENTL_EXIT ); } void CDataOwner::OnContentL(const TDesC8& /*aBytes*/, TInt /*aErrorCode*/) @@ -3220,8 +3340,10 @@ @leave aErrorCode */ { + OstTraceFunctionEntry0( CDATAOWNER_ONERROR_ENTRY ); (void)aErrorCode; - __LOG1("CDataOwner::OnError() - error = %d", aErrorCode); + OstTrace1(TRACE_NORMAL, CDATAOWNER_ONERROR, "error = %d", aErrorCode); + OstTraceFunctionExit0( CDATAOWNER_ONERROR_EXIT ); } TAny* CDataOwner::GetExtendedInterface(const TInt32 /*aUid*/) @@ -3239,15 +3361,17 @@ @return KErrUnknown unknown version */ { + OstTraceFunctionEntry0( CDATAOWNER_HANDLEBACKUPREGISTRATIONL_ENTRY ); if (aAttributes.Count() == 1) { // Check the version is correct. if (aAttributes[0].Value().DesC() != KVersion()) // Only version we know about { - __LOG1("CDataOwner::HandleBackupRegistrationL() - Unknown version at SID(0x%08x)", iSecureId.iId); + OstTrace1(TRACE_ERROR, CDATAOWNER_HANDLEBACKUPREGISTRATIONL, "Unknown version at SID(0x%08x)", iSecureId.iId); User::Leave(KErrNotSupported); } // else } // if + OstTraceFunctionExit0( CDATAOWNER_HANDLEBACKUPREGISTRATIONL_EXIT ); } @@ -3258,6 +3382,7 @@ @return KErrNone */ { + OstTraceFunctionEntry0( CDATAOWNER_HANDLEPASSIVEBACKUP_ENTRY ); iPassiveInformation.iSupported = ETrue; // Loop through reading out attribute values @@ -3270,19 +3395,19 @@ { const TBool supportsSelective = ( aAttributes[x].Value().DesC().CompareF(KYes) == 0 ); iPassiveInformation.iSupportsSelective = supportsSelective; - __LOG2("CDataOwner::HandlePassiveBackup(0x%08x) - iPassiveInformation.iSupportsSelective: %d", iSecureId.iId, supportsSelective); + OstTraceExt2(TRACE_NORMAL, DUP3_CDATAOWNER_HANDLEPASSIVEBACKUP, "(0x%08x) - iPassiveInformation.iSupportsSelective: %d", iSecureId.iId, static_cast(supportsSelective)); } // if else if ( localName.CompareF(KDeleteBeforeRestore) == 0 ) { // AW This logic looks somewhat strange. if (!aAttributes[x].Value().DesC().CompareF(KYes)) { - __LOG1("CDataOwner::HandlePassiveBackup(0x%08x) - iPassiveInformation.iDeleteBeforeRestore: ETrue", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNER_HANDLEPASSIVEBACKUP, "(0x%08x) - iPassiveInformation.iDeleteBeforeRestore: ETrue", iSecureId.iId); iPassiveInformation.iDeleteBeforeRestore |= ETrue; } // if else { - __LOG1("CDataOwner::HandlePassiveBackup(0x%08x) - iPassiveInformation.iDeleteBeforeRestore: EFalse", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP2_CDATAOWNER_HANDLEPASSIVEBACKUP, "(0x%08x) - iPassiveInformation.iDeleteBeforeRestore: EFalse", iSecureId.iId); iPassiveInformation.iDeleteBeforeRestore |= EFalse; } // else } // else if @@ -3290,14 +3415,15 @@ { const TBool baseBackupOnly = ( aAttributes[x].Value().DesC().CompareF(KYes) == 0 ); iPassiveInformation.iBaseBackupOnly = baseBackupOnly; - __LOG2("CDataOwner::HandlePassiveBackup(0x%08x) - iPassiveInformation.iBaseBackupOnly: %d", iSecureId.iId, baseBackupOnly); + OstTraceExt2(TRACE_NORMAL, DUP4_CDATAOWNER_HANDLEPASSIVEBACKUP, "(0x%08x) - iPassiveInformation.iBaseBackupOnly: %d", iSecureId.iId, static_cast(baseBackupOnly)); } // else if else { - __LOG1("CDataOwner::HandlePassiveBackup() - Unknown element while parsing 0x%08x", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP5_CDATAOWNER_HANDLEPASSIVEBACKUP, "Unknown element while parsing 0x%08x", iSecureId.iId); } // else } // for x + OstTraceFunctionExit0( CDATAOWNER_HANDLEPASSIVEBACKUP_EXIT ); return KErrNone; } @@ -3309,15 +3435,17 @@ @return KErrNone */ { + OstTraceFunctionEntry0( CDATAOWNER_HANDLEPUBLICBACKUP_ENTRY ); iPublicInformation.iSupported = ETrue; if (aAttributes.Count() > 0) { const TBool deleteBeforeRestore = ( aAttributes[0].Value().DesC().CompareF(KYes) == 0 ); iPublicInformation.iDeleteBeforeRestore = deleteBeforeRestore; - __LOG2("CDataOwner::HandlePublicBackup(0x%08x) - iPublicInformation.iDeleteBeforeRestore: %d", iSecureId.iId, deleteBeforeRestore); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_HANDLEPUBLICBACKUP, "(0x%08x) - iPublicInformation.iDeleteBeforeRestore: %d", iSecureId.iId, static_cast(deleteBeforeRestore)); } // if + OstTraceFunctionExit0( CDATAOWNER_HANDLEPUBLICBACKUP_EXIT ); return KErrNone; } @@ -3328,9 +3456,11 @@ @return KErrNone */ { + OstTraceFunctionEntry0( CDATAOWNER_HANDLESYSTEMBACKUP_ENTRY ); iSystemInformation.iSupported = ETrue; - __LOG2("CDataOwner::HandleSystemBackup(0x%08x) - iSystemInformation.iSupported: %d", iSecureId.iId, iSystemInformation.iSupported); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_HANDLESYSTEMBACKUP, "(0x%08x) - iSystemInformation.iSupported: %d", iSecureId.iId, static_cast(iSystemInformation.iSupported)); + OstTraceFunctionExit0( CDATAOWNER_HANDLESYSTEMBACKUP_EXIT ); return KErrNone; } @@ -3342,6 +3472,7 @@ @return KErrNone */ { + OstTraceFunctionEntry0( CDATAOWNER_HANDLECENREPBACKUP_ENTRY ); TInt err = KErrNone; TProxyInformation proxyInformation; @@ -3361,7 +3492,8 @@ } - __LOG2("CDataOwner::HandleCenrepBackup(0x%08x) - proxy creation error: %d", iSecureId.iId, err); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_HANDLECENREPBACKUP, "(0x%08x) - proxy creation error: %d", iSecureId.iId, static_cast(err)); + OstTraceFunctionExit0( CDATAOWNER_HANDLECENREPBACKUP_EXIT ); return err; } @@ -3372,6 +3504,7 @@ @return KErrNone */ { + OstTraceFunctionEntry0( CDATAOWNER_HANDLEPROXYDATAMANAGER_ENTRY ); TInt err = KErrNone; TProxyInformation proxyInformation; @@ -3390,7 +3523,7 @@ { if (hexString.Length() < (result + KHexLeader().Size())) { - __LOG1("CDataOwner::HandleProxyDataManager() - The Hex number has incorrect number of digits", iSecureId.iId); + OstTrace1(TRACE_NORMAL, CDATAOWNER_HANDLEPROXYDATAMANAGER, "The Hex number has incorrect number of digits for 0x%08x", iSecureId.iId); } // Strip off the preceeding upper case hex leader characters strippedSID.Set(hexString.Mid(result + KHexLeader().Size())); @@ -3418,15 +3551,16 @@ } } - __LOG3("CDataOwner::HandleProxyDataManager(0x%08x) - proxy creation error: %d for proxySid: 0x%08x", iSecureId.iId, err, proxyInformation.iSecureId.iId); + OstTraceExt3(TRACE_NORMAL, DUP1_CDATAOWNER_HANDLEPROXYDATAMANAGER, "(0x%08x) - proxy creation error: %d for proxySid: 0x%08x", iSecureId.iId, static_cast(err), proxyInformation.iSecureId.iId); } else { - __LOG1("CDataOwner::HandleProxyDataManager() - Not a Hex Number specified in reg_file of 0x%08x)", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP2_CDATAOWNER_HANDLEPROXYDATAMANAGER, "Not a Hex Number specified in reg_file of 0x%08x)", iSecureId.iId); err = KErrNone; // We shouldn't return an error unless Append has errored (OOM etc.) } } // else it's corrupt - don't error, just ignore this attribute + OstTraceFunctionExit0( CDATAOWNER_HANDLEPROXYDATAMANAGER_EXIT ); return err; } @@ -3437,6 +3571,7 @@ @return KErrNone */ { + OstTraceFunctionEntry0( CDATAOWNER_HANDLEDBMSBACKUPL_ENTRY ); iPassiveInformation.iSupported = ETrue; const TInt count = aAttributes.Count(); @@ -3447,7 +3582,7 @@ { if (!localName.CompareF(KDatabase)) { - __LOG1("CDataOwner::HandleDBMSBackup(0x%08x) - Still using deprecated 'database' attribute", iSecureId.iId); + OstTrace1(TRACE_NORMAL, CDATAOWNER_HANDLEDBMSBACKUPL, "(0x%08x) - Still using deprecated 'database' attribute", iSecureId.iId); } else if (!localName.CompareF(KPolicy)) { @@ -3472,7 +3607,7 @@ // Add to list of Uid's if (toAdd) { - __LOG2("CDataOwner::HandleDBMSBackup(0x%08x) - adding database with policy uid: 0x%08x", iSecureId.iId, temp); + OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNER_HANDLEDBMSBACKUPL, "(0x%08x) - adding database with policy uid: 0x%08x", iSecureId.iId, temp); TUid tempUID; tempUID.iUid = temp; TRAP_IGNORE(iDBMSSelections.AppendL(tempUID)); @@ -3480,16 +3615,17 @@ } // if else { - __LOG1("CDataOwner::HandleDBMSBackup(0x%08x) - Error converting policy number", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP2_CDATAOWNER_HANDLEDBMSBACKUPL, "(0x%08x) - Error converting policy number", iSecureId.iId); } // else } // else if } // if else { - __LOG1("CDataOwner::HandleDBMSBackup(0x%08x) - Incorrect use of attributes", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP3_CDATAOWNER_HANDLEDBMSBACKUPL, "(0x%08x) - Incorrect use of attributes", iSecureId.iId); } } // for x + OstTraceFunctionExit0( CDATAOWNER_HANDLEDBMSBACKUPL_EXIT ); return KErrNone; } @@ -3500,6 +3636,7 @@ @return KErrNone */ { + OstTraceFunctionEntry0( CDATAOWNER_HANDLEACTIVEBACKUPL_ENTRY ); iActiveInformation.iSupported = ETrue; iActiveInformation.iActiveDataOwner = ETrue; iStatus = EDataOwnerNotConnected; @@ -3513,43 +3650,43 @@ if (KErrNone != ipDataOwnerManager->ParserProxy().ConvertToUnicodeL(iActiveInformation.iProcessName, aAttributes[x].Value().DesC())) { iActiveInformation.iSupported = EFalse; - __LOG1("CDataOwner::HandleActiveBackup(0x%08x) - Error converting process name", iSecureId.iId); + OstTrace1(TRACE_NORMAL, CDATAOWNER_HANDLEACTIVEBACKUPL, "(0x%08x) - Error converting process name", iSecureId.iId); } } else if (!localName.CompareF(KRequiresDelay)) { const TBool required = ( aAttributes[x].Value().DesC().CompareF(KYes) == 0 ); iActiveInformation.iRequiresDelayToPrepareData = required; - __LOG2("CDataOwner::HandleActiveBackup(0x%08x) - iActiveInformation.iRequiresDelayToPrepareData: %d", iSecureId.iId, required); + OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNER_HANDLEACTIVEBACKUPL, "(0x%08x) - iActiveInformation.iRequiresDelayToPrepareData: %d", iSecureId.iId, static_cast(required)); } // else if else if (!localName.CompareF(KSupportsSelective)) { const TBool required = ( aAttributes[x].Value().DesC().CompareF(KYes) == 0 ); iActiveInformation.iSupportsSelective = required; - __LOG2("CDataOwner::HandleActiveBackup(0x%08x) - iActiveInformation.iSupportsSelective: %d", iSecureId.iId, required); + OstTraceExt2(TRACE_NORMAL, DUP2_CDATAOWNER_HANDLEACTIVEBACKUPL, "(0x%08x) - iActiveInformation.iSupportsSelective: %d", iSecureId.iId, static_cast(required)); } // else if else if (!localName.CompareF(KSupportsInc)) { const TBool required = ( aAttributes[x].Value().DesC().CompareF(KYes) == 0 ); iActiveInformation.iSupportsIncremental = required; - __LOG2("CDataOwner::HandleActiveBackup(0x%08x) - iActiveInformation.iSupportsIncremental: %d", iSecureId.iId, required); + OstTraceExt2(TRACE_NORMAL, DUP3_CDATAOWNER_HANDLEACTIVEBACKUPL, "(0x%08x) - iActiveInformation.iSupportsIncremental: %d", iSecureId.iId, static_cast(required)); } // else if else if (!localName.CompareF(KActiveType)) { const TDesC8& value = aAttributes[x].Value().DesC(); if (!value.CompareF(KActiveOnly)) { - __LOG1("CDataOwner::HandleActiveBackup(0x%08x) - iActiveInformation.iActiveType: EActiveOnly", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP4_CDATAOWNER_HANDLEACTIVEBACKUPL, "(0x%08x) - iActiveInformation.iActiveType: EActiveOnly", iSecureId.iId); iActiveInformation.iActiveType = EActiveOnly; } else if (!value.CompareF(KActiveAndProxy)) { - __LOG1("CDataOwner::HandleActiveBackup(0x%08x) - iActiveInformation.iActiveType: EActiveAndProxyImpl", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP5_CDATAOWNER_HANDLEACTIVEBACKUPL, "(0x%08x) - iActiveInformation.iActiveType: EActiveAndProxyImpl", iSecureId.iId); iActiveInformation.iActiveType = EActiveAndProxyImpl; } else if (!value.CompareF(KProxyOnly)) { - __LOG1("CDataOwner::HandleActiveBackup(0x%08x) - iActiveInformation.iActiveType: EProxyImpOnly", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP6_CDATAOWNER_HANDLEACTIVEBACKUPL, "(0x%08x) - iActiveInformation.iActiveType: EProxyImpOnly", iSecureId.iId); iActiveInformation.iActiveType = EProxyImpOnly; } } @@ -3566,6 +3703,7 @@ } } // for x + OstTraceFunctionExit0( CDATAOWNER_HANDLEACTIVEBACKUPL_EXIT ); return KErrNone; } @@ -3577,6 +3715,7 @@ @return KErrNone */ { + OstTraceFunctionEntry0( CDATAOWNER_HANDLERESTORE_ENTRY ); iRestoreInformation.iSupported = ETrue; if (aAttributes.Count() == 1) @@ -3585,10 +3724,11 @@ { const TBool required = ( aAttributes[0].Value().DesC().CompareF(KYes) == 0 ); iRestoreInformation.iRequiresReboot = required; - __LOG2("CDataOwner::HandleRestore(0x%08x) - iRestoreInformation.iRequiresReboot: %d", iSecureId.iId, required); + OstTraceExt2(TRACE_NORMAL, CDATAOWNER_HANDLERESTORE, "(0x%08x) - iRestoreInformation.iRequiresReboot: %d", iSecureId.iId, static_cast(required)); } // if } // if + OstTraceFunctionExit0( CDATAOWNER_HANDLERESTORE_EXIT ); return KErrNone; } @@ -3603,18 +3743,20 @@ @param aDir The element was found in an element? */ { + OstTraceFunctionEntry0( CDATAOWNER_HANDLEPATHL_ENTRY ); // Check we dont have a NULL string if (aAttributes[0].Value().DesC().Length() > 0) { TFileName filename; if (KErrNone != ipDataOwnerManager->ParserProxy().ConvertToUnicodeL(filename, aAttributes[0].Value().DesC())) { - __LOG1("CDataOwner::HandlePathL(0x%08x) - EPassive - Could not convert filename", iSecureId.iId); + OstTrace1(TRACE_NORMAL, CDATAOWNER_HANDLEPATHL, "(0x%08x) - EPassive - Could not convert filename", iSecureId.iId); + OstTraceFunctionExit0( CDATAOWNER_HANDLEPATHL_EXIT ); return; } else { - __LOG3("CDataOwner::HandlePathL(0x%08x) - path in the registration file is: %S [type: %d]", iSecureId.iId, &filename, aType); + OstTraceExt3(TRACE_NORMAL, DUP1_CDATAOWNER_HANDLEPATHL, "(0x%08x) - path in the registration file is: %S [type: %d]", iSecureId.iId, filename, static_cast(aType)); } // If it is a directory is do we add a trailing backslash, @@ -3638,7 +3780,8 @@ if (offset != KErrNotFound) { // someone other absoulute path - __LOG2("CDataOwner::HandlePathL(0x%08x) - Path is not recognised by the data owner : %S", iSecureId.iId, &filename); + OstTraceExt2(TRACE_NORMAL, DUP2_CDATAOWNER_HANDLEPATHL, "(0x%08x) - Path is not recognised by the data owner : %S", iSecureId.iId, filename); + OstTraceFunctionExit0( DUP1_CDATAOWNER_HANDLEPATHL_EXIT ); return; } else @@ -3661,7 +3804,7 @@ CSelection* selection = CSelection::NewLC(aType, selectionName); iPassiveSelections.AppendL(selection); CleanupStack::Pop(selection); - __LOG3("CDataOwner::HandlePathL(0x%08x) - Added selection: %S [type: %d]", iSecureId.iId, &selectionName, aType); + OstTraceExt3(TRACE_NORMAL, DUP3_CDATAOWNER_HANDLEPATHL, "(0x%08x) - Added selection: %S [type: %d]", iSecureId.iId, selectionName, static_cast(aType)); break; } case EPublic: @@ -3672,11 +3815,12 @@ CSelection* selection = CSelection::NewLC(aType, filename); iPublicSelections.AppendL(selection); CleanupStack::Pop(selection); - __LOG3("CDataOwner::HandlePathL(0x%08x) - Added selection: %S [type: %d]", iSecureId.iId, &filename, aType); + OstTraceExt3(TRACE_NORMAL, DUP4_CDATAOWNER_HANDLEPATHL, "(0x%08x) - Added selection: %S [type: %d]", iSecureId.iId, filename, static_cast(aType)); } else { - __LOG3("CDataOwner::HandlePathL(0x%08x) - Not an Absolute Path: %S [type: %d]", iSecureId.iId, &filename, aType); + OstTraceExt3(TRACE_NORMAL, DUP5_CDATAOWNER_HANDLEPATHL, "(0x%08x) - Not an Absolute Path: %S [type: %d]", iSecureId.iId, filename, static_cast(aType)); + OstTraceFunctionExit0( DUP2_CDATAOWNER_HANDLEPATHL_EXIT ); return; } break; @@ -3685,8 +3829,9 @@ } // if else { - __LOG1("CDataOwner::HandlePathL(0x%08x) - Path attribute error", iSecureId.iId); + OstTrace1(TRACE_NORMAL, DUP6_CDATAOWNER_HANDLEPATHL, "(0x%08x) - Path attribute error", iSecureId.iId); } // else + OstTraceFunctionExit0( DUP3_CDATAOWNER_HANDLEPATHL_EXIT ); } @@ -3696,9 +3841,11 @@ @return a CSnapshotHolder object */ { + OstTraceFunctionEntry0( CSNAPSHOTHOLDER_NEWL_ENTRY ); CSnapshotHolder* self = NewLC(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSNAPSHOTHOLDER_NEWL_EXIT ); return self; } @@ -3708,9 +3855,11 @@ @return a CSnapshotHolder object */ { + OstTraceFunctionEntry0( CSNAPSHOTHOLDER_NEWLC_ENTRY ); CSnapshotHolder* self = new(ELeave) CSnapshotHolder(); CleanupStack::PushL(self); + OstTraceFunctionExit0( CSNAPSHOTHOLDER_NEWLC_EXIT ); return self; } @@ -3718,13 +3867,17 @@ /** Default C++ Constructor */ { + OstTraceFunctionEntry0( CSNAPSHOTHOLDER_CSNAPSHOTHOLDER_CONS_ENTRY ); + OstTraceFunctionExit0( CSNAPSHOTHOLDER_CSNAPSHOTHOLDER_CONS_EXIT ); } CSnapshotHolder::~CSnapshotHolder() /** Default C++ Constructor */ { + OstTraceFunctionEntry0( CSNAPSHOTHOLDER_CSNAPSHOTHOLDER_DES_ENTRY ); iSnapshots.ResetAndDestroy(); + OstTraceFunctionExit0( CSNAPSHOTHOLDER_CSNAPSHOTHOLDER_DES_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbedataownermanager.cpp --- a/backupandrestore/backupengine/src/sbedataownermanager.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbedataownermanager.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #include "sbedataowner.h" #include "sbedataownermanager.h" #include "sbebufferhandler.h" -#include "sblog.h" #include "abserver.h" #include "sbecompressionandencryption.h" @@ -35,6 +34,11 @@ #include #include #include +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbedataownermanagerTraces.h" +#endif namespace conn { @@ -47,11 +51,13 @@ /** Symbian OS static constructor */ { + OstTraceFunctionEntry0( CDATAOWNERCONTAINER_NEWL_ENTRY ); CDataOwnerContainer* self = new(ELeave) CDataOwnerContainer(aSecureId); CleanupStack::PushL(self); self->ConstructL(apDataOwnerManager); CleanupStack::Pop(self); + OstTraceFunctionExit0( CDATAOWNERCONTAINER_NEWL_EXIT ); return self; } @@ -60,18 +66,24 @@ /** Standard C++ constructor */ { + OstTraceFunctionEntry0( CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_CONS_ENTRY ); + OstTraceFunctionExit0( CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_CONS_EXIT ); } CDataOwnerContainer::~CDataOwnerContainer() { + OstTraceFunctionEntry0( CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_DES_ENTRY ); delete ipDataOwner; + OstTraceFunctionExit0( CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_DES_EXIT ); } void CDataOwnerContainer::ConstructL(CDataOwnerManager* apDataOwnerManager) /* Symbian second phase constructor */ { + OstTraceFunctionEntry0( CDATAOWNERCONTAINER_CONSTRUCTL_ENTRY ); ipDataOwner = CDataOwner::NewL(iSecureId, apDataOwnerManager); + OstTraceFunctionExit0( CDATAOWNERCONTAINER_CONSTRUCTL_EXIT ); } TSecureId CDataOwnerContainer::SecureId() const @@ -102,16 +114,20 @@ */ TInt CDataOwnerContainer::Compare(const CDataOwnerContainer& aFirst, const CDataOwnerContainer& aSecond) { + OstTraceFunctionEntry0( CDATAOWNERCONTAINER_COMPARE_ENTRY ); if (aFirst.SecureId() < aSecond.SecureId()) { + OstTraceFunctionExit0( CDATAOWNERCONTAINER_COMPARE_EXIT ); return -1; } else if (aFirst.SecureId() > aSecond.SecureId()) { + OstTraceFunctionExit0( DUP1_CDATAOWNERCONTAINER_COMPARE_EXIT ); return 1; } else { + OstTraceFunctionExit0( DUP2_CDATAOWNERCONTAINER_COMPARE_EXIT ); return 0; } } @@ -133,10 +149,12 @@ /** Symbian OS static constructor */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_NEWLC_ENTRY ); CDataOwnerManager* self = new(ELeave) CDataOwnerManager(); CleanupStack::PushL(self); self->ConstructL(); + OstTraceFunctionExit0( CDATAOWNERMANAGER_NEWLC_EXIT ); return self; } @@ -149,18 +167,23 @@ iResetAfterRestore(EFalse), iJavaDOM(NULL), iSIDListForPartial(NULL), iConfig(NULL), iBaBackupSession(NULL) { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_CDATAOWNERMANAGER_CONS_ENTRY ); + OstTraceFunctionExit0( CDATAOWNERMANAGER_CDATAOWNERMANAGER_CONS_EXIT ); } void CDataOwnerManager::ConstructL() /** Symbian OS second phase contrutor */ { - User::LeaveIfError(iFs.Connect()); - TInt err = RProperty::Define(TUid::Uid(KUidSystemCategoryValue), + OstTraceFunctionEntry0( CDATAOWNERMANAGER_CONSTRUCTL_ENTRY ); + TInt err = iFs.Connect(); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP4_CDATAOWNERMANAGER_CONSTRUCTL, "Leave: %d", err)); + err = RProperty::Define(TUid::Uid(KUidSystemCategoryValue), KUidBackupRestoreKey, RProperty::EInt, KReadPolicy, KWritePolicy, 0); if ((err != KErrNone) && (err != KErrAlreadyExists)) { + OstTrace1(TRACE_ERROR, DUP3_CDATAOWNERMANAGER_CONSTRUCTL, "Leave: %d", err); User::Leave(err); } @@ -173,16 +196,17 @@ TRAP(err, iConfig->ParseL()); if (err != KErrNone) { - __LOG1("Error trying to parse sbeconfig.xml : %d", err); - __LOG("Using Default Settings !"); + OstTrace1(TRACE_NORMAL, CDATAOWNERMANAGER_CONSTRUCTL, "Error trying to parse sbeconfig.xml : %d", err); + OstTrace0(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_CONSTRUCTL, "Using Default Settings !"); iConfig->SetDefault(); } else { - __LOG("sbeconfig.xml parsed sucessfully"); + OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_CONSTRUCTL, "sbeconfig.xml parsed sucessfully"); } iBaBackupSession = CBaBackupSessionWrapper::NewL(); iParserProxy = CSBEParserProxy::NewL(iFs); + OstTraceFunctionExit0( CDATAOWNERMANAGER_CONSTRUCTL_EXIT ); } @@ -195,6 +219,7 @@ The destructor is commonly used to "clean up" when an object is no longer necessary. */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_CDATAOWNERMANAGER_DES_ENTRY ); if(iJavaDOM) { delete iJavaDOM; @@ -215,6 +240,7 @@ } delete iConfig; delete iBaBackupSession; + OstTraceFunctionExit0( CDATAOWNERMANAGER_CDATAOWNERMANAGER_DES_EXIT ); } void CDataOwnerManager::AllSystemFilesRestoredL() @@ -223,16 +249,17 @@ we can parse/start active data owners etc. */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL_ENTRY ); if(iBURType == EBURRestoreFull || iBURType == EBURRestorePartial) { - __LOG("CDataOwnerManager::AllSystemFilesRestored() - called, parse reg files & start active DO's"); + OstTrace0(TRACE_NORMAL, CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "called, parse reg files & start active DO's"); // Build the list of dataOwners TInt err; TRAP(err, FindDataOwnersL()); if (err != KErrNone) { - __LOG1("CDataOwnerManager::AllSystemFilesRestored() - Error while finding data owners: %d", err); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "Error while finding data owners: %d", err); } TInt doCount = iDataOwners.Count(); @@ -251,7 +278,7 @@ TRAP(err, UpdateDataOwnersPartialStateL()); if (err != KErrNone) { - __LOG1("CDataOwnerManager::AllSystemFilesRestored() - Error while updating state: %d", err); + OstTrace1(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "Error while updating state: %d", err); } for (TInt index = 0; index < doCount; index++) @@ -260,14 +287,14 @@ TRAP(err, iDataOwners[index]->DataOwner().StartProcessIfNecessaryL()); if (err != KErrNone) { - __LOG1("CDataOwnerManager::AllSystemFilesRestored() - Error while starting process if necessary: %d", err); + OstTrace1(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "Error while starting process if necessary: %d", err); } // Set up the internal state of the data owners now that all reg files and proxies are back TRAP(err, iDataOwners[index]->DataOwner().BuildDriveStateArrayL()); if (err != KErrNone) { - __LOG1("CDataOwnerManager::AllSystemFilesRestored() - Error while building drive array: %d", err); + OstTrace1(TRACE_NORMAL, DUP4_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "Error while building drive array: %d", err); } } @@ -277,7 +304,7 @@ } else { - __LOG("CDataOwnerManager::AllSystemFilesRestored() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); + OstTrace0(TRACE_NORMAL, DUP5_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); } // now deal with special case packages @@ -303,10 +330,11 @@ { TRAP(err, pDataTransfer->ParseL()); } - __LOG2("CDataOwnerManager::AllSystemFilesRestored() - found reg file: %S for Package: 0x%08x", &fileName, sid.iId); + OstTraceExt2(TRACE_NORMAL, DUP6_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "found reg file: %S for Package: 0x%08x", fileName, sid.iId); } if (err == KErrNoMemory) { + OstTrace0(TRACE_ERROR, DUP8_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "Leave: KErrNoMemory"); User::Leave(KErrNoMemory); } } @@ -317,9 +345,10 @@ } // end if else { - __LOG("CDataOwnerManager::AllSystemFilesRestored() - *Error: called when device is not in Restore mode !"); + OstTrace0(TRACE_NORMAL, DUP7_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "*Error: called when device is not in Restore mode !"); } + OstTraceFunctionExit0( CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL_EXIT ); } @@ -333,8 +362,9 @@ @leave KErrInUse a Software install is in progress, plus system wide errors */ { - __LOG2("CDataOwnerManager::SetBURModeL() - Request new BURType (0x%08x), IncType (0x%08x)", aBURType, aBackupIncType); - __LOG2("CDataOwnerManager::SetBURModeL() - Previous BURType (0x%08x), IncType (0x%08x)", iBURType, iIncType); + OstTraceFunctionEntry0( CDATAOWNERMANAGER_SETBURMODEL_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CDATAOWNERMANAGER_SETBURMODEL, "Request new BURType (0x%08x), IncType (0x%08x)", aBURType, aBackupIncType); + OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_SETBURMODEL, "CDataOwnerManager::SetBURModeL() - Previous BURType (0x%08x), IncType (0x%08x)", iBURType, iIncType); // Ensure that the device can't transition directly from backup to restore mode. It must // go through a normal state first. Allow the state to be set to the same. switch(aBURType) @@ -343,6 +373,7 @@ // allow to set Normal mode in any case. no need to do anything if previous mode was Normal if (iBURType == EBURNormal) { + OstTraceFunctionExit0( CDATAOWNERMANAGER_SETBURMODEL_EXIT ); return; } break; @@ -350,6 +381,7 @@ // don't do anything if previous modes were Normal or Unset if (iBURType == EBURNormal || iBURType == EBURUnset) { + OstTraceFunctionExit0( DUP1_CDATAOWNERMANAGER_SETBURMODEL_EXIT ); return; } break; @@ -360,7 +392,7 @@ // don't allow mode change unless , device was put into normal mode before if (iBURType != EBURNormal && iBURType != EBURUnset) { - __LOG2("CDataOwnerManager::SetBURModeL() - *Error: BUR type has not transitioned between modes correctly, %d became %d", iBURType, aBURType); + OstTraceExt2(TRACE_ERROR, DUP2_CDATAOWNERMANAGER_SETBURMODEL, "*Error: BUR type has not transitioned between modes correctly, %d became %d", iBURType, aBURType); User::Leave(KErrCorrupt); } break; @@ -371,11 +403,11 @@ // Need to reset the list of data owners, and old style babackup if ((aBURType == EBURNormal) || (aBURType == EBURUnset)) { - __LOG1("CDataOwnerManager::SetBURModeL() - Going Normal/Unset/NoBackup (%d)", aBURType); + OstTrace1(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_SETBURMODEL, "Going Normal/Unset/NoBackup (%d)", aBURType); // If we've transitioned from a Restore to a Normal mode, we need to send a RestoreComplete if (previousBURType == EBURRestoreFull || previousBURType == EBURRestorePartial) { - __LOG("CDataOwnerManager::SetBURModeL() - Calling RestoreCompleteL on all active data owners"); + OstTrace0(TRACE_NORMAL, DUP4_CDATAOWNERMANAGER_SETBURMODEL, "Calling RestoreCompleteL on all active data owners"); TInt restoreCompleteCount = iDataOwners.Count(); for (TInt index = 0; index < restoreCompleteCount; index++) @@ -401,7 +433,7 @@ iResetAfterRestore = EFalse; iDataOwners.ResetAndDestroy(); iPackageDataOwners.ResetAndDestroy(); - __LOG("CDataOwnerManager::SetBURModeL() - Restart All Non-System Applications"); + OstTrace0(TRACE_NORMAL, DUP5_CDATAOWNERMANAGER_SETBURMODEL, "Restart All Non-System Applications"); iBaBackupSession->NotifyBackupOperationL(TBackupOperationAttributes(MBackupObserver::ETakeLock, MBackupOperationObserver::EEnd)); iBaBackupSession->RestartAll(); } @@ -412,18 +444,18 @@ TInt regErr = RProperty::Get(KUidSystemCategory, Swi::KUidSoftwareInstallKey, value); if (regErr == KErrNone && value != Swi::ESwisNone) { - __LOG("CDataOwnerManager::SetBURModeL() - *Error: Leave software Install in progress."); + OstTrace0(TRACE_ERROR, DUP6_CDATAOWNERMANAGER_SETBURMODEL, "*Error: Leave software Install in progress."); User::Leave(KErrInUse); } // if else if (regErr != KErrNotFound && regErr != KErrNone) { - __LOG("CDataOwnerManager::SetBURModeL() - *Error: Leave could not get KUidSoftwareInsallKey"); + OstTrace0(TRACE_ERROR, DUP7_CDATAOWNERMANAGER_SETBURMODEL, "*Error: Leave could not get KUidSoftwareInsallKey"); User::Leave(regErr); } // else // Clobber files that are locked open TRequestStatus status; - __LOG("CDataOwnerManager::SetBURModeL() - Calling CloseAll()"); + OstTrace0(TRACE_NORMAL, DUP8_CDATAOWNERMANAGER_SETBURMODEL, "Calling CloseAll()"); if(aBURType == EBURBackupFull || aBURType == EBURBackupPartial) { TBackupOperationAttributes atts(MBackupObserver::EReleaseLockReadOnly, MBackupOperationObserver::EStart); @@ -438,7 +470,7 @@ } User::WaitForRequest(status); - __LOG("CDataOwnerManager::SetBURModeL() - CloseAll() returned"); + OstTrace0(TRACE_NORMAL, DUP9_CDATAOWNERMANAGER_SETBURMODEL, "CloseAll() returned"); // update partial state for active data owners if (aBURType == EBURBackupPartial) @@ -455,15 +487,15 @@ TRAPD(err, iDataOwners[index]->DataOwner().StartProcessIfNecessaryL()); if (err != KErrNone) { - __LOG2("CDataOwnerManager::SetBURModeL() - Data owner (or proxy) with SID 0x%08x errored (%d) whilst starting", iDataOwners[index]->SecureId().iId, err); + OstTraceExt2(TRACE_NORMAL, DUP10_CDATAOWNERMANAGER_SETBURMODEL, "Data owner (or proxy) with SID 0x%08x errored (%d) whilst starting", iDataOwners[index]->SecureId().iId, static_cast(err)); } } } } TInt setError = RProperty::Set(TUid::Uid(KUidSystemCategoryValue), KUidBackupRestoreKey, aBURType | aBackupIncType); - __LOG3("CDataOwnerManager::SetBURModeL() - Setting P&S flag to BURType (0x%08x), IncType (0x%08x), err: ", aBURType, aBackupIncType, setError); - User::LeaveIfError(setError); + OstTraceExt3(TRACE_NORMAL, DUP11_CDATAOWNERMANAGER_SETBURMODEL, "Setting P&S flag to BURType (0x%08x), IncType (0x%08x), err: %d", static_cast(aBURType), static_cast(aBackupIncType), setError); + LEAVEIFERROR(setError, OstTrace1(TRACE_ERROR, DUP13_CDATAOWNERMANAGER_SETBURMODEL, "Leave: %d", setError)); // This configurable delay allows extra time to close all non-system apps. TUint closeDelay = iConfig->AppCloseDelay(); @@ -481,9 +513,10 @@ //CABSessions,since they could not be used in sequent backup/restore event if (aBURType == EBURUnset || aBURType == EBURNormal) { - __LOG1("Invalidate all ABSessions after set Setting P&S flag to 0x%08x", aBURType); + OstTrace1(TRACE_NORMAL, DUP12_CDATAOWNERMANAGER_SETBURMODEL, "Invalidate all ABSessions after set Setting P&S flag to 0x%08x", aBURType); ipABServer->InvalidateABSessions(); } + OstTraceFunctionExit0( DUP2_CDATAOWNERMANAGER_SETBURMODEL_EXIT ); } @@ -493,19 +526,21 @@ @param aDataOwners on return the list of data owners */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_GETDATAOWNERSL_ENTRY ); if (iBURType != EBURNormal && iBURType != EBURUnset) { - __LOG("CDataOwnerManager::GetDataOwnersL() - *Error: ListOfDataOnwers called when device isn't in Normal/Unset mode"); + OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_GETDATAOWNERSL, "*Error: ListOfDataOnwers called when device isn't in Normal/Unset mode"); User::Leave(KErrAccessDenied); } // Build the list of dataOwners FindDataOwnersL(); Swi::RSisRegistrySession registrySession; - User::LeaveIfError(registrySession.Connect()); + TInt err = registrySession.Connect(); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP9_CDATAOWNERMANAGER_GETDATAOWNERSL, "Leave: %d", err)); CleanupClosePushL(registrySession); - TInt err = KErrNone; + err = KErrNone; TUint count = iDataOwners.Count(); // Loop throught the list while(count--) @@ -524,7 +559,7 @@ TRAP(err, dataOwner.ParseFilesL()); if (err != KErrNone) { - __LOG2("CDataOwnerManager::GetDataOwnersL() - ParseFilesL() - Error in sid: 0x%08x (%d)", secureId.iId, err); + OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_GETDATAOWNERSL, "ParseFilesL() - Error in sid: 0x%08x (%d)", secureId.iId, static_cast(err)); } // if else { @@ -532,7 +567,7 @@ TRAP(err, dataOwner.BuildDriveStateArrayL()); if (err != KErrNone) { - __LOG2("CDataOwnerManager::GetDataOwnersL() - BuildDriveStateArrayL() - Error in sid: 0x%08x (%d)", secureId.iId, err); + OstTraceExt2(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_GETDATAOWNERSL, "BuildDriveStateArrayL() - Error in sid: 0x%08x (%d)", secureId.iId, static_cast(err)); }//if else { @@ -540,14 +575,14 @@ TRAP(err, dataOwner.GetDriveListL(driveList)); if (err != KErrNone) { - __LOG2("CDataOwnerManager::GetDataOwnersL() - GetDriveListL() - Error in sid: 0x%08x (%d)", secureId.iId, err); + OstTraceExt2(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_GETDATAOWNERSL, "GetDriveListL() - Error in sid: 0x%08x (%d)", secureId.iId, static_cast(err)); }//if else { TRAP(err, commonSettings = dataOwner.CommonSettingsL()); if (err != KErrNone) { - __LOG2("CDataOwnerManager::GetDataOwnersL() - CommonSettingsL() - Error in sid: 0x%08x (%d)", secureId.iId, err); + OstTraceExt2(TRACE_NORMAL, DUP4_CDATAOWNERMANAGER_GETDATAOWNERSL, "CommonSettingsL() - Error in sid: 0x%08x (%d)", secureId.iId, static_cast(err)); }//if }//else } @@ -564,7 +599,7 @@ if ((error == KErrNone)) { TUid packageUid = pRegistryPackage->Uid(); - __LOG2("CDataOwnerManager::GetDataOwnersL() - Found package for secure id 0x%08x, package id 0x%08x", secureId.iId, packageUid); + OstTraceExt2(TRACE_NORMAL, DUP5_CDATAOWNERMANAGER_GETDATAOWNERSL, "Found package for secure id 0x%08x, package id 0x%08x", secureId.iId, packageUid.iUid); CleanupStack::PushL(pRegistryPackage); pId = CSBPackageId::NewL(packageUid, secureId, pRegistryPackage->Name()); @@ -577,13 +612,13 @@ TRAP(err, pak->GetDriveListL(driveList)); if( err == KErrNotSupported) { - __LOG("CDataOwnerManager::GetDataOwnersL() - Error KErrNotSupported"); + OstTrace0(TRACE_NORMAL, DUP6_CDATAOWNERMANAGER_GETDATAOWNERSL, "Error KErrNotSupported"); err = KErrNone; } } // if else { - __LOG2("CDataOwnerManager::GetDataOwnersL() - Error(%d) retrieving package data for sid 0x%08x", error, secureId.iId); + OstTraceExt2(TRACE_NORMAL, DUP7_CDATAOWNERMANAGER_GETDATAOWNERSL, "Error(%d) retrieving package data for sid 0x%08x", static_cast(error), secureId.iId); } // else } // if } // if @@ -638,8 +673,9 @@ } else { - __LOG("CDataOwnerManager::GetDataOwnersL() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); + OstTrace0(TRACE_NORMAL, DUP8_CDATAOWNERMANAGER_GETDATAOWNERSL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); } + OstTraceFunctionExit0( CDATAOWNERMANAGER_GETDATAOWNERSL_EXIT ); } CDataOwner& CDataOwnerManager::DataOwnerL(TSecureId aSID) @@ -649,16 +685,20 @@ @param aSID The SID of the active data owner */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_DATAOWNERL_ENTRY ); CDataOwnerContainer* pDOContainer = NULL; pDOContainer = FindL(aSID); if (!pDOContainer) { + OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_DATAOWNERL, "Leave: KErrNotFound"); User::Leave(KErrNotFound); } - return pDOContainer->DataOwner(); + CDataOwner& dataOwner = pDOContainer->DataOwner(); + OstTraceFunctionExit0( CDATAOWNERMANAGER_DATAOWNERL_EXIT ); + return dataOwner; } void CDataOwnerManager::GetExpectedDataSizeL(CSBGenericTransferType* apGenericTransferType, TUint& aSize) @@ -671,9 +711,10 @@ @leave KErrNotFound object relating to apGenericTransferType not found */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL_ENTRY ); if (iBURType != EBURBackupPartial && iBURType != EBURBackupFull) { - __LOG("CDataOwnerManager::GetExpectedDataSizeL() - *Error: GetExpectedDataSizeL called when device is not in Backup mode !"); + OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "*Error: GetExpectedDataSizeL called when device is not in Backup mode !"); User::Leave(KErrAccessDenied); } @@ -681,7 +722,7 @@ { case ESIDTransferDerivedType: { - __LOG("CDataOwnerManager::GetExpectedDataSizeL() - ESIDTransferDerivedType"); + OstTrace0(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "ESIDTransferDerivedType"); CSBSIDTransferType* pSIDTransferType = CSBSIDTransferType::NewL(apGenericTransferType); CleanupStack::PushL(pSIDTransferType); @@ -691,7 +732,7 @@ }; case EPackageTransferDerivedType: { - __LOG("CDataOwnerManager::GetExpectedDataSizeL() - EPackageTransferDerivedType"); + OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "EPackageTransferDerivedType"); // This code should be changed. Ideally, the GetExpectedDataSizeL method should be virtual, rendering // this switch statement unnecessary. When java support is added this will become even more important. @@ -706,7 +747,7 @@ const TPackageDataType dataType = pPackageTransferType->DataTypeL(); const TDriveNumber driveNumber = pPackageTransferType->DriveNumberL(); // - __LOG3("CDataOwnerManager::GetExpectedDataSizeL() - package id: 0x%08x, dataType: %d, drive: %c ", packageId.iUid, dataType, driveNumber + 'A'); + OstTraceExt3(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "package id: 0x%08x, dataType: %d, drive: %c ", packageId.iUid, static_cast(dataType), static_cast(driveNumber + 'A')); CPackageDataTransfer* pDataTransfer = FindPackageDataContainerL(pPackageTransferType->PackageIdL()); pDataTransfer->GetExpectedDataSizeL(dataType, driveNumber, aSize); CleanupStack::PopAndDestroy(pPackageTransferType); @@ -715,7 +756,7 @@ case EJavaTransferDerivedType: { - __LOG("CDataOwnerManager::GetExpectedDataSizeL() - EJavaTransferDerivedType"); + OstTrace0(TRACE_NORMAL, DUP4_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "EJavaTransferDerivedType"); // Call the Java DOM to calculate and return the expected size of the data specified in // apGenericTransferType @@ -725,7 +766,7 @@ } else { - __LOG("CDataOwnerManager::GetExpectedDataSizeL() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); + OstTrace0(TRACE_NORMAL, DUP5_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); } break; @@ -733,11 +774,12 @@ default: { - __LOG("CDataOwnerManager::GetExpectedDataSizeL() - ERROR - unsupported transfer type"); + OstTrace0(TRACE_ERROR, DUP6_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "unsupported transfer type"); User::Leave(KErrNotSupported); } } // switch - __LOG1("CDataOwnerManager::GetExpectedDataSizeL() - END - size is: %d", aSize); + OstTrace1(TRACE_NORMAL, DUP7_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "size is: %d", aSize); + OstTraceFunctionExit0( CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL_EXIT ); } @@ -751,15 +793,16 @@ @param aFiles on return the list of public files */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_GETPUBLICFILELISTL_ENTRY ); if (iBURType != EBURBackupPartial && iBURType != EBURBackupFull) { - __LOG("CDataOwnerManager::GetPublicFileListL() - *Error: GetPublicFileListL called when device is not in Backup mode !"); + OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_GETPUBLICFILELISTL, "*Error: GetPublicFileListL called when device is not in Backup mode !"); User::Leave(KErrAccessDenied); } if (!(iDriveList[aDriveNumber])) { - __LOG("CDataOwnerManager::GetPublicFileListL() - The drive in the argument is not in the list of the drives for backup/restore"); + OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_GETPUBLICFILELISTL, "The drive in the argument is not in the list of the drives for backup/restore"); User::Leave(KErrArgument); } @@ -792,16 +835,18 @@ } else { - __LOG("CDataOwnerManager::GetPublicFileListL() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); + OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_GETPUBLICFILELISTL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); } break; } default: { + OstTrace0(TRACE_ERROR, DUP3_CDATAOWNERMANAGER_GETPUBLICFILELISTL, "Leave: KErrNotSupported"); User::Leave(KErrNotSupported); } } + OstTraceFunctionExit0( CDATAOWNERMANAGER_GETPUBLICFILELISTL_EXIT ); } @@ -814,15 +859,16 @@ @param aFileFilter on return an array of TRestoreFileFilter */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL_ENTRY ); if (iBURType != EBURBackupPartial && iBURType != EBURBackupFull) { - __LOG("CDataOwnerManager::GetRawPublicFileListL() - *Error: GetRawPublicFileListL called when device is not in Backup mode !"); + OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL, "*Error: GetRawPublicFileListL called when device is not in Backup mode !"); User::Leave(KErrAccessDenied); } if (!(iDriveList[aDriveNumber])) { - __LOG("CDataOwnerManager::GetRawPublicFileListL() - The drive in the argument is not in the list of the drives for backup/restore"); + OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL, "The drive in the argument is not in the list of the drives for backup/restore"); User::Leave(KErrArgument); } @@ -856,16 +902,18 @@ } else { - __LOG("CDataOwnerManager::GetRawPublicFileListL() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); + OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); } break; } default: { + OstTrace0(TRACE_ERROR, DUP3_CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL, "Leave: KErrNotSupported"); User::Leave(KErrNotSupported); } } + OstTraceFunctionExit0( CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL_EXIT ); } @@ -879,17 +927,19 @@ */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_GETXMLPUBLICFILELISTL_ENTRY ); if (iBURType != EBURBackupPartial && iBURType != EBURBackupFull) { - __LOG("CDataOwnerManager::GetXMLPublicFileListL() - *Error: GetXMLPublicFileListL called when device is not in Backup mode !"); + OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_GETXMLPUBLICFILELISTL, "*Error: GetXMLPublicFileListL called when device is not in Backup mode !"); User::Leave(KErrAccessDenied); } else { //will need to check if the drive exists in our list - __LOG("CDataOwnerManager::GetXMLPublicFileListL() - *Error: GetXMLPublicFileListL Not Yet Implemented"); + OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_GETXMLPUBLICFILELISTL, "*Error: GetXMLPublicFileListL Not Yet Implemented"); User::Leave(KErrNotSupported); } + OstTraceFunctionExit0( CDATAOWNERMANAGER_GETXMLPUBLICFILELISTL_EXIT ); } void CDataOwnerManager::SetSIDListForPartialBURL(TDesC8& aFlatArrayPtr) @@ -899,9 +949,10 @@ @param aFlatArrayPtr Flat Array Pointer */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_SETSIDLISTFORPARTIALBURL_ENTRY ); if (iBURType != EBURNormal && iBURType != EBURUnset) { - __LOG("CDataOwnerManager::SetSIDListForPartialBURL() - *Error: called when device isn't in Normal/Unset mode"); + OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_SETSIDLISTFORPARTIALBURL, "*Error: called when device isn't in Normal/Unset mode"); User::Leave(KErrAccessDenied); } @@ -913,6 +964,7 @@ } iSIDListForPartial = RSIDArray::InternaliseL(aFlatArrayPtr); + OstTraceFunctionExit0( CDATAOWNERMANAGER_SETSIDLISTFORPARTIALBURL_EXIT ); } void CDataOwnerManager::UpdateDataOwnersPartialStateL() @@ -921,6 +973,7 @@ */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_UPDATEDATAOWNERSPARTIALSTATEL_ENTRY ); if (iSIDListForPartial != NULL) { TUint count = iSIDListForPartial->Count(); @@ -931,6 +984,7 @@ DataOwnerL((*iSIDListForPartial)[count]).SetBackedUpAsPartial(ETrue); } // for } // if + OstTraceFunctionExit0( CDATAOWNERMANAGER_UPDATEDATAOWNERSPARTIALSTATEL_EXIT ); } void CDataOwnerManager::SIDStatusL(RSIDStatusArray& aSIDStatus) @@ -940,9 +994,10 @@ @param aSIDStatus Array of SID's and their associated statuses. The statuses will be populated upon return */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_SIDSTATUSL_ENTRY ); if (iBURType == EBURNormal || iBURType == EBURUnset) { - __LOG("CDataOwnerManager::SIDStatusL() - *Error: called when device is in Normal/Unset mode"); + OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_SIDSTATUSL, "*Error: called when device is in Normal/Unset mode"); User::Leave(KErrAccessDenied); } @@ -962,6 +1017,7 @@ aSIDStatus[count].iStatus = pDOContainer->DataOwner().ReadyState(); } } + OstTraceFunctionExit0( CDATAOWNERMANAGER_SIDSTATUSL_EXIT ); } void CDataOwnerManager::AllSnapshotsSuppliedL() @@ -969,7 +1025,7 @@ All the snapshots have been supplied */ { - __LOG("CDataOwnerManager::AllSnapshotsSuppliedL() - Begin"); + OstTraceFunctionEntry0( CDATAOWNERMANAGER_ALLSNAPSHOTSSUPPLIEDL_ENTRY ); if (iBURType == EBURBackupPartial || iBURType == EBURBackupFull) { TUint count = iDataOwners.Count(); @@ -1000,10 +1056,10 @@ } //if else { - __LOG("CDataOwnerManager::AllSnapshotsSuppliedL() - *Error: can only be called in Backup mode"); + OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_ALLSNAPSHOTSSUPPLIEDL, "*Error: can only be called in Backup mode"); User::Leave(KErrAccessDenied); - } // else - __LOG("CDataOwnerManager::AllSnapshotsSuppliedL() - End"); + } // else + OstTraceFunctionExit0( CDATAOWNERMANAGER_ALLSNAPSHOTSSUPPLIEDL_EXIT ); } void CDataOwnerManager::GetNextPublicFileL(CSBGenericDataType* aGenericDataType, @@ -1018,16 +1074,16 @@ @param aEntry on return the next entry in the list, an empty entry indicates the end of the list has been reached */ { - __LOG("CDataOwnerManager::GetNextPublicFileL() - Begin"); + OstTraceFunctionEntry0( CDATAOWNERMANAGER_GETNEXTPUBLICFILEL_ENTRY ); if (iBURType != EBURBackupPartial && iBURType != EBURBackupFull) { - __LOG("CDataOwnerManager::GetNextPublicFileL() - *Error: GetPublicFileListL called when device is not in Backup mode !"); + OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_GETNEXTPUBLICFILEL, "*Error: GetPublicFileListL called when device is not in Backup mode !"); User::Leave(KErrAccessDenied); } if (!(iDriveList[aDriveNumber])) { - __LOG("CDataOwnerManager::GetNextPublicFileL() - The drive in the argument is not in the list of the drives for backup/restore"); + OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_GETNEXTPUBLICFILEL, "The drive in the argument is not in the list of the drives for backup/restore"); User::Leave(KErrArgument); } @@ -1041,9 +1097,10 @@ } else { + OstTrace0(TRACE_ERROR, DUP2_CDATAOWNERMANAGER_GETNEXTPUBLICFILEL, "Leave: KErrNotSupported"); User::Leave(KErrNotSupported); - } - __LOG("CDataOwnerManager::GetNextPublicFileL() - End"); + } + OstTraceFunctionExit0( CDATAOWNERMANAGER_GETNEXTPUBLICFILEL_EXIT ); } @@ -1058,11 +1115,12 @@ @leave KErrNotFound Unknown object */ { - __LOG1("CDataOwnerManager::SupplyDataL() - START - about to decompress %d bytes of data", aBuffer.Length()); + OstTraceFunctionEntry0( CDATAOWNERMANAGER_SUPPLYDATAL_ENTRY ); + OstTrace1(TRACE_NORMAL, CDATAOWNERMANAGER_SUPPLYDATAL, "about to decompress %d bytes of data", aBuffer.Length()); if (iBURType == EBURNormal || iBURType == EBURUnset) { - __LOG("CDataOwnerManager::SupplyDataL() - *Error: called not when device in Normal/Unset mode"); + OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_SUPPLYDATAL, "*Error: called not when device in Normal/Unset mode"); User::Leave(KErrAccessDenied); } @@ -1081,10 +1139,10 @@ uncompressedData = NULL; if (!iDecompressor->NextLC(uncompressedData, moreData)) { - __LOG("CDataOwnerManager::SupplyDataL() - iDecompressor->NextLC returned EFalse"); + OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_SUPPLYDATAL, "iDecompressor->NextLC returned EFalse"); if (uncompressedData != NULL) { - __LOG("CDataOwnerManager::SupplyDataL() - uncompressedData not NULL so cleaning up"); + OstTrace0(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_SUPPLYDATAL, "uncompressedData not NULL so cleaning up"); CleanupStack::PopAndDestroy(uncompressedData); } break; @@ -1092,12 +1150,12 @@ if (uncompressedData == NULL) { - __LOG("CDataOwnerManager::SupplyDataL() - uncompressedData is NULL after NextLC, corrupt data"); + OstTrace0(TRACE_ERROR, DUP4_CDATAOWNERMANAGER_SUPPLYDATAL, "uncompressedData is NULL after NextLC, corrupt data"); User::Leave(KErrCorrupt); } TPtr8 dataPtr(uncompressedData->Des()); - __LOG1("CDataOwnerManager::SupplyDataL() - decompressed data length: %d", dataPtr.Length()); + OstTrace1(TRACE_NORMAL, DUP5_CDATAOWNERMANAGER_SUPPLYDATAL, "decompressed data length: %d", dataPtr.Length()); // Check aLastSection TBool lastSection = aLastSection && !moreData; @@ -1106,13 +1164,14 @@ { case ESIDTransferDerivedType: { - __LOG("CDataOwnerManager::SupplyDataL() - ESIDTransferDerivedType"); + OstTrace0(TRACE_NORMAL, DUP6_CDATAOWNERMANAGER_SUPPLYDATAL, "ESIDTransferDerivedType"); CSBSIDTransferType* pSIDTransferType = CSBSIDTransferType::NewL(apGenericTransferType); CleanupStack::PushL(pSIDTransferType); // Is this the data for registration files? These are now not supported if (pSIDTransferType->DataTypeL() == ERegistrationData) { + OstTrace0(TRACE_ERROR, DUP12_CDATAOWNERMANAGER_SUPPLYDATAL, "Leave: KErrNotSupported"); User::Leave(KErrNotSupported); } // if else @@ -1121,11 +1180,11 @@ const TSecureId sid = pSIDTransferType->SecureIdL(); const TDriveNumber driveNumber = pSIDTransferType->DriveNumberL(); CDataOwner& dataOwner = DataOwnerL(sid); - __LOG2("CDataOwnerManager::SupplyDataL() - trying to restore data for SID: 0x%08x, drive: %c", sid.iId, 'A' + driveNumber); + OstTraceExt2(TRACE_NORMAL, DUP7_CDATAOWNERMANAGER_SUPPLYDATAL, "trying to restore data for SID: 0x%08x, drive: %c", sid.iId, static_cast('A' + driveNumber)); if ((dataOwner.CommonSettingsL() & ERequiresReboot) == ERequiresReboot) { - __LOG1("CDataOwnerManager::SupplyDataL() - data owner 0x%08x requires a REBOOT!", sid.iId); + OstTrace1(TRACE_NORMAL, DUP8_CDATAOWNERMANAGER_SUPPLYDATAL, "data owner 0x%08x requires a REBOOT!", sid.iId); iResetAfterRestore = ETrue; } @@ -1137,7 +1196,7 @@ } case EPackageTransferDerivedType: { - __LOG("CDataOwnerManager::SupplyDataL() - EPackageTransferDerivedType"); + OstTrace0(TRACE_NORMAL, DUP9_CDATAOWNERMANAGER_SUPPLYDATAL, "EPackageTransferDerivedType"); // Ideally, we would use the same CDataOwner class, or a class derived // from it to handle the package backup/restore, however to do this would // require a re-design. @@ -1157,28 +1216,29 @@ case EJavaTransferDerivedType: { - __LOG("CDataOwnerManager::SupplyDataL() - EJavaTransferDerivedType"); + OstTrace0(TRACE_NORMAL, DUP10_CDATAOWNERMANAGER_SUPPLYDATAL, "EJavaTransferDerivedType"); if(iJavaDOM) { iJavaDOM->SupplyDataL(apGenericTransferType, dataPtr, lastSection); } else { - __LOG("CDataOwnerManager::SupplyDataL() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); + OstTrace0(TRACE_NORMAL, DUP11_CDATAOWNERMANAGER_SUPPLYDATAL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); } break; } default: { + OstTrace0(TRACE_ERROR, DUP13_CDATAOWNERMANAGER_SUPPLYDATAL, "Leave: KErrNotSupported"); User::Leave(KErrNotSupported); } } // switch // Cleanup CleanupStack::PopAndDestroy(uncompressedData); - } // while - __LOG("CDataOwnerManager::SupplyDataL() - END"); + } // while + OstTraceFunctionExit0( CDATAOWNERMANAGER_SUPPLYDATAL_EXIT ); } @@ -1193,10 +1253,11 @@ @leave KErrNotFound Unknown object */ { - __LOG2("CDataOwnerManager::RequestDataL() - START - aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d", aBuffer.Ptr(), aBuffer.Length()); + OstTraceFunctionEntry0( CDATAOWNERMANAGER_REQUESTDATAL_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CDATAOWNERMANAGER_REQUESTDATAL, "aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d", reinterpret_cast(aBuffer.Ptr()), static_cast(aBuffer.Length())); if (iBURType == EBURNormal || iBURType == EBURUnset) { - __LOG("CDataOwnerManager::RequestDataL() - *Error: called when device is in Normal/Unset mode"); + OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_REQUESTDATAL, "*Error: called when device is in Normal/Unset mode"); User::Leave(KErrAccessDenied); } @@ -1242,13 +1303,14 @@ } else { - __LOG("CDataOwnerManager::RequestDataL() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); + OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_REQUESTDATAL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored"); } break; } default: { + OstTrace0(TRACE_ERROR, DUP5_CDATAOWNERMANAGER_REQUESTDATAL, "Leave: KErrNotSupported"); User::Leave(KErrNotSupported); } } // switch @@ -1256,24 +1318,24 @@ // Compress the data block if (aBuffer.Size() > 0) // Dont compress no data { - __LOG1("CDataOwnerManager::RequestDataL() - got %d bytes of uncompressed data, about to pack it...", aBuffer.Length()); + OstTrace1(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_REQUESTDATAL, "got %d bytes of uncompressed data, about to pack it...", aBuffer.Length()); pCE->PackL(aBuffer); } else { - __LOG1("CDataOwnerManager::RequestDataL() - got %d bytes of uncompressed data, free reserved space...", aBuffer.Length()); + OstTrace1(TRACE_NORMAL, DUP4_CDATAOWNERMANAGER_REQUESTDATAL, "got %d bytes of uncompressed data, free reserved space...", aBuffer.Length()); pCE->FreeReservedSpace(aBuffer); } - CleanupStack::PopAndDestroy(pCE); - __LOG("CDataOwnerManager::RequestDataL() - End"); + CleanupStack::PopAndDestroy(pCE); + OstTraceFunctionExit0( CDATAOWNERMANAGER_REQUESTDATAL_EXIT ); } // Accessors void CDataOwnerManager::SetActiveBackupServer(CABServer* aABServer) { - ipABServer = aABServer; + ipABServer = aABServer; } RFs& CDataOwnerManager::GetRFs() @@ -1289,7 +1351,7 @@ */ void CDataOwnerManager::FindImportPackagesL(Swi::RSisRegistrySession& aRegistry, RPointerArray& aDataOwners) { - __LOG("CDataOwnerManager::FindImportPackagesL() - Begin"); + OstTraceFunctionEntry0( CDATAOWNERMANAGER_FINDIMPORTPACKAGESL_ENTRY ); CDesCArray* files = new(ELeave) CDesCArrayFlat(KDesCArrayGranularity); CleanupStack::PushL(files); FindRegistrationFilesL(KImportDir, *files); @@ -1310,7 +1372,7 @@ err = entry.Open(aRegistry, sid); if (err == KErrNone) { - __LOG2("CDataOwnerManager::FindImportPackagesL() - found reg file: %S for Package: 0x%08x", &fileName, sid.iId); + OstTraceExt2(TRACE_NORMAL, CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "found reg file: %S for Package: 0x%08x", fileName, sid.iId); CPackageDataTransfer* pDataTransfer = FindPackageDataContainerL(sid); TRAP(err, pDataTransfer->SetRegistrationFileL(fileName)); @@ -1320,6 +1382,7 @@ } if (err == KErrNoMemory) { + OstTrace0(TRACE_ERROR, DUP8_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "Leave: KErrNoMemory"); User::Leave(KErrNoMemory); } // create generic data type @@ -1334,6 +1397,7 @@ if (err != KErrNone) {//Non-removable, ignore this data owner CleanupStack::PopAndDestroy(pId); + entry.Close(); continue; } // create a data owner info @@ -1357,7 +1421,7 @@ CDataOwnerContainer* pDataOwner = FindL(sid); if (pDataOwner == NULL) // If it does not exist we need to create it { - __LOG1("CDataOwnerManager::FindImportPackagesL() - Package has the public files for SID: 0x%08x", sid.iId); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "Package has the public files for SID: 0x%08x", sid.iId); pDataOwner = CDataOwnerContainer::NewL(sid, this); CleanupStack::PushL(pDataOwner); @@ -1367,7 +1431,7 @@ } // if else { - __LOG1("CDataOwnerManager::FindImportPackagesL() - SID already exists in the list SID: 0x%08x", sid.iId); + OstTrace1(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "SID already exists in the list SID: 0x%08x", sid.iId); } TRAP_IGNORE(pDataOwner->DataOwner().AddRegistrationFilesL(fileName)); @@ -1381,7 +1445,7 @@ TRAP(err, pDataOwner->DataOwner().ParseFilesL()); if (err != KErrNone) { - __LOG2("CDataOwnerManager::GetDataOwnersL() - ParseFilesL() - Error in sid: 0x%08x (%d)", sid.iId, err); + OstTraceExt2(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "ParseFilesL() - Error in sid: 0x%08x (%d)", sid.iId, static_cast(err)); } // if else { @@ -1389,7 +1453,7 @@ TRAP(err, pDataOwner->DataOwner().BuildDriveStateArrayL()); if (err != KErrNone) { - __LOG2("CDataOwnerManager::GetDataOwnersL() - BuildDriveStateArrayL() - Error in sid: 0x%08x (%d)", sid.iId, err); + OstTraceExt2(TRACE_NORMAL, DUP4_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "BuildDriveStateArrayL() - Error in sid: 0x%08x (%d)", sid.iId, static_cast(err)); }//if else { @@ -1397,14 +1461,14 @@ TRAP(err, pDataOwner->DataOwner().GetDriveListL(driveList)); if (err != KErrNone) { - __LOG2("CDataOwnerManager::GetDataOwnersL() - GetDriveListL() - Error in sid: 0x%08x (%d)", sid.iId, err); + OstTraceExt2(TRACE_NORMAL, DUP5_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "GetDriveListL() - Error in sid: 0x%08x (%d)", sid.iId, static_cast(err)); }//if else { TRAP(err, pDataOwner->DataOwner().CommonSettingsL()); if (err != KErrNone) { - __LOG2("CDataOwnerManager::GetDataOwnersL() - CommonSettingsL() - Error in sid: 0x%08x (%d)", sid.iId, err); + OstTraceExt2(TRACE_NORMAL, DUP6_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "CommonSettingsL() - Error in sid: 0x%08x (%d)", sid.iId, static_cast(err)); }//if }//else } @@ -1418,7 +1482,7 @@ if (err != KErrNone) { - __LOG1("CDataOwnerManager::FindImportPackagesL() - cannot get Package UID for reg file: %S", &fileName); + OstTraceExt1(TRACE_NORMAL, DUP7_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "cannot get Package UID for reg file: %S", fileName); CSBGenericDataType* pId = CSBPackageId::NewL(sid, KDummyId, KNullDesC); CleanupStack::PushL(pId); @@ -1440,8 +1504,8 @@ CleanupStack::PopAndDestroy(&entry); - CleanupStack::PopAndDestroy(files); - __LOG("CDataOwnerManager::FindImportPackagesL() - End"); + CleanupStack::PopAndDestroy(files); + OstTraceFunctionExit0( CDATAOWNERMANAGER_FINDIMPORTPACKAGESL_EXIT ); } void CDataOwnerManager::FindRegistrationFilesL(const TDesC& aPath, CDesCArray& aFiles) @@ -1450,7 +1514,7 @@ @param aFiles on return a list of registration files on the device */ { - __LOG("CDataOwnerManager::FindRegistrationFilesL() - START"); + OstTraceFunctionEntry0( CDATAOWNERMANAGER_FINDREGISTRATIONFILESL_ENTRY ); // Find private directorys TFindFile findDir(iFs); @@ -1485,7 +1549,7 @@ while(fileCount--) { path.Set((*pFile)[fileCount].iName, &findFile.File(), NULL); - __LOG1("CDataOwnerManager::FindRegistrationFilesL() - found file: %S", &path.FullName()); + OstTraceExt1(TRACE_NORMAL, CDATAOWNERMANAGER_FINDREGISTRATIONFILESL, "found file: %S", path.FullName()); aFiles.AppendL(path.FullName()); } // for y @@ -1502,7 +1566,8 @@ errD = findDir.FindWild(pDir); } // while - __LOG1("CDataOwnerManager::FindRegistrationFilesL() - END - total files %d", aFiles.Count()); + OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_FINDREGISTRATIONFILESL, "total files %d", aFiles.Count()); + OstTraceFunctionExit0( CDATAOWNERMANAGER_FINDREGISTRATIONFILESL_EXIT ); } CDataOwnerContainer* CDataOwnerManager::FindL(TSecureId aSID) @@ -1512,16 +1577,19 @@ @leave KErrNotFound no such secure id */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_FINDL_ENTRY ); CDataOwnerContainer* tempCont = CDataOwnerContainer::NewL(aSID, this); TInt res = iDataOwners.Find(tempCont, CDataOwnerContainer::Match); delete tempCont; if (res == KErrNotFound) { + OstTraceFunctionExit0( CDATAOWNERMANAGER_FINDL_EXIT ); return NULL; } else { + OstTraceFunctionExit0( DUP1_CDATAOWNERMANAGER_FINDL_EXIT ); return iDataOwners[res]; } } @@ -1533,18 +1601,22 @@ @param aPid The process id */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_FINDPACKAGEDATACONTAINERL_ENTRY ); CPackageDataTransfer* pPackageTransfer = CPackageDataTransfer::NewL(aPid, this); CleanupStack::PushL(pPackageTransfer); TInt res = iPackageDataOwners.Find(pPackageTransfer, CPackageDataTransfer::Match); if (res == KErrNotFound) { - User::LeaveIfError(iPackageDataOwners.InsertInOrder(pPackageTransfer, CPackageDataTransfer::Compare)); + TInt err = iPackageDataOwners.InsertInOrder(pPackageTransfer, CPackageDataTransfer::Compare); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, CDATAOWNERMANAGER_FINDPACKAGEDATACONTAINERL, "Leave: %d", err)); CleanupStack::Pop(pPackageTransfer); + OstTraceFunctionExit0( CDATAOWNERMANAGER_FINDPACKAGEDATACONTAINERL_EXIT ); return pPackageTransfer; } else { CleanupStack::PopAndDestroy(pPackageTransfer); + OstTraceFunctionExit0( DUP1_CDATAOWNERMANAGER_FINDPACKAGEDATACONTAINERL_EXIT ); return iPackageDataOwners[res]; } } @@ -1555,6 +1627,7 @@ Looks for a "//private//" directory in the string and strips the SID after it. */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_STRIPSECUREIDL_ENTRY ); TInt start = aStrip.FindF(KImportDir); if (start == KErrNotFound) @@ -1562,6 +1635,7 @@ start = aStrip.FindF(KPrivate); if (start == KErrNotFound) { + OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_STRIPSECUREIDL, "Leave: KErrArgument"); User::Leave(KErrArgument); } start += KPrivate().Length(); @@ -1580,8 +1654,10 @@ // If we cant do the convert then ignore as it is a directory that is not a SID. if (sIdLex.Val(aSecureId.iId, EHex) != KErrNone) { + OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_STRIPSECUREIDL, "Leave: KErrArgument"); User::Leave(KErrArgument); } + OstTraceFunctionExit0( CDATAOWNERMANAGER_STRIPSECUREIDL_EXIT ); } @@ -1592,7 +1668,7 @@ registration files. */ { - __LOG("CDataOwnerManager::FindDataOwnersL() - Begin"); + OstTraceFunctionEntry0( CDATAOWNERMANAGER_FINDDATAOWNERSL_ENTRY ); // Clear out any current list iDataOwners.ResetAndDestroy(); @@ -1600,7 +1676,7 @@ CDesCArray* registrationFiles = new(ELeave) CDesCArrayFlat(KDesCArrayGranularity); CleanupStack::PushL(registrationFiles); FindRegistrationFilesL(KPrivate, *registrationFiles); - __LOG(" "); + OstTrace0(TRACE_NORMAL, CDATAOWNERMANAGER_FINDDATAOWNERSL, " "); // Add registration files to iDataOwners const TInt count = registrationFiles->Count(); @@ -1615,7 +1691,7 @@ CDataOwnerContainer* pDataOwner = FindL(sid); if (pDataOwner == NULL) // If it does not exist we need to create it { - __LOG2("CDataOwnerManager::FindDataOwnersL() - found reg file: %S for sid: 0x%08x", &fileName, sid.iId); + OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_FINDDATAOWNERSL, "found reg file: %S for sid: 0x%08x", fileName, sid.iId); pDataOwner = CDataOwnerContainer::NewL(sid, this); CleanupStack::PushL(pDataOwner); @@ -1625,15 +1701,15 @@ } // if else { - __LOG2("CDataOwnerManager::FindDataOwnersL() - found reg file: %S for existing sid: 0x%08x", &fileName, sid.iId); + OstTraceExt2(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_FINDDATAOWNERSL, "found reg file: %S for existing sid: 0x%08x", fileName, sid.iId); } pDataOwner->DataOwner().AddRegistrationFilesL(fileName); } // if } // for x - CleanupStack::PopAndDestroy(registrationFiles); - __LOG("CDataOwnerManager::FindDataOwnersL() - End"); + CleanupStack::PopAndDestroy(registrationFiles); + OstTraceFunctionExit0( CDATAOWNERMANAGER_FINDDATAOWNERSL_EXIT ); } CSBEConfig& CDataOwnerManager::Config() @@ -1649,6 +1725,7 @@ @return TBool specifying whether a SID is included or not */ { + OstTraceFunctionEntry0( CDATAOWNERMANAGER_ISSETFORPARTIALL_ENTRY ); TBool found = EFalse; if (iSIDListForPartial != NULL) @@ -1661,12 +1738,13 @@ } else { - __LOG("CDataOwnerManager::IsSetForPartialL() - SID list not created yet so leaving!"); + OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_ISSETFORPARTIALL, "SID list not created yet so leaving!"); User::Leave(KErrNotFound); } - __LOG2("CDataOwnerManager::IsSetForPartialL() - SID: 0x%08x, found: %d", aSecureId.iId, found); + OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_ISSETFORPARTIALL, "SID: 0x%08x, found: %d", aSecureId.iId, static_cast(found)); + OstTraceFunctionExit0( CDATAOWNERMANAGER_ISSETFORPARTIALL_EXIT ); return found; } } // namespace conn diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbencrypt.cpp --- a/backupandrestore/backupengine/src/sbencrypt.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbencrypt.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,16 +21,23 @@ */ #include "sbencrypt.h" #include "sbencryptimpl.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbencryptTraces.h" +#endif namespace conn { EXPORT_C CSecureBUREncryptKeySource* CSecureBUREncryptKeySource::NewL() { + OstTraceFunctionEntry0( CSECUREBURENCRYPTKEYSOURCE_NEWL_ENTRY ); CSecureBUREncryptKeySource* pSelf = new CSecureBUREncryptKeySource(); CleanupStack::PushL(pSelf); pSelf->ConstructL(); CleanupStack::Pop(pSelf); + OstTraceFunctionExit0( CSECUREBURENCRYPTKEYSOURCE_NEWL_EXIT ); return pSelf; } @@ -39,11 +46,16 @@ C++ constructor */ { + OstTraceFunctionEntry0( CSECUREBURENCRYPTKEYSOURCE_CSECUREBURENCRYPTKEYSOURCE_CONS_ENTRY ); + OstTraceFunctionExit0( CSECUREBURENCRYPTKEYSOURCE_CSECUREBURENCRYPTKEYSOURCE_CONS_EXIT ); } EXPORT_C CSecureBUREncryptKeySource::~CSecureBUREncryptKeySource() { + OstTraceFunctionEntry0( CSECUREBURENCRYPTKEYSOURCE_CSECUREBURENCRYPTKEYSOURCE_DES_ENTRY ); delete iImpl; + iImpl = NULL; + OstTraceFunctionExit0( CSECUREBURENCRYPTKEYSOURCE_CSECUREBURENCRYPTKEYSOURCE_DES_EXIT ); } void CSecureBUREncryptKeySource::ConstructL() @@ -51,14 +63,18 @@ Symbian 2nd phase construction */ { + OstTraceFunctionEntry0( CSECUREBURENCRYPTKEYSOURCE_CONSTRUCTL_ENTRY ); iImpl = CSecureBURKeySourceImpl::NewL(); + OstTraceFunctionExit0( CSECUREBURENCRYPTKEYSOURCE_CONSTRUCTL_EXIT ); } EXPORT_C void CSecureBUREncryptKeySource::GetDefaultBufferForBackupL(TDriveNumber aDrive, TBool& aGotBuffer, TDes& aBuffer) { + OstTraceFunctionEntry0( CSECUREBURENCRYPTKEYSOURCE_GETDEFAULTBUFFERFORBACKUPL_ENTRY ); iImpl->GetDefaultBufferForBackupL(aDrive, aGotBuffer, aBuffer); + OstTraceFunctionExit0( CSECUREBURENCRYPTKEYSOURCE_GETDEFAULTBUFFERFORBACKUPL_EXIT ); } @@ -67,7 +83,9 @@ TBool &aDoEncrypt, TDes8& aKey, TBool& aGotBuffer, TDes& aBuffer) { + OstTraceFunctionEntry0( CSECUREBURENCRYPTKEYSOURCE_GETBACKUPKEYL_ENTRY ); iImpl->GetBackupKeyL(aDrive, aSID, aDoEncrypt, aKey, aGotBuffer, aBuffer); + OstTraceFunctionExit0( CSECUREBURENCRYPTKEYSOURCE_GETBACKUPKEYL_EXIT ); } @@ -76,7 +94,9 @@ TBool aGotBuffer, TDes& aBuffer, TBool &aGotKey, TDes8& aKey) { + OstTraceFunctionEntry0( CSECUREBURENCRYPTKEYSOURCE_GETRESTOREKEYL_ENTRY ); iImpl->GetRestoreKeyL(aDrive, aSID, aGotBuffer, aBuffer, aGotKey, aKey); + OstTraceFunctionExit0( CSECUREBURENCRYPTKEYSOURCE_GETRESTOREKEYL_EXIT ); } } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbencryptimpl.cpp --- a/backupandrestore/backupengine/src/sbencryptimpl.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbencryptimpl.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -19,6 +19,11 @@ @file */ #include "sbencryptimpl.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbencryptimplTraces.h" +#endif // If you want this code to actually test encryption then uncomment the next line //#define __TEST_ENCRYPTION__ @@ -30,7 +35,9 @@ */ CSecureBURKeySourceImpl* CSecureBURKeySourceImpl::NewL() { + OstTraceFunctionEntry0( CSECUREBURKEYSOURCEIMPL_NEWL_ENTRY ); CSecureBURKeySourceImpl* pSelf = new(ELeave) CSecureBURKeySourceImpl(); + OstTraceFunctionExit0( CSECUREBURKEYSOURCEIMPL_NEWL_EXIT ); return pSelf; } @@ -39,6 +46,8 @@ */ CSecureBURKeySourceImpl::CSecureBURKeySourceImpl() { + OstTraceFunctionEntry0( CSECUREBURKEYSOURCEIMPL_CSECUREBURKEYSOURCEIMPL_CONS_ENTRY ); + OstTraceFunctionExit0( CSECUREBURKEYSOURCEIMPL_CSECUREBURKEYSOURCEIMPL_CONS_EXIT ); } /** @@ -46,6 +55,8 @@ */ CSecureBURKeySourceImpl::~CSecureBURKeySourceImpl() { + OstTraceFunctionEntry0( CSECUREBURKEYSOURCEIMPL_CSECUREBURKEYSOURCEIMPL_DES_ENTRY ); + OstTraceFunctionExit0( CSECUREBURKEYSOURCEIMPL_CSECUREBURKEYSOURCEIMPL_DES_EXIT ); } /** @@ -55,6 +66,7 @@ TBool& aGotBuffer, TDes& /*aBuffer*/) { + OstTraceFunctionEntry0( CSECUREBURKEYSOURCEIMPL_GETDEFAULTBUFFERFORBACKUPL_ENTRY ); #ifdef __TEST_ENCRYPTION__ _LIT(KTestBuffer, "TEST_BUFFER"); @@ -63,6 +75,7 @@ #else aGotBuffer = EFalse; #endif + OstTraceFunctionExit0( CSECUREBURKEYSOURCEIMPL_GETDEFAULTBUFFERFORBACKUPL_EXIT ); } /** @@ -72,6 +85,7 @@ TBool& aDoEncrypt, TDes8& /*aKey*/, TBool& aGotBuffer, TDes& /*aBuffer*/) { + OstTraceFunctionEntry0( CSECUREBURKEYSOURCEIMPL_GETBACKUPKEYL_ENTRY ); #ifdef __TEST_ENCRYPTION__ _LIT(KTestBuffer, "TEST_BUFFER"); @@ -83,6 +97,7 @@ aDoEncrypt = EFalse; aGotBuffer = EFalse; #endif + OstTraceFunctionExit0( CSECUREBURKEYSOURCEIMPL_GETBACKUPKEYL_EXIT ); } /** @@ -92,12 +107,14 @@ TBool /*aGotBuffer*/, TDes& /*aBuffer*/, TBool &aGotKey, TDes8& /*aKey*/) { + OstTraceFunctionEntry0( CSECUREBURKEYSOURCEIMPL_GETRESTOREKEYL_ENTRY ); #ifdef __TEST_ENCRYPTION__ aGotKey = ETrue; aKey.AppendNum(aSID); #else aGotKey = EFalse; #endif + OstTraceFunctionExit0( CSECUREBURKEYSOURCEIMPL_GETRESTOREKEYL_EXIT ); } } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbepanic.cpp --- a/backupandrestore/backupengine/src/sbepanic.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbepanic.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,6 +21,11 @@ #include #include "sbepanic.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbepanicTraces.h" +#endif namespace conn { @@ -34,7 +39,9 @@ @panic aPanicCode The panic code passed in */ { + OstTraceFunctionEntry0( _CONN_PANIC_ENTRY ); _LIT(KPanicString,"SBE:"); User::Panic(KPanicString,aPanicCode); + OstTraceFunctionExit0( _CONN_PANIC_EXIT ); } } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbeparserproxy.cpp --- a/backupandrestore/backupengine/src/sbeparserproxy.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbeparserproxy.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,11 @@ // User includes #include "sbeparserdefs.h" -#include "sblog.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbeparserproxyTraces.h" +#endif namespace conn { @@ -37,27 +41,34 @@ @param apDataOwnerManager data owner manager to access resources */ { + OstTraceFunctionEntry0( CSBEPARSERPROXY_CSBEPARSERPROXY_CONS_ENTRY ); + OstTraceFunctionExit0( CSBEPARSERPROXY_CSBEPARSERPROXY_CONS_EXIT ); } CSBEParserProxy::~CSBEParserProxy() /** Standard C++ destructor */ { + OstTraceFunctionEntry0( CSBEPARSERPROXY_CSBEPARSERPROXY_DES_ENTRY ); delete iConverter; delete iParser; + OstTraceFunctionExit0( CSBEPARSERPROXY_CSBEPARSERPROXY_DES_EXIT ); } void CSBEParserProxy::ConstructL() /** Symbian 2nd stage constructor */ { + OstTraceFunctionEntry0( CSBEPARSERPROXY_CONSTRUCTL_ENTRY ); iParser = CParser::NewL(KMimeType, *this); // We only convert from UTF-8 to UTF-16 iConverter = CCnvCharacterSetConverter::NewL(); if ( iConverter->PrepareToConvertToOrFromL( KCharacterSetIdentifierUtf8, iFsSession ) == CCnvCharacterSetConverter::ENotAvailable ) { + OstTrace0(TRACE_ERROR, CSBEPARSERPROXY_CONSTRUCTL, "Leave: KErrNotFound"); User::Leave(KErrNotFound); } + OstTraceFunctionExit0( CSBEPARSERPROXY_CONSTRUCTL_EXIT ); } CSBEParserProxy* CSBEParserProxy::NewL( RFs& aFsSession ) @@ -68,17 +79,20 @@ @return a CBackupRegistrationParser object */ { + OstTraceFunctionEntry0( CSBEPARSERPROXY_NEWL_ENTRY ); CSBEParserProxy* self = new(ELeave) CSBEParserProxy( aFsSession ); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSBEPARSERPROXY_NEWL_EXIT ); return self; } void CSBEParserProxy::ParseL( const TDesC& aFileName, MContentHandler& aObserver ) /** Parsing API */ { + OstTraceFunctionEntry0( CSBEPARSERPROXY_PARSEL_ENTRY ); // Store transient observer (the entity that we will route callbacks to) iTransientParsingError = KErrNone; iTransientObserver = &aObserver; @@ -88,23 +102,24 @@ Xml::ParseL( *iParser, iFsSession, aFileName ); // Handle any errors received during callbacks - User::LeaveIfError( iTransientParsingError ); + LEAVEIFERROR( iTransientParsingError, OstTrace1(TRACE_ERROR, DUP1_CSBEPARSERPROXY_CONVERTTOUNICODEL, "Leave: %d", iTransientParsingError) ); + OstTraceFunctionExit0( CSBEPARSERPROXY_PARSEL_EXIT ); } TInt CSBEParserProxy::ConvertToUnicodeL( TDes16& aUnicode, const TDesC8& aForeign ) { + OstTraceFunctionEntry0( CSBEPARSERPROXY_CONVERTTOUNICODEL_ENTRY ); const TInt error = iConverter->ConvertToUnicode( aUnicode, aForeign, iConverterState ); -#ifdef SBE_LOGGING_ENABLED if ( error != KErrNone ) { HBufC* copy = HBufC::NewL( aForeign.Length() * 2 ); copy->Des().Copy( aForeign ); - __LOG2("CSBEParserProxy::ConvertToUnicode() - error: %d when converting: %S", error, copy ); + OstTraceExt2(TRACE_NORMAL, CSBEPARSERPROXY_CONVERTTOUNICODEL, "error: %d when converting: %S", error, *copy ); delete copy; } -#endif + OstTraceFunctionExit0( CSBEPARSERPROXY_CONVERTTOUNICODEL_EXIT ); return error; } @@ -116,27 +131,31 @@ */ void CSBEParserProxy::OnStartDocumentL(const RDocumentParameters& aDocParam, TInt aErrorCode) { + OstTraceFunctionEntry0( CSBEPARSERPROXY_ONSTARTDOCUMENTL_ENTRY ); if (aErrorCode != KErrNone) { - __LOG1("CBackupRegistrationParser::OnStartDocumentL() - error = %d", aErrorCode); + OstTrace1(TRACE_ERROR, CSBEPARSERPROXY_ONSTARTDOCUMENTL, "error = %d", aErrorCode); User::Leave(aErrorCode); } iTransientObserver->OnStartDocumentL( aDocParam, aErrorCode ); + OstTraceFunctionExit0( CSBEPARSERPROXY_ONSTARTDOCUMENTL_EXIT ); } /** MContentHandler::OnEndDocumentL() */ void CSBEParserProxy::OnEndDocumentL(TInt aErrorCode) { + OstTraceFunctionEntry0( CSBEPARSERPROXY_ONENDDOCUMENTL_ENTRY ); if (aErrorCode != KErrNone) { // just to satifsy UREL compiler (void) aErrorCode; - __LOG1("CBackupRegistrationParser::OnEndDocumentL() - error = %d", aErrorCode); + OstTrace1(TRACE_NORMAL, CSBEPARSERPROXY_ONENDDOCUMENTL, "error = %d", aErrorCode); } iTransientObserver->OnEndDocumentL( aErrorCode ); + OstTraceFunctionExit0( CSBEPARSERPROXY_ONENDDOCUMENTL_EXIT ); } /** MContentHandler::OnStartElementL() @@ -145,68 +164,83 @@ */ void CSBEParserProxy::OnStartElementL(const RTagInfo& aElement, const RAttributeArray& aAttributes, TInt aErrorCode) { + OstTraceFunctionEntry0( CSBEPARSERPROXY_ONSTARTELEMENTL_ENTRY ); if (aErrorCode != KErrNone) { - __LOG1("CBackupRegistrationParser::OnStartElementL() - error = %d", aErrorCode); - User::LeaveIfError(aErrorCode); + LEAVEIFERROR(aErrorCode, OstTrace1(TRACE_ERROR, CSBEPARSERPROXY_ONSTARTELEMENTL, "error = %d", aErrorCode)); } iTransientObserver->OnStartElementL( aElement, aAttributes, aErrorCode ); + OstTraceFunctionExit0( CSBEPARSERPROXY_ONSTARTELEMENTL_EXIT ); } /** MContentHandler::OnEndElementL() */ void CSBEParserProxy::OnEndElementL(const RTagInfo& aElement, TInt aErrorCode) { + OstTraceFunctionEntry0( CSBEPARSERPROXY_ONENDELEMENTL_ENTRY ); if (aErrorCode != KErrNone) { - __LOG1("CBackupRegistrationParser::OnEndElementL() - error = %d", aErrorCode); + OstTrace1(TRACE_ERROR, CSBEPARSERPROXY_ONENDELEMENTL, "error = %d", aErrorCode); User::Leave(aErrorCode); } iTransientObserver->OnEndElementL( aElement, aErrorCode ); + OstTraceFunctionExit0( CSBEPARSERPROXY_ONENDELEMENTL_EXIT ); } /** MContentHandler::OnContentL() */ void CSBEParserProxy::OnContentL(const TDesC8& aBytes, TInt aErrorCode) { + OstTraceFunctionEntry0( CSBEPARSERPROXY_ONCONTENTL_ENTRY ); iTransientObserver->OnContentL( aBytes, aErrorCode ); + OstTraceFunctionExit0( CSBEPARSERPROXY_ONCONTENTL_EXIT ); } /** MContentHandler::OnStartPrefixMappingL() */ void CSBEParserProxy::OnStartPrefixMappingL(const RString& aPrefix, const RString& aUri, TInt aErrorCode) { + OstTraceFunctionEntry0( CSBEPARSERPROXY_ONSTARTPREFIXMAPPINGL_ENTRY ); iTransientObserver->OnStartPrefixMappingL( aPrefix, aUri, aErrorCode ); + OstTraceFunctionExit0( CSBEPARSERPROXY_ONSTARTPREFIXMAPPINGL_EXIT ); } /** MContentHandler::OnEndPrefixMappingL() */ void CSBEParserProxy::OnEndPrefixMappingL(const RString& aPrefix, TInt aErrorCode) { + OstTraceFunctionEntry0( CSBEPARSERPROXY_ONENDPREFIXMAPPINGL_ENTRY ); iTransientObserver->OnEndPrefixMappingL( aPrefix, aErrorCode ); + OstTraceFunctionExit0( CSBEPARSERPROXY_ONENDPREFIXMAPPINGL_EXIT ); } /** MContentHandler::OnIgnorableWhiteSpaceL() */ void CSBEParserProxy::OnIgnorableWhiteSpaceL(const TDesC8& aBytes, TInt aErrorCode) { + OstTraceFunctionEntry0( CSBEPARSERPROXY_ONIGNORABLEWHITESPACEL_ENTRY ); iTransientObserver->OnIgnorableWhiteSpaceL( aBytes, aErrorCode ); + OstTraceFunctionExit0( CSBEPARSERPROXY_ONIGNORABLEWHITESPACEL_EXIT ); } /** MContentHandler::OnSkippedEntityL() */ void CSBEParserProxy::OnSkippedEntityL(const RString& aName, TInt aErrorCode) { + OstTraceFunctionEntry0( CSBEPARSERPROXY_ONSKIPPEDENTITYL_ENTRY ); iTransientObserver->OnSkippedEntityL( aName, aErrorCode ); + OstTraceFunctionExit0( CSBEPARSERPROXY_ONSKIPPEDENTITYL_EXIT ); } /** MContentHandler::OnProcessingInstructionL() */ void CSBEParserProxy::OnProcessingInstructionL(const TDesC8& aTarget, const TDesC8& aData, TInt aErrorCode) { + OstTraceFunctionEntry0( CSBEPARSERPROXY_ONPROCESSINGINSTRUCTIONL_ENTRY ); iTransientObserver->OnProcessingInstructionL( aTarget, aData, aErrorCode ); + OstTraceFunctionExit0( CSBEPARSERPROXY_ONPROCESSINGINSTRUCTIONL_EXIT ); } /** MContentHandler::OnError() @@ -215,9 +249,11 @@ */ void CSBEParserProxy::OnError(TInt aErrorCode) { - __LOG1("CBackupRegistrationParser::OnError() - error = %d", aErrorCode); + OstTraceFunctionEntry0( CSBEPARSERPROXY_ONERROR_ENTRY ); + OstTrace1(TRACE_NORMAL, CSBEPARSERPROXY_ONERROR, "error = %d", aErrorCode); iTransientParsingError = aErrorCode; iTransientObserver->OnError( aErrorCode ); + OstTraceFunctionExit0( CSBEPARSERPROXY_ONERROR_EXIT ); } /** MContentHandler::OnEndPrefixMappingL() diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbeserver.cpp --- a/backupandrestore/backupengine/src/sbeserver.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbeserver.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -26,13 +26,14 @@ #include "sbesession.h" #include "sbepanic.h" #include "sbedataownermanager.h" -#include "sblog.h" -//#include +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbeserverTraces.h" +#endif namespace conn { - - /** Secure Backup Engine security request ranges This is a breakdown of the SBE requests into ranges @@ -90,7 +91,9 @@ Class constructor */ { + OstTraceFunctionEntry0( CSBESERVER_CSBESERVER_CONS_ENTRY ); __ASSERT_DEBUG(aDOM, Panic(KErrArgument)); + OstTraceFunctionExit0( CSBESERVER_CSBESERVER_CONS_EXIT ); } CSBEServer::~CSBEServer() @@ -98,8 +101,10 @@ Class destructor */ { + OstTraceFunctionEntry0( CSBESERVER_CSBESERVER_DES_ENTRY ); iGlobalSharedHeap.Close(); delete iGSHInterface; + OstTraceFunctionExit0( CSBESERVER_CSBESERVER_DES_EXIT ); } CSBEServer* CSBEServer::NewLC(CDataOwnerManager* aDOM) @@ -110,9 +115,11 @@ @return The new instance of CSBEServer. */ { + OstTraceFunctionEntry0( CSBESERVER_NEWLC_ENTRY ); CSBEServer* pSelf = new (ELeave) CSBEServer(aDOM); CleanupStack::PushL(pSelf); pSelf->ConstructL(); + OstTraceFunctionExit0( CSBESERVER_NEWLC_EXIT ); return pSelf; } @@ -121,6 +128,7 @@ Construct this instance of CSBEServer. */ { + OstTraceFunctionEntry0( CSBESERVER_CONSTRUCTL_ENTRY ); AllocateGlobalSharedHeapL(); iGSHInterface = CHeapWrapper::NewL(); @@ -134,6 +142,7 @@ #ifndef _DEBUG iShutdown.Start(); #endif + OstTraceFunctionExit0( CSBESERVER_CONSTRUCTL_EXIT ); } void CSBEServer::AllocateGlobalSharedHeapL() @@ -142,6 +151,7 @@ progressively smaller chunk sizes */ { + OstTraceFunctionEntry0( CSBESERVER_ALLOCATEGLOBALSHAREDHEAPL_ENTRY ); TInt attemptedSize; TInt retryCount; TInt redFactor; @@ -165,7 +175,8 @@ } } - User::LeaveIfError(result); + LEAVEIFERROR(result, OstTrace1(TRACE_ERROR, CSBESERVER_ALLOCATEGLOBALSHAREDHEAPL, "error = %d", result)); + OstTraceFunctionExit0( CSBESERVER_ALLOCATEGLOBALSHAREDHEAPL_EXIT ); } void CSBEServer::AddSession() @@ -175,8 +186,10 @@ session count drops to zero. */ { + OstTraceFunctionEntry0( CSBESERVER_ADDSESSION_ENTRY ); ++iSessionCount; iShutdown.Cancel(); + OstTraceFunctionExit0( CSBESERVER_ADDSESSION_EXIT ); } void CSBEServer::DropSession() @@ -186,10 +199,12 @@ session count drops to zero. */ { + OstTraceFunctionEntry0( CSBESERVER_DROPSESSION_ENTRY ); if(--iSessionCount == 0) { iShutdown.Start(); } + OstTraceFunctionExit0( CSBESERVER_DROPSESSION_EXIT ); } @@ -206,16 +221,20 @@ @leave KErrNotSupported if the version passed in aVersion is not the same as this one */ { + OstTraceFunctionEntry0( CSBESERVER_NEWSESSIONL_ENTRY ); TVersion thisVersion(KSBEMajorVersionNumber, KSBEMinorVersionNumber, KSBEBuildVersionNumber); if (!User::QueryVersionSupported(thisVersion, aVersion)) { + OstTrace0(TRACE_ERROR, CSBESERVER_NEWSESSIONL, "Leave: KErrNotSupported"); User::Leave(KErrNotSupported); } - return new (ELeave) CSBESession(); + CSession2* session = new (ELeave) CSBESession(); + OstTraceFunctionExit0( CSBESERVER_NEWSESSIONL_EXIT ); + return session; } TInt CSBEServer::RunError(TInt aError) @@ -229,6 +248,7 @@ @return The error code to be passed back to the active scheduler framework. */ { + OstTraceFunctionEntry0( CSBESERVER_RUNERROR_ENTRY ); // // A Bad descriptor is a bad client - panic it. if(aError == KErrBadDescriptor) @@ -240,6 +260,7 @@ // Complete the message and continue handling requests. Message().Complete(aError); ReStart(); + OstTraceFunctionExit0( CSBESERVER_RUNERROR_EXIT ); return KErrNone; } @@ -250,11 +271,13 @@ @param aPanic The panic code. */ { + OstTraceFunctionEntry0( CSBESERVER_PANICCLIENT_ENTRY ); __DEBUGGER() _LIT(KPanicCategory,"SBE Server"); RThread client; Message().Client(client); client.Panic(KPanicCategory, aPanic); + OstTraceFunctionExit0( CSBESERVER_PANICCLIENT_EXIT ); } } // end namespace diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbesession.cpp --- a/backupandrestore/backupengine/src/sbesession.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbesession.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,12 +27,15 @@ #include "sbepanic.h" #include "sbedataownermanager.h" #include -#include "sblog.h" #include +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbesessionTraces.h" +#endif namespace conn - { - + { /** This block size for the internal buffer @internalTechnology */ @@ -43,6 +46,8 @@ Class Constructor */ { + OstTraceFunctionEntry0( CSBESESSION_CSBESESSION_CONS_ENTRY ); + OstTraceFunctionExit0( CSBESESSION_CSBESESSION_CONS_EXIT ); } CSBESession::~CSBESession() @@ -50,12 +55,14 @@ Class destructor */ { + OstTraceFunctionEntry0( CSBESESSION_CSBESESSION_DES_ENTRY ); // // If the client has detached properly, they should // have done this - but just in case. Server().DropSession(); ResetTransferBuf(); delete iExtCurEntry; + OstTraceFunctionExit0( CSBESESSION_CSBESESSION_DES_EXIT ); } void CSBESession::CreateL() @@ -64,9 +71,11 @@ Backup Engine session. Increments the server's session count */ { + OstTraceFunctionEntry0( CSBESESSION_CREATEL_ENTRY ); // // Increase the servers session count. Server().AddSession(); + OstTraceFunctionExit0( CSBESESSION_CREATEL_EXIT ); } void CSBESession::ServiceL(const RMessage2& aMessage) @@ -77,157 +86,160 @@ @param aMessage Reference to a RMessage2 object */ { - #ifdef SBE_LOGGING_ENABLED + OstTraceFunctionEntry0( CSBESESSION_SERVICEL_ENTRY ); + RThread thread; aMessage.Client(thread); const TFullName threadName( thread.FullName() ); thread.Close(); - #endif - + switch(aMessage.Function()) { // // Connection config getting/setting. case ESBEMsgGetGSHHandle: { - __LOG1("CSBESession::ServiceL() - ESBEMsgGetGSHHandle for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, CSBESESSION_SERVICEL, "ESBEMsgGetGSHHandle for thread: %S", threadName); aMessage.Complete(Server().GlobalSharedHeap()); break; } case ESBEMsgPrepDataOwnerInfo: { - __LOG1("CSBESession::ServiceL() - ESBEMsgPrepDataOwnerInfo for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP1_CSBESESSION_SERVICEL, "ESBEMsgPrepDataOwnerInfo for thread: %S", threadName); PrepDataOwnerInfoL(aMessage); break; } case ESBEMsgGetDataOwnerInfo: { - __LOG1("CSBESession::ServiceL() - ESBEMsgGetDataOwnerInfo for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP2_CSBESESSION_SERVICEL, "ESBEMsgGetDataOwnerInfo for thread: %S", threadName); ReturnDataOwnerInfoL(aMessage); break; } case ESBEMsgPrepPublicFiles: { - __LOG1("CSBESession::ServiceL() - ESBEMsgPrepPublicFiles for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP3_CSBESESSION_SERVICEL, "ESBEMsgPrepPublicFiles for thread: %S", threadName); PrepPublicFileListL(aMessage); break; } case ESBEMsgGetPublicFiles: { - __LOG1("CSBESession::ServiceL() - ESBEMsgGetPublicFiles for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP4_CSBESESSION_SERVICEL, "ESBEMsgGetPublicFiles for thread: %S", threadName); ReturnPublicFileListL(aMessage); break; } case ESBEMsgPrepPublicFilesRaw: { - __LOG1("CSBESession::ServiceL() - ESBEMsgPrepPublicFilesRaw for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP5_CSBESESSION_SERVICEL, "ESBEMsgPrepPublicFilesRaw for thread: %S", threadName); PrepPublicFileListRawL(aMessage); break; } case ESBEMsgGetPublicFilesRaw: { - __LOG1("CSBESession::ServiceL() - ESBEMsgGetPublicFilesRaw for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP6_CSBESESSION_SERVICEL, "ESBEMsgGetPublicFilesRaw for thread: %S", threadName); ReturnPublicFileListRawL(aMessage); break; } case ESBEMsgPrepPublicFilesXML: { - __LOG1("CSBESession::ServiceL() - ESBEMsgPrepPublicFilesXML for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP7_CSBESESSION_SERVICEL, "ESBEMsgPrepPublicFilesXML for thread: %S", threadName); PrepPublicFileListXMLL(aMessage); break; } case ESBEMsgGetPublicFilesXML: { - __LOG1("CSBESession::ServiceL() - ESBEMsgGetPublicFilesXML for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP8_CSBESESSION_SERVICEL, "ESBEMsgGetPublicFilesXML for thread: %S", threadName); ReturnPublicFileListXMLL(aMessage); break; } case ESBEMsgSetBURMode: { - __LOG1("CSBESession::ServiceL() - ESBEMsgSetBURMode for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP9_CSBESESSION_SERVICEL, "ESBEMsgSetBURMode for thread: %S", threadName); SetBURModeL(aMessage); break; } case ESBEMsgSetSIDListPartial: { - __LOG1("CSBESession::ServiceL() - ESBEMsgSetSIDListPartial for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP10_CSBESESSION_SERVICEL, "ESBEMsgSetSIDListPartial for thread: %S", threadName); SetSIDListForPartialBURL(aMessage); break; } case ESBEMsgPrepSIDStatus: { - __LOG1("CSBESession::ServiceL() - ESBEMsgPrepSIDStatus for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP11_CSBESESSION_SERVICEL, "ESBEMsgPrepSIDStatus for thread: %S", threadName); PrepSIDStatusL(aMessage); break; } case ESBEMsgGetSIDStatus: { - __LOG1("CSBESession::ServiceL() - ESBEMsgGetSIDStatus for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP12_CSBESESSION_SERVICEL, "ESBEMsgGetSIDStatus for thread: %S", threadName); ReturnSIDStatusL(aMessage); break; } case ESBEMsgRequestDataSync: case ESBEMsgRequestDataAsync: { - __LOG1("CSBESession::ServiceL() - ESBEMsgRequestDataSync / ESBEMsgRequestDataAsync for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP13_CSBESESSION_SERVICEL, "ESBEMsgRequestDataSync / ESBEMsgRequestDataAsync for thread: %S", threadName); TRAPD(reqDataErr, RequestDataAsyncL(aMessage)); if (reqDataErr != KErrNone) { Server().GSHInterface().Header(Server().GlobalSharedHeap()).SetLockedFlag(EFalse); + OstTrace1(TRACE_ERROR, DUP22_CSBESESSION_SERVICEL, "Leave: %d", reqDataErr); User::Leave(reqDataErr); } break; } case ESBEMsgSupplyDataSync: { - __LOG1("CSBESession::ServiceL() - ESBEMsgSupplyDataSync for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP14_CSBESESSION_SERVICEL, "ESBEMsgSupplyDataSync for thread: %S", threadName); TRAPD(supDataErr, SupplyDataSyncL(aMessage)); if (supDataErr != KErrNone) { Server().GSHInterface().Header(Server().GlobalSharedHeap()).SetLockedFlag(EFalse); + OstTrace1(TRACE_ERROR, DUP23_CSBESESSION_SERVICEL, "Leave: %d", supDataErr); User::Leave(supDataErr); } break; } case ESBEMsgAllSnapshotsSupplied: { - __LOG1("CSBESession::ServiceL() - ESBEMsgAllSnapshotsSupplied for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP15_CSBESESSION_SERVICEL, "ESBEMsgAllSnapshotsSupplied for thread: %S", threadName); AllSnapshotsSuppliedL(aMessage); break; } case ESBEMsgGetExpectedDataSize: { - __LOG1("CSBESession::ServiceL() - ESBEMsgGetExpectedDataSize for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP16_CSBESESSION_SERVICEL, "ESBEMsgGetExpectedDataSize for thread: %S", threadName); GetExpectedDataSizeL(aMessage); break; } case ESBEMsgAllSystemFilesRestored: { - __LOG1("CSBESession::ServiceL() - ESBEMsgAllSystemFilesRestored for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP17_CSBESESSION_SERVICEL, "ESBEMsgAllSystemFilesRestored for thread: %S", threadName); AllSystemFilesRestoredL(); aMessage.Complete(KErrNone); break; } case ESBEMsgPrepLargePublicFiles: { - __LOG1("CSBESession::ServiceL() - ESBEMsgPrepPublicFiles for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP18_CSBESESSION_SERVICEL, "ESBEMsgPrepPublicFiles for thread: %S", threadName); PrepLargePublicFileListL(aMessage); break; } case ESBEMsgGetLargePublicFiles: { - __LOG1("CSBESession::ServiceL() - ESBEMsgGetPublicFiles for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP19_CSBESESSION_SERVICEL, "ESBEMsgGetPublicFiles for thread: %S", threadName); ReturnLargePublicFileListL(aMessage); break; } default: { - __LOG1("CSBESession::ServiceL() - UNKNOWN OP CODE for thread: %S", &threadName); + OstTraceExt1(TRACE_ERROR, DUP20_CSBESESSION_SERVICEL, "UNKNOWN OP CODE for thread: %S", threadName); User::Leave(KErrNotSupported); } } - __LOG1("CSBESession::ServiceL() - Completed OK for thread: %S", &threadName); + OstTraceExt1(TRACE_NORMAL, DUP21_CSBESESSION_SERVICEL, "Completed OK for thread: %S", threadName); + OstTraceFunctionExit0( CSBESESSION_SERVICEL_EXIT ); } inline CSBEServer& CSBESession::Server() const @@ -245,6 +257,7 @@ Prepares the */ { + OstTraceFunctionEntry0( CSBESESSION_PREPDATAOWNERINFOL_ENTRY ); TInt err = KErrNone; ResetTransferBuf(); RPointerArray doiArray; @@ -279,11 +292,12 @@ doiArray.ResetAndDestroy(); doiArray.Close(); - User::LeaveIfError(err); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, CSBESESSION_PREPDATAOWNERINFOL, "error = %d", err)); // complete the message with the total size of the buffer so that the // client can create the appropriate sized descriptor for receiving the data aMessage.Complete(iTransferBuf->Des().Size()); + OstTraceFunctionExit0( CSBESESSION_PREPDATAOWNERINFOL_EXIT ); } void CSBESession::ReturnDataOwnerInfoL(const RMessage2& aMessage) @@ -292,6 +306,7 @@ @param aMessage The message sent by the client to the server */ { + OstTraceFunctionEntry0( CSBESESSION_RETURNDATAOWNERINFOL_ENTRY ); __ASSERT_DEBUG(iTransferBuf, Panic(KErrNotFound)); // return the previously allocated transfer buffer @@ -299,6 +314,7 @@ aMessage.Complete(iArrayCount); ResetTransferBuf(); + OstTraceFunctionExit0( CSBESESSION_RETURNDATAOWNERINFOL_EXIT ); } void CSBESession::PrepPublicFileListL(const RMessage2& aMessage) @@ -307,6 +323,7 @@ @param aMessage The message sent by the client to the server */ { + OstTraceFunctionEntry0( CSBESESSION_PREPPUBLICFILELISTL_ENTRY ); RFileArray fileArray; CleanupClosePushL(fileArray); HBufC8* pGenericDataTypeBuffer = HBufC8::NewLC(aMessage.GetDesLengthL(1)); @@ -329,12 +346,14 @@ // complete the message with the total size of the buffer so that the // client can create the appropriate sized descriptor for receiving the data aMessage.Complete(iTransferBuf->Des().MaxSize()); + OstTraceFunctionExit0( CSBESESSION_PREPPUBLICFILELISTL_EXIT ); } void CSBESession::ReturnPublicFileListL(const RMessage2& aMessage) /** Return the previously populated buffer to the client @param aMessage The message sent by the client to the server */ { + OstTraceFunctionEntry0( CSBESESSION_RETURNPUBLICFILELISTL_ENTRY ); __ASSERT_DEBUG(iTransferBuf, Panic(KErrArgument)); // return the previously allocated transfer buffer @@ -343,6 +362,7 @@ aMessage.Complete(KErrNone); ResetTransferBuf(); + OstTraceFunctionExit0( CSBESESSION_RETURNPUBLICFILELISTL_EXIT ); } void CSBESession::PrepPublicFileListRawL(const RMessage2& aMessage) @@ -351,6 +371,7 @@ @param aMessage The message sent by the client to the server */ { + OstTraceFunctionEntry0( CSBESESSION_PREPPUBLICFILELISTRAWL_ENTRY ); RRestoreFileFilterArray fileFilterArray; CleanupClosePushL(fileFilterArray); TPckgBuf driveNumPkg; @@ -375,12 +396,14 @@ // complete the message with the total size of the buffer so that the // client can create the appropriate sized descriptor for receiving the data aMessage.Complete(iTransferBuf->Des().MaxSize()); + OstTraceFunctionExit0( CSBESESSION_PREPPUBLICFILELISTRAWL_EXIT ); } void CSBESession::ReturnPublicFileListRawL(const RMessage2& aMessage) /** Return the previously populated buffer to the client @param aMessage The message sent by the client to the server */ { + OstTraceFunctionEntry0( CSBESESSION_RETURNPUBLICFILELISTRAWL_ENTRY ); __ASSERT_DEBUG(iTransferBuf, Panic(KErrArgument)); // return the previously allocated transfer buffer @@ -389,12 +412,14 @@ aMessage.Complete(KErrNone); ResetTransferBuf(); + OstTraceFunctionExit0( CSBESESSION_RETURNPUBLICFILELISTRAWL_EXIT ); } void CSBESession::PrepPublicFileListXMLL(const RMessage2& aMessage) /** */ { + OstTraceFunctionEntry0( CSBESESSION_PREPPUBLICFILELISTXMLL_ENTRY ); TPckgBuf driveNumPkg; TPckgBuf sidPkg; @@ -407,6 +432,7 @@ iTransferBuf = HBufC8::NewL(0); aMessage.Complete(iTransferBuf->Des().MaxSize()); + OstTraceFunctionExit0( CSBESESSION_PREPPUBLICFILELISTXMLL_EXIT ); } void CSBESession::ReturnPublicFileListXMLL(const RMessage2& aMessage) @@ -415,6 +441,7 @@ @param aMessage The message sent by the client to the server */ { + OstTraceFunctionEntry0( CSBESESSION_RETURNPUBLICFILELISTXMLL_ENTRY ); __ASSERT_DEBUG(iTransferBuf, Panic(KErrArgument)); // return the previously allocated transfer buffer @@ -423,6 +450,7 @@ aMessage.Complete(KErrNone); ResetTransferBuf(); + OstTraceFunctionExit0( CSBESESSION_RETURNPUBLICFILELISTXMLL_EXIT ); } void CSBESession::SetBURModeL(const RMessage2& aMessage) @@ -432,6 +460,7 @@ @param aMessage The message sent by the client to the server */ { + OstTraceFunctionEntry0( CSBESESSION_SETBURMODEL_ENTRY ); TDriveList driveList; aMessage.ReadL(0, driveList); @@ -445,6 +474,7 @@ Server().DataOwnerManager().SetBURModeL(driveList, burType, incType); aMessage.Complete(KErrNone); + OstTraceFunctionExit0( CSBESESSION_SETBURMODEL_EXIT ); } void CSBESession::SetSIDListForPartialBURL(const RMessage2& aMessage) @@ -454,6 +484,7 @@ @param aMessage The message sent by the client to the server */ { + OstTraceFunctionEntry0( CSBESESSION_SETSIDLISTFORPARTIALBURL_ENTRY ); HBufC8* flatArray = HBufC8::NewLC(aMessage.GetDesLengthL(0)); TPtr8 flatArrayPtr(flatArray->Des()); @@ -464,6 +495,7 @@ CleanupStack::PopAndDestroy(flatArray); aMessage.Complete(KErrNone); + OstTraceFunctionExit0( CSBESESSION_SETSIDLISTFORPARTIALBURL_EXIT ); } void CSBESession::PrepSIDStatusL(const RMessage2& aMessage) @@ -473,6 +505,7 @@ @param aMessage The message sent from the client to the server */ { + OstTraceFunctionEntry0( CSBESESSION_PREPSIDSTATUSL_ENTRY ); ResetTransferBuf(); iTransferBuf = HBufC8::NewL(aMessage.GetDesLengthL(0)); @@ -481,6 +514,7 @@ aMessage.ReadL(0, transBuf); aMessage.Complete(KErrNone); + OstTraceFunctionExit0( CSBESESSION_PREPSIDSTATUSL_EXIT ); } void CSBESession::ReturnSIDStatusL(const RMessage2& aMessage) @@ -490,6 +524,7 @@ @param aMessage The message sent from the client to the server */ { + OstTraceFunctionEntry0( CSBESESSION_RETURNSIDSTATUSL_ENTRY ); RSIDStatusArray* pStatusArray = RSIDStatusArray::InternaliseL(*iTransferBuf); CleanupStack::PushL(pStatusArray); CleanupClosePushL(*pStatusArray); @@ -508,6 +543,7 @@ aMessage.Complete(KErrNone); ResetTransferBuf(); + OstTraceFunctionExit0( CSBESESSION_RETURNSIDSTATUSL_EXIT ); } void CSBESession::RequestDataAsyncL(const RMessage2& aMessage) @@ -515,9 +551,9 @@ Handle the client's asynchronous request for data from the SBE */ { + OstTraceFunctionEntry0( CSBESESSION_REQUESTDATAASYNCL_ENTRY ); iMessage = aMessage; - __LOG("CSBESession::RequestDataAsyncL() - START"); TBool finished = EFalse; // Set by DOM, initialised to eliminate warning HBufC8* pTransferredBuf = HBufC8::NewLC(iMessage.GetDesLengthL(0)); @@ -542,8 +578,7 @@ CleanupStack::PopAndDestroy(pGenericType); Server().GSHInterface().Header(Server().GlobalSharedHeap()).iFinished = finished; - __LOG2("CSBESession::RequestDataAsyncL() - Server-side data length: %d, address: 0x%08x", writeBuf.Length(), writeBuf.Ptr()); - //__LOGDATA("CSBESession::RequestDataAsyncL() - %S", writeBuf.Ptr(), writeBuf.Length()); + OstTraceExt2(TRACE_NORMAL, CSBESESSION_REQUESTDATAASYNCL, "Server-side data length: %d, address: 0x%08x", static_cast(writeBuf.Length()), reinterpret_cast(writeBuf.Ptr())); Server().GSHInterface().Header(Server().GlobalSharedHeap()).SetLockedFlag(EFalse); @@ -552,7 +587,7 @@ iMessage.Complete(KErrNone); } - __LOG("CSBESession::RequestDataAsyncL() - END"); + OstTraceFunctionExit0( CSBESESSION_REQUESTDATAASYNCL_EXIT ); } void CSBESession::RequestDataSyncL(const RMessage2& aMessage) @@ -560,7 +595,8 @@ Handle the client's synchronous request for data from the SBE */ { - __LOG("CSBESession::RequestDataSyncL() - START"); + OstTraceFunctionEntry0( CSBESESSION_REQUESTDATASYNCL_ENTRY ); + TBool finished = EFalse; // Set by DOM, initialised to eliminate warning HBufC8* pTransferredBuf = HBufC8::NewLC(aMessage.GetDesLengthL(0)); @@ -587,11 +623,11 @@ Server().GSHInterface().Header(Server().GlobalSharedHeap()).iFinished = finished; Server().GSHInterface().Header(Server().GlobalSharedHeap()).SetLockedFlag(EFalse); - __LOG2("CSBESession::RequestDataSyncL() - Server-side data length: %d, address: 0x%08x", writeBuf.Length(), writeBuf.Ptr()); - //__LOGDATA("CSBESession::RequestDataSyncL() - %S", writeBuf.Ptr(), writeBuf.Length()); + OstTraceExt2(TRACE_NORMAL, CSBESESSION_REQUESTDATASYNCL, "Server-side data length: %d, address: 0x%08x", static_cast(writeBuf.Length()), reinterpret_cast(writeBuf.Ptr())); aMessage.Complete(KErrNone); - __LOG("CSBESession::RequestDataSyncL() - END"); + + OstTraceFunctionExit0( CSBESESSION_REQUESTDATASYNCL_EXIT ); } void CSBESession::SupplyDataSyncL(const RMessage2& aMessage) @@ -599,7 +635,8 @@ Handle the client's synchronous request to supply data to the SBE */ { - __LOG("CSBESession::SupplyDataSyncL() - START"); + OstTraceFunctionEntry0( CSBESESSION_SUPPLYDATASYNCL_ENTRY ); + TBool finished = aMessage.Int0(); CSBGenericTransferType* pGenericType = CSBGenericTransferType::NewL( @@ -610,8 +647,7 @@ TPtrC8& readBuf = Server().GSHInterface().ReadBufferL(Server().GlobalSharedHeap()); Server().GSHInterface().Header(Server().GlobalSharedHeap()).SetLockedFlag(ETrue); - __LOG2("CSBESession::SupplyDataSyncL() - Server-side data length: %d, address: 0x%08x", readBuf.Length(), readBuf.Ptr()); - //__LOGDATA("CSBESession::SupplyDataSyncL() - %S", readBuf.Ptr(), readBuf.Length()); + OstTraceExt2(TRACE_NORMAL, CSBESESSION_SUPPLYDATASYNCL, "Server-side data length: %d, address: 0x%08x", static_cast(readBuf.Length()), reinterpret_cast(readBuf.Ptr())); Server().DataOwnerManager().SupplyDataL(pGenericType, readBuf, finished); @@ -621,7 +657,8 @@ Server().GSHInterface().Header(Server().GlobalSharedHeap()).SetLockedFlag(EFalse); aMessage.Complete(KErrNone); - __LOG("CSBESession::SupplyDataSyncL() - END"); + + OstTraceFunctionExit0( CSBESESSION_SUPPLYDATASYNCL_EXIT ); } void CSBESession::GetExpectedDataSizeL(const RMessage2& aMessage) @@ -629,6 +666,7 @@ Return the size of data that the DOM expects to send back to the PC */ { + OstTraceFunctionEntry0( CSBESESSION_GETEXPECTEDDATASIZEL_ENTRY ); TUint size; TPckg sizePkg(size); @@ -651,15 +689,18 @@ aMessage.WriteL(1, sizePkg); aMessage.Complete(KErrNone); + OstTraceFunctionExit0( CSBESESSION_GETEXPECTEDDATASIZEL_EXIT ); } void CSBESession::AllSnapshotsSuppliedL(const RMessage2& aMessage) /** */ { + OstTraceFunctionEntry0( CSBESESSION_ALLSNAPSHOTSSUPPLIEDL_ENTRY ); Server().DataOwnerManager().AllSnapshotsSuppliedL(); aMessage.Complete(KErrNone); + OstTraceFunctionExit0( CSBESESSION_ALLSNAPSHOTSSUPPLIEDL_EXIT ); } void CSBESession::AllSystemFilesRestoredL() @@ -668,7 +709,9 @@ @param aMessage IPC message sent from the client */ { + OstTraceFunctionEntry0( CSBESESSION_ALLSYSTEMFILESRESTOREDL_ENTRY ); Server().DataOwnerManager().AllSystemFilesRestoredL(); + OstTraceFunctionExit0( CSBESESSION_ALLSYSTEMFILESRESTOREDL_EXIT ); } void CSBESession::PrepLargePublicFileListL(const RMessage2& aMessage) @@ -677,6 +720,7 @@ @param aMessage The message sent by the client to the server */ { + OstTraceFunctionEntry0( CSBESESSION_PREPLARGEPUBLICFILELISTL_ENTRY ); HBufC8* pGenericDataTypeBuffer = HBufC8::NewLC(aMessage.GetDesLengthL(1)); TPtr8 genericDataTypeBuffer(pGenericDataTypeBuffer->Des()); @@ -721,7 +765,7 @@ } default: { - __LOG1("Unknown generic data type supplied, leaving with KErrUnknown (%d)", KErrUnknown); + OstTrace1(TRACE_ERROR, CSBESESSION_PREPLARGEPUBLICFILELISTL, "Unknown generic data type supplied, leaving with KErrUnknown (%d)", KErrUnknown); User::Leave(KErrUnknown); } } @@ -734,7 +778,8 @@ // This is required to look up the MIME type of the file entry and convert it into a textual representation RApaLsSession apaSession; - User::LeaveIfError(apaSession.Connect()); + TInt err = apaSession.Connect(); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP2_CSBESESSION_PREPLARGEPUBLICFILELISTL, "error = %d", err)); CleanupClosePushL(apaSession); // Copy file entries from the cursor until either the end of the list is reached or the @@ -794,7 +839,7 @@ } } CleanupStack::PopAndDestroy(&apaSession); - __LOG2("CSBESession::PrepLargePublicFileListL() - Server-side data length: %d, address: 0x%08x", writeBuf.Length(), writeBuf.Ptr()); + OstTraceExt2(TRACE_NORMAL, DUP1_CSBESESSION_PREPLARGEPUBLICFILELISTL, "Server-side data length: %d, address: 0x%08x", static_cast(writeBuf.Length()), reinterpret_cast(writeBuf.Ptr())); Server().GSHInterface().Header(Server().GlobalSharedHeap()).iFinished = iFinished; @@ -804,23 +849,27 @@ CleanupStack::PopAndDestroy(pGenericDataType); aMessage.Complete(KErrNone); + OstTraceFunctionExit0( CSBESESSION_PREPLARGEPUBLICFILELISTL_EXIT ); } void CSBESession::ReturnLargePublicFileListL(const RMessage2& aMessage) /** Return the previously populated buffer to the client @param aMessage The message sent by the client to the server */ { + OstTraceFunctionEntry0( CSBESESSION_RETURNLARGEPUBLICFILELISTL_ENTRY ); TPckg finPkg(iFinished); TPckg totalPkg(iTotalEntries); aMessage.WriteL(0, finPkg); aMessage.WriteL(1, totalPkg); aMessage.Complete(KErrNone); + OstTraceFunctionExit0( CSBESESSION_RETURNLARGEPUBLICFILELISTL_EXIT ); } void CSBESession::ResetTransferBuf() /** */ { + OstTraceFunctionEntry0( CSBESESSION_RESETTRANSFERBUF_ENTRY ); if (iTransferBuf != NULL) { delete iTransferBuf; @@ -834,5 +883,6 @@ } iArrayCount = 0; + OstTraceFunctionExit0( CSBESESSION_RESETTRANSFERBUF_EXIT ); } } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbheapwrapper.cpp --- a/backupandrestore/backupengine/src/sbheapwrapper.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbheapwrapper.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,6 +22,11 @@ #include "sbheapwrapper.h" #include "sbepanic.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbheapwrapperTraces.h" +#endif namespace conn { @@ -32,8 +37,10 @@ @return pointer to a newly created CHeapWrapper object */ { + OstTraceFunctionEntry0( CHEAPWRAPPER_NEWL_ENTRY ); CHeapWrapper* self = new (ELeave) CHeapWrapper(); + OstTraceFunctionExit0( CHEAPWRAPPER_NEWL_EXIT ); return self; } @@ -45,8 +52,10 @@ @return reference to the descriptor stored on the global shared heap */ { + OstTraceFunctionEntry0( CHEAPWRAPPER_READBUFFERL_ENTRY ); if (Header(aChunk).LockedFlag()) { + OstTrace0(TRACE_ERROR, CHEAPWRAPPER_READBUFFERL, "Leave: KErrInUse"); User::Leave(KErrInUse); } @@ -54,6 +63,7 @@ iReadBuf = new (ELeave) TPtrC8(Buffer(aChunk)); + OstTraceFunctionExit0( CHEAPWRAPPER_READBUFFERL_EXIT ); return *iReadBuf; } @@ -65,8 +75,10 @@ @return reference to the descriptor stored on the global shared heap */ { + OstTraceFunctionEntry0( CHEAPWRAPPER_WRITEBUFFERL_ENTRY ); if (Header(aChunk).LockedFlag()) { + OstTrace0(TRACE_ERROR, CHEAPWRAPPER_WRITEBUFFERL, "Leave: KErrInUse"); User::Leave(KErrInUse); } @@ -77,6 +89,7 @@ // Blank the descriptor as it's a write buffer des.Zero(); + OstTraceFunctionExit0( CHEAPWRAPPER_WRITEBUFFERL_EXIT ); return des; } @@ -99,6 +112,7 @@ @return KErrNone always. */ { + OstTraceFunctionEntry0( CHEAPWRAPPER_RESETHEAP_ENTRY ); TInt err = KErrNone; TUint8* heapPtr = aChunk.Base(); @@ -111,6 +125,7 @@ // placement new a new descriptor on the heap to initialise it new (heapPtr + KDescriptorOffset) TPtr8(heapPtr + KDataOffset, 0, aChunk.Size() - KDataOffset); + OstTraceFunctionExit0( CHEAPWRAPPER_RESETHEAP_EXIT ); return err; } @@ -120,6 +135,7 @@ @return reference to the descriptor stored on the global shared heap */ { + OstTraceFunctionEntry0( CHEAPWRAPPER_BUFFER_ENTRY ); TUint8* heapPtr = aChunk.Base(); // Set the descriptor @@ -128,6 +144,7 @@ const TInt maxLength = descriptor->MaxLength(); descriptor->Set(heapPtr + KDataOffset, length, maxLength); + OstTraceFunctionExit0( CHEAPWRAPPER_BUFFER_EXIT ); return *descriptor; } @@ -136,12 +153,16 @@ Delete and NULL the read buffer if necessary */ { + OstTraceFunctionEntry0( CHEAPWRAPPER_CLEANREADBUFFER_ENTRY ); delete iReadBuf; iReadBuf = NULL; + OstTraceFunctionExit0( CHEAPWRAPPER_CLEANREADBUFFER_EXIT ); } CHeapWrapper::~CHeapWrapper() { + OstTraceFunctionEntry0( CHEAPWRAPPER_CHEAPWRAPPER_DES_ENTRY ); CleanReadBuffer(); + OstTraceFunctionExit0( CHEAPWRAPPER_CHEAPWRAPPER_DES_EXIT ); } } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sblog.cpp --- a/backupandrestore/backupengine/src/sblog.cpp Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,157 +0,0 @@ -// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies). -// All rights reserved. -// This component and the accompanying materials are made available -// under the terms of "Eclipse Public License v1.0" -// which accompanies this distribution, and is available -// at the URL "http://www.eclipse.org/legal/epl-v10.html". -// -// Initial Contributors: -// Nokia Corporation - initial contribution. -// -// Contributors: -// -// Description: -// Implementation of logging functions -// -// - -/** - @file -*/ - -#include "sblog.h" - -namespace conn - { - - namespace securebackuplog - { - #if (defined(SBE_LOGGING_DEBUG_ONLY) && defined(_DEBUG)) || defined(SBE_LOGGING_DEBUG_AND_RELEASE) - - /** The flogger directory - @internalComponent */ - _LIT(KLogDirectory,"connect"); - - /** The flogger file - @internalComponent */ - _LIT(KLogFile, "securebackup.txt"); - - /** The maximum length of text that can be logged - @internalComponent */ - const TInt KMaxLogData = 0x200; - - void __LogRaw( TDes& aData ) - /** Performs the logging operation based upon SBEngine.mmh macro configuration - @param aData The data to be logged - */ - { - #if defined(SBE_LOGGING_METHOD_FLOGGER) - RFileLogger::Write(KLogDirectory, KLogFile, EFileLoggingModeAppend, aData); - #endif - - #if defined(SBE_LOGGING_METHOD_RDEBUG) || defined(SBE_LOGGING_METHOD_UI) - - /** The logging component name - @internalComponent */ - _LIT(KLogComponentName, "[SBE] "); - - aData.Insert( 0, KLogComponentName ); - - #if defined( SBE_LOGGING_METHOD_UI ) - User::InfoPrint( aData ); - #endif - #if defined( SBE_LOGGING_METHOD_RDEBUG ) - RDebug::Print( _L("%S"), &aData ); - #endif - #endif - } - - - - - void __Log( TRefByValue aFmt, ... ) - /** Logs a message to FLOGGER and to the UI depending on - controlling macros. - - Note that FLOG macros are probably disabled in release builds, - so we might need to use something else for logging to files - - @internalComponent - @param aFmt The formatting codes - */ - { - VA_LIST list; - VA_START(list,aFmt); - - TBuf< KMaxLogData > buf; - buf.FormatList(aFmt,list); - - __LogRaw( buf ); - } - - - void __DebugDump( const TDesC& aFormat, const TUint8* aAddress, TInt aLength ) - /** Logs binary data as ASCII (hex encoded). Useful for debugging data transfer - @param aFormat The format specifier, must always include a string format identifer, i.e. %S - @param aAddress The starting memory address containing data that is to be logged - @param aLength The amount of data (in bytes) to log, starting at aAddress - */ - { - _LIT( KEndOfAddressText, ": "); - _LIT( KDoubleSpace, " " ); - _LIT( KSingleSpace, " " ); - - TInt len = aLength; - const TInt maxLen = aLength; - const TUint8* pDataAddr = aAddress; - - TBuf formatBuffer; - TBuf<81> out; - TBuf<20> ascii; - TInt offset = 0; - const TUint8* a = pDataAddr; - // - while(len>0) - { - out.Zero(); - ascii.Zero(); - out.AppendNumFixedWidth((TUint) a, EHex, 8); - out.Append( KEndOfAddressText ); - - TUint b; - for (b=0; b<16; b++) - { - TUint8 c = ' '; - if ((pDataAddr + offset + b) < pDataAddr + maxLen) - { - c = *(pDataAddr + offset + b); - out.AppendNumFixedWidth(c, EHex, 2); - } - else - { - out.Append( KDoubleSpace ); - } - - out.Append( KSingleSpace ); - - if (c<0x20 || c>=0x7f || c=='%') - c=0x2e; - - ascii.Append(TChar(c)); - } - - out.Append(ascii); - out.ZeroTerminate(); - - formatBuffer.Format( aFormat, &out ); - __LogRaw( formatBuffer ); - - a += 16; - offset += 16; - len -= 16; - } - } - - #endif - }//securebackuplog - } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbmain.cpp --- a/backupandrestore/backupengine/src/sbmain.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbmain.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,16 +20,19 @@ */ #include "sbmain.h" -#include "sblog.h" #include "sbeserver.h" #include "abserver.h" #include #include "sbedataownermanager.h" #include "ecom/ecom.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbmainTraces.h" +#endif namespace conn - { - + { void CSBActiveScheduler::Error(TInt aError) const /** Executed by the active scheduler when an error occurs. Ideally errors @@ -42,8 +45,10 @@ @param aError The error code */ { + OstTraceFunctionEntry0( CSBACTIVESCHEDULER_ERROR_ENTRY ); RDebug::Print(_L("Secure Backup unhandled error %d"), aError); Stop(); + OstTraceFunctionExit0( CSBACTIVESCHEDULER_ERROR_EXIT ); } } @@ -63,6 +68,7 @@ @leave RThread::Rename() If an error is returned */ { + OstTraceFunctionEntry0( _CONN_RUNSERVERL_ENTRY ); // // Create and install an active scheduler. CSBActiveScheduler* pScheduler = new (ELeave) CSBActiveScheduler(); @@ -100,6 +106,7 @@ CleanupStack::PopAndDestroy(pSBEServer); CleanupStack::PopAndDestroy(pDOM); CleanupStack::PopAndDestroy(pScheduler); + OstTraceFunctionExit0( _CONN_RUNSERVERL_EXIT ); } @@ -111,6 +118,7 @@ @return Any error trapped by RunServerL */ { + OstTraceFunctionEntry0( _CONN_RUNSERVER_ENTRY ); __UHEAP_MARK; CTrapCleanup* pCleanup = CTrapCleanup::New(); TInt nRet = KErrNoMemory; @@ -145,6 +153,7 @@ REComSession::FinalClose(); __UHEAP_MARKEND; + OstTraceFunctionExit0( _CONN_RUNSERVER_EXIT ); return nRet; } @@ -159,10 +168,12 @@ @return Symbian OS internal value. */ { + OstTraceFunctionEntry0( _E32MAIN_ENTRY ); TInt nRet = KErrNone; nRet = RunServer(); + OstTraceFunctionExit0( _E32MAIN_EXIT ); return nRet; } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbpackagedatatransfer.cpp --- a/backupandrestore/backupengine/src/sbpackagedatatransfer.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbpackagedatatransfer.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #include "sbedataowner.h" #include "sbebufferhandler.h" #include "sbpackagedatatransfer.h" -#include "sblog.h" #include #include @@ -30,6 +29,11 @@ #include #include "sbeparserdefs.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbpackagedatatransferTraces.h" +#endif namespace conn { @@ -46,8 +50,10 @@ @return a CPackageDataTransfer object */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_NEWL_ENTRY ); CPackageDataTransfer* self = CPackageDataTransfer::NewLC(aPid, aDOM); CleanupStack::Pop(self); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_NEWL_EXIT ); return self; } @@ -58,9 +64,11 @@ @return a CPackageDataTransfer object */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_NEWLC_ENTRY ); CPackageDataTransfer *self = new(ELeave) CPackageDataTransfer(aPid, aDOM); CleanupStack::PushL(self); self->ConstructL(); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_NEWLC_EXIT ); return self; } @@ -73,30 +81,39 @@ iBufferFileWriter(NULL), iBufferSnapshotWriter(NULL), iPackageID(aPid), iSnapshot(NULL), iMetaData(NULL), ipDataOwnerManager(aDOM), iRestored(EFalse) { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_CPACKAGEDATATRANSFER_CONS_ENTRY ); // needed for intiliazion iDriveList.SetLength(KMaxDrives); iDriveList.FillZ(); // needed for hashes in registry on drive C (i.e. MMC card app's hash) iDriveList[EDriveC] = ETrue; + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_CPACKAGEDATATRANSFER_CONS_EXIT ); } void CPackageDataTransfer::ConstructL() /** Standard Symbian second phase constructor */ { - User::LeaveIfError(iSWIRestore.Connect()); - User::LeaveIfError(iSWIBackup.Connect()); - User::LeaveIfError(iFs.Connect()); - User::LeaveIfError(iFs.ShareProtected()); + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_CONSTRUCTL_ENTRY ); + TInt err = iSWIRestore.Connect(); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, CPACKAGEDATATRANSFER_CONSTRUCTL, "error = %d", err)); + err = iSWIBackup.Connect(); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP1_CPACKAGEDATATRANSFER_CONSTRUCTL, "error = %d", err)); + err = iFs.Connect(); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP2_CPACKAGEDATATRANSFER_CONSTRUCTL, "error = %d", err)); + err = iFs.ShareProtected(); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP3_CPACKAGEDATATRANSFER_CONSTRUCTL, "error = %d", err)); iRegistrationFile = HBufC::NewL(0); iFileName = HBufC::NewL(KMaxFileName); iTempFileName = HBufC::NewL(KMaxFileName); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_CONSTRUCTL_EXIT ); } CPackageDataTransfer::~CPackageDataTransfer() /** Standard C++ Destructor */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_CPACKAGEDATATRANSFER_DES_ENTRY ); iSWIRestore.Close(); iSWIBackup.Close(); iFileHandle.Close(); @@ -112,6 +129,7 @@ delete iFileName; delete iTempFileName; iFs.Close(); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_CPACKAGEDATATRANSFER_DES_EXIT ); } @@ -124,11 +142,13 @@ @param aSize Size of the aItem */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_WRITEDATA_ENTRY ); TUint8 *pos = reinterpret_cast(aItem); for (TInt i = 0; i < aSize; ++i) { aBuffer.Append(pos[i]); } + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_WRITEDATA_EXIT ); } TUid CPackageDataTransfer::PackageId() const @@ -149,7 +169,7 @@ @param aFileNames on return the list of files */ { - __LOG("CPackageDataTransfer::BuildPackageFileListL() - START"); + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_BUILDPACKAGEFILELIST_ENTRY ); // Establish a connection to the registry and read the list of // filenames into array. // @@ -160,7 +180,7 @@ iDriveList[EDriveC] = ETrue; TUint count = iFiles.Count(); - __LOG1("CPackageDataTransfer::BuildPackageFileListL() - No of files: %d", count); + OstTrace1(TRACE_NORMAL, CPACKAGEDATATRANSFER_BUILDPACKAGEFILELIST, "No of files: %d", count); while (count > 0) { count--; @@ -213,20 +233,17 @@ } // for - #ifdef SBE_LOGGING_ENABLED - const TUint fNameCount = iFiles.Count(); - if (fNameCount) - { - for(TUint k=0; k(k), file); + } + } - - __LOG("CPackageDataTransfer::BuildPackageFileListL() - END"); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_BUILDPACKAGEFILELIST_EXIT ); } @@ -238,7 +255,8 @@ @param aSize on return the size of the data */ { - __LOG("CPackageDataTransfer::GetExpectedDataSizeL - Begin getmetadata"); + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL_ENTRY ); + OstTrace0(TRACE_NORMAL, CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "Begin getmetadata"); if (iMetaData == NULL) { TRAPD(err, iMetaData = iSWIBackup.GetMetaDataL(iPackageID, iFiles)); @@ -246,24 +264,26 @@ if(KErrNotSupported == err) {//Non-Removable package, nothing to backup aSize = 0; - __LOG("CPackageDataTransfer::GetExpectedDataSizeL - GetMetaDataL - KErrNotSupported"); + OstTrace0(TRACE_NORMAL, DUP1_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "GetMetaDataL - KErrNotSupported"); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL_EXIT ); return; } else if(KErrNone != err) { - __LOG1("CPackageDataTransfer::GetExpectedDataSizeL - GetMetaDataL leave with %d", err); + OstTrace1(TRACE_ERROR, DUP2_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "GetMetaDataL leave with %d", err); User::Leave(err); } iMetaDataSize = iMetaData->Size(); BuildPackageFileList(); } - __LOG("CPackageDataTransfer::GetExpectedDataSizeL - End getmetadata"); + OstTrace0(TRACE_NORMAL, DUP3_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "End getmetadata"); if (!IsDataOnDrive(aDriveNumber)) { // no data on drive aSize = 0; + OstTraceFunctionExit0( DUP1_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL_EXIT ); return; } @@ -274,15 +294,15 @@ { case ESystemSnapshotData: { - __LOG1("CPackageDataTransfer::GetExpectedDataSizeL() - START - ESystemSnapshotData - aDriveNumber: %c", aDriveNumber + 'A'); + OstTraceExt1(TRACE_NORMAL, DUP4_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "ESystemSnapshotData - aDriveNumber: %c", aDriveNumber + 'A'); // Find all files aSize = (count * sizeof(TSnapshot)); - __LOG1("CPackageDataTransfer::GetExpectedDataSizeL() - passive snapshot count: %d", count); + OstTrace1(TRACE_NORMAL, DUP5_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "passive snapshot count: %d", count); for (TUint x = 0; x < count; x++) { const TDesC& fileName = *iFiles[x]; const TInt fileSize = fileName.Length();; - __LOG2("CPackageDataTransfer::GetExpectedDataSizeL() - passive snapshot file: %S, size: %d", &fileName, fileSize); + OstTraceExt2(TRACE_NORMAL, DUP6_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "passive snapshot file: %S, size: %d", fileName, fileSize); aSize += fileSize; } // for x @@ -290,18 +310,18 @@ } case ESystemData: { - __LOG1("CPackageDataTransfer::GetExpectedDataSizeL() - START - ESystemData - aDriveNumber: %c", aDriveNumber + 'A'); + OstTraceExt1(TRACE_NORMAL, DUP7_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "ESystemData - aDriveNumber: %c", aDriveNumber + 'A'); aSize += sizeof(TInt); TEntry entry; - __LOG1("CPackageDataTransfer::GetExpectedDataSizeL() - passive file count: %d", count); + OstTrace1(TRACE_NORMAL, DUP8_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "passive file count: %d", count); for (TUint x = 0; x < count; x++) { const TDesC& fileName = *iFiles[x]; TInt err = iFs.Entry(fileName, entry); TUint fileSize = entry.iSize; - __LOG2("CPackageDataTransfer::GetExpectedDataSizeL() - passive file: %S, size: %d", &fileName, fileSize); + OstTraceExt2(TRACE_NORMAL, DUP9_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "passive file: %S, size: %d", fileName, static_cast(fileSize)); switch(err) { case KErrNone: @@ -310,9 +330,10 @@ case KErrNotFound: case KErrPathNotFound: case KErrBadName: - __LOG2("CPackageDataTransfer::GetExpectedDataSizeL() - error getting passive file: %S, error: %d", &fileName, err); + OstTraceExt2(TRACE_NORMAL, DUP10_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "error getting passive file: %S, error: %d", fileName, err); break; default: + OstTrace1(TRACE_ERROR, DUP13_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "Leave: %d", err); User::Leave(err); } } @@ -321,11 +342,12 @@ } default: { - __LOG2("CPackageDataTransfer::GetExpectedDataSizeL() - No case for TransferType: %d, data owner 0x%08x", aTransferType, iPackageID.iUid); + OstTraceExt2(TRACE_ERROR, DUP11_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "No case for TransferType: %d, data owner 0x%08x", static_cast(aTransferType), iPackageID.iUid); User::Leave(KErrNotSupported); } } // switch - __LOG2("CPackageDataTransfer::GetExpectedDataSizeL() - END - size is: %d, data owner 0x%08x", aSize, iPackageID.iUid); + OstTraceExt2(TRACE_NORMAL, DUP12_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL, "size is: %d, data owner 0x%08x", static_cast(aSize), iPackageID.iUid); + OstTraceFunctionExit0( DUP2_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL_EXIT ); } void CPackageDataTransfer::RequestDataL(TDriveNumber aDriveNumber, @@ -342,8 +364,9 @@ data. */ { - __LOG6("CPackageDataTransfer::RequestDataL() - START - aDrive: %c, aTransferType: %d, iSecureId: 0x%08x, iState.iState: %d, iState.iTransferType: %d, aBuffer.Length(): %d", aDriveNumber + 'A', aTransferType, iPackageID.iUid, iState.iState, iState.iTransferType, aBuffer.Length()); - //__LOGDATA("CPackageDataTransfer::RequestDataL() - %S", aBuffer.Ptr(), aBuffer.Length() ); + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_REQUESTDATAL_ENTRY ); + OstTraceExt3(TRACE_NORMAL, CPACKAGEDATATRANSFER_REQUESTDATAL, "aDrive: %c, aTransferType: %d, iSecureId: 0x%08x", static_cast(aDriveNumber + 'A'), static_cast(aTransferType), static_cast(iPackageID.iUid)); + OstTraceExt3(TRACE_NORMAL, DUP4_CPACKAGEDATATRANSFER_REQUESTDATAL, "iState.iState: %d, iState.iTransferType: %d, aBuffer.Length(): %d", static_cast(iState.iState), static_cast(iState.iTransferType), static_cast(aBuffer.Length())); TInt err = KErrNone; @@ -356,6 +379,7 @@ iState.iState = ENone; aLastSection = ETrue; Cleanup(); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_REQUESTDATAL_EXIT ); return; } else if(KErrNone != err) @@ -363,6 +387,7 @@ iState.iState = ENone; aLastSection = ETrue; Cleanup(); + OstTrace1(TRACE_ERROR, DUP3_CPACKAGEDATATRANSFER_REQUESTDATAL, "Leave: %d", err); User::Leave(err); } @@ -375,7 +400,7 @@ ((iState.iState == ERequest) && (iState.iDriveNumber == aDriveNumber) && (iState.iTransferType == aTransferType)))) { - __LOG("CPackageDataTransfer::RequestDataL() - bad state => ERROR => KErrNotReady"); + OstTrace0(TRACE_ERROR, DUP1_CPACKAGEDATATRANSFER_REQUESTDATAL, "bad state => ERROR => KErrNotReady"); User::Leave(KErrNotReady); } @@ -408,10 +433,11 @@ { iState.iState = ENone; Cleanup(); - __LOG1("CPackageDataTransfer::RequestDataL() - Left with error: %d", err); + OstTrace1(TRACE_ERROR, DUP2_CPACKAGEDATATRANSFER_REQUESTDATAL, "Leave with error: %d", err); User::Leave(err); } // if - __LOG("CPackageDataTransfer::RequestDataL() - END"); + + OstTraceFunctionExit0( DUP1_CPACKAGEDATATRANSFER_REQUESTDATAL_EXIT ); } @@ -423,11 +449,13 @@ @param aSize the size of the item to fill */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_READDATA_ENTRY ); TUint8* pos = reinterpret_cast(aDestinationAddress); for (TInt i = 0; i < aSize; ++i) { pos[i] = aBuffer[i]; } + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_READDATA_EXIT ); } void CPackageDataTransfer::SupplyFileDataL( const TDesC8& aBuffer, TBool aLastSection) @@ -437,7 +465,8 @@ @param aLastSection has all data been supplied */ { - __LOG1("CPackageDataTransfer::SupplyFileDataL() - START - aLastSection: %d", aLastSection); + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_SUPPLYFILEDATAL_ENTRY ); + OstTrace1(TRACE_NORMAL, CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "aLastSection: %d", aLastSection); TUint8* current = const_cast(aBuffer.Ptr()); const TUint8* end = current + aBuffer.Size(); while (current < end) @@ -446,17 +475,17 @@ { if (ReadFromBufferF(iFixedHeader, current, end) == EFalse) { - __LOG("CPackageDataTransfer::SupplyFileDataL() - ReadFromBufferF() returned False so breaking!"); + OstTrace0(TRACE_NORMAL, DUP1_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "ReadFromBufferF() returned False so breaking!"); break; } // if - __LOG1("CPackageDataTransfer::SupplyFileDataL() - fixed header - iFileNameLength: %d", iFixedHeader.iFileNameLength); - __LOG1("CPackageDataTransfer::SupplyFileDataL() - fixed header - iFileSize: %d", iFixedHeader.iFileSize); - __LOG1("CPackageDataTransfer::SupplyFileDataL() - fixed header - iAttributes: %d", iFixedHeader.iAttributes); + OstTrace1(TRACE_NORMAL, DUP2_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "fixed header - iFileNameLength: %d", iFixedHeader.iFileNameLength); + OstTrace1(TRACE_NORMAL, DUP3_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "fixed header - iFileSize: %d", iFixedHeader.iFileSize); + OstTrace1(TRACE_NORMAL, DUP4_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "fixed header - iAttributes: %d", iFixedHeader.iAttributes); if ((iFixedHeader.iFileNameLength > KMaxFileName) || (!iFixedHeader.iFileNameLength)) { - __LOG1("CBufferFileReader::SupplyFileDataL() - Leaving - iFileNameLength: %d more then MaxLength", iFixedHeader.iFileNameLength); + OstTrace1(TRACE_ERROR, DUP5_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "Leave with KErrOverflow - iFileNameLength: %d more then MaxLength", iFixedHeader.iFileNameLength); User::Leave(KErrOverflow); } @@ -469,20 +498,20 @@ if (ReadFromBufferV(ptr, iFixedHeader.iFileNameLength * KCharWidthInBytes, current, end) == EFalse) { iBytesRead = ptr.Size(); - __LOG1("CPackageDataTransfer::SupplyFileDataL() - ReadFromBufferV() returned False - Filename bytes read: %d", iBytesRead); + OstTrace1(TRACE_NORMAL, DUP6_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "ReadFromBufferV() returned False - Filename bytes read: %d", iBytesRead); break; } // if if (iFixedHeader.iFileNameLength > KMaxFileName) { - __LOG("CBufferFileReader::SupplyFileDataL() - Leave with KErrOverflow"); + OstTrace0(TRACE_ERROR, DUP7_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "Leave with KErrOverflow"); User::Leave(KErrOverflow); } iFileName->Des().SetLength(iFixedHeader.iFileNameLength); iFileNameRead = ETrue; - __LOG1("CPackageDataTransfer::SupplyFileDataL() - FileName: %S", iFileName); + OstTraceExt1(TRACE_NORMAL, DUP8_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "FileName: %S", *iFileName); } if (!iFileOpen) @@ -506,7 +535,7 @@ if (tempErr != KErrNone) { - __LOG2("CPackageDataTransfer::SupplyFileDataL() - Left creating temp file in: %S , with %d", &tempPath, tempErr); + OstTraceExt2(TRACE_ERROR, DUP9_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "Leave while creating temp file in: %S , with %d", tempPath, tempErr); User::Leave(tempErr); } @@ -515,16 +544,19 @@ } // Write to the file + TInt err; TInt filesize; iFileHandle.Size(filesize); if ((end - current) >= (iFixedHeader.iFileSize - filesize)) { TPtr8 ptr(current, iFixedHeader.iFileSize - filesize, iFixedHeader.iFileSize - filesize); - User::LeaveIfError(iFileHandle.Write(ptr)); + err = iFileHandle.Write(ptr); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP13_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "error = %d", err)); // Write the attributes & modified time - User::LeaveIfError(iFileHandle.Set(iFixedHeader.iModified, iFixedHeader.iAttributes, KEntryAttNormal)); + err = iFileHandle.Set(iFixedHeader.iModified, iFixedHeader.iAttributes, KEntryAttNormal); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP14_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "error = %d", err)); TInt err = KErrNone; if (((*iFileName).FindC(KPrimaryBackupRegistrationFile) >= 0) || @@ -532,14 +564,16 @@ ((*iFileName).MatchC(KResource) >= 0) || ((*iFileName).MatchC(KImport) >= 0) ) { - __LOG("CPackageDataTransfer::SupplyFileDataL() - about to call RestoreFileL()"); + OstTrace0(TRACE_NORMAL, DUP10_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "about to call RestoreFileL()"); TRAP(err, iSWIRestore.RestoreFileL(iFileHandle, *iFileName)); - __LOG1("CPackageDataTransfer::SupplyFileDataL() - RestoreFileL() - err :%d", err); + OstTrace1(TRACE_NORMAL, DUP11_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "RestoreFileL() - err :%d", err); } else if ((*iFileName).MatchC(KPrivateMatch) >= 0) { - User::LeaveIfError(iFs.MkDirAll((*iFileName))); - User::LeaveIfError(iFileHandle.Rename((*iFileName))); + err = iFs.MkDirAll((*iFileName)); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP15_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "error = %d", err)); + err = iFileHandle.Rename((*iFileName)); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP16_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "error = %d", err)); } @@ -566,16 +600,19 @@ { TInt fsize = end - current; TPtr8 ptr(current, fsize, fsize); - User::LeaveIfError(iFileHandle.Write(ptr)); + err = iFileHandle.Write(ptr); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP17_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "error = %d", err)); break; } } // while if (aLastSection && iFileOpen) { + OstTrace0(TRACE_ERROR, DUP12_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL, "Leave with KErrUnderflow"); User::Leave(KErrUnderflow); } // if - __LOG("CPackageDataTransfer::SupplyFileDataL() - END"); + + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_SUPPLYFILEDATAL_EXIT ); } // SupplyFileDataL void CPackageDataTransfer::SupplyDataL(TDriveNumber aDriveNumber, @@ -590,7 +627,8 @@ @param aLastSection is this the last section */ { - __LOG5("CPackageDataTransfer::SupplyDataL() - START - aDrive: %c, aTransferType: %d, iSecureId: 0x%08x, iState.iState: %d, iState.iTransferType: %d", aDriveNumber + 'A', aTransferType, iPackageID.iUid, iState.iState, iState.iTransferType); + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_SUPPLYDATAL_ENTRY ); + OstTraceExt5(TRACE_NORMAL, CPACKAGEDATATRANSFER_SUPPLYDATAL, "aDrive: %c, aTransferType: %d, iSecureId: 0x%08x, iState.iState: %d, iState.iTransferType: %d", aDriveNumber + 'A', aTransferType, iPackageID.iUid, iState.iState, iState.iTransferType); if (!iRestored) { @@ -599,7 +637,7 @@ ((iState.iState == ESupply || iState.iState == EBuffer) && (iState.iDriveNumber == aDriveNumber) && (iState.iTransferType == aTransferType)))) { - __LOG("CPackageDataTransfer::SupplyDataL() - bad state => ERROR => KErrNotReady"); + OstTrace0(TRACE_ERROR, DUP1_CPACKAGEDATATRANSFER_SUPPLYDATAL, "bad state => ERROR => KErrNotReady"); User::Leave(KErrNotReady); } @@ -635,15 +673,15 @@ { Cleanup(); iSWIRestore.Close(); - User::LeaveIfError(iSWIRestore.Connect()); + TInt err1 = iSWIRestore.Connect(); + LEAVEIFERROR(err1, OstTrace1(TRACE_ERROR, DUP3_CPACKAGEDATATRANSFER_SUPPLYDATAL, "error = %d", err1)); } - __LOG1("CPackageDataTransfer::SupplyDataL() - Left with error: %d", err); + OstTrace1(TRACE_ERROR, DUP2_CPACKAGEDATATRANSFER_SUPPLYDATAL, "Left with error: %d", err); User::Leave(err); } //else } - __LOG("CPackageDataTransfer::SupplyDataL() - END"); - + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_SUPPLYDATAL_EXIT ); } void CPackageDataTransfer::DoSupplyDataL(TDriveNumber /*aDriveNumber*/, const TDesC8& aBuffer, TBool aLastSection) @@ -654,8 +692,8 @@ @param aLastSection was this the last section of data */ { - __LOG3("CPackageDataTransfer::DoSupplyDataL() - START - aBuffer length: %d, aLastSection: %d, iState: %d", aBuffer.Length(), aLastSection, iState.iState); - //__LOGDATA("CPackageDataTransfer::DoSupplyDataL() - %S", aBuffer.Ptr(), Min( aBuffer.Length(), 1024 )); + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_DOSUPPLYDATAL_ENTRY ); + OstTraceExt3(TRACE_NORMAL, CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "aBuffer length: %d, aLastSection: %d, iState: %d", aBuffer.Length(), aLastSection, iState.iState); TInt currentPos = 0; const TInt sourceBufferLength = aBuffer.Length(); @@ -664,20 +702,20 @@ { if (iState.iState == ENone ) { - __LOG("CPackageDataTransfer::DoSupplyDataL() - iState == ENone - set up for initial meta data read..."); + OstTrace0(TRACE_NORMAL, DUP1_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "iState == ENone - set up for initial meta data read..."); // Retrieve metadata and file list from the buffer ReadData(&iMetaDataSize, aBuffer, sizeof(TInt)); - __LOG1("CPackageDataTransfer::DoSupplyDataL() - meta data size: %d", iMetaDataSize); + OstTrace1(TRACE_NORMAL, DUP2_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "meta data size: %d", iMetaDataSize); currentPos += sizeof(TInt); if (iMetaDataSize >= (KMaxTInt/2) || iMetaDataSize < 0) { - __LOG("CPackageDataTransfer::DoSupplyDataL() - size read is too big"); + OstTrace0(TRACE_ERROR, DUP3_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "size read is too big"); User::Leave(KErrCorrupt); } - __LOG1("CPackageDataTransfer::DoSupplyDataL() - creating meta data buffer of length: %d bytes", iMetaDataSize); + OstTrace1(TRACE_NORMAL, DUP4_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "creating meta data buffer of length: %d bytes", iMetaDataSize); HBufC8* metaDataBuffer = HBufC8::NewL(iMetaDataSize); delete iMetaData; iMetaData = metaDataBuffer; @@ -685,97 +723,98 @@ if (iMetaDataSize > sourceBufferLength ) { - __LOG("CPackageDataTransfer::DoSupplyDataL() - not enough source data to obtain entire meta data in one pass..."); + OstTrace0(TRACE_NORMAL, DUP5_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "not enough source data to obtain entire meta data in one pass..."); if (aLastSection) { - __LOG("CPackageDataTransfer::DoSupplyDataL() - Underflow1"); + OstTrace0(TRACE_ERROR, DUP6_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "Underflow1"); User::Leave(KErrUnderflow); } else { data.Append(aBuffer.Mid(currentPos)); iState.iState = EBuffer; - __LOG2("CPackageDataTransfer::DoSupplyDataL() - got %d bytes of meta data (%d bytes remaining) => changing state to EBuffer", data.Length(), iMetaDataSize - data.Length() ); + OstTraceExt2(TRACE_NORMAL, DUP7_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "got %d bytes of meta data (%d bytes remaining) => changing state to EBuffer", data.Length(), iMetaDataSize - data.Length() ); } } else { - __LOG("CPackageDataTransfer::DoSupplyDataL() - able to read entire meta data buffer in a single pass... "); + OstTrace0(TRACE_NORMAL, DUP8_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "able to read entire meta data buffer in a single pass... "); data.Append(aBuffer.Mid(currentPos, iMetaDataSize)); currentPos += iMetaDataSize; } } else if (iState.iState == EBuffer) { - __LOG1("CPackageDataTransfer::DoSupplyDataL() - iState == EBuffer, iMetaData length: %d", iMetaData->Length()); + OstTrace1(TRACE_NORMAL, DUP9_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "iState == EBuffer, iMetaData length: %d", iMetaData->Length()); TPtr8 ptr( iMetaData->Des() ); const TInt leftToRead = iMetaDataSize - ptr.Length(); - __LOG1("CPackageDataTransfer::DoSupplyDataL() - meta data buffer left to read: %d", leftToRead); + OstTrace1(TRACE_NORMAL, DUP10_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "meta data buffer left to read: %d", leftToRead); if (sourceBufferLength < leftToRead) { - __LOG("CPackageDataTransfer::DoSupplyDataL() - not enough source data to obtain remaining required meta data in this pass..."); + OstTrace0(TRACE_NORMAL, DUP11_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "not enough source data to obtain remaining required meta data in this pass..."); if (aLastSection) { - __LOG("CPackageDataTransfer::DoSupplyDataL() - Underflow2"); + OstTrace0(TRACE_ERROR, DUP12_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "Underflow2"); User::Leave(KErrUnderflow); } ptr.Append(aBuffer); - __LOG1("CPackageDataTransfer::DoSupplyDataL() - meta data buffered again: %d", ptr.Length()); + OstTrace1(TRACE_NORMAL, DUP13_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "meta data buffered again: %d", ptr.Length()); iState.iState = EBuffer; + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_DOSUPPLYDATAL_EXIT ); return; } else { - __LOG("CPackageDataTransfer::DoSupplyDataL() - able to complete meta data read in this pass..."); + OstTrace0(TRACE_NORMAL, DUP14_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "able to complete meta data read in this pass..."); ptr.Append( aBuffer.Left(leftToRead) ); - __LOG1("CPackageDataTransfer::DoSupplyDataL() - meta data finished buffering, meta data size is now: %d", ptr.Length()); + OstTrace1(TRACE_NORMAL, DUP15_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "meta data finished buffering, meta data size is now: %d", ptr.Length()); currentPos += leftToRead; } } const TBool metaDataComplete = ( iMetaData->Length() == iMetaDataSize ); - __LOG4("CPackageDataTransfer::DoSupplyDataL() - meta data complete?: %d ( %d bytes remaining out of total: %d with current length of: %d)", metaDataComplete, iMetaDataSize - iMetaData->Length(), iMetaDataSize, iMetaData->Length() ); + OstTraceExt4(TRACE_NORMAL, DUP16_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "meta data complete?: %d ( %d bytes remaining out of total: %d with current length of: %d)", metaDataComplete, iMetaDataSize - iMetaData->Length(), iMetaDataSize, iMetaData->Length() ); if ( metaDataComplete ) { - __LOG("CPackageDataTransfer::DoSupplyDataL() - Asking SWI to start a package..."); + OstTrace0(TRACE_NORMAL, DUP17_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "Asking SWI to start a package..."); iState.iState = ESupply; iSWIRestore.StartPackageL(iPackageID, *iMetaData); - __LOG("CPackageDataTransfer::DoSupplyDataL() - SWI StartPackageL() completed OK"); + OstTrace0(TRACE_NORMAL, DUP18_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "SWI StartPackageL() completed OK"); } } if ( iState.iState == ESupply ) { - __LOG1("CPackageDataTransfer::DoSupplyDataL() - iState == ESupply, currentPos: %d", currentPos); + OstTrace1(TRACE_NORMAL, DUP19_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "iState == ESupply, currentPos: %d", currentPos); // Now restore each file and commit the changes - const TPtrC8 ptr( aBuffer.Mid( currentPos ) ); - //__LOGDATA("CPackageDataTransfer::DoSupplyDataL() - for supplyFileData %S", ptr.Ptr(), Min( ptr.Length(), 1024 )); + const TPtrC8 ptr( aBuffer.Mid( currentPos ) ); SupplyFileDataL(ptr, aLastSection); - __LOG("CPackageDataTransfer::DoSupplyDataL() - SupplyFileDataL() completed OK"); + OstTrace0(TRACE_NORMAL, DUP20_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "SupplyFileDataL() completed OK"); if (aLastSection) { - __LOG("CPackageDataTransfer::DoSupplyDataL() - aLastSection - asking SWI to commit package..."); + OstTrace0(TRACE_NORMAL, DUP21_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "aLastSection - asking SWI to commit package..."); // now we can finalise the restore iSWIRestore.CommitPackageL(); - __LOG("CPackageDataTransfer::DoSupplyDataL() - Package commited OK"); + OstTrace0(TRACE_NORMAL, DUP22_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "Package commited OK"); iRestored = ETrue; iState.iState = ENone; Cleanup(); iSWIRestore.Close(); - User::LeaveIfError(iSWIRestore.Connect()); + TInt err = iSWIRestore.Connect(); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP23_CPACKAGEDATATRANSFER_DOSUPPLYDATAL, "error = %d", err)); } } - __LOG("CPackageDataTransfer::DoSupplyDataL() - END"); + OstTraceFunctionExit0( DUP1_CPACKAGEDATATRANSFER_DOSUPPLYDATAL_EXIT ); } // SupplyDataL void CPackageDataTransfer::SupplySnapshotL(TDriveNumber aDriveNumber, const TDesC8& aBuffer, TBool aLastSection) @@ -786,7 +825,8 @@ @param aLastSection was this the last section of data */ { - __LOG("CPackageDataTransfer::SupplySnapshotL() - START"); + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_SUPPLYSNAPSHOTL_ENTRY ); + TInt err = KErrNone; if (iBufferSnapshotReader == NULL) { @@ -808,9 +848,10 @@ delete iBufferSnapshotReader; iBufferSnapshotReader = NULL; - User::LeaveIfError(err); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, CPACKAGEDATATRANSFER_SUPPLYSNAPSHOTL, "error = %d", err)); } // if - __LOG("CPackageDataTransfer::SupplySnapshotL() - END"); + + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_SUPPLYSNAPSHOTL_EXIT ); } void CPackageDataTransfer::DoRequestDataL(TDriveNumber aDriveNumber, TPtr8& aBuffer, TBool& aLastSection) @@ -823,15 +864,16 @@ data. */ { - __LOG3("CPackageDataTransfer::DoRequestDataL() - START - iState: %d, iMetaData length: %d, iMetaDataSize: %d", iState.iState, iMetaData->Length(), iMetaDataSize); + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_DOREQUESTDATAL_ENTRY ); + OstTraceExt3(TRACE_NORMAL, CPACKAGEDATATRANSFER_DOREQUESTDATAL, "iState: %d, iMetaData length: %d, iMetaDataSize: %d", iState.iState, iMetaData->Length(), iMetaDataSize); if (iState.iState == ENone || iState.iState == EBuffer) { if (!IsDataOnDrive(aDriveNumber)) { aLastSection = ETrue; - __LOG("CPackageDataTransfer::DoRequestDataL() - END - no data on drive"); - //__LOGDATA("CPackageDataTransfer::DoRequestDataL() - %S", aBuffer.Ptr(), aBuffer.Length()); + OstTrace0(TRACE_NORMAL, DUP1_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "no data on drive"); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_DOREQUESTDATAL_EXIT ); return; } @@ -839,23 +881,23 @@ // Now write the meta data to the buffer. const TInt KSizeOfTInt = sizeof(TInt); const TInt availableBuffer = aBuffer.MaxSize() - aBuffer.Size(); - __LOG1("CPackageDataTransfer::DoRequestDataL() - available Buffer %d", availableBuffer); + OstTrace1(TRACE_NORMAL, DUP2_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "available Buffer %d", availableBuffer); if (iState.iState == ENone) { if ((availableBuffer - KSizeOfTInt) >= iMetaDataSize) { - __LOG("CPackageDataTransfer::DoRequestDataL() - iState = ENone - can write entire meta data in single pass..."); + OstTrace0(TRACE_NORMAL, DUP3_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "iState = ENone - can write entire meta data in single pass..."); WriteData(&iMetaDataSize, aBuffer, KSizeOfTInt); aBuffer.Append(*iMetaData); - __LOG1("CPackageDataTransfer::DoRequestDataL() - iState = ENone - Written Meta Data, size %d", iMetaDataSize); + OstTrace1(TRACE_NORMAL, DUP4_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "iState = ENone - Written Meta Data, size %d", iMetaDataSize); } else if (availableBuffer - KSizeOfTInt > 0) { // can we write metasize and something else? - __LOG("CPackageDataTransfer::DoRequestDataL() - iState = ENone - have room for some meta data (not all)..."); + OstTrace0(TRACE_NORMAL, DUP5_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "iState = ENone - have room for some meta data (not all)..."); WriteData(&iMetaDataSize, aBuffer, KSizeOfTInt); @@ -868,12 +910,14 @@ aLastSection = EFalse; iState.iState = EBuffer; - __LOG2("CPackageDataTransfer::DoRequestDataL() - END - iState = ENone - Written MetaData %d, left %d", amountOfMetaDataToWrite, iMetaDataLeft); + OstTraceExt2(TRACE_NORMAL, DUP6_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "iState = ENone - Written MetaData %d, left %d", amountOfMetaDataToWrite, iMetaDataLeft); + OstTraceFunctionExit0( DUP1_CPACKAGEDATATRANSFER_DOREQUESTDATAL_EXIT ); return; } else { - __LOG("CPackageDataTransfer::DoRequestDataL() - END - iState = ENone - not enough space to write MetaData, Return for more"); + OstTrace0(TRACE_NORMAL, DUP7_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "iState = ENone - not enough space to write MetaData, Return for more"); + OstTraceFunctionExit0( DUP2_CPACKAGEDATATRANSFER_DOREQUESTDATAL_EXIT ); return; } }// if @@ -882,31 +926,33 @@ if (availableBuffer - iMetaDataLeft >= 0) { const TInt readPosition = iMetaDataSize - iMetaDataLeft; - __LOG2("CPackageDataTransfer::DoRequestDataL() - iState = EBuffer - enough space for remaining meta data in this pass, size %d, readPos: %d", iMetaDataLeft, readPosition); + OstTraceExt2(TRACE_NORMAL, DUP8_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "iState = EBuffer - enough space for remaining meta data in this pass, size %d, readPos: %d", iMetaDataLeft, readPosition); aBuffer.Append(iMetaData->Mid(readPosition)); } else { // continute buffer const TInt readPosition = iMetaDataSize - iMetaDataLeft; - __LOG2("CPackageDataTransfer::DoRequestDataL() - iState = EBuffer - Still buffering Meta Data, Left to write %d, readPos: %d", iMetaDataLeft, readPosition); + OstTraceExt2(TRACE_NORMAL, DUP9_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "iState = EBuffer - Still buffering Meta Data, Left to write %d, readPos: %d", iMetaDataLeft, readPosition); aBuffer.Append(iMetaData->Mid(readPosition, availableBuffer)); iMetaDataLeft -= availableBuffer; aLastSection = EFalse; - __LOG1("CPackageDataTransfer::DoRequestDataL() - iState = EBuffer - END - Still buffering Meta Data, Left to write %d", iMetaDataLeft); + OstTrace1(TRACE_NORMAL, DUP10_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "iState = EBuffer - END - Still buffering Meta Data, Left to write %d", iMetaDataLeft); + OstTraceFunctionExit0( DUP3_CPACKAGEDATATRANSFER_DOREQUESTDATAL_EXIT ); return; } } TUint count = iFiles.Count(); - __LOG1("CPackageDataTransfer::DoRequestDataL() - No of fileNames: %d", count); + OstTrace1(TRACE_NORMAL, DUP11_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "No of fileNames: %d", count); if (count == 0) { aLastSection = ETrue; - __LOG("CPackageDataTransfer::DoRequestDataL() - END - no files"); + OstTrace0(TRACE_NORMAL, DUP12_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "no files"); + OstTraceFunctionExit0( DUP4_CPACKAGEDATATRANSFER_DOREQUESTDATAL_EXIT ); return; } @@ -918,14 +964,14 @@ } - __LOG("CPackageDataTransfer::DoRequestDataL() - starting buffer file writer..."); + OstTrace0(TRACE_NORMAL, DUP13_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "starting buffer file writer..."); CBufferFileWriter* bufferFileWriter = CBufferFileWriter::NewL(iFs, files); delete iBufferFileWriter; iBufferFileWriter = bufferFileWriter; iBufferFileWriter->StartL(aBuffer, aLastSection); iState.iState = ERequest; - __LOG("CPackageDataTransfer::DoRequestDataL() - iState is now ERequest"); + OstTrace0(TRACE_NORMAL, DUP14_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "iState is now ERequest"); if (aLastSection) { @@ -938,7 +984,7 @@ } else if (iBufferFileWriter != NULL) { - __LOG("CPackageDataTransfer::DoRequestDataL() - continuing buffer file writer from last time..."); + OstTrace0(TRACE_NORMAL, DUP15_CPACKAGEDATATRANSFER_DOREQUESTDATAL, "continuing buffer file writer from last time..."); iBufferFileWriter->ContinueL(aBuffer, aLastSection); if (aLastSection) { @@ -948,8 +994,7 @@ } } - //__LOGDATA("CPackageDataTransfer::DoRequestDataL() - %S", aBuffer.Ptr(), aBuffer.Length()); - __LOG("CPackageDataTransfer::DoRequestDataL() - END"); + OstTraceFunctionExit0( DUP5_CPACKAGEDATATRANSFER_DOREQUESTDATAL_EXIT ); } // RequestDataL void CPackageDataTransfer::RequestSnapshotL(TDriveNumber aDriveNumber, TPtr8& aBuffer, TBool& aLastSection) @@ -962,17 +1007,19 @@ data. */ { - __LOG("CPackageDataTransfer::RequestSnapshotL() - START"); + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_REQUESTSNAPSHOTL_ENTRY ); + if (iBufferSnapshotWriter == NULL) { if (!IsDataOnDrive(aDriveNumber)) { aLastSection = ETrue; + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_REQUESTSNAPSHOTL_EXIT ); return; } TUint count = iFiles.Count(); - __LOG1("CPackageDataTransfer::RequestSnapshotL() - No of fileNames: %d", count); + OstTrace1(TRACE_NORMAL, CPACKAGEDATATRANSFER_REQUESTSNAPSHOTL, "No of fileNames: %d", count); if (count > 0) { RSnapshots* snapshots = new(ELeave) RSnapshots(); @@ -1021,7 +1068,7 @@ delete iBufferSnapshotWriter; iBufferSnapshotWriter = NULL; } - __LOG("CPackageDataTransfer::RequestSnapshotL() - END"); + OstTraceFunctionExit0( DUP1_CPACKAGEDATATRANSFER_REQUESTSNAPSHOTL_EXIT ); } @@ -1029,6 +1076,7 @@ */ void CPackageDataTransfer::Cleanup() { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_CLEANUP_ENTRY ); delete iBufferFileWriter; iBufferFileWriter = NULL; delete iBufferSnapshotReader; @@ -1039,6 +1087,7 @@ iSnapshot = NULL; delete iMetaData; iMetaData = NULL; + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_CLEANUP_EXIT ); } /** @@ -1049,12 +1098,15 @@ */ TBool CPackageDataTransfer::IsDataOnDrive(TDriveNumber aDrive) { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_ISDATAONDRIVE_ENTRY ); if (!iDriveList[aDrive]) { + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_ISDATAONDRIVE_EXIT ); return EFalse; } else { + OstTraceFunctionExit0( DUP1_CPACKAGEDATATRANSFER_ISDATAONDRIVE_EXIT ); return ETrue; } @@ -1068,14 +1120,16 @@ @leave KErrNotReady if CPackageDataTransfer::ParseFilesL() not called */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_COMMONSETTINGSL_ENTRY ); TCommonBURSettings settings = ENoOptions; - __LOG1("CPackageDataTransfer::CommonSettingsL() - System Supported: %d", iSystemInformation.iSupported); + OstTrace1(TRACE_NORMAL, CPACKAGEDATATRANSFER_COMMONSETTINGSL, "System Supported: %d", iSystemInformation.iSupported); if (iSystemInformation.iSupported) { settings |= EHasSystemFiles; } + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_COMMONSETTINGSL_EXIT ); return settings; } @@ -1087,7 +1141,8 @@ @leave KErrNotReady if CPackageDataTransfer::ParseFilesL() not called */ { - __LOG1("CPackageDataTransfer::CommonSettingsL() - Public Supported: %d", iPublicInformation.iSupported); + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_PASSIVESETTINGSL_ENTRY ); + OstTrace1(TRACE_NORMAL, CPACKAGEDATATRANSFER_PASSIVESETTINGSL, "Public Supported: %d", iPublicInformation.iSupported); TPassiveBURSettings settings = ENoPassiveOptions; @@ -1097,6 +1152,7 @@ } // if + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_PASSIVESETTINGSL_EXIT ); return settings; } @@ -1118,8 +1174,10 @@ */ void CPackageDataTransfer::SetRegistrationFileL(const TDesC& aFileName) { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_SETREGISTRATIONFILEL_ENTRY ); delete iRegistrationFile; iRegistrationFile = aFileName.AllocL(); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_SETREGISTRATIONFILEL_EXIT ); } /** Parses the package registration file @@ -1127,12 +1185,15 @@ */ void CPackageDataTransfer::ParseL() { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_PARSEL_ENTRY ); if ((*iRegistrationFile).FindF(KPrimaryBackupRegistrationFile) == KErrNotFound) { + OstTrace0(TRACE_ERROR, CPACKAGEDATATRANSFER_PARSEL, "Leave: KErrNotReady"); User::Leave(KErrNotReady); } ipDataOwnerManager->ParserProxy().ParseL(*iRegistrationFile, *this); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_PARSEL_EXIT ); } @@ -1144,9 +1205,11 @@ @param aRestoreFileFilter on return the file filter */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_GETRAWPUBLICFILELISTL_ENTRY ); // Convert drive number to letter TChar drive; - User::LeaveIfError(iFs.DriveToChar(aDriveNumber, drive)); + TInt err = iFs.DriveToChar(aDriveNumber, drive); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, CPACKAGEDATATRANSFER_GETRAWPUBLICFILELISTL, "error = %d", err)); const TInt count = iPublicSelections.Count(); for (TInt x = 0; x < count; x++) @@ -1189,6 +1252,7 @@ aRestoreFileFilter.AppendL(TRestoreFileFilter(include, filename)); } // if } // for x + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_GETRAWPUBLICFILELISTL_EXIT ); } @@ -1200,6 +1264,7 @@ @param aFiles on return a list of public files */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_GETPUBLICFILELISTL_ENTRY ); _LIT(KDrive, "?:"); _LIT(KDriveAndSlash, "?:\\"); _LIT( KExclamationAsDrive, "!"); // Used to generic drives for public data as in .SIS file package @@ -1212,11 +1277,11 @@ TInt count = iPublicSelections.Count(); - __LOG("CPackageDataTransfer::GetPublicFileListL() - file selection listing...:"); + OstTrace0(TRACE_NORMAL, CPACKAGEDATATRANSFER_GETPUBLICFILELISTL, "file selection listing...:"); for (TInt x = 0; x < count; x++) { const TDesC& selectionName = iPublicSelections[x]->SelectionName(); - __LOG3("CPackageDataTransfer::GetPublicFileListL() - selection[%03d]: %S, type: %d", x, &selectionName, iPublicSelections[x]->SelectionType()); + OstTraceExt3(TRACE_NORMAL, DUP1_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL, "selection[%03d]: %S, type: %d", x, selectionName, iPublicSelections[x]->SelectionType()); if (iPublicSelections[x]->SelectionType() == EInclude) { include.AppendL(selectionName); @@ -1229,15 +1294,16 @@ // Loop through all includes count = include.Count(); - __LOG("CPackageDataTransfer::GetPublicFileListL() - include listing...:"); + OstTrace0(TRACE_NORMAL, DUP2_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL, "include listing...:"); for (TInt x = 0; x < count; x++) { TFileName fileName; TChar drive; - User::LeaveIfError(iFs.DriveToChar(aDriveNumber, drive)); + TInt err = iFs.DriveToChar(aDriveNumber, drive); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP13_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL, "error = %d", err)); const TPtrC includeEntry( include[x] ); - __LOG2("CPackageDataTransfer::GetPublicFileListL() - entry[%03d] is: %S", x, &includeEntry); + OstTraceExt2(TRACE_NORMAL, DUP3_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL, "entry[%03d] is: %S", x, includeEntry); // See if the drive is specified if (include[x][0] == KBackSlash()[0]) @@ -1271,7 +1337,7 @@ } // else - __LOG2("CPackageDataTransfer::GetPublicFileListL() - entry[%03d] filename is therefore: %S", x, &fileName); + OstTraceExt2(TRACE_NORMAL, DUP4_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL, "entry[%03d] filename is therefore: %S", x, fileName); if (fileName.Length() > 0) { @@ -1281,7 +1347,7 @@ (fileName.MatchF(KDriveAndSlash) != KErrNotFound)) { isDrive = ETrue; - __LOG("CPackageDataTransfer::GetPublicFileListL() - filename is a drive"); + OstTrace0(TRACE_NORMAL, DUP5_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL, "filename is a drive"); } // if TEntry entry; @@ -1289,7 +1355,7 @@ if (!isDrive) { TInt err = iFs.Entry(fileName, entry); - __LOG1("CPackageDataTransfer::GetPublicFileListL() - get entry error: %d", err); + OstTrace1(TRACE_NORMAL, DUP6_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL, "get entry error: %d", err); entry.iName = fileName; switch (err) { @@ -1301,28 +1367,27 @@ case KErrBadName: break; default: + OstTrace1(TRACE_ERROR, DUP12_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL, "Leave: %d", err); User::Leave(err); } // switch } // if if (isDrive || (isEntry && entry.IsDir())) { - __LOG("CPackageDataTransfer::GetPublicFileListL() - parsing directory..."); + OstTrace0(TRACE_NORMAL, DUP7_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL, "parsing directory..."); ParseDirL(fileName, exclude, aFiles); - #ifdef SBE_LOGGING_ENABLED const TInt fNameCount = aFiles.Count(); if (fNameCount) { for(TInt k=0; k& aExclude, RFileArray& apFileEntries) @@ -1359,6 +1425,7 @@ @param apFileEntries Array of file entries to populate */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_PARSEDIRL_ENTRY ); CDir* pFiles = NULL; // This function requires a / on the end otherwise it does not work! @@ -1371,6 +1438,7 @@ if ((err != KErrNone) && (err != KErrNotFound)) // Do we need to leave? { + OstTrace1(TRACE_ERROR, CPACKAGEDATATRANSFER_PARSEDIRL, "Leave: %d", err); User::Leave(err); } // if @@ -1400,6 +1468,7 @@ // Cleanup CleanupStack::PopAndDestroy(pFiles); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_PARSEDIRL_EXIT ); } void CPackageDataTransfer::GetDriveListL(TDriveList& aDriveList) @@ -1410,7 +1479,8 @@ @leave KErrNotReady if CDataOwner::ParseFilesL() not called */ { - __LOG1("CPackageDataTransfer::GetDriveListL() - Begin - SID: 0x%08x", iPackageID.iUid); + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_GETDRIVELISTL_ENTRY ); + OstTrace1(TRACE_NORMAL, CPACKAGEDATATRANSFER_GETDRIVELISTL, "SID: 0x%08x", iPackageID.iUid); // We now no longer return the Z drive, it has been decided that the Z drive will always be the // ROM. Backing up and restoring the ROM drive should not be possible, as what is the point @@ -1424,6 +1494,7 @@ { iMetaData = NULL; iMetaDataSize = 0; + OstTrace1(TRACE_ERROR, DUP2_CPACKAGEDATATRANSFER_GETDRIVELISTL, "Leave: %d", err); User::Leave( err ); } else @@ -1446,7 +1517,8 @@ aDriveList = iDriveList; - __LOG1("CPackageDataTransfer::GetDriveListL() - end - SID: 0x%08x", iPackageID.iUid); + OstTrace1(TRACE_NORMAL, DUP1_CPACKAGEDATATRANSFER_GETDRIVELISTL, "SID: 0x%08x", iPackageID.iUid); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_GETDRIVELISTL_EXIT ); } TBool CPackageDataTransfer::IsExcluded(const TBool aIsPublic, const TDesC& aFileName, const RArray& aExclude) @@ -1459,6 +1531,7 @@ @return ETrue if excluded otherwise EFalse */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_ISEXCLUDED_ENTRY ); _LIT(KPrivateMatch, "?:\\private\\*"); _LIT(KSystem, "?:\\system\\*"); _LIT(KResource, "?:\\resource\\*"); @@ -1501,7 +1574,8 @@ } // for x } // if - __LOG2("CDataOwner::IsExcluded() - END - returns excluded: %d for file: %S", ret, &aFileName); + OstTraceExt2(TRACE_NORMAL, CPACKAGEDATATRANSFER_ISEXCLUDED, "returns excluded: %d for file: %S", ret, aFileName); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_ISEXCLUDED_EXIT ); return ret; } @@ -1515,16 +1589,20 @@ */ TInt CPackageDataTransfer::Compare(const CPackageDataTransfer& aFirst, const CPackageDataTransfer& aSecond) { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_COMPARE_ENTRY ); if (aFirst.PackageId().iUid < aSecond.PackageId().iUid) { + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_COMPARE_EXIT ); return -1; } else if (aFirst.PackageId().iUid > aSecond.PackageId().iUid) { + OstTraceFunctionExit0( DUP1_CPACKAGEDATATRANSFER_COMPARE_EXIT ); return 1; } else { + OstTraceFunctionExit0( DUP2_CPACKAGEDATATRANSFER_COMPARE_EXIT ); return 0; } } @@ -1553,20 +1631,24 @@ /** MContentHandler::OnStartDocumentL() */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_ONSTARTDOCUMENTL_ENTRY ); if (aErrorCode != KErrNone) { - __LOG1("CPackageDataTransfer::OnStartDocumentL() - error = %d", aErrorCode); + OstTrace1(TRACE_ERROR, CPACKAGEDATATRANSFER_ONSTARTDOCUMENTL, "error = %d", aErrorCode); User::Leave(aErrorCode); } + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_ONSTARTDOCUMENTL_EXIT ); } void CPackageDataTransfer::OnEndDocumentL(TInt aErrorCode) /** MContentHandler::OnEndDocumentL() */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_ONENDDOCUMENTL_ENTRY ); // just to satisfy UREL compiler (void) aErrorCode; - __LOG1("CPackageDataTransfer::OnEndDocumentL() - error = %d", aErrorCode); + OstTrace1(TRACE_NORMAL, CPACKAGEDATATRANSFER_ONENDDOCUMENTL, "error = %d", aErrorCode); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_ONENDDOCUMENTL_EXIT ); } void CPackageDataTransfer::OnStartElementL(const RTagInfo& aElement, @@ -1577,12 +1659,14 @@ @leave KErrUnknown an unknown element */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_ONSTARTELEMENTL_ENTRY ); if (aErrorCode != KErrNone) { - __LOG1("CPackageDataTransfer::OnStartElementL() - error = %d", aErrorCode); + OstTrace1(TRACE_ERROR, CPACKAGEDATATRANSFER_ONSTARTELEMENTL, "error = %d", aErrorCode); User::Leave(aErrorCode); } + TInt err; TPtrC8 localName = aElement.LocalName().DesC(); if (localName == KIncludeFile) { @@ -1602,17 +1686,20 @@ } else if (!localName.CompareF(KPublicBackup)) { - User::LeaveIfError(HandlePublicBackup(aAttributes)); + err = HandlePublicBackup(aAttributes); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP2_CPACKAGEDATATRANSFER_ONSTARTELEMENTL, "error = %d", err)); } else if (!localName.CompareF(KSystemBackup)) { - User::LeaveIfError(HandleSystemBackup(aAttributes)); + err = HandleSystemBackup(aAttributes); + LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP3_CPACKAGEDATATRANSFER_ONSTARTELEMENTL, "error = %d", err)); } else { - __LOG1("CPackageDataTransfer::OnStartElementL() - Unknown element while parsing 0x%08x", iPackageID.iUid); + OstTrace1(TRACE_NORMAL, DUP1_CPACKAGEDATATRANSFER_ONSTARTELEMENTL, "Unknown element while parsing 0x%08x", iPackageID.iUid); } + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_ONSTARTELEMENTL_EXIT ); } @@ -1620,9 +1707,10 @@ /** MContentHandler::OnEndElementL() */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_ONENDELEMENTL_ENTRY ); if (aErrorCode != KErrNone) { - __LOG1("CPackageDataTransfer::OnEndElementL() - error = %d", aErrorCode); + OstTrace1(TRACE_ERROR, CPACKAGEDATATRANSFER_ONENDELEMENTL, "error = %d", aErrorCode); User::Leave(aErrorCode); } @@ -1631,6 +1719,7 @@ { iCurrentElement = ENoElement; } // if + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_ONENDELEMENTL_EXIT ); } void CPackageDataTransfer::OnContentL(const TDesC8& /*aBytes*/, TInt /*aErrorCode*/) @@ -1684,8 +1773,10 @@ @leave aErrorCode */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_ONERROR_ENTRY ); (void)aErrorCode; - __LOG1("CPackageDataTransfer::OnError() - error = %d", aErrorCode); + OstTrace1(TRACE_NORMAL, CPACKAGEDATATRANSFER_ONERROR, "error = %d", aErrorCode); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_ONERROR_EXIT ); } TAny* CPackageDataTransfer::GetExtendedInterface(const TInt32 /*aUid*/) @@ -1703,6 +1794,7 @@ @return KErrUnknown unknown version */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_HANDLEBACKUPREGISTRATIONL_ENTRY ); _LIT8(KVersion, "1.0"); if (aAttributes.Count() == 1) @@ -1710,10 +1802,11 @@ // Check the version is correct. if (aAttributes[0].Value().DesC() != KVersion()) // Only version we know about { - __LOG1("CDataOwner::HandleBackupRegistrationL() - Unknown version at SID(0x%08x)", iPackageID.iUid); + OstTrace1(TRACE_ERROR, CPACKAGEDATATRANSFER_HANDLEBACKUPREGISTRATIONL, "Unknown version at SID(0x%08x)", iPackageID.iUid); User::Leave(KErrNotSupported); } // else } // if + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_HANDLEBACKUPREGISTRATIONL_EXIT ); } @@ -1724,17 +1817,19 @@ @return KErrNone */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_HANDLEPUBLICBACKUP_ENTRY ); iPublicInformation.iSupported = ETrue; if (aAttributes.Count() > 0) { const TBool deleteBeforeRestore = ( aAttributes[0].Value().DesC().CompareF(KYes) == 0 ); iPublicInformation.iDeleteBeforeRestore = deleteBeforeRestore; - __LOG2("CPackageDataTransfer::HandlePublicBackup(0x%08x) - iPublicInformation.iDeleteBeforeRestore: %d", iPackageID.iUid, deleteBeforeRestore); + OstTraceExt2(TRACE_NORMAL, CPACKAGEDATATRANSFER_HANDLEPUBLICBACKUP, "(0x%08x) - iPublicInformation.iDeleteBeforeRestore: %d", iPackageID.iUid, static_cast(deleteBeforeRestore)); } // if iCurrentElement = EPublic; + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_HANDLEPUBLICBACKUP_EXIT ); return KErrNone; } @@ -1745,9 +1840,11 @@ @return KErrNone */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_HANDLESYSTEMBACKUP_ENTRY ); iSystemInformation.iSupported = ETrue; - __LOG2("CPackageDataTransfer::HandlePublicBackup(0x%08x) - iSystemInformation.iSupported: %d", iPackageID.iUid, iSystemInformation.iSupported); + OstTraceExt2(TRACE_NORMAL, CPACKAGEDATATRANSFER_HANDLESYSTEMBACKUP, "(0x%08x) - iSystemInformation.iSupported: %d", iPackageID.iUid, static_cast(iSystemInformation.iSupported)); + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_HANDLESYSTEMBACKUP_EXIT ); return KErrNone; } @@ -1762,6 +1859,7 @@ @param aDir The element was found in an element? */ { + OstTraceFunctionEntry0( CPACKAGEDATATRANSFER_HANDLEPATHL_ENTRY ); // Check we dont have a NULL string if (aAttributes[0].Value().DesC().Length() > 0) { @@ -1787,31 +1885,32 @@ CSelection* selection = CSelection::NewLC(aType, selectionName); iPublicSelections.AppendL(selection); CleanupStack::Pop(selection); - __LOG3("CPackageDataTransfer::HandlePathL(0x%08x) - Added selection: %S [type: %d]", iPackageID.iUid, &selectionName, aType); + OstTraceExt3(TRACE_NORMAL, CPACKAGEDATATRANSFER_HANDLEPATHL, "(0x%08x) - Added selection: %S [type: %d]", iPackageID.iUid, selectionName, static_cast(aType)); } //if }// if else { - __LOG3("CPackageDataTransfer::HandlePathL(0x%08x) - Wrong format: %S [type: %d]", iPackageID.iUid, &selectionName, aType); + OstTraceExt3(TRACE_NORMAL, DUP1_CPACKAGEDATATRANSFER_HANDLEPATHL, "(0x%08x) - Wrong format: %S [type: %d]", iPackageID.iUid, selectionName, static_cast(aType)); } } // if else { - __LOG1("CPackageDataTransfer::HandlePathL(0x%08x) - EPublic - Could not convert filename", iPackageID.iUid); + OstTrace1(TRACE_NORMAL, DUP2_CPACKAGEDATATRANSFER_HANDLEPATHL, "(0x%08x) - EPublic - Could not convert filename", iPackageID.iUid); } // else break; }; default: { - __LOG1("CPackageDataTransfer::HandlePathL(0x%08x) - Private data is Not Supported", iPackageID.iUid); + OstTrace1(TRACE_NORMAL, DUP3_CPACKAGEDATATRANSFER_HANDLEPATHL, "(0x%08x) - Private data is Not Supported", iPackageID.iUid); } break; } // switch } // if else { - __LOG1("CPackageDataTransfer::HandlePathL(0x%08x) - Path attribute error", iPackageID.iUid); + OstTrace1(TRACE_NORMAL, DUP4_CPACKAGEDATATRANSFER_HANDLEPATHL, "(0x%08x) - Path attribute error", iPackageID.iUid); } // else + OstTraceFunctionExit0( CPACKAGEDATATRANSFER_HANDLEPATHL_EXIT ); } // // // MContentHandler // diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbshutdown.cpp --- a/backupandrestore/backupengine/src/sbshutdown.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbshutdown.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,10 +22,14 @@ #include #include #include "sbshutdown.h" +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbshutdownTraces.h" +#endif namespace conn { - /** Shutdown delay, in microseconds. @internalComponent */ const TUint KShutdownDelay = 0x200000; @@ -36,6 +40,8 @@ Class Constructor */ { + OstTraceFunctionEntry0( CSBSHUTDOWN_CSBSHUTDOWN_CONS_ENTRY ); + OstTraceFunctionExit0( CSBSHUTDOWN_CSBSHUTDOWN_CONS_EXIT ); } void CSBShutdown::ConstructL() @@ -43,14 +49,18 @@ Construct this instance of CSBShutdown. */ { + OstTraceFunctionEntry0( CSBSHUTDOWN_CONSTRUCTL_ENTRY ); CTimer::ConstructL(); CActiveScheduler::Add(this); + OstTraceFunctionExit0( CSBSHUTDOWN_CONSTRUCTL_EXIT ); } void CSBShutdown::Start() /** Starts the timer. */ { + OstTraceFunctionEntry0( CSBSHUTDOWN_START_ENTRY ); After(KShutdownDelay); + OstTraceFunctionExit0( CSBSHUTDOWN_START_EXIT ); } void CSBShutdown::RunL() @@ -59,6 +69,8 @@ Stop the active scheduler and shutdown the server. */ { + OstTraceFunctionEntry0( CSBSHUTDOWN_RUNL_ENTRY ); CActiveScheduler::Stop(); + OstTraceFunctionExit0( CSBSHUTDOWN_RUNL_EXIT ); } } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/src/sbtypes.cpp --- a/backupandrestore/backupengine/src/sbtypes.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/backupandrestore/backupengine/src/sbtypes.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -24,10 +24,14 @@ #include #include #include +#include "OstTraceDefinitions.h" +#include "sbtrace.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "sbtypesTraces.h" +#endif namespace conn - { - + { EXPORT_C CDataOwnerInfo* CDataOwnerInfo::NewL( CSBGenericDataType* aGenericDataType, TCommonBURSettings aCommonSettings, TPassiveBURSettings aPassiveSettings, @@ -45,10 +49,12 @@ @return A pointer to the CDataOwnerInfo object */ { + OstTraceFunctionEntry0( CDATAOWNERINFO_NEWL_ENTRY ); CDataOwnerInfo* self = new(ELeave) CDataOwnerInfo(); CleanupStack::PushL(self); self->ConstructL(aGenericDataType, aCommonSettings, aPassiveSettings, aActiveSettings, aDriveList); CleanupStack::Pop(self); + OstTraceFunctionExit0( CDATAOWNERINFO_NEWL_EXIT ); return self; } @@ -61,10 +67,12 @@ @return A pointer to the CDataOwnerInfo object */ { + OstTraceFunctionEntry0( DUP1_CDATAOWNERINFO_NEWL_ENTRY ); CDataOwnerInfo* self = new(ELeave) CDataOwnerInfo(); CleanupStack::PushL(self); self->ConstructL(aFlatDataOwnerInfo); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP1_CDATAOWNERINFO_NEWL_EXIT ); return self; } @@ -73,6 +81,8 @@ C++ Constructor */ { + OstTraceFunctionEntry0( CDATAOWNERINFO_CDATAOWNERINFO_CONS_ENTRY ); + OstTraceFunctionExit0( CDATAOWNERINFO_CDATAOWNERINFO_CONS_EXIT ); } EXPORT_C CDataOwnerInfo::~CDataOwnerInfo() @@ -80,7 +90,10 @@ C++ Destructor */ { + OstTraceFunctionEntry0( CDATAOWNERINFO_CDATAOWNERINFO_DES_ENTRY ); delete iGenericDataType; + iGenericDataType = NULL; + OstTraceFunctionExit0( CDATAOWNERINFO_CDATAOWNERINFO_DES_EXIT ); } void CDataOwnerInfo::ConstructL(CSBGenericDataType* aGenericDataType, @@ -98,8 +111,10 @@ @param aDriveList the array of drives the data owner has data on */ { + OstTraceFunctionEntry0( CDATAOWNERINFO_CONSTRUCTL_ENTRY ); if (aGenericDataType == NULL) { + OstTrace0(TRACE_ERROR, CDATAOWNERINFO_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } iGenericDataType = aGenericDataType; @@ -107,6 +122,7 @@ iPassiveBURSettings = aPassiveSettings; iActiveBURSettings = aActiveSettings; iDriveList = aDriveList; + OstTraceFunctionExit0( CDATAOWNERINFO_CONSTRUCTL_EXIT ); } void CDataOwnerInfo::ConstructL(const TDesC8& aFlatDataOwnerInfo) @@ -117,6 +133,7 @@ @param aFlatDataOwnerInfo a flat data owner info returned from IPC */ { + OstTraceFunctionEntry0( DUP1_CDATAOWNERINFO_CONSTRUCTL_ENTRY ); // TPtr8 that points to aFlatDataOwnerInfo (which remains const) TPtr8 pSource(const_cast(aFlatDataOwnerInfo.Ptr()), aFlatDataOwnerInfo.Size()); pSource.SetMax(); @@ -137,6 +154,7 @@ UnpackTypeAdvance(iPassiveBURSettings, pSource, sourcePos); UnpackTypeAdvance(iActiveBURSettings, pSource, sourcePos); UnpackTypeAdvance(iDriveList, pSource, sourcePos); + OstTraceFunctionExit0( DUP1_CDATAOWNERINFO_CONSTRUCTL_EXIT ); } EXPORT_C CSBGenericDataType& CDataOwnerInfo::Identifier() @@ -226,9 +244,11 @@ @return The externalised buffer */ { + OstTraceFunctionEntry0( CDATAOWNERINFO_EXTERNALISEL_ENTRY ); HBufC8* dataOwnerBuffer = ExternaliseLC(); CleanupStack::Pop(dataOwnerBuffer); + OstTraceFunctionExit0( CDATAOWNERINFO_EXTERNALISEL_EXIT ); return dataOwnerBuffer; } @@ -240,6 +260,7 @@ @return The externalised buffer */ { + OstTraceFunctionEntry0( CDATAOWNERINFO_EXTERNALISELC_ENTRY ); HBufC8* dataBuffer = HBufC8::NewLC(Size()); TPtr8 bufferPtr(dataBuffer->Des()); @@ -254,6 +275,7 @@ bufferPtr.Append(reinterpret_cast(&iActiveBURSettings), sizeof(TActiveBURSettings)); bufferPtr.Append(iDriveList); + OstTraceFunctionExit0( CDATAOWNERINFO_EXTERNALISELC_EXIT ); return dataBuffer; } @@ -265,6 +287,7 @@ @return Size of class in bytes once flattened */ { + OstTraceFunctionEntry0( CDATAOWNERINFO_SIZE_ENTRY ); TInt size = sizeof(TCommonBURSettings) + sizeof(TPassiveBURSettings) + sizeof(TActiveBURSettings) + @@ -272,6 +295,7 @@ iGenericDataType->Externalise().Size() + iDriveList.Size(); + OstTraceFunctionExit0( CDATAOWNERINFO_SIZE_EXIT ); return size; } @@ -287,10 +311,12 @@ @return A pointer to the CSBGenericDataType object */ { + OstTraceFunctionEntry0( CSBGENERICDATATYPE_NEWL_ENTRY ); CSBGenericDataType* self = new(ELeave) CSBGenericDataType(); CleanupStack::PushL(self); self->ConstructL(aDes); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSBGENERICDATATYPE_NEWL_EXIT ); return self; } @@ -301,8 +327,10 @@ to be large enough to accomodate the data stored by the derived type */ { + OstTraceFunctionEntry0( CSBGENERICDATATYPE_CSBGENERICDATATYPE_CONS_ENTRY ); // Initialise iSize iSize = sizeof(TSBDerivedType); + OstTraceFunctionExit0( CSBGENERICDATATYPE_CSBGENERICDATATYPE_CONS_EXIT ); } EXPORT_C CSBGenericDataType::~CSBGenericDataType() @@ -310,7 +338,10 @@ C++ Destructor */ { + OstTraceFunctionEntry0( CSBGENERICDATATYPE_CSBGENERICDATATYPE_DES_ENTRY ); delete iDataBuffer; + iDataBuffer = NULL; + OstTraceFunctionExit0( CSBGENERICDATATYPE_CSBGENERICDATATYPE_DES_EXIT ); } void CSBGenericDataType::ConstructL(const TDesC8& aDes) @@ -321,6 +352,7 @@ @param aDes descriptor containing the buffer of data */ { + OstTraceFunctionEntry0( CSBGENERICDATATYPE_CONSTRUCTL_ENTRY ); // Store the length of the descriptor as our max length iSize = aDes.Size(); @@ -335,6 +367,7 @@ // The base type should be as long as the des passed in (more info in a derived) iDataBuffer->Des().SetLength(iSize); + OstTraceFunctionExit0( CSBGENERICDATATYPE_CONSTRUCTL_EXIT ); } void CSBGenericDataType::InitialiseL(TInt& aOffset) @@ -345,8 +378,10 @@ been parsed up to */ { + OstTraceFunctionEntry0( CSBGENERICDATATYPE_INITIALISEL_ENTRY ); if (iSize < sizeof(TSBDerivedType)) { + OstTrace0(TRACE_ERROR, CSBGENERICDATATYPE_INITIALISEL, "Leave: KErrCorrupt"); User::Leave(KErrCorrupt); } @@ -358,11 +393,13 @@ if (derivedType < 0 || derivedType > KMaxDerivedTypes) { + OstTrace0(TRACE_ERROR, DUP1_CSBGENERICDATATYPE_INITIALISEL, "Leave: KErrCorrupt"); User::Leave(KErrCorrupt); } iDataBuffer->Des().SetLength(aOffset); + OstTraceFunctionExit0( CSBGENERICDATATYPE_INITIALISEL_EXIT ); } void CSBGenericDataType::BaseConstructL() @@ -374,8 +411,10 @@ the data of all classes is created. */ { + OstTraceFunctionEntry0( CSBGENERICDATATYPE_BASECONSTRUCTL_ENTRY ); // All derived classes should += their size to iSize iDataBuffer = HBufC8::NewL(iSize); + OstTraceFunctionExit0( CSBGENERICDATATYPE_BASECONSTRUCTL_EXIT ); } EXPORT_C const TDesC8& CSBGenericDataType::Externalise() const @@ -396,10 +435,12 @@ @return The type of the derived object */ { + OstTraceFunctionEntry0( CSBGENERICDATATYPE_DERIVEDTYPEL_ENTRY ); TSBDerivedType derivedType; UnpackType(derivedType, *iDataBuffer, iDerivedTypeOffset); + OstTraceFunctionExit0( CSBGENERICDATATYPE_DERIVEDTYPEL_EXIT ); return derivedType; } @@ -414,6 +455,7 @@ @param aOffset The running index of where the following type begins. Updated by ExtractPointer */ { + OstTraceFunctionEntry0( CSBGENERICDATATYPE_UNPACKDESCRIPTORTYPEADVANCE_ENTRY ); // Set length of the unicode string in characters TUint32 length; @@ -427,6 +469,7 @@ *pRawTarget++ = *pRawSource++; aOffset++; } + OstTraceFunctionExit0( CSBGENERICDATATYPE_UNPACKDESCRIPTORTYPEADVANCE_EXIT ); } void CSBGenericDataType::UnpackDescriptorTypeAdvance(TDesC8& aDes, TInt& aOffset) @@ -440,6 +483,7 @@ @param aOffset The running index of where the following type begins. Updated by ExtractPointer */ { + OstTraceFunctionEntry0( DUP1_CSBGENERICDATATYPE_UNPACKDESCRIPTORTYPEADVANCE_ENTRY ); // Set length of the string in 8-bit byte characters TUint32 length; @@ -453,6 +497,7 @@ *pRawTarget++ = *pRawSource++; aOffset++; } + OstTraceFunctionExit0( DUP1_CSBGENERICDATATYPE_UNPACKDESCRIPTORTYPEADVANCE_EXIT ); } void CSBGenericDataType::UnpackTPtrAdvance(TPtrC16& aDes, TInt& aOffset) @@ -466,6 +511,7 @@ @param aOffset The running index of where the following type begins. Updated by ExtractPointer */ { + OstTraceFunctionEntry0( CSBGENERICDATATYPE_UNPACKTPTRADVANCE_ENTRY ); // Set length of the unicode string in characters TInt32 length; @@ -474,6 +520,7 @@ aDes.Set(reinterpret_cast(iDataBuffer->Ptr() + aOffset), length); aOffset += aDes.Size(); + OstTraceFunctionExit0( CSBGENERICDATATYPE_UNPACKTPTRADVANCE_EXIT ); } void CSBGenericDataType::UnpackTPtrAdvance(TPtrC8& aDes, TInt& aOffset) @@ -487,6 +534,7 @@ @param aOffset The running index of where the following type begins. Updated by ExtractPointer */ { + OstTraceFunctionEntry0( DUP1_CSBGENERICDATATYPE_UNPACKTPTRADVANCE_ENTRY ); // Set length of the string in 8-bit byte characters TInt32 length; @@ -495,6 +543,7 @@ aDes.Set(iDataBuffer->Ptr() + aOffset, length); aOffset += aDes.Size(); + OstTraceFunctionExit0( DUP1_CSBGENERICDATATYPE_UNPACKTPTRADVANCE_EXIT ); } void CSBGenericDataType::PackDescriptorTypeAdvance(const TDesC16& aDes, TInt& aOffset) @@ -506,6 +555,7 @@ @param aOffset The running index of where the following type begins. Updated by ExtractPointer */ { + OstTraceFunctionEntry0( CSBGENERICDATATYPE_PACKDESCRIPTORTYPEADVANCE_ENTRY ); TInt32 length = aDes.Length(); PackTypeAdvance(length, *iDataBuffer, aOffset); @@ -518,6 +568,7 @@ *pRawTarget++ = *pRawSource++; aOffset++; } + OstTraceFunctionExit0( CSBGENERICDATATYPE_PACKDESCRIPTORTYPEADVANCE_EXIT ); } void CSBGenericDataType::PackDescriptorTypeAdvance(const TDesC8& aDes, TInt& aOffset) @@ -529,6 +580,7 @@ @param aOffset The running index of where the following type begins. Updated by ExtractPointer */ { + OstTraceFunctionEntry0( DUP1_CSBGENERICDATATYPE_PACKDESCRIPTORTYPEADVANCE_ENTRY ); TInt32 length = aDes.Size(); PackTypeAdvance(length, *iDataBuffer, aOffset); @@ -541,6 +593,7 @@ *pRawTarget++ = *pRawSource++; aOffset++; } + OstTraceFunctionExit0( DUP1_CSBGENERICDATATYPE_PACKDESCRIPTORTYPEADVANCE_EXIT ); } @@ -554,10 +607,12 @@ @return A pointer to the CSBSecureId object */ { + OstTraceFunctionEntry0( CSBSECUREID_NEWL_ENTRY ); CSBSecureId* self = new(ELeave) CSBSecureId(); CleanupStack::PushL(self); self->ConstructL(aSecureId); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSBSECUREID_NEWL_EXIT ); return self; } @@ -571,10 +626,12 @@ @return A pointer to the CSBSecureId object */ { + OstTraceFunctionEntry0( DUP1_CSBSECUREID_NEWL_ENTRY ); CSBSecureId* self = new(ELeave) CSBSecureId(); CleanupStack::PushL(self); self->ConstructL(aGenericDataType); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP1_CSBSECUREID_NEWL_EXIT ); return self; } @@ -585,7 +642,9 @@ to be large enough to accomodate the data stored by the derived type */ { + OstTraceFunctionEntry0( CSBSECUREID_CSBSECUREID_CONS_ENTRY ); iSize += sizeof(TSecureId); + OstTraceFunctionExit0( CSBSECUREID_CSBSECUREID_CONS_EXIT ); } EXPORT_C CSBSecureId::~CSBSecureId() @@ -593,6 +652,8 @@ C++ Destructor */ { + OstTraceFunctionEntry0( CSBSECUREID_CSBSECUREID_DES_ENTRY ); + OstTraceFunctionExit0( CSBSECUREID_CSBSECUREID_DES_EXIT ); } void CSBSecureId::InitialiseL(TInt& aOffset) @@ -602,6 +663,7 @@ @param aOffset The running offset of where the descriptor has been parsed up to */ { + OstTraceFunctionEntry0( CSBSECUREID_INITIALISEL_ENTRY ); // Throwaway type used for sizeof information only TSecureId sid; @@ -612,6 +674,7 @@ // Increment the size of the data buffer iDataBuffer->Des().SetLength(aOffset); + OstTraceFunctionExit0( CSBSECUREID_INITIALISEL_EXIT ); } void CSBSecureId::ConstructL(TSecureId aSecureId) @@ -621,6 +684,7 @@ @param aSecureId the secure identifier */ { + OstTraceFunctionEntry0( CSBSECUREID_CONSTRUCTL_ENTRY ); TInt offset = 0; // Call the Base ConstructL in order to allocate the buffer BaseConstructL(); @@ -633,6 +697,7 @@ TSecureId sid = aSecureId; PackType(sid, *iDataBuffer, iSecureIdOffset); + OstTraceFunctionExit0( CSBSECUREID_CONSTRUCTL_EXIT ); } void CSBSecureId::ConstructL(CSBGenericDataType* aGenericDataType) @@ -642,23 +707,28 @@ @param aGenericDataType pointer to a CSBGenericDataType object */ { + OstTraceFunctionEntry0( DUP1_CSBSECUREID_CONSTRUCTL_ENTRY ); if (aGenericDataType == NULL) { + OstTrace0(TRACE_ERROR, CSBSECUREID_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } if (ESIDDerivedType != aGenericDataType->DerivedTypeL()) { + OstTrace0(TRACE_ERROR, DUP1_CSBSECUREID_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } // If the descriptor is different to the size we're expecting then it's not correct const TDesC8& des = aGenericDataType->Externalise(); if (des.Size() != iSize) { + OstTrace0(TRACE_ERROR, DUP2_CSBSECUREID_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } // Call the base class ConstructL CSBGenericDataType::ConstructL(des); + OstTraceFunctionExit0( DUP1_CSBSECUREID_CONSTRUCTL_EXIT ); } EXPORT_C TSecureId CSBSecureId::SecureIdL() const @@ -668,10 +738,12 @@ @return The secure identifier */ { + OstTraceFunctionEntry0( CSBSECUREID_SECUREIDL_ENTRY ); TSecureId sid; UnpackType(sid, *iDataBuffer, iSecureIdOffset); + OstTraceFunctionExit0( CSBSECUREID_SECUREIDL_EXIT ); return sid; } @@ -688,10 +760,12 @@ @return A pointer to the CSBPackageId object */ { + OstTraceFunctionEntry0( CSBPACKAGEID_NEWL_ENTRY ); CSBPackageId* self = new(ELeave) CSBPackageId(); CleanupStack::PushL(self); self->ConstructL(aPackageId, aSecureId, aPackageName); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSBPACKAGEID_NEWL_EXIT ); return self; } @@ -705,10 +779,12 @@ @return A pointer to the CSBPackageId object */ { + OstTraceFunctionEntry0( DUP1_CSBPACKAGEID_NEWL_ENTRY ); CSBPackageId* self = new(ELeave) CSBPackageId(); CleanupStack::PushL(self); self->ConstructL(aGenericDataType); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP1_CSBPACKAGEID_NEWL_EXIT ); return self; } @@ -719,7 +795,9 @@ to be large enough to accomodate the data stored by the derived type */ { + OstTraceFunctionEntry0( CSBPACKAGEID_CSBPACKAGEID_CONS_ENTRY ); iSize += (sizeof(TUid) + sizeof(TSecureId) + sizeof(TPackageName)); + OstTraceFunctionExit0( CSBPACKAGEID_CSBPACKAGEID_CONS_EXIT ); } EXPORT_C CSBPackageId::~CSBPackageId() @@ -727,6 +805,8 @@ C++ Destructor */ { + OstTraceFunctionEntry0( CSBPACKAGEID_CSBPACKAGEID_DES_ENTRY ); + OstTraceFunctionExit0( CSBPACKAGEID_CSBPACKAGEID_DES_EXIT ); } @@ -738,6 +818,7 @@ @param aPackageNameLength The lenght of the package name */ { + OstTraceFunctionEntry0( CSBPACKAGEID_INITIALISEL_ENTRY ); TUid pkgId; TSecureId sid; TPackageName pkgName; @@ -758,6 +839,7 @@ // Increment the size of the data buffer iDataBuffer->Des().SetLength(aOffset); + OstTraceFunctionExit0( CSBPACKAGEID_INITIALISEL_EXIT ); } void CSBPackageId::InitialiseL(TInt& aOffset) @@ -767,6 +849,7 @@ @param aOffset The running offset of where the descriptor has been parsed up to */ { + OstTraceFunctionEntry0( DUP1_CSBPACKAGEID_INITIALISEL_ENTRY ); TUid pkgId; TSecureId sid; TPackageName pkgName; @@ -790,6 +873,7 @@ // Increment the size of the data buffer iDataBuffer->Des().SetLength(aOffset); + OstTraceFunctionExit0( DUP1_CSBPACKAGEID_INITIALISEL_EXIT ); } @@ -803,6 +887,7 @@ @param aPackageName the name of the package */ { + OstTraceFunctionEntry0( CSBPACKAGEID_CONSTRUCTL_ENTRY ); // Call the Base ConstructL in order to allocate the buffer BaseConstructL(); @@ -822,6 +907,7 @@ PackType(packageId, *iDataBuffer, iPackageIdOffset); PackType(secureId, *iDataBuffer, iSecureIdOffset); PackType(packageName, *iDataBuffer, iPackageNameOffset); + OstTraceFunctionExit0( CSBPACKAGEID_CONSTRUCTL_EXIT ); } void CSBPackageId::ConstructL(CSBGenericDataType* aGenericDataType) @@ -831,22 +917,27 @@ @param aGenericDataType pointer to a CSBGenericDataType object */ { + OstTraceFunctionEntry0( DUP1_CSBPACKAGEID_CONSTRUCTL_ENTRY ); if (aGenericDataType == NULL) { + OstTrace0(TRACE_ERROR, CSBPACKAGEID_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } if (EPackageDerivedType != aGenericDataType->DerivedTypeL()) { + OstTrace0(TRACE_ERROR, DUP1_CSBPACKAGEID_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } const TDesC8& des = aGenericDataType->Externalise(); if (des.Size() > iSize) { + OstTrace0(TRACE_ERROR, DUP2_CSBPACKAGEID_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } // Call the base class ConstructL CSBGenericDataType::ConstructL(des); + OstTraceFunctionExit0( DUP1_CSBPACKAGEID_CONSTRUCTL_EXIT ); } EXPORT_C TUid CSBPackageId::PackageIdL() const @@ -856,10 +947,12 @@ @return The package identifier */ { + OstTraceFunctionEntry0( CSBPACKAGEID_PACKAGEIDL_ENTRY ); TUid pkgId; UnpackType(pkgId, *iDataBuffer, iPackageIdOffset); + OstTraceFunctionExit0( CSBPACKAGEID_PACKAGEIDL_EXIT ); return pkgId; } @@ -870,10 +963,12 @@ @return The secure identifier */ { + OstTraceFunctionEntry0( CSBPACKAGEID_SECUREIDL_ENTRY ); TSecureId secureId; UnpackType(secureId, *iDataBuffer, iSecureIdOffset); + OstTraceFunctionExit0( CSBPACKAGEID_SECUREIDL_EXIT ); return secureId; } @@ -884,10 +979,12 @@ @return Reference to the package name */ { + OstTraceFunctionEntry0( CSBPACKAGEID_PACKAGENAMEL_ENTRY ); TPackageName pkgName; UnpackType(pkgName, *iDataBuffer, iPackageNameOffset); + OstTraceFunctionExit0( CSBPACKAGEID_PACKAGENAMEL_EXIT ); return pkgName; } @@ -901,10 +998,12 @@ @return A pointer to the CSBGenericTransferType object */ { + OstTraceFunctionEntry0( CSBGENERICTRANSFERTYPE_NEWL_ENTRY ); CSBGenericTransferType* self = new(ELeave) CSBGenericTransferType(); CleanupStack::PushL(self); self->CSBGenericDataType::ConstructL(aDes); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSBGENERICTRANSFERTYPE_NEWL_EXIT ); return self; } @@ -915,10 +1014,12 @@ @param aOffset The running offset of where the descriptor has been parsed up to */ { + OstTraceFunctionEntry0( CSBGENERICTRANSFERTYPE_INITIALISEL_ENTRY ); CSBGenericDataType::InitialiseL(aOffset); if (iSize < (aOffset + sizeof(TDriveNumber))) { + OstTrace0(TRACE_ERROR, CSBGENERICTRANSFERTYPE_INITIALISEL, "Leave: KErrCorrupt"); User::Leave(KErrCorrupt); } @@ -930,6 +1031,7 @@ // Increment the size of the data buffer iDataBuffer->Des().SetLength(aOffset); + OstTraceFunctionExit0( CSBGENERICTRANSFERTYPE_INITIALISEL_EXIT ); } CSBGenericTransferType::CSBGenericTransferType() @@ -939,7 +1041,9 @@ to be large enough to accomodate the data stored by the derived type */ { + OstTraceFunctionEntry0( CSBGENERICTRANSFERTYPE_CSBGENERICTRANSFERTYPE_CONS_ENTRY ); iSize += sizeof(TDriveNumber); + OstTraceFunctionExit0( CSBGENERICTRANSFERTYPE_CSBGENERICTRANSFERTYPE_CONS_EXIT ); } EXPORT_C CSBGenericTransferType::~CSBGenericTransferType() @@ -947,6 +1051,8 @@ C++ Destructor */ { + OstTraceFunctionEntry0( CSBGENERICTRANSFERTYPE_CSBGENERICTRANSFERTYPE_DES_ENTRY ); + OstTraceFunctionExit0( CSBGENERICTRANSFERTYPE_CSBGENERICTRANSFERTYPE_DES_EXIT ); } EXPORT_C TDriveNumber CSBGenericTransferType::DriveNumberL() const @@ -956,10 +1062,12 @@ @return The drive number */ { + OstTraceFunctionEntry0( CSBGENERICTRANSFERTYPE_DRIVENUMBERL_ENTRY ); TDriveNumber driveNum; UnpackType(driveNum, *iDataBuffer, iDriveNumberOffset); + OstTraceFunctionExit0( CSBGENERICTRANSFERTYPE_DRIVENUMBERL_EXIT ); return driveNum; } @@ -975,10 +1083,12 @@ @return A pointer to the CSBSIDTransferType object */ { + OstTraceFunctionEntry0( CSBSIDTRANSFERTYPE_NEWL_ENTRY ); CSBSIDTransferType* self = new(ELeave) CSBSIDTransferType(); CleanupStack::PushL(self); self->ConstructL(aSecureId, aDriveNumber, aTransferDataType); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSBSIDTRANSFERTYPE_NEWL_EXIT ); return self; } @@ -992,10 +1102,12 @@ @return A pointer to the CSBSIDTransferType object */ { + OstTraceFunctionEntry0( DUP1_CSBSIDTRANSFERTYPE_NEWL_ENTRY ); CSBSIDTransferType* self = new(ELeave) CSBSIDTransferType(); CleanupStack::PushL(self); self->ConstructL(aGenericTransferType); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP1_CSBSIDTRANSFERTYPE_NEWL_EXIT ); return self; } @@ -1006,7 +1118,9 @@ to be large enough to accomodate the data stored by the derived type */ { + OstTraceFunctionEntry0( CSBSIDTRANSFERTYPE_CSBSIDTRANSFERTYPE_CONS_ENTRY ); iSize += (sizeof(TSecureId) + sizeof(TTransferDataType)); + OstTraceFunctionExit0( CSBSIDTRANSFERTYPE_CSBSIDTRANSFERTYPE_CONS_EXIT ); } EXPORT_C CSBSIDTransferType::~CSBSIDTransferType() @@ -1014,6 +1128,8 @@ C++ Destructor */ { + OstTraceFunctionEntry0( CSBSIDTRANSFERTYPE_CSBSIDTRANSFERTYPE_DES_ENTRY ); + OstTraceFunctionExit0( CSBSIDTRANSFERTYPE_CSBSIDTRANSFERTYPE_DES_EXIT ); } void CSBSIDTransferType::InitialiseL(TInt& aOffset) @@ -1023,6 +1139,7 @@ @param aOffset The running offset of where the descriptor has been parsed up to */ { + OstTraceFunctionEntry0( CSBSIDTRANSFERTYPE_INITIALISEL_ENTRY ); CSBGenericTransferType::InitialiseL(aOffset); TSecureId sid; @@ -1036,6 +1153,7 @@ // Increment the size of the data buffer iDataBuffer->Des().SetLength(aOffset); + OstTraceFunctionExit0( CSBSIDTRANSFERTYPE_INITIALISEL_EXIT ); } void CSBSIDTransferType::ConstructL(TSecureId aSecureId, TDriveNumber aDriveNumber, @@ -1048,6 +1166,7 @@ @param aTransferDataType the type of the data you wish to transfer */ { + OstTraceFunctionEntry0( CSBSIDTRANSFERTYPE_CONSTRUCTL_ENTRY ); TInt offset = 0; BaseConstructL(); @@ -1064,6 +1183,7 @@ PackType(driveNum, *iDataBuffer, iDriveNumberOffset); PackType(sid, *iDataBuffer, iSecureIdOffset); PackType(transType, *iDataBuffer, iTransferDataTypeOffset); + OstTraceFunctionExit0( CSBSIDTRANSFERTYPE_CONSTRUCTL_EXIT ); } void CSBSIDTransferType::ConstructL(CSBGenericTransferType* aGenericTransferType) @@ -1073,23 +1193,28 @@ @param aGenericTransferType pointer to a CSBGenericTransferType object */ { + OstTraceFunctionEntry0( DUP1_CSBSIDTRANSFERTYPE_CONSTRUCTL_ENTRY ); if (aGenericTransferType == NULL) { + OstTrace0(TRACE_ERROR, CSBSIDTRANSFERTYPE_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } if (ESIDTransferDerivedType != aGenericTransferType->DerivedTypeL()) { + OstTrace0(TRACE_ERROR, DUP1_CSBSIDTRANSFERTYPE_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } // If the descriptor is different to the size we're expecting then it's not correct const TDesC8& des = aGenericTransferType->Externalise(); if (des.Size() != iSize) { + OstTrace0(TRACE_ERROR, DUP2_CSBSIDTRANSFERTYPE_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } // Call the base class ConstructL CSBGenericDataType::ConstructL(des); + OstTraceFunctionExit0( DUP1_CSBSIDTRANSFERTYPE_CONSTRUCTL_EXIT ); } EXPORT_C TSecureId CSBSIDTransferType::SecureIdL() const @@ -1099,10 +1224,12 @@ @return The secure identifier */ { + OstTraceFunctionEntry0( CSBSIDTRANSFERTYPE_SECUREIDL_ENTRY ); TSecureId sid; UnpackType(sid, *iDataBuffer, iSecureIdOffset); + OstTraceFunctionExit0( CSBSIDTRANSFERTYPE_SECUREIDL_EXIT ); return sid; } @@ -1113,10 +1240,12 @@ @return The transfer data type */ { + OstTraceFunctionEntry0( CSBSIDTRANSFERTYPE_DATATYPEL_ENTRY ); TTransferDataType transType; UnpackType(transType, *iDataBuffer, iTransferDataTypeOffset); + OstTraceFunctionExit0( CSBSIDTRANSFERTYPE_DATATYPEL_EXIT ); return transType; } @@ -1134,10 +1263,12 @@ @return A pointer to the CSBPackageTransferType object */ { + OstTraceFunctionEntry0( CSBPACKAGETRANSFERTYPE_NEWL_ENTRY ); CSBPackageTransferType* self = new(ELeave) CSBPackageTransferType(); CleanupStack::PushL(self); self->ConstructL(aPackageId, aDriveNumber, aPackageDataType); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSBPACKAGETRANSFERTYPE_NEWL_EXIT ); return self; } @@ -1151,10 +1282,12 @@ @return A pointer to the CSBPackageTransferType object */ { + OstTraceFunctionEntry0( DUP1_CSBPACKAGETRANSFERTYPE_NEWL_ENTRY ); CSBPackageTransferType* self = new(ELeave) CSBPackageTransferType(); CleanupStack::PushL(self); self->ConstructL(aGenericTransferType); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP1_CSBPACKAGETRANSFERTYPE_NEWL_EXIT ); return self; } @@ -1165,7 +1298,9 @@ to be large enough to accomodate the data stored by the derived type */ { + OstTraceFunctionEntry0( CSBPACKAGETRANSFERTYPE_CSBPACKAGETRANSFERTYPE_CONS_ENTRY ); iSize += (sizeof(TUid) + sizeof(TPackageDataType)); + OstTraceFunctionExit0( CSBPACKAGETRANSFERTYPE_CSBPACKAGETRANSFERTYPE_CONS_EXIT ); } void CSBPackageTransferType::InitialiseL(TInt& aOffset) @@ -1175,6 +1310,7 @@ @param aOffset The running offset of where the descriptor has been parsed up to */ { + OstTraceFunctionEntry0( CSBPACKAGETRANSFERTYPE_INITIALISEL_ENTRY ); CSBGenericTransferType::InitialiseL(aOffset); TUid pkgId; @@ -1188,6 +1324,7 @@ // Increment the size of the data buffer iDataBuffer->Des().SetLength(aOffset); + OstTraceFunctionExit0( CSBPACKAGETRANSFERTYPE_INITIALISEL_EXIT ); } EXPORT_C CSBPackageTransferType::~CSBPackageTransferType() @@ -1195,6 +1332,8 @@ C++ Destructor */ { + OstTraceFunctionEntry0( CSBPACKAGETRANSFERTYPE_CSBPACKAGETRANSFERTYPE_DES_ENTRY ); + OstTraceFunctionExit0( CSBPACKAGETRANSFERTYPE_CSBPACKAGETRANSFERTYPE_DES_EXIT ); } void CSBPackageTransferType::ConstructL(TUid aPackageId, TDriveNumber aDriveNumber, @@ -1207,6 +1346,7 @@ @param aPackageDataType the type of the data you wish to transfer */ { + OstTraceFunctionEntry0( CSBPACKAGETRANSFERTYPE_CONSTRUCTL_ENTRY ); TInt offset = 0; BaseConstructL(); @@ -1223,6 +1363,7 @@ PackType(driveNum, *iDataBuffer, iDriveNumberOffset); PackType(pkgId, *iDataBuffer, iPackageIdOffset); PackType(pkgDataType, *iDataBuffer, iPackageDataTypeOffset); + OstTraceFunctionExit0( CSBPACKAGETRANSFERTYPE_CONSTRUCTL_EXIT ); } void CSBPackageTransferType::ConstructL(CSBGenericTransferType* aGenericTransferType) @@ -1232,12 +1373,15 @@ @param aGenericTransferType pointer to a CSBGenericTransferType object */ { + OstTraceFunctionEntry0( DUP1_CSBPACKAGETRANSFERTYPE_CONSTRUCTL_ENTRY ); if (aGenericTransferType == NULL) { + OstTrace0(TRACE_ERROR, CSBPACKAGETRANSFERTYPE_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } if (EPackageTransferDerivedType != aGenericTransferType->DerivedTypeL()) { + OstTrace0(TRACE_ERROR, DUP1_CSBPACKAGETRANSFERTYPE_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } // If the descriptor is different to the size we're expecting then it's not correct @@ -1245,11 +1389,13 @@ if (des.Size() != iSize) { + OstTrace0(TRACE_ERROR, DUP2_CSBPACKAGETRANSFERTYPE_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } // Call the base class ConstructL CSBGenericDataType::ConstructL(des); + OstTraceFunctionExit0( DUP1_CSBPACKAGETRANSFERTYPE_CONSTRUCTL_EXIT ); } EXPORT_C TUid CSBPackageTransferType::PackageIdL() const @@ -1259,10 +1405,12 @@ @return The package identifier */ { + OstTraceFunctionEntry0( CSBPACKAGETRANSFERTYPE_PACKAGEIDL_ENTRY ); TUid pkgId; UnpackType(pkgId, *iDataBuffer, iPackageIdOffset); + OstTraceFunctionExit0( CSBPACKAGETRANSFERTYPE_PACKAGEIDL_EXIT ); return pkgId; } @@ -1273,10 +1421,12 @@ @return The package data type */ { + OstTraceFunctionEntry0( CSBPACKAGETRANSFERTYPE_DATATYPEL_ENTRY ); TPackageDataType pkgDataType; UnpackType(pkgDataType, *iDataBuffer, iPackageDataTypeOffset); + OstTraceFunctionExit0( CSBPACKAGETRANSFERTYPE_DATATYPEL_EXIT ); return pkgDataType; } @@ -1295,10 +1445,12 @@ @return A pointer to the CSBJavaId object */ { + OstTraceFunctionEntry0( CSBJAVAID_NEWL_ENTRY ); CSBJavaId* self = new(ELeave) CSBJavaId(aSuiteName, aSuiteVendor, aSuiteVersion, aSuiteHash); CleanupStack::PushL(self); self->ConstructL(aSuiteName, aSuiteVendor, aSuiteVersion, aSuiteHash); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSBJAVAID_NEWL_EXIT ); return self; } @@ -1312,15 +1464,19 @@ @return A pointer to the CSBJavaId object */ { + OstTraceFunctionEntry0( DUP1_CSBJAVAID_NEWL_ENTRY ); CSBJavaId* self = new(ELeave) CSBJavaId; CleanupStack::PushL(self); self->ConstructFromExistingL(aGenericDataType); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP1_CSBJAVAID_NEWL_EXIT ); return self; } CSBJavaId::CSBJavaId() { + OstTraceFunctionEntry0( CSBJAVAID_CSBJAVAID_CONS_ENTRY ); + OstTraceFunctionExit0( CSBJAVAID_CSBJAVAID_CONS_EXIT ); } CSBJavaId::CSBJavaId(const TDesC& aSuiteName, const TDesC& aSuiteVendor, @@ -1336,8 +1492,10 @@ @param aSuiteVersion The version of the MIDlet suite */ { + OstTraceFunctionEntry0( DUP1_CSBJAVAID_CSBJAVAID_CONS_ENTRY ); iSize += (4 * sizeof(TUint32)) + aSuiteName.Size() + aSuiteVendor.Size() + aSuiteVersion.Size() + aSuiteHash.Size(); + OstTraceFunctionExit0( DUP1_CSBJAVAID_CSBJAVAID_CONS_EXIT ); } EXPORT_C CSBJavaId::~CSBJavaId() @@ -1345,6 +1503,8 @@ C++ Destructor */ { + OstTraceFunctionEntry0( CSBJAVAID_CSBJAVAID_DES_ENTRY ); + OstTraceFunctionExit0( CSBJAVAID_CSBJAVAID_DES_EXIT ); } void CSBJavaId::InitialiseL(TInt& aOffset) @@ -1354,6 +1514,7 @@ @param aOffset The running offset of where the descriptor has been parsed up to */ { + OstTraceFunctionEntry0( CSBJAVAID_INITIALISEL_ENTRY ); CSBGenericDataType::InitialiseL(aOffset); UnpackTPtrAdvance(iSuiteName, aOffset); @@ -1363,6 +1524,7 @@ // Increment the size of the data buffer iDataBuffer->Des().SetLength(aOffset); + OstTraceFunctionExit0( CSBJAVAID_INITIALISEL_EXIT ); } void CSBJavaId::InitialiseL(TInt& aOffset, const TDesC& aSuiteName, const TDesC& aSuiteVendor, @@ -1377,6 +1539,7 @@ @param aSuiteVersion The version of the MIDlet suite */ { + OstTraceFunctionEntry0( DUP1_CSBJAVAID_INITIALISEL_ENTRY ); TSBDerivedType derivedType = EJavaDerivedType; PackType(derivedType, *iDataBuffer, aOffset); @@ -1399,6 +1562,7 @@ // Increment the size of the data buffer iDataBuffer->Des().SetLength(aOffset); + OstTraceFunctionExit0( DUP1_CSBJAVAID_INITIALISEL_EXIT ); } void CSBJavaId::ConstructL(const TDesC& aSuiteName, const TDesC& aSuiteVendor, @@ -1412,6 +1576,7 @@ @param aSuiteVersion The version of the MIDlet suite */ { + OstTraceFunctionEntry0( CSBJAVAID_CONSTRUCTL_ENTRY ); // Call the Base ConstructL in order to allocate the buffer BaseConstructL(); @@ -1419,6 +1584,7 @@ // Initialise all member pointers right up the inheritence tree InitialiseL(offset, aSuiteName, aSuiteVendor, aSuiteVersion, aSuiteHash); + OstTraceFunctionExit0( CSBJAVAID_CONSTRUCTL_EXIT ); } void CSBJavaId::ConstructFromExistingL(CSBGenericDataType* aGenericDataType) @@ -1428,16 +1594,20 @@ @param aGenericDataType pointer to a CSBGenericDataType object */ { + OstTraceFunctionEntry0( CSBJAVAID_CONSTRUCTFROMEXISTINGL_ENTRY ); if (aGenericDataType == NULL) { + OstTrace0(TRACE_ERROR, CSBJAVAID_CONSTRUCTFROMEXISTINGL, "Leave: KErrArgument"); User::Leave(KErrArgument); } if (EJavaDerivedType != aGenericDataType->DerivedTypeL()) { + OstTrace0(TRACE_ERROR, DUP1_CSBJAVAID_CONSTRUCTFROMEXISTINGL, "Leave: KErrArgument"); User::Leave(KErrArgument); } // Call the base class ConstructL CSBGenericDataType::ConstructL(aGenericDataType->Externalise()); + OstTraceFunctionExit0( CSBJAVAID_CONSTRUCTFROMEXISTINGL_EXIT ); } EXPORT_C const TDesC& CSBJavaId::SuiteNameL() const @@ -1492,10 +1662,12 @@ @return A pointer to the CSBJavaTransferType object */ { + OstTraceFunctionEntry0( CSBJAVATRANSFERTYPE_NEWL_ENTRY ); CSBJavaTransferType* self = new(ELeave) CSBJavaTransferType(aSuiteHash); CleanupStack::PushL(self); self->ConstructL(aSuiteHash, aDriveNumber, aTransferDataType); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSBJAVATRANSFERTYPE_NEWL_EXIT ); return self; } @@ -1509,10 +1681,12 @@ @return A pointer to the CSBJavaTransferType object */ { + OstTraceFunctionEntry0( DUP1_CSBJAVATRANSFERTYPE_NEWL_ENTRY ); CSBJavaTransferType* self = new(ELeave) CSBJavaTransferType; CleanupStack::PushL(self); self->ConstructL(aGenericTransferType); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP1_CSBJAVATRANSFERTYPE_NEWL_EXIT ); return self; } @@ -1521,6 +1695,8 @@ C++ Constructor */ { + OstTraceFunctionEntry0( CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_CONS_ENTRY ); + OstTraceFunctionExit0( CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_CONS_EXIT ); } CSBJavaTransferType::CSBJavaTransferType(const TDesC& aSuiteHash) @@ -1530,7 +1706,9 @@ to be large enough to accomodate the data stored by the derived type */ { + OstTraceFunctionEntry0( DUP1_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_CONS_ENTRY ); iSize += aSuiteHash.Size() + sizeof(TUint32) + sizeof(TJavaTransferType); + OstTraceFunctionExit0( DUP1_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_CONS_EXIT ); } EXPORT_C CSBJavaTransferType::~CSBJavaTransferType() @@ -1538,6 +1716,8 @@ C++ Destructor */ { + OstTraceFunctionEntry0( CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_DES_ENTRY ); + OstTraceFunctionExit0( CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_DES_EXIT ); } void CSBJavaTransferType::InitialiseL(TInt& aOffset) @@ -1547,6 +1727,7 @@ @param aOffset The running offset of where the descriptor has been parsed up to */ { + OstTraceFunctionEntry0( CSBJAVATRANSFERTYPE_INITIALISEL_ENTRY ); CSBGenericTransferType::InitialiseL(aOffset); iTransferDataTypeOffset = aOffset; @@ -1557,6 +1738,7 @@ // Increment the size of the data buffer iDataBuffer->Des().SetLength(aOffset); + OstTraceFunctionExit0( CSBJAVATRANSFERTYPE_INITIALISEL_EXIT ); } void CSBJavaTransferType::InitialiseL(TInt& aOffset, const TDesC& aSuiteHash, TDriveNumber aDriveNumber, @@ -1569,6 +1751,7 @@ @param aSuiteVersion The version of the MIDlet suite */ { + OstTraceFunctionEntry0( DUP1_CSBJAVATRANSFERTYPE_INITIALISEL_ENTRY ); TSBDerivedType derivedType = EJavaTransferDerivedType; PackType(derivedType, *iDataBuffer, aOffset); @@ -1593,6 +1776,7 @@ // Increment the size of the data buffer iDataBuffer->Des().SetLength(aOffset); + OstTraceFunctionExit0( DUP1_CSBJAVATRANSFERTYPE_INITIALISEL_EXIT ); } void CSBJavaTransferType::ConstructL(const TDesC& aSuiteHash, TDriveNumber aDriveNumber, @@ -1605,11 +1789,13 @@ @param aTransferDataType the type of the data you wish to transfer */ { + OstTraceFunctionEntry0( CSBJAVATRANSFERTYPE_CONSTRUCTL_ENTRY ); TInt offset = 0; BaseConstructL(); InitialiseL(offset, aSuiteHash, aDriveNumber, aTransferDataType); + OstTraceFunctionExit0( CSBJAVATRANSFERTYPE_CONSTRUCTL_EXIT ); } void CSBJavaTransferType::ConstructL(CSBGenericTransferType* aGenericTransferType) @@ -1619,16 +1805,20 @@ @param aGenericTransferType pointer to a CSBGenericTransferType object */ { + OstTraceFunctionEntry0( DUP1_CSBJAVATRANSFERTYPE_CONSTRUCTL_ENTRY ); if (aGenericTransferType == NULL) { + OstTrace0(TRACE_ERROR, CSBJAVATRANSFERTYPE_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } if (EJavaTransferDerivedType != aGenericTransferType->DerivedTypeL()) { + OstTrace0(TRACE_ERROR, DUP1_CSBJAVATRANSFERTYPE_CONSTRUCTL, "Leave: KErrArgument"); User::Leave(KErrArgument); } // Call the base class ConstructL CSBGenericDataType::ConstructL(aGenericTransferType->Externalise()); + OstTraceFunctionExit0( DUP1_CSBJAVATRANSFERTYPE_CONSTRUCTL_EXIT ); } EXPORT_C const TDesC& CSBJavaTransferType::SuiteHashL() const @@ -1648,10 +1838,12 @@ @return The transfer data type */ { + OstTraceFunctionEntry0( CSBJAVATRANSFERTYPE_DATATYPEL_ENTRY ); TJavaTransferType transType; UnpackType(transType, *iDataBuffer, iTransferDataTypeOffset); + OstTraceFunctionExit0( CSBJAVATRANSFERTYPE_DATATYPEL_EXIT ); return transType; } @@ -1666,9 +1858,11 @@ @return Instance of CSBEFileEntry created from data supplied in aEntry */ { + OstTraceFunctionEntry0( CSBEFILEENTRY_NEWLC_ENTRY ); CSBEFileEntry* self = new (ELeave) CSBEFileEntry(aEntry); CleanupStack::PushL(self); self->ConstructL(aEntry, aSession); + OstTraceFunctionExit0( CSBEFILEENTRY_NEWLC_EXIT ); return self; } @@ -1682,15 +1876,19 @@ @return Instance of CSBEFileEntry containing the information previously packed into aStream */ { + OstTraceFunctionEntry0( DUP1_CSBEFILEENTRY_NEWLC_ENTRY ); CSBEFileEntry* self = new (ELeave) CSBEFileEntry; CleanupStack::PushL(self); self->InternaliseL(aStream, aBytesRead); + OstTraceFunctionExit0( DUP1_CSBEFILEENTRY_NEWLC_EXIT ); return self; } CSBEFileEntry::CSBEFileEntry() /** C++ ctor */ { + OstTraceFunctionEntry0( CSBEFILEENTRY_CSBEFILEENTRY_CONS_ENTRY ); + OstTraceFunctionExit0( CSBEFILEENTRY_CSBEFILEENTRY_CONS_EXIT ); } CSBEFileEntry::CSBEFileEntry(const TEntry& aEntry) @@ -1699,13 +1897,19 @@ */ : iAtt(aEntry.iAtt), iSize(aEntry.iSize), iModified(aEntry.iModified), iUidType(aEntry.iType) { + OstTraceFunctionEntry0( DUP1_CSBEFILEENTRY_CSBEFILEENTRY_CONS_ENTRY ); + OstTraceFunctionExit0( DUP1_CSBEFILEENTRY_CSBEFILEENTRY_CONS_EXIT ); } EXPORT_C CSBEFileEntry::~CSBEFileEntry() /** C++ dtor */ { + OstTraceFunctionEntry0( CSBEFILEENTRY_CSBEFILEENTRY_DES_ENTRY ); delete iType; + iType = NULL; delete iFilename; + iFilename = NULL; + OstTraceFunctionExit0( CSBEFILEENTRY_CSBEFILEENTRY_DES_EXIT ); } void CSBEFileEntry::ConstructL(const TEntry& aEntry, RApaLsSession& aSession) @@ -1715,12 +1919,14 @@ @param aSession Required to map from TEntry's UID MIME type into a textual representation */ { + OstTraceFunctionEntry0( CSBEFILEENTRY_CONSTRUCTL_ENTRY ); // Look up the textual mime type of the file instead of the numerical one given by TEntry TUid uidForType; TDataType appDataType; aSession.AppForDocument(aEntry.iName,uidForType,appDataType); iType = appDataType.Des().AllocL(); iFilename = aEntry.iName.AllocL(); + OstTraceFunctionExit0( CSBEFILEENTRY_CONSTRUCTL_EXIT ); } void CSBEFileEntry::InternaliseL(const TDesC8& aStream, TInt& aBytesRead) @@ -1733,6 +1939,7 @@ in order to internalise this single instance of CSBEFileEntry */ { + OstTraceFunctionEntry0( CSBEFILEENTRY_INTERNALISEL_ENTRY ); RDesReadStream stream(aStream); CleanupClosePushL(stream); @@ -1764,6 +1971,7 @@ aBytesRead = CalculatePackedSize(); CleanupStack::PopAndDestroy(&stream); + OstTraceFunctionExit0( CSBEFILEENTRY_INTERNALISEL_EXIT ); } TUint16 CSBEFileEntry::CalculatePackedSize() const @@ -1771,6 +1979,7 @@ @return the size in bytes of the externalised representation of this object */ { + OstTraceFunctionEntry0( CSBEFILEENTRY_CALCULATEPACKEDSIZE_ENTRY ); TInt total = sizeof(TUint32) + // Length of attribute field sizeof(TInt32) + // Length of file size @@ -1780,6 +1989,7 @@ iType->Size() + // Text MIME type data sizeof(TUint16) + // Filename length iFilename->Size(); // Filename data + OstTraceFunctionExit0( CSBEFILEENTRY_CALCULATEPACKEDSIZE_EXIT ); return total; } @@ -1790,6 +2000,7 @@ @return An externalised instance of this object suitable for Internalising */ { + OstTraceFunctionEntry0( CSBEFILEENTRY_EXTERNALISELC_ENTRY ); TUint16 packedSize = CalculatePackedSize(); HBufC8* pBuf = HBufC8::NewLC(packedSize); TPtr8 buf(pBuf->Des()); @@ -1809,6 +2020,7 @@ stream.WriteL(*iFilename); CleanupStack::PopAndDestroy(&stream); + OstTraceFunctionExit0( CSBEFILEENTRY_EXTERNALISELC_EXIT ); return pBuf; } diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/backupandrestore/backupengine/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 backupandrestore/backupengine/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/backupandrestore/backupengine/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,2449 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[TRACE]TRACE_ERROR[0x82]_CDATAOWNERINFO_CONSTRUCTL=0x1c5 +[TRACE]TRACE_ERROR[0x82]_CHEAPWRAPPER_READBUFFERL=0x19d +[TRACE]TRACE_ERROR[0x82]_CHEAPWRAPPER_WRITEBUFFERL=0x19e +[TRACE]TRACE_ERROR[0x82]_CSBECALLBACKHANDLER_RUNL=0x2d2 +[TRACE]TRACE_ERROR[0x82]_CSBECLIENT_CONSTRUCTL=0x2bc +[TRACE]TRACE_ERROR[0x82]_CSBGENERICDATATYPE_INITIALISEL=0x1c6 +[TRACE]TRACE_ERROR[0x82]_CSBGENERICTRANSFERTYPE_INITIALISEL=0x1ce +[TRACE]TRACE_ERROR[0x82]_CSBJAVAID_CONSTRUCTFROMEXISTINGL=0x1d5 +[TRACE]TRACE_ERROR[0x82]_CSBJAVATRANSFERTYPE_CONSTRUCTL=0x1d7 +[TRACE]TRACE_ERROR[0x82]_CSBPACKAGEID_CONSTRUCTL=0x1cb +[TRACE]TRACE_ERROR[0x82]_CSBPACKAGETRANSFERTYPE_CONSTRUCTL=0x1d2 +[TRACE]TRACE_ERROR[0x82]_CSBSECUREID_CONSTRUCTL=0x1c8 +[TRACE]TRACE_ERROR[0x82]_CSBSIDTRANSFERTYPE_CONSTRUCTL=0x1cf +[TRACE]TRACE_ERROR[0x82]_DUP1_CSBGENERICDATATYPE_INITIALISEL=0x1c7 +[TRACE]TRACE_ERROR[0x82]_DUP1_CSBJAVAID_CONSTRUCTFROMEXISTINGL=0x1d6 +[TRACE]TRACE_ERROR[0x82]_DUP1_CSBJAVATRANSFERTYPE_CONSTRUCTL=0x1d8 +[TRACE]TRACE_ERROR[0x82]_DUP1_CSBPACKAGEID_CONSTRUCTL=0x1cc +[TRACE]TRACE_ERROR[0x82]_DUP1_CSBPACKAGETRANSFERTYPE_CONSTRUCTL=0x1d3 +[TRACE]TRACE_ERROR[0x82]_DUP1_CSBSECUREID_CONSTRUCTL=0x1c9 +[TRACE]TRACE_ERROR[0x82]_DUP1_CSBSIDTRANSFERTYPE_CONSTRUCTL=0x1d0 +[TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_LISTOFDATAOWNERSL=0x2cc +[TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_PUBLICFILELISTL=0x2cd +[TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_PUBLICFILELISTXMLL=0x2c2 +[TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_RAWPUBLICFILELISTL=0x2c0 +[TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_REQUESTDATAL=0x2c8 +[TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_SIDSTATUSL=0x2c6 +[TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_SUPPLYDATAL=0x2c9 +[TRACE]TRACE_ERROR[0x82]_DUP2_CSBPACKAGEID_CONSTRUCTL=0x1cd +[TRACE]TRACE_ERROR[0x82]_DUP2_CSBPACKAGETRANSFERTYPE_CONSTRUCTL=0x1d4 +[TRACE]TRACE_ERROR[0x82]_DUP2_CSBSECUREID_CONSTRUCTL=0x1ca +[TRACE]TRACE_ERROR[0x82]_DUP2_CSBSIDTRANSFERTYPE_CONSTRUCTL=0x1d1 +[TRACE]TRACE_ERROR[0x82]_DUP2_RSBECLIENTSESSION_PUBLICFILELISTL=0x2d0 +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL=0x2ca +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_EXPECTEDDATASIZEL=0x2cb +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_LISTOFDATAOWNERSL=0x2bd +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_POPULATELARGEPUBLICFILELISTL=0x2d1 +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_POPULATELISTOFDATAOWNERSL=0x2ce +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_POPULATEPUBLICFILELISTL=0x2cf +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_PUBLICFILELISTL=0x2be +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_PUBLICFILELISTXMLL=0x2c1 +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_RAWPUBLICFILELISTL=0x2bf +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_SETBURMODEL=0x2c3 +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_SETSIDLISTFORPARTIALBURL=0x2c4 +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_SIDSTATUSL=0x2c5 +[TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_TRANSFERDATAINFOL=0x2c7 +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_CDATAOWNERINFO_CONS_ENTRY=0x7cf +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_CDATAOWNERINFO_CONS_EXIT=0x7d0 +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_CDATAOWNERINFO_DES_ENTRY=0x7d1 +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_CDATAOWNERINFO_DES_EXIT=0x7d2 +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_CONSTRUCTL_ENTRY=0x7d3 +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_CONSTRUCTL_EXIT=0x7d4 +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_EXTERNALISELC_ENTRY=0x7e7 +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_EXTERNALISELC_EXIT=0x7e8 +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_EXTERNALISEL_ENTRY=0x7e5 +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_EXTERNALISEL_EXIT=0x7e6 +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_NEWL_ENTRY=0x7cb +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_NEWL_EXIT=0x7cc +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_SIZE_ENTRY=0x7e9 +[TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_SIZE_EXIT=0x7ea +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_BUFFER_ENTRY=0x74b +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_BUFFER_EXIT=0x74c +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_CHEAPWRAPPER_DES_ENTRY=0x74f +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_CHEAPWRAPPER_DES_EXIT=0x750 +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_CLEANREADBUFFER_ENTRY=0x74d +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_CLEANREADBUFFER_EXIT=0x74e +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_NEWL_ENTRY=0x742 +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_NEWL_EXIT=0x743 +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_READBUFFERL_ENTRY=0x744 +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_READBUFFERL_EXIT=0x745 +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_RESETHEAP_ENTRY=0x749 +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_RESETHEAP_EXIT=0x74a +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_WRITEBUFFERL_ENTRY=0x746 +[TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_WRITEBUFFERL_EXIT=0x747 +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CANCELREQUEST_ENTRY=0xc65 +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CANCELREQUEST_EXIT=0xc66 +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_COMPLETEOBSERVER_ENTRY=0xc6b +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_COMPLETEOBSERVER_EXIT=0xc6c +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CONSTRUCTL_ENTRY=0xc5d +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CONSTRUCTL_EXIT=0xc5e +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_CONS_ENTRY=0xc5f +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_CONS_EXIT=0xc60 +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_DES_ENTRY=0xc61 +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_DES_EXIT=0xc62 +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_DOCANCEL_ENTRY=0xc69 +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_DOCANCEL_EXIT=0xc6a +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_NEWL_ENTRY=0xc5b +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_NEWL_EXIT=0xc5c +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_RUNERROR_ENTRY=0xc6d +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_RUNERROR_EXIT=0xc6e +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_RUNL_ENTRY=0xc67 +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_RUNL_EXIT=0xc68 +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_STARTL_ENTRY=0xc63 +[TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_STARTL_EXIT=0xc64 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_ALLSNAPSHOTSSUPPLIEDL_ENTRY=0xc06 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_ALLSNAPSHOTSSUPPLIEDL_EXIT=0xc07 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_ALLSYSTEMFILESRESTOREDL_ENTRY=0xc14 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_ALLSYSTEMFILESRESTOREDL_EXIT=0xc15 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_ALLSYSTEMFILESRESTORED_ENTRY=0xc0a +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_ALLSYSTEMFILESRESTORED_EXIT=0xc0b +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CONSTRUCTL_ENTRY=0xbe8 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CONSTRUCTL_EXIT=0xbe9 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CSBECLIENT_CONS_ENTRY=0xbe4 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CSBECLIENT_CONS_EXIT=0xbe5 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CSBECLIENT_DES_ENTRY=0xbea +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CSBECLIENT_DES_EXIT=0xbeb +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_DATACHECKSUM_ENTRY=0xc16 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_DATACHECKSUM_EXIT=0xc17 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_EXPECTEDDATASIZEL_ENTRY=0xc08 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_EXPECTEDDATASIZEL_EXIT=0xc09 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_LISTOFDATAOWNERSL_ENTRY=0xbec +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_LISTOFDATAOWNERSL_EXIT=0xbed +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_NEWL_ENTRY=0xbe6 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_NEWL_EXIT=0xbe7 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_PUBLICFILELISTL_ENTRY=0xbee +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_PUBLICFILELISTL_EXIT=0xbef +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_PUBLICFILELISTXMLL_ENTRY=0xbf2 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_PUBLICFILELISTXMLL_EXIT=0xbf3 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_RAWPUBLICFILELISTL_ENTRY=0xbf0 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_RAWPUBLICFILELISTL_EXIT=0xbf1 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_REQUESTDATAL_ENTRY=0xbfe +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_REQUESTDATAL_EXIT=0xbff +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SETBURMODEL_ENTRY=0xbf4 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SETBURMODEL_EXIT=0xbf5 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SETSIDLISTFORPARTIALBURL_ENTRY=0xbf6 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SETSIDLISTFORPARTIALBURL_EXIT=0xbf7 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SIDSTATUSL_ENTRY=0xbf8 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SIDSTATUSL_EXIT=0xbf9 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SUPPLYDATAL_ENTRY=0xc02 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SUPPLYDATAL_EXIT=0xc03 +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_TRANSFERDATAADDRESSL_ENTRY=0xbfa +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_TRANSFERDATAADDRESSL_EXIT=0xbfb +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_TRANSFERDATAINFOL_ENTRY=0xbfc +[TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_TRANSFERDATAINFOL_EXIT=0xbfd +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CALCULATEPACKEDSIZE_ENTRY=0x899 +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CALCULATEPACKEDSIZE_EXIT=0x89a +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CONSTRUCTL_ENTRY=0x895 +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CONSTRUCTL_EXIT=0x896 +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CSBEFILEENTRY_CONS_ENTRY=0x88f +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CSBEFILEENTRY_CONS_EXIT=0x890 +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CSBEFILEENTRY_DES_ENTRY=0x893 +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CSBEFILEENTRY_DES_EXIT=0x894 +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_EXTERNALISELC_ENTRY=0x89b +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_EXTERNALISELC_EXIT=0x89c +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_INTERNALISEL_ENTRY=0x897 +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_INTERNALISEL_EXIT=0x898 +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_NEWLC_ENTRY=0x88b +[TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_NEWLC_EXIT=0x88c +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_BASECONSTRUCTL_ENTRY=0x7f5 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_BASECONSTRUCTL_EXIT=0x7f6 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_CONSTRUCTL_ENTRY=0x7f1 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_CONSTRUCTL_EXIT=0x7f2 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_CSBGENERICDATATYPE_CONS_ENTRY=0x7ed +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_CSBGENERICDATATYPE_CONS_EXIT=0x7ee +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_CSBGENERICDATATYPE_DES_ENTRY=0x7ef +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_CSBGENERICDATATYPE_DES_EXIT=0x7f0 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_DERIVEDTYPEL_ENTRY=0x7f9 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_DERIVEDTYPEL_EXIT=0x7fa +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_INITIALISEL_ENTRY=0x7f3 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_INITIALISEL_EXIT=0x7f4 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_NEWL_ENTRY=0x7eb +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_NEWL_EXIT=0x7ec +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_PACKDESCRIPTORTYPEADVANCE_ENTRY=0x803 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_PACKDESCRIPTORTYPEADVANCE_EXIT=0x804 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_UNPACKDESCRIPTORTYPEADVANCE_ENTRY=0x7fb +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_UNPACKDESCRIPTORTYPEADVANCE_EXIT=0x7fc +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_UNPACKTPTRADVANCE_ENTRY=0x7ff +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_UNPACKTPTRADVANCE_EXIT=0x800 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_CSBGENERICTRANSFERTYPE_CONS_ENTRY=0x831 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_CSBGENERICTRANSFERTYPE_CONS_EXIT=0x832 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_CSBGENERICTRANSFERTYPE_DES_ENTRY=0x833 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_CSBGENERICTRANSFERTYPE_DES_EXIT=0x834 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_DRIVENUMBERL_ENTRY=0x835 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_DRIVENUMBERL_EXIT=0x836 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_INITIALISEL_ENTRY=0x82f +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_INITIALISEL_EXIT=0x830 +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_NEWL_ENTRY=0x82d +[TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_NEWL_EXIT=0x82e +[TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CONSTRUCTFROMEXISTINGL_ENTRY=0x86b +[TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CONSTRUCTFROMEXISTINGL_EXIT=0x86c +[TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CONSTRUCTL_ENTRY=0x869 +[TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CONSTRUCTL_EXIT=0x86a +[TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CSBJAVAID_CONS_ENTRY=0x85f +[TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CSBJAVAID_CONS_EXIT=0x860 +[TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CSBJAVAID_DES_ENTRY=0x863 +[TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CSBJAVAID_DES_EXIT=0x864 +[TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_INITIALISEL_ENTRY=0x865 +[TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_INITIALISEL_EXIT=0x866 +[TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_NEWL_ENTRY=0x85b +[TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_NEWL_EXIT=0x85c +[TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_CONSTRUCTL_ENTRY=0x883 +[TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_CONSTRUCTL_EXIT=0x884 +[TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_CONS_ENTRY=0x879 +[TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_CONS_EXIT=0x87a +[TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_DES_ENTRY=0x87d +[TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_DES_EXIT=0x87e +[TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_DATATYPEL_ENTRY=0x889 +[TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_DATATYPEL_EXIT=0x88a +[TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_INITIALISEL_ENTRY=0x87f +[TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_INITIALISEL_EXIT=0x880 +[TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_NEWL_ENTRY=0x875 +[TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_NEWL_EXIT=0x876 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_CONSTRUCTL_ENTRY=0x823 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_CONSTRUCTL_EXIT=0x824 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_CSBPACKAGEID_CONS_ENTRY=0x81b +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_CSBPACKAGEID_CONS_EXIT=0x81c +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_CSBPACKAGEID_DES_ENTRY=0x81d +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_CSBPACKAGEID_DES_EXIT=0x81e +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_INITIALISEL_ENTRY=0x81f +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_INITIALISEL_EXIT=0x820 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_NEWL_ENTRY=0x817 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_NEWL_EXIT=0x818 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_PACKAGEIDL_ENTRY=0x827 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_PACKAGEIDL_EXIT=0x828 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_PACKAGENAMEL_ENTRY=0x82b +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_PACKAGENAMEL_EXIT=0x82c +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_SECUREIDL_ENTRY=0x829 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_SECUREIDL_EXIT=0x82a +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_CONSTRUCTL_ENTRY=0x853 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_CONSTRUCTL_EXIT=0x854 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_CSBPACKAGETRANSFERTYPE_CONS_ENTRY=0x84d +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_CSBPACKAGETRANSFERTYPE_CONS_EXIT=0x84e +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_CSBPACKAGETRANSFERTYPE_DES_ENTRY=0x851 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_CSBPACKAGETRANSFERTYPE_DES_EXIT=0x852 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_DATATYPEL_ENTRY=0x859 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_DATATYPEL_EXIT=0x85a +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_INITIALISEL_ENTRY=0x84f +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_INITIALISEL_EXIT=0x850 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_NEWL_ENTRY=0x849 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_NEWL_EXIT=0x84a +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_PACKAGEIDL_ENTRY=0x857 +[TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_PACKAGEIDL_EXIT=0x858 +[TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_CONSTRUCTL_ENTRY=0x811 +[TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_CONSTRUCTL_EXIT=0x812 +[TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_CSBSECUREID_CONS_ENTRY=0x80b +[TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_CSBSECUREID_CONS_EXIT=0x80c +[TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_CSBSECUREID_DES_ENTRY=0x80d +[TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_CSBSECUREID_DES_EXIT=0x80e +[TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_INITIALISEL_ENTRY=0x80f +[TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_INITIALISEL_EXIT=0x810 +[TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_NEWL_ENTRY=0x807 +[TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_NEWL_EXIT=0x808 +[TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_SECUREIDL_ENTRY=0x815 +[TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_SECUREIDL_EXIT=0x816 +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_CONSTRUCTL_ENTRY=0x841 +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_CONSTRUCTL_EXIT=0x842 +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_CSBSIDTRANSFERTYPE_CONS_ENTRY=0x83b +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_CSBSIDTRANSFERTYPE_CONS_EXIT=0x83c +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_CSBSIDTRANSFERTYPE_DES_ENTRY=0x83d +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_CSBSIDTRANSFERTYPE_DES_EXIT=0x83e +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_DATATYPEL_ENTRY=0x847 +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_DATATYPEL_EXIT=0x848 +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_INITIALISEL_ENTRY=0x83f +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_INITIALISEL_EXIT=0x840 +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_NEWL_ENTRY=0x837 +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_NEWL_EXIT=0x838 +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_SECUREIDL_ENTRY=0x845 +[TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_SECUREIDL_EXIT=0x846 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERINFO_CONSTRUCTL_ENTRY=0x7d5 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERINFO_CONSTRUCTL_EXIT=0x7d6 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERINFO_NEWL_ENTRY=0x7cd +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERINFO_NEWL_EXIT=0x7ce +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_ALLSNAPSHOTSSUPPLIEDL_ENTRY=0xc12 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_ALLSNAPSHOTSSUPPLIEDL_EXIT=0xc13 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_LISTOFDATAOWNERSL_ENTRY=0xc0c +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_LISTOFDATAOWNERSL_EXIT=0xc0d +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_PUBLICFILELISTL_ENTRY=0xc0e +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_PUBLICFILELISTL_EXIT=0xc0f +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_REQUESTDATAL_ENTRY=0xc00 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_REQUESTDATAL_EXIT=0xc01 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_SETBURMODEL_ENTRY=0xc10 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_SETBURMODEL_EXIT=0xc11 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_SUPPLYDATAL_ENTRY=0xc04 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_SUPPLYDATAL_EXIT=0xc05 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEFILEENTRY_CSBEFILEENTRY_CONS_ENTRY=0x891 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEFILEENTRY_CSBEFILEENTRY_CONS_EXIT=0x892 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEFILEENTRY_NEWLC_ENTRY=0x88d +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEFILEENTRY_NEWLC_EXIT=0x88e +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBGENERICDATATYPE_PACKDESCRIPTORTYPEADVANCE_ENTRY=0x805 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBGENERICDATATYPE_PACKDESCRIPTORTYPEADVANCE_EXIT=0x806 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBGENERICDATATYPE_UNPACKDESCRIPTORTYPEADVANCE_ENTRY=0x7fd +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBGENERICDATATYPE_UNPACKDESCRIPTORTYPEADVANCE_EXIT=0x7fe +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBGENERICDATATYPE_UNPACKTPTRADVANCE_ENTRY=0x801 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBGENERICDATATYPE_UNPACKTPTRADVANCE_EXIT=0x802 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVAID_CSBJAVAID_CONS_ENTRY=0x861 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVAID_CSBJAVAID_CONS_EXIT=0x862 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVAID_INITIALISEL_ENTRY=0x867 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVAID_INITIALISEL_EXIT=0x868 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVAID_NEWL_ENTRY=0x85d +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVAID_NEWL_EXIT=0x85e +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_CONSTRUCTL_ENTRY=0x885 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_CONSTRUCTL_EXIT=0x886 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_CONS_ENTRY=0x87b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_CONS_EXIT=0x87c +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_INITIALISEL_ENTRY=0x881 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_INITIALISEL_EXIT=0x882 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_NEWL_ENTRY=0x877 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_NEWL_EXIT=0x878 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGEID_CONSTRUCTL_ENTRY=0x825 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGEID_CONSTRUCTL_EXIT=0x826 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGEID_INITIALISEL_ENTRY=0x821 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGEID_INITIALISEL_EXIT=0x822 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGEID_NEWL_ENTRY=0x819 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGEID_NEWL_EXIT=0x81a +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGETRANSFERTYPE_CONSTRUCTL_ENTRY=0x855 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGETRANSFERTYPE_CONSTRUCTL_EXIT=0x856 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGETRANSFERTYPE_NEWL_ENTRY=0x84b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGETRANSFERTYPE_NEWL_EXIT=0x84c +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSECUREID_CONSTRUCTL_ENTRY=0x813 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSECUREID_CONSTRUCTL_EXIT=0x814 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSECUREID_NEWL_ENTRY=0x809 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSECUREID_NEWL_EXIT=0x80a +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSIDTRANSFERTYPE_CONSTRUCTL_ENTRY=0x843 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSIDTRANSFERTYPE_CONSTRUCTL_EXIT=0x844 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSIDTRANSFERTYPE_NEWL_ENTRY=0x839 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSIDTRANSFERTYPE_NEWL_EXIT=0x83a +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL_ENTRY=0xc4f +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL_EXIT=0xc50 +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_LISTOFDATAOWNERSL_ENTRY=0xc49 +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_LISTOFDATAOWNERSL_EXIT=0xc4a +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_PUBLICFILELISTL_ENTRY=0xc4b +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_PUBLICFILELISTL_EXIT=0xc4c +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_REQUESTDATAL_ENTRY=0xc3d +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_REQUESTDATAL_EXIT=0xc3e +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_SETBURMODEL_ENTRY=0xc4d +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_SETBURMODEL_EXIT=0xc4e +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_STARTSERVER_EXIT=0xc28 +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_SUPPLYDATAL_ENTRY=0xc41 +[TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_SUPPLYDATAL_EXIT=0xc42 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CSBECLIENT_PUBLICFILELISTL_ENTRY=0xc18 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CSBECLIENT_PUBLICFILELISTL_EXIT=0xc19 +[TRACE]TRACE_FLOW[0x8A]_DUP2_RSBECLIENTSESSION_PUBLICFILELISTL_ENTRY=0xc57 +[TRACE]TRACE_FLOW[0x8A]_DUP2_RSBECLIENTSESSION_PUBLICFILELISTL_EXIT=0xc58 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL_ENTRY=0xc43 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL_EXIT=0xc44 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_ALLSYSTEMFILESRESTOREDL_ENTRY=0xc51 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_ALLSYSTEMFILESRESTOREDL_EXIT=0xc52 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_ALLSYSTEMFILESRESTORED_ENTRY=0xc47 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_ALLSYSTEMFILESRESTORED_EXIT=0xc48 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_CLOSE_ENTRY=0xc22 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_CLOSE_EXIT=0xc23 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_CONNECT_ENTRY=0xc24 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_CONNECT_EXIT=0xc25 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_CONSTRUCTL_ENTRY=0xc1c +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_CONSTRUCTL_EXIT=0xc1d +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_EXPECTEDDATASIZEL_ENTRY=0xc45 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_EXPECTEDDATASIZEL_EXIT=0xc46 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_GETGLOBALSHAREDHEAPHANDLE_ENTRY=0xc39 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_GETGLOBALSHAREDHEAPHANDLE_EXIT=0xc3a +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_LISTOFDATAOWNERSL_ENTRY=0xc29 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_LISTOFDATAOWNERSL_EXIT=0xc2a +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_NEWL_ENTRY=0xc1a +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_NEWL_EXIT=0xc1b +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_POPULATELARGEPUBLICFILELISTL_ENTRY=0xc59 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_POPULATELARGEPUBLICFILELISTL_EXIT=0xc5a +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_POPULATELISTOFDATAOWNERSL_ENTRY=0xc53 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_POPULATELISTOFDATAOWNERSL_EXIT=0xc54 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_POPULATEPUBLICFILELISTL_ENTRY=0xc55 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_POPULATEPUBLICFILELISTL_EXIT=0xc56 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_PUBLICFILELISTL_ENTRY=0xc2b +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_PUBLICFILELISTL_EXIT=0xc2c +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_PUBLICFILELISTXMLL_ENTRY=0xc2f +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_PUBLICFILELISTXMLL_EXIT=0xc30 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RAWPUBLICFILELISTL_ENTRY=0xc2d +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RAWPUBLICFILELISTL_EXIT=0xc2e +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_REQUESTDATAL_ENTRY=0xc3b +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_REQUESTDATAL_EXIT=0xc3c +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RSBECLIENTSESSION_CONS_ENTRY=0xc1e +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RSBECLIENTSESSION_CONS_EXIT=0xc1f +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RSBECLIENTSESSION_DES_ENTRY=0xc20 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RSBECLIENTSESSION_DES_EXIT=0xc21 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SETBURMODEL_ENTRY=0xc31 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SETBURMODEL_EXIT=0xc32 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SETSIDLISTFORPARTIALBURL_ENTRY=0xc33 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SETSIDLISTFORPARTIALBURL_EXIT=0xc34 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SIDSTATUSL_ENTRY=0xc35 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SIDSTATUSL_EXIT=0xc36 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_STARTSERVER_ENTRY=0xc26 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_STARTSERVER_EXIT=0xc27 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SUPPLYDATAL_ENTRY=0xc3f +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SUPPLYDATAL_EXIT=0xc40 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_TRANSFERDATAINFOL_ENTRY=0xc37 +[TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_TRANSFERDATAINFOL_EXIT=0xc38 +[TRACE]TRACE_FLOW[0x8A]__CONN_PANIC_ENTRY=0x403 +[TRACE]TRACE_FLOW[0x8A]__CONN_PANIC_EXIT=0x404 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CABSERVER_NEWSESSIONL=0x1f1 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CABSESSIONMAP_SESSIONL=0x202 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERINFO_CONSTRUCTL=0xcc +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_ALLSNAPSHOTSSUPPLIEDL=0x279 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_DATAOWNERL=0x26c +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_FINDPACKAGEDATACONTAINERL=0x284 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_GETDATAOWNERSL=0x26a +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL=0x26d +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_GETNEXTPUBLICFILEL=0x27a +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_GETPUBLICFILELISTL=0x26f +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL=0x272 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_GETXMLPUBLICFILELISTL=0x275 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_ISSETFORPARTIALL=0x287 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_SETSIDLISTFORPARTIALBURL=0x277 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_SIDSTATUSL=0x278 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNERMANAGER_STRIPSECUREIDL=0x285 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNER_ACTIVESETTINGSL=0x247 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNER_GETRAWPUBLICFILELISTL=0x21c +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNER_HANDLEBACKUPREGISTRATIONL=0x262 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNER_ISNEWERL=0x253 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNER_ONENDELEMENTL=0x261 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNER_ONSTARTDOCUMENTL=0x257 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNER_PARSEDIRL=0x24c +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNER_PASSIVESETTINGSL=0x246 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CDATAOWNER_STATEBYDRIVEL=0x254 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CHEAPWRAPPER_READBUFFERL=0xa4 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CHEAPWRAPPER_WRITEBUFFERL=0xa5 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CPACKAGEDATATRANSFER_CONSTRUCTL=0x295 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CPACKAGEDATATRANSFER_GETRAWPUBLICFILELISTL=0x2b1 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CPACKAGEDATATRANSFER_HANDLEBACKUPREGISTRATIONL=0x2bb +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CPACKAGEDATATRANSFER_ONENDELEMENTL=0x2ba +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CPACKAGEDATATRANSFER_ONSTARTDOCUMENTL=0x2b6 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CPACKAGEDATATRANSFER_ONSTARTELEMENTL=0x2b7 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CPACKAGEDATATRANSFER_PARSEDIRL=0x2b4 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CPACKAGEDATATRANSFER_PARSEL=0x2b0 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CPACKAGEDATATRANSFER_SUPPLYSNAPSHOTL=0x2af +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBECALLBACKHANDLER_RUNL=0x1f0 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBECLIENT_CONSTRUCTL=0x1da +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBECONFIG_ONSTARTDOCUMENTL=0x217 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBECONFIG_ONSTARTELEMENTL=0x218 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBECONFIG_PARSEL=0x216 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBEDECOMPRESSANDENCRYPT_MOVEALONGL=0x212 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBEPARSERPROXY_CONSTRUCTL=0x288 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBEPARSERPROXY_ONENDELEMENTL=0x28c +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBEPARSERPROXY_ONSTARTDOCUMENTL=0x28a +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBEPARSERPROXY_ONSTARTELEMENTL=0x28b +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBESERVER_ALLOCATEGLOBALSHAREDHEAPL=0x28d +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBESERVER_NEWSESSIONL=0x28e +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBESESSION_PREPDATAOWNERINFOL=0x292 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBESESSION_PREPLARGEPUBLICFILELISTL=0x293 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBGENERICDATATYPE_INITIALISEL=0xcd +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBGENERICTRANSFERTYPE_INITIALISEL=0xd5 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBJAVAID_CONSTRUCTFROMEXISTINGL=0xdc +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBJAVATRANSFERTYPE_CONSTRUCTL=0xde +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBPACKAGEID_CONSTRUCTL=0xd2 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBPACKAGETRANSFERTYPE_CONSTRUCTL=0xd9 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBSECUREID_CONSTRUCTL=0xcf +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CSBSIDTRANSFERTYPE_CONSTRUCTL=0xd6 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP10_CDATAOWNER_ADDDBMSFILESL=0x255 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP10_CDATAOWNER_GETEXPECTEDDATASIZEL=0x21b +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP10_CDATAOWNER_GETNEXTPUBLICFILEL=0x24f +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP10_CDATAOWNER_ONSTARTELEMENTL=0x260 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP10_CDATAOWNER_PROCESSREQUESTDATAL=0x238 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP10_CDATAOWNER_PROCESSSUPPLYDATAL=0x223 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP11_CDATAOWNER_PROCESSSUPPLYDATAL=0x224 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP11_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x29b +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP12_CABSESSION_SERVICEL=0x1f4 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP12_CDATAOWNERMANAGER_SUPPLYDATAL=0x27f +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP12_CDATAOWNER_GETDRIVELISTL=0x249 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP12_CDATAOWNER_PROCESSREQUESTDATAL=0x239 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP12_CDATAOWNER_PROCESSSUPPLYDATAL=0x225 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP12_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x2ad +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP12_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x2b3 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP12_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x2a7 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP13_CABSESSION_SERVICEL=0x1f5 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP13_CDATAOWNERMANAGER_SETBURMODEL=0x269 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP13_CDATAOWNERMANAGER_SUPPLYDATAL=0x280 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP13_CDATAOWNER_BUILDFILELISTL=0x24b +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP13_CDATAOWNER_GETDRIVELISTL=0x248 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP13_CDATAOWNER_PROCESSREQUESTDATAL=0x23a +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP13_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x29a +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP13_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x2b2 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP13_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x2a2 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP14_CBUFFERFILEWRITER_WRITETOBUFFERL=0x204 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP14_CDATAOWNER_BUILDFILELISTL=0x24a +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP14_CDATAOWNER_PROCESSREQUESTDATAL=0x23b +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP14_CDATAOWNER_PROCESSSUPPLYDATAL=0x226 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP14_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x2a3 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP15_CBUFFERFILEWRITER_WRITETOBUFFERL=0x205 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP15_CDATAOWNER_PROCESSREQUESTDATAL=0x23c +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP15_CDATAOWNER_PROCESSSUPPLYDATAL=0x227 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP15_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x2a4 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP16_CDATAOWNER_PROCESSSUPPLYDATAL=0x228 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP16_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x2a5 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP17_CDATAOWNER_PROCESSSUPPLYDATAL=0x229 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP17_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x2a6 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP18_CDATAOWNER_PROCESSREQUESTDATAL=0x23d +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CABSESSION_CHECKCALLBACKAVAILABLEL=0x1f6 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CABSESSION_MAKECALLBACKGETSNAPSHOTDATAL=0x1f9 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CABSESSION_MAKECALLBACKINITIALISEGETBACKUPDATAL=0x1fa +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CABSESSION_MAKECALLBACKINITIALISEGETPROXYBACKUPDATAL=0x200 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CABSESSION_MAKECALLBACKINITIALISERESTOREBASEDATAL=0x1fc +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CABSESSION_MAKECALLBACKINITIALISERESTOREINCREMENTDATAL=0x1fe +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CABSESSION_MAKECALLBACKINITIALISERESTOREPROXYBASEDATAL=0x201 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CABSESSION_MAKECALLBACKRECEIVESNAPSHOTDATAL=0x1f8 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CABSESSION_MAKECALLBACKRESTOREBASEDATASECTIONL=0x1fd +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CABSESSION_MAKECALLBACKRESTOREINCREMENTDATASECTIONL=0x1ff +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CABSESSION_SUPPLYDATAL=0x1f2 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CBUFFERFILEREADER_RECREATEDIRL=0x206 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CBUFFERFILEREADER_RECREATEFILEL=0x207 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CDATAOWNERMANAGER_GETNEXTPUBLICFILEL=0x27b +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CDATAOWNERMANAGER_GETPUBLICFILELISTL=0x270 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL=0x273 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CDATAOWNERMANAGER_GETXMLPUBLICFILELISTL=0x276 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CDATAOWNERMANAGER_REQUESTDATAL=0x281 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CDATAOWNERMANAGER_STRIPSECUREIDL=0x286 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CDATAOWNERMANAGER_SUPPLYDATAL=0x27d +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CDATAOWNER_REQUESTDATAL=0x243 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CPACKAGEDATATRANSFER_CONSTRUCTL=0x296 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CPACKAGEDATATRANSFER_REQUESTDATAL=0x29d +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CPACKAGEDATATRANSFER_SUPPLYDATAL=0x2a8 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CSBEPARSERPROXY_CONVERTTOUNICODEL=0x289 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CSBGENERICDATATYPE_INITIALISEL=0xce +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CSBJAVAID_CONSTRUCTFROMEXISTINGL=0xdd +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CSBJAVATRANSFERTYPE_CONSTRUCTL=0xdf +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CSBPACKAGEID_CONSTRUCTL=0xd3 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CSBPACKAGETRANSFERTYPE_CONSTRUCTL=0xda +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CSBSECUREID_CONSTRUCTL=0xd0 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CSBSIDTRANSFERTYPE_CONSTRUCTL=0xd7 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_LISTOFDATAOWNERSL=0x1ea +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_PUBLICFILELISTL=0x1eb +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_PUBLICFILELISTXMLL=0x1e0 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_RAWPUBLICFILELISTL=0x1de +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_REQUESTDATAL=0x1e6 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_SIDSTATUSL=0x1e4 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_RSBECLIENTSESSION_SUPPLYDATAL=0x1e7 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP20_CSBESESSION_SERVICEL=0x291 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP21_CDATAOWNER_PROCESSSUPPLYDATAL=0x22a +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP22_CDATAOWNER_PROCESSSUPPLYDATAL=0x22b +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP22_CSBESESSION_SERVICEL=0x28f +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP23_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x2ae +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP23_CSBESESSION_SERVICEL=0x290 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP24_CBUFFERFILEREADER_READFROMBUFFERL=0x20d +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP24_CDATAOWNER_PROCESSREQUESTDATAL=0x23e +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP25_CDATAOWNER_PROCESSREQUESTDATAL=0x23f +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP26_CDATAOWNER_PROCESSREQUESTDATAL=0x240 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP27_CDATAOWNER_PROCESSREQUESTDATAL=0x241 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP29_CDATAOWNER_PROCESSREQUESTDATAL=0x242 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CABSESSION_CHECKCALLBACKAVAILABLEL=0x1f7 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CDATAOWNERMANAGER_GETNEXTPUBLICFILEL=0x27c +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CDATAOWNERMANAGER_SETBURMODEL=0x266 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CDATAOWNER_ONSTARTELEMENTL=0x258 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CDATAOWNER_PARSEFILESL=0x219 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CDATAOWNER_PROCESSREQUESTDATAL=0x232 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CDATAOWNER_PROCESSSUPPLYDATAL=0x21d +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CDATAOWNER_REQUESTDATAL=0x244 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CDATAOWNER_SUPPLYDATAL=0x230 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CDATAOWNER_SUPPLYPASSIVEBASEDATAL=0x252 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CPACKAGEDATATRANSFER_CONSTRUCTL=0x297 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CPACKAGEDATATRANSFER_GETDRIVELISTL=0x2b5 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x299 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CPACKAGEDATATRANSFER_ONSTARTELEMENTL=0x2b8 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CPACKAGEDATATRANSFER_REQUESTDATAL=0x29e +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CPACKAGEDATATRANSFER_SUPPLYDATAL=0x2aa +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL=0x214 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CSBESESSION_PREPLARGEPUBLICFILELISTL=0x294 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CSBPACKAGEID_CONSTRUCTL=0xd4 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CSBPACKAGETRANSFERTYPE_CONSTRUCTL=0xdb +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CSBSECUREID_CONSTRUCTL=0xd1 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CSBSIDTRANSFERTYPE_CONSTRUCTL=0xd8 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_RSBECLIENTSESSION_PUBLICFILELISTL=0x1ee +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP36_CDATAOWNER_PROCESSSUPPLYDATAL=0x22e +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP37_CDATAOWNER_PROCESSSUPPLYDATAL=0x22f +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP38_CDATAOWNER_PROCESSSUPPLYDATAL=0x22c +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP39_CDATAOWNER_PROCESSSUPPLYDATAL=0x22d +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CABSESSION_MAKECALLBACKGETBACKUPDATASECTIONL=0x1fb +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CBUFFERFILEREADER_RECREATEFILEL=0x208 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CDATAOWNERMANAGER_CONSTRUCTL=0x264 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CDATAOWNERMANAGER_GETPUBLICFILELISTL=0x271 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL=0x274 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CDATAOWNER_ONSTARTELEMENTL=0x259 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CDATAOWNER_PARSEFILESL=0x21a +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CDATAOWNER_PROCESSREQUESTDATAL=0x233 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CDATAOWNER_PROCESSSUPPLYDATAL=0x21e +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CDATAOWNER_SUPPLYDATAL=0x231 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CPACKAGEDATATRANSFER_CONSTRUCTL=0x298 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x2ab +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CPACKAGEDATATRANSFER_ONSTARTELEMENTL=0x2b9 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CPACKAGEDATATRANSFER_REQUESTDATAL=0x29c +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CPACKAGEDATATRANSFER_SUPPLYDATAL=0x2a9 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL=0x215 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CSBEDECOMPRESSANDENCRYPT_SETGENERICTRANSFERTYPEL=0x211 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP4_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL=0x20e +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP4_CBUFFERFILEWRITER_WRITETOBUFFERL=0x203 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP4_CDATAOWNERMANAGER_CONSTRUCTL=0x263 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP4_CDATAOWNERMANAGER_SUPPLYDATAL=0x27e +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP4_CDATAOWNER_CLEANUPBEFORERESTOREL=0x256 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP4_CDATAOWNER_ONSTARTELEMENTL=0x25a +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP4_CDATAOWNER_PROCESSSUPPLYDATAL=0x21f +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP4_CSBECOMPRESSANDENCRYPT_CONSTRUCTL=0x210 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP5_CABSESSION_REQUESTDATAL=0x1f3 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP5_CDATAOWNERMANAGER_REQUESTDATAL=0x282 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP5_CDATAOWNER_ONSTARTELEMENTL=0x25b +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP5_CDATAOWNER_PROCESSSUPPLYDATAL=0x220 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP5_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x29f +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP5_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x213 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP6_CBUFFERFILEREADER_WRITETOFILEL=0x209 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP6_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL=0x26e +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP6_CDATAOWNERMANAGER_SETBURMODEL=0x267 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP6_CDATAOWNER_COMMONSETTINGSL=0x245 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP6_CDATAOWNER_GETNEXTPUBLICFILEL=0x24e +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP6_CDATAOWNER_ONSTARTELEMENTL=0x25c +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP6_CDATAOWNER_PROCESSREQUESTDATAL=0x234 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP6_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x2ac +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP7_CBUFFERFILEREADER_READFROMBUFFERL=0x20c +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP7_CBUFFERFILEREADER_WRITETOFILEL=0x20a +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP7_CDATAOWNERMANAGER_SETBURMODEL=0x268 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP7_CDATAOWNER_GETNEXTPUBLICFILEL=0x250 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP7_CDATAOWNER_ONSTARTELEMENTL=0x25d +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP7_CDATAOWNER_PROCESSREQUESTDATAL=0x235 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP7_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL=0x251 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP7_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x2a0 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP8_CBUFFERFILEREADER_WRITETOFILEL=0x20b +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP8_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL=0x265 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP8_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL=0x283 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP8_CDATAOWNER_GETNEXTPUBLICFILEL=0x24d +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP8_CDATAOWNER_ONSTARTELEMENTL=0x25e +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP8_CDATAOWNER_PROCESSREQUESTDATAL=0x236 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP8_CDATAOWNER_PROCESSSUPPLYDATAL=0x221 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP9_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL=0x20f +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP9_CDATAOWNERMANAGER_GETDATAOWNERSL=0x26b +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP9_CDATAOWNER_ONSTARTELEMENTL=0x25f +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP9_CDATAOWNER_PROCESSREQUESTDATAL=0x237 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP9_CDATAOWNER_PROCESSSUPPLYDATAL=0x222 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP9_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x2a1 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL=0x1e8 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_EXPECTEDDATASIZEL=0x1e9 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_LISTOFDATAOWNERSL=0x1db +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_POPULATELARGEPUBLICFILELISTL=0x1ef +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_POPULATELISTOFDATAOWNERSL=0x1ec +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_POPULATEPUBLICFILELISTL=0x1ed +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_PUBLICFILELISTL=0x1dc +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_PUBLICFILELISTXMLL=0x1df +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_RAWPUBLICFILELISTL=0x1dd +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_SETBURMODEL=0x1e1 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_SETSIDLISTFORPARTIALBURL=0x1e2 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_SIDSTATUSL=0x1e3 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_RSBECLIENTSESSION_TRANSFERDATAINFOL=0x1e5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_ADDSESSION_ENTRY=0x4af +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_ADDSESSION_EXIT=0x4b0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_ALLSNAPSHOTSSUPPLIEDL_ENTRY=0x945 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_ALLSNAPSHOTSSUPPLIEDL_EXIT=0x946 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_CABSERVER_CONS_ENTRY=0x935 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_CABSERVER_CONS_EXIT=0x936 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_CABSERVER_DES_ENTRY=0x937 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_CABSERVER_DES_EXIT=0x938 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_CABSERVER_ENTRY=0x4a7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_CABSERVER_EXIT=0x4a8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_CONSTRUCTL_ENTRY=0x93b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_CONSTRUCTL_EXIT=0x93c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_DROPSESSION_ENTRY=0x4b1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_DROPSESSION_EXIT=0x4b2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_GETEXPECTEDDATASIZEL_ENTRY=0x943 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_GETEXPECTEDDATASIZEL_EXIT=0x944 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_INVALIDATEABSESSIONS_ENTRY=0x947 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_INVALIDATEABSESSIONS_EXIT=0x948 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_NEWLC_ENTRY=0x939 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_NEWLC_EXIT=0x93a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_NEWSESSIONL_ENTRY=0x94e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_NEWSESSIONL_EXIT=0x94f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_PANICCLIENT_ENTRY=0x952 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_PANICCLIENT_EXIT=0x953 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_REMOVEELEMENT_ENTRY=0x93d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_REMOVEELEMENT_EXIT=0x93e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_REQUESTDATAL_ENTRY=0x941 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_REQUESTDATAL_EXIT=0x942 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_RESTORECOMPLETEL_ENTRY=0x94c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_RESTORECOMPLETEL_EXIT=0x94d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_RUNERROR_ENTRY=0x950 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_RUNERROR_EXIT=0x951 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_SESSIONREADYSTATEL_ENTRY=0x949 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_SESSIONREADYSTATEL_EXIT=0x94a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_SUPPLYDATAL_ENTRY=0x93f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSERVER_SUPPLYDATAL_EXIT=0x940 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONELEMENT_CABSESSIONELEMENT_CONS_ENTRY=0x9a1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONELEMENT_CABSESSIONELEMENT_CONS_EXIT=0x9a2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONELEMENT_CABSESSIONELEMENT_DES_ENTRY=0x9a3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONELEMENT_CABSESSIONELEMENT_DES_EXIT=0x9a4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONELEMENT_CABSESSIONELEMENT_ENTRY=0x523 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONELEMENT_CABSESSIONELEMENT_EXIT=0x524 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONELEMENT_CONSTRUCTL_ENTRY=0x9a7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONELEMENT_CONSTRUCTL_EXIT=0x9a8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONELEMENT_NEWL_ENTRY=0x9a5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONELEMENT_NEWL_EXIT=0x9a6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_CABSESSIONMAP_CONS_ENTRY=0x9b1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_CABSESSIONMAP_CONS_EXIT=0x9b2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_CABSESSIONMAP_DES_ENTRY=0x9b3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_CABSESSIONMAP_DES_EXIT=0x9b4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_CABSESSIONMAP_ENTRY=0x532 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_CABSESSIONMAP_EXIT=0x533 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_CREATEL_ENTRY=0x9ab +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_CREATEL_EXIT=0x9ac +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_DELETE_ENTRY=0x9ad +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_DELETE_EXIT=0x9ae +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_INVALIDATEABSESSIONS_ENTRY=0x9b5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_INVALIDATEABSESSIONS_EXIT=0x9b6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_NEWL_ENTRY=0x9a9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_NEWL_EXIT=0x9aa +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_SESSIONL_ENTRY=0x9af +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSIONMAP_SESSIONL_EXIT=0x9b0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_ABSESSIONSTATICWATCHDOGCALLER_ENTRY=0x4d0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_ALLSNAPSHOTSSUPPLIEDL_ENTRY=0x962 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_ALLSNAPSHOTSSUPPLIEDL_EXIT=0x963 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CABSESSION_CONS_ENTRY=0x958 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CABSESSION_CONS_EXIT=0x959 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CABSESSION_DES_ENTRY=0x95c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CABSESSION_DES_EXIT=0x95d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CALLBACKINTERFACEAVAILABLE_ENTRY=0x4d5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CHECKCALLBACKAVAILABLEL_ENTRY=0x981 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CHECKCALLBACKAVAILABLEL_EXIT=0x982 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CLEANUPCLIENTSENDSTATE_ENTRY=0x4e7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CLEANUPCLIENTSENDSTATE_EXIT=0x4e8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CONFIRMEDREADYFORBUR_ENTRY=0x4d3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CONFIRMEDREADYFORBUR_EXIT=0x4d4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CONSTRUCTL_ENTRY=0x956 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CONSTRUCTL_EXIT=0x957 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CREATEL_ENTRY=0x95e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_CREATEL_EXIT=0x95f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_DATAOWNERL_ENTRY=0x4cf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_GETDATACHECKSUML_ENTRY=0x4e6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_GETEXPECTEDDATASIZEL_ENTRY=0x964 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_GETEXPECTEDDATASIZEL_EXIT=0x965 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCBURMODEINFOL_ENTRY=0x970 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCBURMODEINFOL_EXIT=0x971 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCCLOSINGDOWNCALLBACK_ENTRY=0x97c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCCLOSINGDOWNCALLBACK_EXIT=0x97d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCCONFIRMREADYFORBURL_ENTRY=0x974 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCCONFIRMREADYFORBURL_EXIT=0x975 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCDOESPARTIALBURAFFECTMEL_ENTRY=0x972 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCDOESPARTIALBURAFFECTMEL_EXIT=0x973 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCGETDATASYNCL_ENTRY=0x978 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCGETDATASYNCL_EXIT=0x979 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCPROPAGATELEAVEL_ENTRY=0x976 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCPROPAGATELEAVEL_EXIT=0x977 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCSENDDATALENGTHL_ENTRY=0x97a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_HANDLEIPCSENDDATALENGTHL_EXIT=0x97b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_INVALIDATED_ENTRY=0x521 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_INVALIDATED_EXIT=0x522 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MADECALLBACK_ENTRY=0x96c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MADECALLBACK_EXIT=0x96d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKALLSNAPSHOTSSUPPLIEDL_ENTRY=0x983 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKALLSNAPSHOTSSUPPLIEDL_EXIT=0x984 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKGETBACKUPDATASECTIONL_ENTRY=0x98d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKGETBACKUPDATASECTIONL_EXIT=0x98e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKGETDATACHECKSUML_ENTRY=0x99f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKGETDATACHECKSUML_EXIT=0x9a0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKGETEXPECTEDDATASIZEL_ENTRY=0x987 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKGETEXPECTEDDATASIZEL_EXIT=0x988 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKGETSNAPSHOTDATAL_ENTRY=0x989 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKGETSNAPSHOTDATAL_EXIT=0x98a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKINITIALISEGETBACKUPDATAL_ENTRY=0x98b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKINITIALISEGETBACKUPDATAL_EXIT=0x98c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKINITIALISEGETPROXYBACKUPDATAL_ENTRY=0x999 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKINITIALISEGETPROXYBACKUPDATAL_EXIT=0x99a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKINITIALISERESTOREBASEDATAL_ENTRY=0x98f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKINITIALISERESTOREBASEDATAL_EXIT=0x990 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKINITIALISERESTOREINCREMENTDATAL_ENTRY=0x993 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKINITIALISERESTOREINCREMENTDATAL_EXIT=0x994 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKINITIALISERESTOREPROXYBASEDATAL_ENTRY=0x99b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKINITIALISERESTOREPROXYBASEDATAL_EXIT=0x99c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKRECEIVESNAPSHOTDATAL_ENTRY=0x985 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKRECEIVESNAPSHOTDATAL_EXIT=0x986 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKRESTOREBASEDATASECTIONL_ENTRY=0x991 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKRESTOREBASEDATASECTIONL_EXIT=0x992 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKRESTORECOMPLETEL_ENTRY=0x997 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKRESTORECOMPLETEL_EXIT=0x998 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKRESTOREINCREMENTDATASECTIONL_ENTRY=0x995 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKRESTOREINCREMENTDATASECTIONL_EXIT=0x996 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKTERMINATEMULTISTAGEOPERATIONL_ENTRY=0x99d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_MAKECALLBACKTERMINATEMULTISTAGEOPERATIONL_EXIT=0x99e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_NEWL_ENTRY=0x954 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_NEWL_EXIT=0x955 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_REQUESTDATAL_ENTRY=0x968 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_REQUESTDATAL_EXIT=0x969 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_RESTORECOMPLETEL_ENTRY=0x960 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_RESTORECOMPLETEL_EXIT=0x961 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_RETURNFROMCALLBACK_ENTRY=0x96e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_RETURNFROMCALLBACK_EXIT=0x96f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_SERVER_ENTRY=0x980 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_SERVICEL_ENTRY=0x97e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_SERVICEL_EXIT=0x97f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_SETINVALID_ENTRY=0x51f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_SETINVALID_EXIT=0x520 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_SUPPLYDATAL_ENTRY=0x966 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_SUPPLYDATAL_EXIT=0x967 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_TAKEOWNERSHIPOFIPCMESSAGE_ENTRY=0x4ed +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_TAKEOWNERSHIPOFIPCMESSAGE_EXIT=0x4ee +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_TERMINATEMULTISTAGEOPERATIONL_ENTRY=0x96a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_TERMINATEMULTISTAGEOPERATIONL_EXIT=0x96b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_WATCHDOGEXPIRED_ENTRY=0x95a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CABSESSION_WATCHDOGEXPIRED_EXIT=0x95b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_CBUFFERFILEREADER_CONS_ENTRY=0x9cf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_CBUFFERFILEREADER_CONS_EXIT=0x9d0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_CBUFFERFILEREADER_DES_ENTRY=0x9e5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_CBUFFERFILEREADER_DES_EXIT=0x9e6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_CBUFFERFILEREADER_ENTRY=0x550 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_CBUFFERFILEREADER_EXIT=0x551 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_CHECKFILEINSNAPSHOTL_ENTRY=0x9d5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_CHECKFILEINSNAPSHOTL_EXIT=0x9d6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_CONTINUEL_ENTRY=0x9d3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_CONTINUEL_EXIT=0x9d4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_NEWL_ENTRY=0x9cd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_NEWL_EXIT=0x9ce +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_READFROMBUFFERL_ENTRY=0x9dd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_READFROMBUFFERL_EXIT=0x9de +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL_ENTRY=0x9e1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL_EXIT=0x9e2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_RECREATEDIRL_ENTRY=0x9d7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_RECREATEDIRL_EXIT=0x9d8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_RECREATEFILEL_ENTRY=0x9d9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_RECREATEFILEL_EXIT=0x9da +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_REDIRECTMIDLETRESTOREPATHL_ENTRY=0x9df +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_REDIRECTMIDLETRESTOREPATHL_EXIT=0x9e0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_RESET_ENTRY=0x9e3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_RESET_EXIT=0x9e4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_STARTL_ENTRY=0x9d1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_STARTL_EXIT=0x9d2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_WRITETOFILEL_ENTRY=0x9db +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEREADER_WRITETOFILEL_EXIT=0x9dc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_CBUFFERFILEWRITER_CONS_ENTRY=0x9c1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_CBUFFERFILEWRITER_CONS_EXIT=0x9c2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_CBUFFERFILEWRITER_DES_ENTRY=0x9c3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_CBUFFERFILEWRITER_DES_EXIT=0x9c4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_CBUFFERFILEWRITER_ENTRY=0x542 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_CBUFFERFILEWRITER_EXIT=0x543 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_CONSTRUCTL_ENTRY=0x9c5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_CONSTRUCTL_EXIT=0x9c6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_CONTINUEL_ENTRY=0x9c9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_CONTINUEL_EXIT=0x9ca +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_NEWL_ENTRY=0x9bf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_NEWL_EXIT=0x9c0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_STARTL_ENTRY=0x9c7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_STARTL_EXIT=0x9c8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_WRITETOBUFFERL_ENTRY=0x9cb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERFILEWRITER_WRITETOBUFFERL_EXIT=0x9cc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_CBUFFERSNAPSHOTREADER_CONS_ENTRY=0x9f7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_CBUFFERSNAPSHOTREADER_CONS_EXIT=0x9f8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_CBUFFERSNAPSHOTREADER_DES_ENTRY=0x9f9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_CBUFFERSNAPSHOTREADER_DES_EXIT=0x9fa +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_CBUFFERSNAPSHOTREADER_ENTRY=0x577 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_CBUFFERSNAPSHOTREADER_EXIT=0x578 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_CONTINUEL_ENTRY=0x9fd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_CONTINUEL_EXIT=0x9fe +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_NEWL_ENTRY=0x9f5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_NEWL_EXIT=0x9f6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_READFROMBUFFERL_ENTRY=0x9ff +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_READFROMBUFFERL_EXIT=0xa00 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_STARTL_ENTRY=0x9fb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTREADER_STARTL_EXIT=0x9fc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_CBUFFERSNAPSHOTWRITER_CONS_ENTRY=0x9e9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_CBUFFERSNAPSHOTWRITER_CONS_EXIT=0x9ea +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_CBUFFERSNAPSHOTWRITER_DES_ENTRY=0x9ed +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_CBUFFERSNAPSHOTWRITER_DES_EXIT=0x9ee +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_CBUFFERSNAPSHOTWRITER_ENTRY=0x56a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_CBUFFERSNAPSHOTWRITER_EXIT=0x56b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_CONSTRUCTL_ENTRY=0x9eb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_CONSTRUCTL_EXIT=0x9ec +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_CONTINUEL_ENTRY=0x9f1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_CONTINUEL_EXIT=0x9f2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_NEWL_ENTRY=0x9e7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_NEWL_EXIT=0x9e8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_STARTL_ENTRY=0x9ef +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_STARTL_EXIT=0x9f0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL_ENTRY=0x9f3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL_EXIT=0x9f4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_CONS_ENTRY=0xad3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_CONS_EXIT=0xad4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_DES_ENTRY=0xad5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_DES_EXIT=0xad6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_ENTRY=0x68d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_EXIT=0x68e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_COMPARE_ENTRY=0xad9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_COMPARE_EXIT=0xada +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_CONSTRUCTL_ENTRY=0xad7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_CONSTRUCTL_EXIT=0xad8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_DATAOWNER_ENTRY=0x695 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_DATAOWNER_EXIT=0x696 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_MATCH_ENTRY=0x69b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_NEWL_ENTRY=0xad1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_NEWL_EXIT=0xad2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_SECUREID_ENTRY=0x693 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERCONTAINER_SECUREID_EXIT=0x694 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_ACTIVESETTINGS_ENTRY=0x7df +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_ACTIVESETTINGS_EXIT=0x7e0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_CDATAOWNERINFO_CONS_ENTRY=0x329 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_CDATAOWNERINFO_CONS_EXIT=0x32a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_CDATAOWNERINFO_DES_ENTRY=0x32b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_CDATAOWNERINFO_DES_EXIT=0x32c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_COMMONSETTINGS_ENTRY=0x7db +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_COMMONSETTINGS_EXIT=0x7dc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_CONSTRUCTL_ENTRY=0x32d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_CONSTRUCTL_EXIT=0x32e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_DRIVELIST_ENTRY=0x7e1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_DRIVELIST_EXIT=0x7e2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_EXTERNALISELC_ENTRY=0x341 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_EXTERNALISELC_EXIT=0x342 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_EXTERNALISEL_ENTRY=0x33f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_EXTERNALISEL_EXIT=0x340 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_IDENTIFIER_ENTRY=0x7d7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_IDENTIFIER_EXIT=0x7d8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_NEWL_ENTRY=0x325 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_NEWL_EXIT=0x326 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_PASSIVESETTINGS_ENTRY=0x7dd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_PASSIVESETTINGS_EXIT=0x7de +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_SIZE_ENTRY=0x343 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERINFO_SIZE_EXIT=0x344 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_ALLSNAPSHOTSSUPPLIEDL_ENTRY=0xafd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_ALLSNAPSHOTSSUPPLIEDL_EXIT=0xafe +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL_ENTRY=0xae5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL_EXIT=0xae6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_CDATAOWNERMANAGER_CONS_ENTRY=0xadf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_CDATAOWNERMANAGER_CONS_EXIT=0xae0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_CDATAOWNERMANAGER_DES_ENTRY=0xae3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_CDATAOWNERMANAGER_DES_EXIT=0xae4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_CDATAOWNERMANAGER_ENTRY=0x69e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_CDATAOWNERMANAGER_EXIT=0x69f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_CONFIG_ENTRY=0x6d5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_CONFIG_EXIT=0x6d6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_CONSTRUCTL_ENTRY=0xae1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_CONSTRUCTL_EXIT=0xae2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_DATAOWNERL_ENTRY=0xaed +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_DATAOWNERL_EXIT=0xaee +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_FINDDATAOWNERSL_ENTRY=0xb11 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_FINDDATAOWNERSL_EXIT=0xb12 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL_ENTRY=0xb05 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL_EXIT=0xb06 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_FINDL_ENTRY=0xb09 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_FINDL_EXIT=0xb0a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_FINDPACKAGEDATACONTAINERL_ENTRY=0xb0c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_FINDPACKAGEDATACONTAINERL_EXIT=0xb0d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_FINDREGISTRATIONFILESL_ENTRY=0xb07 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_FINDREGISTRATIONFILESL_EXIT=0xb08 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETDATAOWNERSL_ENTRY=0xaeb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETDATAOWNERSL_EXIT=0xaec +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL_ENTRY=0xaef +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL_EXIT=0xaf0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETNEXTPUBLICFILEL_ENTRY=0xaff +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETNEXTPUBLICFILEL_EXIT=0xb00 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETPUBLICFILELISTL_ENTRY=0xaf1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETPUBLICFILELISTL_EXIT=0xaf2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL_ENTRY=0xaf3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL_EXIT=0xaf4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETRFS_ENTRY=0x6c5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETRFS_EXIT=0x6c6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETXMLPUBLICFILELISTL_ENTRY=0xaf5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_GETXMLPUBLICFILELISTL_EXIT=0xaf6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_ISSETFORPARTIALL_ENTRY=0xb13 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_ISSETFORPARTIALL_EXIT=0xb14 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_NEWLC_ENTRY=0xadd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_NEWLC_EXIT=0xade +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_REQUESTDATAL_ENTRY=0xb03 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_REQUESTDATAL_EXIT=0xb04 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_SETACTIVEBACKUPSERVER_ENTRY=0x6c3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_SETACTIVEBACKUPSERVER_EXIT=0x6c4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_SETBURMODEL_ENTRY=0xae7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_SETBURMODEL_EXIT=0xae8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_SETSIDLISTFORPARTIALBURL_ENTRY=0xaf7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_SETSIDLISTFORPARTIALBURL_EXIT=0xaf8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_SIDSTATUSL_ENTRY=0xafb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_SIDSTATUSL_EXIT=0xafc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_STRIPSECUREIDL_ENTRY=0xb0f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_STRIPSECUREIDL_EXIT=0xb10 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_SUPPLYDATAL_ENTRY=0xb01 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_SUPPLYDATAL_EXIT=0xb02 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_UPDATEDATAOWNERSPARTIALSTATEL_ENTRY=0xaf9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNERMANAGER_UPDATEDATAOWNERSPARTIALSTATEL_EXIT=0xafa +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ACTIVEINFORMATION_ENTRY=0x622 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ACTIVEINFORMATION_EXIT=0x623 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ACTIVESETTINGSL_ENTRY=0xa7c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ACTIVESETTINGSL_EXIT=0xa7d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ADDDBMSFILESL_ENTRY=0xaa0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ADDDBMSFILESL_EXIT=0xaa1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ADDPROXYTOLIST_ENTRY=0xaa2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ADDPROXYTOLIST_EXIT=0xaa3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ADDREGISTRATIONFILESL_ENTRY=0xa5e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ADDREGISTRATIONFILESL_EXIT=0xa5f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_BUILDDRIVESTATEARRAYL_ENTRY=0xa9e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_BUILDDRIVESTATEARRAYL_EXIT=0xa9f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_BUILDFILELISTL_ENTRY=0xa86 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_BUILDFILELISTL_EXIT=0xa87 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_CDATAOWNER_CONS_ENTRY=0xa58 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_CDATAOWNER_CONS_EXIT=0xa59 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_CDATAOWNER_DES_ENTRY=0xa5c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_CDATAOWNER_DES_EXIT=0xa5d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_CDATAOWNER_ENTRY=0x5fa +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_CDATAOWNER_EXIT=0x5fb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_CLEANUPBEFORERESTOREL_ENTRY=0xaa4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_CLEANUPBEFORERESTOREL_EXIT=0xaa5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_COMMONSETTINGSL_ENTRY=0xa78 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_COMMONSETTINGSL_EXIT=0xa79 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_CONSTRUCTL_ENTRY=0xa5a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_CONSTRUCTL_EXIT=0xa5b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_DISABLESYSTEMDATA_ENTRY=0x64c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_DISABLESYSTEMDATA_EXIT=0x64d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_FINDSNAPSHOT_ENTRY=0xa98 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_FINDSNAPSHOT_EXIT=0xa99 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETDRIVELISTL_ENTRY=0xa7e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETDRIVELISTL_EXIT=0xa7f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETDRIVE_ENTRY=0xa84 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETDRIVE_EXIT=0xa85 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETEXPECTEDDATASIZEL_ENTRY=0xa64 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETEXPECTEDDATASIZEL_EXIT=0xa65 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETEXTENDEDINTERFACE_ENTRY=0x66a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETEXTENDEDINTERFACE_EXIT=0x66b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETNEXTPUBLICFILEL_ENTRY=0xa8a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETNEXTPUBLICFILEL_EXIT=0xa8b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETPUBLICFILELISTL_ENTRY=0xa66 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETPUBLICFILELISTL_EXIT=0xa67 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETRAWPUBLICFILELISTL_ENTRY=0xa68 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_GETRAWPUBLICFILELISTL_EXIT=0xa69 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEACTIVEBACKUPL_ENTRY=0xac0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEACTIVEBACKUPL_EXIT=0xac1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEBACKUPREGISTRATIONL_ENTRY=0xab2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEBACKUPREGISTRATIONL_EXIT=0xab3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLECENREPBACKUP_ENTRY=0xaba +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLECENREPBACKUP_EXIT=0xabb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEDBMSBACKUPL_ENTRY=0xabe +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEDBMSBACKUPL_EXIT=0xabf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEPASSIVEBACKUP_ENTRY=0xab4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEPASSIVEBACKUP_EXIT=0xab5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEPATHL_ENTRY=0xac4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEPATHL_EXIT=0xac5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEPROXYDATAMANAGER_ENTRY=0xabc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEPROXYDATAMANAGER_EXIT=0xabd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEPUBLICBACKUP_ENTRY=0xab6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLEPUBLICBACKUP_EXIT=0xab7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLERESTORE_ENTRY=0xac2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLERESTORE_EXIT=0xac3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLESYSTEMBACKUP_ENTRY=0xab8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_HANDLESYSTEMBACKUP_EXIT=0xab9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ISEXCLUDED_ENTRY=0xa8c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ISEXCLUDED_EXIT=0xa8d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ISNEWERL_ENTRY=0xa96 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ISNEWERL_EXIT=0xa97 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_NEWLC_ENTRY=0xa56 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_NEWLC_EXIT=0xa57 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_NEWL_ENTRY=0xa54 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_NEWL_EXIT=0xa55 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONCONTENTL_ENTRY=0x65c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONCONTENTL_EXIT=0x65d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONENDDOCUMENTL_ENTRY=0xaaa +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONENDDOCUMENTL_EXIT=0xaab +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONENDELEMENTL_ENTRY=0xaae +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONENDELEMENTL_EXIT=0xaaf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONENDPREFIXMAPPINGL_ENTRY=0x660 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONENDPREFIXMAPPINGL_EXIT=0x661 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONERROR_ENTRY=0xab0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONERROR_EXIT=0xab1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONIGNORABLEWHITESPACEL_ENTRY=0x662 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONIGNORABLEWHITESPACEL_EXIT=0x663 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONPROCESSINGINSTRUCTIONL_ENTRY=0x666 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONPROCESSINGINSTRUCTIONL_EXIT=0x667 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONSKIPPEDENTITYL_ENTRY=0x664 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONSKIPPEDENTITYL_EXIT=0x665 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONSTARTDOCUMENTL_ENTRY=0xaa8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONSTARTDOCUMENTL_EXIT=0xaa9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONSTARTELEMENTL_ENTRY=0xaac +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONSTARTELEMENTL_EXIT=0xaad +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONSTARTPREFIXMAPPINGL_ENTRY=0x65e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_ONSTARTPREFIXMAPPINGL_EXIT=0x65f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PARSEDIRL_ENTRY=0xa88 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PARSEDIRL_EXIT=0xa89 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PARSEFILEL_ENTRY=0xa80 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PARSEFILEL_EXIT=0xa81 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PARSEFILESL_ENTRY=0xa62 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PARSEFILESL_EXIT=0xa63 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PARTIALAFFECTSME_ENTRY=0x628 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PARTIALAFFECTSME_EXIT=0x629 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PASSIVESETTINGSL_ENTRY=0xa7a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PASSIVESETTINGSL_EXIT=0xa7b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PRIVATEPATHL_ENTRY=0xa82 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PRIVATEPATHL_EXIT=0xa83 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PROCESSREQUESTDATAL_ENTRY=0xa6e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PROCESSREQUESTDATAL_EXIT=0xa6f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PROCESSSUPPLYDATAL_ENTRY=0xa6a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PROCESSSUPPLYDATAL_EXIT=0xa6b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PROXYSTATEBYDRIVEL_ENTRY=0xa9c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_PROXYSTATEBYDRIVEL_EXIT=0xa9d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_READYSTATE_ENTRY=0xa74 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_READYSTATE_EXIT=0xa75 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_REQUESTDATAL_ENTRY=0xa70 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_REQUESTDATAL_EXIT=0xa71 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_REQUESTPASSIVEDATAL_ENTRY=0xa94 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_REQUESTPASSIVEDATAL_EXIT=0xa95 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL_ENTRY=0xa92 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL_EXIT=0xa93 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_RESTORECOMPLETEL_ENTRY=0xa72 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_RESTORECOMPLETEL_EXIT=0xa73 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_SECUREID_ENTRY=0x616 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_SECUREID_EXIT=0x617 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_SETBACKEDUPASPARTIAL_ENTRY=0x626 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_SETBACKEDUPASPARTIAL_EXIT=0x627 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_SETREADYSTATE_ENTRY=0xa76 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_SETREADYSTATE_EXIT=0xa77 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_STARTPROCESSIFNECESSARYL_ENTRY=0xa60 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_STARTPROCESSIFNECESSARYL_EXIT=0xa61 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_STATEBYDRIVEL_ENTRY=0xa9a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_STATEBYDRIVEL_EXIT=0xa9b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_SUPPLYDATAL_ENTRY=0xa6c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_SUPPLYDATAL_EXIT=0xa6d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_SUPPLYPASSIVEBASEDATAL_ENTRY=0xa90 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_SUPPLYPASSIVEBASEDATAL_EXIT=0xa91 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL_ENTRY=0xa8e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL_EXIT=0xa8f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_VALIDFILEL_ENTRY=0xaa6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CDATAOWNER_VALIDFILEL_EXIT=0xaa7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_BUFFER_ENTRY=0x2a5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_BUFFER_EXIT=0x2a6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_CHEAPWRAPPER_DES_ENTRY=0x2a9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_CHEAPWRAPPER_DES_EXIT=0x2aa +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_CLEANREADBUFFER_ENTRY=0x2a7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_CLEANREADBUFFER_EXIT=0x2a8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_HEADER_ENTRY=0x748 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_NEWL_ENTRY=0x29c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_NEWL_EXIT=0x29d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_READBUFFERL_ENTRY=0x29e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_READBUFFERL_EXIT=0x29f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_RESETHEAP_ENTRY=0x2a3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_RESETHEAP_EXIT=0x2a4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_WRITEBUFFERL_ENTRY=0x2a0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CHEAPWRAPPER_WRITEBUFFERL_EXIT=0x2a1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ACTIVESETTINGSL_ENTRY=0x78e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ACTIVESETTINGSL_EXIT=0x78f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_BUILDPACKAGEFILELIST_ENTRY=0xb91 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_BUILDPACKAGEFILELIST_EXIT=0xb92 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_CLEANUP_ENTRY=0xbaf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_CLEANUP_EXIT=0xbb0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_COMMONSETTINGSL_ENTRY=0xbb4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_COMMONSETTINGSL_EXIT=0xbb5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_COMPARE_ENTRY=0xbc6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_COMPARE_EXIT=0xbc7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_CONSTRUCTL_ENTRY=0xb8b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_CONSTRUCTL_EXIT=0xb8c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_CPACKAGEDATATRANSFER_CONS_ENTRY=0xb89 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_CPACKAGEDATATRANSFER_CONS_EXIT=0xb8a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_CPACKAGEDATATRANSFER_DES_ENTRY=0xb8d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_CPACKAGEDATATRANSFER_DES_EXIT=0xb8e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_DOREQUESTDATAL_ENTRY=0xba5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_DOREQUESTDATAL_EXIT=0xba6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_DOSUPPLYDATAL_ENTRY=0xba0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_DOSUPPLYDATAL_EXIT=0xba1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_GETDRIVELISTL_ENTRY=0xbc2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_GETDRIVELISTL_EXIT=0xbc3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL_ENTRY=0xb93 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL_EXIT=0xb94 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_GETEXTENDEDINTERFACE_ENTRY=0x7b9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_GETEXTENDEDINTERFACE_EXIT=0x7ba +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL_ENTRY=0xbbe +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL_EXIT=0xbbf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_GETRAWPUBLICFILELISTL_ENTRY=0xbbc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_GETRAWPUBLICFILELISTL_EXIT=0xbbd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_HANDLEBACKUPREGISTRATIONL_ENTRY=0xbd4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_HANDLEBACKUPREGISTRATIONL_EXIT=0xbd5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_HANDLEPATHL_ENTRY=0xbda +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_HANDLEPATHL_EXIT=0xbdb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_HANDLEPUBLICBACKUP_ENTRY=0xbd6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_HANDLEPUBLICBACKUP_EXIT=0xbd7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_HANDLESYSTEMBACKUP_ENTRY=0xbd8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_HANDLESYSTEMBACKUP_EXIT=0xbd9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ISDATAONDRIVE_ENTRY=0xbb1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ISDATAONDRIVE_EXIT=0xbb2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ISEXCLUDED_ENTRY=0xbc4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ISEXCLUDED_EXIT=0xbc5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_MATCH_ENTRY=0x7a2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_NEWLC_ENTRY=0xb87 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_NEWLC_EXIT=0xb88 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_NEWL_ENTRY=0xb85 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_NEWL_EXIT=0xb86 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONCONTENTL_ENTRY=0x7ab +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONCONTENTL_EXIT=0x7ac +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONENDDOCUMENTL_ENTRY=0xbcc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONENDDOCUMENTL_EXIT=0xbcd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONENDELEMENTL_ENTRY=0xbd0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONENDELEMENTL_EXIT=0xbd1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONENDPREFIXMAPPINGL_ENTRY=0x7af +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONENDPREFIXMAPPINGL_EXIT=0x7b0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONERROR_ENTRY=0xbd2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONERROR_EXIT=0xbd3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONIGNORABLEWHITESPACEL_ENTRY=0x7b1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONIGNORABLEWHITESPACEL_EXIT=0x7b2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONPROCESSINGINSTRUCTIONL_ENTRY=0x7b5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONPROCESSINGINSTRUCTIONL_EXIT=0x7b6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONSKIPPEDENTITYL_ENTRY=0x7b3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONSKIPPEDENTITYL_EXIT=0x7b4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONSTARTDOCUMENTL_ENTRY=0xbca +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONSTARTDOCUMENTL_EXIT=0xbcb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONSTARTELEMENTL_ENTRY=0xbce +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONSTARTELEMENTL_EXIT=0xbcf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONSTARTPREFIXMAPPINGL_ENTRY=0x7ad +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_ONSTARTPREFIXMAPPINGL_EXIT=0x7ae +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_PACKAGEID_ENTRY=0x765 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_PACKAGEID_EXIT=0x766 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_PARSEDIRL_ENTRY=0xbc0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_PARSEDIRL_EXIT=0xbc1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_PARSEL_ENTRY=0xbba +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_PARSEL_EXIT=0xbbb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_PASSIVESETTINGSL_ENTRY=0xbb6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_PASSIVESETTINGSL_EXIT=0xbb7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_READDATA_ENTRY=0xb9a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_READDATA_EXIT=0xb9b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_REQUESTDATAL_ENTRY=0xb97 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_REQUESTDATAL_EXIT=0xb98 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_REQUESTSNAPSHOTL_ENTRY=0xbac +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_REQUESTSNAPSHOTL_EXIT=0xbad +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_SETREGISTRATIONFILEL_ENTRY=0xbb8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_SETREGISTRATIONFILEL_EXIT=0xbb9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_SUPPLYDATAL_ENTRY=0xb9e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_SUPPLYDATAL_EXIT=0xb9f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL_ENTRY=0xb9c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL_EXIT=0xb9d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_SUPPLYSNAPSHOTL_ENTRY=0xba3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_SUPPLYSNAPSHOTL_EXIT=0xba4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_WRITEDATA_ENTRY=0xb8f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CPACKAGEDATATRANSFER_WRITEDATA_EXIT=0xb90 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBACTIVESCHEDULER_ERROR_ENTRY=0xb7d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBACTIVESCHEDULER_ERROR_EXIT=0xb7e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CANCELREQUEST_ENTRY=0x929 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CANCELREQUEST_EXIT=0x92a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_COMPLETEOBSERVER_ENTRY=0x92f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_COMPLETEOBSERVER_EXIT=0x930 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CONSTRUCTL_ENTRY=0x921 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CONSTRUCTL_EXIT=0x922 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_CONS_ENTRY=0x923 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_CONS_EXIT=0x924 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_DES_ENTRY=0x925 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_DES_EXIT=0x926 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_ENTRY=0x47d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_EXIT=0x47e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_DOCANCEL_ENTRY=0x92d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_DOCANCEL_EXIT=0x92e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_NEWL_ENTRY=0x91f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_NEWL_EXIT=0x920 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_RUNERROR_ENTRY=0x931 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_RUNERROR_EXIT=0x932 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_RUNL_ENTRY=0x92b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_RUNL_EXIT=0x92c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_STARTL_ENTRY=0x927 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECALLBACKHANDLER_STARTL_EXIT=0x928 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_ALLSNAPSHOTSSUPPLIEDL_ENTRY=0x8cb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_ALLSNAPSHOTSSUPPLIEDL_EXIT=0x8cc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_ALLSYSTEMFILESRESTOREDL_ENTRY=0x8d9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_ALLSYSTEMFILESRESTOREDL_EXIT=0x8da +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_ALLSYSTEMFILESRESTORED_ENTRY=0x8cf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_ALLSYSTEMFILESRESTORED_EXIT=0x8d0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CONSTRUCTL_ENTRY=0x8ad +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CONSTRUCTL_EXIT=0x8ae +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CSBECLIENT_CONS_ENTRY=0x8a9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CSBECLIENT_CONS_EXIT=0x8aa +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CSBECLIENT_DES_ENTRY=0x8af +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CSBECLIENT_DES_EXIT=0x8b0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CSBECLIENT_ENTRY=0x405 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_CSBECLIENT_EXIT=0x406 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_DATACHECKSUM_ENTRY=0x8db +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_DATACHECKSUM_EXIT=0x8dc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_EXPECTEDDATASIZEL_ENTRY=0x8cd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_EXPECTEDDATASIZEL_EXIT=0x8ce +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_LISTOFDATAOWNERSL_ENTRY=0x8b1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_LISTOFDATAOWNERSL_EXIT=0x8b2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_NEWL_ENTRY=0x8ab +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_NEWL_EXIT=0x8ac +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_PUBLICFILELISTL_ENTRY=0x8b3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_PUBLICFILELISTL_EXIT=0x8b4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_PUBLICFILELISTXMLL_ENTRY=0x8b7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_PUBLICFILELISTXMLL_EXIT=0x8b8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_RAWPUBLICFILELISTL_ENTRY=0x8b5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_RAWPUBLICFILELISTL_EXIT=0x8b6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_REQUESTDATAL_ENTRY=0x8c3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_REQUESTDATAL_EXIT=0x8c4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SETBURMODEL_ENTRY=0x8b9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SETBURMODEL_EXIT=0x8ba +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SETSIDLISTFORPARTIALBURL_ENTRY=0x8bb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SETSIDLISTFORPARTIALBURL_EXIT=0x8bc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SIDSTATUSL_ENTRY=0x8bd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SIDSTATUSL_EXIT=0x8be +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SUPPLYDATAL_ENTRY=0x8c7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_SUPPLYDATAL_EXIT=0x8c8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_TRANSFERDATAADDRESSL_ENTRY=0x8bf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_TRANSFERDATAADDRESSL_EXIT=0x8c0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_TRANSFERDATAINFOL_ENTRY=0x8c1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECLIENT_TRANSFERDATAINFOL_EXIT=0x8c2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_CONSTRUCTL_ENTRY=0xa16 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_CONSTRUCTL_EXIT=0xa17 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_CSBECOMPRESSANDENCRYPT_CONS_ENTRY=0xa12 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_CSBECOMPRESSANDENCRYPT_CONS_EXIT=0xa13 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_CSBECOMPRESSANDENCRYPT_DES_ENTRY=0xa14 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_CSBECOMPRESSANDENCRYPT_DES_EXIT=0xa15 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_CSBECOMPRESSANDENCRYPT_ENTRY=0x598 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_CSBECOMPRESSANDENCRYPT_EXIT=0x599 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_FREERESERVEDSPACE_ENTRY=0xa1a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_FREERESERVEDSPACE_EXIT=0xa1b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_NEWLC_ENTRY=0xa10 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_NEWLC_EXIT=0xa11 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_PACKL_ENTRY=0xa18 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECOMPRESSANDENCRYPT_PACKL_EXIT=0xa19 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_APPCLOSEDELAY_ENTRY=0x5c6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_APPCLOSEDELAY_EXIT=0x5c7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_CENTREPID_ENTRY=0x5c2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_CENTREPID_EXIT=0x5c3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_CSBECONFIG_CONS_ENTRY=0xa36 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_CSBECONFIG_CONS_EXIT=0xa37 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_CSBECONFIG_DES_ENTRY=0xa38 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_CSBECONFIG_DES_EXIT=0xa39 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_CSBECONFIG_ENTRY=0x5bc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_CSBECONFIG_EXIT=0x5bd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_EXCLUDEDRIVELIST_ENTRY=0x5c4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_EXCLUDEDRIVELIST_EXIT=0x5c5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_GETEXTENDEDINTERFACE_ENTRY=0x5e6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_GETEXTENDEDINTERFACE_EXIT=0x5e7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_HANDLEATTRIBUTESELEMENT_ENTRY=0xa42 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_HANDLEATTRIBUTESELEMENT_EXIT=0xa43 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_HEAPVALUES_ENTRY=0xa3a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_HEAPVALUES_EXIT=0xa3b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_NEWL_ENTRY=0xa34 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_NEWL_EXIT=0xa35 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONCONTENTL_ENTRY=0x5d8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONCONTENTL_EXIT=0x5d9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONENDDOCUMENTL_ENTRY=0xa46 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONENDDOCUMENTL_EXIT=0xa47 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONENDELEMENTL_ENTRY=0x5d6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONENDELEMENTL_EXIT=0x5d7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONENDPREFIXMAPPINGL_ENTRY=0x5dc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONENDPREFIXMAPPINGL_EXIT=0x5dd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONERROR_ENTRY=0x5e4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONERROR_EXIT=0x5e5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONIGNORABLEWHITESPACEL_ENTRY=0x5de +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONIGNORABLEWHITESPACEL_EXIT=0x5df +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONPROCESSINGINSTRUCTIONL_ENTRY=0x5e2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONPROCESSINGINSTRUCTIONL_EXIT=0x5e3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONSKIPPEDENTITYL_ENTRY=0x5e0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONSKIPPEDENTITYL_EXIT=0x5e1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONSTARTDOCUMENTL_ENTRY=0xa44 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONSTARTDOCUMENTL_EXIT=0xa45 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONSTARTELEMENTL_ENTRY=0xa48 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONSTARTELEMENTL_EXIT=0xa49 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONSTARTPREFIXMAPPINGL_ENTRY=0x5da +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_ONSTARTPREFIXMAPPINGL_EXIT=0x5db +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_PARSEL_ENTRY=0xa40 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_PARSEL_EXIT=0xa41 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_SETDEFAULT_ENTRY=0xa3c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_SETDEFAULT_EXIT=0xa3d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_STRINGTODRIVES_ENTRY=0xa3e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBECONFIG_STRINGTODRIVES_EXIT=0xa3f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL_ENTRY=0xa31 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL_EXIT=0xa32 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_CSBEDECOMPRESSANDENCRYPT_ENTRY=0xa20 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_CSBEDECOMPRESSANDENCRYPT_EXIT=0xa21 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_MOVEALONGL_ENTRY=0xa2a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_MOVEALONGL_EXIT=0xa2b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_NEWLC_ENTRY=0xa1e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_NEWLC_EXIT=0xa1f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_NEWL_ENTRY=0xa1c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_NEWL_EXIT=0xa1d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_NEXTLC_ENTRY=0xa2c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_NEXTLC_EXIT=0xa2d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_RESET_ENTRY=0xa28 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_RESET_EXIT=0xa29 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_SETBUFFER_ENTRY=0xa24 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_SETBUFFER_EXIT=0xa25 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_SETGENERICTRANSFERTYPEL_ENTRY=0xa26 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEDECOMPRESSANDENCRYPT_SETGENERICTRANSFERTYPEL_EXIT=0xa27 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CALCULATEPACKEDSIZE_ENTRY=0x3f3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CALCULATEPACKEDSIZE_EXIT=0x3f4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CONSTRUCTL_ENTRY=0x3ef +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CONSTRUCTL_EXIT=0x3f0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CSBEFILEENTRY_CONS_ENTRY=0x3e9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CSBEFILEENTRY_CONS_EXIT=0x3ea +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CSBEFILEENTRY_DES_ENTRY=0x3ed +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_CSBEFILEENTRY_DES_EXIT=0x3ee +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_EXTERNALISELC_ENTRY=0x3f5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_EXTERNALISELC_EXIT=0x3f6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_FILEATTRIBUTES_ENTRY=0x89d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_FILEATTRIBUTES_EXIT=0x89e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_FILENAME_ENTRY=0x8a3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_FILENAME_EXIT=0x8a4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_FILESIZE_ENTRY=0x89f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_FILESIZE_EXIT=0x8a0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_INTERNALISEL_ENTRY=0x3f1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_INTERNALISEL_EXIT=0x3f2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_LASTMODIFIED_ENTRY=0x8a1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_LASTMODIFIED_EXIT=0x8a2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_MIMETYPE_ENTRY=0x8a5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_MIMETYPE_EXIT=0x8a6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_MIMEUID_ENTRY=0x8a7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_MIMEUID_EXIT=0x8a8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_NEWLC_ENTRY=0x3e5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEFILEENTRY_NEWLC_EXIT=0x3e6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_CONSTRUCTL_ENTRY=0xb19 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_CONSTRUCTL_EXIT=0xb1a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_CONVERTTOUNICODEL_ENTRY=0xb1f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_CONVERTTOUNICODEL_EXIT=0xb20 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_CSBEPARSERPROXY_CONS_ENTRY=0xb15 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_CSBEPARSERPROXY_CONS_EXIT=0xb16 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_CSBEPARSERPROXY_DES_ENTRY=0xb17 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_CSBEPARSERPROXY_DES_EXIT=0xb18 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_CSBEPARSERPROXY_ENTRY=0x6d9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_CSBEPARSERPROXY_EXIT=0x6da +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_GETEXTENDEDINTERFACE_ENTRY=0x6fb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_NEWL_ENTRY=0xb1b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_NEWL_EXIT=0xb1c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONCONTENTL_ENTRY=0xb29 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONCONTENTL_EXIT=0xb2a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONENDDOCUMENTL_ENTRY=0xb23 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONENDDOCUMENTL_EXIT=0xb24 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONENDELEMENTL_ENTRY=0xb27 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONENDELEMENTL_EXIT=0xb28 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONENDPREFIXMAPPINGL_ENTRY=0xb2d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONENDPREFIXMAPPINGL_EXIT=0xb2e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONERROR_ENTRY=0xb35 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONERROR_EXIT=0xb36 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONIGNORABLEWHITESPACEL_ENTRY=0xb2f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONIGNORABLEWHITESPACEL_EXIT=0xb30 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONPROCESSINGINSTRUCTIONL_ENTRY=0xb33 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONPROCESSINGINSTRUCTIONL_EXIT=0xb34 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONSKIPPEDENTITYL_ENTRY=0xb31 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONSKIPPEDENTITYL_EXIT=0xb32 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONSTARTDOCUMENTL_ENTRY=0xb21 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONSTARTDOCUMENTL_EXIT=0xb22 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONSTARTELEMENTL_ENTRY=0xb25 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONSTARTELEMENTL_EXIT=0xb26 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONSTARTPREFIXMAPPINGL_ENTRY=0xb2b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_ONSTARTPREFIXMAPPINGL_EXIT=0xb2c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_PARSEL_ENTRY=0xb1d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBEPARSERPROXY_PARSEL_EXIT=0xb1e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_ADDSESSION_ENTRY=0xb41 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_ADDSESSION_EXIT=0xb42 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_ALLOCATEGLOBALSHAREDHEAPL_ENTRY=0xb3f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_ALLOCATEGLOBALSHAREDHEAPL_EXIT=0xb40 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_CONSTRUCTL_ENTRY=0xb3d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_CONSTRUCTL_EXIT=0xb3e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_CSBESERVER_CONS_ENTRY=0xb37 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_CSBESERVER_CONS_EXIT=0xb38 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_CSBESERVER_DES_ENTRY=0xb39 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_CSBESERVER_DES_EXIT=0xb3a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_DROPSESSION_ENTRY=0xb43 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_DROPSESSION_EXIT=0xb44 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_NEWLC_ENTRY=0xb3b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_NEWLC_EXIT=0xb3c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_NEWSESSIONL_ENTRY=0xb45 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_NEWSESSIONL_EXIT=0xb46 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_PANICCLIENT_ENTRY=0xb49 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_PANICCLIENT_EXIT=0xb4a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_RUNERROR_ENTRY=0xb47 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESERVER_RUNERROR_EXIT=0xb48 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_ALLSNAPSHOTSSUPPLIEDL_ENTRY=0xb73 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_ALLSNAPSHOTSSUPPLIEDL_EXIT=0xb74 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_ALLSYSTEMFILESRESTOREDL_ENTRY=0xb75 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_ALLSYSTEMFILESRESTOREDL_EXIT=0xb76 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_CREATEL_ENTRY=0xb4f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_CREATEL_EXIT=0xb50 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_CSBESESSION_CONS_ENTRY=0xb4b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_CSBESESSION_CONS_EXIT=0xb4c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_CSBESESSION_DES_ENTRY=0xb4d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_CSBESESSION_DES_EXIT=0xb4e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_GETEXPECTEDDATASIZEL_ENTRY=0xb71 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_GETEXPECTEDDATASIZEL_EXIT=0xb72 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_PREPDATAOWNERINFOL_ENTRY=0xb53 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_PREPDATAOWNERINFOL_EXIT=0xb54 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_PREPLARGEPUBLICFILELISTL_ENTRY=0xb77 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_PREPLARGEPUBLICFILELISTL_EXIT=0xb78 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_PREPPUBLICFILELISTL_ENTRY=0xb57 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_PREPPUBLICFILELISTL_EXIT=0xb58 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_PREPPUBLICFILELISTRAWL_ENTRY=0xb5b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_PREPPUBLICFILELISTRAWL_EXIT=0xb5c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_PREPPUBLICFILELISTXMLL_ENTRY=0xb5f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_PREPPUBLICFILELISTXMLL_EXIT=0xb60 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_PREPSIDSTATUSL_ENTRY=0xb67 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_PREPSIDSTATUSL_EXIT=0xb68 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_REQUESTDATAASYNCL_ENTRY=0xb6b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_REQUESTDATAASYNCL_EXIT=0xb6c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_REQUESTDATASYNCL_ENTRY=0xb6d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_REQUESTDATASYNCL_EXIT=0xb6e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RESETTRANSFERBUF_ENTRY=0xb7b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RESETTRANSFERBUF_EXIT=0xb7c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RETURNDATAOWNERINFOL_ENTRY=0xb55 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RETURNDATAOWNERINFOL_EXIT=0xb56 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RETURNLARGEPUBLICFILELISTL_ENTRY=0xb79 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RETURNLARGEPUBLICFILELISTL_EXIT=0xb7a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RETURNPUBLICFILELISTL_ENTRY=0xb59 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RETURNPUBLICFILELISTL_EXIT=0xb5a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RETURNPUBLICFILELISTRAWL_ENTRY=0xb5d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RETURNPUBLICFILELISTRAWL_EXIT=0xb5e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RETURNPUBLICFILELISTXMLL_ENTRY=0xb61 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RETURNPUBLICFILELISTXMLL_EXIT=0xb62 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RETURNSIDSTATUSL_ENTRY=0xb69 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_RETURNSIDSTATUSL_EXIT=0xb6a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_SERVER_ENTRY=0x717 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_SERVICEL_ENTRY=0xb51 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_SERVICEL_EXIT=0xb52 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_SETBURMODEL_ENTRY=0xb63 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_SETBURMODEL_EXIT=0xb64 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_SETSIDLISTFORPARTIALBURL_ENTRY=0xb65 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_SETSIDLISTFORPARTIALBURL_EXIT=0xb66 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_SUPPLYDATASYNCL_ENTRY=0xb6f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBESESSION_SUPPLYDATASYNCL_EXIT=0xb70 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_BASECONSTRUCTL_ENTRY=0x34f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_BASECONSTRUCTL_EXIT=0x350 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_CONSTRUCTL_ENTRY=0x34b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_CONSTRUCTL_EXIT=0x34c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_CSBGENERICDATATYPE_CONS_ENTRY=0x347 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_CSBGENERICDATATYPE_CONS_EXIT=0x348 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_CSBGENERICDATATYPE_DES_ENTRY=0x349 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_CSBGENERICDATATYPE_DES_EXIT=0x34a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_DERIVEDTYPEL_ENTRY=0x353 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_DERIVEDTYPEL_EXIT=0x354 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_EXTERNALISE_ENTRY=0x7f7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_EXTERNALISE_EXIT=0x7f8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_INITIALISEL_ENTRY=0x34d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_INITIALISEL_EXIT=0x34e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_NEWL_ENTRY=0x345 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_NEWL_EXIT=0x346 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_PACKDESCRIPTORTYPEADVANCE_ENTRY=0x35d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_PACKDESCRIPTORTYPEADVANCE_EXIT=0x35e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_UNPACKDESCRIPTORTYPEADVANCE_ENTRY=0x355 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_UNPACKDESCRIPTORTYPEADVANCE_EXIT=0x356 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_UNPACKTPTRADVANCE_ENTRY=0x359 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICDATATYPE_UNPACKTPTRADVANCE_EXIT=0x35a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_CSBGENERICTRANSFERTYPE_CONS_ENTRY=0x38b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_CSBGENERICTRANSFERTYPE_CONS_EXIT=0x38c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_CSBGENERICTRANSFERTYPE_DES_ENTRY=0x38d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_CSBGENERICTRANSFERTYPE_DES_EXIT=0x38e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_DRIVENUMBERL_ENTRY=0x38f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_DRIVENUMBERL_EXIT=0x390 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_INITIALISEL_ENTRY=0x389 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_INITIALISEL_EXIT=0x38a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_NEWL_ENTRY=0x387 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBGENERICTRANSFERTYPE_NEWL_EXIT=0x388 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CONSTRUCTFROMEXISTINGL_ENTRY=0x3c5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CONSTRUCTFROMEXISTINGL_EXIT=0x3c6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CONSTRUCTL_ENTRY=0x3c3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CONSTRUCTL_EXIT=0x3c4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CSBJAVAID_CONS_ENTRY=0x3b9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CSBJAVAID_CONS_EXIT=0x3ba +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CSBJAVAID_DES_ENTRY=0x3bd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_CSBJAVAID_DES_EXIT=0x3be +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_INITIALISEL_ENTRY=0x3bf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_INITIALISEL_EXIT=0x3c0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_NEWL_ENTRY=0x3b5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_NEWL_EXIT=0x3b6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_SUITEHASHL_ENTRY=0x873 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_SUITEHASHL_EXIT=0x874 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_SUITENAMEL_ENTRY=0x86d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_SUITENAMEL_EXIT=0x86e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_SUITEVENDORL_ENTRY=0x86f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_SUITEVENDORL_EXIT=0x870 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_SUITEVERSIONL_ENTRY=0x871 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVAID_SUITEVERSIONL_EXIT=0x872 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_CONSTRUCTL_ENTRY=0x3dd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_CONSTRUCTL_EXIT=0x3de +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_CONS_ENTRY=0x3d3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_CONS_EXIT=0x3d4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_DES_ENTRY=0x3d7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_DES_EXIT=0x3d8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_DATATYPEL_ENTRY=0x3e3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_DATATYPEL_EXIT=0x3e4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_INITIALISEL_ENTRY=0x3d9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_INITIALISEL_EXIT=0x3da +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_NEWL_ENTRY=0x3cf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_NEWL_EXIT=0x3d0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_SUITEHASHL_ENTRY=0x887 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBJAVATRANSFERTYPE_SUITEHASHL_EXIT=0x888 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_CONSTRUCTL_ENTRY=0x37d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_CONSTRUCTL_EXIT=0x37e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_CSBPACKAGEID_CONS_ENTRY=0x375 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_CSBPACKAGEID_CONS_EXIT=0x376 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_CSBPACKAGEID_DES_ENTRY=0x377 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_CSBPACKAGEID_DES_EXIT=0x378 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_INITIALISEL_ENTRY=0x379 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_INITIALISEL_EXIT=0x37a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_NEWL_ENTRY=0x371 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_NEWL_EXIT=0x372 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_PACKAGEIDL_ENTRY=0x381 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_PACKAGEIDL_EXIT=0x382 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_PACKAGENAMEL_ENTRY=0x385 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_PACKAGENAMEL_EXIT=0x386 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_SECUREIDL_ENTRY=0x383 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGEID_SECUREIDL_EXIT=0x384 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_CONSTRUCTL_ENTRY=0x3ad +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_CONSTRUCTL_EXIT=0x3ae +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_CSBPACKAGETRANSFERTYPE_CONS_ENTRY=0x3a7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_CSBPACKAGETRANSFERTYPE_CONS_EXIT=0x3a8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_CSBPACKAGETRANSFERTYPE_DES_ENTRY=0x3ab +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_CSBPACKAGETRANSFERTYPE_DES_EXIT=0x3ac +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_DATATYPEL_ENTRY=0x3b3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_DATATYPEL_EXIT=0x3b4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_INITIALISEL_ENTRY=0x3a9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_INITIALISEL_EXIT=0x3aa +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_NEWL_ENTRY=0x3a3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_NEWL_EXIT=0x3a4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_PACKAGEIDL_ENTRY=0x3b1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBPACKAGETRANSFERTYPE_PACKAGEIDL_EXIT=0x3b2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_CONSTRUCTL_ENTRY=0x36b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_CONSTRUCTL_EXIT=0x36c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_CSBSECUREID_CONS_ENTRY=0x365 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_CSBSECUREID_CONS_EXIT=0x366 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_CSBSECUREID_DES_ENTRY=0x367 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_CSBSECUREID_DES_EXIT=0x368 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_INITIALISEL_ENTRY=0x369 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_INITIALISEL_EXIT=0x36a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_NEWL_ENTRY=0x361 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_NEWL_EXIT=0x362 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_SECUREIDL_ENTRY=0x36f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSECUREID_SECUREIDL_EXIT=0x370 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSHUTDOWN_CONSTRUCTL_ENTRY=0xbde +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSHUTDOWN_CONSTRUCTL_EXIT=0xbdf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSHUTDOWN_CSBSHUTDOWN_CONS_ENTRY=0xbdc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSHUTDOWN_CSBSHUTDOWN_CONS_EXIT=0xbdd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSHUTDOWN_RUNL_ENTRY=0xbe2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSHUTDOWN_RUNL_EXIT=0xbe3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSHUTDOWN_START_ENTRY=0xbe0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSHUTDOWN_START_EXIT=0xbe1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_CONSTRUCTL_ENTRY=0x39b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_CONSTRUCTL_EXIT=0x39c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_CSBSIDTRANSFERTYPE_CONS_ENTRY=0x395 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_CSBSIDTRANSFERTYPE_CONS_EXIT=0x396 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_CSBSIDTRANSFERTYPE_DES_ENTRY=0x397 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_CSBSIDTRANSFERTYPE_DES_EXIT=0x398 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_DATATYPEL_ENTRY=0x3a1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_DATATYPEL_EXIT=0x3a2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_INITIALISEL_ENTRY=0x399 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_INITIALISEL_EXIT=0x39a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_NEWL_ENTRY=0x391 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_NEWL_EXIT=0x392 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_SECUREIDL_ENTRY=0x39f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSBSIDTRANSFERTYPE_SECUREIDL_EXIT=0x3a0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURENCRYPTKEYSOURCE_CONSTRUCTL_ENTRY=0x493 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURENCRYPTKEYSOURCE_CONSTRUCTL_EXIT=0x494 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURENCRYPTKEYSOURCE_CSECUREBURENCRYPTKEYSOURCE_ENTRY=0x48f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURENCRYPTKEYSOURCE_CSECUREBURENCRYPTKEYSOURCE_EXIT=0x490 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURENCRYPTKEYSOURCE_GETBACKUPKEYL_ENTRY=0x497 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURENCRYPTKEYSOURCE_GETBACKUPKEYL_EXIT=0x498 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURENCRYPTKEYSOURCE_GETDEFAULTBUFFERFORBACKUPL_ENTRY=0x495 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURENCRYPTKEYSOURCE_GETDEFAULTBUFFERFORBACKUPL_EXIT=0x496 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURENCRYPTKEYSOURCE_GETRESTOREKEYL_ENTRY=0x499 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURENCRYPTKEYSOURCE_GETRESTOREKEYL_EXIT=0x49a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURENCRYPTKEYSOURCE_NEWL_ENTRY=0x48d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURENCRYPTKEYSOURCE_NEWL_EXIT=0x48e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURKEYSOURCEIMPL_CSECUREBURKEYSOURCEIMPL_ENTRY=0x49d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURKEYSOURCEIMPL_CSECUREBURKEYSOURCEIMPL_EXIT=0x49e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURKEYSOURCEIMPL_GETBACKUPKEYL_ENTRY=0x4a3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURKEYSOURCEIMPL_GETBACKUPKEYL_EXIT=0x4a4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURKEYSOURCEIMPL_GETDEFAULTBUFFERFORBACKUPL_ENTRY=0x4a1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURKEYSOURCEIMPL_GETDEFAULTBUFFERFORBACKUPL_EXIT=0x4a2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURKEYSOURCEIMPL_GETRESTOREKEYL_ENTRY=0x4a5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURKEYSOURCEIMPL_GETRESTOREKEYL_EXIT=0x4a6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURKEYSOURCEIMPL_NEWL_ENTRY=0x49b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSECUREBURKEYSOURCEIMPL_NEWL_EXIT=0x49c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_CONSTRUCTL_ENTRY=0xa52 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_CONSTRUCTL_EXIT=0xa53 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_CSELECTION_CONS_ENTRY=0xa50 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_CSELECTION_CONS_EXIT=0xa51 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_CSELECTION_DES_ENTRY=0xa4e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_CSELECTION_DES_EXIT=0xa4f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_CSELECTION_ENTRY=0x5ec +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_CSELECTION_EXIT=0x5ed +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_NEWLC_ENTRY=0xa4c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_NEWLC_EXIT=0xa4d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_SELECTIONNAME_ENTRY=0x5f4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_SELECTIONNAME_EXIT=0x5f5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_SELECTIONTYPE_ENTRY=0x5f2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSELECTION_SELECTIONTYPE_EXIT=0x5f3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOTHOLDER_CSNAPSHOTHOLDER_CONS_ENTRY=0xacd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOTHOLDER_CSNAPSHOTHOLDER_CONS_EXIT=0xace +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOTHOLDER_CSNAPSHOTHOLDER_DES_ENTRY=0xacf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOTHOLDER_CSNAPSHOTHOLDER_DES_EXIT=0xad0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOTHOLDER_CSNAPSHOTHOLDER_ENTRY=0x687 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOTHOLDER_CSNAPSHOTHOLDER_EXIT=0x688 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOTHOLDER_NEWLC_ENTRY=0xacb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOTHOLDER_NEWLC_EXIT=0xacc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOTHOLDER_NEWL_ENTRY=0xac9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOTHOLDER_NEWL_EXIT=0xaca +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_COMPARE_ENTRY=0x590 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_CONSTRUCTL_ENTRY=0xa08 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_CONSTRUCTL_EXIT=0xa09 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_CSNAPSHOT_CONS_ENTRY=0xa06 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_CSNAPSHOT_CONS_EXIT=0xa07 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_CSNAPSHOT_DES_ENTRY=0xa04 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_CSNAPSHOT_DES_EXIT=0xa05 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_CSNAPSHOT_ENTRY=0x584 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_CSNAPSHOT_EXIT=0x585 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_FILENAME_ENTRY=0x58c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_FILENAME_EXIT=0x58d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_MATCH_ENTRY=0x591 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_MODIFIED_ENTRY=0x58a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_MODIFIED_EXIT=0x58b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_NEWLC_ENTRY=0xa01 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_NEWLC_EXIT=0xa02 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_SNAPSHOT_ENTRY=0xa0a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CSNAPSHOT_SNAPSHOT_EXIT=0xa0b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CABSERVER_CABSERVER_ENTRY=0x4a9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CABSERVER_CABSERVER_EXIT=0x4aa +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CABSERVER_SESSIONREADYSTATEL_EXIT=0x94b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CABSESSIONELEMENT_CABSESSIONELEMENT_ENTRY=0x525 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CABSESSIONELEMENT_CABSESSIONELEMENT_EXIT=0x526 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CABSESSIONMAP_CABSESSIONMAP_ENTRY=0x534 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CABSESSIONMAP_CABSESSIONMAP_EXIT=0x535 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CBUFFERFILEREADER_CBUFFERFILEREADER_ENTRY=0x566 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CBUFFERFILEREADER_CBUFFERFILEREADER_EXIT=0x567 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CBUFFERFILEWRITER_CBUFFERFILEWRITER_ENTRY=0x544 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CBUFFERFILEWRITER_CBUFFERFILEWRITER_EXIT=0x545 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CBUFFERSNAPSHOTREADER_CBUFFERSNAPSHOTREADER_ENTRY=0x579 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CBUFFERSNAPSHOTREADER_CBUFFERSNAPSHOTREADER_EXIT=0x57a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CBUFFERSNAPSHOTWRITER_CBUFFERSNAPSHOTWRITER_ENTRY=0x56e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CBUFFERSNAPSHOTWRITER_CBUFFERSNAPSHOTWRITER_EXIT=0x56f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_ENTRY=0x68f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_EXIT=0x690 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERCONTAINER_COMPARE_EXIT=0xadb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERINFO_CONSTRUCTL_ENTRY=0x32f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERINFO_CONSTRUCTL_EXIT=0x330 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERINFO_DRIVELIST_ENTRY=0x7e3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERINFO_DRIVELIST_EXIT=0x7e4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERINFO_IDENTIFIER_ENTRY=0x7d9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERINFO_IDENTIFIER_EXIT=0x7da +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERINFO_NEWL_ENTRY=0x327 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERINFO_NEWL_EXIT=0x328 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERMANAGER_CDATAOWNERMANAGER_ENTRY=0x6a2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERMANAGER_CDATAOWNERMANAGER_EXIT=0x6a3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERMANAGER_FINDL_EXIT=0xb0b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERMANAGER_FINDPACKAGEDATACONTAINERL_EXIT=0xb0e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNERMANAGER_SETBURMODEL_EXIT=0xae9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNER_CDATAOWNER_ENTRY=0x5fe +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNER_CDATAOWNER_EXIT=0x5ff +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CDATAOWNER_HANDLEPATHL_EXIT=0xac6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CPACKAGEDATATRANSFER_COMPARE_EXIT=0xbc8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CPACKAGEDATATRANSFER_DOREQUESTDATAL_EXIT=0xba7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CPACKAGEDATATRANSFER_DOSUPPLYDATAL_EXIT=0xba2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL_EXIT=0xb95 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CPACKAGEDATATRANSFER_ISDATAONDRIVE_EXIT=0xbb3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CPACKAGEDATATRANSFER_REQUESTDATAL_EXIT=0xb99 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CPACKAGEDATATRANSFER_REQUESTSNAPSHOTL_EXIT=0xbae +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_ENTRY=0x47f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECALLBACKHANDLER_CSBECALLBACKHANDLER_EXIT=0x480 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_ALLSNAPSHOTSSUPPLIEDL_ENTRY=0x8d7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_ALLSNAPSHOTSSUPPLIEDL_EXIT=0x8d8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_CSBECLIENT_ENTRY=0x40b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_CSBECLIENT_EXIT=0x40c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_LISTOFDATAOWNERSL_ENTRY=0x8d1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_LISTOFDATAOWNERSL_EXIT=0x8d2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_PUBLICFILELISTL_ENTRY=0x8d3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_PUBLICFILELISTL_EXIT=0x8d4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_REQUESTDATAL_ENTRY=0x8c5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_REQUESTDATAL_EXIT=0x8c6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_SETBURMODEL_ENTRY=0x8d5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_SETBURMODEL_EXIT=0x8d6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_SUPPLYDATAL_ENTRY=0x8c9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECLIENT_SUPPLYDATAL_EXIT=0x8ca +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECOMPRESSANDENCRYPT_CSBECOMPRESSANDENCRYPT_ENTRY=0x59a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECOMPRESSANDENCRYPT_CSBECOMPRESSANDENCRYPT_EXIT=0x59b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECONFIG_CSBECONFIG_ENTRY=0x5be +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBECONFIG_CSBECONFIG_EXIT=0x5bf +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL_EXIT=0xa33 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEDECOMPRESSANDENCRYPT_CSBEDECOMPRESSANDENCRYPT_ENTRY=0xa22 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEDECOMPRESSANDENCRYPT_CSBEDECOMPRESSANDENCRYPT_EXIT=0xa23 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEDECOMPRESSANDENCRYPT_NEXTLC_EXIT=0xa2e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEFILEENTRY_CSBEFILEENTRY_CONS_ENTRY=0x3eb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEFILEENTRY_CSBEFILEENTRY_CONS_EXIT=0x3ec +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEFILEENTRY_NEWLC_ENTRY=0x3e7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEFILEENTRY_NEWLC_EXIT=0x3e8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEPARSERPROXY_CSBEPARSERPROXY_ENTRY=0x6db +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBEPARSERPROXY_CSBEPARSERPROXY_EXIT=0x6dc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBGENERICDATATYPE_PACKDESCRIPTORTYPEADVANCE_ENTRY=0x35f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBGENERICDATATYPE_PACKDESCRIPTORTYPEADVANCE_EXIT=0x360 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBGENERICDATATYPE_UNPACKDESCRIPTORTYPEADVANCE_ENTRY=0x357 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBGENERICDATATYPE_UNPACKDESCRIPTORTYPEADVANCE_EXIT=0x358 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBGENERICDATATYPE_UNPACKTPTRADVANCE_ENTRY=0x35b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBGENERICDATATYPE_UNPACKTPTRADVANCE_EXIT=0x35c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVAID_CSBJAVAID_CONS_ENTRY=0x3bb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVAID_CSBJAVAID_CONS_EXIT=0x3bc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVAID_INITIALISEL_ENTRY=0x3c1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVAID_INITIALISEL_EXIT=0x3c2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVAID_NEWL_ENTRY=0x3b7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVAID_NEWL_EXIT=0x3b8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_CONSTRUCTL_ENTRY=0x3df +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_CONSTRUCTL_EXIT=0x3e0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_CONS_ENTRY=0x3d5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_CSBJAVATRANSFERTYPE_CONS_EXIT=0x3d6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_INITIALISEL_ENTRY=0x3db +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_INITIALISEL_EXIT=0x3dc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_NEWL_ENTRY=0x3d1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBJAVATRANSFERTYPE_NEWL_EXIT=0x3d2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGEID_CONSTRUCTL_ENTRY=0x37f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGEID_CONSTRUCTL_EXIT=0x380 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGEID_INITIALISEL_ENTRY=0x37b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGEID_INITIALISEL_EXIT=0x37c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGEID_NEWL_ENTRY=0x373 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGEID_NEWL_EXIT=0x374 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGETRANSFERTYPE_CONSTRUCTL_ENTRY=0x3af +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGETRANSFERTYPE_CONSTRUCTL_EXIT=0x3b0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGETRANSFERTYPE_NEWL_ENTRY=0x3a5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBPACKAGETRANSFERTYPE_NEWL_EXIT=0x3a6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSECUREID_CONSTRUCTL_ENTRY=0x36d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSECUREID_CONSTRUCTL_EXIT=0x36e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSECUREID_NEWL_ENTRY=0x363 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSECUREID_NEWL_EXIT=0x364 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSIDTRANSFERTYPE_CONSTRUCTL_ENTRY=0x39d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSIDTRANSFERTYPE_CONSTRUCTL_EXIT=0x39e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSIDTRANSFERTYPE_NEWL_ENTRY=0x393 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSBSIDTRANSFERTYPE_NEWL_EXIT=0x394 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSECUREBURENCRYPTKEYSOURCE_CSECUREBURENCRYPTKEYSOURCE_ENTRY=0x491 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSECUREBURENCRYPTKEYSOURCE_CSECUREBURENCRYPTKEYSOURCE_EXIT=0x492 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSECUREBURKEYSOURCEIMPL_CSECUREBURKEYSOURCEIMPL_ENTRY=0x49f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSECUREBURKEYSOURCEIMPL_CSECUREBURKEYSOURCEIMPL_EXIT=0x4a0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSELECTION_CSELECTION_ENTRY=0x5ee +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSELECTION_CSELECTION_EXIT=0x5ef +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSNAPSHOTHOLDER_CSNAPSHOTHOLDER_ENTRY=0x689 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSNAPSHOTHOLDER_CSNAPSHOTHOLDER_EXIT=0x68a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSNAPSHOT_CSNAPSHOT_ENTRY=0x586 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSNAPSHOT_CSNAPSHOT_EXIT=0x587 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_CSNAPSHOT_NEWLC_ENTRY=0xa03 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL_ENTRY=0x913 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL_EXIT=0x914 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_LISTOFDATAOWNERSL_ENTRY=0x90d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_LISTOFDATAOWNERSL_EXIT=0x90e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_PUBLICFILELISTL_ENTRY=0x90f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_PUBLICFILELISTL_EXIT=0x910 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_REQUESTDATAL_ENTRY=0x901 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_REQUESTDATAL_EXIT=0x902 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_RSBECLIENTSESSION_ENTRY=0x43e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_RSBECLIENTSESSION_EXIT=0x43f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_SETBURMODEL_ENTRY=0x911 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_SETBURMODEL_EXIT=0x912 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_STARTSERVER_EXIT=0x934 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_SUPPLYDATAL_ENTRY=0x905 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP1_RSBECLIENTSESSION_SUPPLYDATAL_EXIT=0x906 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CDATAOWNERCONTAINER_COMPARE_EXIT=0xadc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CDATAOWNERMANAGER_SETBURMODEL_EXIT=0xaea +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CDATAOWNER_HANDLEPATHL_EXIT=0xac7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CPACKAGEDATATRANSFER_COMPARE_EXIT=0xbc9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CPACKAGEDATATRANSFER_DOREQUESTDATAL_EXIT=0xba8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL_EXIT=0xb96 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CSBECLIENT_PUBLICFILELISTL_ENTRY=0x8dd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CSBECLIENT_PUBLICFILELISTL_EXIT=0x8de +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_CSBEDECOMPRESSANDENCRYPT_NEXTLC_EXIT=0xa2f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_RSBECLIENTSESSION_PUBLICFILELISTL_ENTRY=0x91b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP2_RSBECLIENTSESSION_PUBLICFILELISTL_EXIT=0x91c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP3_CDATAOWNER_HANDLEPATHL_EXIT=0xac8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP3_CPACKAGEDATATRANSFER_DOREQUESTDATAL_EXIT=0xba9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP3_CSBEDECOMPRESSANDENCRYPT_NEXTLC_EXIT=0xa30 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP4_CPACKAGEDATATRANSFER_DOREQUESTDATAL_EXIT=0xbaa +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_DUP5_CPACKAGEDATATRANSFER_DOREQUESTDATAL_EXIT=0xbab +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL_ENTRY=0x907 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_ALLSNAPSHOTSSUPPLIEDL_EXIT=0x908 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_ALLSYSTEMFILESRESTOREDL_ENTRY=0x915 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_ALLSYSTEMFILESRESTOREDL_EXIT=0x916 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_ALLSYSTEMFILESRESTORED_ENTRY=0x90b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_ALLSYSTEMFILESRESTORED_EXIT=0x90c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_CLOSE_ENTRY=0x8e7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_CLOSE_EXIT=0x8e8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_CONNECT_ENTRY=0x8e9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_CONNECT_EXIT=0x8ea +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_CONSTRUCTL_ENTRY=0x8e1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_CONSTRUCTL_EXIT=0x8e2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_EXPECTEDDATASIZEL_ENTRY=0x909 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_EXPECTEDDATASIZEL_EXIT=0x90a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_GETGLOBALSHAREDHEAPHANDLE_ENTRY=0x8fd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_GETGLOBALSHAREDHEAPHANDLE_EXIT=0x8fe +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_LISTOFDATAOWNERSL_ENTRY=0x8ed +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_LISTOFDATAOWNERSL_EXIT=0x8ee +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_NEWL_ENTRY=0x8df +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_NEWL_EXIT=0x8e0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_POPULATELARGEPUBLICFILELISTL_ENTRY=0x91d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_POPULATELARGEPUBLICFILELISTL_EXIT=0x91e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_POPULATELISTOFDATAOWNERSL_ENTRY=0x917 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_POPULATELISTOFDATAOWNERSL_EXIT=0x918 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_POPULATEPUBLICFILELISTL_ENTRY=0x919 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_POPULATEPUBLICFILELISTL_EXIT=0x91a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_PUBLICFILELISTL_ENTRY=0x8ef +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_PUBLICFILELISTL_EXIT=0x8f0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_PUBLICFILELISTXMLL_ENTRY=0x8f3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_PUBLICFILELISTXMLL_EXIT=0x8f4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RAWPUBLICFILELISTL_ENTRY=0x8f1 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RAWPUBLICFILELISTL_EXIT=0x8f2 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_REQUESTDATAL_ENTRY=0x8ff +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_REQUESTDATAL_EXIT=0x900 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RSBECLIENTSESSION_CONS_ENTRY=0x8e3 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RSBECLIENTSESSION_CONS_EXIT=0x8e4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RSBECLIENTSESSION_DES_ENTRY=0x8e5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RSBECLIENTSESSION_DES_EXIT=0x8e6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RSBECLIENTSESSION_ENTRY=0x43c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_RSBECLIENTSESSION_EXIT=0x43d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SETBURMODEL_ENTRY=0x8f5 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SETBURMODEL_EXIT=0x8f6 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SETSIDLISTFORPARTIALBURL_ENTRY=0x8f7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SETSIDLISTFORPARTIALBURL_EXIT=0x8f8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SIDSTATUSL_ENTRY=0x8f9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SIDSTATUSL_EXIT=0x8fa +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_STARTSERVER_ENTRY=0x8eb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_STARTSERVER_EXIT=0x933 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SUPPLYDATAL_ENTRY=0x903 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_SUPPLYDATAL_EXIT=0x904 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_TRANSFERDATAADDRESSL_ENTRY=0x455 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_TRANSFERDATAINFOL_ENTRY=0x8fb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_TRANSFERDATAINFOL_EXIT=0x8fc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_RSBECLIENTSESSION_VERSION_ENTRY=0x444 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CLEANUPRPOINTERARRAY_ENTRY=0x5e8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CLEANUPRPOINTERARRAY_EXIT=0x5e9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_CLEANUPRPOINTERARRAY_ENTRY=0xa4a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_CLEANUPRPOINTERARRAY_EXIT=0xa4b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_READFROMBUFFERF_ENTRY=0x9b7 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_READFROMBUFFERF_EXIT=0x9b8 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_READFROMBUFFERV_ENTRY=0x9bb +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_READFROMBUFFERV_EXIT=0x9bc +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_READL_ENTRY=0xa0c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_READL_EXIT=0xa0d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_RUNSERVERL_ENTRY=0xb7f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_RUNSERVERL_EXIT=0xb80 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_RUNSERVER_ENTRY=0xb81 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_RUNSERVER_EXIT=0xb82 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_WRITEL_ENTRY=0xa0e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_WRITEL_EXIT=0xa0f +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_WRITETOBUFFERF_ENTRY=0x9b9 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_WRITETOBUFFERF_EXIT=0x9ba +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_WRITETOBUFFERV_ENTRY=0x9bd +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__CONN_WRITETOBUFFERV_EXIT=0x9be +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__E32MAIN_ENTRY=0xb83 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__E32MAIN_EXIT=0xb84 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__PANIC_ENTRY=0x1b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__PANIC_EXIT=0x1c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__READFROMBUFFERF_ENTRY=0x538 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__READFROMBUFFERF_EXIT=0x539 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__READFROMBUFFERV_ENTRY=0x53c +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__READFROMBUFFERV_EXIT=0x53d +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__READL_ENTRY=0x592 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__READL_EXIT=0x593 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__RUNSERVERL_ENTRY=0x753 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__RUNSERVERL_EXIT=0x754 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__RUNSERVER_ENTRY=0x755 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__RUNSERVER_EXIT=0x756 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__WRITEL_ENTRY=0x594 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__WRITEL_EXIT=0x595 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__WRITETOBUFFERF_ENTRY=0x53a +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__WRITETOBUFFERF_EXIT=0x53b +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__WRITETOBUFFERV_ENTRY=0x53e +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]__WRITETOBUFFERV_EXIT=0x53f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSERVER_SESSIONREADYSTATEL=0x410 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_CABSESSION=0x415 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_CHECKCALLBACKAVAILABLEL=0x432 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_CONSTRUCTL=0x413 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_HANDLEIPCBURMODEINFOL=0x41e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_HANDLEIPCCLOSINGDOWNCALLBACK=0x425 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_HANDLEIPCCONFIRMREADYFORBURL=0x420 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_HANDLEIPCDOESPARTIALBURAFFECTMEL=0x41f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_HANDLEIPCGETDATASYNCL=0x422 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_HANDLEIPCPROPAGATELEAVEL=0x421 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_HANDLEIPCSENDDATALENGTHL=0x424 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MADECALLBACK=0x41c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKALLSNAPSHOTSSUPPLIEDL=0x433 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKGETBACKUPDATASECTIONL=0x438 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKGETDATACHECKSUML=0x443 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKGETEXPECTEDDATASIZEL=0x435 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKGETSNAPSHOTDATAL=0x436 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKINITIALISEGETBACKUPDATAL=0x437 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKINITIALISEGETPROXYBACKUPDATAL=0x440 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKINITIALISERESTOREBASEDATAL=0x43b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKINITIALISERESTOREINCREMENTDATAL=0x43d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKINITIALISERESTOREPROXYBASEDATAL=0x441 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKRECEIVESNAPSHOTDATAL=0x434 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKRESTOREBASEDATASECTIONL=0x43c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKRESTORECOMPLETEL=0x43f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKRESTOREINCREMENTDATASECTIONL=0x43e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_MAKECALLBACKTERMINATEMULTISTAGEOPERATIONL=0x442 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_REQUESTDATAL=0x417 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_RETURNFROMCALLBACK=0x41d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_SERVICEL=0x426 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_SUPPLYDATAL=0x416 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CABSESSION_WATCHDOGEXPIRED=0x414 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERFILEREADER_CHECKFILEINSNAPSHOTL=0x454 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERFILEREADER_NEWL=0x452 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERFILEREADER_READFROMBUFFERL=0x45f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL=0x476 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERFILEREADER_RECREATEDIRL=0x456 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERFILEREADER_RECREATEFILEL=0x457 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERFILEREADER_WRITETOFILEL=0x459 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERFILEWRITER_CONSTRUCTL=0x444 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERFILEWRITER_WRITETOBUFFERL=0x445 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERSNAPSHOTREADER_CONTINUEL=0x486 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERSNAPSHOTREADER_READFROMBUFFERL=0x487 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERSNAPSHOTREADER_STARTL=0x485 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERSNAPSHOTWRITER_CONSTRUCTL=0x47e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL=0x480 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL=0x564 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNERMANAGER_CONSTRUCTL=0x561 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNERMANAGER_FINDDATAOWNERSL=0x59e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL=0x594 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNERMANAGER_FINDREGISTRATIONFILESL=0x59c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNERMANAGER_REQUESTDATAL=0x590 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNERMANAGER_SETBURMODEL=0x56c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNERMANAGER_SUPPLYDATAL=0x586 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_ADDDBMSFILESL=0x528 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_ADDPROXYTOLIST=0x532 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_BUILDDRIVESTATEARRAYL=0x526 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_BUILDFILELISTL=0x4fc +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_CLEANUPBEFORERESTOREL=0x533 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_COMMONSETTINGSL=0x4e9 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_FINDSNAPSHOT=0x522 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_GETDRIVELISTL=0x4ef +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_GETEXPECTEDDATASIZEL=0x4b7 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_GETNEXTPUBLICFILEL=0x509 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_HANDLEACTIVEBACKUPL=0x552 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_HANDLECENREPBACKUP=0x54a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_HANDLEDBMSBACKUPL=0x54e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_HANDLEPATHL=0x55a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_HANDLEPROXYDATAMANAGER=0x54b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_HANDLEPUBLICBACKUP=0x548 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_HANDLERESTORE=0x559 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_HANDLESYSTEMBACKUP=0x549 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_ISEXCLUDED=0x50f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_ONENDDOCUMENTL=0x53f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_ONERROR=0x542 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_ONSTARTELEMENTL=0x540 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_PARSEFILEL=0x4fb +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_PARSEFILESL=0x4b5 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_PROCESSREQUESTDATAL=0x4d9 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_PROCESSSUPPLYDATAL=0x4c2 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_READYSTATE=0x4e7 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_REQUESTDATAL=0x4e6 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_REQUESTPASSIVEDATAL=0x51f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL=0x51a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_SETREADYSTATE=0x4e8 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_STARTPROCESSIFNECESSARYL=0x4b0 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_SUPPLYDATAL=0x4d7 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_SUPPLYPASSIVEBASEDATAL=0x518 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL=0x511 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CDATAOWNER_VALIDFILEL=0x537 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_BUILDPACKAGEFILELIST=0x5be +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_COMMONSETTINGSL=0x5fc +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5eb +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5d7 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_GETDRIVELISTL=0x60a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x5c0 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x5fe +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_HANDLEPATHL=0x612 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_HANDLEPUBLICBACKUP=0x610 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_HANDLESYSTEMBACKUP=0x611 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_ISEXCLUDED=0x60c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_ONENDDOCUMENTL=0x60d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_ONERROR=0x60f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_PASSIVESETTINGSL=0x5fd +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_REQUESTDATAL=0x5cb +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_REQUESTSNAPSHOTL=0x5fb +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_SUPPLYDATAL=0x5d6 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x5cd +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBECOMPRESSANDENCRYPT_CONSTRUCTL=0x489 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBECOMPRESSANDENCRYPT_FREERESERVEDSPACE=0x493 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBECOMPRESSANDENCRYPT_PACKL=0x48d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBECONFIG_HANDLEATTRIBUTESELEMENT=0x4aa +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL=0x4a8 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x497 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBEDECOMPRESSANDENCRYPT_SETGENERICTRANSFERTYPEL=0x494 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBEPARSERPROXY_CONVERTTOUNICODEL=0x5a2 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBEPARSERPROXY_ONENDDOCUMENTL=0x5a3 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBEPARSERPROXY_ONERROR=0x5a4 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBESESSION_REQUESTDATAASYNCL=0x5ba +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBESESSION_REQUESTDATASYNCL=0x5bb +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBESESSION_SERVICEL=0x5a5 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CSBESESSION_SUPPLYDATASYNCL=0x5bc +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CABSESSION_SERVICEL=0x430 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CBUFFERFILEREADER_READFROMBUFFERL=0x468 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CBUFFERFILEWRITER_WRITETOBUFFERL=0x44e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CDATAOWNERMANAGER_SETBURMODEL=0x573 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CDATAOWNERMANAGER_SUPPLYDATAL=0x58e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CDATAOWNER_BUILDFILELISTL=0x506 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CDATAOWNER_GETDRIVELISTL=0x4f9 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5f5 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5df +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x5c9 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x608 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x5d4 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x4a0 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP10_CSBESESSION_SERVICEL=0x5af +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CABSESSION_SERVICEL=0x431 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CBUFFERFILEREADER_READFROMBUFFERL=0x469 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CBUFFERFILEWRITER_WRITETOBUFFERL=0x44f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CDATAOWNERMANAGER_SETBURMODEL=0x574 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CDATAOWNERMANAGER_SUPPLYDATAL=0x58f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CDATAOWNER_BUILDFILELISTL=0x507 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CDATAOWNER_GETDRIVELISTL=0x4fa +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CDATAOWNER_GETEXPECTEDDATASIZEL=0x4c1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CDATAOWNER_PROCESSREQUESTDATAL=0x4dd +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5f6 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5e0 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x609 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x5d5 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x4a1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CSBESESSION_SERVICEL=0x5b0 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP12_CBUFFERFILEREADER_READFROMBUFFERL=0x46a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP12_CBUFFERFILEWRITER_WRITETOBUFFERL=0x450 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP12_CDATAOWNERMANAGER_SETBURMODEL=0x575 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP12_CDATAOWNER_BUILDFILELISTL=0x508 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP12_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5f7 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP12_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x5ca +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP12_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x4a2 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP12_CSBESESSION_SERVICEL=0x5b1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP13_CBUFFERFILEREADER_READFROMBUFFERL=0x46b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP13_CBUFFERFILEWRITER_WRITETOBUFFERL=0x451 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP13_CDATAOWNER_PROCESSSUPPLYDATAL=0x4c6 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP13_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5f8 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP13_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5e1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP13_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x4a3 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP13_CSBESESSION_SERVICEL=0x5b2 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP14_CBUFFERFILEREADER_READFROMBUFFERL=0x46c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP14_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5f9 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP14_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5e2 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP14_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x4a4 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP14_CSBESESSION_SERVICEL=0x5b3 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP15_CBUFFERFILEREADER_READFROMBUFFERL=0x46d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP15_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5fa +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP15_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5e3 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP15_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x4a5 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP15_CSBESESSION_SERVICEL=0x5b4 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP16_CBUFFERFILEREADER_READFROMBUFFERL=0x46e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP16_CDATAOWNER_PROCESSREQUESTDATAL=0x4de +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP16_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5e4 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP16_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x4a6 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP16_CSBESESSION_SERVICEL=0x5b5 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP17_CBUFFERFILEREADER_READFROMBUFFERL=0x46f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP17_CDATAOWNER_PROCESSREQUESTDATAL=0x4df +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP17_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5e5 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP17_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x4a7 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP17_CSBESESSION_SERVICEL=0x5b6 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP18_CBUFFERFILEREADER_READFROMBUFFERL=0x470 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP18_CDATAOWNER_PROCESSSUPPLYDATAL=0x4c7 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP18_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5e6 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP18_CSBESESSION_SERVICEL=0x5b7 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP19_CBUFFERFILEREADER_READFROMBUFFERL=0x471 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP19_CDATAOWNER_PROCESSREQUESTDATAL=0x4e0 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP19_CDATAOWNER_PROCESSSUPPLYDATAL=0x4c8 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP19_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5e7 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP19_CSBESESSION_SERVICEL=0x5b8 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CABSERVER_SESSIONREADYSTATEL=0x411 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CABSESSION_HANDLEIPCGETDATASYNCL=0x423 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CABSESSION_MAKECALLBACKGETBACKUPDATASECTIONL=0x439 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CABSESSION_REQUESTDATAL=0x418 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CABSESSION_SERVICEL=0x427 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CBUFFERFILEREADER_CHECKFILEINSNAPSHOTL=0x455 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CBUFFERFILEREADER_NEWL=0x453 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CBUFFERFILEREADER_READFROMBUFFERL=0x460 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL=0x477 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CBUFFERFILEREADER_WRITETOFILEL=0x45a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CBUFFERFILEWRITER_WRITETOBUFFERL=0x446 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CBUFFERSNAPSHOTREADER_READFROMBUFFERL=0x488 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CBUFFERSNAPSHOTWRITER_CONSTRUCTL=0x47f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL=0x481 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL=0x565 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNERMANAGER_CONSTRUCTL=0x562 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNERMANAGER_FINDDATAOWNERSL=0x59f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL=0x595 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNERMANAGER_FINDREGISTRATIONFILESL=0x59d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNERMANAGER_GETDATAOWNERSL=0x576 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL=0x57e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNERMANAGER_ISSETFORPARTIALL=0x5a1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNERMANAGER_SETBURMODEL=0x56d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_ADDDBMSFILESL=0x529 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_BUILDDRIVESTATEARRAYL=0x527 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_BUILDFILELISTL=0x4fd +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_CLEANUPBEFORERESTOREL=0x534 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_COMMONSETTINGSL=0x4ea +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_FINDSNAPSHOT=0x523 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_GETDRIVELISTL=0x4f0 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_GETEXPECTEDDATASIZEL=0x4b8 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_GETNEXTPUBLICFILEL=0x50a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_HANDLEACTIVEBACKUPL=0x553 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_HANDLEDBMSBACKUPL=0x54f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_HANDLEPASSIVEBACKUP=0x544 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_HANDLEPATHL=0x55b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_HANDLEPROXYDATAMANAGER=0x54c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_ISEXCLUDED=0x510 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_ONSTARTELEMENTL=0x541 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_PARSEFILESL=0x4b6 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_PROCESSREQUESTDATAL=0x4da +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_PROCESSSUPPLYDATAL=0x4c3 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_REQUESTPASSIVEDATAL=0x520 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL=0x51b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_STARTPROCESSIFNECESSARYL=0x4b1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_SUPPLYDATAL=0x4d8 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_SUPPLYPASSIVEBASEDATAL=0x519 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL=0x512 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDATAOWNER_VALIDFILEL=0x538 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CPACKAGEDATATRANSFER_BUILDPACKAGEFILELIST=0x5bf +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5ec +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5d8 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CPACKAGEDATATRANSFER_GETDRIVELISTL=0x60b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x5c1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x5ff +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CPACKAGEDATATRANSFER_HANDLEPATHL=0x613 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CPACKAGEDATATRANSFER_ONSTARTELEMENTL=0x60e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x5ce +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CSBECOMPRESSANDENCRYPT_CONSTRUCTL=0x48a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CSBECOMPRESSANDENCRYPT_PACKL=0x48e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CSBECONFIG_HANDLEATTRIBUTESELEMENT=0x4ab +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CSBEDECOMPRESSANDENCRYPT_CREATECIPHERL=0x4a9 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x498 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CSBEDECOMPRESSANDENCRYPT_SETGENERICTRANSFERTYPEL=0x495 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CSBESESSION_PREPLARGEPUBLICFILELISTL=0x5bd +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CSBESESSION_SERVICEL=0x5a6 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP20_CBUFFERFILEREADER_READFROMBUFFERL=0x472 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP20_CDATAOWNER_PROCESSREQUESTDATAL=0x4e1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP20_CDATAOWNER_PROCESSSUPPLYDATAL=0x4c9 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP20_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5e8 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP21_CBUFFERFILEREADER_READFROMBUFFERL=0x473 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP21_CDATAOWNER_PROCESSREQUESTDATAL=0x4e2 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP21_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5e9 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP21_CSBESESSION_SERVICEL=0x5b9 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP22_CBUFFERFILEREADER_READFROMBUFFERL=0x474 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP22_CDATAOWNER_PROCESSREQUESTDATAL=0x4e3 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP22_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5ea +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP23_CBUFFERFILEREADER_READFROMBUFFERL=0x475 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP23_CDATAOWNER_PROCESSREQUESTDATAL=0x4e4 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP23_CDATAOWNER_PROCESSSUPPLYDATAL=0x4ca +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP24_CDATAOWNER_PROCESSSUPPLYDATAL=0x4cb +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP25_CDATAOWNER_PROCESSSUPPLYDATAL=0x4cc +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP26_CDATAOWNER_PROCESSSUPPLYDATAL=0x4cd +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP27_CDATAOWNER_PROCESSSUPPLYDATAL=0x4ce +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP28_CDATAOWNER_PROCESSREQUESTDATAL=0x4e5 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP28_CDATAOWNER_PROCESSSUPPLYDATAL=0x4cf +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP29_CDATAOWNER_PROCESSSUPPLYDATAL=0x4d0 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CABSERVER_SESSIONREADYSTATEL=0x412 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CABSESSION_MAKECALLBACKGETBACKUPDATASECTIONL=0x43a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CABSESSION_REQUESTDATAL=0x419 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CABSESSION_SERVICEL=0x428 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CBUFFERFILEREADER_READFROMBUFFERL=0x461 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL=0x478 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CBUFFERFILEREADER_RECREATEFILEL=0x458 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CBUFFERFILEREADER_WRITETOFILEL=0x45b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CBUFFERFILEWRITER_WRITETOBUFFERL=0x447 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL=0x482 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL=0x566 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNERMANAGER_CONSTRUCTL=0x563 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNERMANAGER_FINDDATAOWNERSL=0x5a0 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL=0x596 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNERMANAGER_GETDATAOWNERSL=0x577 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL=0x57f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNERMANAGER_GETPUBLICFILELISTL=0x584 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL=0x585 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNERMANAGER_REQUESTDATAL=0x591 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNERMANAGER_SUPPLYDATAL=0x587 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_ADDDBMSFILESL=0x52a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_BUILDFILELISTL=0x4fe +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_CLEANUPBEFORERESTOREL=0x535 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_COMMONSETTINGSL=0x4eb +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_FINDSNAPSHOT=0x524 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_GETDRIVELISTL=0x4f1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_GETEXPECTEDDATASIZEL=0x4b9 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_GETNEXTPUBLICFILEL=0x50b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_HANDLEACTIVEBACKUPL=0x554 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_HANDLEDBMSBACKUPL=0x550 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_HANDLEPASSIVEBACKUP=0x545 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_HANDLEPATHL=0x55c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_HANDLEPROXYDATAMANAGER=0x54d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_REQUESTPASSIVEDATAL=0x521 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL=0x51c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_STARTPROCESSIFNECESSARYL=0x4b2 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL=0x513 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CDATAOWNER_VALIDFILEL=0x539 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5ed +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5d9 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x600 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CPACKAGEDATATRANSFER_HANDLEPATHL=0x614 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x5cf +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CSBECOMPRESSANDENCRYPT_CONSTRUCTL=0x48b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CSBECOMPRESSANDENCRYPT_PACKL=0x48f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CSBECONFIG_HANDLEATTRIBUTESELEMENT=0x4ac +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x499 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CSBEDECOMPRESSANDENCRYPT_SETGENERICTRANSFERTYPEL=0x496 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP2_CSBESESSION_SERVICEL=0x5a7 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP30_CDATAOWNER_PROCESSSUPPLYDATAL=0x4d1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP31_CDATAOWNER_PROCESSSUPPLYDATAL=0x4d2 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP32_CDATAOWNER_PROCESSSUPPLYDATAL=0x4d3 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP33_CDATAOWNER_PROCESSSUPPLYDATAL=0x4d4 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP34_CDATAOWNER_PROCESSSUPPLYDATAL=0x4d5 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP35_CDATAOWNER_PROCESSSUPPLYDATAL=0x4d6 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CABSESSION_REQUESTDATAL=0x41a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CABSESSION_SERVICEL=0x429 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CBUFFERFILEREADER_READFROMBUFFERL=0x462 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL=0x479 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CBUFFERFILEREADER_WRITETOFILEL=0x45c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CBUFFERFILEWRITER_WRITETOBUFFERL=0x448 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL=0x483 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL=0x567 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL=0x597 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNERMANAGER_GETDATAOWNERSL=0x578 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL=0x580 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNERMANAGER_REQUESTDATAL=0x592 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNERMANAGER_SETBURMODEL=0x56e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNERMANAGER_SUPPLYDATAL=0x588 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_ADDDBMSFILESL=0x52b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_BUILDFILELISTL=0x4ff +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_CLEANUPBEFORERESTOREL=0x536 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_COMMONSETTINGSL=0x4ec +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_FINDSNAPSHOT=0x525 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_GETDRIVELISTL=0x4f2 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_GETEXPECTEDDATASIZEL=0x4ba +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_GETNEXTPUBLICFILEL=0x50c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_HANDLEACTIVEBACKUPL=0x555 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_HANDLEDBMSBACKUPL=0x551 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_HANDLEPASSIVEBACKUP=0x543 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_HANDLEPATHL=0x55d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL=0x51d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_STARTPROCESSIFNECESSARYL=0x4b3 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL=0x514 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CDATAOWNER_VALIDFILEL=0x53a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5ee +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x5c2 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x601 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CPACKAGEDATATRANSFER_HANDLEPATHL=0x615 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x5d0 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CSBECOMPRESSANDENCRYPT_CONSTRUCTL=0x48c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CSBECOMPRESSANDENCRYPT_PACKL=0x490 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CSBECONFIG_HANDLEATTRIBUTESELEMENT=0x4ad +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x49a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP3_CSBESESSION_SERVICEL=0x5a8 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CABSESSION_REQUESTDATAL=0x41b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CABSESSION_SERVICEL=0x42a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CBUFFERFILEREADER_READFROMBUFFERL=0x463 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CBUFFERFILEREADER_WRITETOFILEL=0x45d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CBUFFERSNAPSHOTWRITER_WRITETOBUFFERL=0x484 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL=0x568 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL=0x598 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNERMANAGER_GETDATAOWNERSL=0x579 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL=0x581 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNERMANAGER_REQUESTDATAL=0x593 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNERMANAGER_SETBURMODEL=0x56f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_ADDDBMSFILESL=0x52c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_BUILDFILELISTL=0x500 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_COMMONSETTINGSL=0x4ed +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_GETDRIVELISTL=0x4f3 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_GETEXPECTEDDATASIZEL=0x4bb +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_GETNEXTPUBLICFILEL=0x50d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_HANDLEACTIVEBACKUPL=0x556 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_HANDLEPASSIVEBACKUP=0x546 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_HANDLEPATHL=0x55e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_PROCESSREQUESTDATAL=0x4db +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_REQUESTPASSIVESNAPSHOTDATAL=0x51e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_STARTPROCESSIFNECESSARYL=0x4b4 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL=0x515 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CDATAOWNER_VALIDFILEL=0x53b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5ef +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5da +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x5c3 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x602 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CPACKAGEDATATRANSFER_HANDLEPATHL=0x616 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CPACKAGEDATATRANSFER_REQUESTDATAL=0x5cc +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x5d1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CSBECOMPRESSANDENCRYPT_PACKL=0x491 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CSBECONFIG_HANDLEATTRIBUTESELEMENT=0x4ae +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x49b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP4_CSBESESSION_SERVICEL=0x5a9 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CABSESSION_SERVICEL=0x42b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CBUFFERFILEREADER_READFROMBUFFERL=0x464 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL=0x47a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CBUFFERFILEREADER_WRITETOFILEL=0x45e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CBUFFERFILEWRITER_WRITETOBUFFERL=0x449 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL=0x569 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL=0x599 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNERMANAGER_GETDATAOWNERSL=0x57a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL=0x582 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNERMANAGER_SETBURMODEL=0x570 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNERMANAGER_SUPPLYDATAL=0x589 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNER_ADDDBMSFILESL=0x52d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNER_BUILDFILELISTL=0x501 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNER_COMMONSETTINGSL=0x4ee +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNER_GETDRIVELISTL=0x4f4 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNER_GETEXPECTEDDATASIZEL=0x4bc +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNER_GETNEXTPUBLICFILEL=0x50e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNER_HANDLEACTIVEBACKUPL=0x557 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNER_HANDLEPASSIVEBACKUP=0x547 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNER_HANDLEPATHL=0x55f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNER_PROCESSREQUESTDATAL=0x4dc +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL=0x516 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CDATAOWNER_VALIDFILEL=0x53c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5f0 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5db +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x5c4 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x603 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CSBECOMPRESSANDENCRYPT_PACKL=0x492 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CSBECONFIG_HANDLEATTRIBUTESELEMENT=0x4af +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP5_CSBESESSION_SERVICEL=0x5aa +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CABSESSION_SERVICEL=0x42c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CBUFFERFILEREADER_READFROMBUFFERL=0x465 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL=0x47b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CBUFFERFILEWRITER_WRITETOBUFFERL=0x44a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL=0x56a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL=0x59a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNERMANAGER_GETDATAOWNERSL=0x57b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNERMANAGER_SUPPLYDATAL=0x58a +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNER_ADDDBMSFILESL=0x52e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNER_BUILDFILELISTL=0x502 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNER_GETDRIVELISTL=0x4f5 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNER_GETEXPECTEDDATASIZEL=0x4bd +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNER_HANDLEACTIVEBACKUPL=0x558 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNER_HANDLEPATHL=0x560 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNER_PROCESSSUPPLYDATAL=0x4c4 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNER_SUPPLYPASSIVESNAPSHOTDATAL=0x517 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CDATAOWNER_VALIDFILEL=0x53d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5f1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x5c5 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x604 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x5d2 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x49c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP6_CSBESESSION_SERVICEL=0x5ab +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CABSESSION_SERVICEL=0x42d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL=0x47c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CBUFFERFILEWRITER_WRITETOBUFFERL=0x44b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL=0x56b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL=0x59b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CDATAOWNERMANAGER_GETDATAOWNERSL=0x57c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL=0x583 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CDATAOWNERMANAGER_SUPPLYDATAL=0x58b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CDATAOWNER_ADDDBMSFILESL=0x52f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CDATAOWNER_BUILDFILELISTL=0x503 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CDATAOWNER_GETDRIVELISTL=0x4f6 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CDATAOWNER_GETEXPECTEDDATASIZEL=0x4be +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CDATAOWNER_PROCESSSUPPLYDATAL=0x4c5 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CDATAOWNER_VALIDFILEL=0x53e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5f2 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5dc +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x5c6 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x605 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x49d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP7_CSBESESSION_SERVICEL=0x5ac +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CABSESSION_SERVICEL=0x42e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CBUFFERFILEREADER_READFROMBUFFERL=0x466 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CBUFFERFILEREADER_READMIDLETSFROMBUFFERL=0x47d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CBUFFERFILEWRITER_WRITETOBUFFERL=0x44c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CDATAOWNERMANAGER_GETDATAOWNERSL=0x57d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CDATAOWNERMANAGER_SETBURMODEL=0x571 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CDATAOWNERMANAGER_SUPPLYDATAL=0x58c +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CDATAOWNER_ADDDBMSFILESL=0x530 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CDATAOWNER_BUILDFILELISTL=0x504 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CDATAOWNER_GETDRIVELISTL=0x4f7 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CDATAOWNER_GETEXPECTEDDATASIZEL=0x4bf +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5f3 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5dd +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x5c7 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x606 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CPACKAGEDATATRANSFER_SUPPLYFILEDATAL=0x5d3 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x49e +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP8_CSBESESSION_SERVICEL=0x5ad +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CABSESSION_SERVICEL=0x42f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CBUFFERFILEREADER_READFROMBUFFERL=0x467 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CBUFFERFILEWRITER_WRITETOBUFFERL=0x44d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CDATAOWNERMANAGER_SETBURMODEL=0x572 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CDATAOWNERMANAGER_SUPPLYDATAL=0x58d +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CDATAOWNER_ADDDBMSFILESL=0x531 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CDATAOWNER_BUILDFILELISTL=0x505 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CDATAOWNER_GETDRIVELISTL=0x4f8 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CDATAOWNER_GETEXPECTEDDATASIZEL=0x4c0 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CPACKAGEDATATRANSFER_DOREQUESTDATAL=0x5f4 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CPACKAGEDATATRANSFER_DOSUPPLYDATAL=0x5de +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CPACKAGEDATATRANSFER_GETEXPECTEDDATASIZEL=0x5c8 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CPACKAGEDATATRANSFER_GETPUBLICFILELISTL=0x607 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CSBEDECOMPRESSANDENCRYPT_NEXTLC=0x49f +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP9_CSBESESSION_SERVICEL=0x5ae diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/dun/atext/group/dunatext.mmp --- a/localconnectivityservice/dun/atext/group/dunatext.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/localconnectivityservice/dun/atext/group/dunatext.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -39,7 +39,6 @@ MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../inc ../../utils/inc -USERINCLUDE ../../../inc LIBRARY atextclient.lib LIBRARY atextcommon.lib diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/dun/client/group/dunclient.mmp --- a/localconnectivityservice/dun/client/group/dunclient.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/localconnectivityservice/dun/client/group/dunclient.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -39,7 +39,6 @@ MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../inc ../../utils/inc -USERINCLUDE ../../../inc ../../../../inc LIBRARY euser.lib LIBRARY ecom.lib diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/dun/plugins/group/dunbt.mmp --- a/localconnectivityservice/dun/plugins/group/dunbt.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/localconnectivityservice/dun/plugins/group/dunbt.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -32,7 +32,6 @@ MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../inc/bt ../../utils/inc -USERINCLUDE ../../../inc LIBRARY euser.lib LIBRARY esock.lib diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/dun/plugins/group/dunir.mmp --- a/localconnectivityservice/dun/plugins/group/dunir.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/localconnectivityservice/dun/plugins/group/dunir.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -31,7 +31,6 @@ MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../inc/ir ../../utils/inc -USERINCLUDE ../../../inc LIBRARY euser.lib LIBRARY c32.lib diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/dun/plugins/group/dunusb.mmp --- a/localconnectivityservice/dun/plugins/group/dunusb.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/localconnectivityservice/dun/plugins/group/dunusb.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -33,7 +33,6 @@ MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../inc/usb ../../utils/inc -USERINCLUDE ../../../inc LIBRARY euser.lib LIBRARY c32.lib diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/dun/server/group/dunserver.mmp --- a/localconnectivityservice/dun/server/group/dunserver.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/localconnectivityservice/dun/server/group/dunserver.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -34,7 +34,6 @@ MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../inc ../../utils/inc -USERINCLUDE ../../../inc ../../../../inc LIBRARY euser.lib LIBRARY dunutils.lib diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/dun/utils/group/dunutils.mmp --- a/localconnectivityservice/dun/utils/group/dunutils.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/localconnectivityservice/dun/utils/group/dunutils.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -57,7 +57,6 @@ MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../inc ../../atext/inc -USERINCLUDE ../../../inc LIBRARY bafl.lib #ifdef PRJ_USE_NETWORK_STUBS diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/generichid/group/generichid.mmp --- a/localconnectivityservice/generichid/group/generichid.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/localconnectivityservice/generichid/group/generichid.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -44,7 +44,6 @@ MW_LAYER_SYSTEMINCLUDE USERINCLUDE ../inc -USERINCLUDE ../../../inc LIBRARY euser.lib LIBRARY ecom.lib diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/generichid/src/hidparser.cpp --- a/localconnectivityservice/generichid/src/hidparser.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/localconnectivityservice/generichid/src/hidparser.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -1272,7 +1272,8 @@ iGlobal.iCount = aItem.Data(); if (aItem.Data() == 0) { - retVal = EZeroReportCount; + TRACE_INFO((_L("Global report count zero\n"))); + } iItemsDefined |= EReportCount; diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/headset/group/hidheadset.mmp --- a/localconnectivityservice/headset/group/hidheadset.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/localconnectivityservice/headset/group/hidheadset.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -43,7 +43,6 @@ #endif //NO101APPDEPFIXES USERINCLUDE ../inc ../hidremconbearer/inc -USERINCLUDE ../../../inc LIBRARY euser.lib LIBRARY ecom.lib diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/commoninc/locodbearer.h --- a/localconnectivityservice/locod/commoninc/locodbearer.h Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,32 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Defines the LCD Bearer Plugin identifier. -* -*/ - - -#ifndef T_LOCODBEARER_H -#define T_LOCODBEARER_H - -#include - -/** bearer value in LC */ -enum TLocodBearer - { - ELocodBearerBT = 0x0001, - ELocodBearerIR = 0x0010, - ELocodBearerUSB = 0x0100, - }; - -#endif // T_LOCODBEARER_H diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/commoninc/locodbearerplugin.h --- a/localconnectivityservice/locod/commoninc/locodbearerplugin.h Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,87 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is the LCD Bearer Plugin base class declaration. -* -*/ - - -#ifndef C_LOCODBEARERPLUGIN_H -#define C_LOCODBEARERPLUGIN_H - -#include -#include "locodbearerpluginparams.h" - -/** - * Bearer Plugin base class - * - * This is the base class from which bearer plugins inherit. - * - * See locodplugin.hrh for the resource registration definitions. - * - * @lib euser.lib - * @since S60 v3.2 - */ -class CLocodBearerPlugin : public CBase - { -public: - - static CLocodBearerPlugin* NewL(TLocodBearerPluginParams& aParams); - - virtual ~CLocodBearerPlugin(); - - /** - * Gets the implementation uid of this plugin - * - * @since S60 v3.2 - * @return The implementation uid - */ - TUid ImplementationUid() const; - -protected: - - CLocodBearerPlugin(TLocodBearerPluginParams& aParams); - - /** - * Gets the observer interface object associated with this plugin - * - * @since S60 v3.2 - * @return The observer object - */ - MLocodBearerPluginObserver& Observer() const; - -private: // data - - /** - * UID set by ECOM when the instance is created. Used when the instance - * is destroyed. - */ - TUid iInstanceUid; - - /** - * Implementation UID of the concrete instance. - */ - TUid iImplementationUid; - - /** - * Holds the observer object which will be notified when the operations - * complete - * Not own. - */ - MLocodBearerPluginObserver& iObserver; - - }; - -#include "locodbearerplugin.inl" - -#endif // C_LOCODBEARERPLUGIN_H diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/commoninc/locodbearerplugin.inl --- a/localconnectivityservice/locod/commoninc/locodbearerplugin.inl Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,73 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is the LCD Bearer Plugin construction parameters -* declaration -* -*/ - - -#include - -// ----------------------------------------------------------------------------- -// Creates the bearer plug ins and return it to caller -// ----------------------------------------------------------------------------- -// -inline CLocodBearerPlugin* CLocodBearerPlugin::NewL(TLocodBearerPluginParams& aParams) - { - CLocodBearerPlugin* self = reinterpret_cast( - REComSession::CreateImplementationL( - aParams.ImplementationUid(), - _FOFF(CLocodBearerPlugin, iInstanceUid), - (TAny*)&aParams) - ); - - return self; - } - -// ----------------------------------------------------------------------------- -// Destructor -// ----------------------------------------------------------------------------- -// -inline CLocodBearerPlugin::~CLocodBearerPlugin() - { - REComSession::DestroyedImplementation(iInstanceUid); - } - -// ----------------------------------------------------------------------------- -// Return the implemtation uid -// ----------------------------------------------------------------------------- -// -inline TUid CLocodBearerPlugin::ImplementationUid() const - { - return iImplementationUid; - } - -// ----------------------------------------------------------------------------- -// Constructor method, just saves the arguments into member variables -// ----------------------------------------------------------------------------- -// -inline CLocodBearerPlugin::CLocodBearerPlugin(TLocodBearerPluginParams& aParams) - : iImplementationUid(aParams.ImplementationUid()), - iObserver(aParams.Observer()) - { - } - -// ----------------------------------------------------------------------------- -// Return the observer class -// ----------------------------------------------------------------------------- -// -inline MLocodBearerPluginObserver& CLocodBearerPlugin::Observer() const - { - return iObserver; - } diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/commoninc/locodbearerpluginobserver.h --- a/localconnectivityservice/locod/commoninc/locodbearerpluginobserver.h Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is the LCD Bearer Plugin observer interface definition. -* -*/ - - -#ifndef M_LOCODBEARERPLUGINOBSERVER_H -#define M_LOCODBEARERPLUGINOBSERVER_H - -#include "locodbearer.h" - -/** - * LCD Bearer Plugin Observer interface class - * - * This is the bearer plugin observer interface definition used by LCD - * Bearer Plugins to inform the daemon about the plugin's event. - * - * @euser.lib - * @since S60 v3.2 - */ -class MLocodBearerPluginObserver - { -public: - - /** - * This is a callback function used by the plugins to inform when the - * bearer's availability changes. - * - * @since S60 v3.2 - * @param aBearer the bearer which calls this nothification - * @param aStatus the status of this bearer, ETrue if it is available; - * EFalse otherwise. - */ - virtual void NotifyBearerStatus(TLocodBearer aBearer, TBool aStatus) = 0; - }; - -#endif // M_LOCODBEARERPLUGINOBSERVER_H diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/commoninc/locodbearerpluginparams.h --- a/localconnectivityservice/locod/commoninc/locodbearerpluginparams.h Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is the LCD Bearer Plugin construction parameters -* declaration -* -*/ - - -#ifndef T_LOCODBEARERPLUGINPARAMS_H -#define T_LOCODBEARERPLUGINPARAMS_H - -class MLocodBearerPluginObserver; - -/** - * LCD Bearer Plugin Callback construction parameters - * - * This interface class is used to pass construction parameters to the - * plugins. These parameters include the callback interface and the ECOM - * plugin implementation UID - * - * @euser.lib - * @since S60 v3.2 - */ -class TLocodBearerPluginParams - { -public: - - /** - * Constructor. - * - * @since S60 v3.2 - * @param aUid Implementation UID of the plugin being constructed - * @param aObserver Callback interface object - */ - TLocodBearerPluginParams(const TUid aUid, MLocodBearerPluginObserver& aObserver); - - /** - * Gets the implementation UID of the plugin - * - * @since S60 v3.2 - * @return Implementaion UID - */ - TUid ImplementationUid() const; - - /** - * Gets the observer interface object - * - * @since S60 v3.2 - * @return The observer object - */ - MLocodBearerPluginObserver& Observer() const; - -private: // data - - /** - * The implementation UID - */ - const TUid iImplementationUid; - - /** - * Reference to the observer object - */ - MLocodBearerPluginObserver& iObserver; - - }; - -#include "locodbearerpluginparams.inl" - -#endif // T_LOCODBEARERPLUGINPARAMS_H diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/commoninc/locodbearerpluginparams.inl --- a/localconnectivityservice/locod/commoninc/locodbearerpluginparams.inl Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is the LCD Bearer Plugin construction parameters -* declaration -* -*/ - - -// ----------------------------------------------------------------------------- -// Constructor method, just saves the arguments into member variables -// ----------------------------------------------------------------------------- -// -inline TLocodBearerPluginParams::TLocodBearerPluginParams(const TUid aUid, MLocodBearerPluginObserver& aObserver) - : iImplementationUid(aUid), - iObserver(aObserver) - { - } - -// ----------------------------------------------------------------------------- -// returns the implementation UID -// ----------------------------------------------------------------------------- -// -inline TUid TLocodBearerPluginParams::ImplementationUid() const - { - return iImplementationUid; - } - -// ----------------------------------------------------------------------------- -// returns the observer class -// ----------------------------------------------------------------------------- -// -inline MLocodBearerPluginObserver& TLocodBearerPluginParams::Observer() const - { - return iObserver; - } diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/commoninc/locodplugin.hrh --- a/localconnectivityservice/locod/commoninc/locodplugin.hrh Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,51 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: Definitions for plugin resource registration. -* -*/ - - -#ifndef LOCODPLUGIN_HRH -#define LOCODPLUGIN_HRH - -/** - * This file contains the defintions for plugin resource registration. - * - * All plugins should use version 2 registration resource file and set the - * rom_only field to 1 to prevent it from being overridden by RAM-based plugins. - * - * All bearer plugins should use KLOCODBEARERINTERFACEUID as the interface UID. - * - * A bearer plugin should use its corresponding feature ID (from features.hrh) as the - * implementation UID, that is, - * Implementation UID of IR bearer is KFeatureIdIrda, - * Implementation UID of BT bearer is KFeatureIdBt, - * Implementation UID of USB bearer is KFeatureIdUsb. - * - * All service plugins should use KLOCODSERVICEINTERFACEUID as the interface UID. - * - * A service plugin should use its corresponding feature ID (from features.hrh) as the - * implementation UID, that is, - * Implementation UID of Dun is KFeatureIdDun, (not exist yet, CR created) - * Implementation UID of Obex is KFeatureIdSrcs, - * - */ - -// Interface UID of bearer plugins -#define KLOCODBEARERINTERFACEUID 0x20002771 - -// Interface UID of service plugins -#define KLOCODSERVICEINTERFACEUID 0x20002772 - -#endif // LOCODPLUGIN_HRH diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/commoninc/locodserviceplugin.h --- a/localconnectivityservice/locod/commoninc/locodserviceplugin.h Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,98 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is the LCD Service Plugin base class declaration. -* -*/ - - -#ifndef C_LOCODSERVICEPLUGIN_H -#define C_LOCODSERVICEPLUGIN_H - -#include - -#include "locodservicepluginparams.h" -#include "locodbearer.h" - -/** - * Service Plugin base class - * - * This is the base class from which service plugins inherit. - * - * When a service plugin is constructed, it should not start any service by default. - * A service is started on demand when the bearer is available. - * - * @euser.lib - * @since S60 v3.2 - */ -class CLocodServicePlugin : public CBase - { -public: - - static CLocodServicePlugin* NewL(TLocodServicePluginParams& aParams); - - virtual ~CLocodServicePlugin(); - - /** - * Tell service plugin which service should be enabled or disabled according to - * specified bearer and its status. - * - * On completion, the plugin should call - * MLocodServicePluginObserver::ManageServiceCompleted() to inform the result. - * - * @since S60 v3.2 - * @param aBearer the bearer identification - * @param aStatus the status of this bearer, ETrue if it is available; - * EFalse otherwise. - */ - virtual void ManageService(TLocodBearer aBearer, TBool aStatus) = 0; - - TUid ImplementationUid() const; - -protected: - - CLocodServicePlugin(TLocodServicePluginParams& aParams); - - /** - * Gets the observer interface object associated with this plugin - * - * @since S60 v3.2 - * @return The observer object - */ - MLocodServicePluginObserver& Observer() const; - -private: // data - - /** - * UID set by ECOM when the instance is created. Used when the instance - * is destroyed. - */ - TUid iInstanceUid; - - /** - * Implementation UID of the concrete instance. - */ - const TUid iImplementationUid; - - /** - * Holds the observer object which will be notified when the operations - * complete - * Not own. - */ - MLocodServicePluginObserver& iObserver; - - }; - -#include - -#endif // C_LOCODSERVICEPLUGIN_H diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/commoninc/locodserviceplugin.inl --- a/localconnectivityservice/locod/commoninc/locodserviceplugin.inl Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,75 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is the LCD Service Plugin construction parameters -* declaration -* -*/ - - -#include - -// ----------------------------------------------------------------------------- -// Constructor method, just saves the arguments into member variables -// ----------------------------------------------------------------------------- -// -inline CLocodServicePlugin* CLocodServicePlugin::NewL(TLocodServicePluginParams& aParams) - { - CLocodServicePlugin* self = reinterpret_cast( - REComSession::CreateImplementationL( - aParams.ImplementationUid(), - _FOFF(CLocodServicePlugin, iInstanceUid), - (TAny*)&aParams) - ); - - return self; - } - - -// ----------------------------------------------------------------------------- -// Service plug ins destructor -// ----------------------------------------------------------------------------- -// -inline CLocodServicePlugin::~CLocodServicePlugin() - { - REComSession::DestroyedImplementation(iInstanceUid); - } - -// ----------------------------------------------------------------------------- -// returns the implementation UID -// ----------------------------------------------------------------------------- -// -inline TUid CLocodServicePlugin::ImplementationUid() const - { - return iImplementationUid; - } - -// ----------------------------------------------------------------------------- -// CLocodServicePlugin C++ constructor -// ----------------------------------------------------------------------------- -// -inline CLocodServicePlugin::CLocodServicePlugin(TLocodServicePluginParams& aParams) - : iImplementationUid(aParams.ImplementationUid()), - iObserver(aParams.Observer()) - { - } - -// ----------------------------------------------------------------------------- -// return the observer class -// ----------------------------------------------------------------------------- -// -inline MLocodServicePluginObserver& CLocodServicePlugin::Observer() const - { - return iObserver; - } - diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/commoninc/locodservicepluginobserver.h --- a/localconnectivityservice/locod/commoninc/locodservicepluginobserver.h Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is the LCD Service Plugin observer interface definition. -* -*/ - - -#ifndef M_LOCODSERVICEPLUGINOBSERVER_H -#define M_LOCODSERVICEPLUGINOBSERVER_H - -#include "locodbearer.h" - -/** - * LCD Service Plugin Observer interface class - * - * This is the service plugin observer interface definition used by LCD - * Service Plugins to inform the daemon when an action is complete. - * - * @lib - * @since S60 v3.2 - */ -class MLocodServicePluginObserver - { -public: - - /** - * This is a callback function used by the plugins to inform when - * managing the service have completed. The parameters passed should be - * identical to the ones used when the plugin's ManageService() was called, - * plus this service plugin's implemnetation UID and the completion status. - * - * @since S60 v3.2 - * @param aBearer the bearer identification passed in ManageService() - * @param aStatus the status of this bearer passed in ManageService() - * @param aServiceImplUid, the implementation UID of this service plugin. - * @param err KErrNone if the operation succeeded; otherwise a Symbian - * error code. - */ - virtual void ManageServiceCompleted( - TLocodBearer aBearer, - TBool aStatus, - TUid aServiceImplUid, - TInt err) = 0; - }; - -#endif // M_LOCODSERVICEPLUGINOBSERVER_H diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/commoninc/locodservicepluginparams.h --- a/localconnectivityservice/locod/commoninc/locodservicepluginparams.h Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,79 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is the LCD Service Plugin construction parameters -* declaration -* -*/ - - -#ifndef T_LOCODSERVICEPLUGINPARAMS_H -#define T_LOCODSERVICEPLUGINPARAMS_H - -class MLocodServicePluginObserver; - -/** - * LCD Service Plugin Callback construction parameters - * - * This interface class is used to pass construction parameters to the - * plugins. These parameters include the callback interface (usually - * implemented by the LCD) and the ECOM plugin implementation UID - * - * @lib ?library - * @since S60 v3.2 - */ -class TLocodServicePluginParams - { -public: - /** - * Constructor. - * - * @since S60 v3.2 - * @param aUid Implementation UID of the plugin being constructed - * @param aObserver Callback interface object - */ - TLocodServicePluginParams(TUid aUid, MLocodServicePluginObserver& aObserver); - - /** - * Gets the implementation UID of the plugin - * - * @since S60 v3.2 - * @return Implementaion UID - */ - TUid ImplementationUid() const; - - /** - * Gets the observer interface object - * - * @since S60 v3.2 - * @return The observer object - */ - MLocodServicePluginObserver& Observer() const; - -private: // data - - /** - * The implementation UID - */ - const TUid iImplementationUid; - - /** - * Reference to the observer object - */ - MLocodServicePluginObserver& iObserver; - - }; - -#include "locodservicepluginparams.inl" - -#endif // T_LOCODSERVICEPLUGINPARAMS_H diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/commoninc/locodservicepluginparams.inl --- a/localconnectivityservice/locod/commoninc/locodservicepluginparams.inl Thu Sep 02 21:21:26 2010 +0300 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -/* -* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). -* All rights reserved. -* This component and the accompanying materials are made available -* under the terms of "Eclipse Public License v1.0" -* which accompanies this distribution, and is available -* at the URL "http://www.eclipse.org/legal/epl-v10.html". -* -* Initial Contributors: -* Nokia Corporation - initial contribution. -* -* Contributors: -* -* Description: This is the LCD Service Plugin construction parameters -* declaration -* -*/ - - -// ----------------------------------------------------------------------------- -// Constructor method, just saves the arguments into member variables -// ----------------------------------------------------------------------------- -// -inline TLocodServicePluginParams::TLocodServicePluginParams(TUid aUid, MLocodServicePluginObserver& aObserver) - : iImplementationUid(aUid), - iObserver(aObserver) - { - } - -// ----------------------------------------------------------------------------- -// Returns the implementation UID -// ----------------------------------------------------------------------------- -// -inline TUid TLocodServicePluginParams::ImplementationUid() const - { - return iImplementationUid; - } - -// ----------------------------------------------------------------------------- -// return the observer class -// ----------------------------------------------------------------------------- -// -inline MLocodServicePluginObserver& TLocodServicePluginParams::Observer() const - { - return iObserver; - } diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/group/bld.inf --- a/localconnectivityservice/locod/group/bld.inf Thu Sep 02 21:21:26 2010 +0300 +++ b/localconnectivityservice/locod/group/bld.inf Fri Sep 17 08:34:51 2010 +0300 @@ -26,17 +26,5 @@ PRJ_TESTMMPFILES PRJ_EXPORTS -../commoninc/locodbearer.h |../../../inc/locodbearer.h -../commoninc/locodplugin.hrh |../../../inc/locodplugin.hrh -../commoninc/locodbearerplugin.h |../../../inc/locodbearerplugin.h -../commoninc/locodbearerplugin.inl |../../../inc/locodbearerplugin.inl -../commoninc/locodbearerpluginobserver.h |../../../inc/locodbearerpluginobserver.h -../commoninc/locodbearerpluginparams.h |../../../inc/locodbearerpluginparams.h -../commoninc/locodbearerpluginparams.inl |../../../inc/locodbearerpluginparams.inl -../commoninc/locodserviceplugin.h |../../inc/locodserviceplugin.h -../commoninc/locodserviceplugin.inl |../../inc/locodserviceplugin.inl -../commoninc/locodservicepluginobserver.h |../../inc/locodservicepluginobserver.h -../commoninc/locodservicepluginparams.h |../../inc/locodservicepluginparams.h -../commoninc/locodservicepluginparams.inl |../../inc/locodservicepluginparams.inl ../rom/locod.iby CORE_MW_LAYER_IBY_EXPORT_PATH(locod.iby) diff -r a5deb6b96675 -r 63cf70d3ecd8 localconnectivityservice/locod/group/locod.mmp --- a/localconnectivityservice/locod/group/locod.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/localconnectivityservice/locod/group/locod.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -34,7 +34,6 @@ SOURCE locodservice.cpp USERINCLUDE ../inc -USERINCLUDE ../../inc ../../../inc MW_LAYER_SYSTEMINCLUDE diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpfileandfolderdp/group/mtpfiledp.mmp --- a/mtpdataproviders/mtpfileandfolderdp/group/mtpfiledp.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpfileandfolderdp/group/mtpfiledp.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -13,8 +13,6 @@ // Description: // -#include - TARGET mtpfiledp.dll TARGETTYPE PLUGIN UID 0x10009D8D 0x102827A5 @@ -24,7 +22,8 @@ MW_LAYER_SYSTEMINCLUDE_SYMBIAN -USERINCLUDE ../inc +USERINCLUDE ../inc +USERINCLUDE ../traces USERINCLUDE ../../../mtpfws/mtpfw/dataproviders/dputility/inc USERINCLUDE ../../../mtpfws/mtpfw/common/inc USERINCLUDE ../../../mtpfws/mtpfw/inc diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpfileandfolderdp/inc/cmtpfiledp.h --- a/mtpdataproviders/mtpfileandfolderdp/inc/cmtpfiledp.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpfileandfolderdp/inc/cmtpfiledp.h Fri Sep 17 08:34:51 2010 +0300 @@ -24,7 +24,6 @@ #include #include "mmtpenumerationcallback.h" -#include "mtpdebug.h" #include "rmtpfiledpsingletons.h" #include "rmtpdpsingletons.h" #include "rmtpframework.h" @@ -81,10 +80,6 @@ static void ImplementationsCleanup(TAny* aData); private: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; /** The active request processors table. diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpfileandfolderdp/inc/mtpfiledpconst.h --- a/mtpdataproviders/mtpfileandfolderdp/inc/mtpfiledpconst.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpfileandfolderdp/inc/mtpfiledpconst.h Fri Sep 17 08:34:51 2010 +0300 @@ -75,7 +75,8 @@ EMTPObjectPropCodeParentObject, EMTPObjectPropCodePersistentUniqueObjectIdentifier, EMTPObjectPropCodeName, - EMTPObjectPropCodeNonConsumable + EMTPObjectPropCodeNonConsumable, + EMTPObjectPropCodeHidden }; /** diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpfileandfolderdp/inc/rmtpfiledpsingletons.h --- a/mtpdataproviders/mtpfileandfolderdp/inc/rmtpfiledpsingletons.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpfileandfolderdp/inc/rmtpfiledpsingletons.h Fri Sep 17 08:34:51 2010 +0300 @@ -58,11 +58,6 @@ void ConstructL(MMTPDataProviderFramework& aFramework); public: // Owned - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; /** The file config manager. @@ -73,14 +68,9 @@ private: // Owned /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - - /** The singletons reference block. */ CSingletons* iSingletons; }; -#endif // RMTPFILEDPSINGLETONS_H \ No newline at end of file +#endif // RMTPFILEDPSINGLETONS_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpfileandfolderdp/src/cmtpfiledp.cpp --- a/mtpdataproviders/mtpfileandfolderdp/src/cmtpfiledp.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpfileandfolderdp/src/cmtpfiledp.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -29,11 +29,15 @@ #include "mtpfiledppanic.h" #include "mtpfiledpprocessor.h" #include "cmtpdataprovidercontroller.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpfiledpTraces.h" +#endif + // Class constants static const TInt KArrayGranularity = 3; static const TInt KActiveEnumeration = 0; -__FLOG_STMT(_LIT8(KComponent,"CMTPFileDataProvider");) /** File data provider factory method. @@ -54,7 +58,7 @@ */ CMTPFileDataProvider::~CMTPFileDataProvider() { - __FLOG(_L8("~CMTPFileDataProvider - Entry")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_CMTPFILEDATAPROVIDER_DES_ENTRY ); iPendingEnumerations.Close(); TUint count(iActiveProcessors.Count()); while (count--) @@ -67,32 +71,31 @@ iSingletons.Close(); delete iFileEnumerator; delete iExclusionMgr; - __FLOG(_L8("~CMTPFileDataProvider - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_CMTPFILEDATAPROVIDER_DES_EXIT ); } void CMTPFileDataProvider::Cancel() { - __FLOG(_L8("Cancel - Entry")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_CANCEL_ENTRY ); iFileEnumerator->Cancel(); - __FLOG(_L8("Cancel - Exit")); + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_CANCEL_EXIT ); } void CMTPFileDataProvider::ProcessEventL(const TMTPTypeEvent& aEvent, MMTPConnection& aConnection) { - __FLOG(_L8("ProcessEventL - Entry")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_PROCESSEVENTL_ENTRY ); TInt idx(LocateRequestProcessorL(aEvent, aConnection)); if (idx != KErrNotFound) { iActiveProcessors[idx]->HandleEventL(aEvent); } - __FLOG(_L8("ProcessEventL - Exit")); + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_PROCESSEVENTL_EXIT ); } void CMTPFileDataProvider::ProcessNotificationL(TMTPNotification aNotification, const TAny* aParams) { - __FLOG(_L8("ProcessNotificationL - Entry")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_PROCESSNOTIFICATIONL_ENTRY ); switch (aNotification) { case EMTPSessionClosed: @@ -107,12 +110,12 @@ // Ignore all other notifications. break; } - __FLOG(_L8("ProcessNotificationL - Exit")); + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_PROCESSNOTIFICATIONL_EXIT ); } void CMTPFileDataProvider::ProcessRequestPhaseL(TMTPTransactionPhase aPhase, const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG(_L8("ProcessRequestPhaseL - Entry")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_PROCESSREQUESTPHASEL_ENTRY ); TInt idx(LocateRequestProcessorL(aRequest, aConnection)); __ASSERT_DEBUG((idx != KErrNotFound), Panic(EMTPFileDpNoMatchingProcessor)); MMTPRequestProcessor* processor(iActiveProcessors[idx]); @@ -130,32 +133,32 @@ } iActiveProcessor = -1; - __FLOG(_L8("ProcessRequestPhaseL - Exit")); + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_PROCESSREQUESTPHASEL_EXIT ); } void CMTPFileDataProvider::StartObjectEnumerationL(TUint32 aStorageId, TBool /*aPersistentFullEnumeration*/) { - __FLOG(_L8("StartObjectEnumerationL - Entry")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_STARTOBJECTENUMERATIONL_ENTRY ); iPendingEnumerations.AppendL(aStorageId); CMTPDataProviderController& dpController(iSingletons.DpController()); //must read this NeedEnumeratingPhase2 before this function return TBool bScanAll = dpController.NeedEnumeratingPhase2(); iFileEnumerator->StartL(iPendingEnumerations[KActiveEnumeration], bScanAll); - __FLOG(_L8("StartObjectEnumerationL - Exit")); + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_STARTOBJECTENUMERATIONL_EXIT ); } void CMTPFileDataProvider::StartStorageEnumerationL() { - __FLOG(_L8("StartStorageEnumerationL - Entry")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_STARTSTORAGEENUMERATIONL_ENTRY ); iExclusionMgr->AppendFormatExclusionListL(); iDpSingletons.MTPUtility().FormatExtensionMapping(); Framework().StorageEnumerationCompleteL(); - __FLOG(_L8("StartStorageEnumerationL - Exit")); + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_STARTSTORAGEENUMERATIONL_EXIT ); } void CMTPFileDataProvider::Supported(TMTPSupportCategory aCategory, RArray& aArray) const { - __FLOG(_L8("Supported - Entry")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_SUPPORTED_ENTRY ); switch (aCategory) { case EEvents: @@ -204,22 +207,19 @@ // Unrecognised category, leave aArray unmodified. break; } - __FLOG(_L8("Supported - Exit")); + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_SUPPORTED_EXIT ); } -#ifdef __FLOG_ACTIVE void CMTPFileDataProvider::NotifyEnumerationCompleteL(TUint32 aStorageId, TInt aError) -#else -void CMTPFileDataProvider::NotifyEnumerationCompleteL(TUint32 /*aStorageId*/, TInt /*aError*/) -#endif // __FLOG_ACTIVE { - __FLOG(_L8("HandleEnumerationCompletedL - Entry")); - __FLOG_VA((_L8("Enumeration of storage 0x%08X completed with error status %d"), aStorageId, aError)); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPFILEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL, + "Enumeration of storage 0x%08X completed with error status %d", aStorageId, (TInt32)aError); __ASSERT_DEBUG((aStorageId == iPendingEnumerations[KActiveEnumeration]), User::Invariant()); Framework().ObjectEnumerationCompleteL(iPendingEnumerations[KActiveEnumeration]); iPendingEnumerations.Remove(KActiveEnumeration); - __FLOG(_L8("HandleEnumerationCompletedL - Exit")); + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_EXIT ); } /** @@ -239,8 +239,7 @@ */ void CMTPFileDataProvider::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_CONSTRUCTL_ENTRY ); iDpSingletons.OpenL(Framework()); iFileDPSingletons.OpenL(Framework()); iSingletons.OpenL(); @@ -250,7 +249,7 @@ TUint processLimit = iFileDPSingletons.FrameworkConfig().UintValueL(CMTPFileDpConfigMgr::EEnumerationIterationLength); iFileEnumerator = CMTPFSEnumerator::NewL(Framework(), iDpSingletons.ExclusionMgrL(), *this, processLimit); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_CONSTRUCTL_EXIT ); } /** @@ -261,7 +260,7 @@ */ TInt CMTPFileDataProvider::LocateRequestProcessorL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG(_L8("LocateRequestProcessorL - Entry")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY ); TInt idx(KErrNotFound); TInt count(iActiveProcessors.Count()); for (TInt i(0); (i < count); i++) @@ -281,8 +280,8 @@ CleanupStack::Pop(); idx = count; } - - __FLOG(_L8("LocateRequestProcessorL - Exit")); + + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT ); return idx; } @@ -294,7 +293,7 @@ */ TInt CMTPFileDataProvider::LocateRequestProcessorL(const TMTPTypeEvent& aEvent, MMTPConnection& aConnection) { - __FLOG(_L8("LocateRequestProcessorL - Entry")); + OstTraceFunctionEntry0( DUP1_CMTPFILEDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY ); TInt idx(KErrNotFound); TInt count(iActiveProcessors.Count()); for (TInt i(0); (i < count); i++) @@ -305,7 +304,7 @@ break; } } - __FLOG(_L8("LocateRequestProcessorL - Exit")); + OstTraceFunctionExit0( DUP1_CMTPFILEDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT ); return idx; } @@ -315,7 +314,7 @@ */ void CMTPFileDataProvider::SessionClosedL(const TMTPNotificationParamsSessionChange& aSession) { - __FLOG(_L8("SessionClosedL - Entry")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_SESSIONCLOSEDL_ENTRY ); TInt count = iActiveProcessors.Count(); while(count--) { @@ -334,22 +333,22 @@ } } } - __FLOG(_L8("SessionClosedL - Exit")); + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_SESSIONCLOSEDL_EXIT ); } /** Prepares for a newly-opened session. @param aSession notification parameter block */ -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE void CMTPFileDataProvider::SessionOpenedL(const TMTPNotificationParamsSessionChange& aSession) #else void CMTPFileDataProvider::SessionOpenedL(const TMTPNotificationParamsSessionChange& /*aSession*/) #endif { - __FLOG(_L8("SessionOpenedL - Entry")); - __FLOG_VA((_L8("SessionID = %d"), aSession.iMTPId)); - __FLOG(_L8("SessionOpenedL - Exit")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_SESSIONOPENEDL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPFILEDATAPROVIDER_SESSIONOPENEDL, "SessionID = %d", aSession.iMTPId ); + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_SESSIONOPENEDL_EXIT ); } /** @@ -360,7 +359,7 @@ */ TBool CMTPFileDataProvider::PictbridgeDpExistL() const { - __FLOG(_L8("PictbridgeDpExistL - Entry")); + OstTraceFunctionEntry0( CMTPFILEDATAPROVIDER_PICTBRIDGEDPEXISTL_ENTRY ); RImplInfoPtrArray implementations; TCleanupItem cleanup(ImplementationsCleanup, reinterpret_cast(&implementations)); @@ -379,9 +378,9 @@ } } CleanupStack::PopAndDestroy(&implementations); - - __FLOG_VA((_L8("return value ret = %d"), ret)); - __FLOG(_L8("PictbridgeDpExistL - Exit")); + + OstTrace1( TRACE_NORMAL, CMTPFILEDATAPROVIDER_PICTBRIDGEDPEXISTL, "return value ret = %d", ret ); + OstTraceFunctionExit0( CMTPFILEDATAPROVIDER_PICTBRIDGEDPEXISTL_EXIT ); return ret; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpfileandfolderdp/src/cmtpfiledpconfigmgr.cpp --- a/mtpdataproviders/mtpfileandfolderdp/src/cmtpfiledpconfigmgr.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpfileandfolderdp/src/cmtpfiledpconfigmgr.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,6 +20,11 @@ #include #include +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpfiledpconfigmgrTraces.h" +#endif + #define UNUSED_VAR(v) (v = v) @@ -103,6 +108,7 @@ err = aArray.InsertInOrder(TUint(reader.ReadUint16())); if( (err != KErrNone) && (err != KErrAlreadyExists) ) { + OstTrace1( TRACE_ERROR, CMTPFILEDPCONFIGMGR_READFORMATEXCLUSIONLISTL, "insert in aArray failed! error code %d", err ); User::Leave(err); } } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpfileandfolderdp/src/rmtpfiledpsingletons.cpp --- a/mtpdataproviders/mtpfileandfolderdp/src/rmtpfiledpsingletons.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpfileandfolderdp/src/rmtpfiledpsingletons.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -19,9 +19,13 @@ #include #include "cmtpfiledpconfigmgr.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "rmtpfiledpsingletonsTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"FileDpSingletons");) /** Constructor. @@ -36,10 +40,9 @@ */ void RMTPFileDpSingletons::OpenL(MMTPDataProviderFramework& aFramework) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("OpenL - Entry")); + OstTraceFunctionEntry0( RMTPFILEDPSINGLETONS_OPENL_ENTRY ); iSingletons = &CSingletons::OpenL(aFramework); - __FLOG(_L8("OpenL - Exit")); + OstTraceFunctionExit0( RMTPFILEDPSINGLETONS_OPENL_EXIT ); } /** @@ -47,14 +50,13 @@ */ void RMTPFileDpSingletons::Close() { - __FLOG(_L8("Close - Entry")); + OstTraceFunctionEntry0( RMTPFILEDPSINGLETONS_CLOSE_ENTRY ); if (iSingletons) { iSingletons->Close(); iSingletons = NULL; } - __FLOG(_L8("Close - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( RMTPFILEDPSINGLETONS_CLOSE_EXIT ); } /** @@ -64,10 +66,10 @@ CMTPFileDpConfigMgr& RMTPFileDpSingletons::FrameworkConfig() { - __FLOG(_L8("FrameworkConfig - Entry")); + OstTraceFunctionEntry0( RMTPFILEDPSINGLETONS_FRAMEWORKCONFIG_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); __ASSERT_DEBUG(iSingletons->iConfigMgr, User::Invariant()); - __FLOG(_L8("FrameworkConfig - Exit")); + OstTraceFunctionExit0( RMTPFILEDPSINGLETONS_FRAMEWORKCONFIG_EXIT ); return *iSingletons->iConfigMgr; } @@ -82,7 +84,7 @@ RMTPFileDpSingletons::CSingletons& RMTPFileDpSingletons::CSingletons::OpenL(MMTPDataProviderFramework& aFramework) { - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("CSingletons::OpenL - Entry")); + OstTraceFunctionEntry0( RMTPFILEDPSINGLETONS_CSINGLETONS_OPENL_ENTRY ); CSingletons* self(reinterpret_cast(Dll::Tls())); if (!self) { @@ -93,7 +95,7 @@ { self->Inc(); } - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("CSingletons::OpenL - Exit")); + OstTraceFunctionExit0( RMTPFILEDPSINGLETONS_CSINGLETONS_OPENL_EXIT ); return *self; } @@ -102,35 +104,33 @@ CSingletons* self(reinterpret_cast(Dll::Tls())); if (self) { - __FLOG(_L8("CSingletons::Close - Entry")); + OstTraceFunctionEntry0( RMTPFILEDPSINGLETONS_CSINGLETONS_CLOSE_ENTRY ); self->Dec(); if (self->AccessCount() == 0) { - __FLOG(_L8("CSingletons::Close - Exit")); + OstTraceFunctionExit0( RMTPFILEDPSINGLETONS_CSINGLETONS_CLOSE_EXIT ); delete self; Dll::SetTls(NULL); } else { - __FLOG(_L8("CSingletons::Close - Exit")); + OstTraceFunctionExit0( DUP1_RMTPFILEDPSINGLETONS_CSINGLETONS_CLOSE_EXIT ); } } } RMTPFileDpSingletons::CSingletons::~CSingletons() { - __FLOG(_L8("CSingletons::~CSingletons - Entry")); + OstTraceFunctionEntry0( RMTPFILEDPSINGLETONS_CSINGLETONS_CSINGLETONS_ENTRY ); delete iConfigMgr; - __FLOG(_L8("CSingletons::~CSingletons - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( RMTPFILEDPSINGLETONS_CSINGLETONS_CSINGLETONS_EXIT ); } void RMTPFileDpSingletons::CSingletons::ConstructL(MMTPDataProviderFramework& aFramework) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CSingletons::ConstructL - Entry")); + OstTraceFunctionEntry0( RMTPFILEDPSINGLETONS_CSINGLETONS_CONSTRUCTL_ENTRY ); iConfigMgr = CMTPFileDpConfigMgr::NewL(aFramework); - __FLOG(_L8("CSingletons::ConstructL - Exit")); + OstTraceFunctionExit0( RMTPFILEDPSINGLETONS_CSINGLETONS_CONSTRUCTL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpfileandfolderdp/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpdataproviders/mtpfileandfolderdp/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpfileandfolderdp/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpdataproviders/mtpfileandfolderdp/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,53 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_NORMAL=0x86 +[TRACE]TRACE_ERROR[0x82]_CMTPFILEDPCONFIGMGR_READFORMATEXCLUSIONLISTL=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_CANCEL_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_CANCEL_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_CMTPFILEDATAPROVIDER_DES_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_CMTPFILEDATAPROVIDER_DES_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_CONSTRUCTL_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_CONSTRUCTL_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY=0x15 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT=0x16 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_ENTRY=0x11 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_PICTBRIDGEDPEXISTL_ENTRY=0x1d +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_PICTBRIDGEDPEXISTL_EXIT=0x1e +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_PROCESSEVENTL_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_PROCESSEVENTL_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_PROCESSNOTIFICATIONL_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_PROCESSNOTIFICATIONL_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_PROCESSREQUESTPHASEL_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_PROCESSREQUESTPHASEL_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_SESSIONCLOSEDL_ENTRY=0x19 +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_SESSIONCLOSEDL_EXIT=0x1a +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_SESSIONOPENEDL_ENTRY=0x1b +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_SESSIONOPENEDL_EXIT=0x1c +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_STARTOBJECTENUMERATIONL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_STARTOBJECTENUMERATIONL_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_STARTSTORAGEENUMERATIONL_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_STARTSTORAGEENUMERATIONL_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_SUPPORTED_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CMTPFILEDATAPROVIDER_SUPPORTED_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPFILEDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY=0x17 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPFILEDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT=0x18 +[TRACE]TRACE_FLOW[0x8A]_DUP1_RMTPFILEDPSINGLETONS_CSINGLETONS_CLOSE_EXIT=0x33 +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_CLOSE_ENTRY=0x21 +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_CLOSE_EXIT=0x22 +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_CSINGLETONS_CLOSE_ENTRY=0x31 +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_CSINGLETONS_CLOSE_EXIT=0x32 +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_CSINGLETONS_CONSTRUCTL_ENTRY=0x36 +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_CSINGLETONS_CONSTRUCTL_EXIT=0x37 +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_CSINGLETONS_CSINGLETONS_ENTRY=0x34 +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_CSINGLETONS_CSINGLETONS_EXIT=0x35 +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_CSINGLETONS_OPENL_ENTRY=0x2f +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_CSINGLETONS_OPENL_EXIT=0x30 +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_FRAMEWORKCONFIG_ENTRY=0x23 +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_FRAMEWORKCONFIG_EXIT=0x24 +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_OPENL_ENTRY=0x1f +[TRACE]TRACE_FLOW[0x8A]_RMTPFILEDPSINGLETONS_OPENL_EXIT=0x20 +[TRACE]TRACE_NORMAL[0x86]_CMTPFILEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL=0x1 +[TRACE]TRACE_NORMAL[0x86]_CMTPFILEDATAPROVIDER_PICTBRIDGEDPEXISTL=0x3 +[TRACE]TRACE_NORMAL[0x86]_CMTPFILEDATAPROVIDER_SESSIONOPENEDL=0x2 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/group/mtpimagedp.mmp --- a/mtpdataproviders/mtpimagedp/group/mtpimagedp.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/group/mtpimagedp.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -18,8 +18,6 @@ @internalTechnology */ -#include - TARGET mtpimagedp.dll TARGETTYPE PLUGIN UID 0x10009D8D 0x2001FCA2 @@ -35,7 +33,8 @@ USERINCLUDE ../../../mtpfws/mtpfw/common/inc USERINCLUDE ../../../mtpfws/mtpfw/inc USERINCLUDE ../../../mtpfws/mtpfw/datatypes/inc -USERINCLUDE ../../../mtpfws/mtpfw/transports/transportapi/inc +USERINCLUDE ../../../mtpfws/mtpfw/transports/transportapi/inc +USERINCLUDE ../traces SOURCEPATH ../src diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedp.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedp.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedp.h Fri Sep 17 08:34:51 2010 +0300 @@ -97,10 +97,6 @@ TUint QueryImageObjectCountL(); private: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPImageDpObjectPropertyMgr* iPropertyMgr; CMTPImageDpThumbnailCreator* iThumbnailManager; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpcopyobject.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpcopyobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpcopyobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -86,10 +86,6 @@ this is currently hard coded so doesn't copy these */ TTime iDateModified; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif //CMTPIMAGEDPCOPYOBJECT_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpdeleteobject.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpdeleteobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpdeleteobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -83,11 +83,6 @@ private: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - CMTPImageDataProvider& iDataProvider; CMTPObjectMetaData* iObjectMeta; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetformatcapabilities.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetformatcapabilities.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetformatcapabilities.h Fri Sep 17 08:34:51 2010 +0300 @@ -51,14 +51,11 @@ void ServiceOneFormatCapabilitiesL(TUint aFormatCode); CMTPTypeObjectPropDesc* ServiceProtectionStatusL(); CMTPTypeObjectPropDesc* ServiceNonConsumableL(); + CMTPTypeObjectPropDesc* ServiceHiddenL(); TUint16 GetPropertyGroupNumber(const TUint16 aPropCode) const; private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; TUint iFormatCode; /* diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobject.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -52,11 +52,6 @@ void BuildFileObjectL(const TDesC& aFileName); private: // Owned - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; MMTPDataProviderFramework& iFramework; CMTPTypeFile* iFileObject; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectinfo.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -59,7 +59,6 @@ void SetKeywordL(); private: - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPTypeObjectInfo* iObjectInfoToBuild; CMTPObjectMetaData* iObjectMeta; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectpropdesc.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectpropdesc.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectpropdesc.h Fri Sep 17 08:34:51 2010 +0300 @@ -70,15 +70,11 @@ void ServiceRepresentativeSampleWidthL(); void ServiceRepresentativeSampleDataL(); void ServiceNonConsumableL(); + void ServiceHiddenL(); TUint16 GetPropertyGroupNumber(const TUint16 aPropCode) const; private: CMTPTypeObjectPropDesc* iObjectProperty; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif //CMTPIMAGEDPGETOBJECTPROPDESC_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectproplist.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectproplist.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectproplist.h Fri Sep 17 08:34:51 2010 +0300 @@ -89,11 +89,6 @@ RArray iHandles; CMTPTypeObjectPropList* iPropertyList; CMTPObjectMetaData* iObjectMeta; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // CMTPIMAGEDPGETOBJECTPROPLIST_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectpropssupported.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectpropssupported.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectpropssupported.h Fri Sep 17 08:34:51 2010 +0300 @@ -50,11 +50,6 @@ private: CMTPTypeArray* iObjectPropsSupported; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif //CMTPIMAGEDPGETOBJECTPROPSSUPPORTED_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectpropvalue.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectpropvalue.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectpropvalue.h Fri Sep 17 08:34:51 2010 +0300 @@ -73,6 +73,7 @@ void ServiceRepresentativeSampleWidthL(); void ServiceRepresentativeSampleDataL(); void ServiceNonConsumableL(); + void ServiceHiddenL(); private: CMTPImageDpObjectPropertyMgr& iObjectPropertyMgr; @@ -84,11 +85,7 @@ CMTPTypeString* iMTPTypeString; CMTPTypeArray* iMTPTypeArray; CMTPObjectMetaData* iObjectMeta; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; + }; #endif //CMTPIMAGEDPGETOBJECTPROPVALUE_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectreferences.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectreferences.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetobjectreferences.h Fri Sep 17 08:34:51 2010 +0300 @@ -45,10 +45,6 @@ virtual void ServiceL(); private: - /** - FLOGGER debug trace member variable. - **/ - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPTypeArray* iReferences; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetpartialobject.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetpartialobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetpartialobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -54,10 +54,6 @@ void BuildPartialDataL(); private: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; RFs& iFs; TUint32 iOffset; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetthumb.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetthumb.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpgetthumb.h Fri Sep 17 08:34:51 2010 +0300 @@ -51,11 +51,6 @@ void ConstructL(); private: // Owned - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPImageDataProvider& imgDp; CMTPTypeOpaqueData* iThumb; CMTPObjectMetaData* iObjectMeta; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpmdeobserver.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpmdeobserver.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpmdeobserver.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,8 +25,6 @@ #include #include -#include - #include "cmtpimagedpobjectpropertymgr.h" class MMTPDataProviderFramework; @@ -66,10 +64,6 @@ void CreateMetadataL(const TParsePtrC& aParse, TMTPFormatCode aFormat, TUint32 aParentHandle, CMTPObjectMetaData& aMetaData); private: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; MMTPDataProviderFramework& iFramework; CMTPImageDataProvider& iDataProvider; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpmoveobject.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpmoveobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpmoveobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -65,10 +65,6 @@ TUint32 iStorageId; TTime iPreviousModifiedTime; CMTPImageDataProvider& iDataProvider; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif //CMTPIMAGEDPMOVEOBJECT_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpobjectpropertymgr.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpobjectpropertymgr.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpobjectpropertymgr.h Fri Sep 17 08:34:51 2010 +0300 @@ -193,10 +193,6 @@ }; private: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; MMTPDataProviderFramework& iFramework; CMTPImageDataProvider& iDataProvider; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedprenameobject.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedprenameobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedprenameobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,8 +22,6 @@ #ifndef CMTPIMAGEDPRENAMEOBJECT_H #define CMTPIMAGEDPRENAMEOBJECT_H -#include "mtpdebug.h" - // Forward declarations class MMTPDataProviderFramework; class CMTPImageDataProvider; @@ -54,9 +52,7 @@ private: void GenerateObjectHandleListL(TUint32 aParentHandle); -private: - __FLOG_DECLARATION_MEMBER_MUTABLE; - +private: MMTPDataProviderFramework& iFramework; CMTPImageDataProvider& iDataProvider; RArray iObjectHandles; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpsendobjectinfo.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpsendobjectinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpsendobjectinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -153,11 +153,6 @@ TBool IsTooLarge(TUint64 aObjectSize) const; private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - CMTPImageDataProvider& iDataProvider; CMTPTypeFile* iFileReceived; CMTPTypeObjectInfo* iObjectInfo; @@ -175,6 +170,7 @@ CMTPObjectMetaData* iReceivedObject; TMTPTypeRequest iExpectedSendObjectRequest; TUint16 iProtectionStatus; + TUint16 iHiddenStatus; TUint16 iFormatCode; TUint32 iPreviousTransactionID; CMTPImageDpObjectPropertyMgr& iObjectPropertyMgr; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpsetobjectproplist.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpsetobjectproplist.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpsetobjectproplist.h Fri Sep 17 08:34:51 2010 +0300 @@ -53,11 +53,6 @@ TMTPResponseCode CheckPropCode(TUint16 aPropertyCode, TUint16 aDataType) const; private: - - /** - FLOGGER debug trace member variable. - **/ - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPImageDataProvider& iDataProvider; CMTPImageDpObjectPropertyMgr& iPropertyMgr; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpsetobjectpropvalue.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpsetobjectpropvalue.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpsetobjectpropvalue.h Fri Sep 17 08:34:51 2010 +0300 @@ -52,10 +52,6 @@ TBool HasDataphase() const; private: - /** - FLOGGER debug trace member variable. - **/ - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPImageDataProvider& iDataProvider; CMTPImageDpObjectPropertyMgr& iObjectPropertyMgr; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpsetobjectprotection.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpsetobjectprotection.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpsetobjectprotection.h Fri Sep 17 08:34:51 2010 +0300 @@ -46,13 +46,9 @@ TBool DoHandleResponsePhaseL(); private: - /** - FLOGGER debug trace member variable. - **/ TMTPTypeUint16 iMTPTypeUint16; RFs& iRfs; CMTPObjectMetaData* iObjMeta; - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // CMTPIMAGEDPSETOBJECTPROTECTION_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpsetobjectreferences.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpsetobjectreferences.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpsetobjectreferences.h Fri Sep 17 08:34:51 2010 +0300 @@ -50,10 +50,6 @@ TBool VerifyReferenceHandlesL() const; private: - /** - FLOGGER debug trace member variable. - **/ - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPTypeArray* iReferences; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/cmtpimagedpthumbnailcreator.h --- a/mtpdataproviders/mtpimagedp/inc/cmtpimagedpthumbnailcreator.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/cmtpimagedpthumbnailcreator.h Fri Sep 17 08:34:51 2010 +0300 @@ -32,9 +32,6 @@ #include class CMTPTypeOpaqueData; - -#include "mtpdebug.h" - class CMTPImageDataProvider; #define MTPTHUMBSCALING @@ -106,10 +103,6 @@ void ConstructL(); private: - /** - FLOGGER debug trace member variable. - **/ - __FLOG_DECLARATION_MEMBER_MUTABLE; enum{ EIdle, diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/inc/mtpimagedpconst.h --- a/mtpdataproviders/mtpimagedp/inc/mtpimagedpconst.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/inc/mtpimagedpconst.h Fri Sep 17 08:34:51 2010 +0300 @@ -24,7 +24,6 @@ #include #include -#include // for __FLOG debugging /* * [Thumbnail SIZE]: performance improvement @@ -98,7 +97,8 @@ EMTPObjectPropCodeRepresentativeSampleHeight, EMTPObjectPropCodeRepresentativeSampleWidth, EMTPObjectPropCodeRepresentativeSampleData, - EMTPObjectPropCodeNonConsumable + EMTPObjectPropCodeNonConsumable, + EMTPObjectPropCodeHidden }; /** @@ -134,7 +134,10 @@ EMTPObjectPropCodeRepresentativeSampleSize, EMTPObjectPropCodeRepresentativeSampleHeight, EMTPObjectPropCodeRepresentativeSampleWidth, - EMTPObjectPropCodeRepresentativeSampleData + EMTPObjectPropCodeRepresentativeSampleData, + + //From file system + EMTPObjectPropCodeHidden }; /** diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/mediasyncserver/src/cmediasyncdatabase.cpp --- a/mtpdataproviders/mtpimagedp/mediasyncserver/src/cmediasyncdatabase.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/mediasyncserver/src/cmediasyncdatabase.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -440,8 +440,8 @@ RDbView view; CleanupClosePushL(view); - view.Prepare(iDatabase, TDbQuery(KSQLQuery)); - view.EvaluateAll(); + User::LeaveIfError(view.Prepare(iDatabase, TDbQuery(KSQLQuery))); + User::LeaveIfError(view.EvaluateAll()); //goto the last fetch position if (iSavePosition) diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedp.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedp.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedp.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -42,8 +42,11 @@ #include "cmtpimagedpmdeobserver.h" #include "cmtpimagedprenameobject.h" #include "cmtpimagedpnewpicturesnotifier.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"CMTPImageDataProvider");) static const TInt KArrayGranularity = 3; static const TInt KDeleteObjectGranularity = 2; @@ -94,8 +97,8 @@ */ void CMTPImageDataProvider::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8(">> CMTPImageDataProvider::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_CONSTRUCTL_ENTRY ); + iNewPicNotifier = CMTPImageDpNewPicturesNotifier::NewL(); //Setup central repository connection @@ -124,12 +127,14 @@ TInt error = RProperty::Define(tSid, KMTPNewPicKey, RProperty::EInt, KAllowReadAll, KAllowReadAll); if (error != KErrNone && error != KErrAlreadyExists) { - __FLOG_1(_L8("CMTPImageDataProvider::ConstructL - RProperty define error:%d"), error); - User::LeaveIfError(error); + LEAVEIFERROR(error, + OstTrace1( TRACE_ERROR, DUP1_CMTPIMAGEDATAPROVIDER_CONSTRUCTL, + "RProperty define error:%d", error )); + } iEnumerationNotified = ETrue; - __FLOG(_L8("<< CMTPImageDataProvider::ConstructL")); + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_CONSTRUCTL_EXIT ); } /** @@ -137,7 +142,7 @@ */ CMTPImageDataProvider::~CMTPImageDataProvider() { - __FLOG(_L8(">> ~CMTPImageDataProvider")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_CMTPIMAGEDATAPROVIDER_DES_ENTRY ); // delete all processor instances TUint count(iActiveProcessors.Count()); @@ -166,15 +171,14 @@ HandleDeleteObjectsArray(); iDeleteObjectsArray.ResetAndDestroy(); iNewPicHandles.Reset(); - - __FLOG(_L8("<< ~CMTPImageDataProvider")); - __FLOG_CLOSE; + + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_CMTPIMAGEDATAPROVIDER_DES_EXIT ); } void CMTPImageDataProvider::Cancel() { - __FLOG(_L8(">> Cancel")); - __FLOG(_L8("<< Cancel")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_CANCEL_ENTRY ); + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_CANCEL_EXIT ); } /** @@ -185,7 +189,7 @@ */ void CMTPImageDataProvider::ProcessEventL(const TMTPTypeEvent& aEvent, MMTPConnection& aConnection) { - __FLOG(_L8(">> ProcessEventL")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_PROCESSEVENTL_ENTRY ); //Try to delete objects in array HandleDeleteObjectsArray(); @@ -197,7 +201,7 @@ iActiveProcessors[idx]->HandleEventL(aEvent); } - __FLOG(_L8("<< ProcessEventL")); + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_PROCESSEVENTL_EXIT ); } /** @@ -207,7 +211,7 @@ */ void CMTPImageDataProvider::ProcessNotificationL(TMTPNotification aNotification, const TAny* aParams) { - __FLOG(_L8(">> ProcessNotificationL")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_PROCESSNOTIFICATIONL_ENTRY ); switch (aNotification) { @@ -227,8 +231,8 @@ // Ignore all other notifications. break; } - - __FLOG(_L8("<< ProcessNotificationL")); + + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_PROCESSNOTIFICATIONL_EXIT ); } /** @@ -240,7 +244,7 @@ */ void CMTPImageDataProvider::ProcessRequestPhaseL(TMTPTransactionPhase aPhase, const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG(_L8(">> ProcessRequestPhaseL")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_PROCESSREQUESTPHASEL_ENTRY ); //Try to handle objects which need to be deleted HandleDeleteObjectsArray(); @@ -262,7 +266,7 @@ } iActiveProcessor = -1; - __FLOG(_L8("<< ProcessRequestPhaseL")); + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_PROCESSREQUESTPHASEL_EXIT ); } /** @@ -270,7 +274,7 @@ */ void CMTPImageDataProvider::StartObjectEnumerationL(TUint32 aStorageId, TBool /*aPersistentFullEnumeration*/) { - __FLOG(_L8(">> StartObjectEnumerationL")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_STARTOBJECTENUMERATIONL_ENTRY ); TBool isComplete = ETrue; iEnumerationNotified = EFalse; @@ -295,7 +299,7 @@ NotifyEnumerationCompleteL(aStorageId, KErrNone); } - __FLOG(_L8("<< StartObjectEnumerationL")); + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_STARTOBJECTENUMERATIONL_EXIT ); } @@ -304,9 +308,9 @@ */ void CMTPImageDataProvider::StartStorageEnumerationL() { - __FLOG(_L8(">> StartStorageEnumerationL")); - NotifyStorageEnumerationCompleteL(); - __FLOG(_L8("<< StartStorageEnumerationL")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_STARTSTORAGEENUMERATIONL_ENTRY ); + NotifyStorageEnumerationCompleteL(); + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_STARTSTORAGEENUMERATIONL_EXIT ); } /** @@ -317,7 +321,7 @@ */ void CMTPImageDataProvider::Supported(TMTPSupportCategory aCategory, RArray& aArray) const { - __FLOG(_L8(">> Supported")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_SUPPORTED_ENTRY ); switch (aCategory) { @@ -327,7 +331,8 @@ for (TInt i(0); (i < count); i++) { aArray.Append(KMTPImageDpSupportedEvents[i]); - __FLOG_VA((_L(" CMTPImageDataProvider::Supported Events %d added"), KMTPImageDpSupportedEvents[i])); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDATAPROVIDER_SUPPORTED, + " CMTPImageDataProvider::Supported Events %d added", KMTPImageDpSupportedEvents[i] ); } } break; @@ -338,11 +343,13 @@ TInt count(sizeof(KMTPValidCodeExtensionMappings) / sizeof(KMTPValidCodeExtensionMappings[0])); for(TInt i(0); (i < count); i++) { - __FLOG_VA((_L(" CMTPImageDataProvider::Supported we have formatCode %d"), KMTPValidCodeExtensionMappings[i].iFormatCode )); + OstTrace1( TRACE_NORMAL, DUP1_CMTPIMAGEDATAPROVIDER_SUPPORTED, + " CMTPImageDataProvider::Supported we have formatCode %d", KMTPValidCodeExtensionMappings[i].iFormatCode ); if(aArray.Find(KMTPValidCodeExtensionMappings[i].iFormatCode)==KErrNotFound) // KMTPValidCodeExtensionMappings may contain format code more than once { aArray.Append(KMTPValidCodeExtensionMappings[i].iFormatCode); - __FLOG_VA((_L(" CMTPImageDataProvider::Supported formatCode %d added"), KMTPValidCodeExtensionMappings[i].iFormatCode)); + OstTrace1( TRACE_NORMAL, DUP2_CMTPIMAGEDATAPROVIDER_SUPPORTED, + " CMTPImageDataProvider::Supported formatCode %d added", KMTPValidCodeExtensionMappings[i].iFormatCode ); } } } @@ -353,7 +360,9 @@ for (TInt i(0); (i < count); i++) { aArray.Append(KMTPImageDpSupportedProperties[i]); - __FLOG_VA((_L(" CMTPImageDataProvider::Supported property %d added"), KMTPImageDpSupportedProperties[i])); + OstTrace1( TRACE_NORMAL, DUP3_CMTPIMAGEDATAPROVIDER_SUPPORTED, + " CMTPImageDataProvider::Supported property %d added", KMTPImageDpSupportedProperties[i] ); + } } break; @@ -364,7 +373,8 @@ for (TInt i(0); (i < count); i++) { aArray.Append(KMTPImageDpSupportedOperations[i]); - __FLOG_VA((_L(" CMTPImageDataProvider::Supported operation %d added"), KMTPImageDpSupportedOperations[i])); + OstTrace1( TRACE_NORMAL, DUP4_CMTPIMAGEDATAPROVIDER_SUPPORTED, + " CMTPImageDataProvider::Supported operation %d added", KMTPImageDpSupportedOperations[i] ); } } break; @@ -378,7 +388,7 @@ break; } - __FLOG(_L8("<< Supported")); + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_SUPPORTED_EXIT ); } /** @@ -447,9 +457,9 @@ */ void CMTPImageDataProvider::NotifyStorageEnumerationCompleteL() { - __FLOG(_L8(">> NotifyStorageEnumerationCompleteL")); - Framework().StorageEnumerationCompleteL(); - __FLOG(_L8("<< NotifyStorageEnumerationCompleteL")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_NOTIFYSTORAGEENUMERATIONCOMPLETEL_ENTRY ); + Framework().StorageEnumerationCompleteL(); + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_NOTIFYSTORAGEENUMERATIONCOMPLETEL_EXIT ); } CMTPImageDpThumbnailCreator* CMTPImageDataProvider::ThumbnailManager() @@ -477,22 +487,23 @@ // // -------------------------------------------------------------------------- // -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE void CMTPImageDataProvider::NotifyEnumerationCompleteL(TUint32 aStorageId, TInt aError) #else void CMTPImageDataProvider::NotifyEnumerationCompleteL(TUint32 aStorageId, TInt /*aError*/) -#endif // __FLOG_ACTIVE +#endif // OST_TRACE_COMPILER_IN_USE { - __FLOG(_L8(">> NotifyEnumerationCompletedL")); - __FLOG_VA((_L8("Enumeration of storage 0x%08X completed with error status %d"), aStorageId, aError)); - + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPIMAGEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL, + "Enumeration of storage 0x%08X completed with error status %d", aStorageId, (TInt32)aError ); + if (!iEnumerationNotified) { iEnumerationNotified = ETrue; Framework().ObjectEnumerationCompleteL(aStorageId); } - __FLOG(_L8("<< HandleEnumerationCompletedL")); + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_EXIT ); } /** @@ -505,7 +516,7 @@ */ TInt CMTPImageDataProvider::LocateRequestProcessorL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG(_L8(">> LocateRequestProcessorL")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY ); TInt idx(KErrNotFound); TInt count(iActiveProcessors.Count()); @@ -526,8 +537,8 @@ CleanupStack::Pop(); idx = count; } - - __FLOG(_L8("<< LocateRequestProcessorL")); + + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT ); return idx; } @@ -541,7 +552,7 @@ */ TInt CMTPImageDataProvider::LocateRequestProcessorL(const TMTPTypeEvent& aEvent, MMTPConnection& aConnection) { - __FLOG(_L8(">> LocateRequestProcessorL")); + OstTraceFunctionEntry0( DUP1_CMTPIMAGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY ); TInt idx(KErrNotFound); TInt count(iActiveProcessors.Count()); @@ -554,7 +565,7 @@ } } - __FLOG(_L8("<< LocateRequestProcessorL")); + OstTraceFunctionExit0( DUP1_CMTPIMAGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT ); return idx; } @@ -566,7 +577,8 @@ */ void CMTPImageDataProvider::SessionClosedL(const TMTPNotificationParamsSessionChange& aSession) { - __FLOG_VA((_L8(">> SessionClosedL SessionID = %d"), aSession.iMTPId)); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_SESSIONCLOSEDL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDATAPROVIDER_SESSIONCLOSEDL, "SessionID = %d", aSession.iMTPId ); TInt count = iActiveProcessors.Count(); while(count--) @@ -591,8 +603,8 @@ * We clear property manager cache when receiving session close notification from framework every times */ iPropertyMgr->ClearAllCache(); - - __FLOG(_L8("<< SessionClosedL")); + + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_SESSIONCLOSEDL_EXIT ); } /** @@ -601,13 +613,14 @@ @param aSessionId The session Id opened @param aConnection The connection of the sesssion */ -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE void CMTPImageDataProvider::SessionOpenedL(const TMTPNotificationParamsSessionChange& aSession) #else void CMTPImageDataProvider::SessionOpenedL(const TMTPNotificationParamsSessionChange& /*aSession*/) #endif { - __FLOG_VA((_L8(">> SessionOpenedL SessionID = %d"), aSession.iMTPId)); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_SESSIONOPENEDL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDATAPROVIDER_SESSIONOPENEDL, "SessionID = %d", aSession.iMTPId ); if (iEnumerated) { @@ -616,11 +629,12 @@ */ TUint newPictures = QueryImageObjectCountL(); iNewPicNotifier->SetNewPictures(newPictures); - __FLOG_1(_L16("CMTPImageDpEnumerator::CompleteEnumeration - New Pics: %d"), newPictures); + OstTrace1( TRACE_NORMAL, DUP1_CMTPIMAGEDATAPROVIDER_SESSIONOPENEDL, + "CMTPImageDpEnumerator::CompleteEnumeration - New Pics: %d", newPictures ); iEnumerated = EFalse; } - - __FLOG(_L8("<< SessionOpenedL ")); + + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_SESSIONOPENEDL_EXIT ); } /** @@ -630,7 +644,9 @@ */ void CMTPImageDataProvider::RenameObjectL(const TMTPNotificationParamsHandle& aParam) { - __FLOG_VA((_L16(">> RenameObjectL Handle: %u, Old name: %S"), aParam.iHandleId, &aParam.iFileName)); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_RENAMEOBJECTL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPIMAGEDATAPROVIDER_RENAMEOBJECTL, + "Handle: %u, Old name: %S", aParam.iHandleId, aParam.iFileName); if (!iRenameObject) { @@ -638,8 +654,8 @@ } iRenameObject->StartL(aParam.iHandleId, aParam.iFileName); - - __FLOG(_L8("<< RenameObjectL ")); + + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_RENAMEOBJECTL_EXIT ); } /** @@ -725,7 +741,7 @@ CleanupStack::PopAndDestroy(objMetadata); CleanupStack::PopAndDestroy(&handles); CleanupStack::PopAndDestroy(&context); - + return newPictures; } @@ -741,7 +757,9 @@ { HBufC* object = iDeleteObjectsArray[i]; TInt err = Framework().Fs().Delete(object->Des()); - __FLOG_2(_L8("delete left objects %d error code is %d \n"), i, err ); + OstTraceExt2( TRACE_NORMAL, CMTPIMAGEDATAPROVIDER_HANDLEDELETEOBJECTSARRAY, + "delete left objects %d error code is %d \n", i, err ); + if ( err == KErrNone ) { @@ -755,31 +773,34 @@ void CMTPImageDataProvider::IncreaseNewPictures(TInt aCount) { - __FLOG_VA((_L16(">> IncreaseNewPictures New Pictures: %d"), aCount)); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_INCREASENEWPICTURES_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDATAPROVIDER_INCREASENEWPICTURES, "New Pictures: %d", aCount ); iNewPicNotifier->IncreaseCount(aCount); - - __FLOG(_L8("<< IncreaseNewPictures ")); + + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_INCREASENEWPICTURES_EXIT ); } void CMTPImageDataProvider::DecreaseNewPictures(TInt aCount) { - __FLOG_VA((_L16(">> DecreaseNewPictures New Pictures: %d"), aCount)); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_DECREASENEWPICTURES_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDATAPROVIDER_DECREASENEWPICTURES, "New Pictures: %d", aCount ); iNewPicNotifier->DecreaseCount(aCount); - - __FLOG(_L8("<< DecreaseNewPictures ")); + + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_DECREASENEWPICTURES_EXIT ); } void CMTPImageDataProvider::ResetNewPictures() { - __FLOG(_L8(">> ResetNewPictures ")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_RESETNEWPICTURES_ENTRY ); iNewPicNotifier->SetNewPictures(0); TInt count = iNewPicHandles.Count(); if (!count) { + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_RESETNEWPICTURES_EXIT ); return; } @@ -793,13 +814,13 @@ iNewPicHandles.Reset(); CleanupStack::PopAndDestroy(objMetadata); - - __FLOG(_L8("<< ResetNewPictures ")); + + OstTraceFunctionExit0( DUP1_CMTPIMAGEDATAPROVIDER_RESETNEWPICTURES_EXIT ); } void CMTPImageDataProvider::HandleMdeSessionCompleteL(TInt aError) { - __FLOG(_L8(">> HandleMdeSessionComplete")); + OstTraceFunctionEntry0( CMTPIMAGEDATAPROVIDER_HANDLEMDESESSIONCOMPLETEL_ENTRY ); NotifyEnumerationCompleteL(KMTPStorageAll, KErrNone); if (aError == KErrNone) @@ -807,7 +828,7 @@ iMdeObserver = CMTPImageDpMdeObserver::NewL(Framework(), *this); iMdeObserver->SubscribeForChangeNotificationL(); } - - __FLOG(_L8("<< HandleMdeSessionComplete ")); + + OstTraceFunctionExit0( CMTPIMAGEDATAPROVIDER_HANDLEMDESESSIONCOMPLETEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpcopyobject.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpcopyobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpcopyobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -34,8 +34,11 @@ #include "mtpimagedppanic.h" #include "mtpimagedputilits.h" #include "cmtpimagedp.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpcopyobjectTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"CopyObject");) const TInt RollbackFuncCnt = 1; @@ -69,15 +72,13 @@ */ CMTPImageDpCopyObject::~CMTPImageDpCopyObject() { - __FLOG(_L8(">> CMTPImageDpCopyObject::~CMTPImageDpCopyObject")); + OstTraceFunctionEntry0( CMTPIMAGEDPCOPYOBJECT_CMTPIMAGEDPCOPYOBJECT_DES_ENTRY ); delete iDest; delete iFileMan; delete iSrcObjectInfo; delete iTargetObjectInfo; iRollbackActionL.Close(); - __FLOG(_L8("<< CMTPImageDpCopyObject::~CMTPImageDpCopyObject")); - __FLOG_CLOSE; - + OstTraceFunctionExit0( CMTPIMAGEDPCOPYOBJECT_CMTPIMAGEDPCOPYOBJECT_DES_EXIT ); } /** @@ -88,7 +89,6 @@ iFramework(aFramework), iDataProvider(aDataProvider) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } /** @@ -96,16 +96,16 @@ */ void CMTPImageDpCopyObject::ConstructL() { - __FLOG(_L8(">> CMTPImageDpCopyObject::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPCOPYOBJECT_CONSTRUCTL_ENTRY ); iFileMan = CFileMan::NewL(iFramework.Fs()); iSrcObjectInfo = CMTPObjectMetaData::NewL(); iRollbackActionL.ReserveL(RollbackFuncCnt); - __FLOG(_L8("<< CMTPImageDpCopyObject::ConstructL")); + OstTraceFunctionExit0( CMTPIMAGEDPCOPYOBJECT_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPImageDpCopyObject::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpCopyObject::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPCOPYOBJECT_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -118,8 +118,9 @@ responseCode = EMTPRespCodeInvalidParentObject; } - __FLOG_VA((_L8("CheckRequestL - Exit with responseCode = 0x%04X"), responseCode)); - __FLOG(_L8("<< CMTPImageDpCopyObject::CheckRequestL")); + OstTrace1( TRACE_FLOW, CMTPIMAGEDPCOPYOBJECT_CHECKREQUESTL, + "CheckRequestL - Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPIMAGEDPCOPYOBJECT_CHECKREQUESTL_EXIT ); return responseCode; } @@ -128,7 +129,7 @@ */ void CMTPImageDpCopyObject::ServiceL() { - __FLOG(_L8(">> CMTPImageDpCopyObject::ServiceL")); + OstTraceFunctionEntry0( CMTPIMAGEDPCOPYOBJECT_SERVICEL_ENTRY ); TUint32 handle = KMTPHandleNone; TMTPResponseCode responseCode = CopyObjectL(handle); if(responseCode == EMTPRespCodeOK) @@ -139,7 +140,7 @@ { SendResponseL(responseCode); } - __FLOG(_L8("<< CMTPImageDpCopyObject::ServiceL")); + OstTraceFunctionExit0( CMTPIMAGEDPCOPYOBJECT_SERVICEL_EXIT ); } /** @@ -148,7 +149,7 @@ */ TMTPResponseCode CMTPImageDpCopyObject::CopyObjectL(TUint32& aNewHandle) { - __FLOG(_L8(">> CMTPImageDpCopyObject::CopyObjectL")); + OstTraceFunctionEntry0( CMTPIMAGEDPCOPYOBJECT_COPYOBJECTL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; aNewHandle = KMTPHandleNone; @@ -173,7 +174,7 @@ { aNewHandle = CopyFileL(oldFileName, iNewFileName); } - __FLOG(_L8("<< CMTPImageDpCopyObject::CopyObjectL")); + OstTraceFunctionExit0( CMTPIMAGEDPCOPYOBJECT_COPYOBJECTL_EXIT ); return responseCode; } @@ -184,12 +185,15 @@ */ TUint32 CMTPImageDpCopyObject::CopyFileL(const TDesC& aOldFileName, const TDesC& aNewFileName) { - __FLOG(_L8(">> CMTPImageDpCopyObject::CopyFileL")); + OstTraceFunctionEntry0( CMTPIMAGEDPCOPYOBJECT_COPYFILEL_ENTRY ); TCleanupItem anItem(FailRecover, reinterpret_cast(this)); CleanupStack::PushL(anItem); GetPreviousPropertiesL(aOldFileName); - User::LeaveIfError(iFileMan->Copy(aOldFileName, *iDest)); + LEAVEIFERROR(iFileMan->Copy(aOldFileName, *iDest), + OstTraceExt3( TRACE_ERROR, CMTPIMAGEDPCOPYOBJECT_COPYFILEL, + "Copy %S to %S failed! error code %d", aOldFileName, *iDest, munged_err)); + iRollbackActionL.AppendL(RollBackFromFsL); SetPreviousPropertiesL(aNewFileName); @@ -201,8 +205,8 @@ iDataProvider.IncreaseNewPictures(1); } - __FLOG(_L8("<< CMTPImageDpCopyObject::CopyFileL")); CleanupStack::Pop(this); + OstTraceFunctionExit0( CMTPIMAGEDPCOPYOBJECT_COPYFILEL_EXIT ); return iTargetObjectInfo->Uint(CMTPObjectMetaData::EHandle); } @@ -211,7 +215,7 @@ */ void CMTPImageDpCopyObject::GetParametersL() { - __FLOG(_L8(">> CMTPImageDpCopyObject::GetParametersL")); + OstTraceFunctionEntry0( CMTPIMAGEDPCOPYOBJECT_GETPARAMETERSL_ENTRY ); __ASSERT_DEBUG(iRequestChecker, Panic(EMTPImageDpRequestCheckNull)); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); @@ -231,7 +235,7 @@ iDest = parentObjectInfo->DesC(CMTPObjectMetaData::ESuid).AllocL(); iNewParentHandle = parentObjectHandle; } - __FLOG(_L8("<< CMTPImageDpCopyObject::GetParametersL")); + OstTraceFunctionExit0( CMTPIMAGEDPCOPYOBJECT_GETPARAMETERSL_EXIT ); } /** @@ -239,9 +243,10 @@ */ void CMTPImageDpCopyObject::SetDefaultParentObjectL() { - __FLOG(_L8(">> CMTPImageDpCopyObject::SetDefaultParentObjectL")); + OstTraceFunctionEntry0( CMTPIMAGEDPCOPYOBJECT_SETDEFAULTPARENTOBJECTL_ENTRY ); TDriveNumber drive(static_cast(iFramework.StorageMgr().DriveNumber(iStorageId))); - User::LeaveIfError(drive); + LEAVEIFERROR(drive, + OstTraceExt2( TRACE_ERROR, CMTPIMAGEDPCOPYOBJECT_SETDEFAULTPARENTOBJECTL, "No driver number for %d! error code %d",iStorageId, munged_err)); TChar driveLetter; iFramework.Fs().DriveToChar(drive, driveLetter); TFileName driveBuf; @@ -251,7 +256,7 @@ iDest = NULL; iDest = driveBuf.AllocL(); iNewParentHandle = KMTPHandleNoParent; - __FLOG(_L8("<< CMTPImageDpCopyObject::SetDefaultParentObjectL")); + OstTraceFunctionExit0( CMTPIMAGEDPCOPYOBJECT_SETDEFAULTPARENTOBJECTL_EXIT ); } /** @@ -259,15 +264,21 @@ */ TMTPResponseCode CMTPImageDpCopyObject::CanCopyObjectL(const TDesC& aOldName, const TDesC& aNewName) const { - __FLOG(_L8(">> CMTPImageDpCopyObject::CanCopyObjectL")); + OstTraceFunctionEntry0( CMTPIMAGEDPCOPYOBJECT_CANCOPYOBJECTL_ENTRY ); TMTPResponseCode result = EMTPRespCodeOK; TEntry fileEntry; - User::LeaveIfError(iFramework.Fs().Entry(aOldName, fileEntry)); + LEAVEIFERROR(iFramework.Fs().Entry(aOldName, fileEntry), + OstTraceExt2( TRACE_ERROR, DUP1_CMTPIMAGEDPCOPYOBJECT_CANCOPYOBJECTL, + "Gets the entry details for %S failed! error code %d", aOldName, munged_err )); TDriveNumber drive(static_cast(iFramework.StorageMgr().DriveNumber(iStorageId))); - User::LeaveIfError(drive); + LEAVEIFERROR(drive, + OstTraceExt2( TRACE_ERROR, DUP2_CMTPIMAGEDPCOPYOBJECT_CANCOPYOBJECTL, + "Gets drive for storage %d failed! error code %d", iStorageId, munged_err )); TVolumeInfo volumeInfo; - User::LeaveIfError(iFramework.Fs().Volume(volumeInfo, drive)); + LEAVEIFERROR(iFramework.Fs().Volume(volumeInfo, drive), + OstTraceExt2( TRACE_ERROR, DUP3_CMTPIMAGEDPCOPYOBJECT_CANCOPYOBJECTL, + "Gets volume information for driver %d failed! error code %d", drive, munged_err )); if(volumeInfo.iFree < fileEntry.FileSize()) { @@ -277,8 +288,9 @@ { result = EMTPRespCodeInvalidParentObject; } - __FLOG_VA((_L8("CanCopyObjectL - Exit with response code 0x%04X"), result)); - __FLOG(_L8("<< CMTPImageDpCopyObject::CanCopyObjectL")); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPCOPYOBJECT_CANCOPYOBJECTL, + "CanCopyObjectL - Exit with response code 0x%04X", result ); + OstTraceFunctionExit0( CMTPIMAGEDPCOPYOBJECT_CANCOPYOBJECTL_EXIT ); return result; } @@ -287,9 +299,11 @@ */ void CMTPImageDpCopyObject::GetPreviousPropertiesL(const TDesC& aOldFileName) { - __FLOG(_L8("GetPreviousPropertiesL - Entry")); - User::LeaveIfError(iFramework.Fs().Modified(aOldFileName, iDateModified)); - __FLOG(_L8("GetPreviousPropertiesL - Exit")); + OstTraceFunctionEntry0( CMTPIMAGEDPCOPYOBJECT_GETPREVIOUSPROPERTIESL_ENTRY ); + LEAVEIFERROR(iFramework.Fs().Modified(aOldFileName, iDateModified), + OstTraceExt2( TRACE_ERROR, CMTPIMAGEDPCOPYOBJECT_GETPREVIOUSPROPERTIESL, + "Gets the last modification date and time failed for %S! error code %d", aOldFileName, munged_err )); + OstTraceFunctionExit0( CMTPIMAGEDPCOPYOBJECT_GETPREVIOUSPROPERTIESL_EXIT ); } /** @@ -297,9 +311,10 @@ */ void CMTPImageDpCopyObject::SetPreviousPropertiesL(const TDesC& aNewFileName) { - __FLOG(_L8("SetPreviousPropertiesL - Entry")); - User::LeaveIfError(iFramework.Fs().SetModified(aNewFileName, iDateModified)); - + OstTraceFunctionEntry0( CMTPIMAGEDPCOPYOBJECT_SETPREVIOUSPROPERTIESL_ENTRY ); + LEAVEIFERROR(iFramework.Fs().SetModified(aNewFileName, iDateModified), + OstTraceExt2( TRACE_ERROR, CMTPIMAGEDPCOPYOBJECT_SETPREVIOUSPROPERTIESL, + "Sets the date and time for %S failed. Error code %d", aNewFileName, munged_err)); iTargetObjectInfo = CMTPObjectMetaData::NewL(); iTargetObjectInfo->SetUint(CMTPObjectMetaData::EDataProviderId, iSrcObjectInfo->Uint(CMTPObjectMetaData::EDataProviderId)); iTargetObjectInfo->SetUint(CMTPObjectMetaData::EFormatCode, iSrcObjectInfo->Uint(CMTPObjectMetaData::EFormatCode)); @@ -309,7 +324,7 @@ iTargetObjectInfo->SetUint(CMTPObjectMetaData::EParentHandle, iNewParentHandle); iTargetObjectInfo->SetUint(CMTPObjectMetaData::EStorageId, iStorageId); iTargetObjectInfo->SetDesCL(CMTPObjectMetaData::ESuid, aNewFileName); - __FLOG(_L8("SetPreviousPropertiesL - Exit")); + OstTraceFunctionExit0( CMTPIMAGEDPCOPYOBJECT_SETPREVIOUSPROPERTIESL_EXIT ); } void CMTPImageDpCopyObject::FailRecover(TAny* aCopyOperation) @@ -329,7 +344,9 @@ void CMTPImageDpCopyObject::RollBackFromFsL() { - User::LeaveIfError(iFramework.Fs().Delete(iNewFileName)); + LEAVEIFERROR(iFramework.Fs().Delete(iNewFileName), + OstTraceExt2( TRACE_ERROR, CMTPIMAGEDPCOPYOBJECT_ROLLBACKFROMFSL, + "delete %S failed! error code %d", iNewFileName, munged_err)); } void CMTPImageDpCopyObject::RollBackFromFsL(CMTPImageDpCopyObject* aObject) diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpdeleteobject.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpdeleteobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpdeleteobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -30,8 +30,12 @@ #include "cmtpimagedpobjectpropertymgr.h" #include "mtpimagedputilits.h" #include "cmtpimagedp.h" -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"ImageDeleteObject");) +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpdeleteobjectTraces.h" +#endif + + /** Standard c++ constructor */ @@ -42,9 +46,8 @@ iDataProvider(aDataProvider), iResponseCode( EMTPRespCodeOK ) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8(">> CMTPImageDpDeleteObject")); - __FLOG(_L8("<< CMTPImageDpDeleteObject")); + OstTraceFunctionEntry0( CMTPIMAGEDPDELETEOBJECT_CMTPIMAGEDPDELETEOBJECT_CONS_ENTRY ); + OstTraceFunctionExit0( CMTPIMAGEDPDELETEOBJECT_CMTPIMAGEDPDELETEOBJECT_CONS_EXIT ); } /** @@ -67,21 +70,20 @@ void CMTPImageDpDeleteObject::ConstructL() { - __FLOG(_L8(">> CMTPImageDpDeleteObject::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPDELETEOBJECT_CONSTRUCTL_ENTRY ); iObjectMeta = CMTPObjectMetaData::NewL(); - __FLOG(_L8("<< CMTPImageDpDeleteObject::ConstructL")); + OstTraceFunctionExit0( CMTPIMAGEDPDELETEOBJECT_CONSTRUCTL_EXIT ); } /** Destructor */ CMTPImageDpDeleteObject::~CMTPImageDpDeleteObject() { - __FLOG(_L8("~CMTPImageDpDeleteObject - Entry")); + OstTraceFunctionEntry0( DUP1_CMTPIMAGEDPDELETEOBJECT_CMTPIMAGEDPDELETEOBJECT_DES_ENTRY ); Cancel(); delete iObjectMeta; iObjectsToDelete.Close(); - __FLOG(_L8("~CMTPImageDpDeleteObject - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( DUP1_CMTPIMAGEDPDELETEOBJECT_CMTPIMAGEDPDELETEOBJECT_DES_EXIT ); } /** @@ -91,14 +93,14 @@ TMTPResponseCode CMTPImageDpDeleteObject::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpDeleteObject::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPDELETEOBJECT_CHECKREQUESTL_ENTRY ); TMTPResponseCode result = EMTPRespCodeOK; TUint32 handle(Request().Uint32(TMTPTypeRequest::ERequestParameter1)); if ( handle != KMTPHandleAll ) { result = CheckStorageL( handle ); } - __FLOG(_L8("<< CMTPImageDpDeleteObject::CheckRequestL")); + OstTraceFunctionExit0( CMTPIMAGEDPDELETEOBJECT_CHECKREQUESTL_EXIT ); return result; } @@ -107,7 +109,7 @@ */ void CMTPImageDpDeleteObject::ServiceL() { - __FLOG(_L8(">> CMTPImageDpDeleteObject::ServiceL")); + OstTraceFunctionEntry0( CMTPIMAGEDPDELETEOBJECT_SERVICEL_ENTRY ); //begin to find object iObjectsToDelete.Reset(); @@ -120,7 +122,7 @@ if ( objectHandle == KMTPHandleAll ) { //add for test - __FLOG(_L8("delete all objects")); + OstTrace0( TRACE_FLOW, CMTPIMAGEDPDELETEOBJECT_SERVICEL, "delete all objects" ); GetObjectHandlesL( KMTPStorageAll, formatCode, KMTPHandleNone ); iObjectsNotDelete = iObjectsToDelete.Count(); StartL(); @@ -128,19 +130,19 @@ else { //add for test - __FLOG(_L8("delete only one object")); + OstTrace0( TRACE_FLOW, DUP1_CMTPIMAGEDPDELETEOBJECT_SERVICEL, "delete only one object" ); iObjectsNotDelete = 1; DeleteObjectL( objectHandle ); SendResponseL(); } - __FLOG(_L8("<< CMTPImageDpDeleteObject::ServiceL")); + OstTraceFunctionExit0( CMTPIMAGEDPDELETEOBJECT_SERVICEL_EXIT ); } void CMTPImageDpDeleteObject::RunL() { - __FLOG(_L8(">> CMTPImageDpDeleteObject::RunL")); + OstTraceFunctionEntry0( CMTPIMAGEDPDELETEOBJECT_RUNL_ENTRY ); TInt numObjectsToDelete = iObjectsToDelete.Count(); @@ -152,17 +154,17 @@ // Start the process again to read the next row... StartL(); - - __FLOG(_L8("<< CMTPImageDpDeleteObject::RunL")); + + OstTraceFunctionExit0( CMTPIMAGEDPDELETEOBJECT_RUNL_EXIT ); } void CMTPImageDpDeleteObject::DoCancel() { - __FLOG(_L8(">> CMTPImageDpDeleteObject::DoCancel")); + OstTraceFunctionEntry0( CMTPIMAGEDPDELETEOBJECT_DOCANCEL_ENTRY ); TRAP_IGNORE( SendResponseL()); - - __FLOG(_L8("<< CMTPImageDpDeleteObject::DoCancel")); + + OstTraceFunctionExit0( CMTPIMAGEDPDELETEOBJECT_DOCANCEL_EXIT ); } /** @@ -171,29 +173,33 @@ */ TMTPResponseCode CMTPImageDpDeleteObject::CheckStorageL(TUint32 aObjectHandle) { - __FLOG(_L8(">> CMTPImageDpDeleteObject::CheckStorageL")); + OstTraceFunctionEntry0( CMTPIMAGEDPDELETEOBJECT_CHECKSTORAGEL_ENTRY ); TMTPResponseCode result = MTPImageDpUtilits::VerifyObjectHandleL( iFramework, aObjectHandle, *iObjectMeta); if (EMTPRespCodeOK == result) { TDriveNumber drive= static_cast(iFramework.StorageMgr().DriveNumber( iObjectMeta->Uint(CMTPObjectMetaData::EStorageId))); - User::LeaveIfError(drive); + LEAVEIFERROR(drive, + OstTraceExt2( TRACE_ERROR, CMTPIMAGEDPDELETEOBJECT_CHECKSTORAGEL, + "No driver number for %d! error code %d",iObjectMeta->Uint(CMTPObjectMetaData::EStorageId), munged_err)); TVolumeInfo volumeInfo; - User::LeaveIfError(iFramework.Fs().Volume(volumeInfo, drive)); + LEAVEIFERROR(iFramework.Fs().Volume(volumeInfo, drive), + OstTraceExt2( TRACE_ERROR, DUP1_CMTPIMAGEDPDELETEOBJECT_CHECKSTORAGEL, + "Gets volume information for driver %d failed! error code %d", drive, munged_err )); if (volumeInfo.iDrive.iMediaAtt == KMediaAttWriteProtected) { result = EMTPRespCodeStoreReadOnly; } } - __FLOG(_L8("<< CMTPImageDpDeleteObject::CheckStorageL")); + OstTraceFunctionExit0( CMTPIMAGEDPDELETEOBJECT_CHECKSTORAGEL_EXIT ); return result; } void CMTPImageDpDeleteObject::GetObjectHandlesL( TUint32 aStorageId, TUint32 aFormatCode, TUint32 aParentHandle ) { - __FLOG(_L8(">> CMTPImageDpDeleteObject::GetObjectHandlesL")); - + OstTraceFunctionEntry0( CMTPIMAGEDPDELETEOBJECT_GETOBJECTHANDLESL_ENTRY ); + RMTPObjectMgrQueryContext context; RArray handles; TMTPObjectMgrQueryParams params( aStorageId, aFormatCode, aParentHandle, iFramework.DataProviderId()); @@ -212,13 +218,13 @@ CleanupStack::PopAndDestroy( &handles ); // - handles CleanupStack::PopAndDestroy( &context ); // - context - - __FLOG(_L8("<< CMTPImageDpDeleteObject::GetObjectHandlesL")); + + OstTraceFunctionExit0( CMTPIMAGEDPDELETEOBJECT_GETOBJECTHANDLESL_EXIT ); } void CMTPImageDpDeleteObject::DeleteObjectL( TUint32 aHandle ) { - __FLOG(_L8(">> CMTPImageDpDeleteObject::DeleteObjectL")); + OstTraceFunctionEntry0( CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL_ENTRY ); iFramework.ObjectMgr().ObjectL( aHandle, *iObjectMeta); iDataProvider.PropertyMgr().SetCurrentObjectL(*iObjectMeta, EFalse); @@ -227,14 +233,14 @@ if(EMTPProtectionNoProtection == protectionStatus) { TInt err = iFramework.Fs().Delete(iObjectMeta->DesC(CMTPObjectMetaData::ESuid)); - __FLOG_1(_L8("delete file error is %d"), err ); + OstTrace1( TRACE_FLOW, CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL, "delete file error is %d", err ); switch ( err ) { case KErrInUse: //coverity[fallthrough] case KErrAccessDenied: //add for test - __FLOG_1(_L8("err:%d"), err); + OstTrace1( TRACE_FLOW, DUP1_CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL, "err:%d", err ); //add Suid to deleteobjectlist iDataProvider.AppendDeleteObjectsArrayL(iObjectMeta->DesC(CMTPObjectMetaData::ESuid)); //coverity[unterminated_case] @@ -242,8 +248,8 @@ //if the file does not exist on device, remove it from objectstore //coverity[fallthrough] case KErrNone: - //add for test - __FLOG(_L8("KErrNone")); + //add for test + OstTrace0( TRACE_NORMAL, DUP2_CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL, "KErrNone" ); //if the image object is new, we should update new picture count if (MTPImageDpUtilits::IsNewPicture(*iObjectMeta)) { @@ -255,8 +261,10 @@ break; default: //add for test - __FLOG(_L8("default")); - User::LeaveIfError( err ); + OstTrace0( TRACE_NORMAL, DUP3_CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL, "default" ); + LEAVEIFERROR( err, + OstTraceExt2( TRACE_ERROR, DUP4_CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL, + "delete %S failed! error code %d", iObjectMeta->DesC(CMTPObjectMetaData::ESuid), munged_err)); break; } } @@ -264,19 +272,20 @@ { iResponseCode = EMTPRespCodeObjectWriteProtected; } - __FLOG(_L8("<< CMTPImageDpDeleteObject::DeleteObjectL")); + OstTraceFunctionExit0( CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL_EXIT ); } void CMTPImageDpDeleteObject::StartL() { - __FLOG(_L8(">> CMTPImageDpDeleteObject::StartL")); + OstTraceFunctionEntry0( CMTPIMAGEDPDELETEOBJECT_STARTL_ENTRY ); if(iCancelled) { - __FLOG(_L8("Cancell the delete")); + OstTrace0( TRACE_NORMAL, CMTPIMAGEDPDELETEOBJECT_STARTL, "Cancell the delete" ); CMTPRequestProcessor::SendResponseL(EMTPRespCodeTransactionCancelled); iObjectsToDelete.Reset(); iCancelled = EFalse; + OstTraceFunctionExit0( CMTPIMAGEDPDELETEOBJECT_STARTL_EXIT ); return; } @@ -293,19 +302,19 @@ { SendResponseL(); } - __FLOG(_L8("<< CMTPImageDpDeleteObject::StartL")); + OstTraceFunctionExit0( DUP1_CMTPIMAGEDPDELETEOBJECT_STARTL_EXIT ); } void CMTPImageDpDeleteObject::SendResponseL() { - __FLOG(_L8(">> CMTPImageDpDeleteObject::SendResponseL")); + OstTraceFunctionEntry0( CMTPIMAGEDPDELETEOBJECT_SENDRESPONSEL_ENTRY ); if ( iResponseCode == EMTPRespCodePartialDeletion && iObjectsNotDelete == 0 ) { iResponseCode = EMTPRespCodeOK; } CMTPRequestProcessor::SendResponseL( iResponseCode ); - - __FLOG(_L8("<< CMTPImageDpDeleteObject::SendResponseL")); + + OstTraceFunctionExit0( CMTPIMAGEDPDELETEOBJECT_SENDRESPONSEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobject.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -34,9 +34,11 @@ #include "cmtpimagedp.h" #include "mtpimagedpconst.h" #include "mtpimagedputilits.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpgetobjectTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"ImageDpGetObject");) /** Verification data for the GetNumObjects request @@ -67,10 +69,9 @@ */ CMTPImageDpGetObject::~CMTPImageDpGetObject() { - __FLOG(_L8(">> ~CMTPImageDpGetObject")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECT_CMTPIMAGEDPGETOBJECT_ENTRY ); delete iFileObject; - __FLOG(_L8("<< ~CMTPImageDpGetObject")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECT_CMTPIMAGEDPGETOBJECT_EXIT ); } /** @@ -89,13 +90,12 @@ */ void CMTPImageDpGetObject::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8(">> CMTPImageDpGetObject::ConstructL")); - __FLOG(_L8("<< CMTPImageDpGetObject::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECT_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECT_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPImageDpGetObject::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpGetObject::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECT_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); TUint32 handle(Request().Uint32(TMTPTypeRequest::ERequestParameter1)); @@ -106,7 +106,7 @@ iFramework, handle, *ObjectMeta); delete ObjectMeta; } - __FLOG(_L8("<< CMTPImageDpGetObject::CheckRequestL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECT_CHECKREQUESTL_EXIT ); return responseCode; } /** @@ -114,7 +114,7 @@ */ void CMTPImageDpGetObject::ServiceL() { - __FLOG(_L8(">> CMTPImageDpGetObject::ServiceL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECT_SERVICEL_ENTRY ); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); //does not take ownership @@ -123,7 +123,7 @@ BuildFileObjectL(objectInfo->DesC(CMTPObjectMetaData::ESuid)); SendDataL(*iFileObject); - __FLOG(_L8("<< CMTPImageDpGetObject::ServiceL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECT_SERVICEL_EXIT ); } @@ -133,16 +133,16 @@ */ void CMTPImageDpGetObject::BuildFileObjectL(const TDesC& aFileName) { - __FLOG(_L8(">> CMTPImageDpGetObject::BuildFileObjectL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECT_BUILDFILEOBJECTL_ENTRY ); delete iFileObject; iFileObject = NULL; iFileObject = CMTPTypeFile::NewL(iFramework.Fs(), aFileName, EFileShareReadersOnly); - __FLOG(_L8("<< CMTPImageDpGetObject::BuildFileObjectL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECT_BUILDFILEOBJECTL_EXIT ); } TBool CMTPImageDpGetObject::DoHandleCompletingPhaseL() { - __FLOG(_L8(" CMTPImageDpGetObject::DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECT_DOHANDLECOMPLETINGPHASEL_ENTRY ); /** * end-user does not cancel the operation, we think the getobject operation is successful. @@ -158,7 +158,6 @@ iDataProvider.ResetNewPictures(); } } - - __FLOG(_L8("CMTPImageDpGetObject::DoHandleResponsePhaseL - Exit")); + return CMTPRequestProcessor::DoHandleCompletingPhaseL(); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectinfo.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -32,8 +32,11 @@ #include "mtpimagedppanic.h" #include "cmtpimagedp.h" #include "mtpimagedputilits.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpgetobjectinfoTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"CMTPImageDpGetObjectInfo");) /** Two-phase construction method @@ -56,11 +59,10 @@ */ CMTPImageDpGetObjectInfo::~CMTPImageDpGetObjectInfo() { - __FLOG(_L8(">> ~CMTPImageDpGetObjectInfo")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTINFO_CMTPIMAGEDPGETOBJECTINFO_DES_ENTRY ); delete iObjectInfoToBuild; delete iObjectMeta; - __FLOG(_L8("<< ~CMTPImageDpGetObjectInfo")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTINFO_CMTPIMAGEDPGETOBJECTINFO_DES_EXIT ); } /** @@ -71,15 +73,13 @@ CMTPRequestProcessor(aFramework, aConnection, 0, NULL), iObjectPropertyMgr(aDataProvider.PropertyMgr()) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPImageDpGetObjectInfo::CMTPImageDpGetObjectInfo")); } TMTPResponseCode CMTPImageDpGetObjectInfo::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpGetObject::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTINFO_CHECKREQUESTL_ENTRY ); TMTPResponseCode result = MTPImageDpUtilits::VerifyObjectHandleL(iFramework, Request().Uint32(TMTPTypeRequest::ERequestParameter1), *iObjectMeta); - __FLOG(_L8("<< CMTPImageDpGetObject::CheckRequestL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTINFO_CHECKREQUESTL_EXIT ); return result; } @@ -88,10 +88,10 @@ */ void CMTPImageDpGetObjectInfo::ServiceL() { - __FLOG(_L8(">> CMTPImageDpGetObjectInfo::ServiceL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTINFO_SERVICEL_ENTRY ); BuildObjectInfoL(); SendDataL(*iObjectInfoToBuild); - __FLOG(_L8("<< CMTPImageDpGetObjectInfo::ServiceL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTINFO_SERVICEL_EXIT ); } /** @@ -99,10 +99,10 @@ */ void CMTPImageDpGetObjectInfo::ConstructL() { - __FLOG(_L8(">> CMTPImageDpGetObjectInfo::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTINFO_CONSTRUCTL_ENTRY ); iObjectInfoToBuild = CMTPTypeObjectInfo::NewL(); iObjectMeta = CMTPObjectMetaData::NewL(); - __FLOG(_L8("<< CMTPImageDpGetObjectInfo::ConstructL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTINFO_CONSTRUCTL_EXIT ); } /** @@ -110,7 +110,7 @@ */ void CMTPImageDpGetObjectInfo::BuildObjectInfoL() { - __FLOG(_L8(">> CMTPImageDpGetObjectInfo::BuildObjectInfoL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTINFO_BUILDOBJECTINFOL_ENTRY ); iObjectPropertyMgr.SetCurrentObjectL(*iObjectMeta, EFalse); //1. storage id @@ -182,7 +182,7 @@ //18. keyword SetKeywordL(); - __FLOG(_L8("<< CMTPImageDpGetObjectInfo::BuildObjectInfoL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTINFO_BUILDOBJECTINFOL_EXIT ); } /** Set the file name of the current object in the data set @@ -190,13 +190,13 @@ */ void CMTPImageDpGetObjectInfo::SetFileNameL() { + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTINFO_SETFILENAMEL_ENTRY ); //use the name without full path specification - __FLOG(_L8(">> CMTPImageDpGetObjectInfo::SetFileNameL")); CMTPTypeString* fileName = CMTPTypeString::NewLC(); iObjectPropertyMgr.GetPropertyL(EMTPObjectPropCodeObjectFileName, *fileName); iObjectInfoToBuild->SetStringL(CMTPTypeObjectInfo::EFilename, fileName->StringChars()); CleanupStack::PopAndDestroy(fileName); - __FLOG(_L8("<< CMTPImageDpGetObjectInfo::SetFileNameL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTINFO_SETFILENAMEL_EXIT ); } /** @@ -205,8 +205,8 @@ */ void CMTPImageDpGetObjectInfo::SetFileSizeDateL() { + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTINFO_SETFILESIZEDATEL_ENTRY ); //file size - __FLOG(_L8(">> CMTPImageDpGetObjectInfo::SetFileSizeDateL")); TUint64 fileSize; iObjectPropertyMgr.GetPropertyL(EMTPObjectPropCodeObjectSize, fileSize); TUint32 shortFileSize = (fileSize > KMaxTUint32) ? KMaxTUint32 : static_cast(fileSize); @@ -222,7 +222,7 @@ iObjectInfoToBuild->SetStringL(CMTPTypeObjectInfo::EDateCreated, createdString->StringChars()); CleanupStack::PopAndDestroy(2); // createdString, dateString - __FLOG(_L8("<< CMTPImageDpGetObjectInfo::SetFileSizeDateL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTINFO_SETFILESIZEDATEL_EXIT ); } /** @@ -231,8 +231,8 @@ */ void CMTPImageDpGetObjectInfo::SetKeywordL() { + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTINFO_SETKEYWORDL_ENTRY ); //empty keyword - __FLOG(_L8(">> CMTPImageDpGetObjectInfo::SetKeywordL")); iObjectInfoToBuild->SetStringL(CMTPTypeObjectInfo::EKeywords, KNullDesC); - __FLOG(_L8("<< CMTPImageDpGetObjectInfo::SetKeywordL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTINFO_SETKEYWORDL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectpropdesc.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectpropdesc.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectpropdesc.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -31,8 +31,11 @@ #include "mtpimagedpconst.h" #include "mtpimagedppanic.h" #include "cmtpimagedp.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpgetobjectpropdescTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"GetObjectPropDesc");) _LIT(KMtpObjDescObjFileName, "[a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~][a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~ ]{0, 7}\\.[[a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~][a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~ ]{0, 2}]?"); @@ -60,11 +63,9 @@ */ CMTPImageDpGetObjectPropDesc::~CMTPImageDpGetObjectPropDesc() { - __FLOG(_L8(">> ~CMTPImageDpGetObjectPropDesc")); - __FLOG(_L8(">> CMTPImageDpCopyObject::~CMTPImageDpCopyObject")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPDESC_CMTPIMAGEDPGETOBJECTPROPDESC_DES_ENTRY ); delete iObjectProperty; - __FLOG(_L8("<< ~CMTPImageDpGetObjectPropDesc")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPDESC_CMTPIMAGEDPGETOBJECTPROPDESC_DES_EXIT ); } /** @@ -75,7 +76,6 @@ MMTPConnection& aConnection) :CMTPRequestProcessor(aFramework, aConnection, 0, NULL) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } /** @@ -83,7 +83,7 @@ */ TMTPResponseCode CMTPImageDpGetObjectPropDesc::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpGetObjectPropDesc::CheckRequestL")); + OstTraceFunctionEntry0( DUP1_CMTPIMAGEDPGETOBJECTPROPDESC_CHECKREQUESTL_ENTRY ); TMTPResponseCode response = CMTPRequestProcessor::CheckRequestL(); TUint32 propCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1); TUint32 formatCode = Request().Uint32(TMTPTypeRequest::ERequestParameter2); @@ -102,7 +102,7 @@ response = EMTPRespCodeInvalidObjectPropCode; } - __FLOG(_L8("<< CMTPImageDpGetObjectPropDesc::CheckRequestL")); + OstTraceFunctionExit0( DUP1_CMTPIMAGEDPGETOBJECTPROPDESC_CHECKREQUESTL_EXIT ); return response; } @@ -112,11 +112,13 @@ */ void CMTPImageDpGetObjectPropDesc::ServiceL() { + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPDESC_SERVICEL_ENTRY ); delete iObjectProperty; iObjectProperty = NULL; - TUint32 propCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1); - __FLOG_VA((_L8(">> CMTPImageDpGetObjectPropDesc::ServiceL propcode %d"), propCode)); + TUint32 propCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPGETOBJECTPROPDESC_SERVICEL, "propcode %d", propCode ); + switch(propCode) { case EMTPObjectPropCodeStorageID: @@ -175,10 +177,14 @@ break; case EMTPObjectPropCodeNonConsumable: ServiceNonConsumableL(); - break; + break; + case EMTPObjectPropCodeHidden: + ServiceHiddenL(); + break; default: { //Leave + OstTrace1( TRACE_ERROR, DUP1_CMTPIMAGEDPGETOBJECTPROPDESC_SERVICEL, "Invalid property code %d", propCode ); User::Leave(KErrGeneral); } break; @@ -189,7 +195,7 @@ iObjectProperty->SetUint32L(CMTPTypeObjectPropDesc::EGroupCode, GetPropertyGroupNumber(propCode)); SendDataL(*iObjectProperty); - __FLOG(_L8("<< CMTPImageDpGetObjectPropDesc::ServiceL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPDESC_SERVICEL_EXIT ); } @@ -434,6 +440,21 @@ iObjectProperty = CMTPTypeObjectPropDesc::NewL(EMTPObjectPropCodeNonConsumable, *expectedForm); CleanupStack::PopAndDestroy(expectedForm); } + +void CMTPImageDpGetObjectPropDesc::ServiceHiddenL() + { + CMTPTypeObjectPropDescEnumerationForm* expectedForm = CMTPTypeObjectPropDescEnumerationForm::NewL(EMTPTypeUINT16); + CleanupStack::PushL(expectedForm); + TUint16 values[] = {EMTPVisible,EMTPHidden}; + TUint numValues((sizeof(values) / sizeof(values[0]))); + for (TUint i = 0; i < numValues; i++) + { + TMTPTypeUint16 data(values[i]); + expectedForm->AppendSupportedValueL(data); + } + iObjectProperty = CMTPTypeObjectPropDesc::NewL(EMTPObjectPropCodeHidden, *expectedForm); + CleanupStack::PopAndDestroy(expectedForm); + } TUint16 CMTPImageDpGetObjectPropDesc::GetPropertyGroupNumber(const TUint16 aPropCode) const { diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectproplist.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectproplist.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectproplist.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -35,8 +35,10 @@ #include "mtpimagedppanic.h" #include "cmtpimagedp.h" #include "mtpimagedputilits.h" - -__FLOG_STMT(_LIT8(KComponent,"ImageDpGetObjectPropList");) +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpgetobjectproplistTraces.h" +#endif MMTPRequestProcessor* CMTPImageDpGetObjectPropList::NewL(MMTPDataProviderFramework& aFramework, @@ -56,7 +58,6 @@ CMTPRequestProcessor(aFramework, aConnection, 0,NULL), iPropertyMgr(aDataProvider.PropertyMgr()) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } /* @@ -64,12 +65,12 @@ */ void CMTPImageDpGetObjectPropList::ConstructL() { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_CONSTRUCTL_ENTRY ); iPropertyList = CMTPTypeObjectPropList::NewL(); iObjectMeta = CMTPObjectMetaData::NewL(); - - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::ConstructL")); + + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_CONSTRUCTL_EXIT ); } /* @@ -77,13 +78,13 @@ */ CMTPImageDpGetObjectPropList::~CMTPImageDpGetObjectPropList() { - __FLOG(_L8("~CMTPImageDpGetObjectPropList")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_CMTPIMAGEDPGETOBJECTPROPLIST_DES_ENTRY ); Cancel(); iHandles.Close(); delete iPropertyList; delete iObjectMeta; - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_CMTPIMAGEDPGETOBJECTPROPLIST_DES_EXIT ); } /* @@ -91,7 +92,7 @@ */ void CMTPImageDpGetObjectPropList::ServiceL() { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::ServiceL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEL_ENTRY ); //get all the handles GetObjectHandlesL(); @@ -103,8 +104,8 @@ } StartL(); - - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::ServiceL")); + + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEL_EXIT ); } /* @@ -112,7 +113,7 @@ */ TMTPResponseCode CMTPImageDpGetObjectPropList::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_CHECKREQUESTL_ENTRY ); TMTPResponseCode result = EMTPRespCodeOK; TUint32 handle(Request().Uint32(TMTPTypeRequest::ERequestParameter1)); @@ -133,14 +134,16 @@ { result = CheckDepth(); } + + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPGETOBJECTPROPLIST_CHECKREQUESTL, "result: %d", result ); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_CHECKREQUESTL_EXIT ); - __FLOG_VA((_L8("<< CMTPImageDpGetObjectPropList::CheckRequestL result: %d"), result)); return result; } TMTPResponseCode CMTPImageDpGetObjectPropList::CheckPropCode() const { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::CheckPropCode")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_CHECKPROPCODE_ENTRY ); TMTPResponseCode response = EMTPRespCodeOK; TUint32 propCode = Request().Uint32(TMTPTypeRequest::ERequestParameter3); @@ -164,13 +167,13 @@ response = EMTPRespCodeInvalidObjectPropCode; } } - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::CheckPropCode")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_CHECKPROPCODE_EXIT ); return response; } TMTPResponseCode CMTPImageDpGetObjectPropList::CheckDepth() const { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::CheckDepth")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_CHECKDEPTH_ENTRY ); TMTPResponseCode response = EMTPRespCodeSpecificationByDepthUnsupported; @@ -183,13 +186,13 @@ response = EMTPRespCodeOK; } - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::CheckDepth")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_CHECKDEPTH_EXIT ); return response; } void CMTPImageDpGetObjectPropList::GetObjectHandlesL() { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::GetObjectHandlesL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_GETOBJECTHANDLESL_ENTRY ); TUint32 handle(Request().Uint32(TMTPTypeRequest::ERequestParameter1)); TUint32 formatCode(Request().Uint32(TMTPTypeRequest::ERequestParameter2)); @@ -210,12 +213,12 @@ iHandles.AppendL( handle ); } - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::GetObjectHandlesL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_GETOBJECTHANDLESL_EXIT ); } void CMTPImageDpGetObjectPropList::GetObjectHandlesL(TUint32 aStorageId, TUint32 aFormatCode, TUint32 aParentHandle) { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::GetObjectHandlesL")); + OstTraceFunctionEntry0( DUP1_CMTPIMAGEDPGETOBJECTPROPLIST_GETOBJECTHANDLESL_ENTRY ); RMTPObjectMgrQueryContext context; RArray handles; @@ -237,13 +240,13 @@ CleanupStack::PopAndDestroy(&handles); CleanupStack::PopAndDestroy(&context); - - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::GetObjectHandlesL")); + + OstTraceFunctionExit0( DUP1_CMTPIMAGEDPGETOBJECTPROPLIST_GETOBJECTHANDLESL_EXIT ); } void CMTPImageDpGetObjectPropList::GetRootObjectHandlesL(TUint32 aFormatCode, TUint32 aDepth) { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::GetRootObjectHandlesL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_GETROOTOBJECTHANDLESL_ENTRY ); if (aDepth == KMaxTUint) { @@ -251,20 +254,20 @@ } else if (aDepth == 0) { - __FLOG(_L8("depth is 0, iHandles is an empty array")); + OstTrace0( TRACE_NORMAL, CMTPIMAGEDPGETOBJECTPROPLIST_GETROOTOBJECTHANDLESL, "depth is 0, iHandles is an empty array" ); iHandles.Reset(); } else { GetObjectHandlesL(KMTPStorageAll, aFormatCode, KMTPHandleNoParent); } - - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::GetRootObjectHandlesL")); + + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_GETROOTOBJECTHANDLESL_EXIT ); } void CMTPImageDpGetObjectPropList::ServicePropertiesL( TUint32 aHandle ) { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::ServicePropertiesL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEPROPERTIESL_ENTRY ); TUint32 propCode = Request().Uint32(TMTPTypeRequest::ERequestParameter3); TUint32 groupCode = Request().Uint32(TMTPTypeRequest::ERequestParameter4); @@ -284,12 +287,12 @@ { ServiceOneObjectPropertyL(aHandle, propCode); } - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::ServicePropertiesL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEPROPERTIESL_EXIT ); } void CMTPImageDpGetObjectPropList::ServiceAllPropertiesL(TUint32 aHandle) { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::ServiceAllPropertiesL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEALLPROPERTIESL_ENTRY ); if (iFramework.ObjectMgr().ObjectOwnerId(aHandle) == iFramework.DataProviderId()) { @@ -298,12 +301,12 @@ ServiceOneObjectPropertyL(aHandle, KMTPImageDpSupportedProperties[i]); } } - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::ServiceAllPropertiesL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEALLPROPERTIESL_EXIT ); } void CMTPImageDpGetObjectPropList::ServiceGroupPropertiesL(TUint32 aHandle,TUint16 /*aGroupCode*/) { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::ServiceGroupPropertiesL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEGROUPPROPERTIESL_ENTRY ); TUint32 groupCode = Request().Uint32(TMTPTypeRequest::ERequestParameter4); if (KMTPImageDpPropertyGroupOneNumber == groupCode) //only return data for group one { @@ -319,12 +322,12 @@ } } } - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::ServiceGroupPropertiesL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEGROUPPROPERTIESL_EXIT ); } void CMTPImageDpGetObjectPropList::ServiceOneObjectPropertyL(TUint32 aHandle, TUint32 aPropCode) { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::ServiceOneObjectPropertyL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEONEOBJECTPROPERTYL_ENTRY ); if (iFramework.ObjectMgr().ObjectOwnerId(aHandle) == iFramework.DataProviderId()) { @@ -424,27 +427,45 @@ propElem.SetUint8L(CMTPTypeObjectPropListElement::EValue, value); iPropertyList->CommitPropElemL(propElem); } - break; + break; + case EMTPObjectPropCodeHidden: + { + TEntry FileEntry; + User::LeaveIfError(iFramework.Fs().Entry(iObjectMeta->DesC(CMTPObjectMetaData::ESuid), FileEntry)); + CMTPTypeObjectPropListElement& propElem = iPropertyList->ReservePropElemL(aHandle, aPropCode); + TBool isHidden = FileEntry.IsHidden(); + if ( isHidden ) + { + propElem.SetUint16L(CMTPTypeObjectPropListElement::EValue,EMTPHidden ); + } + else + { + propElem.SetUint16L(CMTPTypeObjectPropListElement::EValue,EMTPVisible ); + } + iPropertyList->CommitPropElemL(propElem); + } + break; default: //Leave { + OstTrace1( TRACE_ERROR, CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEONEOBJECTPROPERTYL, "Invalid property code %d", aPropCode ); User::Leave(KErrGeneral); } break; } } - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::ServiceOneObjectPropertyL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEONEOBJECTPROPERTYL_EXIT ); } void CMTPImageDpGetObjectPropList::DoCancel() { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::DoCancel")); - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::DoCancel")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_DOCANCEL_ENTRY ); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_DOCANCEL_EXIT ); } void CMTPImageDpGetObjectPropList::RunL() { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::RunL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_RUNL_ENTRY ); if ( iHandles.Count() > 0 ) { @@ -452,22 +473,22 @@ iHandles.Remove( 0 ); } StartL(); - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::RunL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_RUNL_EXIT ); } TInt CMTPImageDpGetObjectPropList::RunError( TInt aError ) { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::RunError")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_RUNERROR_ENTRY ); TRAP_IGNORE( SendResponseL( EMTPRespCodeGeneralError ) ); - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::RunError")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_RUNERROR_EXIT ); return aError; } void CMTPImageDpGetObjectPropList::StartL() { - __FLOG(_L8(">> CMTPImageDpGetObjectPropList::StartL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTPROPLIST_STARTL_ENTRY ); if ( iHandles.Count() > 0 ) { @@ -479,6 +500,6 @@ { SendDataL(*iPropertyList); } - - __FLOG(_L8("<< CMTPImageDpGetObjectPropList::StartL")); + + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTPROPLIST_STARTL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectpropssupported.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectpropssupported.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectpropssupported.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -30,8 +30,6 @@ #include "mtpimagedpconst.h" #include "cmtpimagedp.h" -__FLOG_STMT(_LIT8(KComponent,"GetObjectPropsSupported");) - /** Verification data for the GetObjectPropSupported request */ @@ -64,7 +62,6 @@ CMTPImageDpGetObjectPropsSupported::~CMTPImageDpGetObjectPropsSupported() { delete iObjectPropsSupported; - __FLOG_CLOSE; } /** @@ -75,7 +72,6 @@ MMTPConnection& aConnection) :CMTPRequestProcessor(aFramework, aConnection, sizeof(KMTPGetObjectPropSupportedPolicy)/sizeof(TMTPRequestElementInfo), KMTPGetObjectPropSupportedPolicy) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } /** diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectpropvalue.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectpropvalue.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectpropvalue.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -37,9 +37,12 @@ #include "mtpimagedppanic.h" #include "cmtpimagedp.h" #include "mtpimagedputilits.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpgetobjectpropvalueTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"GetObjectPropValue");) /** Two-phase construction method @@ -67,7 +70,6 @@ delete iMTPTypeString; delete iMTPTypeArray; delete iObjectMeta; - __FLOG_CLOSE; } /** @@ -79,7 +81,6 @@ :CMTPRequestProcessor(aFramework, aConnection,0, NULL), iObjectPropertyMgr(aDataProvider.PropertyMgr()) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } /** @@ -189,8 +190,12 @@ break; case EMTPObjectPropCodeNonConsumable: ServiceNonConsumableL(); - break; + break; + case EMTPObjectPropCodeHidden: + ServiceHiddenL(); + break; default: + OstTrace1( TRACE_ERROR, CMTPIMAGEDPGETOBJECTPROPVALUE_SERVICEL, "Invalid property code %d", propCode); User::Leave(KErrGeneral); } } @@ -353,3 +358,11 @@ iMTPTypeUint8.Set(nonConsumable); SendDataL(iMTPTypeUint8); } + +void CMTPImageDpGetObjectPropValue::ServiceHiddenL() + { + TUint16 hiddenStatus; + iObjectPropertyMgr.GetPropertyL(EMTPObjectPropCodeHidden, hiddenStatus); + iMTPTypeUint16.Set(hiddenStatus); + SendDataL(iMTPTypeUint16); + } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectreferences.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectreferences.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetobjectreferences.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,8 +22,11 @@ #include "cmtpimagedpgetobjectreferences.h" #include "mtpimagedputilits.h" #include "cmtpimagedp.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpgetobjectreferencesTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"GetObjectReferences");) /** Two-phase construction method @@ -46,10 +49,9 @@ */ CMTPImageDpGetObjectReferences::~CMTPImageDpGetObjectReferences() { - __FLOG(_L8(">> CMTPImageDpGetObjectReferences::~CMTPImageDpGetObjectReferences")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTREFERENCES_CMTPIMAGEDPGETOBJECTREFERENCES_ENTRY ); delete iReferences; - __FLOG(_L8("<< CMTPImageDpGetObjectReferences::~CMTPImageDpGetObjectReferences")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTREFERENCES_CMTPIMAGEDPGETOBJECTREFERENCES_EXIT ); } /** @@ -65,22 +67,21 @@ */ void CMTPImageDpGetObjectReferences::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8(">> CMTPImageDpGetObjectReferences::ConstructL")); - __FLOG(_L8("<< CMTPImageDpGetObjectReferences::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTREFERENCES_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTREFERENCES_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPImageDpGetObjectReferences::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpGetObjectReferences::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTREFERENCES_CHECKREQUESTL_ENTRY ); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); CMTPObjectMetaData* objectInfo = CMTPObjectMetaData::NewLC(); TMTPResponseCode responseCode = MTPImageDpUtilits::VerifyObjectHandleL(iFramework, objectHandle, *objectInfo); CleanupStack::PopAndDestroy(objectInfo); - - __FLOG_VA((_L8("CheckRequestL - Exit with responseCode = 0x%04X"), responseCode)); - __FLOG(_L8("<< CMTPImageDpGetObjectReferences::CheckRequestL")); + + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPGETOBJECTREFERENCES_CHECKREQUESTL, "CheckRequestL - Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTREFERENCES_CHECKREQUESTL_EXIT ); return responseCode; } @@ -89,7 +90,7 @@ */ void CMTPImageDpGetObjectReferences::ServiceL() { - __FLOG(_L8(">> CMTPImageDpCopyObject::ServiceL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETOBJECTREFERENCES_SERVICEL_ENTRY ); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); MMTPReferenceMgr& referenceMgr = iFramework.ReferenceMgr(); @@ -98,7 +99,7 @@ iReferences = referenceMgr.ReferencesLC(TMTPTypeUint32(objectHandle)); CleanupStack::Pop(iReferences); SendDataL(*iReferences); - __FLOG(_L8("<< CMTPImageDpCopyObject::ServiceL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETOBJECTREFERENCES_SERVICEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpgetpartialobject.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetpartialobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetpartialobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -33,8 +33,12 @@ #include "cmtpimagedp.h" #include "mtpimagedputilits.h" #include "cmtpimagedpobjectpropertymgr.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpgetpartialobjectTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"ImageDpGetPartialObject");) + /** Verification data for the GetPartialObject request */ @@ -59,11 +63,10 @@ */ CMTPImageDpGetPartialObject::~CMTPImageDpGetPartialObject() { - __FLOG(_L8(">> CMTPImageDpGetPartialObject::~CMTPImageDpGetPartialObject")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETPARTIALOBJECT_CMTPIMAGEDPGETPARTIALOBJECT_ENTRY ); delete iFileObject; delete iObjectMeta; - __FLOG(_L8("<< CMTPImageDpGetPartialObject::~CMTPImageDpGetPartialObject")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPGETPARTIALOBJECT_CMTPIMAGEDPGETPARTIALOBJECT_EXIT ); } /** @@ -82,10 +85,9 @@ */ void CMTPImageDpGetPartialObject::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8(">> CMTPImageDpGetPartialObject::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETPARTIALOBJECT_CONSTRUCTL_ENTRY ); iObjectMeta = CMTPObjectMetaData::NewL(); - __FLOG(_L8("<< CMTPImageDpGetPartialObject::ConstructL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETPARTIALOBJECT_CONSTRUCTL_EXIT ); } /** @@ -94,7 +96,7 @@ */ TMTPResponseCode CMTPImageDpGetPartialObject::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpGetPartialObject::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETPARTIALOBJECT_CHECKREQUESTL_ENTRY ); TMTPResponseCode result = CMTPRequestProcessor::CheckRequestL(); if(result == EMTPRespCodeOK) { @@ -104,8 +106,8 @@ { result = EMTPRespCodeInvalidParameter; } - __FLOG_VA((_L8("<< CMTPImageDpGetPartialObject::CheckRequestL 0x%x"), result)); - __FLOG(_L8("<< CMTPImageDpGetPartialObject::CheckRequestL")); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPGETPARTIALOBJECT_CHECKREQUESTL, "CheckRequestL result 0x%x", result ); + OstTraceFunctionExit0( CMTPIMAGEDPGETPARTIALOBJECT_CHECKREQUESTL_EXIT ); return result; } @@ -115,18 +117,23 @@ */ TBool CMTPImageDpGetPartialObject::VerifyParametersL() { - __FLOG(_L8(">> CMTPImageDpGetPartialObject::VerifyParametersL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETPARTIALOBJECT_VERIFYPARAMETERSL_ENTRY ); TBool result = EFalse; iOffset = Request().Uint32(TMTPTypeRequest::ERequestParameter2); iMaxLength = Request().Uint32(TMTPTypeRequest::ERequestParameter3); TEntry fileEntry; - User::LeaveIfError(iFs.Entry(iObjectMeta->DesC(CMTPObjectMetaData::ESuid), fileEntry)); + LEAVEIFERROR(iFs.Entry(iObjectMeta->DesC(CMTPObjectMetaData::ESuid), fileEntry), + OstTraceExt2( TRACE_ERROR, DUP1_CMTPIMAGEDPGETPARTIALOBJECT_VERIFYPARAMETERSL, + "Gets the entry details for %S failed! error code %d", iObjectMeta->DesC(CMTPObjectMetaData::ESuid), munged_err)); + if((iOffset < fileEntry.FileSize())) { result = ETrue; } - __FLOG_VA((_L8("<< CMTPImageDpGetPartialObject::VerifyParametersL %d"), result)); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPGETPARTIALOBJECT_VERIFYPARAMETERSL, + "VerifyParametersL result %d", result ); + OstTraceFunctionExit0( CMTPIMAGEDPGETPARTIALOBJECT_VERIFYPARAMETERSL_EXIT ); return result; } /** @@ -135,12 +142,12 @@ */ void CMTPImageDpGetPartialObject::ServiceL() { + OstTraceFunctionEntry0( CMTPIMAGEDPGETPARTIALOBJECT_SERVICEL_ENTRY ); // Get file information - __FLOG(_L8(">> CMTPImageDpGetPartialObject::ServiceL")); // Pass the complete file back to the host iFileObject = CMTPTypeFile::NewL(iFramework.Fs(), iObjectMeta->DesC(CMTPObjectMetaData::ESuid), (TFileMode)(EFileRead | EFileShareReadersOnly), iMaxLength, iOffset); SendDataL(*iFileObject); - __FLOG(_L8("<< CMTPImageDpGetPartialObject::ServiceL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETPARTIALOBJECT_SERVICEL_EXIT ); } @@ -150,9 +157,9 @@ */ TBool CMTPImageDpGetPartialObject::DoHandleResponsePhaseL() { - __FLOG(_L8(">> CMTPImageDpGetPartialObject::DoHandleResponsePhaseL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETPARTIALOBJECT_DOHANDLERESPONSEPHASEL_ENTRY ); TUint32 dataLength = iFileObject->GetByteSent(); SendResponseL(EMTPRespCodeOK, 1, &dataLength); - __FLOG(_L8("<< CMTPImageDpGetPartialObject::DoHandleResponsePhaseL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETPARTIALOBJECT_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpgetthumb.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetthumb.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpgetthumb.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -31,9 +31,11 @@ #include "cmtpimagedpthumbnailcreator.h" #include "cmtpimagedpobjectpropertymgr.h" #include "cmtpimagedp.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpgetthumbTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"ImageDpGetThumb");) /** @@ -57,11 +59,10 @@ */ CMTPImageDpGetThumb::~CMTPImageDpGetThumb() { - __FLOG(_L8(">> CMTPImageDpGetThumb::~CMTPImageDpGetThumb")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETTHUMB_CMTPIMAGEDPGETTHUMB_ENTRY ); delete iThumb; delete iObjectMeta; - __FLOG(_L8("<< CMTPImageDpGetThumb::~CMTPImageDpGetThumb")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPGETTHUMB_CMTPIMAGEDPGETTHUMB_EXIT ); } /** @@ -78,19 +79,18 @@ */ void CMTPImageDpGetThumb::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPImageDpGetThumb::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETTHUMB_CONSTRUCTL_ENTRY ); iThumb = CMTPTypeOpaqueData::NewL(); iObjectMeta = CMTPObjectMetaData::NewL(); - __FLOG(_L8("CMTPImageDpGetThumb::ConstructL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETTHUMB_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPImageDpGetThumb::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpGetThumb::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETTHUMB_CHECKREQUESTL_ENTRY ); TMTPResponseCode result = MTPImageDpUtilits::VerifyObjectHandleL(iFramework, Request().Uint32(TMTPTypeRequest::ERequestParameter1), *iObjectMeta); - __FLOG(_L8("<< CMTPImageDpGetThumb::CheckRequestL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETTHUMB_CHECKREQUESTL_EXIT ); return result; } @@ -100,17 +100,19 @@ */ void CMTPImageDpGetThumb::ServiceL() { - __FLOG(_L8(">> CMTPImageDpGetThumb::ServiceL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETTHUMB_SERVICEL_ENTRY ); TInt err = KErrNone; //at first, try to query thumbnail from property manager HBufC8* thumbnailData = imgDp.PropertyMgr().Thumbnail(iObjectMeta->Uint(CMTPObjectMetaData::EHandle)); if (thumbnailData == NULL) { - __FLOG(_L8("CMTPImageDpGetThumb::ServiceL- fail to query thumbnail from cache")); + OstTrace0( TRACE_NORMAL, CMTPIMAGEDPGETTHUMB_SERVICEL, "CMTPImageDpGetThumb::ServiceL- fail to query thumbnail from cache" ); TEntry fileEntry; - User::LeaveIfError(iFramework.Fs().Entry(iObjectMeta->DesC(CMTPObjectMetaData::ESuid), fileEntry)); + LEAVEIFERROR(iFramework.Fs().Entry(iObjectMeta->DesC(CMTPObjectMetaData::ESuid), fileEntry), + OstTraceExt2( TRACE_ERROR, DUP1_CMTPIMAGEDPGETTHUMB_SERVICEL, + "Gets the entry details for %S failed! error code %d", iObjectMeta->DesC(CMTPObjectMetaData::ESuid), munged_err)); CMTPImageDpThumbnailCreator* tnc = imgDp.ThumbnailManager(); if(tnc != NULL) @@ -118,7 +120,7 @@ tnc->GetThumbMgr()->SetFlagsL(CThumbnailManager::EDefaultFlags); if(fileEntry.FileSize() > KFileSizeMax) { - __FLOG(_L8(">> CMTPImageDpGetThumb::ServiceL, fileEntry.FileSize() > KFileSizeMax")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPIMAGEDPGETTHUMB_SERVICEL, "fileEntry.FileSize() > KFileSizeMax" ); tnc->GetThumbMgr()->SetFlagsL(CThumbnailManager::EDoNotCreate); } @@ -132,7 +134,7 @@ iThumb->Write(*thumbnailData); } SendDataL(*iThumb); - __FLOG(_L8("<< CMTPImageDpGetThumb::ServiceL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETTHUMB_SERVICEL_EXIT ); } TBool CMTPImageDpGetThumb::DoHandleCompletingPhaseL() diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpmdeobserver.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpmdeobserver.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpmdeobserver.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -35,8 +35,11 @@ #include "cmtpimagedp.h" #include "cmtpimagedpobjectpropertymgr.h" #include "mtpimagedputilits.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpmdeobserverTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent, "CMTPImageDpMdeObserver");) CMTPImageDpMdeObserver* CMTPImageDpMdeObserver::NewL(MMTPDataProviderFramework& aFramework, CMTPImageDataProvider& aDataProvider) { @@ -59,23 +62,21 @@ void CMTPImageDpMdeObserver::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPImageDpMdeObserver::ConstructL - Entry")); - __FLOG(_L8("CMTPImageDpMdeObserver::ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPIMAGEDPMDEOBSERVER_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPIMAGEDPMDEOBSERVER_CONSTRUCTL_EXIT ); } CMTPImageDpMdeObserver::~CMTPImageDpMdeObserver() { - __FLOG(_L8("CMTPImageDpMdeObserver::~CMTPImageDpMdeObserver - Entry")); - __FLOG(_L8("CMTPImageDpMdeObserver::~CMTPImageDpMdeObserver - Exit")); - __FLOG_CLOSE; + OstTraceFunctionEntry0( CMTPIMAGEDPMDEOBSERVER_CMTPIMAGEDPMDEOBSERVER_ENTRY ); + OstTraceFunctionExit0( CMTPIMAGEDPMDEOBSERVER_CMTPIMAGEDPMDEOBSERVER_EXIT ); } void CMTPImageDpMdeObserver::CreateMetadataL(const TParsePtrC& aParse, TMTPFormatCode aFormat, TUint32 aParentHandle, CMTPObjectMetaData& aMetaData) { TInt32 storageId = MTPImageDpUtilits::FindStorage(iFramework, aParse.FullName()); - - __FLOG_VA((_L16("Addition - New Image:%S"), &aParse.FullName())); + + OstTraceExt1( TRACE_NORMAL, CMTPIMAGEDPMDEOBSERVER_CREATEMETADATAL, "Addition - New Image:%S", aParse.FullName() ); aMetaData.SetUint(CMTPObjectMetaData::EDataProviderId, iFramework.DataProviderId()); aMetaData.SetUint(CMTPObjectMetaData::EFormatCode, aFormat); aMetaData.SetUint(CMTPObjectMetaData::EStorageId, storageId); @@ -89,7 +90,7 @@ void CMTPImageDpMdeObserver::ProcessMdeNotificationL(const RArray& aObjectIdArray, TObserverNotificationType /*aType*/) { - __FLOG_VA((_L8("CMTPImageDpMdeObserver::ProcessMdeNotificationL Start"))); + OstTraceFunctionEntry0( CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL_ENTRY ); //Because image dp only subscribe add notification from MdS, only the add notifictions can reach here //we ignore checking ENotifyAdd notification type to reduce complexity. @@ -106,8 +107,9 @@ continue; } CleanupStack::PushL(mdeObject); - __FLOG_VA((_L16("Addition - ObjectId:%u, URI:%S"), aObjectIdArray[i], &mdeObject->Uri())); - + OstTraceExt2( TRACE_NORMAL, CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL, + "Addition - ObjectId:%u, URI:%S", aObjectIdArray[i], mdeObject->Uri()); + //filter out all image files other jpeg files TParsePtrC parse(mdeObject->Uri()); TMTPFormatCode format = iDataProvider.FindFormat(parse.Ext().Mid(1)); @@ -123,13 +125,13 @@ TUint32 parentHandle = MTPImageDpUtilits::FindParentHandleL(iFramework, iDataProvider, parse.FullName()); if (parentHandle == KMTPHandleNone) { - __FLOG_VA((_L16("Notify framework - URI:%S"), &mdeObject->Uri())); + OstTraceExt1( TRACE_NORMAL, DUP1_CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL, "Notify framework - URI:%S", mdeObject->Uri() ); TMTPNotificationParamsFolderChange param = {mdeObject->Uri()}; iFramework.NotifyFrameworkL(EMTPAddFolder, ¶m); //try to get parent handle if framework complete it's tasks parentHandle = MTPImageDpUtilits::FindParentHandleL(iFramework, iDataProvider, parse.FullName()); - __FLOG_VA((_L16("Framework enumeration parent handle:%u"), parentHandle)); + OstTrace1( TRACE_NORMAL, DUP2_CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL, "Framework enumeration parent handle:%u", parentHandle ); } if (parentHandle != KMTPHandleNone) @@ -137,7 +139,8 @@ CMTPObjectMetaData* object = CMTPObjectMetaData::NewLC(); CreateMetadataL(parse, format, parentHandle, *object); iFramework.ObjectMgr().InsertObjectL(*object); - __FLOG_VA((_L16("Addition - New Handle:%u"), object->Uint(CMTPObjectMetaData::EHandle))); + OstTrace1( TRACE_NORMAL, DUP3_CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL, + "Addition - New Handle:%u", object->Uint(CMTPObjectMetaData::EHandle) ); TMTPTypeEvent event; event.SetUint16(TMTPTypeEvent::EEventCode, EMTPEventCodeObjectAdded); @@ -146,8 +149,10 @@ TUint32 handle = object->Uint(CMTPObjectMetaData::EHandle); event.SetUint32(TMTPTypeEvent::EEventParameter1, handle); - iFramework.SendEventL(event); - __FLOG_VA((_L8("ProcessMdeNotificationL - EMTPEventCodeObjectAdd, object handle:%u"), handle)); + iFramework.SendEventL(event); + OstTrace1( TRACE_NORMAL, DUP4_CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL, + "ProcessMdeNotificationL - EMTPEventCodeObjectAdd, object handle:%u", handle ); + CleanupStack::PopAndDestroy(object);//object } } @@ -156,7 +161,7 @@ CleanupStack::PopAndDestroy(mdeObject);//mdeObject } - __FLOG_VA((_L8("CMTPImageDpMdeObserver::ProcessMdeNotificationL - Exit"))); + OstTraceFunctionExit0( CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL_EXIT ); } /* @@ -179,19 +184,20 @@ TObserverNotificationType aType, const RArray& aObjectIdArray) { - __FLOG_VA((_L8("CMTPImageDpMdeObserver::HandleObjectNotificationL - changeType = %d"), aType)); + OstTraceFunctionEntry0( CMTPIMAGEDPMDEOBSERVER_HANDLEOBJECTNOTIFICATIONL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPMDEOBSERVER_HANDLEOBJECTNOTIFICATIONL, "changeType = %d", aType ); ProcessMdeNotificationL(aObjectIdArray, aType); //Update RProperty to notify the subscribers. if (iNewPics > 0) { - __FLOG_1(_L16("CMTPImageDpMdeObserver::CMTPImageDpMdeObserver - New Pics: %u"), iNewPics); + OstTrace1( TRACE_NORMAL, DUP1_CMTPIMAGEDPMDEOBSERVER_HANDLEOBJECTNOTIFICATIONL, "CMTPImageDpMdeObserver::CMTPImageDpMdeObserver - New Pics: %u", iNewPics ); iDataProvider.IncreaseNewPictures(iNewPics); iNewPics = 0; } - __FLOG(_L8("CMTPImageDpMdeObserver::CMTPImageDpMdeObserver - Exit")); + OstTraceFunctionExit0( CMTPIMAGEDPMDEOBSERVER_HANDLEOBJECTNOTIFICATIONL_EXIT ); } /* @@ -199,7 +205,7 @@ */ void CMTPImageDpMdeObserver::SubscribeForChangeNotificationL() { - __FLOG_VA((_L8("CMTPImageDpMdeObserver::SubscribeForChangeNotificationL"))); + OstTraceFunctionEntry0( CMTPIMAGEDPMDEOBSERVER_SUBSCRIBEFORCHANGENOTIFICATIONL_ENTRY ); if (!iSubscribed) { @@ -216,8 +222,8 @@ iSubscribed = ETrue; } - - __FLOG(_L8("CMTPImageDpMdeObserver::SubscribeForChangeNotificationL - Exit")); + + OstTraceFunctionExit0( CMTPIMAGEDPMDEOBSERVER_SUBSCRIBEFORCHANGENOTIFICATIONL_EXIT ); } /* @@ -225,7 +231,7 @@ */ void CMTPImageDpMdeObserver::UnsubscribeForChangeNotificationL() { - __FLOG_VA((_L8("CMTPImageDpMdeObserver::UnsubscribeForChangeNotificationL"))); + OstTraceFunctionEntry0( CMTPIMAGEDPMDEOBSERVER_UNSUBSCRIBEFORCHANGENOTIFICATIONL_ENTRY ); if (iSubscribed) { @@ -235,5 +241,5 @@ iSubscribed = EFalse; } - __FLOG(_L8("CMTPImageDpMdeObserver::UnsubscribeForChangeNotificationL - Exit")); + OstTraceFunctionExit0( CMTPIMAGEDPMDEOBSERVER_UNSUBSCRIBEFORCHANGENOTIFICATIONL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpmoveobject.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpmoveobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpmoveobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -36,8 +36,11 @@ #include "mtpimagedputilits.h" #include "cmtpimagedpthumbnailcreator.h" #include "cmtpimagedp.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpmoveobjectTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"MoveObject");) /** Verification data for the MoveObject request @@ -69,12 +72,11 @@ */ CMTPImageDpMoveObject::~CMTPImageDpMoveObject() { - __FLOG(_L8(">> CMTPImageDpMoveObject::~CMTPImageDpMoveObject")); + OstTraceFunctionEntry0( CMTPIMAGEDPMOVEOBJECT_CMTPIMAGEDPMOVEOBJECT_ENTRY ); delete iDest; delete iFileMan; delete iObjectInfo; - __FLOG(_L8("<< CMTPImageDpMoveObject::~CMTPImageDpMoveObject")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPMOVEOBJECT_CMTPIMAGEDPMOVEOBJECT_EXIT ); } /** @@ -84,7 +86,6 @@ CMTPRequestProcessor(aFramework, aConnection, sizeof(KMTPMoveObjectPolicy)/sizeof(TMTPRequestElementInfo), KMTPMoveObjectPolicy), iDataProvider(aDataProvider) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } /** @@ -92,15 +93,15 @@ */ void CMTPImageDpMoveObject::ConstructL() { - __FLOG(_L8(">> CMTPImageDpMoveObject::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPMOVEOBJECT_CONSTRUCTL_ENTRY ); iFileMan = CFileMan::NewL(iFramework.Fs()); iObjectInfo = CMTPObjectMetaData::NewL(); - __FLOG(_L8("<< CMTPImageDpMoveObject::ConstructL")); + OstTraceFunctionExit0( CMTPIMAGEDPMOVEOBJECT_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPImageDpMoveObject::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpCopyObject::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPMOVEOBJECT_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -113,8 +114,9 @@ responseCode = EMTPRespCodeInvalidParentObject; } - __FLOG_VA((_L8("CheckRequestL - Exit with responseCode = 0x%04X"), responseCode)); - __FLOG(_L8("<< CMTPImageDpCopyObject::CheckRequestL")); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPMOVEOBJECT_CHECKREQUESTL, + "CheckRequestL - Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPIMAGEDPMOVEOBJECT_CHECKREQUESTL_EXIT ); return responseCode; } @@ -123,12 +125,12 @@ */ void CMTPImageDpMoveObject::ServiceL() { - __FLOG(_L8(">> CMTPImageDpMoveObject::ServiceL")); + OstTraceFunctionEntry0( CMTPIMAGEDPMOVEOBJECT_SERVICEL_ENTRY ); TMTPResponseCode ret = MoveObjectL(); SendResponseL(ret); - - __FLOG(_L8("<< CMTPImageDpMoveObject::ServiceL")); + + OstTraceFunctionExit0( CMTPIMAGEDPMOVEOBJECT_SERVICEL_EXIT ); } /** @@ -137,7 +139,7 @@ */ TMTPResponseCode CMTPImageDpMoveObject::MoveFileL(const TDesC& aOldFileName, const TDesC& aNewFileName) { - __FLOG(_L8(">> CMTPImageDpMoveObject::MoveFileL")); + OstTraceFunctionEntry0( CMTPIMAGEDPMOVEOBJECT_MOVEFILEL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; /** @@ -173,22 +175,23 @@ iObjectInfo->SetUint(CMTPObjectMetaData::EStorageId, iStorageId); iObjectInfo->SetUint(CMTPObjectMetaData::EParentHandle, iNewParentHandle); iFramework.ObjectMgr().ModifyObjectL(*iObjectInfo); - __FLOG_VA((_L16("CMTPImageDpMoveObject::MoveFileL - Update object info:%S"), &aNewFileName)); + OstTraceExt1( TRACE_NORMAL, DUP2_CMTPIMAGEDPMOVEOBJECT_MOVEFILEL, + "CMTPImageDpMoveObject::MoveFileL - Update object info:%S", aNewFileName ); TInt ret = MoveImageFile(aOldFileName, *iDest); if (ret != KErrNone) { //rollback - __FLOG_VA((_L16("CMTPImageDpMoveObject::MoveFileL - Rollback"))); + OstTrace0( TRACE_NORMAL, DUP1_CMTPIMAGEDPMOVEOBJECT_MOVEFILEL, "CMTPImageDpMoveObject::MoveFileL - Rollback" ); iObjectInfo->SetDesCL(CMTPObjectMetaData::ESuid, aOldFileName); iObjectInfo->SetUint(CMTPObjectMetaData::EStorageId, oldStoradId); iObjectInfo->SetUint(CMTPObjectMetaData::EParentHandle, oldParentHandle); iFramework.ObjectMgr().ModifyObjectL(*iObjectInfo); responseCode = EMTPRespCodeGeneralError; } - __FLOG_VA((_L8("CMTPImageDpMoveObject::MoveFileL - MoveImageFile:%d"), ret)); - - __FLOG(_L8("<< CMTPImageDpMoveObject::MoveFileL")); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPMOVEOBJECT_MOVEFILEL, "- MoveImageFile:%d", ret ); + + OstTraceFunctionExit0( CMTPIMAGEDPMOVEOBJECT_MOVEFILEL_EXIT ); return responseCode; } /** @@ -197,7 +200,7 @@ */ TMTPResponseCode CMTPImageDpMoveObject::MoveObjectL() { - __FLOG(_L8(">> CMTPImageDpMoveObject::MoveObjectL")); + OstTraceFunctionEntry0( CMTPIMAGEDPMOVEOBJECT_MOVEOBJECTL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; GetParametersL(); RBuf newObjectName; @@ -221,7 +224,7 @@ responseCode = MoveFileL(oldFileName, newObjectName); } CleanupStack::PopAndDestroy(); // newObjectName. - __FLOG(_L8("<< CMTPImageDpMoveObject::MoveObjectL")); + OstTraceFunctionExit0( CMTPIMAGEDPMOVEOBJECT_MOVEOBJECTL_EXIT ); return responseCode; } @@ -230,7 +233,7 @@ */ void CMTPImageDpMoveObject::GetParametersL() { - __FLOG(_L8(">> CMTPImageDpMoveObject::GetParametersL")); + OstTraceFunctionEntry0( CMTPIMAGEDPMOVEOBJECT_GETPARAMETERSL_ENTRY ); __ASSERT_DEBUG(iRequestChecker, Panic(EMTPImageDpRequestCheckNull)); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); @@ -249,7 +252,7 @@ iDest = NULL; iDest = parentObjectInfo->DesC(CMTPObjectMetaData::ESuid).AllocL(); } - __FLOG(_L8("<< CMTPImageDpMoveObject::GetParametersL")); + OstTraceFunctionExit0( CMTPIMAGEDPMOVEOBJECT_GETPARAMETERSL_EXIT ); } /** @@ -257,13 +260,13 @@ */ void CMTPImageDpMoveObject::SetDefaultParentObjectL() { - __FLOG(_L8(">> CMTPImageDpMoveObject::SetDefaultParentObjectL")); + OstTraceFunctionEntry0( CMTPIMAGEDPMOVEOBJECT_SETDEFAULTPARENTOBJECTL_ENTRY ); const CMTPStorageMetaData& storage = iFramework.StorageMgr().StorageL(iStorageId); delete iDest; iDest = NULL; iDest = storage.DesC(CMTPStorageMetaData::EStorageSuid).AllocL(); iNewParentHandle = KMTPHandleNoParent; - __FLOG(_L8("<< CMTPImageDpMoveObject::SetDefaultParentObjectL")); + OstTraceFunctionExit0( CMTPIMAGEDPMOVEOBJECT_SETDEFAULTPARENTOBJECTL_EXIT ); } /** @@ -271,15 +274,21 @@ */ TMTPResponseCode CMTPImageDpMoveObject::CanMoveObjectL(const TDesC& aOldName, const TDesC& aNewName) const { - __FLOG(_L8(">> CMTPImageDpMoveObject::CanMoveObjectL")); + OstTraceFunctionEntry0( CMTPIMAGEDPMOVEOBJECT_CANMOVEOBJECTL_ENTRY ); TMTPResponseCode result = EMTPRespCodeOK; TEntry fileEntry; - User::LeaveIfError(iFramework.Fs().Entry(aOldName, fileEntry)); + LEAVEIFERROR(iFramework.Fs().Entry(aOldName, fileEntry), + OstTraceExt2( TRACE_ERROR, CMTPIMAGEDPMOVEOBJECT_CANMOVEOBJECTL, + "Gets the entry details for %S failed! error code %d", aOldName, munged_err )); TDriveNumber drive(static_cast(iFramework.StorageMgr().DriveNumber(iStorageId))); - User::LeaveIfError(drive); + LEAVEIFERROR(drive, + OstTraceExt2( TRACE_ERROR, DUP1_CMTPIMAGEDPMOVEOBJECT_CANMOVEOBJECTL, + "Gets drive for storage %d failed! error code %d", iStorageId, munged_err )); TVolumeInfo volumeInfo; - User::LeaveIfError(iFramework.Fs().Volume(volumeInfo, drive)); + LEAVEIFERROR(iFramework.Fs().Volume(volumeInfo, drive), + OstTraceExt2( TRACE_ERROR, DUP2_CMTPIMAGEDPMOVEOBJECT_CANMOVEOBJECTL, + "Gets volume information for driver %d failed! error code %d", drive, munged_err )); if(volumeInfo.iFree < fileEntry.FileSize()) { @@ -289,16 +298,16 @@ { result = EMTPRespCodeInvalidParentObject; } - __FLOG_VA((_L8("CanMoveObjectL - Exit with response code 0x%04X"), result)); - __FLOG(_L8("<< CMTPImageDpMoveObject::CanMoveObjectL")); + OstTrace1( TRACE_NORMAL, DUP3_CMTPIMAGEDPMOVEOBJECT_CANMOVEOBJECTL, "Exit with response code 0x%04X", result ); + OstTraceFunctionExit0( CMTPIMAGEDPMOVEOBJECT_CANMOVEOBJECTL_EXIT ); return result; } TInt CMTPImageDpMoveObject::MoveImageFile(const TDesC& aOldImageName, const TDesC& aNewImageName) { - __FLOG(_L8(">> CMTPImageDpMoveObject::MoveImageFile")); - __FLOG_VA((_L8("move image src: %S dest: %S"), &aOldImageName, &aNewImageName)); - __FLOG(_L8("<< CMTPImageDpMoveObject::MoveImageFile")); + OstTraceFunctionEntry0( CMTPIMAGEDPMOVEOBJECT_MOVEIMAGEFILE_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPIMAGEDPMOVEOBJECT_MOVEIMAGEFILE, "move image src: %S dest: %S", aOldImageName, aNewImageName ); + OstTraceFunctionExit0( CMTPIMAGEDPMOVEOBJECT_MOVEIMAGEFILE_EXIT ); return iFileMan->Move(aOldImageName, aNewImageName); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpobjectpropertymgr.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpobjectpropertymgr.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpobjectpropertymgr.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -47,9 +47,11 @@ #include "mtpimagedputilits.h" #include "mtpimagedpconst.h" #include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpobjectpropertymgrTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"MTPImageDpPropertyMgr");) // Indicate how many cache can be stored const TUint KCacheThreshold = 16; @@ -169,19 +171,16 @@ iFs(aFramework.Fs()), iObjectMgr(aFramework.ObjectMgr()) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } void CMTPImageDpObjectPropertyMgr::ConstructL(MMTPDataProviderFramework& /*aFramework*/) { - __FLOG(_L8("CMTPImageDpObjectPropertyMgr::ConstructL - Entry")); iMetaDataSession = CMdESession::NewL(*this); - __FLOG(_L8("CMTPImageDpObjectPropertyMgr::ConstructL - Exit")); } CMTPImageDpObjectPropertyMgr::~CMTPImageDpObjectPropertyMgr() { - __FLOG(_L8("CMTPImageDpObjectPropertyMgr::~CMTPImageDpObjectPropertyMgr - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_CMTPIMAGEDPOBJECTPROPERTYMGR_DES_ENTRY ); delete iObject; delete iMetaDataSession; delete iThumbnailCache.iThumbnailData; @@ -189,13 +188,12 @@ //Clear propreties cache map ClearAllCache(); iPropretiesCacheMap.Close(); - __FLOG(_L8("CMTPImageDpObjectPropertyMgr::~CMTPImageDpObjectPropertyMgr - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_CMTPIMAGEDPOBJECTPROPERTYMGR_DES_EXIT ); } void CMTPImageDpObjectPropertyMgr::SetCurrentObjectL(CMTPObjectMetaData& aObjectInfo, TBool aRequireForModify, TBool aSaveToCache) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::SetCurrentObjectL")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL_ENTRY ); iObjectInfo = &aObjectInfo; /** @@ -225,7 +223,8 @@ TUint objectHandle = iObjectInfo->Uint(CMTPObjectMetaData::EHandle); if (FindPropertiesCache(objectHandle)) { - __FLOG_VA((_L16("SetCurrentObjectL - find object in cache:%u"), objectHandle)); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL, + "SetCurrentObjectL - find object in cache:%u", objectHandle ); iCurrentPropertiesCache->ResetL(); } else @@ -235,22 +234,24 @@ // Find the first object handle from cache map and then destory it RHashMap::TIter iter(iPropretiesCacheMap); DestroyPropertiesCahce(*iter.NextKey()); - __FLOG_VA((_L16("SetCurrentObjectL - destory object:%u"), objectHandle)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL, + "SetCurrentObjectL - destory object:%u", objectHandle ); } iCurrentPropertiesCache = CMTPImagePropertiesCache::NewL(); iPropretiesCacheMap.Insert(objectHandle, iCurrentPropertiesCache); - __FLOG_VA((_L16("SetCurrentObjectL - create new object:%u"), objectHandle)); + OstTrace1( TRACE_NORMAL, DUP2_CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL, + "SetCurrentObjectL - create new object:%u", objectHandle ); } } } - - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::SetCurrentObjectL")); + + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL_EXIT ); } void CMTPImageDpObjectPropertyMgr::SetPropertyL(TMTPObjectPropertyCode aProperty, const TUint8 aValue) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::SetPropertyL")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT8_ENTRY ); __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull)); if (aProperty == EMTPObjectPropCodeNonConsumable) @@ -259,14 +260,16 @@ } else { + OstTrace1( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL, + "property code %d not equal to EMTPObjectPropCodeNonConsumable", aProperty ); User::Leave(EMTPRespCodeObjectPropNotSupported); } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::SetPropertyL")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT8_EXIT ); } void CMTPImageDpObjectPropertyMgr::SetPropertyL(TMTPObjectPropertyCode aProperty, const TUint16 aValue) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::SetPropertyL")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT16_ENTRY ); __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull)); switch(aProperty) @@ -277,16 +280,34 @@ case EMTPObjectPropCodeProtectionStatus://this property does not supported by image dp //nothing to do break; + case EMTPObjectPropCodeHidden: + { + __ASSERT_ALWAYS(( EMTPHidden == aValue )||( EMTPVisible == aValue ), User::Leave(KErrArgument)); + TEntry entry; + User::LeaveIfError(iFramework.Fs().Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry)); + if (( EMTPHidden == aValue ) && ( !entry.IsHidden())) + { + entry.iAtt &= ~KEntryAttHidden; + entry.iAtt |= KEntryAttHidden; + User::LeaveIfError(iFramework.Fs().SetAtt(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry.iAtt, ~entry.iAtt)); + } + else if (( EMTPVisible == aValue )&&( entry.IsHidden())) + { + entry.iAtt &= ~KEntryAttHidden; + User::LeaveIfError(iFramework.Fs().SetAtt(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry.iAtt, ~entry.iAtt)); + } + } + break; default: //nothing to do break; } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::SetPropertyL")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT16_EXIT ); } void CMTPImageDpObjectPropertyMgr::SetPropertyL(TMTPObjectPropertyCode aProperty, const TUint32 aValue) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::SetPropertyL")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT32_ENTRY ); __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull)); switch(aProperty) @@ -319,12 +340,12 @@ //nothing to do break; } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::SetPropertyL")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT32_EXIT ); } void CMTPImageDpObjectPropertyMgr::SetPropertyL(TMTPObjectPropertyCode aProperty, const TDesC& aValue) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::SetPropertyL")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TDESC_ENTRY ); __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull)); switch(aProperty) @@ -347,7 +368,9 @@ newUri.Trim(); //ask fs to rename file, leave if err returned from fs - User::LeaveIfError(iFs.Rename(oldUri.FullName(), newUri)); + LEAVEIFERROR(iFs.Rename(oldUri.FullName(), newUri), + OstTraceExt3( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_TDESC_SETPROPERTYL, + "Rename %S to %S failed! error code %d", oldUri.FullName(), newUri, munged_err )); iObjectInfo->SetDesCL(CMTPObjectMetaData::ESuid, newUri); CleanupStack::PopAndDestroy(&newUri); } @@ -376,12 +399,12 @@ //nothing to do break; } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::SetPropertyL")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TDESC_EXIT ); } void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, TUint8 &aValue) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT8_ENTRY ); __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull)); if (aProperty == EMTPObjectPropCodeNonConsumable) @@ -390,14 +413,16 @@ } else { + OstTrace1( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_TUINT8_GETPROPERTYL, + "property code %d not equal to EMTPObjectPropCodeNonConsumable", aProperty ); User::Leave(EMTPRespCodeObjectPropNotSupported); } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyL")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT8_EXIT ); } void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, TUint16 &aValue) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT16_ENTRY ); __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull)); TEntry entry; switch(aProperty) @@ -420,19 +445,32 @@ aValue = EMTPProtectionNoProtection; } } - break; + break; + case EMTPObjectPropCodeHidden: + { + TInt err = iFs.Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), entry); + if ( err == KErrNone && entry.IsHidden()) + { + aValue = EMTPHidden; + } + else + { + aValue = EMTPVisible; + } + } + break; default: aValue = 0;//initialization //ingore the failure if we can't get properties form MdS TRAP_IGNORE(GetPropertyFromMdsL(aProperty, &aValue)); break; } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyL")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT16_EXIT ); } void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, TUint32 &aValue, TBool alwaysCreate/* = ETrue*/) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT32_ENTRY ); __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull)); switch(aProperty) @@ -447,7 +485,8 @@ case EMTPObjectPropCodeRepresentativeSampleSize: { - __FLOG_VA((_L16("Query smaple size from MdS - URI:%S"), &iObjectInfo->DesC(CMTPObjectMetaData::ESuid))); + OstTraceExt1( TRACE_NORMAL, CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT32, + "Query smaple size from MdS - URI:%S", iObjectInfo->DesC(CMTPObjectMetaData::ESuid) ); ClearThumnailCache(); /** * try to query thumbnail from TNM, and then store thumbnail to cache @@ -507,12 +546,12 @@ TRAP_IGNORE(GetPropertyFromMdsL(aProperty, &aValue)); break; } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyL")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT32_EXIT ); } void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, TUint64& aValue) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT64_ENTRY ); __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull)); if (aProperty == EMTPObjectPropCodeObjectSize) @@ -523,14 +562,16 @@ } else { + OstTrace1( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT64, + "property code %d not equal to EMTPObjectPropCodeObjectSize", aProperty ); User::Leave(EMTPRespCodeObjectPropNotSupported); } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyL")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT64_EXIT ); } void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, TMTPTypeUint128& aValue) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TMTPTYPEUINT128_ENTRY ); __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull)); if (aProperty == EMTPObjectPropCodePersistentUniqueObjectIdentifier) @@ -540,14 +581,16 @@ } else { + OstTrace1( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TMTPTYPEUINT128, + "property code %d not equal to EMTPObjectPropCodeObjectSize", aProperty ); User::Leave(EMTPRespCodeObjectPropNotSupported); } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyL")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TMTPTYPEUINT128_EXIT ); } void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, CMTPTypeString& aValue) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPESTRING_ENTRY ); __ASSERT_DEBUG(iObjectInfo, Panic(EMTPImageDpObjectNull)); switch(aProperty) @@ -555,7 +598,10 @@ case EMTPObjectPropCodeObjectFileName: { TFileName name; - User::LeaveIfError(BaflUtils::MostSignificantPartOfFullName(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), name)); + LEAVEIFERROR(BaflUtils::MostSignificantPartOfFullName(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), name), + OstTraceExt2( TRACE_ERROR, DUP1_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL, + "Can't get most significant part of %S! error code %d", iObjectInfo->DesC(CMTPObjectMetaData::ESuid), munged_err)); + aValue.SetL(name); } break; @@ -583,12 +629,12 @@ TRAP_IGNORE(GetPropertyFromMdsL(aProperty, &aValue)); break; } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyL")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPESTRING_EXIT ); } void CMTPImageDpObjectPropertyMgr::GetPropertyL(TMTPObjectPropertyCode aProperty, CMTPTypeArray& aValue, TBool alwaysCreate /*= ETrue*/) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyL -- SmapleData")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPEARRAY_ENTRY ); if (aProperty == EMTPObjectPropCodeRepresentativeSampleData) { @@ -635,13 +681,16 @@ } else { + OstTrace1( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPEARRAY, + "property code %d not equal to EMTPObjectPropCodeRepresentativeSampleData", aProperty ); User::Leave(EMTPRespCodeObjectPropNotSupported); } + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPEARRAY_EXIT ); } void CMTPImageDpObjectPropertyMgr::GetPropertyFromMdsL(TMTPObjectPropertyCode aProperty, TAny* aValue) { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetPropertyFromMdsL")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYFROMMDSL_ENTRY ); TInt err = KErrNone; @@ -700,7 +749,9 @@ mdeProperty->TimeValueL().FormatL(timeValue, KTimeFormat); (*(static_cast(aValue))).SetL(timeValue); - __FLOG_VA((_L16("GetPropertyFromMdsL - from MdS: URI:%S, DateCreated:%S"), &iObjectInfo->DesC(CMTPObjectMetaData::ESuid), &timeValue)); + OstTraceExt2( TRACE_NORMAL, CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYFROMMDSL, + "GetPropertyFromMdsL - from MdS: URI:%S, DateCreated:%S", + iObjectInfo->DesC(CMTPObjectMetaData::ESuid), timeValue ); } } } @@ -777,21 +828,21 @@ break; } } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetPropertyFromMdsL")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYFROMMDSL_EXIT ); } TBool CMTPImageDpObjectPropertyMgr::GetYear(const TDesC& aDateString, TInt& aYear) const { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetYear")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETYEAR_ENTRY ); aYear = 0; TLex dateBuf(aDateString.Left(4)); - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetYear")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETYEAR_EXIT ); return dateBuf.Val(aYear) == KErrNone; } TBool CMTPImageDpObjectPropertyMgr::GetMonth(const TDesC& aDateString, TMonth& aMonth) const { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetMonth")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETMONTH_ENTRY ); TBool result = EFalse; aMonth = EJanuary; TInt month = 0; @@ -802,13 +853,13 @@ aMonth = (TMonth)month; result = ETrue; } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetMonth")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETMONTH_EXIT ); return result; } TBool CMTPImageDpObjectPropertyMgr::GetDay(const TDesC& aDateString, TInt& aDay) const { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetDay")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETDAY_ENTRY ); TBool result = EFalse; aDay = 0; TLex dateBuf(aDateString.Mid(6, 2)); @@ -817,40 +868,40 @@ aDay--; result = ETrue; } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetDay")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETDAY_EXIT ); return result; } TBool CMTPImageDpObjectPropertyMgr::GetHour(const TDesC& aDateString, TInt& aHour) const { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetHour")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETHOUR_ENTRY ); aHour = 0; TLex dateBuf(aDateString.Mid(9, 2)); - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetHour")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETHOUR_EXIT ); return (dateBuf.Val(aHour) == KErrNone && aHour >=0 && aHour < 60); } TBool CMTPImageDpObjectPropertyMgr::GetMinute(const TDesC& aDateString, TInt& aMinute) const { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetMinute")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETMINUTE_ENTRY ); aMinute = 0; TLex dateBuf(aDateString.Mid(11, 2)); - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetMinute")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETMINUTE_EXIT ); return (dateBuf.Val(aMinute) == KErrNone && aMinute >=0 && aMinute < 60); } TBool CMTPImageDpObjectPropertyMgr::GetSecond(const TDesC& aDateString, TInt& aSecond) const { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetSecond")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETSECOND_ENTRY ); aSecond = 0; TLex dateBuf(aDateString.Mid(13, 2)); - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetSecond")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETSECOND_EXIT ); return (dateBuf.Val(aSecond) == KErrNone && aSecond >= 0 && aSecond < 60); } TBool CMTPImageDpObjectPropertyMgr::GetTenthSecond(const TDesC& aDateString, TInt& aTenthSecond) const { - __FLOG(_L8(">> CMTPImageDpObjectPropertyMgr::GetTenthSecond")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETTENTHSECOND_ENTRY ); TBool result = EFalse; aTenthSecond = 0; TInt dotPos = aDateString.Find(_L(".")); @@ -863,7 +914,7 @@ { result = ETrue; } - __FLOG(_L8("<< CMTPImageDpObjectPropertyMgr::GetTenthSecond")); + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_GETTENTHSECOND_EXIT ); return result; } @@ -893,6 +944,7 @@ ||!GetSecond(aTimeString,second) ||!GetTenthSecond(aTimeString,tenthSecond)) { + OstTrace0( TRACE_ERROR, CMTPIMAGEDPOBJECTPROPERTYMGR_CONVERTMTPTIMESTR2TTIMEL, "Failed to extract date/time details!"); User::Leave(KErrArgument); } else @@ -904,7 +956,7 @@ void CMTPImageDpObjectPropertyMgr::RemoveProperty(CMdEObject& aObject, CMdEPropertyDef& aPropDef) { - __FLOG(_L8("CMTPImageDpObjectPropertyMgr::RemoveProperty")); + OstTraceFunctionEntry0( CMTPIMAGEDPOBJECTPROPERTYMGR_REMOVEPROPERTY_ENTRY ); TInt index; CMdEProperty* property; index = aObject.Property(aPropDef, property); @@ -912,6 +964,7 @@ { aObject.RemoveProperty(index); } + OstTraceFunctionExit0( CMTPIMAGEDPOBJECTPROPERTYMGR_REMOVEPROPERTY_EXIT ); } /** @@ -989,7 +1042,8 @@ { if (iObject == NULL) { - __FLOG_VA((_L16("OpenMdeObjectL - URI = %S"), &iObjectInfo->DesC(CMTPObjectMetaData::ESuid))); + OstTraceExt1( TRACE_NORMAL, CMTPIMAGEDPOBJECTPROPERTYMGR_OPENMDEOBJECTL, + "OpenMdeObjectL - URI = %S", iObjectInfo->DesC(CMTPObjectMetaData::ESuid) ); CMdENamespaceDef& defaultNamespace = iMetaDataSession->GetDefaultNamespaceDefL(); CMdEObjectDef& imageObjDef = defaultNamespace.GetObjectDefL( MdeConstants::Image::KImageObject ); diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedprenameobject.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedprenameobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedprenameobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,8 +27,11 @@ #include "cmtpimagedprenameobject.h" #include "cmtpimagedp.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedprenameobjectTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"CMTPImageDpRenameObject");) const TInt KMmMtpRArrayGranularity = 4; const TInt KUpdateThreshold = 30; @@ -53,9 +56,7 @@ iFramework(aFramework), iDataProvider(aDataProvider), iObjectHandles(KMmMtpRArrayGranularity) - { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPImageDpRenameObject::CMTPImageDpRenameObject")); + { } // ----------------------------------------------------------------------------- @@ -65,15 +66,14 @@ // CMTPImageDpRenameObject::~CMTPImageDpRenameObject() { - __FLOG(_L8(">> ~CMTPImageDpRenameObject")); + OstTraceFunctionEntry0( CMTPIMAGEDPRENAMEOBJECT_CMTPIMAGEDPRENAMEOBJECT_DES_ENTRY ); Cancel(); iObjectHandles.Close(); delete iObjectInfo; delete iParentObjectInfo; iNewFileName.Close(); delete iRenameWaiter; - __FLOG(_L8("<< ~CMTPImageDpRenameObject")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPRENAMEOBJECT_CMTPIMAGEDPRENAMEOBJECT_DES_EXIT ); } // ----------------------------------------------------------------------------- @@ -83,13 +83,15 @@ // void CMTPImageDpRenameObject::StartL(const TUint32 aParentHandle, const TDesC& /*aOldFolderName*/) { - __FLOG_VA((_L16(">> CMTPImageDpRenameObject::StartL aParentHandle(0x%x)"), aParentHandle)); + OstTraceFunctionEntry0( CMTPIMAGEDPRENAMEOBJECT_STARTL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPRENAMEOBJECT_STARTL, "aParentHandle(0x%x)", aParentHandle ); iObjectHandles.Reset(); GenerateObjectHandleListL(aParentHandle); iCount = iObjectHandles.Count(); - __FLOG_VA((_L8(">> CMTPImageDpRenameObject::StartL handle count = %u"), iCount)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPIMAGEDPRENAMEOBJECT_STARTL, "handle count = %u", iCount); + if (iCount > 0) { iIndex = 0; @@ -102,7 +104,7 @@ iObjectHandles.Reset(); } - __FLOG(_L8("<< CMTPImageDpRenameObject::StartL")); + OstTraceFunctionExit0( CMTPIMAGEDPRENAMEOBJECT_STARTL_EXIT ); } // ----------------------------------------------------------------------------- @@ -122,7 +124,9 @@ // void CMTPImageDpRenameObject::RunL() { - __FLOG_VA((_L8(">> CMTPImageDpRenameObject::RunL iIndex = %d"), iIndex)); + OstTraceFunctionEntry0( CMTPIMAGEDPRENAMEOBJECT_RUNL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPRENAMEOBJECT_RUNL, "iIndex = %d", iIndex ); + if (iIndex < iCount) { TInt threshold = KUpdateThreshold; @@ -140,8 +144,8 @@ iNewFileName.Append(parentUri.DriveAndPath()); iNewFileName.Append(objectUri.NameAndExt()); iNewFileName.Trim(); - __FLOG_VA((_L16("New file name(%S)"), &iNewFileName)); - + OstTraceExt1( TRACE_NORMAL, DUP1_CMTPIMAGEDPRENAMEOBJECT_RUNL, "New file name(%S)", iNewFileName ); + // update framework metadata DB iObjectInfo->SetDesCL(CMTPObjectMetaData::ESuid, iNewFileName); iObjectInfo->SetUint(CMTPObjectMetaData::EObjectMetaDataUpdate, 1); @@ -160,7 +164,7 @@ iRenameWaiter->AsyncStop(); } - __FLOG(_L8("<< CMTPImageDpRenameObject::RunL")); + OstTraceFunctionExit0( CMTPIMAGEDPRENAMEOBJECT_RUNL_EXIT ); } // ----------------------------------------------------------------------------- @@ -171,8 +175,9 @@ TInt CMTPImageDpRenameObject::RunError( TInt aError ) { if (aError != KErrNone) - __FLOG_VA((_L8(">> CMTPImageDpRenameObject::RunError with error %d"), aError)); - + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CMTPIMAGEDPRENAMEOBJECT_RUNERROR, + "with error %d", aError ); + return KErrNone; } @@ -183,14 +188,14 @@ // void CMTPImageDpRenameObject::ConstructL() { - __FLOG(_L8(">> CMTPImageDpRenameObject::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPRENAMEOBJECT_CONSTRUCTL_ENTRY ); CActiveScheduler::Add( this ); iObjectInfo = CMTPObjectMetaData::NewL(); iParentObjectInfo = CMTPObjectMetaData::NewL(); iNewFileName.CreateL(KMaxFileNameLength); iRenameWaiter = new( ELeave ) CActiveSchedulerWait; - __FLOG(_L8("<< CMTPImageDpRenameObject::ConstructL")); + OstTraceFunctionExit0( CMTPIMAGEDPRENAMEOBJECT_CONSTRUCTL_EXIT ); } // ----------------------------------------------------------------------------- @@ -200,7 +205,9 @@ // void CMTPImageDpRenameObject::GenerateObjectHandleListL(TUint32 aParentHandle) { - __FLOG_VA((_L8(">> CMTPImageDpRenameObject::GenerateObjectHandleListL aParentHandle(0x%x)"), aParentHandle)); + OstTraceFunctionEntry0( CMTPIMAGEDPRENAMEOBJECT_GENERATEOBJECTHANDLELISTL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPRENAMEOBJECT_GENERATEOBJECTHANDLELISTL, "aParentHandle(0x%x)", aParentHandle ); + RMTPObjectMgrQueryContext context; RArray handles; CleanupClosePushL(context); // + context @@ -233,6 +240,6 @@ CleanupStack::PopAndDestroy(&handles); // - handles CleanupStack::PopAndDestroy(&context); // - context - __FLOG(_L8("<< CMTPImageDpRenameObject::GenerateObjectHandleListL")); + OstTraceFunctionExit0( CMTPIMAGEDPRENAMEOBJECT_GENERATEOBJECTHANDLELISTL_EXIT ); } //end of file diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpsendobjectinfo.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpsendobjectinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpsendobjectinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -42,9 +42,11 @@ #include "cmtpimagedpthumbnailcreator.h" #include "mtpimagedputilits.h" #include "cmtpimagedp.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpsendobjectinfoTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent, "ImageDPSendObjectInfo");) const TInt RollbackFuncCnt = 3; @@ -73,7 +75,7 @@ */ CMTPImageDpSendObjectInfo::~CMTPImageDpSendObjectInfo() { - __FLOG(_L8("CMTPImageDpSendObjectInfo::~CMTPImageDpSendObjectInfo - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_CMTPIMAGEDPSENDOBJECTINFO_DES_ENTRY ); Rollback(); iRollbackList.Close(); @@ -85,9 +87,8 @@ delete iReceivedObject; delete iObjectInfo; delete iObjectPropList; - - __FLOG(_L8("CMTPImageDpSendObjectInfo::~CMTPImageDpSendObjectInfo - Exit")); - __FLOG_CLOSE; + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_CMTPIMAGEDPSENDOBJECTINFO_DES_EXIT ); } /** @@ -98,6 +99,7 @@ CMTPImageDpSendObjectInfo::CMTPImageDpSendObjectInfo(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, CMTPImageDataProvider& aDataProvider) : CMTPRequestProcessor(aFramework, aConnection, 0, NULL), iDataProvider(aDataProvider), + iHiddenStatus( EMTPVisible ), iObjectPropertyMgr(aDataProvider.PropertyMgr()) { @@ -113,8 +115,7 @@ */ void CMTPImageDpSendObjectInfo::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPImageDpSendObjectInfo::ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_CONSTRUCTL_ENTRY ); iRollbackList.ReserveL(RollbackFuncCnt); iExpectedSendObjectRequest.SetUint16(TMTPTypeRequest::ERequestOperationCode, EMTPOpCodeSendObject); @@ -147,8 +148,8 @@ ADD_FSM_ENTRY(EObjectServ, EObjectInfoEvent, EStateEnd, EStateEnd, NULL); ADD_FSM_ENTRY(EObjectServ, EObjectPropListEvent, EStateEnd, EStateEnd, NULL); ADD_FSM_ENTRY(EObjectServ, EObjectEvent, EStateIdle, EObjectInfoSucceed, FsmDoHandleSendObjectCompleteL); - - __FLOG(_L8("CMTPImageEnumerator::ConstructL - Exit")); + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_CONSTRUCTL_EXIT ); } TBool CMTPImageDpSendObjectInfo::FsmCheckObjectInfoParamsL(CMTPImageDpSendObjectInfo* aObject, TAny *aPtr) @@ -202,7 +203,7 @@ */ TMTPResponseCode CMTPImageDpSendObjectInfo::CheckRequestL() { - __FLOG(_L8("CMTPImageDpSendObjectInfo::CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_CHECKREQUESTL_ENTRY ); iOperationCode = Request().Uint16(TMTPTypeRequest::ERequestOperationCode); @@ -253,11 +254,13 @@ { iCurrentState = iStateMachine[iCurrentState][iEvent].iNextFailedState; } - User::LeaveIfError(err); + LEAVEIFERROR(err, + OstTrace1( TRACE_ERROR, DUP1_CMTPIMAGEDPSENDOBJECTINFO_CHECKREQUESTL, + "the request check failed! error code %d", err )); } - __FLOG_1(_L8("CheckRequestL - Result: 0x%04x"), result); - __FLOG(_L8("CMTPImageDpSendObjectInfo::CheckRequestL - Exit")); - + + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPSENDOBJECTINFO_CHECKREQUESTL, "Result: 0x%04x", result ); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_CHECKREQUESTL_EXIT ); return result; } @@ -268,7 +271,7 @@ TBool CMTPImageDpSendObjectInfo::CheckObjectInfoParamsL(TAny *aPtr) { - __FLOG(_L8("CMTPImageDpSendObjectInfo::CheckObjectInfoParamsL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_CHECKOBJECTINFOPARAMSL_ENTRY ); TMTPResponseCode* ret = static_cast(aPtr); *ret = EMTPRespCodeOK; @@ -296,13 +299,13 @@ CleanupStack::PopAndDestroy(parentObjInfo); } - __FLOG(_L8("CMTPImageDpSendObjectInfo::CheckObjectInfoParamsL - Exit")); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_CHECKOBJECTINFOPARAMSL_EXIT ); return (*ret == EMTPRespCodeOK) ? ETrue : EFalse; } TBool CMTPImageDpSendObjectInfo::CheckObjectPropListParamsL(TAny *aPtr) { - __FLOG(_L8("CMTPImageDpSendObjectInfo::CheckObjectPropListParamsL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_CHECKOBJECTPROPLISTPARAMSL_ENTRY ); TMTPResponseCode* ret = static_cast(aPtr); *ret = EMTPRespCodeOK; @@ -328,14 +331,14 @@ *ret = EMTPRespCodeObjectTooLarge; } } - - __FLOG(_L8("CMTPImageDpSendObjectInfo::CheckObjectPropListParamsL - Exit")); + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_CHECKOBJECTPROPLISTPARAMSL_EXIT ); return (*ret == EMTPRespCodeOK) ? ETrue : EFalse; } TBool CMTPImageDpSendObjectInfo::CheckObjectParams(TAny *aPtr) { - __FLOG(_L8("CMTPImageDpSendObjectInfo::CheckObjectParamsL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_CHECKOBJECTPARAMS_ENTRY ); TMTPResponseCode* ret = static_cast(aPtr); *ret = EMTPRespCodeOK; @@ -347,8 +350,8 @@ { *ret = EMTPRespCodeNoValidObjectInfo; } - - __FLOG(_L8("CMTPImageDpSendObjectInfo::CheckObjectParamsL - Exit")); + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_CHECKOBJECTPARAMS_EXIT ); return (*ret == EMTPRespCodeOK) ? ETrue : EFalse; } @@ -359,7 +362,7 @@ */ void CMTPImageDpSendObjectInfo::ServiceL() { - __FLOG(_L8("CMTPImageDpSendObjectInfo::ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_SERVICEL_ENTRY ); FsmAction pService = iStateMachine[iCurrentState][iEvent].iFsmAction; __ASSERT_DEBUG(pService, Panic(EMTPImageDpNoMatchingProcessor)); @@ -379,9 +382,10 @@ { Rollback(); } - User::LeaveIfError(err); - - __FLOG(_L8("CMTPImageDpSendObjectInfo::ServiceL - Exit")); + LEAVEIFERROR(err, + OstTrace1( TRACE_ERROR, CMTPIMAGEDPSENDOBJECTINFO_SERVICEL, "Action failed! error code %d", err)); + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_SERVICEL_EXIT ); } /** @@ -392,7 +396,7 @@ */ TBool CMTPImageDpSendObjectInfo::Match(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) const { - __FLOG(_L8("CMTPImageDpSendObjectInfo::Match - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_MATCH_ENTRY ); TBool result = EFalse; TUint16 operationCode = aRequest.Uint16(TMTPTypeRequest::ERequestOperationCode); if ((operationCode == EMTPOpCodeSendObjectInfo || @@ -402,7 +406,7 @@ { result = ETrue; } - __FLOG(_L8("CMTPImageDpSendObjectInfo::Match - Exit")); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_MATCH_EXIT ); return result; } @@ -412,7 +416,7 @@ */ TBool CMTPImageDpSendObjectInfo::DoHandleResponsePhaseL() { - __FLOG(_L8("CMTPImageDpSendObjectInfo::DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_ENTRY ); //to check if the sending/receiving data is successful iSuccessful = !iCancelled; @@ -435,9 +439,10 @@ { Rollback(); } - User::LeaveIfError(err); - - __FLOG(_L8("CMTPImageDpSendObjectInfo::DoHandleResponsePhaseL - Exit")); + LEAVEIFERROR(err, + OstTrace1( TRACE_ERROR, CMTPIMAGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL, "Response error! error code %d", err)); + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } @@ -447,7 +452,7 @@ */ TBool CMTPImageDpSendObjectInfo::DoHandleCompletingPhaseL() { - __FLOG(_L8("CMTPImageDpSendObjectInfo::DoHandleCompletingPhaseL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_ENTRY ); TBool result = ETrue; CMTPRequestProcessor::DoHandleCompletingPhaseL(); @@ -467,8 +472,8 @@ } result = EFalse; } - - __FLOG(_L8("CMTPImageDpSendObjectInfo::DoHandleCompletingPhaseL - Exit")); + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_EXIT ); return result; } @@ -477,14 +482,14 @@ */ TBool CMTPImageDpSendObjectInfo::ServiceSendObjectInfoL(TAny* /*aPtr*/) { - __FLOG(_L8("CMTPImageDpSendObjectInfo::ServiceSendObjectInfoL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_SERVICESENDOBJECTINFOL_ENTRY ); delete iObjectInfo; iObjectInfo = NULL; iObjectInfo = CMTPTypeObjectInfo::NewL(); ReceiveDataL(*iObjectInfo); - - __FLOG(_L8("CMTPImageDpSendObjectInfo::ServiceSendObjectInfoL - Exit")); + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_SERVICESENDOBJECTINFOL_EXIT ); return ETrue; } @@ -493,15 +498,15 @@ */ TBool CMTPImageDpSendObjectInfo::ServiceSendObjectPropListL(TAny* /*aPtr*/) { - __FLOG(_L8("CMTPImageDpSendObjectInfo::ServiceSendObjectPropListL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_SERVICESENDOBJECTPROPLISTL_ENTRY ); delete iObjectPropList; iObjectPropList = NULL; iObjectPropList = CMTPTypeObjectPropList::NewL(); iReceivedObject->SetUint(CMTPObjectMetaData::EFormatCode, iRequest->Uint32(TMTPTypeRequest::ERequestParameter3)); ReceiveDataL(*iObjectPropList); - - __FLOG(_L8("CMTPImageDpSendObjectInfo::ServiceSendObjectPropListL - Exit")); + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_SERVICESENDOBJECTPROPLISTL_EXIT ); return ETrue; } @@ -510,15 +515,15 @@ */ TBool CMTPImageDpSendObjectInfo::ServiceSendObjectL(TAny* /*aPtr*/) { - __FLOG(_L8("CMTPImageDpSendObjectInfo::ServiceSendObjectL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_SERVICESENDOBJECTL_ENTRY ); iFramework.ObjectMgr().CommitReservedObjectHandleL(*iReceivedObject); //prepare for rollback iRollbackList.AppendL(RemoveObjectFromDb); ReceiveDataL(*iFileReceived); - - __FLOG(_L8("CMTPImageDpSendObjectInfo::ServiceSendObjectL - Exit")); + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_SERVICESENDOBJECTL_EXIT ); return ETrue; } @@ -527,21 +532,23 @@ */ void CMTPImageDpSendObjectInfo::GetDefaultParentObjectL() { - __FLOG(_L8("CMTPImageDpSendObjectInfo::GetDefaultParentObjectL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_ENTRY ); if (iStorageId == KMTPStorageDefault) { iStorageId = iFramework.StorageMgr().DefaultStorageId(); } TInt drive(static_cast(iFramework.StorageMgr().DriveNumber(iStorageId))); - User::LeaveIfError(drive); + LEAVEIFERROR(drive, + OstTraceExt2( TRACE_ERROR, CMTPIMAGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL, + "Can't get drive number for storage %d! error code %d", iStorageId, munged_err )); delete iParentSuid; iParentSuid = NULL; iParentSuid = (iFramework.StorageMgr().StorageL(iStorageId).DesC(CMTPStorageMetaData::EStorageSuid)).AllocL(); iReceivedObject->SetUint(CMTPObjectMetaData::EParentHandle, KMTPHandleNoParent); - - __FLOG(_L8("CMTPImageDpSendObjectInfo::GetDefaultParentObjectL - Exit")); + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_EXIT ); } /** @@ -550,7 +557,7 @@ */ TMTPResponseCode CMTPImageDpSendObjectInfo::GetParentObjectAndStorageIdL() { - __FLOG(_L8("CMTPImageDpSendObjectInfo::GetParentObjectAndStorageIdL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_ENTRY ); __ASSERT_DEBUG(iRequestChecker, Panic(EMTPImageDpRequestCheckNull)); iStorageId = Request().Uint32(TMTPTypeRequest::ERequestParameter1); @@ -570,8 +577,9 @@ iReceivedObject->SetUint(CMTPObjectMetaData::EParentHandle, iParentHandle); } - __FLOG_VA((_L8("ParentSuid = %S"), iParentSuid)); - __FLOG(_L8("CMTPImageDpSendObjectInfo::GetParentObjectAndStorageIdL - Exit")); + OstTraceExt1( TRACE_NORMAL, CMTPIMAGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL, + "ParentSuid = %S", *iParentSuid ); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_EXIT ); return EMTPRespCodeOK; } @@ -581,7 +589,7 @@ */ TBool CMTPImageDpSendObjectInfo::DoHandleSendObjectInfoCompleteL(TAny* /*aPtr*/) { - __FLOG(_L8("CMTPImageDpSendObjectInfo::DoHandleSendObjectInfoCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_ENTRY ); TBool result(ETrue); TUint16 format(iObjectInfo->Uint16L(CMTPTypeObjectInfo::EObjectFormat)); @@ -652,7 +660,8 @@ TRAPD(err,CreateFsObjectL()); if (err != KErrNone) { - __FLOG_1(_L8("Fail to create fs object %d"),err); + OstTrace1( TRACE_ERROR, CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL, + "Fail to create fs object %d", err ); SendResponseL(ErrorToMTPError(err)); Rollback(); result = EFalse; @@ -671,7 +680,7 @@ } iSuccessful = result; - __FLOG(_L8("CMTPImageDpSendObjectInfo::DoHandleSendObjectInfoCompleteL - Exit")); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_EXIT ); return result; } @@ -681,7 +690,7 @@ */ TBool CMTPImageDpSendObjectInfo::DoHandleSendObjectPropListCompleteL(TAny* /*aPtr*/) { - __FLOG(_L8("CMTPImageDpSendObjectInfo::DoHandleSendObjectPropListCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_ENTRY ); TBool result(ETrue); TMTPResponseCode responseCode(GetParentObjectAndStorageIdL()); @@ -725,7 +734,8 @@ TRAPD(err,CreateFsObjectL()); if (err != KErrNone) { - __FLOG_1(_L8("Fail to create fs object %d"),err); + OstTrace1( TRACE_ERROR, CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL, + "Fail to create fs object %d", err ); SendResponseL(ErrorToMTPError(err)); Rollback(); result = EFalse; @@ -740,7 +750,7 @@ } iSuccessful = result; - __FLOG(_L8("CMTPImageDpSendObjectInfo::DoHandleSendObjectPropListCompleteL - Exit")); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_EXIT ); return result; } @@ -750,11 +760,8 @@ */ TBool CMTPImageDpSendObjectInfo::DoHandleSendObjectCompleteL(TAny* /*aPtr*/) { - __FLOG(_L8("CMTPImageDpSendObjectInfo::DoHandleSendObjectCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_ENTRY ); TBool result(ETrue); - - delete iFileReceived; - iFileReceived = NULL; #ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API TInt64 objectsize = 0; @@ -762,13 +769,12 @@ TInt objectsize = 0; #endif - TEntry entry; - User::LeaveIfError(iFramework.Fs().Entry(iFullPath, entry)); - objectsize = entry.FileSize(); - + iFileReceived->File().Size(objectsize); + if (objectsize != iObjectSize) { - __FLOG_VA((_L8("object sizes differ %lu != %lu"), objectsize, iObjectSize)); + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL, + "object sizes differ %Lu != %Lu", objectsize, iObjectSize ); iFramework.RouteRequestUnregisterL(iExpectedSendObjectRequest, iConnection); Rollback(); @@ -784,28 +790,36 @@ // SendObject is cancelled or connection is dropped. if(result && iCancelled) { - __FLOG(_L8("It is a cancel for sendObject.")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL, "It is a cancel for sendObject." ); iFramework.RouteRequestUnregisterL(iExpectedSendObjectRequest, iConnection); Rollback(); SendResponseL(EMTPRespCodeTransactionCancelled); } else if (result && !iCancelled) - { + { + TUint attValue = 0; + User::LeaveIfError(iFileReceived->File().Att(attValue)); if (iProtectionStatus == EMTPProtectionNoProtection || iProtectionStatus == EMTPProtectionReadOnly) { - entry.iAtt &= ~(KEntryAttNormal | KEntryAttReadOnly); + attValue &= ~(KEntryAttNormal | KEntryAttReadOnly); + if (iProtectionStatus == EMTPProtectionNoProtection) { - entry.iAtt |= KEntryAttNormal; + attValue |= KEntryAttNormal; } else { - entry.iAtt |= KEntryAttReadOnly; + attValue |= KEntryAttReadOnly; } - User::LeaveIfError(iFramework.Fs().SetAtt(iFullPath, entry.iAtt, ~entry.iAtt)); + User::LeaveIfError(iFileReceived->File().SetAtt(attValue, ~attValue)); } - + if ( iHiddenStatus == EMTPHidden ) + { + attValue &= ~KEntryAttHidden; + attValue |= KEntryAttHidden; + User::LeaveIfError(iFileReceived->File().SetAtt(attValue, ~attValue)); + } TTime modifiedTime; //update datemodified property. if(iDateMod != NULL && iDateMod->Length()) @@ -816,7 +830,7 @@ { iObjectPropertyMgr.ConvertMTPTimeStr2TTimeL(*iDateCreated, modifiedTime); } - User::LeaveIfError(iFramework.Fs().SetModified(iFullPath, modifiedTime)); + User::LeaveIfError(iFileReceived->File().SetModified(modifiedTime)); iFramework.RouteRequestUnregisterL(iExpectedSendObjectRequest, iConnection); @@ -831,9 +845,11 @@ SendResponseL(EMTPRespCodeOK); } + delete iFileReceived; + iFileReceived = NULL; iSuccessful = result; - __FLOG(_L8("CMTPImageDpSendObjectInfo::DoHandleSendObjectCompleteL - Exit")); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_EXIT ); return result; } @@ -860,7 +876,7 @@ void CMTPImageDpSendObjectInfo::RemoveObjectFromFs() { - __FLOG(_L8("RemoveObjectFromFs")); + OstTraceFunctionEntry0( DUP1_CMTPIMAGEDPSENDOBJECTINFO_REMOVEOBJECTFROMFS_ENTRY ); delete iFileReceived; iFileReceived = NULL; TInt err = iFramework.Fs().Delete(iFullPath); @@ -869,6 +885,7 @@ //add Suid to deleteobjectlist TRAP_IGNORE(iDataProvider.AppendDeleteObjectsArrayL(iFullPath)); } + OstTraceFunctionExit0( DUP1_CMTPIMAGEDPSENDOBJECTINFO_REMOVEOBJECTFROMFS_EXIT ); } void CMTPImageDpSendObjectInfo::RemoveObjectFromDb() @@ -898,16 +915,18 @@ */ TBool CMTPImageDpSendObjectInfo::IsFormatValid(TMTPFormatCode aFormat) const { - __FLOG_1(_L8("CMTPImageDpSendObjectInfo::IsFormatValid - Format: 0x%04x"), aFormat); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_ISFORMATVALID_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPSENDOBJECTINFO_ISFORMATVALID, "Format: 0x%04x", aFormat ); TInt count(sizeof(KMTPValidCodeExtensionMappings) / sizeof(KMTPValidCodeExtensionMappings[0])); for(TInt i=0; i < count; i++) { if (KMTPValidCodeExtensionMappings[i].iFormatCode == aFormat) { + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_ISFORMATVALID_EXIT ); return ETrue; } } - __FLOG(_L8("CMTPImageDpSendObjectInfo::IsFormatValid - Exit")); + OstTraceFunctionExit0( DUP1_CMTPIMAGEDPSENDOBJECTINFO_ISFORMATVALID_EXIT ); return EFalse; } @@ -919,7 +938,8 @@ */ TBool CMTPImageDpSendObjectInfo::GetFullPathName(const TDesC& aFileName) { - __FLOG_1(_L8("CMTPImageDpSendObjectInfo::GetFullPathNameL - FileName: %S"), &aFileName); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_GETFULLPATHNAME_ENTRY ); + OstTraceExt1( TRACE_NORMAL, CMTPIMAGEDPSENDOBJECTINFO_GETFULLPATHNAME, "FileName: %S", aFileName ); TBool result(EFalse); if (aFileName.Length() > 0) { @@ -929,10 +949,10 @@ iFullPath.Append(aFileName); result = iFramework.Fs().IsValidName(iFullPath); } - __FLOG_1(_L16("FullPath: %S"), &iFullPath); + OstTraceExt1( TRACE_NORMAL, DUP1_CMTPIMAGEDPSENDOBJECTINFO_GETFULLPATHNAME, "FullPath: %S", iFullPath ); } - __FLOG(_L8("CMTPImageDpSendObjectInfo::GetFullPathNameL - Exit")); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_GETFULLPATHNAME_EXIT ); return result; } @@ -942,12 +962,12 @@ */ TBool CMTPImageDpSendObjectInfo::Exists(const TDesC& aName) const { - __FLOG(_L8("CMTPImageDpSendObjectInfo::Exists - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_EXISTS_ENTRY ); // This detects both files and folders TBool ret(EFalse); ret = BaflUtils::FileExists(iFramework.Fs(), aName); - __FLOG_VA((_L16("Exists: %S (%d)"), &aName, ret)); - __FLOG(_L8("CMTPImageDpSendObjectInfo::IsTooLarge - Exit")); + OstTraceExt2( TRACE_NORMAL, CMTPIMAGEDPSENDOBJECTINFO_EXISTS, "Exists: %S (%d)", aName, ret); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_EXISTS_EXIT ); return ret; } @@ -958,7 +978,7 @@ */ TMTPResponseCode CMTPImageDpSendObjectInfo::VerifyObjectPropListL(TInt& aInvalidParameterIndex) { - __FLOG(_L8("CMTPImageDpSendObjectInfo::VerifyObjectPropListL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_ENTRY ); TMTPResponseCode responseCode(EMTPRespCodeOK); const TUint KCount(iObjectPropList->NumberOfElements()); @@ -985,8 +1005,8 @@ break; } } - __FLOG_VA((_L8("Result = 0x%04X"), responseCode)); - __FLOG(_L8("CMTPImageDpSendObjectInfo::VerifyObjectPropListL - Exit")); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL, "Result = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_EXIT ); return responseCode; } @@ -998,7 +1018,7 @@ */ TMTPResponseCode CMTPImageDpSendObjectInfo::ExtractPropertyL(const CMTPTypeObjectPropListElement& aElement) { - __FLOG(_L8("CMTPImageDpSendObjectInfo::ExtractPropertyL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_EXTRACTPROPERTYL_ENTRY ); TMTPResponseCode responseCode(EMTPRespCodeOK); switch (aElement.Uint16L(CMTPTypeObjectPropListElement::EPropertyCode)) { @@ -1062,12 +1082,14 @@ case EMTPObjectPropCodeNonConsumable: iNonConsumable = aElement.Uint8L(CMTPTypeObjectPropListElement::EValue); break; - + case EMTPObjectPropCodeHidden: + iHiddenStatus = aElement.Uint16L(CMTPTypeObjectPropListElement::EValue); + break; default: break; } - __FLOG_VA((_L8("Result = 0x%04X"), responseCode)); - __FLOG(_L8("CMTPImageDpSendObjectInfo::ExtractPropertyL - Exit")); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPSENDOBJECTINFO_EXTRACTPROPERTYL, "Result = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_EXTRACTPROPERTYL_EXIT ); return responseCode; } @@ -1079,7 +1101,7 @@ */ TMTPResponseCode CMTPImageDpSendObjectInfo::CheckPropCodeL(const CMTPTypeObjectPropListElement& aElement) const { - __FLOG(_L8("CMTPImageDpSendObjectInfo::CheckPropCode - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_CHECKPROPCODEL_ENTRY ); TMTPResponseCode responseCode(EMTPRespCodeOK); switch(aElement.Uint16L(CMTPTypeObjectPropListElement::EPropertyCode)) { @@ -1133,6 +1155,7 @@ case EMTPObjectPropCodeRepresentativeSampleFormat: case EMTPObjectPropCodeProtectionStatus: + case EMTPObjectPropCodeHidden: if (aElement.Uint16L(CMTPTypeObjectPropListElement::EDatatype) != EMTPTypeUINT16) { responseCode = EMTPRespCodeInvalidObjectPropFormat; @@ -1176,8 +1199,8 @@ responseCode = EMTPRespCodeInvalidObjectPropCode; break; } - __FLOG_VA((_L8("Result = 0x%04X"), responseCode)); - __FLOG(_L8("CMTPImageDpSendObjectInfo::CheckPropCode - Exit")); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPSENDOBJECTINFO_CHECKPROPCODEL, "Result = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_CHECKPROPCODEL_EXIT ); return responseCode; } @@ -1187,7 +1210,7 @@ */ void CMTPImageDpSendObjectInfo::ReserveObjectL() { - __FLOG(_L8("CMTPImageDpSendObjectInfo::ReserveObjectL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_RESERVEOBJECTL_ENTRY ); const TInt objectStatusBitmask = 0x8000;//the most significant bit represents importing flag iReceivedObject->SetUint(CMTPObjectMetaData::EFormatSubCode, objectStatusBitmask);//mark object imported due to it sent by PC @@ -1196,7 +1219,7 @@ // prepare for rollback iRollbackList.AppendL(UnreserveObject); - __FLOG(_L8("CMTPImageDpSendObjectInfo::ReserveObjectL - Exit")); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_RESERVEOBJECTL_EXIT ); } /** @@ -1204,7 +1227,7 @@ */ void CMTPImageDpSendObjectInfo::SetPropertiesL() { - __FLOG(_L8("CMTPImageDpSendObjectInfo::SetPropertiesL - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_SETPROPERTIESL_ENTRY ); iObjectPropertyMgr.SetCurrentObjectL(*iReceivedObject, ETrue, ETrue); iReceivedObject->SetDesCL(CMTPObjectMetaData::ESuid, iFullPath); @@ -1225,12 +1248,12 @@ iObjectPropertyMgr.SetPropertyL(EMTPObjectPropCodeDateCreated, *iDateCreated); } - __FLOG(_L8("CMTPImageDpSendObjectInfo::SetPropertiesL - Exit")); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_SETPROPERTIESL_EXIT ); } void CMTPImageDpSendObjectInfo::Rollback() { - __FLOG(_L8("CMTPImageDpSendObjectInfo::Rollback - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_ROLLBACK_ENTRY ); TInt count = iRollbackList.Count(); while(--count >= 0) @@ -1238,17 +1261,17 @@ TRAP_IGNORE((*iRollbackList[count])(this)); } iRollbackList.Reset(); - - __FLOG(_L8("CMTPImageDpSendObjectInfo::Rollback - Exit")); + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_ROLLBACK_EXIT ); } void CMTPImageDpSendObjectInfo::CleanUndoList() { - __FLOG(_L8("CMTPImageDpSendObjectInfo::CleanUndoList - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_CLEANUNDOLIST_ENTRY ); iRollbackList.Reset(); - - __FLOG(_L8("CMTPImageDpSendObjectInfo::CleanUndoList - Exit")); + + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_CLEANUNDOLIST_EXIT ); } void CMTPImageDpSendObjectInfo::CreateFsObjectL() @@ -1283,7 +1306,7 @@ default: break; } - + return resp; } @@ -1293,7 +1316,7 @@ */ TBool CMTPImageDpSendObjectInfo::IsTooLarge(TUint64 aObjectSize) const { - __FLOG(_L8("IsTooLarge - Entry")); + OstTraceFunctionEntry0( CMTPIMAGEDPSENDOBJECTINFO_ISTOOLARGE_ENTRY ); TBool ret(aObjectSize > KMaxTInt64); if(!ret) @@ -1319,7 +1342,7 @@ } } } - __FLOG_VA((_L8("Result = %d"), ret)); - __FLOG(_L8("IsTooLarge - Exit")); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPSENDOBJECTINFO_ISTOOLARGE, "Result = %d", ret ); + OstTraceFunctionExit0( CMTPIMAGEDPSENDOBJECTINFO_ISTOOLARGE_EXIT ); return ret; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpsetobjectproplist.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpsetobjectproplist.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpsetobjectproplist.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -30,8 +30,11 @@ #include "cmtpimagedpobjectpropertymgr.h" #include "cmtpimagedp.h" #include "mtpimagedputilits.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpsetobjectproplistTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"CMTPImageDpSetObjectPropList");) MMTPRequestProcessor* CMTPImageDpSetObjectPropList::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection,CMTPImageDataProvider& aDataProvider) { @@ -44,11 +47,10 @@ CMTPImageDpSetObjectPropList::~CMTPImageDpSetObjectPropList() { - __FLOG(_L8(">> CMTPImageDpSetObjectPropList::~CMTPImageDpSetObjectPropList")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROPLIST_CMTPIMAGEDPSETOBJECTPROPLIST_DES_ENTRY ); delete iPropertyList; delete iObjectMeta; - __FLOG(_L8("<< CMTPImageDpSetObjectPropList::~CMTPImageDpSetObjectPropList")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROPLIST_CMTPIMAGEDPSETOBJECTPROPLIST_DES_EXIT ); } CMTPImageDpSetObjectPropList::CMTPImageDpSetObjectPropList(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection,CMTPImageDataProvider& aDataProvider) : @@ -61,29 +63,29 @@ void CMTPImageDpSetObjectPropList::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8(">> CMTPImageDpSetObjectPropList::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROPLIST_CONSTRUCTL_ENTRY ); iPropertyList = CMTPTypeObjectPropList::NewL(); iObjectMeta = CMTPObjectMetaData::NewL(); - __FLOG(_L8("<< CMTPImageDpSetObjectPropList::ConstructL")); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROPLIST_CONSTRUCTL_EXIT ); } void CMTPImageDpSetObjectPropList::ServiceL() { - __FLOG(_L8(">> CMTPImageDpSetObjectPropList::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROPLIST_SERVICEL_ENTRY ); ReceiveDataL(*iPropertyList); - __FLOG(_L8(">> CMTPImageDpSetObjectPropList::ConstructL")); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROPLIST_SERVICEL_EXIT ); } TBool CMTPImageDpSetObjectPropList::DoHandleResponsePhaseL() { - __FLOG(_L8(">> CMTPImageDpSetObjectPropList::DoHandleResponsePhaseL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY ); MMTPObjectMgr& objects(iFramework.ObjectMgr()); TUint32 parameter(0); TMTPResponseCode responseCode(EMTPRespCodeOK); const TUint count(iPropertyList->NumberOfElements()); iPropertyList->ResetCursor(); - __FLOG_VA((_L8("setting %d properties"), count)); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL, + "setting %d properties", count ); TUint32 preHandle = KMTPHandleNone; for (TUint i(0); ((i < count) && (responseCode == EMTPRespCodeOK)); i++) { @@ -91,7 +93,8 @@ TUint32 handle = element.Uint32L(CMTPTypeObjectPropListElement::EObjectHandle); TUint16 propertyCode = element.Uint16L(CMTPTypeObjectPropListElement::EPropertyCode); TUint16 dataType = element.Uint16L(CMTPTypeObjectPropListElement::EDatatype); - __FLOG_VA((_L8("set property, propertycode %d, datatype %d, handle %d"), propertyCode, dataType, handle)); + OstTraceExt3( TRACE_NORMAL, DUP1_CMTPIMAGEDPSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL, + "set property, propertycode %d, datatype %d, handle %d", propertyCode, dataType, handle ); responseCode = MTPImageDpUtilits::VerifyObjectHandleL(iFramework, handle, *iObjectMeta); if ((EMTPRespCodeOK == responseCode) && (iObjectMeta->Uint(CMTPObjectMetaData::EDataProviderId) == iFramework.DataProviderId())) @@ -116,7 +119,10 @@ case EMTPObjectPropCodeNonConsumable: iPropertyMgr.SetPropertyL(TMTPObjectPropertyCode(propertyCode), element.Uint8L(CMTPTypeObjectPropListElement::EValue)); objects.ModifyObjectL(*iObjectMeta); - break; + break; + case EMTPObjectPropCodeHidden: + iPropertyMgr.SetPropertyL(TMTPObjectPropertyCode(propertyCode), element.Uint16L(CMTPTypeObjectPropListElement::EValue)); + break; default: responseCode = EMTPRespCodeInvalidObjectPropCode; break; @@ -133,19 +139,20 @@ } SendResponseL(responseCode, 1, ¶meter); - __FLOG(_L8("<< CMTPImageDpSetObjectPropList::DoHandleResponsePhaseL")); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } TBool CMTPImageDpSetObjectPropList::HasDataphase() const { - __FLOG(_L8(">> CMTPImageDpSetObjectPropList::HasDataphase")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROPLIST_HASDATAPHASE_ENTRY ); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROPLIST_HASDATAPHASE_EXIT ); return ETrue; } TMTPResponseCode CMTPImageDpSetObjectPropList::CheckPropCode(TUint16 aPropertyCode, TUint16 aDataType) const { - __FLOG(_L8(">> CMTPImageDpSetObjectPropList::CheckPropCode")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROPLIST_CHECKPROPCODE_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; switch(aPropertyCode) { @@ -180,11 +187,17 @@ { responseCode = EMTPRespCodeInvalidObjectPropFormat; } - break; + break; + case EMTPObjectPropCodeHidden: + if (aDataType != EMTPTypeUINT16) + { + responseCode = EMTPRespCodeInvalidObjectPropFormat; + } + break; default: responseCode = EMTPRespCodeInvalidObjectPropCode; } - __FLOG(_L8("<< CMTPImageDpSetObjectPropList::CheckPropCode")); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROPLIST_CHECKPROPCODE_EXIT ); return responseCode; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpsetobjectpropvalue.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpsetobjectpropvalue.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpsetobjectpropvalue.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -32,8 +32,12 @@ #include "cmtpimagedp.h" #include "cmtpimagedpobjectpropertymgr.h" #include "cmtpimagedpsetobjectpropvalue.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpsetobjectpropvalueTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"CMTPImageDpSetObjectPropValue");) + /** Two-phase construction method @param aPlugin The data provider plugin @@ -57,11 +61,10 @@ */ CMTPImageDpSetObjectPropValue::~CMTPImageDpSetObjectPropValue() { - __FLOG(_L8(">> ~CMTPImageDpSetObjectPropValue")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROPVALUE_CMTPIMAGEDPSETOBJECTPROPVALUE_DES_ENTRY ); delete iMTPTypeString; delete iObjectMeta; - __FLOG(_L8("<< ~CMTPImageDpSetObjectPropValue")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROPVALUE_CMTPIMAGEDPSETOBJECTPROPVALUE_DES_EXIT ); } /** @@ -84,7 +87,7 @@ */ TBool CMTPImageDpSetObjectPropValue::IsPropCodeReadonly(TUint32 aObjectPropCode) { - __FLOG(_L8(">> CMTPImageDpSetObjectPropValue::IsPropCodeReadonly")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROPVALUE_ISPROPCODEREADONLY_ENTRY ); TBool returnCode = EFalse; if(aObjectPropCode == EMTPObjectPropCodeStorageID || aObjectPropCode == EMTPObjectPropCodeObjectFormat @@ -104,7 +107,7 @@ { returnCode = ETrue; } - __FLOG(_L8("<< CMTPImageDpSetObjectPropValue::IsPropCodeReadonly")); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROPVALUE_ISPROPCODEREADONLY_EXIT ); return returnCode; } @@ -113,7 +116,7 @@ */ TMTPResponseCode CMTPImageDpSetObjectPropValue::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpSetObjectPropValue::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROPVALUE_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if(responseCode == EMTPRespCodeOK) { @@ -145,7 +148,7 @@ responseCode = EMTPRespCodeInvalidObjectPropCode; } } - __FLOG(_L8("<< CMTPImageDpSetObjectPropValue::CheckRequestL")); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROPVALUE_CHECKREQUESTL_EXIT ); return responseCode; } @@ -154,7 +157,7 @@ */ void CMTPImageDpSetObjectPropValue::ServiceL() { - __FLOG(_L8(">> CMTPImageDpSetObjectPropValue::ServiceL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROPVALUE_SERVICEL_ENTRY ); TUint32 propCode = Request().Uint32(TMTPTypeRequest::ERequestParameter2); delete iMTPTypeString; iMTPTypeString = NULL; @@ -168,11 +171,15 @@ break; case EMTPObjectPropCodeNonConsumable: ReceiveDataL(iMTPTypeUint8); - break; + break; + case EMTPObjectPropCodeHidden: + ReceiveDataL(iMTPTypeUint16); + break; default: + OstTrace1( TRACE_ERROR, CMTPIMAGEDPSETOBJECTPROPVALUE_SERVICEL, "Invalid propCode %d", propCode ); User::Leave(KErrGeneral); } - __FLOG(_L8("<< CMTPImageDpSetObjectPropValue::ServiceL")); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROPVALUE_SERVICEL_EXIT ); } /** @@ -181,7 +188,7 @@ */ TBool CMTPImageDpSetObjectPropValue::DoHandleResponsePhaseL() { - __FLOG(_L8(">> CMTPImageDpSetObjectPropValue::DoHandleResponsePhaseL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROPVALUE_DOHANDLERESPONSEPHASEL_ENTRY ); iObjectPropertyMgr.SetCurrentObjectL(*iObjectMeta, ETrue); /* @@ -192,6 +199,7 @@ if(EMTPProtectionReadOnly == protection) { SendResponseL(EMTPRespCodeAccessDenied); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROPVALUE_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } TInt32 handle(Request().Uint32(TMTPTypeRequest::ERequestParameter1)); @@ -233,15 +241,21 @@ iFramework.ObjectMgr().ModifyObjectL(*iObjectMeta); responseCode = EMTPRespCodeOK; } - break; + break; + case EMTPObjectPropCodeHidden: + { + iObjectPropertyMgr.SetPropertyL(TMTPObjectPropertyCode(propCode), iMTPTypeUint16.Value()); + responseCode = EMTPRespCodeOK; + } + break; default: responseCode = EMTPRespCodeInvalidObjectPropFormat; //Panic(EMTPImageDpUnsupportedProperty); } SendResponseL(responseCode); - - __FLOG(_L8("<< CMTPImageDpSetObjectPropValue::DoHandleResponsePhaseL")); + + OstTraceFunctionExit0( DUP1_CMTPIMAGEDPSETOBJECTPROPVALUE_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } @@ -255,12 +269,11 @@ */ void CMTPImageDpSetObjectPropValue::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8(">> CMTPImageDpSetObjectPropList::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROPVALUE_CONSTRUCTL_ENTRY ); iObjectMeta = CMTPObjectMetaData::NewL(); - - __FLOG(_L8("<< CMTPImageDpSetObjectPropList::ConstructL")); + + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROPVALUE_CONSTRUCTL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpsetobjectprotection.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpsetobjectprotection.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpsetobjectprotection.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -24,8 +24,11 @@ #include "mtpimagedputilits.h" #include "cmtpimagedp.h" #include "cmtpimagedpsetobjectprotection.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpsetobjectprotectionTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"SetObjectProtection");) /** Two-phase construction method @@ -48,11 +51,9 @@ */ CMTPImageDpSetObjectProtection::~CMTPImageDpSetObjectProtection() { - __FLOG(_L8(">> CMTPImageDpSetObjectProtection::~CMTPImageDpSetObjectProtection")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROTECTION_CMTPIMAGEDPSETOBJECTPROTECTION_DES_ENTRY ); delete iObjMeta; - __FLOG(_L8("<< CMTPImageDpSetObjectProtection::~CMTPImageDpSetObjectProtection")); - - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROTECTION_CMTPIMAGEDPSETOBJECTPROTECTION_DES_EXIT ); } /** @@ -69,17 +70,14 @@ */ void CMTPImageDpSetObjectProtection::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - - __FLOG(_L8(">> CMTPImageDpSetObjectProtection::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROTECTION_CONSTRUCTL_ENTRY ); iObjMeta = CMTPObjectMetaData::NewL(); - __FLOG(_L8("<< CMTPImageDpSetObjectProtection::ConstructL")); - + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROTECTION_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPImageDpSetObjectProtection::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpSetObjectProtection::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROTECTION_CHECKREQUESTL_ENTRY ); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); TUint32 statusValue = Request().Uint32(TMTPTypeRequest::ERequestParameter2); @@ -103,9 +101,10 @@ break; } } - __FLOG_VA((_L8("CheckRequestL - Exit with responseCode = 0x%04X"), responseCode)); - __FLOG(_L8("<< CMTPImageDpSetObjectProtection::CheckRequestL")); - + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPSETOBJECTPROTECTION_CHECKREQUESTL, + "Exit with responseCode = 0x%04X", responseCode ); + + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROTECTION_CHECKREQUESTL_EXIT ); return responseCode; } @@ -124,7 +123,7 @@ */ void CMTPImageDpSetObjectProtection::ServiceL() { - __FLOG(_L8(">> CMTPImageDpCopyObject::ServiceL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTPROTECTION_SERVICEL_ENTRY ); TUint32 statusValue = Request().Uint32(TMTPTypeRequest::ERequestParameter2); TMTPResponseCode responseCode = EMTPRespCodeOK; TInt ret = KErrNone; @@ -152,6 +151,6 @@ } SendResponseL(responseCode); - __FLOG(_L8("<< CMTPImageDpCopyObject::ServiceL")); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTPROTECTION_SERVICEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpsetobjectreferences.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpsetobjectreferences.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpsetobjectreferences.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,8 +23,11 @@ #include "cmtpimagedpsetobjectreferences.h" #include "mtpimagedputilits.h" #include "cmtpimagedp.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpsetobjectreferencesTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"SetObjectReferences");) /** Two-phase construction method @@ -47,10 +50,9 @@ */ CMTPImageDpSetObjectReferences::~CMTPImageDpSetObjectReferences() { - __FLOG(_L8(">> CMTPImageDpSetObjectReferences::~CMTPImageDpSetObjectReferences")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTREFERENCES_CMTPIMAGEDPSETOBJECTREFERENCES_DES_ENTRY ); delete iReferences; - __FLOG(_L8("<< CMTPImageDpSetObjectReferences::~CMTPImageDpSetObjectReferences")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTREFERENCES_CMTPIMAGEDPSETOBJECTREFERENCES_DES_EXIT ); } /** @@ -66,21 +68,21 @@ */ void CMTPImageDpSetObjectReferences::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8(">> CMTPImageDpSetObjectReferences::ConstructL")); - __FLOG(_L8("<< CMTPImageDpSetObjectReferences::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTREFERENCES_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTREFERENCES_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPImageDpSetObjectReferences::CheckRequestL() { - __FLOG(_L8(">> CMTPImageDpSetObjectReferences::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTREFERENCES_CHECKREQUESTL_ENTRY ); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); CMTPObjectMetaData* objectInfo = CMTPObjectMetaData::NewLC(); TMTPResponseCode responseCode = MTPImageDpUtilits::VerifyObjectHandleL(iFramework, objectHandle, *objectInfo); CleanupStack::PopAndDestroy(objectInfo); - __FLOG_VA((_L8("CheckRequestL - Exit with responseCode = 0x%04X"), responseCode)); - __FLOG(_L8("<< CMTPImageDpSetObjectReferences::CheckRequestL")); + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPSETOBJECTREFERENCES_CHECKREQUESTL, + "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTREFERENCES_CHECKREQUESTL_EXIT ); return responseCode; } @@ -110,12 +112,12 @@ */ void CMTPImageDpSetObjectReferences::ServiceL() { - __FLOG(_L8(">> CMTPImageDpCopyObject::ServiceL")); + OstTraceFunctionEntry0( CMTPIMAGEDPSETOBJECTREFERENCES_SERVICEL_ENTRY ); delete iReferences; iReferences = NULL; iReferences = CMTPTypeArray::NewL(EMTPTypeAUINT32); ReceiveDataL(*iReferences); - __FLOG(_L8("<< CMTPImageDpCopyObject::ServiceL")); + OstTraceFunctionExit0( CMTPIMAGEDPSETOBJECTREFERENCES_SERVICEL_EXIT ); } TBool CMTPImageDpSetObjectReferences::HasDataphase() const diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/cmtpimagedpthumbnailcreator.cpp --- a/mtpdataproviders/mtpimagedp/src/cmtpimagedpthumbnailcreator.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/cmtpimagedpthumbnailcreator.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -31,8 +31,13 @@ #include "mtpimagedpconst.h" #include "mtpimagedputilits.h" #include "cmtpimagedp.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpimagedpthumbnailcreatorTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"CMTPImageDpThumbnailCreator");) + // -------------------------------------------------------------------------- // CMTPImageDpThumbnailCreator::NewL // 2-phased constructor. @@ -54,7 +59,7 @@ // CMTPImageDpThumbnailCreator::~CMTPImageDpThumbnailCreator() { - __FLOG(_L8(">> ~CMTPImageDpThumbnailCreator")); + OstTraceFunctionEntry0( CMTPIMAGEDPTHUMBNAILCREATOR_CMTPIMAGEDPTHUMBNAILCREATOR_DES_ENTRY ); Cancel(); if(EGetting == iState) { @@ -74,8 +79,7 @@ iActiveSchedulerWait->AsyncStop(); } delete iActiveSchedulerWait; - __FLOG(_L8("<< ~CMTPImageDpThumbnailCreator")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPTHUMBNAILCREATOR_CMTPIMAGEDPTHUMBNAILCREATOR_DES_EXIT ); } // -------------------------------------------------------------------------- @@ -87,10 +91,9 @@ CActive(EPriorityStandard), iDataProvider(aDataProvider) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPImageDpThumbnailCreator::CMTPImageDpThumbnailCreator(), begin")); + OstTraceFunctionEntry0( DUP1_CMTPIMAGEDPTHUMBNAILCREATOR_CMTPIMAGEDPTHUMBNAILCREATOR_CONS_ENTRY ); CActiveScheduler::Add(this); - __FLOG(_L8("CMTPImageDpThumbnailCreator::CMTPImageDpThumbnailCreator(), end")); + OstTraceFunctionExit0( DUP1_CMTPIMAGEDPTHUMBNAILCREATOR_CMTPIMAGEDPTHUMBNAILCREATOR_CONS_EXIT ); } // -------------------------------------------------------------------------- @@ -100,14 +103,14 @@ // void CMTPImageDpThumbnailCreator::ConstructL() { - __FLOG(_L8("CMTPImageDpThumbnailCreator::ConstructL(), begin")); + OstTraceFunctionEntry0( CMTPIMAGEDPTHUMBNAILCREATOR_CONSTRUCTL_ENTRY ); iThumbMgr = CThumbnailManager::NewL( *this ); iThumbMgr->SetThumbnailSizeL( EGridThumbnailSize ); #ifdef MTPTHUMBSCALING iScaler = CBitmapScaler::NewL(); #endif iActiveSchedulerWait = new (ELeave) CActiveSchedulerWait(); - __FLOG(_L8("CMTPImageDpThumbnailCreator::ConstructL(), end")); + OstTraceFunctionExit0( CMTPIMAGEDPTHUMBNAILCREATOR_CONSTRUCTL_EXIT ); } // -------------------------------------------------------------------------- @@ -117,7 +120,8 @@ // void CMTPImageDpThumbnailCreator::DoCancel() { - __FLOG_VA((_L8(">> CMTPImageDpThumbnailCreator::DoCancel() iState %d iStatus 0x%X"), iState, iStatus.Int())); + OstTraceFunctionEntry0( CMTPIMAGEDPTHUMBNAILCREATOR_DOCANCEL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPIMAGEDPTHUMBNAILCREATOR_DOCANCEL, "iState %d iStatus 0x%X", iState, iStatus.Int() ); switch(iState) { #ifdef MTPTHUMBSCALING @@ -137,7 +141,8 @@ iActiveSchedulerWait->AsyncStop(); } // we will not continue creating thumbs. - __FLOG_VA((_L8("<< CMTPImageDpThumbnailCreator::DoCancel() iState %d"), iState)); + OstTraceFunctionExit0( CMTPIMAGEDPTHUMBNAILCREATOR_DOCANCEL_EXIT ); + OstTrace1( TRACE_NORMAL, DUP1_CMTPIMAGEDPTHUMBNAILCREATOR_DOCANCEL, "iState %d", iState); } // -------------------------------------------------------------------------- @@ -147,8 +152,12 @@ // void CMTPImageDpThumbnailCreator::RunL() { - __FLOG_VA((_L8(">> CMTPImageDpThumbnailCreator::RunL() iState %d iStatus %d"), iState, iStatus.Int())); - User::LeaveIfError(iStatus.Int()); + OstTraceFunctionEntry0( CMTPIMAGEDPTHUMBNAILCREATOR_RUNL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPIMAGEDPTHUMBNAILCREATOR_RUNL, "iState %d iStatus 0x%X", iState, iStatus.Int() ); + + LEAVEIFERROR(iStatus.Int(), + OstTrace1(TRACE_ERROR, DUP1_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL, "iStatus %d is not correct!", iStatus.Int() )); + switch (iState) { #ifdef MTPTHUMBSCALING @@ -170,12 +179,14 @@ iState=EIdle; if (iThumbMgr->Flags() == CThumbnailManager::EDoNotCreate) { - __FLOG_VA((_L8("CMTPImageDpThumbnailCreator::RunL(),EDoNotCreate; iState %d"), iState)); + OstTrace1( TRACE_NORMAL, DUP2_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL, + "CMTPImageDpThumbnailCreator::RunL(),EDoNotCreate; iState %d", iState ); + delete iData; iData = HBufC8::NewL(1); } - - __FLOG_VA((_L8("<< CMTPImageDpThumbnailCreator::RunL(),iBuffer->Write(*iData); iState %d"), iState)); + + OstTrace1( TRACE_NORMAL, DUP3_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL, "iBuffer->Write(*iData); iState %d", iState ); if(iActiveSchedulerWait->IsStarted()) { iActiveSchedulerWait->AsyncStop(); @@ -184,11 +195,13 @@ } default: { + OstTrace1( TRACE_ERROR, DUP4_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL, "Invalid iState %d", iState ); User::Leave(KErrGeneral); break; } } - __FLOG_VA((_L8("<< CMTPImageDpThumbnailCreator::RunL() iState %d"), iState)); + OstTrace1( TRACE_NORMAL, DUP5_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL, "iState %d", iState ); + OstTraceFunctionExit0( CMTPIMAGEDPTHUMBNAILCREATOR_RUNL_EXIT ); } // -------------------------------------------------------------------------- @@ -197,7 +210,8 @@ // TInt CMTPImageDpThumbnailCreator::RunError(TInt aErr) { - __FLOG_VA((_L8(">> CMTPImageDpThumbnailCreator::RunError() err 0x%X"), aErr)); + OstTraceFunctionEntry0( CMTPIMAGEDPTHUMBNAILCREATOR_RUNERROR_ENTRY ); + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CMTPIMAGEDPTHUMBNAILCREATOR_RUNERROR, "err 0x%X", aErr ); iState=EIdle; if(iActiveSchedulerWait->IsStarted()) { @@ -205,7 +219,7 @@ iActiveSchedulerWait->AsyncStop(); } // no need to cancel iScalerP since only leave is issued if scaler creation fails - __FLOG(_L8("<< CMTPImageDpThumbnailCreator::RunError()")); + OstTraceFunctionExit0( CMTPIMAGEDPTHUMBNAILCREATOR_RUNERROR_EXIT ); return KErrNone; } @@ -215,11 +229,10 @@ // void CMTPImageDpThumbnailCreator::GetThumbnailL(const TDesC& aFileName, HBufC8*& aDestinationData, TInt& result) { - __FLOG(_L8(">> CMtpImageDphumbnailCreator::GetThumbnailL()")); + OstTraceFunctionEntry0( CMTPIMAGEDPTHUMBNAILCREATOR_GETTHUMBNAILL_ENTRY ); GetThumbL(aFileName); iCreationErr = &result; //reset the err flag *iCreationErr = KErrNone; - __FLOG(_L8("<< CMTPImageDpThumbnailCreator::CreateThumbnailL()")); iActiveSchedulerWait->Start(); /** @@ -234,6 +247,7 @@ { aDestinationData = NULL; } + OstTraceFunctionExit0( CMTPIMAGEDPTHUMBNAILCREATOR_GETTHUMBNAILL_EXIT ); } // -------------------------------------------------------------------------- @@ -254,7 +268,7 @@ void CMTPImageDpThumbnailCreator::GetThumbL(const TDesC& aFileName) { - __FLOG(_L8(">> CMtpImageDphumbnailCreator::GetThumbL()")); + OstTraceFunctionEntry0( CMTPIMAGEDPTHUMBNAILCREATOR_GETTHUMBL_ENTRY ); // Create an object source representing a path to a file on local // file system. delete iObjectSource; @@ -264,7 +278,8 @@ if (parse.Ext().Length() >= 1) { const TDesC& mimeType = iDataProvider.FindMimeType(parse.Ext().Mid(1)); - __FLOG_VA((_L16("CMtpImageDphumbnailCreator::GetThumbL() - FileName:%S, MimeType:%S"), &aFileName, &mimeType)); + OstTraceExt2( TRACE_NORMAL, CMTPIMAGEDPTHUMBNAILCREATOR_GETTHUMBL, + "CMtpImageDphumbnailCreator::GetThumbL() - FileName:%S, MimeType:%S", aFileName, mimeType ); iObjectSource = CThumbnailObjectSource::NewL(aFileName, mimeType); } @@ -274,7 +289,7 @@ } iCurrentReq = iThumbMgr->GetThumbnailL( *iObjectSource ); iState = EGetting; - __FLOG(_L8("<< CMtpImageDphumbnailCreator::GetThumbL()")); + OstTraceFunctionExit0( CMTPIMAGEDPTHUMBNAILCREATOR_GETTHUMBL_EXIT ); } #ifdef MTPTHUMBSCALING @@ -285,7 +300,7 @@ // void CMTPImageDpThumbnailCreator::ScaleBitmap() { - __FLOG(_L8("CMTPImageDpThumbnailCreator::ScaleBitmapL(), begin")); + OstTraceFunctionEntry0( CMTPIMAGEDPTHUMBNAILCREATOR_SCALEBITMAP_ENTRY ); TSize size( KThumbWidht, KThumbHeigth ); // size 160x120 // Resize image to thumbnail size // iScaler->Scale( &iStatus, *iBitmap, size ); @@ -299,7 +314,7 @@ User::RequestComplete( status, KErrNone ); SetActive(); - __FLOG(_L8("CMTPImageDpThumbnailCreator::ScaleBitmapL(), end")); + OstTraceFunctionExit0( CMTPIMAGEDPTHUMBNAILCREATOR_SCALEBITMAP_EXIT ); } #endif @@ -310,7 +325,7 @@ // void CMTPImageDpThumbnailCreator::EncodeImageL( ) { - __FLOG(_L8(">> CMTPImageDpThumbnailCreator::EncodeImageL()")); + OstTraceFunctionEntry0( CMTPIMAGEDPTHUMBNAILCREATOR_ENCODEIMAGEL_ENTRY ); delete iData; iData = NULL; @@ -322,18 +337,20 @@ iImgEnc = CImageEncoder::DataNewL( iData, KPtpMimeJPEG, CImageEncoder::EPreferFastEncode ); iImgEnc->Convert( &iStatus, *iBitmap ); SetActive(); - __FLOG(_L8("<< CMTPImageDpThumbnailCreator::EncodeImageL()")); + OstTraceFunctionExit0( CMTPIMAGEDPTHUMBNAILCREATOR_ENCODEIMAGEL_EXIT ); } // // void CMTPImageDpThumbnailCreator::ThumbnailReady( TInt aError, MThumbnailData& aThumbnail, TThumbnailRequestId aId ) { + OstTraceFunctionEntry0( CMTPIMAGEDPTHUMBNAILCREATOR_THUMBNAILREADY_ENTRY ); // This function must not leave. - __FLOG(_L8(">> CMTPImageDpThumbnailCreator::ThumbnailReady()")); if(iCurrentReq != aId) { - __FLOG(_L8("CMTPImageDpThumbnailCreator::ThumbnailReady(),iCurrentReq != aId")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPIMAGEDPTHUMBNAILCREATOR_THUMBNAILREADY, + "CMTPImageDpThumbnailCreator::ThumbnailReady(),iCurrentReq != aId" ); + OstTraceFunctionExit0( CMTPIMAGEDPTHUMBNAILCREATOR_THUMBNAILREADY_EXIT ); return; } if (aError == KErrNone) @@ -350,7 +367,8 @@ } else if ((iThumbMgr->Flags() == CThumbnailManager::EDoNotCreate) && (aError == KErrNotFound)) { - __FLOG(_L8("CMTPImageDpThumbnailCreator::ThumbnailReady(),EDoNotCreate, KErrNotFound")); + OstTrace0( TRACE_NORMAL, CMTPIMAGEDPTHUMBNAILCREATOR_THUMBNAILREADY, + "CMTPImageDpThumbnailCreator::ThumbnailReady(),EDoNotCreate, KErrNotFound" ); iState = EEncoding; //don't trigger TNM to create thumbnail if image files are too big //iThumbMgr->CreateThumbnails(*iObjectSource); @@ -360,7 +378,7 @@ TRequestStatus* status=&iStatus; User::RequestComplete(status, aError); SetActive(); - __FLOG(_L8("<< CMTPImageDpThumbnailCreator::ThumbnailReady()")); + OstTraceFunctionExit0( DUP1_CMTPIMAGEDPTHUMBNAILCREATOR_THUMBNAILREADY_EXIT ); } void CMTPImageDpThumbnailCreator::ThumbnailPreviewReady( MThumbnailData& /*aThumbnail*/, TThumbnailRequestId /*aId*/ ) diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/src/mtpimagedpgetformatcapabilities.cpp --- a/mtpdataproviders/mtpimagedp/src/mtpimagedpgetformatcapabilities.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpimagedp/src/mtpimagedpgetformatcapabilities.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -26,8 +26,12 @@ #include "cmtpimagedpgetformatcapabilities.h" #include "cmtpimagedp.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "mtpimagedpgetformatcapabilitiesTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"ImageDpGetFormatCapabilities");) + MMTPRequestProcessor* CMTPImageDpGetFormatCapabilities::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection,CMTPImageDataProvider& /*aDataProvider*/) { CMTPImageDpGetFormatCapabilities* self = new (ELeave) CMTPImageDpGetFormatCapabilities(aFramework, aConnection); @@ -39,15 +43,14 @@ CMTPImageDpGetFormatCapabilities::~CMTPImageDpGetFormatCapabilities() { - __FLOG(_L8(">> ~CMTPPictureDpGetObject")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETFORMATCAPABILITIES_CMTPIMAGEDPGETFORMATCAPABILITIES_ENTRY ); delete iCapabilityList; - __FLOG(_L8("<< ~CMTPPictureDpGetObject")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPIMAGEDPGETFORMATCAPABILITIES_CMTPIMAGEDPGETFORMATCAPABILITIES_EXIT ); } void CMTPImageDpGetFormatCapabilities::ServiceL() { - __FLOG(_L8(">> CMTPPictureDpGetFormatCapabilities::ServiceL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICEL_ENTRY ); delete iCapabilityList; iCapabilityList = NULL; iCapabilityList = CMTPTypeFormatCapabilityList::NewL(); @@ -66,12 +69,12 @@ } SendDataL(*iCapabilityList); - __FLOG(_L8("<< CMTPPictureDpGetFormatCapabilities::ServiceL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICEL_EXIT ); } void CMTPImageDpGetFormatCapabilities::ServiceOneFormatCapabilitiesL(TUint aFormatCode) { - __FLOG(_L8(">> CMTPPictureDpGetFormatCapabilities::BuildFormatExifJpegL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICEONEFORMATCAPABILITIESL_ENTRY ); CMTPTypeInterdependentPropDesc* interDesc = CMTPTypeInterdependentPropDesc::NewLC(); CMTPTypeFormatCapability* frmCap = CMTPTypeFormatCapability::NewLC(aFormatCode, interDesc); @@ -132,7 +135,8 @@ //EMTPObjectPropCodeNonConsumable frmCap->AppendL(ServiceNonConsumableL() ); - + //EMTPObjectPropCodeHidden + frmCap->AppendL( ServiceHiddenL() ); CMTPTypeObjectPropDesc::TPropertyInfo info; info.iDataType = EMTPTypeString; @@ -210,13 +214,13 @@ iCapabilityList->AppendL(frmCap); CleanupStack::Pop(frmCap); CleanupStack::Pop(interDesc); - __FLOG(_L8("<< CMTPPictureDpGetFormatCapabilities::BuildFormatExifJpegL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICEONEFORMATCAPABILITIESL_EXIT ); } CMTPTypeObjectPropDesc* CMTPImageDpGetFormatCapabilities::ServiceProtectionStatusL() { - __FLOG(_L8(">> CMTPPictureDpGetFormatCapabilities::ServiceProtectionStatusL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICEPROTECTIONSTATUSL_ENTRY ); CMTPTypeObjectPropDescEnumerationForm* expectedForm = CMTPTypeObjectPropDescEnumerationForm::NewL(EMTPTypeUINT16); CleanupStack::PushL(expectedForm); //Currently, we only support EMTPProtectionNoProtection and EMTPProtectionReadOnly @@ -232,14 +236,14 @@ ret->SetUint32L(CMTPTypeObjectPropDesc::EGroupCode, GetPropertyGroupNumber(EMTPObjectPropCodeProtectionStatus)); CleanupStack::Pop(1, ret); CleanupStack::PopAndDestroy(expectedForm); - __FLOG(_L8("<< CMTPPictureDpGetFormatCapabilities::ServiceProtectionStatusL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICEPROTECTIONSTATUSL_EXIT ); return ret; } CMTPTypeObjectPropDesc* CMTPImageDpGetFormatCapabilities::ServiceNonConsumableL() { - __FLOG(_L8(">> CMTPPictureDpGetFormatCapabilities::ServiceNonConsumableL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICENONCONSUMABLEL_ENTRY ); CMTPTypeObjectPropDescEnumerationForm* expectedForm = CMTPTypeObjectPropDescEnumerationForm::NewL(EMTPTypeUINT8); CleanupStack::PushL(expectedForm); TUint8 values[] = {0,1}; @@ -253,14 +257,14 @@ ret->SetUint32L(CMTPTypeObjectPropDesc::EGroupCode, GetPropertyGroupNumber(EMTPObjectPropCodeNonConsumable)); CleanupStack::Pop(1, ret); CleanupStack::PopAndDestroy(expectedForm); - __FLOG(_L8("<< CMTPPictureDpGetFormatCapabilities::ServiceNonConsumableL")); + OstTraceFunctionExit0( CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICENONCONSUMABLEL_EXIT ); return ret; } TMTPResponseCode CMTPImageDpGetFormatCapabilities::CheckRequestL() { - __FLOG(_L8(">> CMTPPictureDpGetFormatCapabilities::CheckRequestL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETFORMATCAPABILITIES_CHECKREQUESTL_ENTRY ); TMTPResponseCode response = EMTPRespCodeOK; iFormatCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1); @@ -276,8 +280,10 @@ break; } } - } - __FLOG_VA((_L8("<< CMTPPictureDpGetFormatCapabilities::CheckRequestL - response = 0x%x"), response)); + } + OstTrace1( TRACE_NORMAL, CMTPIMAGEDPGETFORMATCAPABILITIES_CHECKREQUESTL, "response = 0x%x", response ); + OstTraceFunctionExit0( CMTPIMAGEDPGETFORMATCAPABILITIES_CHECKREQUESTL_EXIT ); + return response; } @@ -289,17 +295,33 @@ void CMTPImageDpGetFormatCapabilities::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8(">> CMTPPictureDpGetFormatCapabilities::ConstructL")); - __FLOG(_L8("<< CMTPPictureDpGetFormatCapabilities::ConstructL")); + OstTraceFunctionEntry0( CMTPIMAGEDPGETFORMATCAPABILITIES_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPIMAGEDPGETFORMATCAPABILITIES_CONSTRUCTL_EXIT ); } +CMTPTypeObjectPropDesc* CMTPImageDpGetFormatCapabilities::ServiceHiddenL() + { + CMTPTypeObjectPropDescEnumerationForm* expectedForm = CMTPTypeObjectPropDescEnumerationForm::NewL(EMTPTypeUINT16); + CleanupStack::PushL(expectedForm); + TUint16 values[] = {EMTPVisible, EMTPHidden}; + TUint numValues((sizeof(values) / sizeof(values[0]))); + for (TUint i = 0; i < numValues; i++) + { + TMTPTypeUint16 data(values[i]); + expectedForm->AppendSupportedValueL(data); + } + CMTPTypeObjectPropDesc* ret = CMTPTypeObjectPropDesc::NewL(EMTPObjectPropCodeHidden, *expectedForm); + CleanupStack::PopAndDestroy(expectedForm); + return ret; + } + TUint16 CMTPImageDpGetFormatCapabilities::GetPropertyGroupNumber(const TUint16 aPropCode) const { for( TInt propCodeIndex = 0 ; propCodeIndex < KMTPImageDpGroupOneSize ; propCodeIndex++) { if(KMTPImageDpGroupOneProperties[propCodeIndex] == aPropCode) { + OstTraceFunctionExit0( CMTPIMAGEDPGETFORMATCAPABILITIES_GETPROPERTYGROUPNUMBER_EXIT ); return KMTPImageDpPropertyGroupOneNumber; } } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpdataproviders/mtpimagedp/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpimagedp/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpdataproviders/mtpimagedp/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,551 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_IMPORTANT=0x85 +[GROUP]TRACE_NORMAL=0x86 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPCOPYOBJECT_COPYFILEL=0x2 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPCOPYOBJECT_GETPREVIOUSPROPERTIESL=0x7 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPCOPYOBJECT_ROLLBACKFROMFSL=0x9 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPCOPYOBJECT_SETDEFAULTPARENTOBJECTL=0x3 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPCOPYOBJECT_SETPREVIOUSPROPERTIESL=0x8 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPDELETEOBJECT_CHECKSTORAGEL=0xa +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEONEOBJECTPROPERTYL=0xe +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPGETOBJECTPROPVALUE_SERVICEL=0xf +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPMOVEOBJECT_CANMOVEOBJECTL=0x12 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPOBJECTPROPERTYMGR_CONVERTMTPTIMESTR2TTIMEL=0x1c +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPEARRAY=0x1b +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TMTPTYPEUINT128=0x19 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT64=0x18 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL=0x15 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPOBJECTPROPERTYMGR_TDESC_SETPROPERTYL=0x16 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPOBJECTPROPERTYMGR_TUINT8_GETPROPERTYL=0x17 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL=0x1f +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL=0x23 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x21 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL=0x22 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL=0x20 +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPSENDOBJECTINFO_SERVICEL=0x1e +[TRACE]TRACE_ERROR[0x82]_CMTPIMAGEDPSETOBJECTPROPVALUE_SERVICEL=0x26 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPIMAGEDATAPROVIDER_CONSTRUCTL=0x1 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPIMAGEDPCOPYOBJECT_CANCOPYOBJECTL=0x4 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPIMAGEDPDELETEOBJECT_CHECKSTORAGEL=0xb +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPIMAGEDPGETOBJECTPROPDESC_SERVICEL=0xd +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPIMAGEDPGETPARTIALOBJECT_VERIFYPARAMETERSL=0x10 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPIMAGEDPGETTHUMB_SERVICEL=0x11 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPIMAGEDPMOVEOBJECT_CANMOVEOBJECTL=0x13 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL=0x1a +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPIMAGEDPSENDOBJECTINFO_CHECKREQUESTL=0x1d +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL=0x27 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPIMAGEDPCOPYOBJECT_CANCOPYOBJECTL=0x5 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPIMAGEDPMOVEOBJECT_CANMOVEOBJECTL=0x14 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPIMAGEDPCOPYOBJECT_CANCOPYOBJECTL=0x6 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL=0x24 +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL=0xc +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL=0x25 +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL=0x28 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_CANCEL_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_CANCEL_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_CMTPIMAGEDATAPROVIDER_DES_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_CMTPIMAGEDATAPROVIDER_DES_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_CONSTRUCTL_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_CONSTRUCTL_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_DECREASENEWPICTURES_ENTRY=0x23 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_DECREASENEWPICTURES_EXIT=0x24 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_HANDLEMDESESSIONCOMPLETEL_ENTRY=0x28 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_HANDLEMDESESSIONCOMPLETEL_EXIT=0x29 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_INCREASENEWPICTURES_ENTRY=0x21 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_INCREASENEWPICTURES_EXIT=0x22 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY=0x17 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT=0x18 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_ENTRY=0x15 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_EXIT=0x16 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_NOTIFYSTORAGEENUMERATIONCOMPLETEL_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_NOTIFYSTORAGEENUMERATIONCOMPLETEL_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_PROCESSEVENTL_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_PROCESSEVENTL_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_PROCESSNOTIFICATIONL_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_PROCESSNOTIFICATIONL_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_PROCESSREQUESTPHASEL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_PROCESSREQUESTPHASEL_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_RENAMEOBJECTL_ENTRY=0x1f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_RENAMEOBJECTL_EXIT=0x20 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_RESETNEWPICTURES_ENTRY=0x25 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_RESETNEWPICTURES_EXIT=0x26 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_SESSIONCLOSEDL_ENTRY=0x1b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_SESSIONCLOSEDL_EXIT=0x1c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_SESSIONOPENEDL_ENTRY=0x1d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_SESSIONOPENEDL_EXIT=0x1e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_STARTOBJECTENUMERATIONL_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_STARTOBJECTENUMERATIONL_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_STARTSTORAGEENUMERATIONL_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_STARTSTORAGEENUMERATIONL_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_SUPPORTED_ENTRY=0x11 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDATAPROVIDER_SUPPORTED_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_CANCOPYOBJECTL_ENTRY=0x3b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_CANCOPYOBJECTL_EXIT=0x3c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_CHECKREQUESTL=0x2f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_CHECKREQUESTL_ENTRY=0x2e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_CHECKREQUESTL_EXIT=0x30 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_CMTPIMAGEDPCOPYOBJECT_DES_ENTRY=0x2a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_CMTPIMAGEDPCOPYOBJECT_DES_EXIT=0x2b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_CONSTRUCTL_ENTRY=0x2c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_CONSTRUCTL_EXIT=0x2d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_COPYFILEL_ENTRY=0x35 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_COPYFILEL_EXIT=0x36 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_COPYOBJECTL_ENTRY=0x33 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_COPYOBJECTL_EXIT=0x34 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_GETPARAMETERSL_ENTRY=0x37 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_GETPARAMETERSL_EXIT=0x38 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_GETPREVIOUSPROPERTIESL_ENTRY=0x3d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_GETPREVIOUSPROPERTIESL_EXIT=0x3e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_SERVICEL_ENTRY=0x31 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_SERVICEL_EXIT=0x32 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_SETDEFAULTPARENTOBJECTL_ENTRY=0x39 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_SETDEFAULTPARENTOBJECTL_EXIT=0x3a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_SETPREVIOUSPROPERTIESL_ENTRY=0x3f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPCOPYOBJECT_SETPREVIOUSPROPERTIESL_EXIT=0x40 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_CHECKREQUESTL_ENTRY=0x47 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_CHECKREQUESTL_EXIT=0x48 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_CHECKSTORAGEL_ENTRY=0x51 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_CHECKSTORAGEL_EXIT=0x52 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_CMTPIMAGEDPDELETEOBJECT_CONS_ENTRY=0x41 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_CMTPIMAGEDPDELETEOBJECT_CONS_EXIT=0x42 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_CONSTRUCTL_ENTRY=0x43 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_CONSTRUCTL_EXIT=0x44 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL=0x56 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL_ENTRY=0x55 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL_EXIT=0x58 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_DOCANCEL_ENTRY=0x4f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_DOCANCEL_EXIT=0x50 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_GETOBJECTHANDLESL_ENTRY=0x53 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_GETOBJECTHANDLESL_EXIT=0x54 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_RUNL_ENTRY=0x4d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_RUNL_EXIT=0x4e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_SENDRESPONSEL_ENTRY=0x5c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_SENDRESPONSEL_EXIT=0x5d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_SERVICEL=0x4a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_SERVICEL_ENTRY=0x49 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_SERVICEL_EXIT=0x4c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_STARTL_ENTRY=0x59 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPDELETEOBJECT_STARTL_EXIT=0x5a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_CHECKREQUESTL_ENTRY=0x197 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_CHECKREQUESTL_EXIT=0x198 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_CMTPIMAGEDPGETFORMATCAPABILITIES_ENTRY=0x18d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_CMTPIMAGEDPGETFORMATCAPABILITIES_EXIT=0x18e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_CONSTRUCTL_ENTRY=0x199 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_CONSTRUCTL_EXIT=0x19a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_GETPROPERTYGROUPNUMBER_EXIT=0x19b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICEL_ENTRY=0x18f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICEL_EXIT=0x190 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICENONCONSUMABLEL_ENTRY=0x195 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICENONCONSUMABLEL_EXIT=0x196 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICEONEFORMATCAPABILITIESL_ENTRY=0x191 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICEONEFORMATCAPABILITIESL_EXIT=0x192 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICEPROTECTIONSTATUSL_ENTRY=0x193 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETFORMATCAPABILITIES_SERVICEPROTECTIONSTATUSL_EXIT=0x194 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_BUILDOBJECTINFOL_ENTRY=0x71 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_BUILDOBJECTINFOL_EXIT=0x72 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_CHECKREQUESTL_ENTRY=0x6b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_CHECKREQUESTL_EXIT=0x6c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_CMTPIMAGEDPGETOBJECTINFO_DES_ENTRY=0x69 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_CMTPIMAGEDPGETOBJECTINFO_DES_EXIT=0x6a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_CONSTRUCTL_ENTRY=0x6f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_CONSTRUCTL_EXIT=0x70 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_SERVICEL_ENTRY=0x6d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_SERVICEL_EXIT=0x6e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_SETFILENAMEL_ENTRY=0x73 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_SETFILENAMEL_EXIT=0x74 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_SETFILESIZEDATEL_ENTRY=0x75 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_SETFILESIZEDATEL_EXIT=0x76 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_SETKEYWORDL_ENTRY=0x77 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTINFO_SETKEYWORDL_EXIT=0x78 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPDESC_CMTPIMAGEDPGETOBJECTPROPDESC_DES_ENTRY=0x79 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPDESC_CMTPIMAGEDPGETOBJECTPROPDESC_DES_EXIT=0x7a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPDESC_SERVICEL_ENTRY=0x7d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPDESC_SERVICEL_EXIT=0x7e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_CHECKDEPTH_ENTRY=0x89 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_CHECKDEPTH_EXIT=0x8a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_CHECKPROPCODE_ENTRY=0x87 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_CHECKPROPCODE_EXIT=0x88 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_CHECKREQUESTL_ENTRY=0x85 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_CHECKREQUESTL_EXIT=0x86 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_CMTPIMAGEDPGETOBJECTPROPLIST_DES_ENTRY=0x81 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_CMTPIMAGEDPGETOBJECTPROPLIST_DES_EXIT=0x82 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_CONSTRUCTL_ENTRY=0x7f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_CONSTRUCTL_EXIT=0x80 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_DOCANCEL_ENTRY=0x99 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_DOCANCEL_EXIT=0x9a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_GETOBJECTHANDLESL_ENTRY=0x8b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_GETOBJECTHANDLESL_EXIT=0x8c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_GETROOTOBJECTHANDLESL_ENTRY=0x8f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_GETROOTOBJECTHANDLESL_EXIT=0x90 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_RUNERROR_ENTRY=0x9d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_RUNERROR_EXIT=0x9e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_RUNL_ENTRY=0x9b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_RUNL_EXIT=0x9c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEALLPROPERTIESL_ENTRY=0x93 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEALLPROPERTIESL_EXIT=0x94 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEGROUPPROPERTIESL_ENTRY=0x95 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEGROUPPROPERTIESL_EXIT=0x96 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEL_ENTRY=0x83 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEL_EXIT=0x84 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEONEOBJECTPROPERTYL_ENTRY=0x97 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEONEOBJECTPROPERTYL_EXIT=0x98 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEPROPERTIESL_ENTRY=0x91 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_SERVICEPROPERTIESL_EXIT=0x92 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_STARTL_ENTRY=0x9f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTPROPLIST_STARTL_EXIT=0xa0 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTREFERENCES_CHECKREQUESTL_ENTRY=0xa5 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTREFERENCES_CHECKREQUESTL_EXIT=0xa6 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTREFERENCES_CMTPIMAGEDPGETOBJECTREFERENCES_ENTRY=0xa1 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTREFERENCES_CMTPIMAGEDPGETOBJECTREFERENCES_EXIT=0xa2 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTREFERENCES_CONSTRUCTL_ENTRY=0xa3 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTREFERENCES_CONSTRUCTL_EXIT=0xa4 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTREFERENCES_SERVICEL_ENTRY=0xa7 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECTREFERENCES_SERVICEL_EXIT=0xa8 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECT_BUILDFILEOBJECTL_ENTRY=0x66 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECT_BUILDFILEOBJECTL_EXIT=0x67 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECT_CHECKREQUESTL_ENTRY=0x62 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECT_CHECKREQUESTL_EXIT=0x63 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECT_CMTPIMAGEDPGETOBJECT_ENTRY=0x5e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECT_CMTPIMAGEDPGETOBJECT_EXIT=0x5f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECT_CONSTRUCTL_ENTRY=0x60 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECT_CONSTRUCTL_EXIT=0x61 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECT_DOHANDLECOMPLETINGPHASEL_ENTRY=0x68 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECT_SERVICEL_ENTRY=0x64 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETOBJECT_SERVICEL_EXIT=0x65 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETPARTIALOBJECT_CHECKREQUESTL_ENTRY=0xad +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETPARTIALOBJECT_CHECKREQUESTL_EXIT=0xae +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETPARTIALOBJECT_CMTPIMAGEDPGETPARTIALOBJECT_ENTRY=0xa9 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETPARTIALOBJECT_CMTPIMAGEDPGETPARTIALOBJECT_EXIT=0xaa +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETPARTIALOBJECT_CONSTRUCTL_ENTRY=0xab +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETPARTIALOBJECT_CONSTRUCTL_EXIT=0xac +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETPARTIALOBJECT_DOHANDLERESPONSEPHASEL_ENTRY=0xb3 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETPARTIALOBJECT_DOHANDLERESPONSEPHASEL_EXIT=0xb4 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETPARTIALOBJECT_SERVICEL_ENTRY=0xb1 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETPARTIALOBJECT_SERVICEL_EXIT=0xb2 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETPARTIALOBJECT_VERIFYPARAMETERSL_ENTRY=0xaf +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETPARTIALOBJECT_VERIFYPARAMETERSL_EXIT=0xb0 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETTHUMB_CHECKREQUESTL_ENTRY=0xb9 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETTHUMB_CHECKREQUESTL_EXIT=0xba +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETTHUMB_CMTPIMAGEDPGETTHUMB_ENTRY=0xb5 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETTHUMB_CMTPIMAGEDPGETTHUMB_EXIT=0xb6 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETTHUMB_CONSTRUCTL_ENTRY=0xb7 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETTHUMB_CONSTRUCTL_EXIT=0xb8 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETTHUMB_SERVICEL_ENTRY=0xbb +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPGETTHUMB_SERVICEL_EXIT=0xbc +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMDEOBSERVER_CMTPIMAGEDPMDEOBSERVER_ENTRY=0xbf +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMDEOBSERVER_CMTPIMAGEDPMDEOBSERVER_EXIT=0xc0 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMDEOBSERVER_CONSTRUCTL_ENTRY=0xbd +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMDEOBSERVER_CONSTRUCTL_EXIT=0xbe +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMDEOBSERVER_HANDLEOBJECTNOTIFICATIONL_ENTRY=0xc3 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMDEOBSERVER_HANDLEOBJECTNOTIFICATIONL_EXIT=0xc4 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL_ENTRY=0xc1 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL_EXIT=0xc2 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMDEOBSERVER_SUBSCRIBEFORCHANGENOTIFICATIONL_ENTRY=0xc5 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMDEOBSERVER_SUBSCRIBEFORCHANGENOTIFICATIONL_EXIT=0xc6 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMDEOBSERVER_UNSUBSCRIBEFORCHANGENOTIFICATIONL_ENTRY=0xc7 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMDEOBSERVER_UNSUBSCRIBEFORCHANGENOTIFICATIONL_EXIT=0xc8 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_CANMOVEOBJECTL_ENTRY=0xd9 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_CANMOVEOBJECTL_EXIT=0xda +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_CHECKREQUESTL_ENTRY=0xcd +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_CHECKREQUESTL_EXIT=0xce +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_CMTPIMAGEDPMOVEOBJECT_ENTRY=0xc9 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_CMTPIMAGEDPMOVEOBJECT_EXIT=0xca +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_CONSTRUCTL_ENTRY=0xcb +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_CONSTRUCTL_EXIT=0xcc +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_GETPARAMETERSL_ENTRY=0xd5 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_GETPARAMETERSL_EXIT=0xd6 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_MOVEFILEL_ENTRY=0xd1 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_MOVEFILEL_EXIT=0xd2 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_MOVEIMAGEFILE_ENTRY=0xdb +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_MOVEOBJECTL_ENTRY=0xd3 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_MOVEOBJECTL_EXIT=0xd4 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_SERVICEL_ENTRY=0xcf +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_SERVICEL_EXIT=0xd0 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_SETDEFAULTPARENTOBJECTL_ENTRY=0xd7 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPMOVEOBJECT_SETDEFAULTPARENTOBJECTL_EXIT=0xd8 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_CMTPIMAGEDPOBJECTPROPERTYMGR_DES_ENTRY=0xdc +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_CMTPIMAGEDPOBJECTPROPERTYMGR_DES_EXIT=0xdd +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETDAY_ENTRY=0xfc +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETDAY_EXIT=0xfd +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETHOUR_ENTRY=0xfe +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETHOUR_EXIT=0xff +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETMINUTE_ENTRY=0x100 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETMINUTE_EXIT=0x101 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETMONTH_ENTRY=0xfa +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETMONTH_EXIT=0xfb +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYFROMMDSL_ENTRY=0xf6 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYFROMMDSL_EXIT=0xf7 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPEARRAY_ENTRY=0xf4 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPEARRAY_EXIT=0xf5 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPESTRING_ENTRY=0xf2 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_CMTPTYPESTRING_EXIT=0xf3 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TMTPTYPEUINT128_ENTRY=0xf0 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TMTPTYPEUINT128_EXIT=0xf1 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT16_ENTRY=0xea +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT16_EXIT=0xeb +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT32_ENTRY=0xec +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT32_EXIT=0xed +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT64_ENTRY=0xee +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT64_EXIT=0xef +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT8_ENTRY=0xe8 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT8_EXIT=0xe9 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETSECOND_ENTRY=0x102 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETSECOND_EXIT=0x103 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETTENTHSECOND_ENTRY=0x104 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETTENTHSECOND_EXIT=0x105 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETYEAR_ENTRY=0xf8 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETYEAR_EXIT=0xf9 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_REMOVEPROPERTY_ENTRY=0x106 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_REMOVEPROPERTY_EXIT=0x107 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL_ENTRY=0xde +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL_EXIT=0xdf +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TDESC_ENTRY=0xe6 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TDESC_EXIT=0xe7 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT16_ENTRY=0xe2 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT16_EXIT=0xe3 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT32_ENTRY=0xe4 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT32_EXIT=0xe5 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT8_ENTRY=0xe0 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPOBJECTPROPERTYMGR_SETPROPERTYL_TUINT8_EXIT=0xe1 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPRENAMEOBJECT_CMTPIMAGEDPRENAMEOBJECT_DES_ENTRY=0x108 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPRENAMEOBJECT_CMTPIMAGEDPRENAMEOBJECT_DES_EXIT=0x109 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPRENAMEOBJECT_CONSTRUCTL_ENTRY=0x10e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPRENAMEOBJECT_CONSTRUCTL_EXIT=0x10f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPRENAMEOBJECT_GENERATEOBJECTHANDLELISTL_ENTRY=0x110 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPRENAMEOBJECT_GENERATEOBJECTHANDLELISTL_EXIT=0x111 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPRENAMEOBJECT_RUNL_ENTRY=0x10c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPRENAMEOBJECT_RUNL_EXIT=0x10d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPRENAMEOBJECT_STARTL_ENTRY=0x10a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPRENAMEOBJECT_STARTL_EXIT=0x10b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CHECKOBJECTINFOPARAMSL_ENTRY=0x118 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CHECKOBJECTPARAMS_ENTRY=0x11b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CHECKOBJECTPROPLISTPARAMSL_ENTRY=0x119 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CHECKOBJECTPROPLISTPARAMSL_EXIT=0x11a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CHECKPROPCODEL_ENTRY=0x141 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CHECKPROPCODEL_EXIT=0x142 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CHECKREQUESTL_ENTRY=0x116 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CHECKREQUESTL_EXIT=0x117 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CLEANUNDOLIST_ENTRY=0x149 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CLEANUNDOLIST_EXIT=0x14a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CMTPIMAGEDPSENDOBJECTINFO_DES_ENTRY=0x112 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CMTPIMAGEDPSENDOBJECTINFO_DES_EXIT=0x113 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CONSTRUCTL_ENTRY=0x114 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_CONSTRUCTL_EXIT=0x115 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_ENTRY=0x122 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_EXIT=0x123 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_ENTRY=0x120 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_EXIT=0x121 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_ENTRY=0x132 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_EXIT=0x133 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_ENTRY=0x12e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_EXIT=0x12f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_ENTRY=0x130 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_EXIT=0x131 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_EXISTS_ENTRY=0x13b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_EXISTS_EXIT=0x13c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_EXTRACTPROPERTYL_ENTRY=0x13f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_EXTRACTPROPERTYL_EXIT=0x140 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_ENTRY=0x12a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_EXIT=0x12b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_GETFULLPATHNAME_ENTRY=0x139 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_GETFULLPATHNAME_EXIT=0x13a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_ENTRY=0x12c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_EXIT=0x12d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_ISFORMATVALID_ENTRY=0x136 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_ISFORMATVALID_EXIT=0x137 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_ISTOOLARGE_ENTRY=0x14b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_ISTOOLARGE_EXIT=0x14c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_MATCH_ENTRY=0x11e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_MATCH_EXIT=0x11f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_RESERVEOBJECTL_ENTRY=0x143 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_RESERVEOBJECTL_EXIT=0x144 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_ROLLBACK_ENTRY=0x147 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_ROLLBACK_EXIT=0x148 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_SERVICEL_ENTRY=0x11c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_SERVICEL_EXIT=0x11d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_SERVICESENDOBJECTINFOL_ENTRY=0x124 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_SERVICESENDOBJECTINFOL_EXIT=0x125 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_SERVICESENDOBJECTL_ENTRY=0x128 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_SERVICESENDOBJECTL_EXIT=0x129 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_SERVICESENDOBJECTPROPLISTL_ENTRY=0x126 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_SERVICESENDOBJECTPROPLISTL_EXIT=0x127 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_SETPROPERTIESL_ENTRY=0x145 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_SETPROPERTIESL_EXIT=0x146 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_ENTRY=0x13d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_EXIT=0x13e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPLIST_CHECKPROPCODE_ENTRY=0x157 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPLIST_CHECKPROPCODE_EXIT=0x158 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPLIST_CMTPIMAGEDPSETOBJECTPROPLIST_DES_ENTRY=0x14d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPLIST_CMTPIMAGEDPSETOBJECTPROPLIST_DES_EXIT=0x14e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPLIST_CONSTRUCTL_ENTRY=0x14f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPLIST_CONSTRUCTL_EXIT=0x150 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY=0x153 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_EXIT=0x154 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPLIST_HASDATAPHASE_ENTRY=0x155 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPLIST_HASDATAPHASE_EXIT=0x156 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPLIST_SERVICEL_ENTRY=0x151 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPLIST_SERVICEL_EXIT=0x152 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPVALUE_CHECKREQUESTL_ENTRY=0x15d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPVALUE_CHECKREQUESTL_EXIT=0x15e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPVALUE_CMTPIMAGEDPSETOBJECTPROPVALUE_DES_ENTRY=0x159 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPVALUE_CMTPIMAGEDPSETOBJECTPROPVALUE_DES_EXIT=0x15a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPVALUE_CONSTRUCTL_ENTRY=0x164 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPVALUE_CONSTRUCTL_EXIT=0x165 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPVALUE_DOHANDLERESPONSEPHASEL_ENTRY=0x161 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPVALUE_DOHANDLERESPONSEPHASEL_EXIT=0x162 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPVALUE_ISPROPCODEREADONLY_ENTRY=0x15b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPVALUE_ISPROPCODEREADONLY_EXIT=0x15c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPVALUE_SERVICEL_ENTRY=0x15f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROPVALUE_SERVICEL_EXIT=0x160 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROTECTION_CHECKREQUESTL_ENTRY=0x16a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROTECTION_CHECKREQUESTL_EXIT=0x16b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROTECTION_CMTPIMAGEDPSETOBJECTPROTECTION_DES_ENTRY=0x166 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROTECTION_CMTPIMAGEDPSETOBJECTPROTECTION_DES_EXIT=0x167 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROTECTION_CONSTRUCTL_ENTRY=0x168 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROTECTION_CONSTRUCTL_EXIT=0x169 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROTECTION_SERVICEL_ENTRY=0x16c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTPROTECTION_SERVICEL_EXIT=0x16d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTREFERENCES_CHECKREQUESTL_ENTRY=0x172 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTREFERENCES_CHECKREQUESTL_EXIT=0x173 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTREFERENCES_CMTPIMAGEDPSETOBJECTREFERENCES_DES_ENTRY=0x16e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTREFERENCES_CMTPIMAGEDPSETOBJECTREFERENCES_DES_EXIT=0x16f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTREFERENCES_CONSTRUCTL_ENTRY=0x170 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTREFERENCES_CONSTRUCTL_EXIT=0x171 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTREFERENCES_SERVICEL_ENTRY=0x174 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPSETOBJECTREFERENCES_SERVICEL_EXIT=0x175 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_CMTPIMAGEDPTHUMBNAILCREATOR_DES_ENTRY=0x176 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_CMTPIMAGEDPTHUMBNAILCREATOR_DES_EXIT=0x177 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_CONSTRUCTL_ENTRY=0x17a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_CONSTRUCTL_EXIT=0x17b +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_DOCANCEL_ENTRY=0x17c +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_DOCANCEL_EXIT=0x17d +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_ENCODEIMAGEL_ENTRY=0x188 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_ENCODEIMAGEL_EXIT=0x189 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_GETTHUMBL_ENTRY=0x184 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_GETTHUMBL_EXIT=0x185 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_GETTHUMBNAILL_ENTRY=0x182 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_GETTHUMBNAILL_EXIT=0x183 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_RUNERROR_ENTRY=0x180 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_RUNERROR_EXIT=0x181 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL_ENTRY=0x17e +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL_EXIT=0x17f +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_SCALEBITMAP_ENTRY=0x186 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_SCALEBITMAP_EXIT=0x187 +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_THUMBNAILREADY_ENTRY=0x18a +[TRACE]TRACE_FLOW[0x8A]_CMTPIMAGEDPTHUMBNAILCREATOR_THUMBNAILREADY_EXIT=0x18b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY=0x19 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT=0x1a +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDATAPROVIDER_RESETNEWPICTURES_EXIT=0x27 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPDELETEOBJECT_CMTPIMAGEDPDELETEOBJECT_DES_ENTRY=0x45 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPDELETEOBJECT_CMTPIMAGEDPDELETEOBJECT_DES_EXIT=0x46 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL=0x57 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPDELETEOBJECT_SERVICEL=0x4b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPDELETEOBJECT_STARTL_EXIT=0x5b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPGETOBJECTPROPDESC_CHECKREQUESTL_ENTRY=0x7b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPGETOBJECTPROPDESC_CHECKREQUESTL_EXIT=0x7c +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPGETOBJECTPROPLIST_GETOBJECTHANDLESL_ENTRY=0x8d +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPGETOBJECTPROPLIST_GETOBJECTHANDLESL_EXIT=0x8e +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPSENDOBJECTINFO_ISFORMATVALID_EXIT=0x138 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPSENDOBJECTINFO_REMOVEOBJECTFROMFS_ENTRY=0x134 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPSENDOBJECTINFO_REMOVEOBJECTFROMFS_EXIT=0x135 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPSETOBJECTPROPVALUE_DOHANDLERESPONSEPHASEL_EXIT=0x163 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPTHUMBNAILCREATOR_CMTPIMAGEDPTHUMBNAILCREATOR_CONS_ENTRY=0x178 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPTHUMBNAILCREATOR_CMTPIMAGEDPTHUMBNAILCREATOR_CONS_EXIT=0x179 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPIMAGEDPTHUMBNAILCREATOR_THUMBNAILREADY_EXIT=0x18c +[TRACE]TRACE_IMPORTANT[0x85]_CMTPIMAGEDPRENAMEOBJECT_RUNERROR=0x1 +[TRACE]TRACE_IMPORTANT[0x85]_CMTPIMAGEDPTHUMBNAILCREATOR_RUNERROR=0x2 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDATAPROVIDER_DECREASENEWPICTURES=0xd +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDATAPROVIDER_HANDLEDELETEOBJECTSARRAY=0xb +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDATAPROVIDER_INCREASENEWPICTURES=0xc +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL=0x6 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDATAPROVIDER_RENAMEOBJECTL=0xa +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDATAPROVIDER_SESSIONCLOSEDL=0x7 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDATAPROVIDER_SESSIONOPENEDL=0x8 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDATAPROVIDER_SUPPORTED=0x1 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPCOPYOBJECT_CANCOPYOBJECTL=0xe +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPDELETEOBJECT_STARTL=0x11 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPGETFORMATCAPABILITIES_CHECKREQUESTL=0x4c +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPGETOBJECTPROPDESC_SERVICEL=0x12 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPGETOBJECTPROPLIST_CHECKREQUESTL=0x13 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPGETOBJECTPROPLIST_GETROOTOBJECTHANDLESL=0x14 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPGETOBJECTREFERENCES_CHECKREQUESTL=0x15 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPGETPARTIALOBJECT_CHECKREQUESTL=0x16 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPGETPARTIALOBJECT_VERIFYPARAMETERSL=0x17 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPGETTHUMB_SERVICEL=0x18 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPMDEOBSERVER_CREATEMETADATAL=0x1a +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPMDEOBSERVER_HANDLEOBJECTNOTIFICATIONL=0x20 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL=0x1b +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPMOVEOBJECT_CHECKREQUESTL=0x22 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPMOVEOBJECT_MOVEFILEL=0x25 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPMOVEOBJECT_MOVEIMAGEFILE=0x27 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYFROMMDSL=0x2c +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPOBJECTPROPERTYMGR_GETPROPERTYL_TUINT32=0x2b +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPOBJECTPROPERTYMGR_OPENMDEOBJECTL=0x2d +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL=0x28 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPRENAMEOBJECT_GENERATEOBJECTHANDLELISTL=0x32 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPRENAMEOBJECT_RUNL=0x30 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPRENAMEOBJECT_STARTL=0x2e +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPSENDOBJECTINFO_CHECKPROPCODEL=0x3d +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPSENDOBJECTINFO_CHECKREQUESTL=0x33 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPSENDOBJECTINFO_EXISTS=0x3a +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPSENDOBJECTINFO_EXTRACTPROPERTYL=0x3c +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPSENDOBJECTINFO_GETFULLPATHNAME=0x38 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL=0x34 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPSENDOBJECTINFO_ISFORMATVALID=0x37 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPSENDOBJECTINFO_ISTOOLARGE=0x3e +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL=0x3b +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL=0x3f +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPSETOBJECTPROTECTION_CHECKREQUESTL=0x41 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPSETOBJECTREFERENCES_CHECKREQUESTL=0x42 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPTHUMBNAILCREATOR_DOCANCEL=0x43 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPTHUMBNAILCREATOR_GETTHUMBL=0x49 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL=0x45 +[TRACE]TRACE_NORMAL[0x86]_CMTPIMAGEDPTHUMBNAILCREATOR_THUMBNAILREADY=0x4b +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDATAPROVIDER_SESSIONOPENEDL=0x9 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDATAPROVIDER_SUPPORTED=0x2 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDPMDEOBSERVER_HANDLEOBJECTNOTIFICATIONL=0x21 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL=0x1c +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDPMOVEOBJECT_MOVEFILEL=0x24 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL=0x29 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDPRENAMEOBJECT_RUNL=0x31 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDPRENAMEOBJECT_STARTL=0x2f +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL=0x35 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDPSENDOBJECTINFO_GETFULLPATHNAME=0x39 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDPSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL=0x40 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDPTHUMBNAILCREATOR_DOCANCEL=0x44 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPIMAGEDPTHUMBNAILCREATOR_THUMBNAILREADY=0x4a +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPIMAGEDATAPROVIDER_SUPPORTED=0x3 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL=0xf +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPIMAGEDPGETTHUMB_SERVICEL=0x19 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL=0x1d +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPIMAGEDPMOVEOBJECT_MOVEFILEL=0x23 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPIMAGEDPOBJECTPROPERTYMGR_SETCURRENTOBJECTL=0x2a +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPIMAGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL=0x36 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL=0x46 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPIMAGEDATAPROVIDER_SUPPORTED=0x4 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPIMAGEDPDELETEOBJECT_DELETEOBJECTL=0x10 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL=0x1e +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPIMAGEDPMOVEOBJECT_CANMOVEOBJECTL=0x26 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL=0x47 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPIMAGEDATAPROVIDER_SUPPORTED=0x5 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPIMAGEDPMDEOBSERVER_PROCESSMDENOTIFICATIONL=0x1f +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPIMAGEDPTHUMBNAILCREATOR_RUNL=0x48 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/group/mtppictbridgedp.mmp --- a/mtpdataproviders/mtppictbridgedp/group/mtppictbridgedp.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/group/mtppictbridgedp.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -13,8 +13,6 @@ // Description: // -#include - TARGET mtppictbridgedp.dll TARGETTYPE PLUGIN UID 0x10009D8D 0x2001FE3B @@ -54,6 +52,7 @@ END USERINCLUDE ../inc +USERINCLUDE ../traces USERINCLUDE ../../../mtpfws/mtpfw/dataproviders/dputility/inc USERINCLUDE ../../../mtpfws/mtpfw/common/inc USERINCLUDE ../../../mtpfws/mtpfw/inc diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedp.h --- a/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedp.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedp.h Fri Sep 17 08:34:51 2010 +0300 @@ -27,7 +27,6 @@ #include "mmtppictbridgeenumeratorcallback.h" #include "cmtprequestprocessor.h" -#include "mtpdebug.h" class CMTPPictBridgeEnumerator; class CPtpServer; @@ -81,10 +80,6 @@ The active request processors table. */ RPointerArray iActiveProcessors; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // CMTPPICTBRIDGEDP_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedpgetobject.h --- a/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedpgetobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedpgetobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -46,11 +46,6 @@ CMTPPictBridgeDataProvider& iPictBridgeDP; CMTPTypeFile* iFileObject; // owned TMTPResponseCode iError; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // CMTPPICTBRIDGEDPGETOBJECT_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedpgetobjectinfo.h --- a/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedpgetobjectinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedpgetobjectinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -48,10 +48,6 @@ private: CMTPPictBridgeDataProvider& iPictBridgeDP; CMTPTypeObjectInfo* iObjectInfoToBuildP; // owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif CMTPPICTBRIDGEDPGETOBJECTINFO_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedpgetobjectproplist.h --- a/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedpgetobjectproplist.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedpgetobjectproplist.h Fri Sep 17 08:34:51 2010 +0300 @@ -66,10 +66,7 @@ RMTPDpSingletons iDpSingletons; CMTPObjectMetaData* iObjMeta; TEntry iFileEntry; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; + }; #endif /* CMTPPICTBRIDGEDPGETOBJECTPROPLIST_H_ */ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedpsendobjectinfo.h --- a/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedpsendobjectinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgedpsendobjectinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -120,10 +120,6 @@ RMTPDpSingletons iDpSingletons; TFileName iName; TBool iNoRollback; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif //CMTPPictBridgeDpSendObjectInfo_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgeenumerator.h --- a/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgeenumerator.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgeenumerator.h Fri Sep 17 08:34:51 2010 +0300 @@ -28,7 +28,6 @@ #include #include "mtppictbridgedpconst.h" -#include "mtpdebug.h" #include "rmtpframework.h" class MMTPDataProviderFramework; @@ -61,10 +60,6 @@ MMTPPictBridgeEnumeratorCallback& iCallback; TUint32 iDpsDiscoveryHandle; RMTPFramework iSingletons; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // CMTPPICTBRIDGEENUMERATOR_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgeprinter.h --- a/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgeprinter.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgeprinter.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #ifndef CMTPPICTBRIDGEPRINTER_H #define CMTPPICTBRIDGEPRINTER_H #include -#include "mtpdebug.h" class CMTPTypeObjectInfo; class MMTPConnection; @@ -76,9 +75,5 @@ TUint32 iOutgoingObjectHandle; CMTPPictBridgeUsbConnection* iUsbConnectionP; // owned TMTPTypeEvent iEvent; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; -#endif // CMTPPICTBRIDGEPRINTER_H \ No newline at end of file +#endif // CMTPPICTBRIDGEPRINTER_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgeusbconnection.h --- a/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgeusbconnection.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/cmtppictbridgeusbconnection.h Fri Sep 17 08:34:51 2010 +0300 @@ -24,7 +24,6 @@ #include #include -#include "mtpdebug.h" // FORWARD DECLARATION @@ -80,11 +79,7 @@ CMTPPictBridgePrinter& iPrinter; RProperty iProperty; TInt iPreviousPersonality; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif - \ No newline at end of file + diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/cptpreceivedmsghandler.h --- a/mtpdataproviders/mtppictbridgedp/inc/cptpreceivedmsghandler.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/cptpreceivedmsghandler.h Fri Sep 17 08:34:51 2010 +0300 @@ -97,10 +97,6 @@ TUint32 iTransactionID; RArray iReceiveQ; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // CPTPRECEIVEDMSGHANDLER_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/cptpserver.h --- a/mtpdataproviders/mtppictbridgedp/inc/cptpserver.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/cptpserver.h Fri Sep 17 08:34:51 2010 +0300 @@ -97,10 +97,6 @@ TBool iMtpSessionOpen; CPtpSession* iSessionOpenNotifyClientP; CFileMan* iFileMan; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // PTPSERVER_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/cptpsession.h --- a/mtpdataproviders/mtppictbridgedp/inc/cptpsession.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/cptpsession.h Fri Sep 17 08:34:51 2010 +0300 @@ -209,10 +209,6 @@ RMessage2 iCancelMsg; TFileName iReceivedFile; CPtpTimer* iTimerP; // owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // PTPSESSION_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/cptptimer.h --- a/mtpdataproviders/mtppictbridgedp/inc/cptptimer.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/cptptimer.h Fri Sep 17 08:34:51 2010 +0300 @@ -45,11 +45,7 @@ private: CPtpSession& iSession; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif - \ No newline at end of file + diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/inc/ptpdef.h --- a/mtpdataproviders/mtppictbridgedp/inc/ptpdef.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/inc/ptpdef.h Fri Sep 17 08:34:51 2010 +0300 @@ -23,14 +23,10 @@ #define PTPDEF_H #include -#include // for __FLOG debugging _LIT( KPTPServer, "PtpServer" ); _LIT( KPTPClientPanicCategory, "PTPServ-Client"); -__FLOG_STMT(_LIT8(KComponent, "PictBridgeDp");) -__FLOG_STMT(_LIT8(KPtpServerLog, "PTPServer");) - const TInt KPtpServerVersionMinor = 1; const TInt KPtpServerVersionMajor = 1; const TInt KFileNameAndPathLength = 32; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/pictbridgeengine/group/pictbridge.mmp --- a/mtpdataproviders/mtppictbridgedp/pictbridgeengine/group/pictbridge.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/pictbridgeengine/group/pictbridge.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -24,7 +24,10 @@ CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT -USERINCLUDE ../inc +USERINCLUDE ../inc +USERINCLUDE ../traces +USERINCLUDE ../../../../mtpfws/mtpfw/common/inc + MW_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/xml @@ -53,3 +56,4 @@ LIBRARY euser.lib xmlframework.lib efsrv.lib bafl.lib platformenv.lib LIBRARY rptp.lib usbman.lib usbwatcher.lib centralrepository.lib estor.lib +SMPSAFE diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/pictbridgeengine/src/dpsconnectnotifier.cpp --- a/mtpdataproviders/mtppictbridgedp/pictbridgeengine/src/dpsconnectnotifier.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/pictbridgeengine/src/dpsconnectnotifier.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -17,14 +17,11 @@ */ -#include #include "dpsconnectnotifier.h" #include "dpsusbnotifier.h" - -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -#else -# define IF_DEBUG(t) +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "dpsconnectnotifierTraces.h" #endif const TUint KUsbAllStates = 0xFFFFFFFF; @@ -35,7 +32,6 @@ // CDpsConnectNotifier* CDpsConnectNotifier::NewL(CDpsUsbNotifier* aParent) { - IF_DEBUG(Print(_L("CDpsConnectNotifier::NewL"))); CDpsConnectNotifier* self = new(ELeave) CDpsConnectNotifier(aParent); return self; } @@ -47,9 +43,9 @@ CDpsConnectNotifier::CDpsConnectNotifier(CDpsUsbNotifier* aParent) : CActive(EPriorityNormal), iNotifier(aParent) { - IF_DEBUG(Print(_L(">>>CDpsConnectNotifier::Ctor"))); + OstTraceFunctionEntry0( DUP1_CDPSCONNECTNOTIFIER_CDPSCONNECTNOTIFIER_CONS_ENTRY ); CActiveScheduler::Add(this); - IF_DEBUG(Print(_L("<<>>CDpsConnectNotifier::~"))); + OstTraceFunctionEntry0( CDPSCONNECTNOTIFIER_CDPSCONNECTNOTIFIER_DES_ENTRY ); Cancel(); - IF_DEBUG(Print(_L("<<>>CDpsConnectNotifier::ConnectNotify"))); + OstTraceFunctionEntry0( CDPSCONNECTNOTIFIER_CONNECTNOTIFY_ENTRY ); if (!IsActive()) { iNotifier->iUsbM.DeviceStateNotification(KUsbAllStates, iNotifier->iConnectState, iStatus); SetActive(); - } - IF_DEBUG(Print(_L("<<>>CDpsConnectNotifier::RunL %x"), iNotifier->iConnectState)); + OstTraceFunctionEntry0( CDPSCONNECTNOTIFIER_RUNL_ENTRY ); + OstTrace1( TRACE_NORMAL, CDPSCONNECTNOTIFIER_RUNL, "status %d", iNotifier->iConnectState ); + if (KErrNone == iStatus.Int()) { @@ -117,9 +114,9 @@ } else { - IF_DEBUG(Print(_L("\tthe iStatus is wrong!!!"))); - } - IF_DEBUG(Print(_L("<<>>CDpsConnectNotifier::DoCancel"))); + OstTraceFunctionEntry0( CDPSCONNECTNOTIFIER_DOCANCEL_ENTRY ); iNotifier->iUsbM.DeviceStateNotificationCancel(); - IF_DEBUG(Print(_L("<<ConstructL(); @@ -47,9 +45,11 @@ // void CDpsFile::ConstructL() { - IF_DEBUG(Print(_L(">>>CDpsFile::ConstructL"))); - User::LeaveIfError(iFs.Connect()); - IF_DEBUG(Print(_L("<<>>CDpsFile::~"))); + OstTraceFunctionEntry0( CDPSFILE_CDPSFILE_DES_ENTRY ); iFs.Close(); - IF_DEBUG(Print(_L("<<>>CDpsFile::CreateScriptFile size %d"), aFileSize)); + OstTraceFunctionEntry0( CDPSFILE_CREATESCRIPTFILE_ENTRY ); + OstTrace1( TRACE_NORMAL, CDPSFILE_CREATESCRIPTFILE, "File size %d", aFileSize ); RFile file; TInt err = file.Replace(iFs, aFileName, EFileShareExclusive); - IF_DEBUG(Print(_L("---the error is %d"), err)); + OstTrace1( TRACE_NORMAL, DUP1_CDPSFILE_CREATESCRIPTFILE, "---the error is %d", err ); if (err != KErrNone) { + OstTraceFunctionExit0( CDPSFILE_CREATESCRIPTFILE_EXIT ); return err; } @@ -93,8 +95,9 @@ err = file.Write(aScript, aFileSize); } - file.Close(); - IF_DEBUG(Print(_L("<<>>CDpsFile::GetContent %S"), &aFileName)); + OstTraceFunctionEntry0( CDPSFILE_GETCONTENTL_ENTRY ); + OstTraceExt1( TRACE_NORMAL, CDPSFILE_GETCONTENTL, "File name %S", aFileName ); RFile file; CleanupClosePushL(file); - User::LeaveIfError(file.Open(iFs, aFileName, EFileRead)); - User::LeaveIfError(file.Read(aScript)); - CleanupStack::PopAndDestroy(); - IF_DEBUG(Print(_L("<<>>CDpsFile::FileSize %S"), &aFileName)); + OstTraceFunctionEntry0( CDPSFILE_FILESIZEL_ENTRY ); + OstTraceExt1( TRACE_NORMAL, CDPSFILE_FILESIZEL, "File name %S", aFileName ); RFile file; CleanupClosePushL(file); - User::LeaveIfError(file.Open(iFs, aFileName, EFileRead)); - User::LeaveIfError(file.Size(aSize)); - CleanupStack::PopAndDestroy(); - IF_DEBUG(Print(_L("<< #include "dpsoperation.h" #include "dpsconst.h" #include "dpstransaction.h" @@ -24,12 +23,11 @@ #include "dpsxmlparser.h" #include "dpsxmlgenerator.h" #include "dpsstatemachine.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "dpsoperationTraces.h" +#endif -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -#else -# define IF_DEBUG(t) -#endif const TInt KConfigPrintService = 5; const TInt KCopyFileWidth = 3; @@ -44,7 +42,7 @@ RWriteStream& aScript, CDpsTransaction* aTrader) { - IF_DEBUG(Print(_L(">>>TMDpsOperation::CreateReqScript"))); + OstTraceFunctionEntry0( TMDPSOPERATION_CREATEREQSCRIPTL_ENTRY ); CDpsXmlGenerator* g = aTrader->Generator(); g->StartDocumentL(aScript); g->StartInputL(aScript); @@ -64,8 +62,8 @@ } g->EndInputL(aScript); - g->EndDocumentL(aScript); - IF_DEBUG(Print(_L("<<EndDocumentL(aScript); + OstTraceFunctionExit0( TMDPSOPERATION_CREATEREQSCRIPTL_EXIT ); } // --------------------------------------------------------------------------- @@ -77,15 +75,17 @@ TDpsAttribute& /*aAttrib*/, CDpsTransaction* aTrader) { - IF_DEBUG(Print(_L(">>>TDpsStartJob::FillReqArgs"))); + OstTraceFunctionEntry0( TDPSSTARTJOB_FILLREQARGS_ENTRY ); TInt imageCount = iReqParam.iPrintInfo.Count(); if (!imageCount) { + OstTraceFunctionExit0( TDPSSTARTJOB_FILLREQARGS_EXIT ); return KErrUnknown; } TUint32* objectHandles = new TUint32[imageCount]; if (!objectHandles) { + OstTraceFunctionExit0( DUP1_TDPSSTARTJOB_FILLREQARGS_EXIT ); return KErrNoMemory; } for (TInt i = 0; i < imageCount; i++) @@ -95,9 +95,10 @@ iReqParam.iPrintInfo[i].iFile, objectHandles[i], ETrue); if (err != KErrNone) { - IF_DEBUG(Print(_L("---error %d"), err)); - + OstTrace1( TRACE_ERROR, TDPSSTARTJOB_FILLREQARGS, "---error %d", err ); + delete[] objectHandles; + OstTraceFunctionExit0( DUP2_TDPSSTARTJOB_FILLREQARGS_EXIT ); return err; } } @@ -105,6 +106,7 @@ if (!argsP) { delete[] objectHandles; + OstTraceFunctionExit0( DUP3_TDPSSTARTJOB_FILLREQARGS_EXIT ); return KErrNoMemory; } TDpsEle* elemsP = new TDpsEle[1 + imageCount]; @@ -112,6 +114,7 @@ { delete[] argsP; delete[] objectHandles; + OstTraceFunctionExit0( DUP4_TDPSSTARTJOB_FILLREQARGS_EXIT ); return KErrNoMemory; } // jobConfig @@ -128,8 +131,8 @@ // we have to append the low bytes (0000) argsP[i].iContent.Append(KDpsLowZero); aArgs.Append(argsP[i]); - IF_DEBUG(Print(_L("the element is %d"), argsP[i].iElement)); - IF_DEBUG(Print(_L("the content is %S"), &(argsP[i].iContent))); + OstTrace1( TRACE_NORMAL, DUP1_TDPSSTARTJOB_FILLREQARGS, "the element is %d", argsP[i].iElement ); + OstTraceExt1( TRACE_NORMAL, DUP2_TDPSSTARTJOB_FILLREQARGS, "the content is %s", argsP[i].iContent ); } // printInfo @@ -143,8 +146,9 @@ KFullWordWidth); aArgs.Append(argsP[count]); - IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement)); - IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent))); + OstTrace1( TRACE_NORMAL, DUP3_TDPSSTARTJOB_FILLREQARGS, "the element is %d", argsP[count].iElement); + OstTraceExt1( TRACE_NORMAL, DUP4_TDPSSTARTJOB_FILLREQARGS, "the content is %s", argsP[count].iContent); + count++; // not empty @@ -153,10 +157,10 @@ argsP[count].iElement = EDpsArgFileName; argsP[count].iContent.Copy(iReqParam.iPrintInfo[j].iFile); aArgs.Append(argsP[count]); - - IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement)); - IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent))); - + + OstTrace1( TRACE_NORMAL, DUP5_TDPSSTARTJOB_FILLREQARGS, "the element is %d", argsP[count].iElement); + OstTraceExt1( TRACE_NORMAL, DUP6_TDPSSTARTJOB_FILLREQARGS, "the content is %s", argsP[count].iContent); + k++; count++; } // not empty @@ -165,8 +169,8 @@ argsP[count].iElement = EDpsArgDate; argsP[count].iContent.Copy(iReqParam.iPrintInfo[j].iDate); aArgs.Append(argsP[count]); - IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement)); - IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent))); + OstTrace1( TRACE_NORMAL, DUP7_TDPSSTARTJOB_FILLREQARGS, "the element is %d", argsP[count].iElement); + OstTraceExt1( TRACE_NORMAL, DUP8_TDPSSTARTJOB_FILLREQARGS, "the content is %s", argsP[count].iContent); k++; count++; } if (iReqParam.iPrintInfo[j].iCopies != 0) @@ -175,8 +179,8 @@ argsP[count].iContent.AppendNumFixedWidthUC( iReqParam.iPrintInfo[j].iCopies, EDecimal, KCopyFileWidth); aArgs.Append(argsP[count]); - IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement)); - IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent))); + OstTrace1( TRACE_NORMAL, DUP9_TDPSSTARTJOB_FILLREQARGS, "the element is %d", argsP[count].iElement); + OstTraceExt1( TRACE_NORMAL, DUP10_TDPSSTARTJOB_FILLREQARGS, "the content is %s", argsP[count].iContent); k++; count++; } if (iReqParam.iPrintInfo[j].iPrtPID != 0) @@ -184,8 +188,8 @@ argsP[count].iElement = EDpsArgPrtPID; argsP[count].iContent.AppendNumUC(iReqParam.iPrintInfo[j].iPrtPID); aArgs.Append(argsP[count]); - IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement)); - IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent))); + OstTrace1( TRACE_NORMAL, DUP11_TDPSSTARTJOB_FILLREQARGS, "the element is %d", argsP[count].iElement); + OstTraceExt1( TRACE_NORMAL, DUP12_TDPSSTARTJOB_FILLREQARGS, "the content is %s", argsP[count].iContent); k++; count++; } if (iReqParam.iPrintInfo[j].iCopyID != 0) @@ -193,8 +197,8 @@ argsP[count].iElement = EDpsArgCopyID; argsP[count].iContent.AppendNumUC(iReqParam.iPrintInfo[j].iCopyID); aArgs.Append(argsP[count]); - IF_DEBUG(Print(_L("the element is %d"), argsP[count].iElement)); - IF_DEBUG(Print(_L("the content is %S"), &(argsP[count].iContent))); + OstTrace1( TRACE_NORMAL, DUP13_TDPSSTARTJOB_FILLREQARGS, "the element is %d", argsP[count].iElement); + OstTraceExt1( TRACE_NORMAL, DUP14_TDPSSTARTJOB_FILLREQARGS, "the content is %s", argsP[count].iContent); k++; count++; } @@ -204,8 +208,8 @@ delete[] objectHandles; delete[] argsP; - delete[] elemsP; - IF_DEBUG(Print(_L("<<>>TDpsStartJob::CreateReqScript"))); + OstTraceFunctionEntry0( TDPSSTARTJOB_CREATEREQSCRIPTL_ENTRY ); CDpsXmlGenerator* g = aTrader->Generator(); g->StartDocumentL(aScript); g->StartInputL(aScript); @@ -239,8 +243,8 @@ } g->EndOperationL((TDpsOperation)iOperation, aScript); g->EndInputL(aScript); - g->EndDocumentL(aScript); - IF_DEBUG(Print(_L("<<EndDocumentL(aScript); + OstTraceFunctionExit0( TDPSSTARTJOB_CREATEREQSCRIPTL_EXIT ); } // --------------------------------------------------------------------------- @@ -252,13 +256,13 @@ TDpsAttribute& /*aAttrib*/, CDpsTransaction* /*aParam*/) { - IF_DEBUG(Print(_L(">>>TDpsAbortJob::FillReqArgs"))); + OstTraceFunctionEntry0( TDPSABORTJOB_FILLREQARGS_ENTRY ); TDpsArg arg; arg.iElement = EDpsArgAbortStyle; arg.iContent.AppendNumUC(iReqParam.iAbortStyle, EHex); arg.iContent.Append(KDpsLowZero); - aArgs.Append(arg); - IF_DEBUG(Print(_L("<<>>TDpsGetCapability::FillReqArgs"))); + OstTraceFunctionEntry0( TDPSGETCAPABILITY_FILLREQARGS_ENTRY ); // only one element TDpsEle elems; elems.iElement = EDpsCapability; @@ -288,8 +292,8 @@ { aAttrib = iReqParam.iAttribute; } - } - IF_DEBUG(Print(_L("<<>>TDpsGetCapability::CreateReqScript"))); + OstTraceFunctionEntry0( TDPSGETCAPABILITY_CREATEREQSCRIPTL_ENTRY ); CDpsXmlGenerator* g = aTrader->Generator(); g->StartDocumentL(aScript); g->StartInputL(aScript); @@ -318,8 +322,8 @@ g->EndElementL(aElements[0].iElement, aScript); g->EndOperationL((TDpsOperation)iOperation, aScript); g->EndInputL(aScript); - g->EndDocumentL(aScript); - IF_DEBUG(Print(_L("<<EndDocumentL(aScript); + OstTraceFunctionExit0( TDPSGETCAPABILITY_CREATEREQSCRIPTL_EXIT ); } // --------------------------------------------------------------------------- @@ -331,10 +335,11 @@ TDpsAttribute& /*aAttrib*/, CDpsTransaction* /*aParam*/) { - IF_DEBUG(Print(_L(">>>TDpsConfigPrintService::FillReqArgs"))); + OstTraceFunctionEntry0( TDPSCONFIGPRINTSERVICE_FILLREQARGS_ENTRY ); TDpsArg* argsP = new TDpsArg[KConfigPrintService]; if (!argsP) { + OstTraceFunctionExit0( TDPSCONFIGPRINTSERVICE_FILLREQARGS_EXIT ); return KErrNoMemory; } TInt count; @@ -395,14 +400,15 @@ break; default: - IF_DEBUG(Print(_L("***Wrong parameter"))); + OstTrace0( TRACE_ERROR, TDPSCONFIGPRINTSERVICE_FILLREQARGS, "***Wrong parameter" ); delete[] argsP; + OstTraceFunctionExit0( DUP1_TDPSCONFIGPRINTSERVICE_FILLREQARGS_EXIT ); return KErrArgument; } } - delete[] argsP; - IF_DEBUG(Print(_L("<<>>TDpsGetCapability::FillRepArgs"))); + OstTraceFunctionEntry0( TDPSGETCAPABILITY_FILLREPARGS_ENTRY ); CDpsXmlParser* XmlPar = aTrader->Parser(); if (aArgs.Count()) @@ -451,13 +457,15 @@ } else { - IF_DEBUG(Print(_L("***Wrong argument"))); + OstTrace0( TRACE_ERROR, TDPSGETCAPABILITY_FILLREPARGS, "***Wrong argument" ); + OstTraceFunctionExit0( TDPSGETCAPABILITY_FILLREPARGS_EXIT ); return KErrArgument; } TInt error = converter.Val(value, EHex); if (error != KErrNone) { - IF_DEBUG(Print(_L("convert error %d"), error)); + OstTrace1( TRACE_ERROR, DUP1_TDPSGETCAPABILITY_FILLREPARGS, "convert error %d", error ); + OstTraceFunctionExit0( DUP1_TDPSGETCAPABILITY_FILLREPARGS_EXIT ); return error; } if (EDpsArgPaperTypes == aArgs[0].iElement) @@ -473,7 +481,7 @@ // remove the extra zeros value = value >> KShiftLength; iRepParam.iContent.Append(value); - IF_DEBUG(Print(_L("the value is %x"), value)); + OstTrace1( TRACE_NORMAL, DUP2_TDPSGETCAPABILITY_FILLREPARGS, "the value is %x", value ); } } @@ -481,7 +489,7 @@ } - IF_DEBUG(Print(_L("<<>>TDpsConfigPrintService::FillRepArgs"))); + OstTraceFunctionEntry0( TDPSCONFIGPRINTSERVICE_FILLREPARGS_ENTRY ); TInt error = KErrNone; TLex8 converter, parser; const TInt count = aArgs.Count(); @@ -510,11 +518,12 @@ error = converter.Val(result, EHex); if (error != KErrNone) { - IF_DEBUG(Print(_L("*** convert error"))); + OstTrace0( TRACE_ERROR, TDPSCONFIGPRINTSERVICE_FILLREPARGS, "*** convert error" ); + OstTraceFunctionExit0( TDPSCONFIGPRINTSERVICE_FILLREPARGS_EXIT ); return error; } // removes the low four bytes zeros. - IF_DEBUG(Print(_L("--Printer available is %x"), result)); + OstTrace1( TRACE_NORMAL, DUP1_TDPSCONFIGPRINTSERVICE_FILLREPARGS, "--Printer available is %x", result ); result = result >> KShiftLength; iRepParam.iPrintAvailable = result; break; @@ -535,12 +544,14 @@ } else { - IF_DEBUG(Print(_L("***wrong !!!"))); + OstTrace0( TRACE_ERROR, DUP2_TDPSCONFIGPRINTSERVICE_FILLREPARGS, "***wrong !!!"); + OstTraceFunctionExit0( DUP1_TDPSCONFIGPRINTSERVICE_FILLREPARGS_EXIT ); return KErrArgument; } error = aTrader->ConvertVersion(converter, version); if (error != KErrNone) { + OstTraceFunctionExit0( DUP2_TDPSCONFIGPRINTSERVICE_FILLREPARGS_EXIT ); return error; } iRepParam.iDpsVersions.Append(version); @@ -549,36 +560,38 @@ case EDpsArgVendorName: iRepParam.iVendorName.Copy(aArgs[i].iContent); - IF_DEBUG(Print(_L - ("vendor name is %S"), &iRepParam.iVendorName)); + OstTraceExt1( TRACE_NORMAL, DUP3_TDPSCONFIGPRINTSERVICE_FILLREPARGS, + "vendor name is %S", iRepParam.iVendorName ); break; case EDpsArgVendorSpecificVersion: parser.Assign(aArgs[i].iContent); aTrader->ConvertVersion(parser, version); iRepParam.iVendorVersion = version; - IF_DEBUG(Print(_L - ("vendor version is %x"), iRepParam.iVendorVersion)); + OstTraceExt2( TRACE_NORMAL, DUP4_TDPSCONFIGPRINTSERVICE_FILLREPARGS, + "vendor version is %d.%d", iRepParam.iVendorVersion.iMajor, iRepParam.iVendorVersion.iMinor ); break; case EDpsArgProductName: iRepParam.iProductName.Copy(aArgs[i].iContent); - IF_DEBUG(Print(_L - ("product name is %S"), &iRepParam.iProductName)); + OstTraceExt1( TRACE_NORMAL, DUP5_TDPSCONFIGPRINTSERVICE_FILLREPARGS, + "product name is %S", iRepParam.iProductName ); break; case EDpsArgSerialNo: iRepParam.iSerialNo.Copy(aArgs[i].iContent); - IF_DEBUG(Print(_L("SerialNo is %S"), &iRepParam.iSerialNo)); + OstTraceExt1( TRACE_NORMAL, DUP6_TDPSCONFIGPRINTSERVICE_FILLREPARGS, + "SerialNo is %S", iRepParam.iSerialNo ); break; default: - IF_DEBUG(Print(_L("--Unknown param!!"))); + OstTrace0( TRACE_ERROR, DUP7_TDPSCONFIGPRINTSERVICE_FILLREPARGS, "--Unknown param!!" ); + OstTraceFunctionExit0( DUP3_TDPSCONFIGPRINTSERVICE_FILLREPARGS_EXIT ); return KErrArgument; } } - - IF_DEBUG(Print(_L("<<>>TDpsGetJobStatus::FillRepArgs"))); + OstTraceFunctionEntry0( TDPSGETJOBSTATUS_FILLREPARGS_ENTRY ); TInt value, error, per; TBuf fileName; TLex8 converter; @@ -615,6 +628,7 @@ error = converter.Val(value); if (error != KErrNone) { + OstTraceFunctionExit0( TDPSGETJOBSTATUS_FILLREPARGS_EXIT ); return error; } if (reply) @@ -645,6 +659,7 @@ error = converter.Val(value); if (error != KErrNone) { + OstTraceFunctionExit0( DUP1_TDPSGETJOBSTATUS_FILLREPARGS_EXIT ); return error; } if (reply) @@ -662,6 +677,7 @@ per = aTrader->ParsePercentage(aArgs[i].iContent); if (per < KErrNone) { + OstTraceFunctionExit0( DUP2_TDPSGETJOBSTATUS_FILLREPARGS_EXIT ); return per; } @@ -681,6 +697,7 @@ error = converter.Val(value); if (error != KErrNone) { + OstTraceFunctionExit0( DUP3_TDPSGETJOBSTATUS_FILLREPARGS_EXIT ); return error; } if (reply) @@ -695,11 +712,12 @@ break; default: - IF_DEBUG(Print(_L("***wrong param!!!"))); + OstTrace0( TRACE_ERROR, TDPSGETJOBSTATUS_FILLREPARGS, "***wrong param!!!" ); + OstTraceFunctionExit0( DUP4_TDPSGETJOBSTATUS_FILLREPARGS_EXIT ); return KErrArgument; } } - IF_DEBUG(Print(_L("<<>>TDpsGetPrinterStatus::FillRepArgs"))); + OstTraceFunctionEntry0( TDPSGETPRINTERSTATUS_FILLREPARGS_ENTRY ); // if UI has not pass the event pointer, we do need to fill in it if (!aTrader->Engine()->Event()) { + OstTraceFunctionExit0( TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT ); return KErrNone; } TLex8 converter; @@ -738,10 +757,11 @@ TInt error = converter.Val(value, EHex); if (error != KErrNone) { + OstTraceFunctionExit0( DUP1_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT ); return error; } - IF_DEBUG(Print(_L("--the value is %x"), value)); - + OstTrace1( TRACE_NORMAL, TDPSGETPRINTERSTATUS_FILLREPARGS, "--the value is %x", value ); + switch (aArgs[i].iElement) { case EDpsArgDpsPrintServiceStatus: @@ -763,6 +783,7 @@ } else { + OstTraceFunctionExit0( DUP2_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT ); return KErrArgument; } @@ -788,6 +809,7 @@ } else { + OstTraceFunctionExit0( DUP3_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT ); return KErrArgument; } @@ -811,6 +833,7 @@ } else { + OstTraceFunctionExit0( DUP4_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT ); return KErrArgument; } @@ -826,7 +849,7 @@ { param.iJobEndReason.iMajor = (TDpsJobEndReasonMajor)(temp); - IF_DEBUG(Print(_L("the end reason is %x"), temp)); + OstTrace1( TRACE_NORMAL, DUP1_TDPSGETPRINTERSTATUS_FILLREPARGS, "the end reason is %x", temp ); value = value & KDpsMinorMask; switch (param.iJobEndReason.iMajor) { @@ -851,7 +874,7 @@ break; default: - IF_DEBUG(Print(_L("no minor error"))); + OstTrace0( TRACE_NORMAL, DUP2_TDPSGETPRINTERSTATUS_FILLREPARGS, "no minor error" ); break; } if (reply) @@ -866,6 +889,7 @@ } else { + OstTraceFunctionExit0( DUP5_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT ); return KErrArgument; } @@ -883,6 +907,7 @@ } else { + OstTraceFunctionExit0( DUP6_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT ); return KErrArgument; } if (reply) @@ -908,6 +933,7 @@ } else { + OstTraceFunctionExit0( DUP7_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT ); return KErrArgument; } if (reply) @@ -933,6 +959,7 @@ } else { + OstTraceFunctionExit0( DUP8_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT ); return KErrArgument; } if (reply) @@ -947,11 +974,12 @@ break; default: - IF_DEBUG(Print(_L("***wrong param"))); + OstTrace0( TRACE_ERROR, DUP3_TDPSGETPRINTERSTATUS_FILLREPARGS, "***wrong param" ); + OstTraceFunctionExit0( DUP9_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT ); return KErrArgument; } } - IF_DEBUG(Print(_L("<< #include "dpsptpnotifier.h" #include "dpsusbnotifier.h" #include "dpsconst.h" - -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -#else -# define IF_DEBUG(t) +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "dpsptpnotifierTraces.h" #endif // --------------------------------------------------------------------------- @@ -35,7 +32,6 @@ // CDpsPtpNotifier* CDpsPtpNotifier::NewL(CDpsUsbNotifier* aParent) { - IF_DEBUG(Print(_L("CDpsPtpNotifier::NewL"))); CDpsPtpNotifier* self = new(ELeave) CDpsPtpNotifier(aParent); return self; } @@ -47,9 +43,9 @@ CDpsPtpNotifier::CDpsPtpNotifier(CDpsUsbNotifier* aParent) : CActive(EPriorityNormal), iNotifier(aParent) { - IF_DEBUG(Print(_L(">>>CDpsPtpNotifier::Ctor"))); + OstTraceFunctionEntry0( CDPSPTPNOTIFIER_CDPSPTPNOTIFIER_CONS_ENTRY ); CActiveScheduler::Add(this); - IF_DEBUG(Print(_L("<<>>CDpsPtpNotifier::"))); - Cancel(); - IF_DEBUG(Print(_L("<<>>CDpsPtpNotifier::ChangePtpPersonality"))); + OstTraceFunctionEntry0( CDPSPTPNOTIFIER_CHANGEPTPPERSONALITY_ENTRY ); if (!IsActive()) { TInt personalityId = KUsbPersonalityIdMTP; iNotifier->iUsbM.GetCurrentPersonalityId(personalityId); - IF_DEBUG(Print(_L("CDpsPtpNotifier::ChangePtpPersonality, current personality= %d"), personalityId)); + OstTrace1(TRACE_NORMAL, CDPSPTPNOTIFIER_CHANGEPTPPERSONALITY, "current personality= %d", personalityId ); if(KUsbPersonalityIdPCSuiteMTP == personalityId) { TRequestStatus* statusPtr = &iStatus; @@ -86,8 +82,8 @@ iNotifier->iUsbW.SetPersonality(iStatus, KUsbPersonalityIdMTP, ETrue); SetActive(); } - } - IF_DEBUG(Print(_L("<<>>CDpsPtpNotifier::RunL %d"), iStatus.Int())); + OstTraceFunctionEntry0( CDPSPTPNOTIFIER_RUNL_ENTRY ); + OstTrace1( TRACE_NORMAL, CDPSPTPNOTIFIER_RUNL, "iStatus %d", iStatus.Int()); if (KErrNone == iStatus.Int()) { iNotifier->iPersonality = KUsbPersonalityIdMTP; TInt ret = iNotifier->ConnectState(); if (ret != KErrNone) { - IF_DEBUG(Print(_L("error happened %d"), ret)); + OstTrace1( TRACE_WARNING, DUP1_CDPSPTPNOTIFIER_RUNL, "error happened %d", ret ); } } iNotifier->PtpNotify(iStatus.Int()); - IF_DEBUG(Print(_L("<<>>CDpsPtpNotifier::DoCancel"))); - iNotifier->iUsbW.CancelSetPersonality(); - IF_DEBUG(Print(_L("<<iUsbW.CancelSetPersonality(); + OstTraceFunctionExit0( CDPSPTPNOTIFIER_DOCANCEL_EXIT ); } // --------------------------------------------------------------------------- @@ -127,6 +124,7 @@ // TInt CDpsPtpNotifier::RunError(TInt aErr) { - IF_DEBUG(Print(_L("CDpsPtpNotifier::RunError"))); + OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CDPSPTPNOTIFIER_RUNERROR, + "error code %d", aErr); return aErr; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/pictbridgeengine/src/dpsscriptreceiver.cpp --- a/mtpdataproviders/mtppictbridgedp/pictbridgeengine/src/dpsscriptreceiver.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/pictbridgeengine/src/dpsscriptreceiver.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -15,18 +15,15 @@ * */ - -#include #include #include "dpsscriptreceiver.h" #include "dpsstatemachine.h" #include "pictbridge.h" #include "dpsconst.h" - -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -#else -# define IF_DEBUG(t) +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "dpsscriptreceiverTraces.h" #endif // --------------------------------------------------------------------------- @@ -35,7 +32,6 @@ // CDpsScriptReceiver* CDpsScriptReceiver::NewL(CDpsStateMachine* aOperator) { - IF_DEBUG(Print(_L("CDpsScriptReceiver::NewL"))); CDpsScriptReceiver* self = new(ELeave) CDpsScriptReceiver(aOperator); return self; } @@ -48,10 +44,10 @@ CActive(EPriorityNormal), iOperator(aOperator), iFileNameAndPath(KDpsHostResponseFileName) { - IF_DEBUG(Print(_L(">>>CDpsScriptReceiver::Ctor"))); + OstTraceFunctionEntry0( CDPSSCRIPTRECEIVER_CDPSSCRIPTRECEIVER_CONS_ENTRY ); CActiveScheduler::Add(this); WaitForReceive(); - IF_DEBUG(Print(_L("<<>>~CDpsScriptReceiver"))); + OstTraceFunctionEntry0( CDPSSCRIPTRECEIVER_CDPSSCRIPTRECEIVER_DES_ENTRY ); Cancel(); - IF_DEBUG(Print(_L("<<<~CDpsScriptReceiver"))); + OstTraceFunctionExit0( CDPSSCRIPTRECEIVER_CDPSSCRIPTRECEIVER_DES_EXIT ); } // --------------------------------------------------------------------------- @@ -71,14 +67,14 @@ // void CDpsScriptReceiver::WaitForReceive() { - IF_DEBUG(Print(_L(">>>CDpsScriptReceiver::WaitForReceive"))); + OstTraceFunctionEntry0( CDPSSCRIPTRECEIVER_WAITFORRECEIVE_ENTRY ); if (!IsActive()) { iOperator->DpsEngine()->Ptp().ObjectReceivedNotify(KDpsScriptFile, iFileNameAndPath, iStatus, EFalse); SetActive(); - } - IF_DEBUG(Print(_L("<<>>CDpsScriptReceiver::RunL %S"), &iFileNameAndPath)); + OstTraceFunctionEntry0( CDPSSCRIPTRECEIVER_RUNL_ENTRY ); + OstTraceExt1( TRACE_NORMAL, CDPSSCRIPTRECEIVER_RUNL, "iFileNameAndPath %S", iFileNameAndPath ); // in the certain error case, it is possible that the printer sending // the device status before the UI is ready to receive this event. // in this case, pictbridge engine still does not get the ptp folder @@ -126,8 +123,11 @@ if (KErrNone == iStatus.Int()) { TFileName receive; - User::LeaveIfError(GetFileName(receive)); - IF_DEBUG(Print(_L("received file is %S"), &receive)); + LEAVEIFERROR(GetFileName(receive), + OstTraceExt2( TRACE_ERROR, DUP3_CDPSSCRIPTRECEIVER_RUNL, + "Gets the file name from %S failed! error code %d",receive, munged_err )); + + OstTraceExt1( TRACE_NORMAL, DUP1_CDPSSCRIPTRECEIVER_RUNL, "received file is %S", receive ); // reply from Host is received if (!receive.Compare(KDpsHostResponseFileName)) { @@ -142,10 +142,10 @@ } else { - IF_DEBUG(Print(_L("the iStatus is wrong!!! %d"), iStatus.Int())); + OstTrace1( TRACE_ERROR, DUP2_CDPSSCRIPTRECEIVER_RUNL, "the iStatus is wrong!!! %d", iStatus.Int() ); iOperator->Error(iStatus.Int()); } - IF_DEBUG(Print(_L("<<>>CDpsScriptReceiver::DoCancel"))); + OstTraceFunctionEntry0( CDPSSCRIPTRECEIVER_DOCANCEL_ENTRY ); iOperator->DpsEngine()->Ptp().CancelObjectReceivedNotify(); - IF_DEBUG(Print(_L("<<>>CDpsScriptReceiver::RunError is %d"), aError)); + OstTraceFunctionEntry0( CDPSSCRIPTRECEIVER_RUNERROR_ENTRY ); + OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CDPSSCRIPTRECEIVER_RUNERROR, + "error code %d", aError); // if error happened cancel the outstanding request Cancel(); iOperator->Error(aError); - IF_DEBUG(Print(_L("<< #include #include "dpsscriptsender.h" #include "dpsstatemachine.h" #include "pictbridge.h" #include "dpstransaction.h" #include "dpsfile.h" - -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -#else -# define IF_DEBUG(t) +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "dpsscriptsenderTraces.h" #endif // --------------------------------------------------------------------------- @@ -36,7 +33,6 @@ // CDpsScriptSender* CDpsScriptSender::NewL(CDpsStateMachine* aOperator) { - IF_DEBUG(Print(_L("CDpsScriptSender::NewL"))); CDpsScriptSender* self = new(ELeave) CDpsScriptSender(aOperator); return self; } @@ -49,9 +45,9 @@ CActive(EPriorityNormal), iOperator(aOperator), iReply(EFalse) { - IF_DEBUG(Print(_L(">>>CDpsScriptSender::Ctor"))); + OstTraceFunctionEntry0( CDPSSCRIPTSENDER_CDPSSCRIPTSENDER_CONS_ENTRY ); CActiveScheduler::Add(this); - IF_DEBUG(Print(_L("<<>>~CDpsScriptSender"))); + OstTraceFunctionEntry0( DUP1_CDPSSCRIPTSENDER_CDPSSCRIPTSENDER_DES_ENTRY ); Cancel(); - IF_DEBUG(Print(_L("<<<~CDpsScriptSender"))); + OstTraceFunctionExit0( DUP1_CDPSSCRIPTSENDER_CDPSSCRIPTSENDER_DES_EXIT ); } // --------------------------------------------------------------------------- @@ -71,7 +67,7 @@ // TInt CDpsScriptSender::SendScript(TBool aReply) { - IF_DEBUG(Print(_L(">>>CDpsScriptSender::SendScript"))); + OstTraceFunctionEntry0( CDPSSCRIPTSENDER_SENDSCRIPT_ENTRY ); if (!IsActive()) { iReply = aReply; @@ -89,6 +85,7 @@ FileHandle()->FileSession(), file, EFileRead); if (err != KErrNone) { + OstTraceFunctionExit0( CDPSSCRIPTSENDER_SENDSCRIPT_EXIT ); return err; } TInt size; @@ -105,11 +102,12 @@ Ptp().SendObject(file, iStatus, ETrue, size); } SetActive(); - IF_DEBUG(Print(_L("<<>>CDpsScriptSender::RunL"))); + OstTraceFunctionEntry0( CDPSSCRIPTSENDER_RUNL_ENTRY ); if (KErrNone == iStatus.Int()) { @@ -137,10 +135,10 @@ } else { - IF_DEBUG(Print(_L("the iStatus is wrong %d!!!"), iStatus.Int())); + OstTrace1( TRACE_ERROR, CDPSSCRIPTSENDER_RUNL, "the iStatus is wrong %d!!!", iStatus.Int() ); iOperator->Error(iStatus.Int()); } - IF_DEBUG(Print(_L("<<>>CDpsScriptSender::DoCancel"))); + OstTraceFunctionEntry0( CDPSSCRIPTSENDER_DOCANCEL_ENTRY ); iOperator->DpsEngine()->Ptp().CancelSendObject(); - IF_DEBUG(Print(_L("<<>>CDpsScriptSender::RunError is %d"), aError)); + OstTraceFunctionEntry0( CDPSSCRIPTSENDER_RUNERROR_ENTRY ); + OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CDPSSCRIPTSENDER_RUNERROR, + "error code %d", aError); Cancel(); iOperator->Error(aError); - IF_DEBUG(Print(_L("<< #include "dpsstate.h" #include "dpsstatemachine.h" #include "dpstransaction.h" #include "dpsscriptreceiver.h" #include - -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -#else -# define IF_DEBUG(t) +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "dpsstateTraces.h" #endif + // --------------------------------------------------------------------------- // @@ -41,7 +39,8 @@ // void TDpsIdleState::ScriptSentNotifyL(TBool /*aReply*/) { - IF_DEBUG(Print(_L("TDpsIdleState::ScriptSentNotify"))); + OstTraceFunctionEntry0( TDPSIDLESTATE_SCRIPTSENTNOTIFYL_ENTRY ); + OstTraceFunctionExit0( TDPSIDLESTATE_SCRIPTSENTNOTIFYL_EXIT ); } // --------------------------------------------------------------------------- @@ -52,14 +51,13 @@ { if (!aReply) { - IF_DEBUG(Print(_L("TDpsIdleState::ScriptReceived request got"))); + OstTrace0( TRACE_NORMAL, TDPSIDLESTATE_SCRIPTRECEIVEDNOTIFYL, "request got" ); iStateMachine->Trader()->ParseScriptL(aReply); iStateMachine->SetState(iStateMachine->SendingRepState()); } else { - IF_DEBUG(Print(_L( - "TDpsIdleState::ScriptReceived should not get reply!!!"))); + OstTrace0( TRACE_NORMAL, DUP1_TDPSIDLESTATE_SCRIPTRECEIVEDNOTIFYL, "should not get reply!!!" ); } } @@ -69,7 +67,7 @@ // void TDpsIdleState::Error(TInt aErr) { - IF_DEBUG(Print(_L("TDpsIdleState::Error %d"), aErr)); + OstTrace1( TRACE_NORMAL, TDPSIDLESTATE_ERROR, "Error %d", aErr ); if ((aErr != KErrCancel) && (aErr != KErrNotReady)) { iStateMachine->Trader()->HandleHostRequestError(aErr); @@ -93,13 +91,12 @@ { if (!aReply) { - IF_DEBUG(Print(_L("TDpsSendingReqState::ScriptSent request"))); + OstTrace0( TRACE_NORMAL, TDPSSENDINGREQSTATE_SCRIPTSENTNOTIFYL, " request" ); iStateMachine->SetState(iStateMachine->WaitingRepState()); } else { - IF_DEBUG(Print(_L( - "TDpsSendingReqState::ScriptSent should not get reply!!"))); + OstTrace0( TRACE_NORMAL, DUP1_TDPSSENDINGREQSTATE_SCRIPTSENTNOTIFYL, " should not get reply!!" ); } } @@ -109,8 +106,7 @@ // void TDpsSendingReqState::ScriptReceivedNotifyL(TBool /*aReply*/) { - IF_DEBUG(Print(_L("TDpsSendingReqState::ScriptReceived"))); - IF_DEBUG(Print(_L("**should not reply to the request/reply from host"))); + OstTrace0( TRACE_NORMAL, TDPSSENDINGREQSTATE_SCRIPTRECEIVEDNOTIFYL, "**should not reply to the request/reply from host" ); } // --------------------------------------------------------------------------- @@ -139,7 +135,8 @@ // void TDpsWaitingRepState::ScriptSentNotifyL(TBool /*aReply*/) { - IF_DEBUG(Print(_L("TDpsWaitingRepState::ScriptSent"))); + OstTraceFunctionEntry0( TDPSWAITINGREPSTATE_SCRIPTSENTNOTIFYL_ENTRY ); + OstTraceFunctionExit0( TDPSWAITINGREPSTATE_SCRIPTSENTNOTIFYL_EXIT ); } // --------------------------------------------------------------------------- @@ -150,8 +147,8 @@ { if (aReply) { - IF_DEBUG(Print(_L("WaitingRepState reply"))) - + OstTrace0( TRACE_NORMAL, TDPSWAITINGREPSTATE_SCRIPTRECEIVEDNOTIFYL, "WaitingRepState reply" ); + iStateMachine->Trader()->ParseScriptL(aReply); User::RequestComplete( iStateMachine->DpsEngine()->OperationRequest(), KErrNone); @@ -159,7 +156,7 @@ } else { - IF_DEBUG(Print(_L("WaitingRepState should not get request"))); + OstTrace0( TRACE_NORMAL, DUP1_TDPSWAITINGREPSTATE_SCRIPTRECEIVEDNOTIFYL, "WaitingRepState should not get request" ); // collision happened, we do nothing because the host will // eventually handle this by sending the correct response. but we need // to subscribe for the event again. @@ -194,7 +191,7 @@ { if (aReply) { - IF_DEBUG(Print(_L("TDpsSendingRepState::ScriptSent reply"))); + OstTrace0( TRACE_NORMAL, TDPSSENDINGREPSTATE_SCRIPTSENTNOTIFYL, "reply" ); if (KErrNone == iStateMachine->CurError()) { // this is the normal situation, inform the client @@ -211,8 +208,7 @@ } else { - IF_DEBUG(Print(_L( - "TDpsSendingRepState::ScriptSent shoul not get request!!!"))); + OstTrace0( TRACE_NORMAL, DUP1_TDPSSENDINGREPSTATE_SCRIPTSENTNOTIFYL, "shoul not get request!!!" ); } } @@ -222,7 +218,8 @@ // void TDpsSendingRepState::ScriptReceivedNotifyL(TBool /*aReply*/) { - IF_DEBUG(Print(_L("TDpsSendingRepState::ScriptReceived"))); + OstTraceFunctionEntry0( TDPSSENDINGREPSTATE_SCRIPTRECEIVEDNOTIFYL_ENTRY ); + OstTraceFunctionExit0( TDPSSENDINGREPSTATE_SCRIPTRECEIVEDNOTIFYL_EXIT ); } // --------------------------------------------------------------------------- diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/pictbridgeengine/src/dpsstatemachine.cpp --- a/mtpdataproviders/mtppictbridgedp/pictbridgeengine/src/dpsstatemachine.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/pictbridgeengine/src/dpsstatemachine.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -16,7 +16,6 @@ */ -#include #include "dpsstatemachine.h" #include "dpsscriptreceiver.h" #include "dpsscriptsender.h" @@ -25,11 +24,9 @@ #include "pictbridge.h" #include "dpsparam.h" #include "dpsoperation.h" - -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -#else -# define IF_DEBUG(t) +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "dpsstatemachineTraces.h" #endif // --------------------------------------------------------------------------- @@ -38,7 +35,6 @@ // CDpsStateMachine* CDpsStateMachine::NewL(CDpsEngine* aEngine) { - IF_DEBUG(Print(_L("CDpsStateMachine::NewL"))); CDpsStateMachine* self = new(ELeave) CDpsStateMachine(aEngine); CleanupStack::PushL(self); self->ConstructL(); @@ -52,7 +48,7 @@ // CDpsStateMachine::~CDpsStateMachine() { - IF_DEBUG(Print(_L(">>>~CDpsStateMachine"))); + OstTraceFunctionEntry0( CDPSSTATEMACHINE_CDPSSTATEMACHINE_DES_ENTRY ); delete iTrader; iTrader = NULL; delete iScriptReceiver; @@ -64,7 +60,7 @@ delete iSendingReqState; iSendingReqState = NULL; delete iWaitingRepState; iWaitingRepState = NULL; delete iSendingRepState; iSendingRepState = NULL; - IF_DEBUG(Print(_L("<<<~CDpsStateMachine"))); + OstTraceFunctionExit0( CDPSSTATEMACHINE_CDPSSTATEMACHINE_DES_EXIT ); } // --------------------------------------------------------------------------- @@ -75,9 +71,9 @@ iEngine(aEngine),iOperation(EDpsOpEmpty), iEvent(EDpsEvtEmpty), iCurError(KErrNone) { - IF_DEBUG(Print(_L(">>>CDpsStateMachine::Ctor"))); - - IF_DEBUG(Print(_L("<<>>CDpsStateMachine::ConstructL"))); + OstTraceFunctionEntry0( CDPSSTATEMACHINE_CONSTRUCTL_ENTRY ); iIdleState = new(ELeave) TDpsIdleState(this); iSendingReqState = new(ELeave) TDpsSendingReqState(this); iWaitingRepState = new(ELeave) TDpsWaitingRepState(this); @@ -95,7 +91,7 @@ iTrader = CDpsTransaction::NewL(this); iScriptReceiver = CDpsScriptReceiver::NewL(this); iScriptSender = CDpsScriptSender::NewL(this); - IF_DEBUG(Print(_L("<<>>CDpsStateMachine::StartTransaction"))); + OstTraceFunctionEntry0( CDPSSTATEMACHINE_STARTTRANSACTIONL_ENTRY ); iMOperation = aRequest; iOperation = (TDpsOperation)iMOperation->iOperation; iTrader->CreateRequestL(aRequest); iCurState = iSendingReqState; - IF_DEBUG(Print(_L("<<>>CDpsStateMachine::Initialize"))); + OstTraceFunctionEntry0( CDPSSTATEMACHINE_INITIALIZE_ENTRY ); iOperation = EDpsOpEmpty; iEvent = EDpsEvtEmpty; iCurError = KErrNone; if (CurState() != IdleState()) { SetState(IdleState()); - } - IF_DEBUG(Print(_L("<< -#include #include #include #include "dpstransaction.h" @@ -34,12 +33,12 @@ #include "dpsparam.h" #include "dpsoperation.h" #include "dpsxmlstring.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "dpstransactionTraces.h" +#endif -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -#else -# define IF_DEBUG(t) -#endif const TInt KPathLength = 3; const TInt KPercentagePosition = 3; @@ -50,7 +49,6 @@ // CDpsTransaction* CDpsTransaction::NewL(CDpsStateMachine* aOperator) { - IF_DEBUG(Print(_L("CDpsTransaction::NewL"))); CDpsTransaction* self = new(ELeave) CDpsTransaction(aOperator); CleanupStack::PushL(self); self->ConstructL(); @@ -65,7 +63,8 @@ CDpsTransaction::CDpsTransaction(CDpsStateMachine* aOperator) : iOperator(aOperator), iReply(EFalse) { - IF_DEBUG(Print(_L("CDpsTransaction::Ctor"))); + OstTraceFunctionEntry0( CDPSTRANSACTION_CDPSTRANSACTION_CONS_ENTRY ); + OstTraceFunctionExit0( CDPSTRANSACTION_CDPSTRANSACTION_CONS_EXIT ); } // --------------------------------------------------------------------------- @@ -74,11 +73,11 @@ // void CDpsTransaction::ConstructL() { - IF_DEBUG(Print(_L(">>>CDpsTransaction::ConstructL"))); + OstTraceFunctionEntry0( CDPSTRANSACTION_CONSTRUCTL_ENTRY ); iFile = CDpsFile::NewL(); iXmlGen = CDpsXmlGenerator::NewL(iOperator->DpsEngine()); iXmlPar = CDpsXmlParser::NewL(iOperator->DpsEngine()); - IF_DEBUG(Print(_L("<<>>~CDpsTransaction"))); + OstTraceFunctionEntry0( DUP1_CDPSTRANSACTION_CDPSTRANSACTION_DES_ENTRY ); delete iXmlPar; iXmlPar = NULL; @@ -96,8 +95,8 @@ delete iFile; iFile = NULL; - - IF_DEBUG(Print(_L("<<<~CDpsTransaction"))); + + OstTraceFunctionExit0( DUP1_CDPSTRANSACTION_CDPSTRANSACTION_DES_EXIT ); } // --------------------------------------------------------------------------- @@ -106,8 +105,8 @@ // void CDpsTransaction::CreateRequestL(TMDpsOperation* aOperation) { - IF_DEBUG(Print(_L(">>>CDpsTransaction::CreateRequest "))); - IF_DEBUG(Print(_L(" the request is %d"), aOperation->iOperation)); + OstTraceFunctionEntry0( CDPSTRANSACTION_CREATEREQUESTL_ENTRY ); + OstTrace1( TRACE_NORMAL, CDPSTRANSACTION_CREATEREQUESTL, " the request is %d", aOperation->iOperation ); TDpsArgArray args; TDpsEleArray elements; TDpsAttribute attrib = 0; @@ -117,18 +116,21 @@ writer.PushL(); TFileName defaultPath = iOperator->DpsEngine()->DpsFolder(); defaultPath.Append(KDpsDeviceRequestFileName); - User::LeaveIfError(writer.Replace(iFile->FileSession(), defaultPath, - EFileWrite)); - IF_DEBUG(Print(_L("*** file created "))); - User::LeaveIfError(aOperation->FillReqArgs(args, elements, attrib, this)); + LEAVEIFERROR(writer.Replace(iFile->FileSession(), defaultPath, EFileWrite), + OstTraceExt2( TRACE_ERROR, DUP2_CDPSTRANSACTION_CREATEREQUESTL, + "Creates %S for stream failed ! error code %d", defaultPath, munged_err )); + OstTrace0( TRACE_NORMAL, DUP1_CDPSTRANSACTION_CREATEREQUESTL, "*** file created " ); + LEAVEIFERROR(aOperation->FillReqArgs(args, elements, attrib, this), + OstTrace1( TRACE_ERROR, DUP3_CDPSTRANSACTION_CREATEREQUESTL, "FillReqArgs failed! error code %d", munged_err )); aOperation->CreateReqScriptL(args, elements, attrib, writer, this); writer.CommitL(); writer.Pop(); writer.Release(); - User::LeaveIfError(iOperator->ScriptSender()->SendScript(EFalse)); + LEAVEIFERROR(iOperator->ScriptSender()->SendScript(EFalse), + OstTrace1( TRACE_ERROR, DUP4_CDPSTRANSACTION_CREATEREQUESTL, "SendScript failed! error code %d", munged_err )); CleanupStack::PopAndDestroy(&elements); CleanupStack::PopAndDestroy(&args); - IF_DEBUG(Print(_L("<<>>CDpsTransaction::Filter size %d"), size)); - + OstTrace1( TRACE_NORMAL, CDPSTRANSACTION_FILTER, "size %d", size); + for (TInt i = 0; i < size; ) { // removes any unprintalbe char between two XML attributes, e.g. @@ -154,7 +157,8 @@ i++; } } - IF_DEBUG(Print(_L("<<>>CDpsTransaction::ParseScript"))); + OstTraceFunctionEntry0( CDPSTRANSACTION_PARSESCRIPTL_ENTRY ); iReply = aReply; TInt size; iFile->FileSizeL(iOperator->ScriptReceiver()->FileNameAndPath(), size); @@ -183,15 +187,16 @@ for (TInt i = 0; i < args.Count(); i++) { print.Copy(args[i].iContent); - IF_DEBUG(Print(_L("element %d content %S"), - args[i].iElement, &print)); + OstTraceExt2( TRACE_NORMAL, CDPSTRANSACTION_PARSESCRIPTL, "element %d content %S", args[i].iElement, print ); } #endif if (aReply) { TMDpsOperation* op = iOperator->MOperation(); - User::LeaveIfError(op->FillRepArgs(args, this)); + LEAVEIFERROR(op->FillRepArgs(args, this), + OstTrace1( TRACE_ERROR, DUP1_CDPSTRANSACTION_PARSESCRIPTL, + "FillRepArgs failed! error code %d", munged_err )); iXmlPar->SetOperationResult(op->iResult); } else @@ -205,13 +210,17 @@ iOperator->SetEvent(event); if (event == EDpsEvtNotifyJobStatus) { - User::LeaveIfError(iOperator->DpsEngine()->Event()-> - iJobEvent.FillRepArgs(args, this)); + LEAVEIFERROR(iOperator->DpsEngine()->Event()-> + iJobEvent.FillRepArgs(args, this), + OstTrace1( TRACE_ERROR, DUP2_CDPSTRANSACTION_PARSESCRIPTL, + "iJobEvent.FillRepArgs failed! error code %d", munged_err )); } else { - User::LeaveIfError(iOperator->DpsEngine()->Event()-> - iPrinterEvent.FillRepArgs(args, this)); + LEAVEIFERROR(iOperator->DpsEngine()->Event()-> + iPrinterEvent.FillRepArgs(args, this), + OstTrace1( TRACE_ERROR, DUP3_CDPSTRANSACTION_PARSESCRIPTL, + "iPrinterEvent.FillRepArgs failed! error code %d", munged_err )); } CreateEventReplyL(event, result); } @@ -223,6 +232,8 @@ iOperator->SetOperation(ope); if (iOperator->Operation() != EDpsOpGetFileID) { + OstTrace1( TRACE_ERROR, DUP4_CDPSTRANSACTION_PARSESCRIPTL, + "The operation %d doesn't equal to EDpsOpGetFileID", iOperator->Operation()); User::Leave(KErrNotSupported); } CreateRequestReplyL(args, result); @@ -230,7 +241,7 @@ } CleanupStack::PopAndDestroy(parser); CleanupStack::PopAndDestroy(script); - IF_DEBUG(Print(_L("<<>>CDpsTransaction::HandleHostRequestError %d"), aErr)); + OstTraceFunctionEntry0( CDPSTRANSACTION_HANDLEHOSTREQUESTERROR_ENTRY ); + OstTrace1( TRACE_NORMAL, CDPSTRANSACTION_HANDLEHOSTREQUESTERROR, "Error %d", aErr ); TDpsResult result; // here we need to map the aErr to Dps standard error switch (aErr) @@ -255,12 +267,13 @@ break; default: - IF_DEBUG(Print(_L("unknown err"))); + OstTrace0( TRACE_NORMAL, DUP1_CDPSTRANSACTION_HANDLEHOSTREQUESTERROR, "unknown err" ); + OstTraceFunctionExit0( CDPSTRANSACTION_HANDLEHOSTREQUESTERROR_EXIT ); return; } TRAP_IGNORE(CreateEventReplyL(iXmlPar->Event(), result)); - - IF_DEBUG(Print(_L("<<>>CDpsTransaction::CreateReply"))); - IF_DEBUG(Print(_L - (" the operation reply is %d"), iOperator->Operation())); - IF_DEBUG(Print(_L("\t the event reply is %d"), iOperator->Event())); + OstTraceFunctionEntry0( CDPSTRANSACTION_CREATEEVENTREPLYL_ENTRY ); + OstTrace1( TRACE_NORMAL, CDPSTRANSACTION_CREATEEVENTREPLYL, "the operation reply is %d", iOperator->Operation() ); + OstTrace1( TRACE_NORMAL, DUP1_CDPSTRANSACTION_CREATEEVENTREPLYL, "the event reply is %d", iOperator->Event()); + RFileWriteStream writer; writer.PushL(); TFileName defaultPath = iOperator->DpsEngine()->DpsFolder(); defaultPath.Append(KDpsDeviceResponseFileName); - User::LeaveIfError(writer.Replace(iFile->FileSession(), defaultPath, - EFileWrite)); - IF_DEBUG(Print(_L("*** file created "))); + LEAVEIFERROR(writer.Replace(iFile->FileSession(), defaultPath, EFileWrite), + OstTraceExt2( TRACE_ERROR, DUP3_CDPSTRANSACTION_CREATEEVENTREPLYL, + "Creates %S for stream failed ! error code %d", defaultPath, munged_err )); + OstTrace0( TRACE_NORMAL, DUP2_CDPSTRANSACTION_CREATEEVENTREPLYL, "*** file created " ); + iXmlGen->CreateResultScriptL(aEvent, writer, aResult); writer.CommitL(); writer.Pop(); writer.Release(); - User::LeaveIfError(iOperator->ScriptSender()->SendScript(ETrue)); - IF_DEBUG(Print(_L("<<ScriptSender()->SendScript(ETrue), + OstTrace1( TRACE_ERROR, DUP4_CDPSTRANSACTION_CREATEEVENTREPLYL, + "SendScript failed! error code %d", munged_err )); + OstTraceFunctionExit0( CDPSTRANSACTION_CREATEEVENTREPLYL_EXIT ); } // --------------------------------------------------------------------------- @@ -371,7 +388,7 @@ void CDpsTransaction::CreateRequestReplyL(const TDpsArgArray& aArgs, const TDpsResult& aResult) { - IF_DEBUG(Print(_L(">>>CDpsTransaction::CreateRequestReply"))); + OstTraceFunctionEntry0( CDPSTRANSACTION_CREATEREQUESTREPLYL_ENTRY ); TInt count = aArgs.Count(); TInt basePathId; TBuf8 filePath; @@ -383,7 +400,9 @@ { case EDpsArgBasePathID: converter.Assign(aArgs[i].iContent); - User::LeaveIfError(converter.Val(basePathId)); + LEAVEIFERROR(converter.Val(basePathId), + OstTrace1( TRACE_ERROR, DUP2_CDPSTRANSACTION_CREATEREQUESTREPLYL, + "Parses the string failed! error code %d", munged_err )); break; case EDpsArgFilePath: @@ -391,7 +410,7 @@ break; default: - __IF_DEBUG(Print(_L("***wrong args"))); + OstTrace0( TRACE_ERROR, CDPSTRANSACTION_CREATEREQUESTREPLYL, "***wrong args" ); User::Leave(KErrArgument); break; } @@ -400,7 +419,7 @@ SubstitutePath(filePath); TBuf file; file.Copy(filePath); - User::LeaveIfError(iOperator->DpsEngine()-> + (iOperator->DpsEngine()-> Ptp().GetObjectHandleByName(file, fileId)); TDpsArg arg; arg.iElement = EDpsArgFileID; @@ -409,16 +428,16 @@ writer.PushL(); TFileName defaultPath = iOperator->DpsEngine()->DpsFolder(); defaultPath.Append(KDpsDeviceResponseFileName); - User::LeaveIfError(writer.Replace(iFile->FileSession(), defaultPath, + (writer.Replace(iFile->FileSession(), defaultPath, EFileWrite)); - IF_DEBUG(Print(_L("*** file created "))); + OstTrace0( TRACE_NORMAL, DUP1_CDPSTRANSACTION_CREATEREQUESTREPLYL, "*** file created " ); iXmlGen->CreateReplyScriptL(EDpsOpGetFileID, writer, aResult, arg); - User::LeaveIfError(iOperator->ScriptSender()->SendScript(ETrue)); + (iOperator->ScriptSender()->SendScript(ETrue)); writer.CommitL(); writer.Pop(); writer.Release(); } - IF_DEBUG(Print(_L("<<>>CDpsTransaction::SubstitutePath %S"), &aPath)); + OstTraceFunctionEntry0( CDPSTRANSACTION_SUBSTITUTEPATH_ENTRY ); + OstTraceExt1( TRACE_NORMAL, CDPSTRANSACTION_SUBSTITUTEPATH, "path %s", aPath ); + TInt size = aPath.Size(); for (TInt i = 0; i < size; i++) { @@ -451,5 +472,6 @@ TBuf8 driveENarrow; driveENarrow.Copy(driveEWide); aPath.Replace(0, KPathLength - 1, driveENarrow); - IF_DEBUG(Print(_L("<< #include #include #include "dpsusbnotifier.h" #include "dpsconst.h" #include "dpsptpnotifier.h" #include "dpsconnectnotifier.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "dpsusbnotifierTraces.h" +#endif -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -#else -# define IF_DEBUG(t) -#endif const TInt KUnknownPersonality = 0; @@ -40,7 +39,6 @@ // CDpsUsbNotifier* CDpsUsbNotifier::NewL(CDpsEngine* aEngine) { - IF_DEBUG(Print(_L("CDpsUsbNotifier::NewL"))); CDpsUsbNotifier* self = new(ELeave) CDpsUsbNotifier(aEngine); CleanupStack::PushL(self); self->ConstructL(); @@ -58,9 +56,9 @@ iConnectState(EUsbDeviceStateUndefined), iConfigured(EFalse), iConnection(CDpsEngine::ENotConnected), iRollback(EFalse) { - IF_DEBUG(Print(_L(">>>CDpsUsbNotifier::Ctor"))); + OstTraceFunctionEntry0( CDPSUSBNOTIFIER_CDPSUSBNOTIFIER_CONS_ENTRY ); CActiveScheduler::Add(this); - IF_DEBUG(Print(_L("<<>>~CDpsUsbNotifier"))); + OstTraceFunctionEntry0( CDPSUSBNOTIFIER_CDPSUSBNOTIFIER_DES_ENTRY ); Cancel(); Rollback(); delete iPtpP; iPtpP = NULL; delete iConnectP; iConnectP = NULL; iUsbM.Close(); iUsbW.Close(); - IF_DEBUG(Print(_L("<<<~CDpsUsbNotifier"))); + OstTraceFunctionExit0( CDPSUSBNOTIFIER_CDPSUSBNOTIFIER_DES_EXIT ); } // --------------------------------------------------------------------------- @@ -85,12 +83,16 @@ // void CDpsUsbNotifier::ConstructL() { - IF_DEBUG(Print(_L(">>>CDpsUsbNotifier::ConstructL"))); - User::LeaveIfError(iUsbM.Connect()); - User::LeaveIfError(iUsbW.Connect()); + OstTraceFunctionEntry0( CDPSUSBNOTIFIER_CONSTRUCTL_ENTRY ); + LEAVEIFERROR(iUsbM.Connect(), + OstTrace1( TRACE_ERROR, CDPSUSBNOTIFIER_CONSTRUCTL, + "Connect to iUsbM failed! error code %d", munged_err)); + LEAVEIFERROR(iUsbW.Connect(), + OstTrace1( TRACE_ERROR, DUP1_CDPSUSBNOTIFIER_CONSTRUCTL, + "Connect to iUsbM failed! error code %d", munged_err)); iPtpP = CDpsPtpNotifier::NewL(this); iConnectP = CDpsConnectNotifier::NewL(this); - IF_DEBUG(Print(_L("<<ChangePtpPersonality(); + OstTraceFunctionExit0( CDPSUSBNOTIFIER_WAITFORPRINTERNOTIFY_EXIT ); } // --------------------------------------------------------------------------- @@ -109,7 +112,7 @@ // void CDpsUsbNotifier::CancelPrinterNotify() { - IF_DEBUG(Print(_L(">>>CDpsUsbNotifier::CancelPrinterNotify"))); + OstTraceFunctionEntry0( CDPSUSBNOTIFIER_CANCELPRINTERNOTIFY_ENTRY ); if (CDpsEngine::ENotConnected == iConnection) { iPtpP->Cancel(); @@ -125,7 +128,7 @@ { User::RequestComplete(iEngine->PrinterConnectRequest(), KErrCancel); } - IF_DEBUG(Print(_L("<<>>CDpsUsbNotifier::ConnectNotify"))); + OstTraceFunctionEntry0( CDPSUSBNOTIFIER_CONNECTNOTIFY_ENTRY ); iConnectP->ConnectNotify(); - IF_DEBUG(Print(_L("<<>>CDpsUsbNotifier::Rollback"))); + OstTraceFunctionEntry0( CDPSUSBNOTIFIER_ROLLBACK_ENTRY ); // only when the personality has changed, we switch back to the previous // personality if (iPersonality) { TInt personalityId = KUsbPersonalityIdMTP; iUsbM.GetCurrentPersonalityId(personalityId); - IF_DEBUG(Print(_L("CDpsUsbNotifier::Rollback, current personality= %d"), personalityId)); + OstTrace1( TRACE_NORMAL, CDPSUSBNOTIFIER_ROLLBACK, "current personality= %d", personalityId ); if(KUsbPersonalityIdPCSuiteMTP != personalityId) { if (!iConfigured || iRollback) @@ -165,7 +168,7 @@ } } } - IF_DEBUG(Print(_L("<<>>CDpsUsbNotifier::PtpNotify %x %d"), - iConnectState, aErr)); + OstTraceFunctionEntry0( CDPSUSBNOTIFIER_PTPNOTIFY_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CDPSUSBNOTIFIER_PTPNOTIFY, "connect status %x, error no %d", iConnectState, aErr ); + if (aErr == KErrNone) { // personality changed to MTP, but cable is not connected @@ -198,8 +202,8 @@ iConnection = CDpsEngine::EWrongPrintModeConnected; User::RequestComplete(iEngine->PrinterConnectRequest(), iConnection); } - - IF_DEBUG(Print(_L("<<>>CDpsUsbNotifier::PersonalityChanged %x"), - iPersonality)); + OstTraceFunctionEntry0( CDPSUSBNOTIFIER_PERSONALITYCHANGED_ENTRY ); + OstTrace1( TRACE_NORMAL, CDPSUSBNOTIFIER_PERSONALITYCHANGED, "iPersonality %x", iPersonality ); + if (iPersonality != KUsbPersonalityIdMTP) { iConnection = CDpsEngine::EWrongPrintModeConnected; @@ -222,8 +227,8 @@ } // when UI gets this notification, it must quit. As the result, the dps // engine will be deleted so we do not need to care the further change. - - IF_DEBUG(Print(_L(">>>CDpsUsbNotifier::PersonalityChanged "))); + + OstTraceFunctionExit0( CDPSUSBNOTIFIER_PERSONALITYCHANGED_EXIT ); } // --------------------------------------------------------------------------- @@ -232,7 +237,7 @@ // void CDpsUsbNotifier::RunL() { - IF_DEBUG(Print(_L(">>>CDpsUsbNotifier::RunL"))); + OstTraceFunctionEntry0( CDPSUSBNOTIFIER_RUNL_ENTRY ); if (EPrinterAvailable == iStatus.Int()) { @@ -245,8 +250,8 @@ iConnection = CDpsEngine::EOtherConnected; } User::RequestComplete(iEngine->PrinterConnectRequest(), iConnection); - - IF_DEBUG(Print(_L("<<>>CDpsUsbNotifier::DoCancel"))); + OstTraceFunctionEntry0( CDPSUSBNOTIFIER_DOCANCEL_ENTRY ); iEngine->Ptp().CancelIsDpsPrinter(); - IF_DEBUG(Print(_L(">>>CDpsUsbNotifier::DoCancel"))); + OstTraceFunctionExit0( CDPSUSBNOTIFIER_DOCANCEL_EXIT ); } // --------------------------------------------------------------------------- @@ -266,7 +271,8 @@ // TInt CDpsUsbNotifier::RunError(TInt aErr) { - IF_DEBUG(Print(_L("CDpsUsbNotifier::RunError is %d"), aErr)); + OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CDPSUSBNOTIFIER_RUNERROR, + "error code %d", aErr); return aErr; } @@ -276,7 +282,9 @@ // void CDpsUsbNotifier::DisconnectNotify(TUsbDeviceState aState) { - IF_DEBUG(Print(_L(">>>CDpsUsbNotifier::DisconnectNotify %d"), aState)); + OstTraceFunctionEntry0( CDPSUSBNOTIFIER_DISCONNECTNOTIFY_ENTRY ); + OstTrace1( TRACE_NORMAL, CDPSUSBNOTIFIER_DISCONNECTNOTIFY, "status %d", aState ); + if (iConfigured) { iConnection = CDpsEngine::EPrinterDisconnected; @@ -294,8 +302,8 @@ { User::RequestComplete(iEngine->PrinterConnectRequest(), iConnection); } - - IF_DEBUG(Print(_L("<<>>CDpsUsbNotifier::ConnectState"))); - TInt ret = iUsbM.GetDeviceState(iConnectState); - IF_DEBUG(Print(_L("<< +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "dpsxmlgeneratorTraces.h" +#endif -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -#else -# define IF_DEBUG(t) -#endif const TInt KCodeSize = 4; @@ -37,7 +35,6 @@ // CDpsXmlGenerator* CDpsXmlGenerator::NewL(CDpsEngine* aEngine) { - IF_DEBUG(Print(_L("CDpsXmlGenerator::NewL"))); CDpsXmlGenerator* self= new (ELeave) CDpsXmlGenerator(aEngine); return self; } @@ -48,7 +45,8 @@ // CDpsXmlGenerator::~CDpsXmlGenerator() { - IF_DEBUG(Print(_L("~CDpsXmlGenerator"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_CDPSXMLGENERATOR_DES_ENTRY ); + OstTraceFunctionExit0( CDPSXMLGENERATOR_CDPSXMLGENERATOR_DES_EXIT ); } // --------------------------------------------------------------------------- @@ -58,7 +56,8 @@ CDpsXmlGenerator::CDpsXmlGenerator(CDpsEngine* aEngine) : iEngine(aEngine) { - IF_DEBUG(Print(_L("CDpsXmlGenerator::Ctor"))); + OstTraceFunctionEntry0( DUP1_CDPSXMLGENERATOR_CDPSXMLGENERATOR_CONS_ENTRY ); + OstTraceFunctionExit0( DUP1_CDPSXMLGENERATOR_CDPSXMLGENERATOR_CONS_EXIT ); } // --------------------------------------------------------------------------- @@ -69,7 +68,7 @@ RWriteStream& aScript, const TDpsResult& aResult) const { - IF_DEBUG(Print(_L(">>>CDpsXmlGenerator::CreateResultScript"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_CREATERESULTSCRIPTL_ENTRY ); StartDocumentL(aScript); StartResultL(aScript, aResult); if (aEvent != EDpsEvtEmpty) @@ -78,7 +77,7 @@ } EndResultL(aScript); EndDocumentL(aScript); - IF_DEBUG(Print(_L("<<>>CDpsXmlGenerator::StatrDocument"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_STARTDOCUMENTL_ENTRY ); aScript.WriteL(KDpsXmlHeader); aScript.WriteL(KDpsXmlNS); aScript.WriteL(KDpsXmlSpace); - IF_DEBUG(Print(_L("<<>>CDpsXmlGenerator::EndDocument"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_ENDDOCUMENTL_ENTRY ); aScript.WriteL(KDpsXmlBraceOpen); aScript.WriteL(KDpsXmlSlash); aScript.WriteL(KDpsXml); - aScript.WriteL(KDpsXmlBraceClose); - IF_DEBUG(Print(_L("<<>>CDpsXmlGenerator::StartInput"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_STARTINPUTL_ENTRY ); aScript.WriteL(KDpsXmlBraceOpen); aScript.WriteL(KDpsXmlInput); aScript.WriteL(KDpsXmlBraceClose); aScript.WriteL(KDpsXmlSpace); - IF_DEBUG(Print(_L("<<>>CDpsXmlGenerator::EndInput"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_ENDINPUTL_ENTRY ); aScript.WriteL(KDpsXmlBraceOpen); aScript.WriteL(KDpsXmlSlash); aScript.WriteL(KDpsXmlInput); aScript.WriteL(KDpsXmlBraceClose); - aScript.WriteL(KDpsXmlSpace); - IF_DEBUG(Print(_L("<<>>CDpsXmlGenerator::StartResult"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_STARTRESULTL_ENTRY ); aScript.WriteL(KDpsXmlBraceOpen); aScript.WriteL(KDpsXmlOutput); aScript.WriteL(KDpsXmlBraceClose); @@ -181,8 +180,8 @@ aScript.WriteL(KDpsXmlSlash); aScript.WriteL(KDpsXmlResult); aScript.WriteL(KDpsXmlBraceClose); - aScript.WriteL(KDpsXmlSpace); - IF_DEBUG(Print(_L("<<>>CDpsXmlGenerator::EndResult"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_ENDRESULTL_ENTRY ); aScript.WriteL(KDpsXmlBraceOpen); aScript.WriteL(KDpsXmlSlash); aScript.WriteL(KDpsXmlOutput); aScript.WriteL(KDpsXmlBraceClose); - aScript.WriteL(KDpsXmlSpace); - IF_DEBUG(Print(_L("<<>>CDpsXmlGenerator::StartOperation %d"), aOperation)); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_STARTOPERATIONL_ENTRY ); + OstTrace1( TRACE_NORMAL, CDPSXMLGENERATOR_STARTOPERATIONL, "Operation %d", aOperation ); aScript.WriteL(KDpsXmlBraceOpen); aScript.WriteL(iEngine->DpsParameters()-> iDpsOperationStrings[aOperation - 1]); @@ -218,7 +218,7 @@ } aScript.WriteL(KDpsXmlBraceClose); aScript.WriteL(KDpsXmlSpace); - IF_DEBUG(Print(_L("<<>>CDpsXmlGenerator::EndOperation"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_ENDOPERATIONL_ENTRY ); aScript.WriteL(KDpsXmlBraceOpen); aScript.WriteL(KDpsXmlSlash); // there is an empty op in the op enum so we must reduce one @@ -236,7 +236,7 @@ iDpsOperationStrings[aOperation - 1]); aScript.WriteL(KDpsXmlBraceClose); aScript.WriteL(KDpsXmlSpace); - IF_DEBUG(Print(_L("<<>>CDpsXmlGenerator::CreatEvent"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_CREATEEVENTL_ENTRY ); aScript.WriteL(KDpsXmlBraceOpen); aScript.WriteL(iEngine->DpsParameters()-> iDpsEventStrings[aEvent - 1]); aScript.WriteL(KDpsXmlSlash); aScript.WriteL(KDpsXmlBraceClose); aScript.WriteL(KDpsXmlSpace); - IF_DEBUG(Print(_L("<<>>CDpsXmlGenerator::CreatArg"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_CREATEARGL_ENTRY ); aScript.WriteL(KDpsXmlBraceOpen); //< aScript.WriteL(iEngine->DpsParameters()-> iDpsArgStrings[aArgument.iElement]); @@ -296,7 +296,7 @@ aScript.WriteL(KDpsXmlBraceClose); // > } aScript.WriteL(KDpsXmlSpace); - IF_DEBUG(Print(_L("<<>>CDpsXmlGenerator::StartElement"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_STARTELEMENTL_ENTRY ); aScript.WriteL(KDpsXmlBraceOpen); //< aScript.WriteL(iEngine->DpsParameters()-> iDpsElementStrings[aElement - 1]); aScript.WriteL(KDpsXmlBraceClose); // > aScript.WriteL(KDpsXmlSpace); - IF_DEBUG(Print(_L("<<>>CDpsXmlGenerator::EndElement"))); + OstTraceFunctionEntry0( CDPSXMLGENERATOR_ENDELEMENTL_ENTRY ); aScript.WriteL(KDpsXmlBraceOpen); //< aScript.WriteL(KDpsXmlSlash); aScript.WriteL(iEngine->DpsParameters()-> iDpsElementStrings[aElement - 1]); aScript.WriteL(KDpsXmlBraceClose); // > aScript.WriteL(KDpsXmlSpace); - IF_DEBUG(Print(_L("<< #include "dpsxmlparser.h" #include "dpsconst.h" #include "pictbridge.h" #include "dpsxmlstring.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "dpsxmlparserTraces.h" +#endif -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -# define PRINT_DES(t)\ - {TBuf _buf; _buf.Copy(t);RDebug::Print(_L("---%S"), &_buf);} -#else -# define IF_DEBUG(t) -# define PRINT_DES(t) -#endif // --------------------------------------------------------------------------- // @@ -37,7 +32,6 @@ // CDpsXmlParser* CDpsXmlParser::NewL(CDpsEngine* aEngine) { - IF_DEBUG(Print(_L("CDpsXmlParser::NewL"))); CDpsXmlParser* self = new (ELeave) CDpsXmlParser(aEngine); return self; } @@ -48,9 +42,9 @@ // CDpsXmlParser::~CDpsXmlParser() { - IF_DEBUG(Print(_L(">>>~CDpsXmlParser"))); + OstTraceFunctionEntry0( CDPSXMLPARSER_CDPSXMLPARSER_DES_ENTRY ); iDpsArgs.Close(); - __IF_DEBUG(Print(_L("<<<~CDpsXmlParser"))); + OstTraceFunctionExit0( CDPSXMLPARSER_CDPSXMLPARSER_DES_EXIT ); } // --------------------------------------------------------------------------- @@ -59,9 +53,9 @@ // CDpsXmlParser::CDpsXmlParser(CDpsEngine* aEngine) : iEngine(aEngine) { - IF_DEBUG(Print(_L(">>>CDpsXmlParser::Ctor"))); + OstTraceFunctionEntry0( DUP1_CDPSXMLPARSER_CDPSXMLPARSER_CONS_ENTRY ); Reset(); - IF_DEBUG(Print(_L("<<>>CDpsXmlParser::OnStartDocumentL"))); + OstTraceFunctionEntry0( CDPSXMLPARSER_ONSTARTDOCUMENTL_ENTRY ); if (aErrorCode != KErrNone) { - IF_DEBUG(Print(_L("---, error code is %d"), aErrorCode)); + OstTrace1( TRACE_ERROR, CDPSXMLPARSER_ONSTARTDOCUMENTL, "---, error code is %d", aErrorCode ); User::Leave(aErrorCode); } - IF_DEBUG(Print(_L("<<>>CDpsXmlParser::OnEndDocumentL"))); + OstTraceFunctionEntry0( CDPSXMLPARSER_ONENDDOCUMENTL_ENTRY ); if (aErrorCode != KErrNone) { - IF_DEBUG(Print(_L("---, error code is %d"), aErrorCode)); + OstTrace1( TRACE_ERROR, CDPSXMLPARSER_ONENDDOCUMENTL, "---, error code is %d", aErrorCode ); User::Leave(aErrorCode); } - IF_DEBUG(Print(_L("<<>>CDpsXmlParser::OnStartElementL"))); + OstTraceFunctionEntry0( CDPSXMLPARSER_ONSTARTELEMENTL_ENTRY ); if (aErrCode != KErrNone) { - IF_DEBUG(Print(_L("---, error code is %d"), aErrCode)); + OstTrace1( TRACE_ERROR, CDPSXMLPARSER_ONSTARTELEMENTL, "---, error code is %d", aErrCode ); User::Leave(aErrCode); } if (aAttributes.Count() > 1) { - IF_DEBUG(Print(_L("---cannot have more than one attribute!"))); + OstTrace0( TRACE_ERROR, DUP1_CDPSXMLPARSER_ONSTARTELEMENTL, "---cannot have more than one attribute!" ); User::Leave(KErrArgument); } // Gets the name of the tag const TDesC8& name = aElement.LocalName().DesC(); - IF_DEBUG(Print(_L("---Start"))); PRINT_DES(name); - + OstTraceExt1( TRACE_NORMAL, DUP2_CDPSXMLPARSER_ONSTARTELEMENTL, "---Start---%s", name ); //Checks the element // this is the first layer if (!name.Compare(KDpsXml)) @@ -165,8 +158,7 @@ { if (!name.Compare(iEngine->DpsParameters()->iDpsOperationStrings[i])) { - IF_DEBUG(Print(_L("---found the operation"))); - PRINT_DES(name); + OstTraceExt1( TRACE_NORMAL, DUP3_CDPSXMLPARSER_ONSTARTELEMENTL, "---found the operation---%s", name ); iDpsOperation = (TDpsOperation)(i+1);// i+1 to by pass first operation EDpsOpEmpty in enum which is not added to array break; } @@ -180,8 +172,7 @@ // only element in output is capability if (!name.Compare(iEngine->DpsParameters()->iDpsElementStrings[0])) { - IF_DEBUG(Print(_L("---the element is"))); - PRINT_DES(name); + OstTraceExt1( TRACE_NORMAL, DUP4_CDPSXMLPARSER_ONSTARTELEMENTL, "---the element is %s", name ); iElement = EDpsCapability; } else @@ -190,8 +181,7 @@ { if (!name.Compare(iEngine->DpsParameters()->iDpsArgStrings[i])) { - IF_DEBUG(Print(_L("---the argument is "))); - PRINT_DES(name); + OstTraceExt1( TRACE_NORMAL, DUP5_CDPSXMLPARSER_ONSTARTELEMENTL, "---the argument is %s", name ); TDpsArg arg; arg.iElement = (TDpsArgument)i; arg.iContent.Copy(_L("")); @@ -205,14 +195,14 @@ else { // something wrong - IF_DEBUG(Print(_L("--- non-PB element! %S"), &name)); + OstTraceExt1( TRACE_ERROR, DUP6_CDPSXMLPARSER_ONSTARTELEMENTL, "--- non-PB element! %S", name ); User::Leave(KErrNotSupported); } if (aAttributes.Count() == 1) { ParseAttributesL(aAttributes, name); } - IF_DEBUG(Print(_L("<<> KShiftLength; CleanupStack::PopAndDestroy(value); - IF_DEBUG(Print(_L("--- attribte value %x"), result)); - + OstTrace1( TRACE_NORMAL, DUP3_CDPSXMLPARSER_PARSEATTRIBUTESL, "--- attribte value %x", result ); + + OstTraceFunctionExit0( CDPSXMLPARSER_PARSEATTRIBUTESL_EXIT ); } // --------------------------------------------------------------------------- @@ -263,18 +253,18 @@ void CDpsXmlParser::OnEndElementL(const RTagInfo& aElement, TInt aErrorCode) { - IF_DEBUG(Print(_L(">>>CDpsXmlParser::OnEndElementL"))); + OstTraceFunctionEntry0( CDPSXMLPARSER_ONENDELEMENTL_ENTRY ); if (aErrorCode != KErrNone) { - IF_DEBUG(Print(_L("--- error code is %d"), aErrorCode)); + OstTrace1( TRACE_ERROR, CDPSXMLPARSER_ONENDELEMENTL, "--- error code is %d", aErrorCode ); User::Leave(aErrorCode); } // Get the name of the tag const TDesC8& name = aElement.LocalName().DesC(); - PRINT_DES(name); - IF_DEBUG(Print(_L("<<>>CDpsXmlParser::OnContentL content is"))); - PRINT_DES(aBytes); + OstTraceFunctionEntry0( CDPSXMLPARSER_ONCONTENTL_ENTRY ); + OstTraceExt1( TRACE_NORMAL, CDPSXMLPARSER_ONCONTENTL, "content is %s", aBytes ); if (aErrorCode != KErrNone) { - IF_DEBUG(Print(_L("--- error code %d"), aErrorCode)); + OstTrace1( TRACE_ERROR, DUP1_CDPSXMLPARSER_ONCONTENTL, "--- error code %d", aErrorCode ); User::Leave(aErrorCode); } if (aBytes[0] >= KSOH && aBytes[0] <= KSpace) { - IF_DEBUG(Print(_L("the unprintable char %d"), aBytes[0])); + OstTrace1( TRACE_NORMAl, DUP2_CDPSXMLPARSER_ONCONTENTL, "the unprintable char %d", aBytes[0] ); + OstTraceFunctionExit0( CDPSXMLPARSER_ONCONTENTL_EXIT ); return; } // parses the result @@ -304,10 +295,11 @@ TInt error = converter.Val(value, EHex); if (error != KErrNone) { - IF_DEBUG(Print(_L("--- convert error %d"), error)); + OstTrace1( TRACE_ERROR, DUP3_CDPSXMLPARSER_ONCONTENTL, "--- convert error %d", error ); User::Leave(error); } - IF_DEBUG(Print(_L("--- result %x"), value)); + OstTrace1( TRACE_NORMAL, DUP4_CDPSXMLPARSER_ONCONTENTL, "--- result %x", value); + // we have got the result iDpsResult.iMajorCode = static_cast(value >> KShiftLength); @@ -319,7 +311,7 @@ { iDpsArgs[iDpsArgs.Count() - 1].iContent.Copy(aBytes); } - IF_DEBUG(Print(_L("<<>>CDpsXmlParser::OnStartPrefixMappingL"))); + OstTraceFunctionEntry0( CDPSXMLPARSER_ONSTARTPREFIXMAPPINGL_ENTRY ); if (aErrorCode != KErrNone) { - IF_DEBUG(Print(_L("--- error code %d"), aErrorCode)); + OstTrace1( TRACE_ERROR, CDPSXMLPARSER_ONSTARTPREFIXMAPPINGL, "--- error code %d", aErrorCode ); User::Leave(aErrorCode); } - IF_DEBUG(Print(_L("<<>>CDpsXmlParser::OnEndPrefixMappingL"))); + OstTraceFunctionEntry0( CDPSXMLPARSER_ONENDPREFIXMAPPINGL_ENTRY ); if (aErrorCode != KErrNone) { - IF_DEBUG(Print(_L("--- error code %d"), aErrorCode)); + OstTrace1( TRACE_ERROR, CDPSXMLPARSER_ONENDPREFIXMAPPINGL, "--- error code %d", aErrorCode ); User::Leave(aErrorCode); } - IF_DEBUG(Print(_L("<<>>CDpsXmlParser::OnIgnorableWhiteSpaceL"))); + OstTraceFunctionEntry0( CDPSXMLPARSER_ONIGNORABLEWHITESPACEL_ENTRY ); if (aErrorCode != KErrNone) { - IF_DEBUG(Print(_L("---error code %d"), aErrorCode)); + OstTrace1( TRACE_ERROR, CDPSXMLPARSER_ONIGNORABLEWHITESPACEL, "--- error code %d", aErrorCode ); User::Leave(aErrorCode); } - IF_DEBUG(Print(_L("<<>>CDpsXmlParser::OnSkippedEntityL"))); + OstTraceFunctionEntry0( CDPSXMLPARSER_ONSKIPPEDENTITYL_ENTRY ); if (aErrorCode != KErrNone) { - IF_DEBUG(Print(_L("--- error code %d"), aErrorCode)); + OstTrace1( TRACE_ERROR, CDPSXMLPARSER_ONSKIPPEDENTITYL, "--- error code %d", aErrorCode ); User::Leave(aErrorCode); } - IF_DEBUG(Print(_L("<<>>CDpsXmlParser::OnProcessingInstructionL"))); + OstTraceFunctionEntry0( CDPSXMLPARSER_ONPROCESSINGINSTRUCTIONL_ENTRY ); if (aErrorCode != KErrNone) { - IF_DEBUG(Print(_L("--- error code %d"), aErrorCode)); + OstTrace1( TRACE_ERROR, CDPSXMLPARSER_ONPROCESSINGINSTRUCTIONL, "--- error code %d", aErrorCode ); User::Leave(aErrorCode); } - IF_DEBUG(Print(_L("<<>>CDpsXmlParser::OnError()"))); + OstTraceFunctionEntry0( CDPSXMLPARSER_ONERROR_ENTRY ); if (aErrorCode != KErrNone) { - IF_DEBUG(Print(_L("---error code %d"), aErrorCode)); + OstTrace1( TRACE_NORMAL, CDPSXMLPARSER_ONERROR, "---error code %d", aErrorCode ); } - IF_DEBUG(Print(_L("<< - -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -#else -# define IF_DEBUG(t) +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "dpsxmlstringTraces.h" #endif // --------------------------------------------------------------------------- @@ -119,7 +116,7 @@ break; default: - IF_DEBUG(Print(_L("wrong in OperationString"))); + OstTrace0( TRACE_ERROR, TDPSXMLSTRING_CONSTRUCTL, "wrong in OperationString" ); User::Leave(KErrArgument); break; } @@ -143,7 +140,7 @@ break; default: - IF_DEBUG(Print(_L("wrong in ElementString"))); + OstTrace0( TRACE_ERROR, DUP1_TDPSXMLSTRING_CONSTRUCTL, "wrong in ElementString" ); User::Leave(KErrArgument); break; } @@ -164,7 +161,7 @@ break; default: - IF_DEBUG(Print(_L("wrong in Event String"))); + OstTrace0( TRACE_ERROR, DUP2_TDPSXMLSTRING_CONSTRUCTL, "wrong in Event String" ); User::Leave(KErrArgument); break; } @@ -399,7 +396,7 @@ break; default: - IF_DEBUG(Print(_L("wrong in ArgString"))); + OstTrace0( TRACE_ERROR, DUP3_TDPSXMLSTRING_CONSTRUCTL, "wrong in ArgString" ); User::Leave(KErrArgument); break; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/pictbridgeengine/src/pictbridge.cpp --- a/mtpdataproviders/mtppictbridgedp/pictbridgeengine/src/pictbridge.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/pictbridgeengine/src/pictbridge.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -17,7 +17,6 @@ #include -#include #include #include #include @@ -36,12 +35,12 @@ #include "dpsscriptsender.h" #include "dpstransaction.h" #include "dpsfile.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "pictbridgeTraces.h" +#endif -#ifdef _DEBUG -# define IF_DEBUG(t) {RDebug::t;} -#else -# define IF_DEBUG(t) -#endif const TInt KResource = 32; const TInt KDriver = 3; @@ -51,7 +50,7 @@ // EXPORT_C CDpsEngine* CDpsEngine::GetEngineL() { - IF_DEBUG(Print(_L("CDpsEngine::GetEngineL"))); + OstTraceFunctionEntry0( CDPSENGINE_GETENGINEL_ENTRY ); CDpsEngine* me; me = static_cast(Dll::Tls()); if (!me) @@ -61,11 +60,16 @@ CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(); - User::LeaveIfError(Dll::SetTls(self)); + LEAVEIFERROR(Dll::SetTls(self), + OstTrace1( TRACE_ERROR, CDPSENGINE_GETENGINEL, + "Build singleton failed! error code %d", munged_err)); + + OstTraceFunctionExit0( CDPSENGINE_GETENGINEL_EXIT ); return self; } else { + OstTraceFunctionExit0( DUP1_CDPSENGINE_GETENGINEL_EXIT ); return me; } } @@ -76,14 +80,14 @@ // EXPORT_C void CDpsEngine::Delete() { - IF_DEBUG(Print(_L(">>>DpsEngine::Delete"))); + OstTraceFunctionEntry0( CDPSENGINE_DELETE_ENTRY ); CDpsEngine *me; me = static_cast(Dll::Tls()); if (me) { delete me; Dll::SetTls(NULL); } - IF_DEBUG(Print(_L("<<>>CDpsEngine::ConstructL"))); + OstTraceFunctionEntry0( CDPSENGINE_CONSTRUCTL_ENTRY ); iDpsParameters = TDpsXmlString::NewL(); - User::LeaveIfError(iPtp.Connect()); + LEAVEIFERROR(iPtp.Connect(), + OstTrace1( TRACE_ERROR, CDPSENGINE_CONSTRUCTL, + "Connect iPtp failed! error code %d", munged_err)); + iDpsOperator = CDpsStateMachine::NewL(this); - iUsbNotifier = CDpsUsbNotifier::NewL(this); - IF_DEBUG(Print(_L("<<>>~CDpsEngine"))); + OstTraceFunctionEntry0( CDPSENGINE_CDPSENGINE_DES_ENTRY ); delete iDpsOperator; iDpsOperator = NULL; @@ -129,7 +136,7 @@ delete iDpsParameters; iDpsParameters = NULL; iPtp.Close(); - IF_DEBUG(Print(_L("<<<~CDpsEngine"))); + OstTraceFunctionExit0( CDPSENGINE_CDPSENGINE_DES_EXIT ); } // --------------------------------------------------------------------------- @@ -138,12 +145,12 @@ // EXPORT_C void CDpsEngine::SetPrintMode(TRequestStatus& aStatus) { - IF_DEBUG(Print(_L(">>>DpsEngine::SearchPrinter"))); + OstTraceFunctionEntry0( CDPSENGINE_SETPRINTMODE_ENTRY ); iPrinterConnectRequest = &aStatus; *iPrinterConnectRequest = KRequestPending; iUsbNotifier->WaitForPrinterNotify(); - IF_DEBUG(Print(_L("<<>>DpsEngine::CancelSearchPrinter"))); + OstTraceFunctionEntry0( CDPSENGINE_CANCELPRINTMODE_ENTRY ); iUsbNotifier->CancelPrinterNotify(); - IF_DEBUG(Print(_L("<<>>DpsEngine::ConnectStateNotifyL"))); + OstTraceFunctionEntry0( CDPSENGINE_CONNECTSTATENOTIFY_ENTRY ); // SetPrintMode must be finished if (!iUsbNotifier->IsSetPrintModeIssued()) { TRequestStatus* status = &aStatus; User::RequestComplete(status, KErrNotReady); + OstTraceFunctionExit0( CDPSENGINE_CONNECTSTATENOTIFY_EXIT ); return; } iPrinterConnectRequest = &aStatus; *iPrinterConnectRequest = KRequestPending; iUsbNotifier->ConnectNotify(); - IF_DEBUG(Print(_L("<<>>DpsEngine::DoDpsRequestL"))); + OstTraceFunctionEntry0( CDPSENGINE_DODPSREQUESTL_ENTRY ); // the ptp printer must be connected and registered for the dps event if (!iUsbNotifier->IsConfigured() || !iDpsEventRequest) { TRequestStatus* status = &aStatus; User::RequestComplete(status, KErrNotReady); + OstTraceFunctionExit0( CDPSENGINE_DODPSREQUESTL_EXIT ); return; } // there is a request from the host received and the reply has been // sending out, but the host has not received it yet. we can not send - // the device request now - IF_DEBUG(Print(_L("curState is %x, idleState is %x"), - iDpsOperator->CurState(), iDpsOperator->IdleState())); + // the device request now + OstTraceExt2( TRACE_NORMAL, CDPSENGINE_DODPSREQUESTL, + "curState is %x, idleState is %x", (TUint32)iDpsOperator->CurState(), (TUint32)iDpsOperator->IdleState() ); + if (iDpsOperator->CurState() != iDpsOperator->IdleState()) { TRequestStatus* status = &aStatus; User::RequestComplete(status, KErrInUse); + OstTraceFunctionExit0( DUP1_CDPSENGINE_DODPSREQUESTL_EXIT ); return; } iDpsOperator->StartTransactionL(aRequest); iDpsOperationRequest = &aStatus; - *iDpsOperationRequest = KRequestPending; - IF_DEBUG(Print(_L("<<>>DpsEngine::CancelDpsOperation"))); + OstTraceFunctionEntry0( CDPSENGINE_CANCELDPSREQUEST_ENTRY ); if (iDpsOperationRequest) { iDpsOperator->ScriptSender()->Cancel(); User::RequestComplete(iDpsOperationRequest, KErrCancel); } iDpsOperator->Initialize(); - IF_DEBUG(Print(_L("<<>>DpsEngine::DpsEventNotify"))); + OstTraceFunctionEntry0( CDPSENGINE_DPSEVENTNOTIFY_ENTRY ); // the PTP printer must be connected and registered for the disconnect if (!iUsbNotifier->IsConfigured() || !iPrinterConnectRequest) { TRequestStatus* status = &aStatus; User::RequestComplete(status, KErrNotReady); + OstTraceFunctionExit0( CDPSENGINE_DPSEVENTNOTIFY_EXIT ); return; } @@ -248,7 +260,7 @@ iDpsEventRequest = &aStatus; *iDpsEventRequest = KRequestPending; iDpsOperator->ScriptReceiver()->WaitForReceive(); - IF_DEBUG(Print(_L("<<ScriptReceiver()->Cancel(); } + OstTraceFunctionExit0( CDPSENGINE_CANCELDPSEVENTNOTIFY_EXIT ); } // --------------------------------------------------------------------------- @@ -271,7 +284,7 @@ // EXPORT_C void CDpsEngine::GetDpsConfigL(TDpsConfigPrintReq& aConfig) { - IF_DEBUG(Print(_L(">>>DpsEngine::GetDpsConfigL"))); + OstTraceFunctionEntry0( CDPSENGINE_GETDPSCONFIGL_ENTRY ); RFs fs = iDpsOperator->Trader()->FileHandle()->FileSession(); RResourceFile resource; @@ -280,7 +293,7 @@ TBuf length(KDpsResource); resourceFile.SetLength(KDriver + length.Length()); resourceFile.Replace(KDriver, length.Length(), KDpsResource); - IF_DEBUG(Print(_L("file is %S"), &resourceFile)); + OstTraceExt1( TRACE_NORMAL, CDPSENGINE_GETDPSCONFIGL, "file is %S", resourceFile ); resource.OpenL(fs, resourceFile); CleanupClosePushL(resource); resource.ConfirmSignatureL(KDpsResourceVersion); @@ -307,7 +320,7 @@ aConfig.iSerialNo.Copy(SerialNo); CleanupStack::PopAndDestroy(id); CleanupStack::PopAndDestroy(&resource); - IF_DEBUG(Print(_L("<< +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/pictbridgeengine/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpdataproviders/mtppictbridgedp/pictbridgeengine/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,406 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_IMPORTANT=0x85 +[GROUP]TRACE_NORMAL=0x86 +[GROUP]TRACE_NORMAl=0xde +[GROUP]TRACE_WARNING=0x83 +[TRACE]TRACE_ERROR[0x82]_CDPSENGINE_CONSTRUCTL=0x36 +[TRACE]TRACE_ERROR[0x82]_CDPSENGINE_GETENGINEL=0x35 +[TRACE]TRACE_ERROR[0x82]_CDPSFILE_CONSTRUCTL=0x1 +[TRACE]TRACE_ERROR[0x82]_CDPSSCRIPTSENDER_RUNL=0x11 +[TRACE]TRACE_ERROR[0x82]_CDPSTRANSACTION_CONVERTVERSION=0x19 +[TRACE]TRACE_ERROR[0x82]_CDPSTRANSACTION_CREATEREQUESTREPLYL=0x1e +[TRACE]TRACE_ERROR[0x82]_CDPSUSBNOTIFIER_CONSTRUCTL=0x1f +[TRACE]TRACE_ERROR[0x82]_CDPSXMLPARSER_ONENDDOCUMENTL=0x22 +[TRACE]TRACE_ERROR[0x82]_CDPSXMLPARSER_ONENDELEMENTL=0x29 +[TRACE]TRACE_ERROR[0x82]_CDPSXMLPARSER_ONENDPREFIXMAPPINGL=0x2d +[TRACE]TRACE_ERROR[0x82]_CDPSXMLPARSER_ONIGNORABLEWHITESPACEL=0x2e +[TRACE]TRACE_ERROR[0x82]_CDPSXMLPARSER_ONPROCESSINGINSTRUCTIONL=0x30 +[TRACE]TRACE_ERROR[0x82]_CDPSXMLPARSER_ONSKIPPEDENTITYL=0x2f +[TRACE]TRACE_ERROR[0x82]_CDPSXMLPARSER_ONSTARTDOCUMENTL=0x21 +[TRACE]TRACE_ERROR[0x82]_CDPSXMLPARSER_ONSTARTELEMENTL=0x23 +[TRACE]TRACE_ERROR[0x82]_CDPSXMLPARSER_ONSTARTPREFIXMAPPINGL=0x2c +[TRACE]TRACE_ERROR[0x82]_CDPSXMLPARSER_PARSEATTRIBUTESL=0x26 +[TRACE]TRACE_ERROR[0x82]_DUP1_CDPSFILE_FILESIZEL=0x4 +[TRACE]TRACE_ERROR[0x82]_DUP1_CDPSFILE_GETCONTENTL=0x2 +[TRACE]TRACE_ERROR[0x82]_DUP1_CDPSTRANSACTION_PARSESCRIPTL=0x15 +[TRACE]TRACE_ERROR[0x82]_DUP1_CDPSUSBNOTIFIER_CONSTRUCTL=0x20 +[TRACE]TRACE_ERROR[0x82]_DUP1_CDPSXMLPARSER_ONCONTENTL=0x2a +[TRACE]TRACE_ERROR[0x82]_DUP1_CDPSXMLPARSER_ONSTARTELEMENTL=0x24 +[TRACE]TRACE_ERROR[0x82]_DUP1_CDPSXMLPARSER_PARSEATTRIBUTESL=0x27 +[TRACE]TRACE_ERROR[0x82]_DUP1_TDPSGETCAPABILITY_FILLREPARGS=0x9 +[TRACE]TRACE_ERROR[0x82]_DUP1_TDPSXMLSTRING_CONSTRUCTL=0x32 +[TRACE]TRACE_ERROR[0x82]_DUP2_CDPSFILE_FILESIZEL=0x5 +[TRACE]TRACE_ERROR[0x82]_DUP2_CDPSFILE_GETCONTENTL=0x3 +[TRACE]TRACE_ERROR[0x82]_DUP2_CDPSSCRIPTRECEIVER_RUNL=0x10 +[TRACE]TRACE_ERROR[0x82]_DUP2_CDPSTRANSACTION_CONVERTVERSION=0x1a +[TRACE]TRACE_ERROR[0x82]_DUP2_CDPSTRANSACTION_CREATEREQUESTL=0x12 +[TRACE]TRACE_ERROR[0x82]_DUP2_CDPSTRANSACTION_CREATEREQUESTREPLYL=0x1d +[TRACE]TRACE_ERROR[0x82]_DUP2_CDPSTRANSACTION_PARSESCRIPTL=0x16 +[TRACE]TRACE_ERROR[0x82]_DUP2_CDPSXMLPARSER_PARSEATTRIBUTESL=0x28 +[TRACE]TRACE_ERROR[0x82]_DUP2_TDPSCONFIGPRINTSERVICE_FILLREPARGS=0xb +[TRACE]TRACE_ERROR[0x82]_DUP2_TDPSXMLSTRING_CONSTRUCTL=0x33 +[TRACE]TRACE_ERROR[0x82]_DUP3_CDPSSCRIPTRECEIVER_RUNL=0xf +[TRACE]TRACE_ERROR[0x82]_DUP3_CDPSTRANSACTION_CREATEEVENTREPLYL=0x1b +[TRACE]TRACE_ERROR[0x82]_DUP3_CDPSTRANSACTION_CREATEREQUESTL=0x13 +[TRACE]TRACE_ERROR[0x82]_DUP3_CDPSTRANSACTION_PARSESCRIPTL=0x17 +[TRACE]TRACE_ERROR[0x82]_DUP3_CDPSXMLPARSER_ONCONTENTL=0x2b +[TRACE]TRACE_ERROR[0x82]_DUP3_TDPSGETPRINTERSTATUS_FILLREPARGS=0xe +[TRACE]TRACE_ERROR[0x82]_DUP3_TDPSXMLSTRING_CONSTRUCTL=0x34 +[TRACE]TRACE_ERROR[0x82]_DUP4_CDPSTRANSACTION_CREATEEVENTREPLYL=0x1c +[TRACE]TRACE_ERROR[0x82]_DUP4_CDPSTRANSACTION_CREATEREQUESTL=0x14 +[TRACE]TRACE_ERROR[0x82]_DUP4_CDPSTRANSACTION_PARSESCRIPTL=0x18 +[TRACE]TRACE_ERROR[0x82]_DUP6_CDPSXMLPARSER_ONSTARTELEMENTL=0x25 +[TRACE]TRACE_ERROR[0x82]_DUP7_TDPSCONFIGPRINTSERVICE_FILLREPARGS=0xc +[TRACE]TRACE_ERROR[0x82]_TDPSCONFIGPRINTSERVICE_FILLREPARGS=0xa +[TRACE]TRACE_ERROR[0x82]_TDPSCONFIGPRINTSERVICE_FILLREQARGS=0x7 +[TRACE]TRACE_ERROR[0x82]_TDPSGETCAPABILITY_FILLREPARGS=0x8 +[TRACE]TRACE_ERROR[0x82]_TDPSGETJOBSTATUS_FILLREPARGS=0xd +[TRACE]TRACE_ERROR[0x82]_TDPSSTARTJOB_FILLREQARGS=0x6 +[TRACE]TRACE_ERROR[0x82]_TDPSXMLSTRING_CONSTRUCTL=0x31 +[TRACE]TRACE_FLOW[0x8A]_CDPSCONNECTNOTIFIER_CDPSCONNECTNOTIFIER_DES_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CDPSCONNECTNOTIFIER_CDPSCONNECTNOTIFIER_DES_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CDPSCONNECTNOTIFIER_CONNECTNOTIFY_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CDPSCONNECTNOTIFIER_CONNECTNOTIFY_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CDPSCONNECTNOTIFIER_DOCANCEL_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CDPSCONNECTNOTIFIER_DOCANCEL_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CDPSCONNECTNOTIFIER_RUNL_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CDPSCONNECTNOTIFIER_RUNL_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_CANCELDPSEVENTNOTIFY_ENTRY=0x101 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_CANCELDPSEVENTNOTIFY_EXIT=0x102 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_CANCELDPSREQUEST_ENTRY=0xfc +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_CANCELDPSREQUEST_EXIT=0xfd +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_CANCELPRINTMODE_ENTRY=0xf3 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_CANCELPRINTMODE_EXIT=0xf4 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_CDPSENGINE_DES_ENTRY=0xef +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_CDPSENGINE_DES_EXIT=0xf0 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_CONNECTSTATENOTIFY_ENTRY=0xf5 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_CONNECTSTATENOTIFY_EXIT=0xf6 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_CONSTRUCTL_ENTRY=0xed +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_CONSTRUCTL_EXIT=0xee +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_DELETE_ENTRY=0xeb +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_DELETE_EXIT=0xec +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_DODPSREQUESTL_ENTRY=0xf8 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_DODPSREQUESTL_EXIT=0xf9 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_DPSEVENTNOTIFY_ENTRY=0xfe +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_DPSEVENTNOTIFY_EXIT=0xff +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_GETDPSCONFIGL_ENTRY=0x103 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_GETDPSCONFIGL_EXIT=0x104 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_GETENGINEL_ENTRY=0xe8 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_GETENGINEL_EXIT=0xe9 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_SETPRINTMODE_ENTRY=0xf1 +[TRACE]TRACE_FLOW[0x8A]_CDPSENGINE_SETPRINTMODE_EXIT=0xf2 +[TRACE]TRACE_FLOW[0x8A]_CDPSFILE_CDPSFILE_DES_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]_CDPSFILE_CDPSFILE_DES_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_CDPSFILE_CONSTRUCTL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CDPSFILE_CONSTRUCTL_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CDPSFILE_CREATESCRIPTFILE_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CDPSFILE_CREATESCRIPTFILE_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CDPSFILE_DELETE_ENTRY=0x16 +[TRACE]TRACE_FLOW[0x8A]_CDPSFILE_DELETE_EXIT=0x17 +[TRACE]TRACE_FLOW[0x8A]_CDPSFILE_FILESIZEL_ENTRY=0x14 +[TRACE]TRACE_FLOW[0x8A]_CDPSFILE_FILESIZEL_EXIT=0x15 +[TRACE]TRACE_FLOW[0x8A]_CDPSFILE_GETCONTENTL_ENTRY=0x12 +[TRACE]TRACE_FLOW[0x8A]_CDPSFILE_GETCONTENTL_EXIT=0x13 +[TRACE]TRACE_FLOW[0x8A]_CDPSPTPNOTIFIER_CDPSPTPNOTIFIER_CONS_ENTRY=0x4a +[TRACE]TRACE_FLOW[0x8A]_CDPSPTPNOTIFIER_CDPSPTPNOTIFIER_CONS_EXIT=0x4b +[TRACE]TRACE_FLOW[0x8A]_CDPSPTPNOTIFIER_CDPSPTPNOTIFIER_DES_ENTRY=0x4c +[TRACE]TRACE_FLOW[0x8A]_CDPSPTPNOTIFIER_CHANGEPTPPERSONALITY_ENTRY=0x4e +[TRACE]TRACE_FLOW[0x8A]_CDPSPTPNOTIFIER_CHANGEPTPPERSONALITY_EXIT=0x4f +[TRACE]TRACE_FLOW[0x8A]_CDPSPTPNOTIFIER_DOCANCEL_ENTRY=0x52 +[TRACE]TRACE_FLOW[0x8A]_CDPSPTPNOTIFIER_DOCANCEL_EXIT=0x53 +[TRACE]TRACE_FLOW[0x8A]_CDPSPTPNOTIFIER_RUNL_ENTRY=0x50 +[TRACE]TRACE_FLOW[0x8A]_CDPSPTPNOTIFIER_RUNL_EXIT=0x51 +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTRECEIVER_CDPSSCRIPTRECEIVER_CONS_ENTRY=0x54 +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTRECEIVER_CDPSSCRIPTRECEIVER_CONS_EXIT=0x55 +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTRECEIVER_CDPSSCRIPTRECEIVER_DES_ENTRY=0x56 +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTRECEIVER_CDPSSCRIPTRECEIVER_DES_EXIT=0x57 +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTRECEIVER_DOCANCEL_ENTRY=0x5c +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTRECEIVER_DOCANCEL_EXIT=0x5d +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTRECEIVER_RUNERROR_ENTRY=0x5e +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTRECEIVER_RUNERROR_EXIT=0x5f +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTRECEIVER_RUNL_ENTRY=0x5a +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTRECEIVER_RUNL_EXIT=0x5b +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTRECEIVER_WAITFORRECEIVE_ENTRY=0x58 +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTRECEIVER_WAITFORRECEIVE_EXIT=0x59 +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTSENDER_CDPSSCRIPTSENDER_CONS_ENTRY=0x60 +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTSENDER_CDPSSCRIPTSENDER_CONS_EXIT=0x61 +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTSENDER_DOCANCEL_ENTRY=0x6a +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTSENDER_DOCANCEL_EXIT=0x6b +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTSENDER_RUNERROR_ENTRY=0x6c +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTSENDER_RUNERROR_EXIT=0x6d +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTSENDER_RUNL_ENTRY=0x68 +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTSENDER_RUNL_EXIT=0x69 +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTSENDER_SENDSCRIPT_ENTRY=0x64 +[TRACE]TRACE_FLOW[0x8A]_CDPSSCRIPTSENDER_SENDSCRIPT_EXIT=0x65 +[TRACE]TRACE_FLOW[0x8A]_CDPSSTATEMACHINE_CDPSSTATEMACHINE_DES_ENTRY=0x74 +[TRACE]TRACE_FLOW[0x8A]_CDPSSTATEMACHINE_CDPSSTATEMACHINE_DES_EXIT=0x75 +[TRACE]TRACE_FLOW[0x8A]_CDPSSTATEMACHINE_CONSTRUCTL_ENTRY=0x78 +[TRACE]TRACE_FLOW[0x8A]_CDPSSTATEMACHINE_CONSTRUCTL_EXIT=0x79 +[TRACE]TRACE_FLOW[0x8A]_CDPSSTATEMACHINE_INITIALIZE_ENTRY=0x7c +[TRACE]TRACE_FLOW[0x8A]_CDPSSTATEMACHINE_INITIALIZE_EXIT=0x7d +[TRACE]TRACE_FLOW[0x8A]_CDPSSTATEMACHINE_STARTTRANSACTIONL_ENTRY=0x7a +[TRACE]TRACE_FLOW[0x8A]_CDPSSTATEMACHINE_STARTTRANSACTIONL_EXIT=0x7b +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_CDPSTRANSACTION_CONS_ENTRY=0x7e +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_CDPSTRANSACTION_CONS_EXIT=0x7f +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_CONSTRUCTL_ENTRY=0x80 +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_CONSTRUCTL_EXIT=0x81 +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_CREATEEVENTREPLYL_ENTRY=0x8d +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_CREATEEVENTREPLYL_EXIT=0x8e +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_CREATEREQUESTL_ENTRY=0x84 +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_CREATEREQUESTL_EXIT=0x85 +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_CREATEREQUESTREPLYL_ENTRY=0x8f +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_CREATEREQUESTREPLYL_EXIT=0x90 +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_FILTER_ENTRY=0x86 +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_FILTER_EXIT=0x87 +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_HANDLEHOSTREQUESTERROR_ENTRY=0x8a +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_HANDLEHOSTREQUESTERROR_EXIT=0x8b +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_PARSESCRIPTL_ENTRY=0x88 +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_PARSESCRIPTL_EXIT=0x89 +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_SUBSTITUTEPATH_ENTRY=0x91 +[TRACE]TRACE_FLOW[0x8A]_CDPSTRANSACTION_SUBSTITUTEPATH_EXIT=0x92 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_CANCELPRINTERNOTIFY_ENTRY=0x9b +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_CANCELPRINTERNOTIFY_EXIT=0x9c +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_CDPSUSBNOTIFIER_CONS_ENTRY=0x93 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_CDPSUSBNOTIFIER_CONS_EXIT=0x94 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_CDPSUSBNOTIFIER_DES_ENTRY=0x95 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_CDPSUSBNOTIFIER_DES_EXIT=0x96 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_CONNECTNOTIFY_ENTRY=0x9d +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_CONNECTNOTIFY_EXIT=0x9e +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_CONNECTSTATE_ENTRY=0xab +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_CONNECTSTATE_EXIT=0xac +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_CONSTRUCTL_ENTRY=0x97 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_CONSTRUCTL_EXIT=0x98 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_DISCONNECTNOTIFY_ENTRY=0xa9 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_DISCONNECTNOTIFY_EXIT=0xaa +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_DOCANCEL_ENTRY=0xa7 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_DOCANCEL_EXIT=0xa8 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_PERSONALITYCHANGED_ENTRY=0xa3 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_PERSONALITYCHANGED_EXIT=0xa4 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_PTPNOTIFY_ENTRY=0xa1 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_PTPNOTIFY_EXIT=0xa2 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_ROLLBACK_ENTRY=0x9f +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_ROLLBACK_EXIT=0xa0 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_RUNL_ENTRY=0xa5 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_RUNL_EXIT=0xa6 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_WAITFORPRINTERNOTIFY_ENTRY=0x99 +[TRACE]TRACE_FLOW[0x8A]_CDPSUSBNOTIFIER_WAITFORPRINTERNOTIFY_EXIT=0x9a +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_CDPSXMLGENERATOR_DES_ENTRY=0xad +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_CDPSXMLGENERATOR_DES_EXIT=0xae +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_CREATEARGL_ENTRY=0xc5 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_CREATEARGL_EXIT=0xc6 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_CREATEEVENTL_ENTRY=0xc3 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_CREATEEVENTL_EXIT=0xc4 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_CREATERESULTSCRIPTL_ENTRY=0xb1 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_CREATERESULTSCRIPTL_EXIT=0xb2 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_ENDDOCUMENTL_ENTRY=0xb5 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_ENDDOCUMENTL_EXIT=0xb6 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_ENDELEMENTL_ENTRY=0xc9 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_ENDELEMENTL_EXIT=0xca +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_ENDINPUTL_ENTRY=0xb9 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_ENDINPUTL_EXIT=0xba +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_ENDOPERATIONL_ENTRY=0xc1 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_ENDOPERATIONL_EXIT=0xc2 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_ENDRESULTL_ENTRY=0xbd +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_ENDRESULTL_EXIT=0xbe +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_STARTDOCUMENTL_ENTRY=0xb3 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_STARTDOCUMENTL_EXIT=0xb4 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_STARTELEMENTL_ENTRY=0xc7 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_STARTELEMENTL_EXIT=0xc8 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_STARTINPUTL_ENTRY=0xb7 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_STARTINPUTL_EXIT=0xb8 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_STARTOPERATIONL_ENTRY=0xbf +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_STARTOPERATIONL_EXIT=0xc0 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_STARTRESULTL_ENTRY=0xbb +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLGENERATOR_STARTRESULTL_EXIT=0xbc +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_CDPSXMLPARSER_DES_ENTRY=0xcb +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_CDPSXMLPARSER_DES_EXIT=0xcc +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONCONTENTL_ENTRY=0xd9 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONCONTENTL_EXIT=0xda +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONENDDOCUMENTL_ENTRY=0xd1 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONENDDOCUMENTL_EXIT=0xd2 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONENDELEMENTL_ENTRY=0xd7 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONENDELEMENTL_EXIT=0xd8 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONENDPREFIXMAPPINGL_ENTRY=0xde +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONENDPREFIXMAPPINGL_EXIT=0xdf +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONERROR_ENTRY=0xe6 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONERROR_EXIT=0xe7 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONIGNORABLEWHITESPACEL_ENTRY=0xe0 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONIGNORABLEWHITESPACEL_EXIT=0xe1 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONPROCESSINGINSTRUCTIONL_ENTRY=0xe4 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONPROCESSINGINSTRUCTIONL_EXIT=0xe5 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONSKIPPEDENTITYL_ENTRY=0xe2 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONSKIPPEDENTITYL_EXIT=0xe3 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONSTARTDOCUMENTL_ENTRY=0xcf +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONSTARTDOCUMENTL_EXIT=0xd0 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONSTARTELEMENTL_ENTRY=0xd3 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONSTARTELEMENTL_EXIT=0xd4 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONSTARTPREFIXMAPPINGL_ENTRY=0xdc +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_ONSTARTPREFIXMAPPINGL_EXIT=0xdd +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_PARSEATTRIBUTESL_ENTRY=0xd5 +[TRACE]TRACE_FLOW[0x8A]_CDPSXMLPARSER_PARSEATTRIBUTESL_EXIT=0xd6 +[TRACE]TRACE_FLOW[0x8A]_DUP10_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT=0x49 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSCONNECTNOTIFIER_CDPSCONNECTNOTIFIER_CONS_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSCONNECTNOTIFIER_CDPSCONNECTNOTIFIER_CONS_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSENGINE_CONNECTSTATENOTIFY_EXIT=0xf7 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSENGINE_DODPSREQUESTL_EXIT=0xfa +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSENGINE_DPSEVENTNOTIFY_EXIT=0x100 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSENGINE_GETENGINEL_EXIT=0xea +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSFILE_CREATESCRIPTFILE_EXIT=0x11 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSPTPNOTIFIER_CDPSPTPNOTIFIER_DES_EXIT=0x4d +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSSCRIPTSENDER_CDPSSCRIPTSENDER_DES_ENTRY=0x62 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSSCRIPTSENDER_CDPSSCRIPTSENDER_DES_EXIT=0x63 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSSCRIPTSENDER_SENDSCRIPT_EXIT=0x66 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSSTATEMACHINE_CDPSSTATEMACHINE_CONS_ENTRY=0x76 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSSTATEMACHINE_CDPSSTATEMACHINE_CONS_EXIT=0x77 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSTRANSACTION_CDPSTRANSACTION_DES_ENTRY=0x82 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSTRANSACTION_CDPSTRANSACTION_DES_EXIT=0x83 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSTRANSACTION_HANDLEHOSTREQUESTERROR_EXIT=0x8c +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSXMLGENERATOR_CDPSXMLGENERATOR_CONS_ENTRY=0xaf +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSXMLGENERATOR_CDPSXMLGENERATOR_CONS_EXIT=0xb0 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSXMLPARSER_CDPSXMLPARSER_CONS_ENTRY=0xcd +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSXMLPARSER_CDPSXMLPARSER_CONS_EXIT=0xce +[TRACE]TRACE_FLOW[0x8A]_DUP1_CDPSXMLPARSER_ONCONTENTL_EXIT=0xdb +[TRACE]TRACE_FLOW[0x8A]_DUP1_TDPSCONFIGPRINTSERVICE_FILLREPARGS_EXIT=0x33 +[TRACE]TRACE_FLOW[0x8A]_DUP1_TDPSCONFIGPRINTSERVICE_FILLREQARGS_EXIT=0x2b +[TRACE]TRACE_FLOW[0x8A]_DUP1_TDPSGETCAPABILITY_FILLREPARGS_EXIT=0x2f +[TRACE]TRACE_FLOW[0x8A]_DUP1_TDPSGETJOBSTATUS_FILLREPARGS_EXIT=0x39 +[TRACE]TRACE_FLOW[0x8A]_DUP1_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT=0x40 +[TRACE]TRACE_FLOW[0x8A]_DUP1_TDPSSTARTJOB_FILLREQARGS_EXIT=0x1c +[TRACE]TRACE_FLOW[0x8A]_DUP2_CDPSENGINE_DODPSREQUESTL_EXIT=0xfb +[TRACE]TRACE_FLOW[0x8A]_DUP2_CDPSSCRIPTSENDER_SENDSCRIPT_EXIT=0x67 +[TRACE]TRACE_FLOW[0x8A]_DUP2_TDPSCONFIGPRINTSERVICE_FILLREPARGS_EXIT=0x34 +[TRACE]TRACE_FLOW[0x8A]_DUP2_TDPSCONFIGPRINTSERVICE_FILLREQARGS_EXIT=0x2c +[TRACE]TRACE_FLOW[0x8A]_DUP2_TDPSGETCAPABILITY_FILLREPARGS_EXIT=0x30 +[TRACE]TRACE_FLOW[0x8A]_DUP2_TDPSGETJOBSTATUS_FILLREPARGS_EXIT=0x3a +[TRACE]TRACE_FLOW[0x8A]_DUP2_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT=0x41 +[TRACE]TRACE_FLOW[0x8A]_DUP2_TDPSSTARTJOB_FILLREQARGS_EXIT=0x1d +[TRACE]TRACE_FLOW[0x8A]_DUP3_TDPSCONFIGPRINTSERVICE_FILLREPARGS_EXIT=0x35 +[TRACE]TRACE_FLOW[0x8A]_DUP3_TDPSGETJOBSTATUS_FILLREPARGS_EXIT=0x3b +[TRACE]TRACE_FLOW[0x8A]_DUP3_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT=0x42 +[TRACE]TRACE_FLOW[0x8A]_DUP3_TDPSSTARTJOB_FILLREQARGS_EXIT=0x1e +[TRACE]TRACE_FLOW[0x8A]_DUP4_TDPSCONFIGPRINTSERVICE_FILLREPARGS_EXIT=0x36 +[TRACE]TRACE_FLOW[0x8A]_DUP4_TDPSGETJOBSTATUS_FILLREPARGS_EXIT=0x3c +[TRACE]TRACE_FLOW[0x8A]_DUP4_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT=0x43 +[TRACE]TRACE_FLOW[0x8A]_DUP4_TDPSSTARTJOB_FILLREQARGS_EXIT=0x1f +[TRACE]TRACE_FLOW[0x8A]_DUP5_TDPSGETJOBSTATUS_FILLREPARGS_EXIT=0x3d +[TRACE]TRACE_FLOW[0x8A]_DUP5_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT=0x44 +[TRACE]TRACE_FLOW[0x8A]_DUP5_TDPSSTARTJOB_FILLREQARGS_EXIT=0x20 +[TRACE]TRACE_FLOW[0x8A]_DUP6_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT=0x45 +[TRACE]TRACE_FLOW[0x8A]_DUP7_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT=0x46 +[TRACE]TRACE_FLOW[0x8A]_DUP8_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT=0x47 +[TRACE]TRACE_FLOW[0x8A]_DUP9_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT=0x48 +[TRACE]TRACE_FLOW[0x8A]_TDPSABORTJOB_FILLREQARGS_ENTRY=0x23 +[TRACE]TRACE_FLOW[0x8A]_TDPSABORTJOB_FILLREQARGS_EXIT=0x24 +[TRACE]TRACE_FLOW[0x8A]_TDPSCONFIGPRINTSERVICE_FILLREPARGS_ENTRY=0x31 +[TRACE]TRACE_FLOW[0x8A]_TDPSCONFIGPRINTSERVICE_FILLREPARGS_EXIT=0x32 +[TRACE]TRACE_FLOW[0x8A]_TDPSCONFIGPRINTSERVICE_FILLREQARGS_ENTRY=0x29 +[TRACE]TRACE_FLOW[0x8A]_TDPSCONFIGPRINTSERVICE_FILLREQARGS_EXIT=0x2a +[TRACE]TRACE_FLOW[0x8A]_TDPSGETCAPABILITY_CREATEREQSCRIPTL_ENTRY=0x27 +[TRACE]TRACE_FLOW[0x8A]_TDPSGETCAPABILITY_CREATEREQSCRIPTL_EXIT=0x28 +[TRACE]TRACE_FLOW[0x8A]_TDPSGETCAPABILITY_FILLREPARGS_ENTRY=0x2d +[TRACE]TRACE_FLOW[0x8A]_TDPSGETCAPABILITY_FILLREPARGS_EXIT=0x2e +[TRACE]TRACE_FLOW[0x8A]_TDPSGETCAPABILITY_FILLREQARGS_ENTRY=0x25 +[TRACE]TRACE_FLOW[0x8A]_TDPSGETCAPABILITY_FILLREQARGS_EXIT=0x26 +[TRACE]TRACE_FLOW[0x8A]_TDPSGETJOBSTATUS_FILLREPARGS_ENTRY=0x37 +[TRACE]TRACE_FLOW[0x8A]_TDPSGETJOBSTATUS_FILLREPARGS_EXIT=0x38 +[TRACE]TRACE_FLOW[0x8A]_TDPSGETPRINTERSTATUS_FILLREPARGS_ENTRY=0x3e +[TRACE]TRACE_FLOW[0x8A]_TDPSGETPRINTERSTATUS_FILLREPARGS_EXIT=0x3f +[TRACE]TRACE_FLOW[0x8A]_TDPSIDLESTATE_SCRIPTSENTNOTIFYL_ENTRY=0x6e +[TRACE]TRACE_FLOW[0x8A]_TDPSIDLESTATE_SCRIPTSENTNOTIFYL_EXIT=0x6f +[TRACE]TRACE_FLOW[0x8A]_TDPSSENDINGREPSTATE_SCRIPTRECEIVEDNOTIFYL_ENTRY=0x72 +[TRACE]TRACE_FLOW[0x8A]_TDPSSENDINGREPSTATE_SCRIPTRECEIVEDNOTIFYL_EXIT=0x73 +[TRACE]TRACE_FLOW[0x8A]_TDPSSTARTJOB_CREATEREQSCRIPTL_ENTRY=0x21 +[TRACE]TRACE_FLOW[0x8A]_TDPSSTARTJOB_CREATEREQSCRIPTL_EXIT=0x22 +[TRACE]TRACE_FLOW[0x8A]_TDPSSTARTJOB_FILLREQARGS_ENTRY=0x1a +[TRACE]TRACE_FLOW[0x8A]_TDPSSTARTJOB_FILLREQARGS_EXIT=0x1b +[TRACE]TRACE_FLOW[0x8A]_TDPSWAITINGREPSTATE_SCRIPTSENTNOTIFYL_ENTRY=0x70 +[TRACE]TRACE_FLOW[0x8A]_TDPSWAITINGREPSTATE_SCRIPTSENTNOTIFYL_EXIT=0x71 +[TRACE]TRACE_FLOW[0x8A]_TMDPSOPERATION_CREATEREQSCRIPTL_ENTRY=0x18 +[TRACE]TRACE_FLOW[0x8A]_TMDPSOPERATION_CREATEREQSCRIPTL_EXIT=0x19 +[TRACE]TRACE_IMPORTANT[0x85]_CDPSCONNECTNOTIFIER_RUNERROR=0x1 +[TRACE]TRACE_IMPORTANT[0x85]_CDPSPTPNOTIFIER_RUNERROR=0x2 +[TRACE]TRACE_IMPORTANT[0x85]_CDPSSCRIPTRECEIVER_RUNERROR=0x3 +[TRACE]TRACE_IMPORTANT[0x85]_CDPSSCRIPTSENDER_RUNERROR=0x4 +[TRACE]TRACE_IMPORTANT[0x85]_CDPSUSBNOTIFIER_RUNERROR=0x5 +[TRACE]TRACE_NORMAL[0x86]_CDPSCONNECTNOTIFIER_RUNL=0x1 +[TRACE]TRACE_NORMAL[0x86]_CDPSENGINE_DODPSREQUESTL=0x4c +[TRACE]TRACE_NORMAL[0x86]_CDPSENGINE_GETDPSCONFIGL=0x4d +[TRACE]TRACE_NORMAL[0x86]_CDPSFILE_CREATESCRIPTFILE=0x3 +[TRACE]TRACE_NORMAL[0x86]_CDPSFILE_FILESIZEL=0x7 +[TRACE]TRACE_NORMAL[0x86]_CDPSFILE_GETCONTENTL=0x6 +[TRACE]TRACE_NORMAL[0x86]_CDPSPTPNOTIFIER_CHANGEPTPPERSONALITY=0x20 +[TRACE]TRACE_NORMAL[0x86]_CDPSPTPNOTIFIER_RUNL=0x21 +[TRACE]TRACE_NORMAL[0x86]_CDPSSCRIPTRECEIVER_RUNL=0x22 +[TRACE]TRACE_NORMAL[0x86]_CDPSTRANSACTION_CREATEEVENTREPLYL=0x37 +[TRACE]TRACE_NORMAL[0x86]_CDPSTRANSACTION_CREATEREQUESTL=0x2e +[TRACE]TRACE_NORMAL[0x86]_CDPSTRANSACTION_FILTER=0x30 +[TRACE]TRACE_NORMAL[0x86]_CDPSTRANSACTION_HANDLEHOSTREQUESTERROR=0x33 +[TRACE]TRACE_NORMAL[0x86]_CDPSTRANSACTION_PARSESCRIPTL=0x32 +[TRACE]TRACE_NORMAL[0x86]_CDPSTRANSACTION_SUBSTITUTEPATH=0x3b +[TRACE]TRACE_NORMAL[0x86]_CDPSUSBNOTIFIER_CONNECTSTATE=0x41 +[TRACE]TRACE_NORMAL[0x86]_CDPSUSBNOTIFIER_DISCONNECTNOTIFY=0x40 +[TRACE]TRACE_NORMAL[0x86]_CDPSUSBNOTIFIER_PERSONALITYCHANGED=0x3f +[TRACE]TRACE_NORMAL[0x86]_CDPSUSBNOTIFIER_PTPNOTIFY=0x3e +[TRACE]TRACE_NORMAL[0x86]_CDPSUSBNOTIFIER_ROLLBACK=0x3d +[TRACE]TRACE_NORMAL[0x86]_CDPSXMLGENERATOR_STARTOPERATIONL=0x42 +[TRACE]TRACE_NORMAL[0x86]_CDPSXMLPARSER_ONCONTENTL=0x49 +[TRACE]TRACE_NORMAL[0x86]_CDPSXMLPARSER_ONERROR=0x4b +[TRACE]TRACE_NORMAL[0x86]_DUP10_TDPSSTARTJOB_FILLREQARGS=0x12 +[TRACE]TRACE_NORMAL[0x86]_DUP11_TDPSSTARTJOB_FILLREQARGS=0x13 +[TRACE]TRACE_NORMAL[0x86]_DUP12_TDPSSTARTJOB_FILLREQARGS=0x14 +[TRACE]TRACE_NORMAL[0x86]_DUP13_TDPSSTARTJOB_FILLREQARGS=0x15 +[TRACE]TRACE_NORMAL[0x86]_DUP14_TDPSSTARTJOB_FILLREQARGS=0x16 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CDPSFILE_CREATESCRIPTFILE=0x4 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CDPSSCRIPTRECEIVER_RUNL=0x23 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CDPSTRANSACTION_CONVERTVERSION=0x35 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CDPSTRANSACTION_CREATEEVENTREPLYL=0x38 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CDPSTRANSACTION_CREATEREQUESTL=0x2f +[TRACE]TRACE_NORMAL[0x86]_DUP1_CDPSTRANSACTION_CREATEREQUESTREPLYL=0x3a +[TRACE]TRACE_NORMAL[0x86]_DUP1_CDPSTRANSACTION_FILTER=0x31 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CDPSTRANSACTION_HANDLEHOSTREQUESTERROR=0x34 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CDPSTRANSACTION_SUBSTITUTEPATH=0x3c +[TRACE]TRACE_NORMAL[0x86]_DUP1_CDPSXMLPARSER_ONENDELEMENTL=0x48 +[TRACE]TRACE_NORMAL[0x86]_DUP1_TDPSCONFIGPRINTSERVICE_FILLREPARGS=0x18 +[TRACE]TRACE_NORMAL[0x86]_DUP1_TDPSGETPRINTERSTATUS_FILLREPARGS=0x1e +[TRACE]TRACE_NORMAL[0x86]_DUP1_TDPSIDLESTATE_SCRIPTRECEIVEDNOTIFYL=0x25 +[TRACE]TRACE_NORMAL[0x86]_DUP1_TDPSSENDINGREPSTATE_SCRIPTSENTNOTIFYL=0x2d +[TRACE]TRACE_NORMAL[0x86]_DUP1_TDPSSENDINGREQSTATE_SCRIPTSENTNOTIFYL=0x28 +[TRACE]TRACE_NORMAL[0x86]_DUP1_TDPSSTARTJOB_FILLREQARGS=0x9 +[TRACE]TRACE_NORMAL[0x86]_DUP1_TDPSWAITINGREPSTATE_SCRIPTRECEIVEDNOTIFYL=0x2b +[TRACE]TRACE_NORMAL[0x86]_DUP2_CDPSFILE_CREATESCRIPTFILE=0x5 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CDPSTRANSACTION_CREATEEVENTREPLYL=0x39 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CDPSXMLPARSER_ONSTARTELEMENTL=0x43 +[TRACE]TRACE_NORMAL[0x86]_DUP2_TDPSGETCAPABILITY_FILLREPARGS=0x17 +[TRACE]TRACE_NORMAL[0x86]_DUP2_TDPSGETPRINTERSTATUS_FILLREPARGS=0x1f +[TRACE]TRACE_NORMAL[0x86]_DUP2_TDPSSTARTJOB_FILLREQARGS=0xa +[TRACE]TRACE_NORMAL[0x86]_DUP3_CDPSFILE_FILESIZEL=0x8 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CDPSTRANSACTION_CONVERTVERSION=0x36 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CDPSXMLPARSER_ONSTARTELEMENTL=0x44 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CDPSXMLPARSER_PARSEATTRIBUTESL=0x47 +[TRACE]TRACE_NORMAL[0x86]_DUP3_TDPSCONFIGPRINTSERVICE_FILLREPARGS=0x19 +[TRACE]TRACE_NORMAL[0x86]_DUP3_TDPSSTARTJOB_FILLREQARGS=0xb +[TRACE]TRACE_NORMAL[0x86]_DUP4_CDPSXMLPARSER_ONCONTENTL=0x4a +[TRACE]TRACE_NORMAL[0x86]_DUP4_CDPSXMLPARSER_ONSTARTELEMENTL=0x45 +[TRACE]TRACE_NORMAL[0x86]_DUP4_TDPSCONFIGPRINTSERVICE_FILLREPARGS=0x1a +[TRACE]TRACE_NORMAL[0x86]_DUP4_TDPSSTARTJOB_FILLREQARGS=0xc +[TRACE]TRACE_NORMAL[0x86]_DUP5_CDPSXMLPARSER_ONSTARTELEMENTL=0x46 +[TRACE]TRACE_NORMAL[0x86]_DUP5_TDPSCONFIGPRINTSERVICE_FILLREPARGS=0x1b +[TRACE]TRACE_NORMAL[0x86]_DUP5_TDPSSTARTJOB_FILLREQARGS=0xd +[TRACE]TRACE_NORMAL[0x86]_DUP6_TDPSCONFIGPRINTSERVICE_FILLREPARGS=0x1c +[TRACE]TRACE_NORMAL[0x86]_DUP6_TDPSSTARTJOB_FILLREQARGS=0xe +[TRACE]TRACE_NORMAL[0x86]_DUP7_TDPSSTARTJOB_FILLREQARGS=0xf +[TRACE]TRACE_NORMAL[0x86]_DUP8_TDPSSTARTJOB_FILLREQARGS=0x10 +[TRACE]TRACE_NORMAL[0x86]_DUP9_TDPSSTARTJOB_FILLREQARGS=0x11 +[TRACE]TRACE_NORMAL[0x86]_TDPSGETPRINTERSTATUS_FILLREPARGS=0x1d +[TRACE]TRACE_NORMAL[0x86]_TDPSIDLESTATE_ERROR=0x26 +[TRACE]TRACE_NORMAL[0x86]_TDPSIDLESTATE_SCRIPTRECEIVEDNOTIFYL=0x24 +[TRACE]TRACE_NORMAL[0x86]_TDPSSENDINGREPSTATE_SCRIPTSENTNOTIFYL=0x2c +[TRACE]TRACE_NORMAL[0x86]_TDPSSENDINGREQSTATE_SCRIPTRECEIVEDNOTIFYL=0x29 +[TRACE]TRACE_NORMAL[0x86]_TDPSSENDINGREQSTATE_SCRIPTSENTNOTIFYL=0x27 +[TRACE]TRACE_NORMAL[0x86]_TDPSWAITINGREPSTATE_SCRIPTRECEIVEDNOTIFYL=0x2a +[TRACE]TRACE_NORMAl[0xDE]_DUP2_CDPSXMLPARSER_ONCONTENTL=0x1 +[TRACE]TRACE_WARNING[0x83]_DUP1_CDPSCONNECTNOTIFIER_RUNL=0x2 +[TRACE]TRACE_WARNING[0x83]_DUP1_CDPSPTPNOTIFIER_RUNL=0x1 +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CDPSCONNECTNOTIFIER_RUNL=0x2 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedp.cpp --- a/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedp.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedp.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -26,6 +26,11 @@ #include "mtppictbridgedpprocessor.h" #include "cmtppictbridgeenumerator.h" #include "ptpdef.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppictbridgedpTraces.h" +#endif + LOCAL_D const TInt KArrayGranularity = 3; @@ -59,11 +64,10 @@ // void CMTPPictBridgeDataProvider::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8(">> CMTPPictBridgeDataProvider::ConstructL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_CONSTRUCTL_ENTRY ); iPictBridgeEnumeratorP = CMTPPictBridgeEnumerator::NewL(Framework(), *this); iServerP = CPtpServer::NewL(Framework(), *this); - __FLOG(_L8("<< CMTPPictBridgeDataProvider::ConstructL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_CONSTRUCTL_EXIT ); } // -------------------------------------------------------------------------- // Destructor @@ -71,7 +75,7 @@ // CMTPPictBridgeDataProvider::~CMTPPictBridgeDataProvider() { - __FLOG(_L8(">> ~CMTPPictBridgeDataProvider")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_CMTPPICTBRIDGEDATAPROVIDER_DES_ENTRY ); TUint count(iActiveProcessors.Count()); while (count--) @@ -83,8 +87,7 @@ delete iPictBridgeEnumeratorP; delete iServerP; - __FLOG(_L8("<< ~CMTPPictBridgeDataProvider")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_CMTPPICTBRIDGEDATAPROVIDER_DES_EXIT ); } // -------------------------------------------------------------------------- @@ -93,9 +96,9 @@ // void CMTPPictBridgeDataProvider::Cancel() { - __FLOG(_L8(">> CMTPPictBridgeDataProvider::Cancel")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_CANCEL_ENTRY ); // nothing to cancel - __FLOG(_L8("<< CMTPPictBridgeDataProvider::Cancel")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_CANCEL_EXIT ); } // -------------------------------------------------------------------------- // @@ -103,7 +106,7 @@ // void CMTPPictBridgeDataProvider::ProcessEventL(const TMTPTypeEvent& aEvent, MMTPConnection& aConnection) { - __FLOG(_L8(">> CMTPPictBridgeDataProvider::ProcessEventL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_PROCESSEVENTL_ENTRY ); TInt idx = LocateRequestProcessorL(aEvent, aConnection); @@ -112,7 +115,7 @@ iActiveProcessors[idx]->HandleEventL(aEvent); } - __FLOG(_L8("<< CMTPPictBridgeDataProvider::ProcessEventL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_PROCESSEVENTL_EXIT ); } // -------------------------------------------------------------------------- // Process notifications from the initiator @@ -120,7 +123,7 @@ // void CMTPPictBridgeDataProvider::ProcessNotificationL(TMTPNotification aNotification, const TAny* aParams) { - __FLOG(_L8(">> CMTPPictBridgeDataProvider::ProcessNotificationL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_PROCESSNOTIFICATIONL_ENTRY ); switch (aNotification) { @@ -136,8 +139,8 @@ // Ignore all other notifications. break; } - - __FLOG(_L8("<< CMTPPictBridgeDataProvider::ProcessNotificationL")); + + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_PROCESSNOTIFICATIONL_EXIT ); } // -------------------------------------------------------------------------- // Process requests from the initiator @@ -145,7 +148,7 @@ // void CMTPPictBridgeDataProvider::ProcessRequestPhaseL(TMTPTransactionPhase aPhase, const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG(_L8(">> CMTPPictBridgeDataProvider::ProcessRequestPhaseL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_PROCESSREQUESTPHASEL_ENTRY ); TInt idx = LocateRequestProcessorL(aRequest, aConnection); __ASSERT_DEBUG((idx != KErrNotFound), Panic(EMTPPictBridgeDpNoMatchingProcessor)); @@ -157,7 +160,8 @@ iActiveProcessors.Remove(idx); } - __FLOG_VA((_L8("<< CMTPPictBridgeDataProvider::ProcessRequestPhaseL result=%d"), result)); + OstTrace1( TRACE_NORMAL, CMTPPICTBRIDGEDATAPROVIDER_PROCESSREQUESTPHASEL, "result=%d", result ); + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_PROCESSREQUESTPHASEL_EXIT ); } // -------------------------------------------------------------------------- @@ -166,11 +170,11 @@ // void CMTPPictBridgeDataProvider::StartObjectEnumerationL(TUint32 aStorageId, TBool /*aPersistentFullEnumeration*/) { - __FLOG(_L8(">> CMTPPictBridgeDataProvider::StartObjectEnumerationL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_STARTOBJECTENUMERATIONL_ENTRY ); iPictBridgeEnumeratorP->EnumerateObjectsL(aStorageId); - __FLOG(_L8("<< CMTPPictBridgeDataProvider::StartObjectEnumerationL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_STARTOBJECTENUMERATIONL_EXIT ); } // -------------------------------------------------------------------------- @@ -179,9 +183,9 @@ // void CMTPPictBridgeDataProvider::StartStorageEnumerationL() { - __FLOG(_L8(">> CMTPPictBridgeDataProvider::StartStorageEnumerationL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_STARTSTORAGEENUMERATIONL_ENTRY ); iPictBridgeEnumeratorP->EnumerateStoragesL(); - __FLOG(_L8("<< CMTPPictBridgeDataProvider::StartStorageEnumerationL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_STARTSTORAGEENUMERATIONL_EXIT ); } // -------------------------------------------------------------------------- // @@ -189,7 +193,8 @@ // void CMTPPictBridgeDataProvider::Supported(TMTPSupportCategory aCategory, RArray& aArray) const { - __FLOG_VA((_L8(">> CMTPPictBridgeDataProvider::Supported %d"), aCategory)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_SUPPORTED_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPPICTBRIDGEDATAPROVIDER_SUPPORTED, "aCategory: %d", aCategory); switch (aCategory) { case EEvents: @@ -226,7 +231,7 @@ // Unrecognised category, leave aArray unmodified. break; } - __FLOG(_L8("<< CMTPPictBridgeDataProvider::Supported")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_SUPPORTED_EXIT ); } void CMTPPictBridgeDataProvider::SupportedL(TMTPSupportCategory aCategory, CDesCArray& /*aStrings*/) const @@ -249,24 +254,26 @@ // void CMTPPictBridgeDataProvider::NotifyStorageEnumerationCompleteL() { - __FLOG(_L8(">> CMTPPictBridgeDataProvider::NotifyStorageEnumerationCompleteL")); - Framework().StorageEnumerationCompleteL(); - __FLOG(_L8("<< CMTPPictBridgeDataProvider::NotifyStorageEnumerationCompleteL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_NOTIFYSTORAGEENUMERATIONCOMPLETEL_ENTRY ); + Framework().StorageEnumerationCompleteL(); + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_NOTIFYSTORAGEENUMERATIONCOMPLETEL_EXIT ); } // -------------------------------------------------------------------------- // // -------------------------------------------------------------------------- // -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE void CMTPPictBridgeDataProvider::NotifyEnumerationCompleteL(TUint32 aStorageId, TInt aErr ) #else void CMTPPictBridgeDataProvider::NotifyEnumerationCompleteL(TUint32 aStorageId, TInt /* aErr*/ ) #endif { - __FLOG_VA((_L8(">> CMTPPictBridgeDataProvider::NotifyEnumerationCompletedL storage 0x%08X status %d"), aStorageId, aErr )); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL, + " storage 0x%08X status %d", aStorageId, (TInt32)aErr); Framework().ObjectEnumerationCompleteL(aStorageId); - __FLOG(_L8("<< CMTPPictBridgeDataProvider::NotifyEnumerationCompletedL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_EXIT ); } @@ -279,7 +286,7 @@ // TInt CMTPPictBridgeDataProvider::LocateRequestProcessorL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG(_L8(">> CMTPPictBridgeDataProvider::LocateRequestProcessorL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY ); TInt idx(KErrNotFound); TInt count(iActiveProcessors.Count()); @@ -300,8 +307,8 @@ CleanupStack::Pop(); idx = count; } - - __FLOG(_L8("<< CMTPPictBridgeDataProvider::LocateRequestProcessorL")); + + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT ); return idx; } @@ -314,7 +321,7 @@ // TInt CMTPPictBridgeDataProvider::LocateRequestProcessorL(const TMTPTypeEvent& aEvent, MMTPConnection& aConnection) { - __FLOG(_L8(">> CMTPPictBridgeDataProvider::LocateRequestProcessorL (event)")); + OstTraceFunctionEntry0( DUP1_CMTPPICTBRIDGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY ); TInt idx(KErrNotFound); TInt count(iActiveProcessors.Count()); @@ -326,7 +333,7 @@ break; } } - __FLOG(_L8("<< CMTPPictBridgeDataProvider::LocateRequestProcessorL (event)")); + OstTraceFunctionExit0( DUP1_CMTPPICTBRIDGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT ); return idx; } @@ -337,7 +344,8 @@ // void CMTPPictBridgeDataProvider::SessionClosedL(const TMTPNotificationParamsSessionChange& aSession) { - __FLOG_VA((_L8(">> CMTPPictBridgeDataProvider::SessionClosedL SessionID = %d"), aSession.iMTPId)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDATAPROVIDER_SESSIONCLOSEDL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPICTBRIDGEDATAPROVIDER_SESSIONCLOSEDL, "SessionID = %d", aSession.iMTPId ); TInt count = iActiveProcessors.Count(); while(count--) @@ -352,7 +360,7 @@ } iServerP->MtpSessionClosed(); - __FLOG(_L8("<< CMTPPictBridgeDataProvider::SessionClosedL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDATAPROVIDER_SESSIONCLOSEDL_EXIT ); } // -------------------------------------------------------------------------- @@ -360,13 +368,13 @@ // @param aSession notification parameter block // -------------------------------------------------------------------------- // -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE void CMTPPictBridgeDataProvider::SessionOpenedL(const TMTPNotificationParamsSessionChange& aSession ) #else void CMTPPictBridgeDataProvider::SessionOpenedL(const TMTPNotificationParamsSessionChange& /*aSession*/ ) #endif { - __FLOG_VA((_L8(" CMTPPictBridgeDataProvider::SessionOpenedL SessionID = %d"), aSession.iMTPId)); + OstTrace1( TRACE_NORMAL, CMTPPICTBRIDGEDATAPROVIDER_SESSIONOPENEDL, "SessionID = %d", aSession.iMTPId ); iServerP->MtpSessionOpened(); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedpgetobject.cpp --- a/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedpgetobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedpgetobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -28,6 +28,11 @@ #include "mtppictbridgedppanic.h" #include "cmtprequestchecker.h" #include "cptpserver.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppictbridgedpgetobjectTraces.h" +#endif + /** Verification data for the GetNumObjects request @@ -57,9 +62,9 @@ */ CMTPPictBridgeDpGetObject::~CMTPPictBridgeDpGetObject() { - __FLOG(_L8("~CMTPPictBridgeDpGetObject")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPGETOBJECT_CMTPPICTBRIDGEDPGETOBJECT_DES_ENTRY ); delete iFileObject; - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPICTBRIDGEDPGETOBJECT_CMTPPICTBRIDGEDPGETOBJECT_DES_EXIT ); } /** @@ -80,7 +85,8 @@ */ void CMTPPictBridgeDpGetObject::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPGETOBJECT_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPGETOBJECT_CONSTRUCTL_EXIT ); } /** @@ -88,14 +94,14 @@ */ void CMTPPictBridgeDpGetObject::ServiceL() { - __FLOG(_L8(">> CMTPPictBridgeDpGetObject::ServiceL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPGETOBJECT_SERVICEL_ENTRY ); __ASSERT_DEBUG(iRequestChecker, Panic(EMTPPictBridgeDpRequestCheckNull)); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); //does not take ownership CMTPObjectMetaData* objectInfo = iRequestChecker->GetObjectInfo(objectHandle); if (!objectInfo) { - __FLOG_VA((_L8(">> CMTPPictBridgeDpGetObject::ServiceL no object info for objectHandle %d"), objectHandle)); + OstTrace1( TRACE_WARNING, CMTPPICTBRIDGEDPGETOBJECT_SERVICEL, "no object info for objectHandle %d", objectHandle ); // The object handle has already been checked, so an invalid handle can // only occur if it was invalidated during a context switch between // the validation time and now. @@ -108,7 +114,7 @@ SendDataL(*iFileObject); iPictBridgeDP.PtpServer()->Printer()->DpsFileSent(KErrNone); } - __FLOG(_L8("<< CMTPPictBridgeDpGetObject::ServiceL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPGETOBJECT_SERVICEL_EXIT ); } //============================================================================= @@ -116,11 +122,11 @@ //============================================================================= void CMTPPictBridgeDpGetObject::BuildFileObjectL(const TDesC& aFileName) { - __FLOG(_L8(">> CMTPPictBridgeDpGetObject::BuildFileObjectL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPGETOBJECT_BUILDFILEOBJECTL_ENTRY ); delete iFileObject; iFileObject = NULL; - iFileObject = CMTPTypeFile::NewL(iFramework.Fs(), aFileName, EFileRead); - __FLOG(_L8("<< CMTPPictBridgeDpGetObject::BuildFileObjectL")); + iFileObject = CMTPTypeFile::NewL(iFramework.Fs(), aFileName, EFileRead); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPGETOBJECT_BUILDFILEOBJECTL_EXIT ); } @@ -129,10 +135,10 @@ //============================================================================= TBool CMTPPictBridgeDpGetObject::DoHandleResponsePhaseL() { - __FLOG(_L8(">> CMTPPictBridgeDpGetObject::DoHandleResponsePhaseL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPGETOBJECT_DOHANDLERESPONSEPHASEL_ENTRY ); TMTPResponseCode responseCode = (iCancelled ? EMTPRespCodeIncompleteTransfer : iError); SendResponseL(responseCode); - __FLOG(_L8("<< CMTPPictBridgeDpGetObject::DoHandleResponsePhaseL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPGETOBJECT_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedpgetobjectinfo.cpp --- a/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedpgetobjectinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedpgetobjectinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -29,6 +29,12 @@ #include "mtppictbridgedppanic.h" #include "cmtprequestchecker.h" #include "cptpserver.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppictbridgedpgetobjectinfoTraces.h" +#endif + /** Two-phase construction method @@ -50,9 +56,9 @@ */ CMTPPictBridgeDpGetObjectInfo::~CMTPPictBridgeDpGetObjectInfo() { - __FLOG(_L8("CMTPPictBridgeDpGetObjectInfo::~CMTPPictBridgeDpGetObjectInfo")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPGETOBJECTINFO_CMTPPICTBRIDGEDPGETOBJECTINFO_DES_ENTRY ); delete iObjectInfoToBuildP; - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPICTBRIDGEDPGETOBJECTINFO_CMTPPICTBRIDGEDPGETOBJECTINFO_DES_EXIT ); } /** @@ -72,10 +78,10 @@ */ void CMTPPictBridgeDpGetObjectInfo::ServiceL() { - __FLOG(_L8(">> CMTPPictBridgeDpGetObjectInfo::ServiceL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPGETOBJECTINFO_SERVICEL_ENTRY ); BuildObjectInfoL(); SendDataL(*iObjectInfoToBuildP); - __FLOG(_L8("<< CMTPPictBridgeDpGetObjectInfo::ServiceL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPGETOBJECTINFO_SERVICEL_EXIT ); } /** @@ -83,8 +89,9 @@ */ void CMTPPictBridgeDpGetObjectInfo::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPGETOBJECTINFO_CONSTRUCTL_ENTRY ); iObjectInfoToBuildP = CMTPTypeObjectInfo::NewL(); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPGETOBJECTINFO_CONSTRUCTL_EXIT ); } /** @@ -92,13 +99,13 @@ */ void CMTPPictBridgeDpGetObjectInfo::BuildObjectInfoL() { - __FLOG(_L8(">> CMTPPictBridgeDpGetObjectInfo::BuildObjectInfoL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPGETOBJECTINFO_BUILDOBJECTINFOL_ENTRY ); __ASSERT_DEBUG(iRequestChecker, Panic(EMTPPictBridgeDpRequestCheckNull)); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); - __FLOG_VA((_L8(" object handle 0x%x"), objectHandle)); - + OstTrace1( TRACE_NORMAL, CMTPPICTBRIDGEDPGETOBJECTINFO_BUILDOBJECTINFOL, "object handle 0x%x", objectHandle ); + //1. storage id TUint32 storageId(iFramework.StorageMgr().DefaultStorageId()); // we always use default storage for DPS @@ -106,14 +113,14 @@ //2. object format TUint16 format(EMTPFormatCodeScript); // we only handle DPS script - iObjectInfoToBuildP->SetUint16L(CMTPTypeObjectInfo::EObjectFormat, format); - __FLOG_VA((_L8(" format ok 0x%x"), format)); + iObjectInfoToBuildP->SetUint16L(CMTPTypeObjectInfo::EObjectFormat, format); + OstTrace1( TRACE_NORMAL, DUP1_CMTPPICTBRIDGEDPGETOBJECTINFO_BUILDOBJECTINFOL, "format ok 0x%x", format ); //3. protection status, TUint16 protection(EMTPProtectionNoProtection); // we do not care about protection iObjectInfoToBuildP->SetUint16L(CMTPTypeObjectInfo::EProtectionStatus, protection); - __FLOG_VA((_L8(" protection(%d) ok"), protection)); + OstTrace1( TRACE_NORMAL, DUP2_CMTPPICTBRIDGEDPGETOBJECTINFO_BUILDOBJECTINFOL, " protection(%d) ok", protection ); //4. object compressed size // see SetFileSizeDateL @@ -139,7 +146,12 @@ iFramework.ObjectMgr().ObjectL(objectHandle, *objectP); //12. Parent object - TUint32 parent(objectP->Uint(CMTPObjectMetaData::EParentHandle)); + TUint32 parent(objectP->Uint(CMTPObjectMetaData::EParentHandle)); + // refer to 5.3.1.9 of MTP Spec 1.0 + if (parent == KMTPHandleNoParent) + { + parent = 0; + } iObjectInfoToBuildP->SetUint32L(CMTPTypeObjectInfo::EParentObject, parent); //13 and 14. Association type and description @@ -153,7 +165,9 @@ //16. file name //use the name without full path specification TParse parse; - User::LeaveIfError( parse.Set(objectP->DesC(CMTPObjectMetaData::ESuid), NULL, NULL) ); + LEAVEIFERROR( parse.Set(objectP->DesC(CMTPObjectMetaData::ESuid), NULL, NULL), + OstTraceExt2( TRACE_ERROR, DUP3_CMTPPICTBRIDGEDPGETOBJECTINFO_BUILDOBJECTINFOL, + "Sets up TParse object for %S failed! error code %d", objectP->DesC(CMTPObjectMetaData::ESuid), munged_err)); iObjectInfoToBuildP->SetStringL(CMTPTypeObjectInfo::EFilename, parse.NameAndExt()); //4, compressed size, 17 Date created, and 18 Date modified @@ -163,7 +177,7 @@ //empty keyword iObjectInfoToBuildP->SetStringL(CMTPTypeObjectInfo::EKeywords, KNullDesC); CleanupStack::PopAndDestroy(objectP); - __FLOG(_L8("<< CMTPPictBridgeDpGetObjectInfo::BuildObjectInfoL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPGETOBJECTINFO_BUILDOBJECTINFOL_EXIT ); } @@ -172,7 +186,9 @@ */ void CMTPPictBridgeDpGetObjectInfo::SetFileSizeDateL(const TDesC& aFileName, TBool aDiscoveryFile) { - __FLOG_VA((_L16(">> CMTPPictBridgeDpGetObjectInfo::SetFileSizeDateL aDiscoveryFile %d %S"), aDiscoveryFile, &aFileName)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL, + "aDiscoveryFile %d %S", aDiscoveryFile, aFileName ); // open the file for retrieving information RFile file; @@ -181,14 +197,20 @@ if (!aDiscoveryFile) { - User::LeaveIfError(file.Open(iFramework.Fs(), aFileName, EFileShareReadersOnly)); + LEAVEIFERROR(file.Open(iFramework.Fs(), aFileName, EFileShareReadersOnly), + OstTraceExt2( TRACE_ERROR, DUP3_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL, + "Open %S failed! error code %d", aFileName, munged_err )); CleanupClosePushL(file); //file size - User::LeaveIfError(file.Size(size)); - + LEAVEIFERROR(file.Size(size), + OstTrace1( TRACE_ERROR, DUP4_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL, + "Get current file size failed! error code %d", munged_err)); + //file modified time - User::LeaveIfError(file.Modified(modifiedTime)); + LEAVEIFERROR(file.Modified(modifiedTime), + OstTrace1( TRACE_ERROR, DUP5_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL, + "Gets local date and time the file was last modified failed! error code %d", munged_err)); } else { @@ -199,7 +221,7 @@ //file size TUint32 fileSize=size; iObjectInfoToBuildP->SetUint32L(CMTPTypeObjectInfo::EObjectCompressedSize, fileSize); - __FLOG_VA((_L8(" file size %d"), fileSize)); + OstTrace1( TRACE_NORMAL, DUP2_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL, "file size %d", fileSize ); //file modified time const TInt KTimeStringLen=0x0f;// YYYYMMDDThhmmss(.s), we exclude tenths of seconds and use length 15, (MTP 1.0 spec, section 3.2.5) @@ -217,7 +239,8 @@ { CleanupStack::PopAndDestroy(&file); } - - __FLOG_VA((_L16("<< CMTPPictBridgeDpGetObjectInfo::SetFileSizeDateL %S"),&modifiedTimeBuffer)); + + OstTraceExt1( TRACE_NORMAL, DUP1_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL, "%S", modifiedTimeBuffer ); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedpsendobjectinfo.cpp --- a/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedpsendobjectinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgedpsendobjectinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -35,6 +35,12 @@ #include "cptpserver.h" #include "cmtpconnection.h" #include "cmtpconnectionmgr.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppictbridgedpsendobjectinfoTraces.h" +#endif + /** Verification data for the SendObjectInfo request @@ -69,8 +75,9 @@ */ CMTPPictBridgeDpSendObjectInfo::~CMTPPictBridgeDpSendObjectInfo() { - __FLOG_VA((_L8(">> CMTPPictBridgeDpSendObjectInfo::~CMTPPictBridgeDpSendObjectInfo iProgress=%d iNoRollback=%d "), iProgress, iNoRollback)); - __FLOG_2(_L8("iProgress:%d NoRollback:%d"),iProgress,iNoRollback); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CMTPPICTBRIDGEDPSENDOBJECTINFO_DES_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_CMTPPICTBRIDGEDPSENDOBJECTINFO, + "iProgress=%d iNoRollback=%d ", iProgress, iNoRollback ); if ((iProgress == EObjectInfoSucceed || iProgress == EObjectInfoFail || @@ -88,8 +95,7 @@ delete iObjectInfoP; delete iObjectPropList; - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::~CMTPPictBridgeDpSendObjectInfo")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CMTPPICTBRIDGEDPSENDOBJECTINFO_DES_EXIT ); } /** @@ -109,11 +115,12 @@ */ TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::CheckRequestL() { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::CheckRequestL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKREQUESTL_ENTRY ); TMTPResponseCode result = CheckSendingStateL(); if (result != EMTPRespCodeOK) { + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKREQUESTL_EXIT ); return result; } @@ -157,9 +164,9 @@ result = EMTPRespCodeNoValidObjectInfo; } } - - __FLOG_VA((_L8("<< CMTPPictBridgeDpSendObjectInfo::CheckRequestL 0x%04x"), result)); + OstTrace1( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKREQUESTL, "result 0x%04x", result ); + OstTraceFunctionExit0( DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKREQUESTL_EXIT ); return result; } @@ -175,7 +182,7 @@ */ void CMTPPictBridgeDpSendObjectInfo::ServiceL() { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::ServiceL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_SERVICEL_ENTRY ); if (iProgress == EObjectNone) { if ( EMTPOpCodeSendObjectInfo == iOperationCode ) @@ -190,8 +197,8 @@ else { ServiceSendObjectL(); - } - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::ServiceL")); + } + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_SERVICEL_EXIT ); } /** @@ -199,14 +206,13 @@ */ void CMTPPictBridgeDpSendObjectInfo::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::ConstructL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CONSTRUCTL_ENTRY ); iExpectedSendObjectRequest.SetUint16(TMTPTypeRequest::ERequestOperationCode, EMTPOpCodeSendObject); iReceivedObjectP = CMTPObjectMetaData::NewL(); iReceivedObjectP->SetUint(CMTPObjectMetaData::EDataProviderId, iFramework.DataProviderId()); iDpSingletons.OpenL(iFramework); iNoRollback = EFalse; - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::ConstructL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CONSTRUCTL_EXIT ); } /** @@ -217,7 +223,7 @@ */ TBool CMTPPictBridgeDpSendObjectInfo::Match(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) const { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::Match")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_MATCH_ENTRY ); TBool result = EFalse; TUint16 operationCode = aRequest.Uint16(TMTPTypeRequest::ERequestOperationCode); if ((operationCode == EMTPOpCodeSendObjectInfo || @@ -226,8 +232,8 @@ &iConnection == &aConnection) { result = ETrue; - } - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::Match")); + } + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_MATCH_EXIT ); return result; } @@ -237,7 +243,9 @@ */ TBool CMTPPictBridgeDpSendObjectInfo::DoHandleResponsePhaseL() { - __FLOG_VA((_L8(">> CMTPPictBridgeDpSendObjectInfo::DoHandleResponsePhaseL iProgress==%d opCode==0x%x"),iProgress, iOperationCode)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL, + "iProgress==%d opCode==0x%x",iProgress, iOperationCode ); //to check if the sending/receiving data is successful TBool successful = !iCancelled; if (iProgress == EObjectInfoInProgress) @@ -256,8 +264,8 @@ { successful = DoHandleSendObjectCompleteL(); iProgress = (successful ? ESendObjectSucceed : ESendObjectFail); - } - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::DoHandleResponsePhaseL")); + } + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } @@ -267,7 +275,10 @@ */ TBool CMTPPictBridgeDpSendObjectInfo::DoHandleCompletingPhaseL() { - __FLOG_VA((_L8(">> CMTPPictBridgeDpSendObjectInfo::DoHandleCompletingPhaseL iProgress==%d opCode==0x%x"),iProgress, iOperationCode)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL, + " iProgress==%d opCode==0x%x",iProgress, iOperationCode ); + TBool result = ETrue; CMTPRequestProcessor::DoHandleCompletingPhaseL(); if (iProgress == EObjectInfoSucceed) @@ -291,8 +302,11 @@ iProgress = EObjectInfoSucceed; result = EFalse; } - - __FLOG_2(_L8("<< CMTPPictBridgeDpSendObjectInfo::DoHandleCompletingPhaseL result:%d progress %d"),result,iProgress); + + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL, + " result:%d progress %d",result,iProgress ); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_EXIT ); + return result; } @@ -303,7 +317,7 @@ */ TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::CheckSendingStateL() { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::CheckSendingStateL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKSENDINGSTATEL_ENTRY ); TMTPResponseCode result = EMTPRespCodeOK; iOperationCode = Request().Uint16(TMTPTypeRequest::ERequestOperationCode); @@ -330,7 +344,8 @@ // Not finished SendObjectInfo/SendObject pair detected, need to remove the object reservation that was created, unless the object already existed if (!iNoRollback ) { - __FLOG(_L8(" CMTPPictBridgeDpSendObjectInfo::CheckSendingStateL ... Rolling back!")); + OstTrace0( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKSENDINGSTATEL, + " CMTPPictBridgeDpSendObjectInfo::CheckSendingStateL ... Rolling back!" ); Rollback(); } @@ -343,9 +358,11 @@ } else { + OstTrace1( TRACE_ERROR, DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKSENDINGSTATEL, + "Progress %d is invalid here!", iProgress); User::Leave( KErrGeneral ); } - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::CheckSendingStateL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKSENDINGSTATEL_EXIT ); return result; } @@ -387,14 +404,16 @@ */ void CMTPPictBridgeDpSendObjectInfo::GetDefaultParentObjectL() { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::GetDefaultParentObjectL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_ENTRY ); if (iStorageId == KMTPStorageDefault) { iStorageId = iFramework.StorageMgr().DefaultStorageId(); } TInt drive(static_cast(iFramework.StorageMgr().DriveNumber(iStorageId))); - User::LeaveIfError(drive); + LEAVEIFERROR(drive, + OstTrace1( TRACE_ERROR, CMTPPICTBRIDGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL, + "Can't identify drive number for storage %d", iStorageId )); // Obtain the root of the drive. Logical storages can sometimes have a filesystem root // other than :\ . For example an MP3 DP might have a root of c:\media\music\ @@ -402,8 +421,8 @@ delete iParentSuidP; iParentSuidP = NULL; iParentSuidP=(iFramework.StorageMgr().StorageL(iStorageId).DesC(CMTPStorageMetaData::EStorageSuid)).AllocL(); - iReceivedObjectP->SetUint(CMTPObjectMetaData::EParentHandle, KMTPHandleNoParent); - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::GetDefaultParentObjectL")); + iReceivedObjectP->SetUint(CMTPObjectMetaData::EParentHandle, KMTPHandleNoParent); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_EXIT ); } /** @@ -412,7 +431,7 @@ */ TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::GetParentObjectAndStorageIdL() { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::GetParentObjectAndStorageIdL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_ENTRY ); __ASSERT_DEBUG(iRequestChecker, Panic(EMTPPictBridgeDpRequestCheckNull)); iStorageId = Request().Uint32(TMTPTypeRequest::ERequestParameter1); @@ -432,7 +451,9 @@ iReceivedObjectP->SetUint(CMTPObjectMetaData::EParentHandle, iParentHandle); } - __FLOG_VA((_L16("<< CMTPPictBridgeDpSendObjectInfo::GetParentObjectAndStorageIdL %S"), iParentSuidP)); + OstTraceExt1( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL, + "iParentSuidP: %S", *iParentSuidP ); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_EXIT ); return EMTPRespCodeOK; } @@ -442,7 +463,7 @@ */ TBool CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectInfoCompleteL() { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectInfoCompleteL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_ENTRY ); TBool result(ETrue); TUint16 format(iObjectInfoP->Uint16L(CMTPTypeObjectInfo::EObjectFormat)); @@ -505,7 +526,7 @@ if (!result) { // Object with the same name already exists. - __FLOG(_L8(" no rollback")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_ROLLBACK, " no rollback" ); iNoRollback = ETrue; SendResponseL(EMTPRespCodeAccessDenied); } @@ -520,7 +541,8 @@ if (err != KErrNone) { - __FLOG_1(_L8("Fail to create fs object %d"),err); + OstTrace1( TRACE_WARNING, CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL, + "Fail to create fs object %d", err ); SendResponseL(ErrorToMTPError(err)); result = EFalse; } @@ -528,15 +550,15 @@ { ReserveObjectL(); } - } - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectInfoCompleteL")); + } + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_EXIT ); return result; } TBool CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectPropListCompleteL() { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectPropListCompleteL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_ENTRY ); TBool result(ETrue); TMTPResponseCode responseCode( GetParentObjectAndStorageIdL() ); if ( responseCode != EMTPRespCodeOK ) @@ -568,7 +590,8 @@ TRAPD(err, CreateFsObjectL()); if ( err != KErrNone ) { - __FLOG_1(_L8("Fail to create fs object %d"),err); + OstTrace1( TRACE_WARNING, CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL, + "Fail to create fs object %d", err ); SendResponseL(ErrorToMTPError(err)); result = EFalse; } @@ -578,7 +601,7 @@ } } - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectPropListCompleteL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_EXIT ); return result; } @@ -586,17 +609,18 @@ */ TBool CMTPPictBridgeDpSendObjectInfo::IsFormatValid(TMTPFormatCode aFormat) const { - __FLOG_VA((_L8(">> CMTPPictGetObjectPropDesc::IsFormatValid %d"),aFormat)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_ISFORMATVALID_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_ISFORMATVALID, "aFormat : %d", aFormat ); TInt count(sizeof(KMTPValidCodeExtensionMappings) / sizeof(KMTPValidCodeExtensionMappings[0])); for(TInt i = 0; i < count; i++) { if (KMTPValidCodeExtensionMappings[i].iFormatCode == aFormat) { - __FLOG(_L8("<< CMTPPictGetObjectPropDesc::IsFormatValid ETrue")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_ISFORMATVALID_EXIT ); return ETrue; } } - __FLOG(_L8("<< CMTPPictGetObjectPropDesc::IsFormatValid EFalse")); + OstTraceFunctionExit0( DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_ISFORMATVALID_EXIT ); return EFalse; } @@ -606,18 +630,23 @@ */ TBool CMTPPictBridgeDpSendObjectInfo::DoHandleSendObjectCompleteL() { - __FLOG_VA((_L8(">> CMTPPictGetObjectPropDesc::DoHandleSendObjectCompleteL size=%d cancelled=%d"), iObjectSize, iCancelled)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL, + " size=%d cancelled=%d", iObjectSize, iCancelled ); TBool result(ETrue); delete iFileReceivedP; iFileReceivedP = NULL; TEntry fileEntry; - User::LeaveIfError(iFramework.Fs().Entry(iFullPath, fileEntry)); + LEAVEIFERROR(iFramework.Fs().Entry(iFullPath, fileEntry), + OstTraceExt2( TRACE_ERROR, DUP2_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL, + "Can't get entry details for %S! error code %d", iFullPath, munged_err )); if (fileEntry.FileSize() != iObjectSize) { - __FLOG_VA((_L8(" sizes differ %d!=%d"),fileEntry.FileSize(), iObjectSize)); + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL, + " sizes differ %d!=%d", (TUint32)fileEntry.FileSize(), (TUint32)iObjectSize); iFramework.RouteRequestUnregisterL(iExpectedSendObjectRequest, iConnection); iFramework.Fs().Delete(iFullPath); @@ -659,8 +688,8 @@ //with folder creation. - TRAPD(err, iFramework.ObjectMgr().CommitReservedObjectHandleL(*iReceivedObjectP)); - __FLOG_VA((_L8(" Entry error %d"),err)); + TRAPD(err, iFramework.ObjectMgr().CommitReservedObjectHandleL(*iReceivedObjectP)); + OstTrace1( TRACE_NORMAL, DUP3_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL, " Entry error %d", err); if( KErrAlreadyExists == err ) { iReceivedObjectP->SetUint(CMTPObjectMetaData::EHandle, iFramework.ObjectMgr().HandleL(iFullPath)); @@ -671,7 +700,7 @@ } SendResponseL(EMTPRespCodeOK); } - __FLOG(_L8("<< CMTPPictGetObjectPropDesc::DoHandleSendObjectCompleteL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_EXIT ); return result; } @@ -683,7 +712,9 @@ */ TBool CMTPPictBridgeDpSendObjectInfo::GetFullPathNameL(const TDesC& aFileName) { - __FLOG_VA((_L16(">> CMTPPictBridgeDpSendObjectInfo::GetFullPathNameL file %S"), &aFileName)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_GETFULLPATHNAMEL_ENTRY ); + OstTraceExt1( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_GETFULLPATHNAMEL, "file %S", aFileName ); + TBool result(EFalse); if (aFileName.Length() > 0) { @@ -695,7 +726,8 @@ } } - __FLOG_VA((_L16("<< CMTPPictBridgeDpSendObjectInfo::GetFullPathNameL full path %S"), &iFullPath)); + OstTraceExt1( TRACE_NORMAL, DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_GETFULLPATHNAMEL, "full path %S", iFullPath ); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_GETFULLPATHNAMEL_EXIT ); return result; } @@ -711,7 +743,7 @@ TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::VerifyObjectPropListL( TInt& aInvalidParameterIndex ) { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::VerifyObjectPropListL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_ENTRY ); TMTPResponseCode responseCode( EMTPRespCodeOK ); const TUint KCount( iObjectPropList->NumberOfElements() ); iObjectPropList->ResetCursor(); @@ -737,13 +769,13 @@ } } - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::VerifyObjectPropListL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_EXIT ); return responseCode; } TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::ExtractPropertyL( const CMTPTypeObjectPropListElement& aElement ) { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::ExtractPropertyL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_EXTRACTPROPERTYL_ENTRY ); TMTPResponseCode responseCode(EMTPRespCodeOK); switch ( aElement.Uint16L(CMTPTypeObjectPropListElement::EPropertyCode) ) { @@ -780,13 +812,13 @@ break; } - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::ExtractPropertyL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_EXTRACTPROPERTYL_EXIT ); return responseCode; } TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::CheckPropCodeL( const CMTPTypeObjectPropListElement& aElement ) const { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::CheckPropCodeL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKPROPCODEL_ENTRY ); TMTPResponseCode responseCode( EMTPRespCodeOK ); switch( aElement.Uint16L( CMTPTypeObjectPropListElement::EPropertyCode )) { @@ -875,13 +907,13 @@ } break; } - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::CheckPropCodeL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKPROPCODEL_EXIT ); return responseCode; } TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::MatchStoreAndParentL() const { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::MatchStoreAndParentL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_MATCHSTOREANDPARENTL_ENTRY ); TMTPResponseCode ret = EMTPRespCodeOK; const TUint32 storeId(Request().Uint32(TMTPTypeRequest::ERequestParameter1)); const TUint32 parentHandle(Request().Uint32(TMTPTypeRequest::ERequestParameter2)); @@ -895,7 +927,7 @@ ret = EMTPRespCodeInvalidObjectHandle; } } - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::MatchStoreAndParentL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_MATCHSTOREANDPARENTL_EXIT ); return ret; } @@ -905,7 +937,7 @@ */ void CMTPPictBridgeDpSendObjectInfo::ReserveObjectL() { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::ReserveObjectL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_RESERVEOBJECTL_ENTRY ); iReceivedObjectP->SetUint(CMTPObjectMetaData::EStorageId, iStorageId); iReceivedObjectP->SetDesCL(CMTPObjectMetaData::ESuid, iFullPath); @@ -918,29 +950,30 @@ parameters[1] = iParentHandle; parameters[2] = iReceivedObjectP->Uint(CMTPObjectMetaData::EHandle); SendResponseL(EMTPRespCodeOK, (sizeof(parameters) / sizeof(parameters[0])), parameters); - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::ReserveObjectL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_RESERVEOBJECTL_EXIT ); } void CMTPPictBridgeDpSendObjectInfo::CreateFsObjectL() { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::CreateFsObjectL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CREATEFSOBJECTL_ENTRY ); delete iFileReceivedP; iFileReceivedP = NULL; iFileReceivedP = CMTPTypeFile::NewL(iFramework.Fs(), iFullPath, EFileWrite); - iFileReceivedP->SetSizeL(iObjectSize); - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::CreateFsObjectL")); + iFileReceivedP->SetSizeL(iObjectSize); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_CREATEFSOBJECTL_EXIT ); } void CMTPPictBridgeDpSendObjectInfo::Rollback() { - __FLOG(_L8(">> CMTPPictBridgeDpSendObjectInfo::Rollback")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEDPSENDOBJECTINFO_ROLLBACK_ENTRY ); // Delete this object from file system. delete iFileReceivedP; iFileReceivedP=NULL; TInt err=iFramework.Fs().Delete(iFullPath); - __FLOG_VA((_L16(">> CMTPPictBridgeDpSendObjectInfo::Rollback deleted %S with return code %d"), &iFullPath, err)); + OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEDPSENDOBJECTINFO_ROLLBACK, + "deleted %S with return code %d", iFullPath, err ); TRAP_IGNORE(iFramework.ObjectMgr().UnreserveObjectHandleL(*iReceivedObjectP)); - __FLOG(_L8("<< CMTPPictBridgeDpSendObjectInfo::Rollback")); + OstTraceFunctionExit0( CMTPPICTBRIDGEDPSENDOBJECTINFO_ROLLBACK_EXIT ); } TMTPResponseCode CMTPPictBridgeDpSendObjectInfo::ErrorToMTPError(TInt aError) const diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/src/cmtppictbridgeenumerator.cpp --- a/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgeenumerator.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgeenumerator.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -31,6 +31,11 @@ #include "cmtpdataprovidercontroller.h" #include #include +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppictbridgeenumeratorTraces.h" +#endif + //================================================================== // @@ -57,10 +62,9 @@ //================================================================== void CMTPPictBridgeEnumerator::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8(">> CMTPPictBridgeEnumerator::ConstructL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEENUMERATOR_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); - __FLOG(_L8("<< CMTPPictBridgeEnumerator::ConstructL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEENUMERATOR_CONSTRUCTL_EXIT ); } /** @@ -68,11 +72,10 @@ */ CMTPPictBridgeEnumerator::~CMTPPictBridgeEnumerator() { - __FLOG(_L8(">> CMTPPictBridgeEnumerator::~CMTPPictBridgeEnumerator")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEENUMERATOR_CMTPPICTBRIDGEENUMERATOR_DES_ENTRY ); // we keep the persistent handle iSingletons.Close(); - __FLOG(_L8("<< CMTPPictBridgeEnumerator::~CMTPPictBridgeEnumerator")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPICTBRIDGEENUMERATOR_CMTPPICTBRIDGEENUMERATOR_DES_EXIT ); } // -------------------------------------------------------------------------- @@ -97,7 +100,7 @@ // -------------------------------------------------------------------------- void CMTPPictBridgeEnumerator::EnumerateObjectsL(TUint32 aStorageId) { - __FLOG(_L8(">> CMTPPictBridgeEnumerator::EnumerateObjectsL")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL_ENTRY ); const TUint storageId(iFramework.StorageMgr().DefaultStorageId()); if ((aStorageId==KMTPStorageAll) || (aStorageId==storageId)) @@ -108,19 +111,19 @@ TFileName fullPath; fullPath = PathInfo::PhoneMemoryRootPath(); fullPath.Append(KHostDiscovery); - __FLOG_VA((_L16("full path is %S "), &fullPath)); + OstTraceExt1( TRACE_NORMAL, CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL, "full path is %S ", fullPath ); iFramework.Fs().SetAtt(fullPath, KEntryAttNormal, KEntryAttReadOnly); iFramework.Fs().Delete(fullPath); fullPath = PathInfo::PhoneMemoryRootPath(); fullPath.Append(KHostRequest); - __FLOG_VA((_L16("full path is %S "), &fullPath)); + OstTraceExt1( TRACE_NORMAL, DUP1_CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL, "full path is %S ", fullPath ); iFramework.Fs().SetAtt(fullPath, KEntryAttNormal, KEntryAttReadOnly); iFramework.Fs().Delete(fullPath); fullPath = PathInfo::PhoneMemoryRootPath(); fullPath.Append(KHostResponse); - __FLOG_VA((_L16("full path is %S "), &fullPath)); + OstTraceExt1( TRACE_NORMAL, DUP2_CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL, "full path is %S ", fullPath ); iFramework.Fs().SetAtt(fullPath, KEntryAttNormal, KEntryAttReadOnly); iFramework.Fs().Delete(fullPath); @@ -130,7 +133,7 @@ CleanupClosePushL(rf); fullPath = PathInfo::PhoneMemoryRootPath(); fullPath.Append(KDeviceDiscovery); - __FLOG_VA((_L16("full path is %S "), &fullPath)); + OstTraceExt1( TRACE_NORMAL, DUP3_CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL, "full path is %S ", fullPath ); iFramework.Fs().SetAtt(fullPath, KEntryAttNormal, KEntryAttReadOnly); iFramework.Fs().Delete(fullPath); @@ -145,12 +148,13 @@ objectP->SetUint(CMTPObjectMetaData::EParentHandle, KMTPHandleNoParent); objectMgr.InsertObjectL(*objectP); iDpsDiscoveryHandle = objectP->Uint( CMTPObjectMetaData::EHandle ); - __FLOG_VA((_L8("added discovery file iDpsDiscoveryHandle is 0x%08X"), iDpsDiscoveryHandle)); + OstTrace1( TRACE_NORMAL, DUP4_CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL, + "added discovery file iDpsDiscoveryHandle is 0x%08X", iDpsDiscoveryHandle ); CleanupStack::PopAndDestroy(objectP); } iCallback.NotifyEnumerationCompleteL(aStorageId, KErrNone); - __FLOG(_L8("<< CMTPPictBridgeEnumerator::EnumerateObjectsL")); + OstTraceFunctionExit0( CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/src/cmtppictbridgeprinter.cpp --- a/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgeprinter.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgeprinter.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,6 +23,11 @@ #include "cmtppictbridgeprinter.h" #include "mtppictbridgedpconst.h" #include "cmtppictbridgeusbconnection.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppictbridgeprinterTraces.h" +#endif + // -------------------------------------------------------------------------- // @@ -43,7 +48,6 @@ // void CMTPPictBridgePrinter::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KPtpServerLog); iMsgHandlerP = CPtpReceivedMsgHandler::NewL(&iServer); iUsbConnectionP = CMTPPictBridgeUsbConnection::NewL(*this); } @@ -64,7 +68,6 @@ { delete iMsgHandlerP; delete iUsbConnectionP; - __FLOG_CLOSE; } // -------------------------------------------------------------------------- @@ -103,7 +106,8 @@ } else { - __FLOG(_L8("WARNING! CMTPPictBridgePrinter::NoDpsDiscovery trying to say no printer even though already discovered")); + OstTrace0( TRACE_WARNING, CMTPPICTBRIDGEPRINTER_NODPSDISCOVERY, + "WARNING! trying to say no printer even though already discovered" ); } } @@ -113,15 +117,18 @@ // void CMTPPictBridgePrinter::DpsObjectReceived(TUint32 aHandle) { - __FLOG(_L8("CMTPPictBridgePrinter::DpsObjectReceived")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEPRINTER_DPSOBJECTRECEIVED_ENTRY ); if(iPrinterStatus==EConnected) // we only handle the object when we are connected to the printer { iMsgHandlerP->ObjectReceived(aHandle); } else { - __FLOG(_L8("!!!!WARNING: CMTPPictBridgePrinter::DpsObjectReceived Rx dps file when printer not connected!")); + OstTrace0( TRACE_WARNING, CMTPPICTBRIDGEPRINTER_DPSOBJECTRECEIVED, + "!!!!WARNING: CMTPPictBridgePrinter::DpsObjectReceived Rx dps file when printer not connected!" ); + } + OstTraceFunctionExit0( CMTPPICTBRIDGEPRINTER_DPSOBJECTRECEIVED_EXIT ); } // -------------------------------------------------------------------------- @@ -130,12 +137,12 @@ // void CMTPPictBridgePrinter::DpsDiscovery(const TFileName& aFileName, MMTPConnection* aConnectionP) { - __FLOG_VA(_L8(">> CMTPPictBridgePrinter::DpsDiscovery")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEPRINTER_DPSDISCOVERY_ENTRY ); if ( iPrinterStatus != EConnected ) { if (KErrNotFound!=aFileName.Find(KHostDiscovery)) { - __FLOG(_L8("***Dps printer Discovered.")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPPICTBRIDGEPRINTER_DPSDISCOVERY, "***Dps printer Discovered." ); iPrinterConnectionP=aConnectionP; iPrinterStatus=EConnected; iUsbConnectionP->Listen(); @@ -144,8 +151,9 @@ iDpsPrinterNotifyCbP->IsDpsPrinterCompleted(EPrinterAvailable); } } - } - __FLOG_VA((_L16("<< CMTPPictBridgePrinter::DpsDiscovery received file %S"), &aFileName)); + } + OstTraceExt1( TRACE_NORMAL, CMTPPICTBRIDGEPRINTER_DPSDISCOVERY, "received file %S", aFileName ); + OstTraceFunctionExit0( CMTPPICTBRIDGEPRINTER_DPSDISCOVERY_EXIT ); } // -------------------------------------------------------------------------- // @@ -153,9 +161,9 @@ // void CMTPPictBridgePrinter::DeRegisterDpsPrinterNotify(CPtpSession* /*aSessionP*/ ) { - __FLOG(_L8(">>>CMTPPictBridgePrinter::DeRegisterDpsPrinterNotify")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEPRINTER_DEREGISTERDPSPRINTERNOTIFY_ENTRY ); iDpsPrinterNotifyCbP=NULL; - __FLOG(_L8("<<>>CMTPPictBridgePrinter::RegisterDpsPrinterNotify 0x%x (old) 0x%x (new)"), iDpsPrinterNotifyCbP, aSessionP)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEPRINTER_REGISTERDPSPRINTERNOTIFY_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEPRINTER_REGISTERDPSPRINTERNOTIFY, + " 0x%x (old) 0x%x (new)", (TUint)iDpsPrinterNotifyCbP, (TUint)aSessionP ); __ASSERT_DEBUG(iDpsPrinterNotifyCbP==NULL, User::Invariant()); iDpsPrinterNotifyCbP=aSessionP; - __FLOG(_L8("<<> CMTPPictBridgePrinter::SendDpsFileL %S"), &aFile)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEPRINTER_SENDDPSFILEL_ENTRY ); + OstTraceExt1( TRACE_NORMAL, CMTPPICTBRIDGEPRINTER_SENDDPSFILEL, "DpsFile %S", aFile ); TUint32 handle(0); TRAPD(err, iServer.GetObjectHandleByNameL(aFile, handle)); if(err!=KErrNone || handle==0) { - __FLOG_VA((_L8(" Object does not exist, adding it, errorcode = %d"), err)); + OstTrace1( TRACE_WARNING, DUP1_CMTPPICTBRIDGEPRINTER_SENDDPSFILEL, + " Object does not exist, adding it, errorcode = %d", err); iServer.AddTemporaryObjectL(aFile, handle); } CreateRequestObjectTransfer(handle, iEvent); iServer.SendEventL(iEvent); iOutgoingObjectHandle=handle; - __FLOG_VA((_L8("<< CMTPPictBridgePrinter::SendDpsFileL handle 0x%x"),iOutgoingObjectHandle)); + OstTrace1( TRACE_NORMAL, DUP2_CMTPPICTBRIDGEPRINTER_SENDDPSFILEL, "handle 0x%x", iOutgoingObjectHandle ); + OstTraceFunctionExit0( CMTPPICTBRIDGEPRINTER_SENDDPSFILEL_EXIT ); } // -------------------------------------------------------------------------- @@ -202,9 +215,9 @@ // void CMTPPictBridgePrinter::CancelSendDpsFile() { - __FLOG(_L8(">>>CMTPPictBridgePrinter::CancelSendObject")); - iOutgoingObjectHandle=0; - __FLOG(_L8("<<ReceivedObjectCompleted(aFile); + OstTraceFunctionExit0( CMTPPICTBRIDGEPRINTER_OBJECTRECEIVED_EXIT ); } // -------------------------------------------------------------------------- @@ -252,12 +269,15 @@ // void CMTPPictBridgePrinter::DpsFileSent(TInt aError) { - __FLOG_VA((_L8("CMTPPictBridgePrinter::DpsFileSent error %d handle 0x%x"), aError, iOutgoingObjectHandle)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEPRINTER_DPSFILESENT_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEPRINTER_DPSFILESENT, "error %d handle 0x%x", (TInt32)aError, iOutgoingObjectHandle ); + if( SendObjectPending() ) { iObserverP->SendObjectCompleted(aError); iOutgoingObjectHandle=0; } + OstTraceFunctionExit0( CMTPPICTBRIDGEPRINTER_DPSFILESENT_EXIT ); } // -------------------------------------------------------------------------- diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/src/cmtppictbridgeusbconnection.cpp --- a/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgeusbconnection.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/src/cmtppictbridgeusbconnection.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -18,6 +18,12 @@ #include "cmtppictbridgeusbconnection.h" #include "cmtppictbridgeprinter.h" #include "ptpdef.h" +#include "OstTraceDefinitions.h" +#include "mtpdebug.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppictbridgeusbconnectionTraces.h" +#endif + const TInt KNotAssigned=0; // -------------------------------------------------------------------------- @@ -54,9 +60,12 @@ // void CMTPPictBridgeUsbConnection::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KPtpServerLog); - __FLOG(_L8("CMTPPictBridgeUsbConnection::ConstructL")); - User::LeaveIfError(iProperty.Attach(KPSUidUsbWatcher, KUsbWatcherSelectedPersonality)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEUSBCONNECTION_CONSTRUCTL_ENTRY ); + LEAVEIFERROR(iProperty.Attach(KPSUidUsbWatcher, KUsbWatcherSelectedPersonality), + OstTrace1( TRACE_ERROR, CMTPPICTBRIDGEUSBCONNECTION_CONSTRUCTL, + "Attaches to the specified property failed. Error code %d", munged_err)); + + OstTraceFunctionExit0( CMTPPICTBRIDGEUSBCONNECTION_CONSTRUCTL_EXIT ); } // -------------------------------------------------------------------------- @@ -65,11 +74,10 @@ // CMTPPictBridgeUsbConnection::~CMTPPictBridgeUsbConnection() { - __FLOG(_L8(">> CMTPPictBridgeUsbConnection::~")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEUSBCONNECTION_CMTPPICTBRIDGEUSBCONNECTION_DES_ENTRY ); Cancel(); iProperty.Close(); - __FLOG(_L8("<< CMTPPictBridgeUsbConnection::~")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPICTBRIDGEUSBCONNECTION_CMTPPICTBRIDGEUSBCONNECTION_DES_EXIT ); } // -------------------------------------------------------------------------- @@ -78,10 +86,10 @@ // void CMTPPictBridgeUsbConnection::Listen() { - __FLOG(_L8(">> CMTPPictBridgeUsbConnection::Listen")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEUSBCONNECTION_LISTEN_ENTRY ); if(!IsActive()) { - __FLOG(_L8(" CMTPPictBridgeUsbConnection AO is NOT active and run AO")); + OstTrace0( TRACE_NORMAL, CMTPPICTBRIDGEUSBCONNECTION_LISTEN, " CMTPPictBridgeUsbConnection AO is NOT active and run AO"); iProperty.Subscribe(iStatus); SetActive(); if(ConnectionClosed()) // we listen to the disconnection only if connected to the printer @@ -90,7 +98,7 @@ Cancel(); } } - __FLOG(_L8("<< CMTPPictBridgeUsbConnection::Listen")); + OstTraceFunctionExit0( CMTPPICTBRIDGEUSBCONNECTION_LISTEN_EXIT ); } // -------------------------------------------------------------------------- @@ -102,13 +110,15 @@ TInt personality=KNotAssigned; TInt ret = RProperty::Get(KPSUidUsbWatcher, KUsbWatcherSelectedPersonality, personality); - __FLOG_VA((_L8("CMTPPictBridgeUsbConnection::ConnectionClosed() current personality = %d, previous personality = %d"), personality, iPreviousPersonality)); + OstTraceExt2( TRACE_NORMAL, CMTPPICTBRIDGEUSBCONNECTION_CONNECTIONCLOSED, + " current personality = %d, previous personality = %d", personality, iPreviousPersonality ); if ((ret == KErrNone && personality == KUsbPersonalityIdMS) || (iPreviousPersonality != KNotAssigned && personality != iPreviousPersonality)) { if((personality != KUsbPersonalityIdPCSuiteMTP)&&(personality != KUsbPersonalityIdMTP)) { - __FLOG_VA((_L8("****WARNING!!! PTP server detects the USB connection closed!"))); + OstTrace0( TRACE_WARNING, DUP1_CMTPPICTBRIDGEUSBCONNECTION_CONNECTIONCLOSED, + "****WARNING!!! PTP server detects the USB connection closed!" ); return ETrue; } } @@ -125,8 +135,9 @@ // void CMTPPictBridgeUsbConnection::DoCancel() { - __FLOG(_L8("CMTPPictBridgeUsbConnection::DoCancel()")); + OstTraceFunctionEntry0( CMTPPICTBRIDGEUSBCONNECTION_DOCANCEL_ENTRY ); iProperty.Cancel(); + OstTraceFunctionExit0( CMTPPICTBRIDGEUSBCONNECTION_DOCANCEL_EXIT ); } // -------------------------------------------------------------------------- @@ -135,7 +146,8 @@ // void CMTPPictBridgeUsbConnection::RunL() { - __FLOG_VA((_L8(">>>CMTPPictBridgeUsbConnection::RunL %d"),iStatus.Int())); + OstTraceFunctionEntry0( CMTPPICTBRIDGEUSBCONNECTION_RUNL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPICTBRIDGEUSBCONNECTION_RUNL, "iStatus %d", iStatus.Int() ); TBool closed = EFalse; if( iStatus == KErrNone ) @@ -152,20 +164,23 @@ Listen(); } - __FLOG(_L8("<<>>CMTPPictBridgeUsbConnection::RunError %d"), aErr)); + OstTraceFunctionEntry0( CMTPPICTBRIDGEUSBCONNECTION_RUNERROR_ENTRY ); + OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CMTPPICTBRIDGEUSBCONNECTION_RUNERROR, + "error code %d", aErr); + OstTraceFunctionExit0( CMTPPICTBRIDGEUSBCONNECTION_RUNERROR_EXIT ); return KErrNone; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/src/cptpreceivedmsghandler.cpp --- a/mtpdataproviders/mtppictbridgedp/src/cptpreceivedmsghandler.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/src/cptpreceivedmsghandler.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,6 +23,11 @@ #include "cmtppictbridgeprinter.h" #include "cptpserver.h" #include "ptpdef.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpreceivedmsghandlerTraces.h" +#endif + // -------------------------------------------------------------------------- // CPtpReceivedMsgHandler::NewL() @@ -56,7 +61,6 @@ // void CPtpReceivedMsgHandler::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KPtpServerLog); } // -------------------------------------------------------------------------- @@ -66,9 +70,9 @@ // CPtpReceivedMsgHandler::~CPtpReceivedMsgHandler() { - __FLOG(_L8("CPtpReceivedMsgHandler::~")); + OstTraceFunctionEntry0( CPTPRECEIVEDMSGHANDLER_CPTPRECEIVEDMSGHANDLER_DES_ENTRY ); iReceiveQ.Close(); - __FLOG_CLOSE; + OstTraceFunctionExit0( CPTPRECEIVEDMSGHANDLER_CPTPRECEIVEDMSGHANDLER_DES_EXIT ); } // -------------------------------------------------------------------------- @@ -92,9 +96,10 @@ // void CPtpReceivedMsgHandler::RegisterReceiveObjectNotify(const TDesC& aExtension) { - __FLOG(_L8(">>>PtpMsgHandler::RegisterReceiveObjectNotify")); + OstTraceFunctionEntry0( CPTPRECEIVEDMSGHANDLER_REGISTERRECEIVEOBJECTNOTIFY_ENTRY ); iExtension.Copy(aExtension); - __FLOG_VA((_L8("***the Receiving Que msg count: %d"), iReceiveQ.Count())); + OstTrace1( TRACE_NORMAL, CPTPRECEIVEDMSGHANDLER_REGISTERRECEIVEOBJECTNOTIFY, + "***the Receiving Que msg count: %d", iReceiveQ.Count()); for ( TUint index = 0; index < iReceiveQ.Count(); ++index ) { if ( ObjectReceived( iReceiveQ[index] ) ) @@ -103,8 +108,9 @@ break; } } - __FLOG_VA((_L8("***the Receiving Que msg count:%d"), iReceiveQ.Count())); - __FLOG(_L8("<<>>CPtpReceivedMsgHandler::ObjectReceived 0x%x"), aHandle)); + OstTraceFunctionEntry0( CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED_ENTRY ); + OstTrace1( TRACE_NORMAL, CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED, "Handle 0x%x", aHandle ); TBuf file; TInt err=KErrNone; TRAP( err, iServerP->GetObjectNameByHandleL(file, aHandle)); - __FLOG_VA((_L16("---after GetObjectNameByHandleL err(%d) file is %S"), err, &file)); + OstTraceExt2( TRACE_NORMAL, DUP2_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED, + "---after GetObjectNameByHandleL err(%d) file is %S", err, file ); + if (err == KErrNone) { TFileName fileName; TBuf extension; TParse p; err = p.Set(file,NULL,NULL); - __FLOG_VA((_L8("---after Set err(%d)"), err)); + OstTrace1(TRACE_NORMAL, DUP3_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED, "---after Set err(%d)", err ); + if (err == KErrNone) { fileName = p.FullName(); extension = p.Ext(); - __FLOG_VA((_L16("---after parse file is %S ext is %S comparing it to %S"), &fileName, &extension, &iExtension)); + OstTraceExt3( TRACE_NORMAL, DUP4_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED, + "---after parse file is %S ext is %S comparing it to %S", fileName, extension, iExtension ); + if (!iExtension.CompareF(extension)) { iServerP->Printer()->ObjectReceived(fileName); // deregister notification DeRegisterReceiveObjectNotify(); + OstTraceFunctionExit0( CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED_EXIT ); return ETrue; } else @@ -148,12 +161,14 @@ iReceiveQ.Append(aHandle); } - __FLOG_VA((_L8("*** Que length is %d err is %d"), iReceiveQ.Count(), err)); - } + OstTraceExt2( TRACE_NORMAL, DUP5_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED, + "*** Que length is %d err is %d", iReceiveQ.Count(), err); + } } } - - __FLOG_VA((_L8("<<>>CPtpServer::ConstructL")); + OstTraceFunctionEntry0( CPTPSERVER_CONSTRUCTL_ENTRY ); + iFileMan = CFileMan::NewL(iFramework.Fs()); iPtpFolder = PathInfo::PhoneMemoryRootPath(); iPtpFolder.Append( PathInfo::ImagesPath()); @@ -72,7 +77,7 @@ Framework().Fs().MkDirAll(iPtpFolder); iPrinterP = CMTPPictBridgePrinter::NewL(*this); - __FLOG(_L8("<<>>CPtpServer::~")); + OstTraceFunctionEntry0( CPTPSERVER_CPTPSERVER_DES_ENTRY ); delete iPrinterP; iPrinterP = NULL; delete iFileMan; iFileMan = NULL; - __FLOG(_L8("<<>>CPtpServer::NewSessionL")); + OstTraceFunctionEntry0( CPTPSERVER_NEWSESSIONL_ENTRY ); TVersion v(KPtpServerVersionMajor, KPtpServerVersionMinor, 0); if (!User::QueryVersionSupported(v,aVersion)) { - __FLOG(_L8("!!!!Error: CPtpServer::NewSessionL version not support!")); + OstTrace0( TRACE_ERROR, CPTPSERVER_NEWSESSIONL, "!!!!Error: version not support!" ); User::Leave(KErrNotSupported); } if (iNumSession>0) { - __FLOG(_L8("!!!!Error: CPtpServer::NewSessionL session is in use!")); + OstTrace0( TRACE_ERROR, DUP1_CPTPSERVER_NEWSESSIONL, "!!!!Error: session is in use!" ); User::Leave(KErrInUse); } CPtpSession* session = CPtpSession::NewL(const_cast(this)); - __FLOG(_L8("<<> CPtpServer::GetObjectHandleByNameL %S"), &aNameAndPath)); + OstTraceFunctionEntry0( CPTPSERVER_GETOBJECTHANDLEBYNAMEL_ENTRY ); + OstTraceExt1( TRACE_NORMAL, CPTPSERVER_GETOBJECTHANDLEBYNAMEL, "Name %S", aNameAndPath ); aHandle=Framework().ObjectMgr().HandleL(aNameAndPath); - __FLOG_VA((_L16("<< CPtpServer::GetObjectHandleByNameL %S == 0x%x"), &aNameAndPath, aHandle)); + OstTraceExt2( TRACE_NORMAL, DUP1_CPTPSERVER_GETOBJECTHANDLEBYNAMEL, + "Name %S == Handle 0x%x", aNameAndPath, aHandle ); + OstTraceFunctionExit0( CPTPSERVER_GETOBJECTHANDLEBYNAMEL_EXIT ); + } // -------------------------------------------------------------------------- @@ -138,20 +146,20 @@ void CPtpServer::GetObjectNameByHandleL(TDes& aNameAndPath, const TUint32 aHandle) { - __FLOG(_L8(">> CPtpServer::GetObjectNameByHandleL")); + OstTraceFunctionEntry0( CPTPSERVER_GETOBJECTNAMEBYHANDLEL_ENTRY ); TMTPTypeUint32 handle(aHandle); CMTPObjectMetaData* objectP=CMTPObjectMetaData::NewL(); CleanupStack::PushL(objectP); TBool err = Framework().ObjectMgr().ObjectL(handle, *objectP); if(EFalse == err) { - __FLOG(_L8("!!!!Error: CPtpServer::GetObjectNameByHandleL ObjectL failed!")); + OstTrace0( TRACE_ERROR, CPTPSERVER_GETOBJECTNAMEBYHANDLEL, "!!!!Error: ObjectL failed!" ); User::Leave(KErrBadHandle); } aNameAndPath=objectP->DesC(CMTPObjectMetaData::ESuid); CleanupStack::PopAndDestroy(objectP); - __FLOG(_L8("<< CPtpServer::GetObjectNameByHandleL")); + OstTraceFunctionExit0( CPTPSERVER_GETOBJECTNAMEBYHANDLEL_EXIT ); } @@ -162,16 +170,16 @@ // void CPtpServer::SendEventL(TMTPTypeEvent& ptpEvent) { - __FLOG(_L8(">> CPtpServer::SendEventL")); + OstTraceFunctionEntry0( CPTPSERVER_SENDEVENTL_ENTRY ); if(iPrinterP->Status()!=CMTPPictBridgePrinter::EConnected) { - __FLOG(_L8(" CPtpServer::SendEventL, no printer connection")); + OstTrace0( TRACE_ERROR, CPTPSERVER_SENDEVENTL, " no printer connection" ); User::Leave(KErrNotReady); } Framework().SendEventL(ptpEvent, *(iPrinterP->ConnectionP())); - - __FLOG(_L8("<< CPtpServer::SendEventL")); + + OstTraceFunctionExit0( CPTPSERVER_SENDEVENTL_EXIT ); } @@ -201,7 +209,7 @@ // void CPtpServer::AddTemporaryObjectL(const TDesC& aPathAndFileName, TUint32& aHandle) { - __FLOG_VA((_L8(">> CPtpServer::AddTemporaryObjectL"))); + OstTraceFunctionEntry0( CPTPSERVER_ADDTEMPORARYOBJECTL_ENTRY ); // always using the default storage for this @@ -221,12 +229,12 @@ Framework().Fs().Delete(objectP->DesC(CMTPObjectMetaData::ESuid)); // not checking the return value since there is not much we can do with it RemoveObjectL(objectP->DesC(CMTPObjectMetaData::ESuid)); delete objectP; - __FLOG_VA((_L8(" CPtpServer::AddTemporaryObjectL, leaving %d"), err)); + OstTrace1( TRACE_ERROR, CPTPSERVER_ADDTEMPORARYOBJECTL, " leaving %d", err); User::Leave(err); } - - __FLOG_VA((_L8("<< CPtpServer::AddTemporaryObjectL"))); + + OstTraceFunctionExit0( CPTPSERVER_ADDTEMPORARYOBJECTL_EXIT ); } // -------------------------------------------------------------------------- @@ -235,19 +243,22 @@ // void CPtpServer::RemoveTemporaryObjects() { - __FLOG_VA((_L8(">> CPtpServer::RemoveTemporaryObjects %d"), iTemporaryObjects.Count())); + OstTraceFunctionEntry0( CPTPSERVER_REMOVETEMPORARYOBJECTS_ENTRY ); + OstTrace1( TRACE_NORMAL, CPTPSERVER_REMOVETEMPORARYOBJECTS, "plan to remove %d temporary objects", iTemporaryObjects.Count()); for (TInt i=0; iDesC(CMTPObjectMetaData::ESuid))); - __FLOG_VA((_L16("removed object from db %S err=%d"), &(iTemporaryObjects[i]->DesC(CMTPObjectMetaData::ESuid)), err)); + OstTraceExt2( TRACE_NORMAL, DUP1_CPTPSERVER_REMOVETEMPORARYOBJECTS, + "removed object from db %S err=%d", iTemporaryObjects[i]->DesC(CMTPObjectMetaData::ESuid), err); err=Framework().Fs().Delete(iTemporaryObjects[i]->DesC(CMTPObjectMetaData::ESuid)); - __FLOG_VA((_L16("removed object from fs %S err=%d"), &(iTemporaryObjects[i]->DesC(CMTPObjectMetaData::ESuid)), err)); - + OstTraceExt2( TRACE_NORMAL, DUP2_CPTPSERVER_REMOVETEMPORARYOBJECTS, + "removed object from fs %S err=%d", iTemporaryObjects[i]->DesC(CMTPObjectMetaData::ESuid), err); } iTemporaryObjects.ResetAndDestroy(); - __FLOG_VA((_L8("<< CPtpServer::RemoveTemporaryObjects %d"), iTemporaryObjects.Count())); + OstTrace1( TRACE_NORMAL, DUP3CPTPSERVER_REMOVETEMPORARYOBJECTS, "%d temporary objects remain", iTemporaryObjects.Count()); + OstTraceFunctionExit0( CPTPSERVER_REMOVETEMPORARYOBJECTS_EXIT ); } // -------------------------------------------------------------------------- @@ -256,9 +267,10 @@ // void CPtpServer::RemoveObjectL(const TDesC& aSuid) { - __FLOG_VA((_L16(">> CPtpServer::RemoveObjectL %S"), &aSuid)); + OstTraceFunctionEntry0( CPTPSERVER_REMOVEOBJECTL_ENTRY ); + OstTraceExt1( TRACE_NORMAL, CPTPSERVER_REMOVEOBJECTL, "remove %S", aSuid ); Framework().ObjectMgr().RemoveObjectL(aSuid); - __FLOG_VA((_L8("<< CPtpServer::RemoveObjectL"))); + OstTraceFunctionExit0( CPTPSERVER_REMOVEOBJECTL_EXIT ); } // -------------------------------------------------------------------------- diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/src/cptpsession.cpp --- a/mtpdataproviders/mtppictbridgedp/src/cptpsession.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtppictbridgedp/src/cptpsession.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,13 @@ #include "cmtppictbridgeprinter.h" #include "cptptimer.h" #include "mtppictbridgedpconst.h" -#include "ptpdef.h" +#include "ptpdef.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpsessionTraces.h" +#endif + // -------------------------------------------------------------------------- // @@ -56,7 +62,6 @@ // void CPtpSession::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KPtpServerLog); iTimerP=CPtpTimer::NewL(*this); } // -------------------------------------------------------------------------- @@ -66,7 +71,7 @@ // CPtpSession::~CPtpSession() { - __FLOG(_L8(">>>CPtpSession::~")); + OstTraceFunctionEntry0( CPTPSESSION_CPTPSESSION_DES_ENTRY ); delete iTimerP; CancelOutstandingRequest(); TRAP_IGNORE(CleanupL()); // there is not much we can do at this phase if the removal fails, so just ignore @@ -74,8 +79,7 @@ { iServerP->DecrementSessionCount(); } - __FLOG(_L8("<<>>CPtpSession::ServiceL")); + OstTraceFunctionEntry0( CPTPSESSION_SERVICEL_ENTRY ); DispatchMessageL(aMessage); - __FLOG(_L8("<<>>CPtpSession::Cleanup")); + OstTraceFunctionEntry0( CPTPSESSION_CLEANUPL_ENTRY ); if(iReceivedFile.Size()) { - __FLOG_VA((_L16(" deleting file %S"), &iReceivedFile)); - User::LeaveIfError(iServerP->Framework().Fs().Delete(iReceivedFile)); - __FLOG(_L8(" removing from DB")); + OstTraceExt1( TRACE_NORMAL, CPTPSESSION_CLEANUPL, " deleting file %S", iReceivedFile ); + LEAVEIFERROR(iServerP->Framework().Fs().Delete(iReceivedFile), + OstTrace1( TRACE_ERROR, DUP2_CPTPSESSION_CLEANUPL, "Delete file failed! error code %d", munged_err)); + OstTrace0( TRACE_NORMAL, DUP1_CPTPSESSION_CLEANUPL, " removing from DB" ); iServerP->RemoveObjectL(iReceivedFile); iReceivedFile.Zero(); } - __FLOG(_L8("<<>>CPtpSession::DispatchMessageL %d"), aMessage.Function())); + OstTraceFunctionEntry0( CPTPSESSION_DISPATCHMESSAGEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CPTPSESSION_DISPATCHMESSAGEL, "aMessage.Function() %d", aMessage.Function()); + TInt ret = KErrNone; TBool complete = ETrue; CleanupL(); // calling this here assumes that the client never makes a new call @@ -159,7 +166,7 @@ break; default: - __FLOG(_L8("!!!Error: ---Wrong param from client!!!")); + OstTrace0( TRACE_FATAL, DUP2_CPTPSESSION_DISPATCHMESSAGEL, "!!!Error: ---Wrong param from client!!!" ); aMessage.Panic(KPTPClientPanicCategory, EBadRequest); break; } @@ -168,7 +175,8 @@ { aMessage.Complete(ret); } - __FLOG_VA((_L8("<<>>CPtpSession::CancelIsDpsPrinter")); + OstTraceFunctionEntry0( CPTPSESSION_CANCELISDPSPRINTER_ENTRY ); if (iDpsPrinterMsg.Handle()) { iDpsPrinterMsg.Complete(KErrCancel); @@ -186,7 +194,7 @@ iTimerP->Cancel(); iServerP->CancelNotifyOnMtpSessionOpen(this); } - __FLOG(_L8("<<>>CancelSendObject")); + OstTraceFunctionEntry0( CPTPSESSION_CANCELSENDOBJECT_ENTRY ); if (iSendObjectMsg.Handle()) { iServerP->Printer()->CancelSendDpsFile(); iSendObjectMsg.Complete(KErrCancel); iTimerP->Cancel(); } - __FLOG(_L8("<<>>CancelObjectReceivedNotify")); + OstTraceFunctionEntry0( CPTPSESSION_CANCELOBJECTRECEIVEDNOTIFY_ENTRY ); if (iObjectReceivedNotifyMsg.Handle()) { - __FLOG_VA((_L8("the handle is 0x%x"), iObjectReceivedNotifyMsg.Handle())); + OstTrace1( TRACE_NORMAL, CPTPSESSION_CANCELOBJECTRECEIVEDNOTIFY, + "the handle is 0x%x", iObjectReceivedNotifyMsg.Handle()); iServerP->Printer()->MsgHandlerP()->DeRegisterReceiveObjectNotify(); iObjectReceivedNotifyMsg.Complete(KErrCancel); } - __FLOG(_L8("<<>>IsDpsPrinter")); + OstTraceFunctionEntry0( CPTPSESSION_ISDPSPRINTER_ENTRY ); TInt ret=EPrinterNotAvailable; if (!iDpsPrinterMsg.Handle()) // not already pending { @@ -251,19 +260,19 @@ iServerP->NotifyOnMtpSessionOpen(this); } // we do not set ret since the value does not really matter, we will be waiting for the discovery to complete - __FLOG(_L8(" waiting")); + OstTrace0( TRACE_NORMAL, CPTPSESSION_ISDPSPRINTER, " waiting" ); break; case CMTPPictBridgePrinter::EConnected: ret=EPrinterAvailable; aComplete = ETrue; - __FLOG(_L8(" connected")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPSESSION_ISDPSPRINTER, " connected" ); break; case CMTPPictBridgePrinter::ENotPrinter: ret=EPrinterNotAvailable; aComplete = ETrue; - __FLOG(_L8(" not connected")); + OstTrace0( TRACE_NORMAL, DUP2_CPTPSESSION_ISDPSPRINTER, " not connected" ); break; default: @@ -271,12 +280,12 @@ } } else - { - __FLOG(_L8("!!!Error: client message error, duplicated IsDpsPrinter")); + { + OstTrace0( TRACE_FATAL, DUP3_CPTPSESSION_ISDPSPRINTER, "!!!Error: client message error, duplicated IsDpsPrinter" ); aMessage.Panic(KPTPClientPanicCategory, ERequestPending); aComplete = EFalse; } - __FLOG(_L8("<<>>CPtpSession::MTPSessionOpened")); + OstTraceFunctionEntry0( CPTPSESSION_MTPSESSIONOPENED_ENTRY ); if (!iTimerP->IsActive() && iDpsPrinterMsg.Handle()) { - __FLOG(_L8(" CPtpSession::MTPSessionOpened timer started")); + OstTrace0( TRACE_NORMAL, CPTPSESSION_MTPSESSIONOPENED, "timer started" ); iTimerP->After(KDiscoveryTime); } - __FLOG(_L8("<<>>CPtpSession::GetObjectHandleByNameL")); + OstTraceFunctionEntry0( CPTPSESSION_GETOBJECTHANDLEBYNAMEL_ENTRY ); TFileName file; - User::LeaveIfError(aMessage.Read(0, file)); - __FLOG_VA((_L16("--the file is %S"), &file)); + LEAVEIFERROR(aMessage.Read(0, file), + OstTrace1( TRACE_ERROR, DUP2_CPTPSESSION_GETOBJECTHANDLEBYNAMEL, + "Read file name from message failed! error code %d", munged_err )); + OstTraceExt1( TRACE_NORMAL, DUP1_CPTPSESSION_GETOBJECTHANDLEBYNAMEL, "--the file is %S", file ); TUint32 handle=0; TRAP_IGNORE(iServerP->GetObjectHandleByNameL(file, handle)); TPckgBuf handlePckg(handle); aMessage.WriteL(1, handlePckg); - __FLOG_VA((_L16("<<>>CPtpSession::GetNameByObjectHandle")); + OstTraceFunctionEntry0( CPTPSESSION_GETNAMEBYOBJECTHANDLEL_ENTRY ); TUint32 handle = 0; TPckgBuf pckgHandle(handle); - User::LeaveIfError(aMessage.Read(1, pckgHandle)); + LEAVEIFERROR(aMessage.Read(1, pckgHandle), + OstTrace1( TRACE_ERROR, CPTPSESSION_GETNAMEBYOBJECTHANDLEL, + "Read handle from message failed! error code %d", munged_err )); TFileName file; handle = pckgHandle(); - __FLOG_VA((_L8("---handle is %x"), handle)); + OstTrace1( TRACE_NORMAL, DUP1_CPTPSESSION_GETNAMEBYOBJECTHANDLEL, "---handle is %x", handle ); TRAP_IGNORE(iServerP->GetObjectNameByHandleL(file, handle)); - __FLOG_VA((_L16("the file is %S"), &file)); + OstTraceExt1( TRACE_NORMAL, DUP2_CPTPSESSION_GETNAMEBYOBJECTHANDLEL, "the file is %S", file ); aMessage.WriteL(0, file); - - __FLOG(_L8("<<>>CPtpSession::SendObject")); + OstTraceFunctionEntry0( CPTPSESSION_SENDOBJECT_ENTRY ); TInt err(KErrNone); if (iSendObjectMsg.Handle()) { - __FLOG(_L8("!!!!Error: client message error, duplicated SendObject")); + OstTrace0( TRACE_FATAL, DUP1_CPTPSESSION_SENDOBJECT, "!!!!Error: client message error, duplicated SendObject" ); aMessage.Panic(KPTPClientPanicCategory, ERequestPending); aComplete = EFalse; + OstTraceFunctionExit0( CPTPSESSION_SENDOBJECT_EXIT ); return KErrNone; } else @@ -358,15 +373,16 @@ // // Sending ObjectAdded Event is not mandatory ( See Appendix B page 78. DPS Usage of USB and PTP in CIPA DC-001-2003) - TBool timeout = aMessage.Int2(); - __FLOG_VA((_L8("---timeout is %d"), timeout)); + TBool timeout = aMessage.Int2(); + OstTrace1( TRACE_NORMAL, DUP2_CPTPSESSION_SENDOBJECT, "---timeout is %d", timeout ); TFileName file; err = aMessage.Read(0, file); if (err == KErrNone) { - __FLOG_VA((_L16("---the file is %S"), &file)); + OstTraceExt1( TRACE_NORMAL, DUP3_CPTPSESSION_SENDOBJECT, "---the file is %S", file ); TInt size = aMessage.Int3(); - __FLOG_VA((_L8("---the file size is %d"), size)); // size is deprecated and not used anymore + // size is deprecated and not used anymore + OstTrace1( TRACE_NORMAL, DUP4_CPTPSESSION_SENDOBJECT, "---the file size is %d", size ); TRAP(err, iServerP->Printer()->SendDpsFileL(file, timeout, size)); if (err == KErrNone) { @@ -378,7 +394,8 @@ { iTimerP->After(KSendTimeout); } - __FLOG_VA((_L8("<<>>CPtpSession::ObjectReceivedNotify")); + OstTraceFunctionEntry0( CPTPSESSION_OBJECTRECEIVEDNOTIFY_ENTRY ); if (iObjectReceivedNotifyMsg.Handle()) { - __FLOG(_L8("!!!!Error: client message error, duplicated ObjectReceivedNotify")); + OstTrace0( TRACE_FATAL, CPTPSESSION_OBJECTRECEIVEDNOTIFY, "!!!!Error: client message error, duplicated ObjectReceivedNotify" ); aMessage.Panic(KPTPClientPanicCategory, ERequestPending); aComplete = EFalse; + OstTraceFunctionExit0( CPTPSESSION_OBJECTRECEIVEDNOTIFY_EXIT ); return KErrNone; } else { - //TBool del = aMessage.Int2(); - //__FLOG_VA((_L8("---the del is %d"), del)); + //TBool del = aMessage.Int2(); TBuf ext; TInt err = aMessage.Read(0, ext); if (err == KErrNone) { - __FLOG_VA((_L16("the extension is %S"), &ext)); - + OstTraceExt1( TRACE_NORMAL, DUP1_CPTPSESSION_OBJECTRECEIVEDNOTIFY, "the extension is %S", ext); + iObjectReceivedNotifyMsg = aMessage; aComplete = EFalse; iServerP->Printer()->MsgHandlerP()->RegisterReceiveObjectNotify(ext); - } - __FLOG(_L8("<<>>CPtpSession::PtpFolder")); + OstTraceFunctionEntry0( CPTPSESSION_PTPFOLDER_ENTRY ); TInt err(KErrNotReady); TFileName folder = iServerP->PtpFolder(); err = aMessage.Write(0,folder); - __FLOG_VA((_L16("<<>>CPtpSession::SendObjectCompleted status(%d)"), aStatus)); + OstTraceFunctionEntry0( CPTPSESSION_SENDOBJECTCOMPLETED_ENTRY ); + OstTrace1( TRACE_NORMAL, CPTPSESSION_SENDOBJECTCOMPLETED, "status(%d)", aStatus ); if (iSendObjectMsg.Handle()) { iSendObjectMsg.Complete(aStatus); @@ -449,9 +468,9 @@ } else { - __FLOG(_L8("!!!Warning: CPtpSession::SendObjectCompleted: UNEXPECTED CALL")); + OstTrace0( TRACE_WARNING, DUP1_CPTPSESSION_SENDOBJECTCOMPLETED, "!!!Warning: UNEXPECTED CALL" ); } - __FLOG(_L8("<<>>CPtpSession::IsDpsPrinterCompleted")); + OstTraceFunctionEntry0( CPTPSESSION_ISDPSPRINTERCOMPLETED_ENTRY ); if (iDpsPrinterMsg.Handle()) { iDpsPrinterMsg.Complete(aState); @@ -470,9 +489,9 @@ } else { - __FLOG(_L8("!!!Warning: CPtpSession::IsDpsPrinterCompleted: UNEXPECTED CALL")); - } - __FLOG(_L8("<<>>CPtpSession::ReceivedObjectCompleted")); + OstTraceFunctionEntry0( CPTPSESSION_RECEIVEDOBJECTCOMPLETED_ENTRY ); if (iObjectReceivedNotifyMsg.Handle()) { TInt err = iObjectReceivedNotifyMsg.Write(1, aFile); iReceivedFile.Copy(aFile); - __FLOG_VA((_L8("***CPtpSession::ReceivedObjectCompleted err=%d"), err)); + OstTrace1( TRACE_NORMAL, CPTPSESSION_RECEIVEDOBJECTCOMPLETED, "*** err=%d", err ); iObjectReceivedNotifyMsg.Complete(err); } else { - __FLOG(_L8("!!!Warning: Strange Happened!!!")); + OstTrace0( TRACE_WARNING, DUP1_CPTPSESSION_RECEIVEDOBJECTCOMPLETED, "!!!Warning: Strange Happened!!!" ); } - __FLOG(_L8("<<>>CPtpSession::CancelOutstandingRequest")); + OstTraceFunctionEntry0( CPTPSESSION_CANCELOUTSTANDINGREQUEST_ENTRY ); if (iSendObjectMsg.Handle()) { iSendObjectMsg.Complete(KErrCancel); @@ -517,7 +536,7 @@ { iDpsPrinterMsg.Complete(KErrCancel); } - __FLOG(_L8("<<>>CPtpTimer::RunL")); + OstTraceFunctionEntry0( CPTPTIMER_RUNL_ENTRY ); if (iStatus.Int() == KErrNone) { - __FLOG(_L8("--- timer expired, because of:")); + OstTrace0( TRACE_NORMAL, CPTPTIMER_RUNL, "--- timer expired, because of:" ); if (iSession.ServerP()->Printer()->Status() == CMTPPictBridgePrinter::ENotConnected) // must be DPS discovery, since no other service is supported { - __FLOG(_L8("--- Dps printer not available")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPTIMER_RUNL, "--- Dps printer not available" ); iSession.ServerP()->Printer()->NoDpsDiscovery(); iSession.IsDpsPrinterCompleted(EPrinterNotAvailable); } else if (iSession.ServerP()->Printer()->SendObjectPending()) { - __FLOG(_L8("---SendObject timeout")); + OstTrace0( TRACE_NORMAL, DUP2_CPTPTIMER_RUNL, "---SendObject timeout" ); iSession.ServerP()->Printer()->DpsFileSent(KErrTimedOut); } else { - __FLOG(_L8("---something else, do not care")); + OstTrace0( TRACE_NORMAL, DUP3_CPTPTIMER_RUNL, "---something else, do not care" ); } } else if (iStatus.Int() == KErrCancel) { - __FLOG(_L8("--- RunL Cancelled.")); + OstTrace0( TRACE_NORMAL, DUP4_CPTPTIMER_RUNL, "--- RunL Cancelled." ); } else { - __FLOG_VA((_L8("!!!Error: Err %d returned."), iStatus.Int())); + OstTrace1( TRACE_WARNING, DUP5_CPTPTIMER_RUNL, "!!!Error: Err %d returned.", iStatus.Int() ); } - __FLOG(_L8("<<>>CPtpTimer::RunError %d"), aErr)); + OstTraceFunctionEntry0( CPTPTIMER_RUNERROR_ENTRY ); + OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CPTPTIMER_RUNERROR, + "error code %d", aErr); + OstTraceFunctionExit0( CPTPTIMER_RUNERROR_EXIT ); return KErrNone; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpdataproviders/mtppictbridgedp/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtppictbridgedp/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpdataproviders/mtppictbridgedp/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,341 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FATAL=0x81 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_IMPORTANT=0x85 +[GROUP]TRACE_NORMAL=0x86 +[GROUP]TRACE_WARNING=0x83 +[TRACE]TRACE_ERROR[0x82]_CMTPPICTBRIDGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL=0x6 +[TRACE]TRACE_ERROR[0x82]_CMTPPICTBRIDGEUSBCONNECTION_CONSTRUCTL=0x8 +[TRACE]TRACE_ERROR[0x82]_CPTPSERVER_ADDTEMPORARYOBJECTL=0xd +[TRACE]TRACE_ERROR[0x82]_CPTPSERVER_GETOBJECTNAMEBYHANDLEL=0xb +[TRACE]TRACE_ERROR[0x82]_CPTPSERVER_NEWSESSIONL=0x9 +[TRACE]TRACE_ERROR[0x82]_CPTPSERVER_SENDEVENTL=0xc +[TRACE]TRACE_ERROR[0x82]_CPTPSESSION_GETNAMEBYOBJECTHANDLEL=0x10 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKSENDINGSTATEL=0x5 +[TRACE]TRACE_ERROR[0x82]_DUP1_CPTPSERVER_NEWSESSIONL=0xa +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL=0x7 +[TRACE]TRACE_ERROR[0x82]_DUP2_CPTPSESSION_CLEANUPL=0xe +[TRACE]TRACE_ERROR[0x82]_DUP2_CPTPSESSION_GETOBJECTHANDLEBYNAMEL=0xf +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPPICTBRIDGEDPGETOBJECTINFO_BUILDOBJECTINFOL=0x1 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL=0x2 +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL=0x3 +[TRACE]TRACE_ERROR[0x82]_DUP5_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL=0x4 +[TRACE]TRACE_FATAL[0x81]_CPTPSESSION_OBJECTRECEIVEDNOTIFY=0x4 +[TRACE]TRACE_FATAL[0x81]_DUP1_CPTPSESSION_SENDOBJECT=0x3 +[TRACE]TRACE_FATAL[0x81]_DUP2_CPTPSESSION_DISPATCHMESSAGEL=0x1 +[TRACE]TRACE_FATAL[0x81]_DUP3_CPTPSESSION_ISDPSPRINTER=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_CANCEL_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_CANCEL_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_CMTPPICTBRIDGEDATAPROVIDER_DES_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_CMTPPICTBRIDGEDATAPROVIDER_DES_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_CONSTRUCTL_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_CONSTRUCTL_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY=0x17 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT=0x18 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_ENTRY=0x15 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_EXIT=0x16 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_NOTIFYSTORAGEENUMERATIONCOMPLETEL_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_NOTIFYSTORAGEENUMERATIONCOMPLETEL_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_PROCESSEVENTL_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_PROCESSEVENTL_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_PROCESSNOTIFICATIONL_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_PROCESSNOTIFICATIONL_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_PROCESSREQUESTPHASEL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_PROCESSREQUESTPHASEL_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_SESSIONCLOSEDL_ENTRY=0x1b +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_SESSIONCLOSEDL_EXIT=0x1c +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_STARTOBJECTENUMERATIONL_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_STARTOBJECTENUMERATIONL_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_STARTSTORAGEENUMERATIONL_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_STARTSTORAGEENUMERATIONL_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_SUPPORTED_ENTRY=0x11 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDATAPROVIDER_SUPPORTED_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECTINFO_BUILDOBJECTINFOL_ENTRY=0x2d +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECTINFO_BUILDOBJECTINFOL_EXIT=0x2e +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECTINFO_CMTPPICTBRIDGEDPGETOBJECTINFO_DES_ENTRY=0x27 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECTINFO_CMTPPICTBRIDGEDPGETOBJECTINFO_DES_EXIT=0x28 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECTINFO_CONSTRUCTL_ENTRY=0x2b +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECTINFO_CONSTRUCTL_EXIT=0x2c +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECTINFO_SERVICEL_ENTRY=0x29 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECTINFO_SERVICEL_EXIT=0x2a +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL_ENTRY=0x2f +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL_EXIT=0x30 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECT_BUILDFILEOBJECTL_ENTRY=0x23 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECT_BUILDFILEOBJECTL_EXIT=0x24 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECT_CMTPPICTBRIDGEDPGETOBJECT_DES_ENTRY=0x1d +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECT_CMTPPICTBRIDGEDPGETOBJECT_DES_EXIT=0x1e +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECT_CONSTRUCTL_ENTRY=0x1f +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECT_CONSTRUCTL_EXIT=0x20 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECT_DOHANDLERESPONSEPHASEL_ENTRY=0x25 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECT_DOHANDLERESPONSEPHASEL_EXIT=0x26 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECT_SERVICEL_ENTRY=0x21 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPGETOBJECT_SERVICEL_EXIT=0x22 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKPROPCODEL_ENTRY=0x55 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKPROPCODEL_EXIT=0x56 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKREQUESTL_ENTRY=0x33 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKREQUESTL_EXIT=0x34 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKSENDINGSTATEL_ENTRY=0x40 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKSENDINGSTATEL_EXIT=0x41 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CMTPPICTBRIDGEDPSENDOBJECTINFO_DES_ENTRY=0x31 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CMTPPICTBRIDGEDPSENDOBJECTINFO_DES_EXIT=0x32 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CONSTRUCTL_ENTRY=0x38 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CONSTRUCTL_EXIT=0x39 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CREATEFSOBJECTL_ENTRY=0x5b +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CREATEFSOBJECTL_EXIT=0x5c +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_ENTRY=0x3e +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_EXIT=0x3f +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_ENTRY=0x3c +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_EXIT=0x3d +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_ENTRY=0x4d +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_EXIT=0x4e +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_ENTRY=0x46 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_EXIT=0x47 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_ENTRY=0x48 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_EXIT=0x49 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_EXTRACTPROPERTYL_ENTRY=0x53 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_EXTRACTPROPERTYL_EXIT=0x54 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_ENTRY=0x42 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_EXIT=0x43 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_GETFULLPATHNAMEL_ENTRY=0x4f +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_GETFULLPATHNAMEL_EXIT=0x50 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_ENTRY=0x44 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_EXIT=0x45 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_ISFORMATVALID_ENTRY=0x4a +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_ISFORMATVALID_EXIT=0x4b +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_MATCHSTOREANDPARENTL_ENTRY=0x57 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_MATCHSTOREANDPARENTL_EXIT=0x58 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_MATCH_ENTRY=0x3a +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_MATCH_EXIT=0x3b +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_RESERVEOBJECTL_ENTRY=0x59 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_RESERVEOBJECTL_EXIT=0x5a +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_ROLLBACK_ENTRY=0x5d +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_ROLLBACK_EXIT=0x5e +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_SERVICEL_ENTRY=0x36 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_SERVICEL_EXIT=0x37 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_ENTRY=0x51 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEDPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_EXIT=0x52 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEENUMERATOR_CMTPPICTBRIDGEENUMERATOR_DES_ENTRY=0x61 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEENUMERATOR_CMTPPICTBRIDGEENUMERATOR_DES_EXIT=0x62 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEENUMERATOR_CONSTRUCTL_ENTRY=0x5f +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEENUMERATOR_CONSTRUCTL_EXIT=0x60 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL_ENTRY=0x63 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL_EXIT=0x64 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_CANCELSENDDPSFILE_ENTRY=0x6f +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_CANCELSENDDPSFILE_EXIT=0x70 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_CREATEREQUESTOBJECTTRANSFER_ENTRY=0x71 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_CREATEREQUESTOBJECTTRANSFER_EXIT=0x72 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_DEREGISTERDPSPRINTERNOTIFY_ENTRY=0x69 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_DEREGISTERDPSPRINTERNOTIFY_EXIT=0x6a +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_DPSDISCOVERY_ENTRY=0x67 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_DPSDISCOVERY_EXIT=0x68 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_DPSFILESENT_ENTRY=0x75 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_DPSFILESENT_EXIT=0x76 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_DPSOBJECTRECEIVED_ENTRY=0x65 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_DPSOBJECTRECEIVED_EXIT=0x66 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_OBJECTRECEIVED_ENTRY=0x73 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_OBJECTRECEIVED_EXIT=0x74 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_REGISTERDPSPRINTERNOTIFY_ENTRY=0x6b +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_REGISTERDPSPRINTERNOTIFY_EXIT=0x6c +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_SENDDPSFILEL_ENTRY=0x6d +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEPRINTER_SENDDPSFILEL_EXIT=0x6e +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEUSBCONNECTION_CMTPPICTBRIDGEUSBCONNECTION_DES_ENTRY=0x79 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEUSBCONNECTION_CMTPPICTBRIDGEUSBCONNECTION_DES_EXIT=0x7a +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEUSBCONNECTION_CONSTRUCTL_ENTRY=0x77 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEUSBCONNECTION_CONSTRUCTL_EXIT=0x78 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEUSBCONNECTION_DOCANCEL_ENTRY=0x7d +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEUSBCONNECTION_DOCANCEL_EXIT=0x7e +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEUSBCONNECTION_LISTEN_ENTRY=0x7b +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEUSBCONNECTION_LISTEN_EXIT=0x7c +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEUSBCONNECTION_RUNERROR_ENTRY=0x81 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEUSBCONNECTION_RUNERROR_EXIT=0x82 +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEUSBCONNECTION_RUNL_ENTRY=0x7f +[TRACE]TRACE_FLOW[0x8A]_CMTPPICTBRIDGEUSBCONNECTION_RUNL_EXIT=0x80 +[TRACE]TRACE_FLOW[0x8A]_CPTPRECEIVEDMSGHANDLER_CPTPRECEIVEDMSGHANDLER_DES_ENTRY=0x83 +[TRACE]TRACE_FLOW[0x8A]_CPTPRECEIVEDMSGHANDLER_CPTPRECEIVEDMSGHANDLER_DES_EXIT=0x84 +[TRACE]TRACE_FLOW[0x8A]_CPTPRECEIVEDMSGHANDLER_DEREGISTERRECEIVEOBJECTNOTIFY_ENTRY=0x8a +[TRACE]TRACE_FLOW[0x8A]_CPTPRECEIVEDMSGHANDLER_DEREGISTERRECEIVEOBJECTNOTIFY_EXIT=0x8b +[TRACE]TRACE_FLOW[0x8A]_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED_ENTRY=0x87 +[TRACE]TRACE_FLOW[0x8A]_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED_EXIT=0x88 +[TRACE]TRACE_FLOW[0x8A]_CPTPRECEIVEDMSGHANDLER_REGISTERRECEIVEOBJECTNOTIFY_ENTRY=0x85 +[TRACE]TRACE_FLOW[0x8A]_CPTPRECEIVEDMSGHANDLER_REGISTERRECEIVEOBJECTNOTIFY_EXIT=0x86 +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_ADDTEMPORARYOBJECTL_ENTRY=0x98 +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_ADDTEMPORARYOBJECTL_EXIT=0x99 +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_CONSTRUCTL_ENTRY=0x8c +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_CONSTRUCTL_EXIT=0x8d +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_CPTPSERVER_DES_ENTRY=0x8e +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_CPTPSERVER_DES_EXIT=0x8f +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_GETOBJECTHANDLEBYNAMEL_ENTRY=0x92 +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_GETOBJECTHANDLEBYNAMEL_EXIT=0x93 +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_GETOBJECTNAMEBYHANDLEL_ENTRY=0x94 +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_GETOBJECTNAMEBYHANDLEL_EXIT=0x95 +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_NEWSESSIONL_ENTRY=0x90 +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_NEWSESSIONL_EXIT=0x91 +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_REMOVEOBJECTL_ENTRY=0x9c +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_REMOVEOBJECTL_EXIT=0x9d +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_REMOVETEMPORARYOBJECTS_ENTRY=0x9a +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_REMOVETEMPORARYOBJECTS_EXIT=0x9b +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_SENDEVENTL_ENTRY=0x96 +[TRACE]TRACE_FLOW[0x8A]_CPTPSERVER_SENDEVENTL_EXIT=0x97 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_CANCELISDPSPRINTER_ENTRY=0xa6 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_CANCELISDPSPRINTER_EXIT=0xa7 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_CANCELOBJECTRECEIVEDNOTIFY_ENTRY=0xaa +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_CANCELOBJECTRECEIVEDNOTIFY_EXIT=0xab +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_CANCELOUTSTANDINGREQUEST_ENTRY=0xc2 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_CANCELOUTSTANDINGREQUEST_EXIT=0xc3 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_CANCELSENDOBJECT_ENTRY=0xa8 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_CANCELSENDOBJECT_EXIT=0xa9 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_CLEANUPL_ENTRY=0xa2 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_CLEANUPL_EXIT=0xa3 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_CPTPSESSION_DES_ENTRY=0x9e +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_CPTPSESSION_DES_EXIT=0x9f +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_DISPATCHMESSAGEL_ENTRY=0xa4 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_DISPATCHMESSAGEL_EXIT=0xa5 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_GETNAMEBYOBJECTHANDLEL_ENTRY=0xb2 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_GETNAMEBYOBJECTHANDLEL_EXIT=0xb3 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_GETOBJECTHANDLEBYNAMEL_ENTRY=0xb0 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_GETOBJECTHANDLEBYNAMEL_EXIT=0xb1 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_ISDPSPRINTERCOMPLETED_ENTRY=0xbe +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_ISDPSPRINTERCOMPLETED_EXIT=0xbf +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_ISDPSPRINTER_ENTRY=0xac +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_ISDPSPRINTER_EXIT=0xad +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_MTPSESSIONOPENED_ENTRY=0xae +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_MTPSESSIONOPENED_EXIT=0xaf +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_OBJECTRECEIVEDNOTIFY_ENTRY=0xb7 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_OBJECTRECEIVEDNOTIFY_EXIT=0xb8 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_PTPFOLDER_ENTRY=0xba +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_PTPFOLDER_EXIT=0xbb +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_RECEIVEDOBJECTCOMPLETED_ENTRY=0xc0 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_RECEIVEDOBJECTCOMPLETED_EXIT=0xc1 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_SENDOBJECTCOMPLETED_ENTRY=0xbc +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_SENDOBJECTCOMPLETED_EXIT=0xbd +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_SENDOBJECT_ENTRY=0xb4 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_SENDOBJECT_EXIT=0xb5 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_SERVICEL_ENTRY=0xa0 +[TRACE]TRACE_FLOW[0x8A]_CPTPSESSION_SERVICEL_EXIT=0xa1 +[TRACE]TRACE_FLOW[0x8A]_CPTPTIMER_CONSTRUCTL_ENTRY=0xc4 +[TRACE]TRACE_FLOW[0x8A]_CPTPTIMER_CONSTRUCTL_EXIT=0xc5 +[TRACE]TRACE_FLOW[0x8A]_CPTPTIMER_CPTPTIMER_DES_ENTRY=0xc6 +[TRACE]TRACE_FLOW[0x8A]_CPTPTIMER_CPTPTIMER_DES_EXIT=0xc7 +[TRACE]TRACE_FLOW[0x8A]_CPTPTIMER_RUNERROR_ENTRY=0xca +[TRACE]TRACE_FLOW[0x8A]_CPTPTIMER_RUNERROR_EXIT=0xcb +[TRACE]TRACE_FLOW[0x8A]_CPTPTIMER_RUNL_ENTRY=0xc8 +[TRACE]TRACE_FLOW[0x8A]_CPTPTIMER_RUNL_EXIT=0xc9 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPICTBRIDGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY=0x19 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPICTBRIDGEDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT=0x1a +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKREQUESTL_EXIT=0x35 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_ISFORMATVALID_EXIT=0x4c +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED_EXIT=0x89 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPSESSION_OBJECTRECEIVEDNOTIFY_EXIT=0xb9 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPSESSION_SENDOBJECT_EXIT=0xb6 +[TRACE]TRACE_IMPORTANT[0x85]_CMTPPICTBRIDGEUSBCONNECTION_RUNERROR=0x1 +[TRACE]TRACE_IMPORTANT[0x85]_CPTPTIMER_RUNERROR=0x2 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL=0x3 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDATAPROVIDER_PROCESSREQUESTPHASEL=0x1 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDATAPROVIDER_SESSIONCLOSEDL=0x4 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDATAPROVIDER_SESSIONOPENEDL=0x5 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDATAPROVIDER_SUPPORTED=0x2 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDPGETOBJECTINFO_BUILDOBJECTINFOL=0x6 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL=0x9 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKREQUESTL=0xd +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CHECKSENDINGSTATEL=0x11 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDPSENDOBJECTINFO_CMTPPICTBRIDGEDPSENDOBJECTINFO=0xc +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL=0xf +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL=0xe +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL=0x14 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDPSENDOBJECTINFO_GETFULLPATHNAMEL=0x17 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL=0x12 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDPSENDOBJECTINFO_ISFORMATVALID=0x13 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEDPSENDOBJECTINFO_ROLLBACK=0x19 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL=0x1a +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEPRINTER_CREATEREQUESTOBJECTTRANSFER=0x24 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEPRINTER_DPSDISCOVERY=0x20 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEPRINTER_DPSFILESENT=0x25 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEPRINTER_REGISTERDPSPRINTERNOTIFY=0x21 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEPRINTER_SENDDPSFILEL=0x22 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEUSBCONNECTION_CONNECTIONCLOSED=0x27 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEUSBCONNECTION_LISTEN=0x26 +[TRACE]TRACE_NORMAL[0x86]_CMTPPICTBRIDGEUSBCONNECTION_RUNL=0x28 +[TRACE]TRACE_NORMAL[0x86]_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED=0x2b +[TRACE]TRACE_NORMAL[0x86]_CPTPRECEIVEDMSGHANDLER_REGISTERRECEIVEOBJECTNOTIFY=0x29 +[TRACE]TRACE_NORMAL[0x86]_CPTPSERVER_GETOBJECTHANDLEBYNAMEL=0x31 +[TRACE]TRACE_NORMAL[0x86]_CPTPSERVER_REMOVEOBJECTL=0x37 +[TRACE]TRACE_NORMAL[0x86]_CPTPSERVER_REMOVETEMPORARYOBJECTS=0x33 +[TRACE]TRACE_NORMAL[0x86]_CPTPSESSION_CANCELOBJECTRECEIVEDNOTIFY=0x3c +[TRACE]TRACE_NORMAL[0x86]_CPTPSESSION_CLEANUPL=0x38 +[TRACE]TRACE_NORMAL[0x86]_CPTPSESSION_DISPATCHMESSAGEL=0x3a +[TRACE]TRACE_NORMAL[0x86]_CPTPSESSION_GETOBJECTHANDLEBYNAMEL=0x42 +[TRACE]TRACE_NORMAL[0x86]_CPTPSESSION_ISDPSPRINTER=0x3d +[TRACE]TRACE_NORMAL[0x86]_CPTPSESSION_MTPSESSIONOPENED=0x40 +[TRACE]TRACE_NORMAL[0x86]_CPTPSESSION_PTPFOLDER=0x4a +[TRACE]TRACE_NORMAL[0x86]_CPTPSESSION_RECEIVEDOBJECTCOMPLETED=0x4c +[TRACE]TRACE_NORMAL[0x86]_CPTPSESSION_SENDOBJECT=0x48 +[TRACE]TRACE_NORMAL[0x86]_CPTPSESSION_SENDOBJECTCOMPLETED=0x4b +[TRACE]TRACE_NORMAL[0x86]_CPTPTIMER_RUNL=0x4d +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPICTBRIDGEDPGETOBJECTINFO_BUILDOBJECTINFOL=0x7 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL=0xb +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL=0x10 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL=0x15 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPICTBRIDGEDPSENDOBJECTINFO_GETFULLPATHNAMEL=0x18 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL=0x1b +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPICTBRIDGEPRINTER_DPSDISCOVERY=0x1f +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED=0x30 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPRECEIVEDMSGHANDLER_REGISTERRECEIVEOBJECTNOTIFY=0x2a +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPSERVER_GETOBJECTHANDLEBYNAMEL=0x32 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPSERVER_REMOVETEMPORARYOBJECTS=0x34 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPSESSION_CLEANUPL=0x39 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPSESSION_DISPATCHMESSAGEL=0x3b +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPSESSION_GETNAMEBYOBJECTHANDLEL=0x43 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPSESSION_GETOBJECTHANDLEBYNAMEL=0x41 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPSESSION_ISDPSPRINTER=0x3e +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPSESSION_OBJECTRECEIVEDNOTIFY=0x49 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPTIMER_RUNL=0x4e +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPPICTBRIDGEDPGETOBJECTINFO_BUILDOBJECTINFOL=0x8 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPPICTBRIDGEDPGETOBJECTINFO_SETFILESIZEDATEL=0xa +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL=0x1c +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPPICTBRIDGEPRINTER_SENDDPSFILEL=0x23 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED=0x2c +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPSERVER_REMOVETEMPORARYOBJECTS=0x35 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPSESSION_GETNAMEBYOBJECTHANDLEL=0x44 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPSESSION_ISDPSPRINTER=0x3f +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPSESSION_SENDOBJECT=0x45 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPTIMER_RUNL=0x4f +[TRACE]TRACE_NORMAL[0x86]_DUP3CPTPSERVER_REMOVETEMPORARYOBJECTS=0x36 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL=0x16 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL=0x1d +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED=0x2d +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPSESSION_SENDOBJECT=0x46 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPTIMER_RUNL=0x50 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPPICTBRIDGEENUMERATOR_ENUMERATEOBJECTSL=0x1e +[TRACE]TRACE_NORMAL[0x86]_DUP4_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED=0x2e +[TRACE]TRACE_NORMAL[0x86]_DUP4_CPTPSESSION_SENDOBJECT=0x47 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CPTPTIMER_RUNL=0x51 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CPTPRECEIVEDMSGHANDLER_OBJECTRECEIVED=0x2f +[TRACE]TRACE_WARNING[0x83]_CMTPPICTBRIDGEDPGETOBJECT_SERVICEL=0x1 +[TRACE]TRACE_WARNING[0x83]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x2 +[TRACE]TRACE_WARNING[0x83]_CMTPPICTBRIDGEDPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL=0x3 +[TRACE]TRACE_WARNING[0x83]_CMTPPICTBRIDGEPRINTER_DPSOBJECTRECEIVED=0x5 +[TRACE]TRACE_WARNING[0x83]_CMTPPICTBRIDGEPRINTER_NODPSDISCOVERY=0x4 +[TRACE]TRACE_WARNING[0x83]_CPTPSESSION_ISDPSPRINTERCOMPLETED=0x9 +[TRACE]TRACE_WARNING[0x83]_DUP1_CMTPPICTBRIDGEPRINTER_SENDDPSFILEL=0x6 +[TRACE]TRACE_WARNING[0x83]_DUP1_CMTPPICTBRIDGEUSBCONNECTION_CONNECTIONCLOSED=0x7 +[TRACE]TRACE_WARNING[0x83]_DUP1_CPTPSESSION_RECEIVEDOBJECTCOMPLETED=0xa +[TRACE]TRACE_WARNING[0x83]_DUP1_CPTPSESSION_SENDOBJECTCOMPLETED=0x8 +[TRACE]TRACE_WARNING[0x83]_DUP5_CPTPTIMER_RUNL=0xb diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/group/mtpplaybackcontroldp.mmp --- a/mtpdataproviders/mtpplaybackcontroldp/group/mtpplaybackcontroldp.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/group/mtpplaybackcontroldp.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -35,7 +35,8 @@ USERINCLUDE ../../../mtpfws/mtpfw/inc USERINCLUDE ../mtpplaybackinterface/inc -USERINCLUDE ../mtpplaybackmpximplementation/inc +USERINCLUDE ../mtpplaybackmpximplementation/inc +USERINCLUDE ../traces SOURCEPATH ../src SOURCE cmtppbcgetdevicepropdesc.cpp @@ -91,3 +92,4 @@ LIBRARY mpxcollectionutility.lib LIBRARY platformenv.lib +SMPSAFE diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcgetdevicepropdesc.h --- a/mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcgetdevicepropdesc.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcgetdevicepropdesc.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define CMTPPBCGETPBDEVICEPROPDESC_H #include "cmtprequestprocessor.h" -#include "mtpdebug.h" #include "cmtpplaybackmap.h" class CMTPTypeDevicePropDesc; @@ -59,7 +58,6 @@ private: // Owned. - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPPlaybackControlDataProvider& iPlaybackControlDp; CMTPTypeDevicePropDesc* iPropDesc; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcgetdevicepropvalue.h --- a/mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcgetdevicepropvalue.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcgetdevicepropvalue.h Fri Sep 17 08:34:51 2010 +0300 @@ -53,7 +53,7 @@ CMTPPlaybackControlDataProvider& aDataProvider); private: // Owned - __FLOG_DECLARATION_MEMBER_MUTABLE; + CMTPPlaybackControlDataProvider& iPlaybackControlDp; CMTPPlaybackCommand* iPbCmd; TMTPTypeInt32 iInt32; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcresetdevicepropvalue.h --- a/mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcresetdevicepropvalue.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcresetdevicepropvalue.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define CMTPPCBRESETPBDEVICEPROPVALUE_H #include "cmtppbcgetdevicepropdesc.h" -#include "mtpdebug.h" #include "cmtpplaybackmap.h" class CMTPTypeString; @@ -59,11 +58,7 @@ void SaveGUID( const TUint aKey, TMTPTypeGuid& aValue ); private: // Owned - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; + CMTPPlaybackControlDataProvider& iPlaybackControlDp; TMTPPbCtrlData iData; CMTPPlaybackCommand* iPbCmd; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcsetdevicepropvalue.h --- a/mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcsetdevicepropvalue.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcsetdevicepropvalue.h Fri Sep 17 08:34:51 2010 +0300 @@ -58,10 +58,6 @@ private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPPlaybackControlDataProvider& iPlaybackControlDp; TMTPPbCtrlData iData; CMTPPlaybackCommand* iPbCmd; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcskip.h --- a/mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcskip.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/inc/cmtppbcskip.h Fri Sep 17 08:34:51 2010 +0300 @@ -54,7 +54,6 @@ CMTPPlaybackControlDataProvider& aDataProvider); private: // Owned - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPPlaybackControlDataProvider& iPlaybackControlDp; CMTPPlaybackCommand* iPbCmd; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/inc/cmtpplaybackcontroldp.h --- a/mtpdataproviders/mtpplaybackcontroldp/inc/cmtpplaybackcontroldp.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/inc/cmtpplaybackcontroldp.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,6 @@ #include #include "mtpplaybackcontroldpconst.h" -#include "mtpdebug.h" #include "mmtpplaybackinterface.h" class MMTPRequestProcessor; @@ -77,11 +76,6 @@ private: // Owned /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - - /** The event dataset. */ TMTPTypeEvent iEvent; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/inc/cmtpplaybackmap.h --- a/mtpdataproviders/mtpplaybackcontroldp/inc/cmtpplaybackmap.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/inc/cmtpplaybackmap.h Fri Sep 17 08:34:51 2010 +0300 @@ -27,6 +27,7 @@ #include "mmtpplaybackinterface.h" #include "mtpdebug.h" + class CMTPPlaybackCommand; class CMTPPlaybackProperty; class MMTPDataProviderFramework; @@ -88,8 +89,7 @@ void GetObjecInfoFromHandleL(TUint32 aHandle, TDes& aSuid, TUint& aFormat) const; private: // Owned. - - __FLOG_DECLARATION_MEMBER_MUTABLE; + MMTPDataProviderFramework& iFramework; CMTPPlaybackProperty& iProperty; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/inc/cmtpplaybackproperty.h --- a/mtpdataproviders/mtpplaybackcontroldp/inc/cmtpplaybackproperty.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/inc/cmtpplaybackproperty.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define CMTPPLAYBACKPROPERTY_H #include "mtpplaybackcontroldpconst.h" -#include "mtpdebug.h" #include "cmtpplaybackcommand.h" class CMTPPlaybackControlDataProvider; @@ -85,7 +84,6 @@ private: // Owned. - __FLOG_DECLARATION_MEMBER_MUTABLE; TMTPPbDataVolume* iPlaybackVolumeData; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/inc/cmtpplaybackcommand.h --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/inc/cmtpplaybackcommand.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/inc/cmtpplaybackcommand.h Fri Sep 17 08:34:51 2010 +0300 @@ -21,7 +21,6 @@ #ifndef CMTPPLAYBACKCOMMAND_H #define CMTPPLAYBACKCOMMAND_H -#include "mtpdebug.h" #include "mmtpplaybackinterface.h" #include "cmtpplaybackparam.h" @@ -105,7 +104,7 @@ void ConstructL(); private: // Owned. - __FLOG_DECLARATION_MEMBER; + const TMTPPlaybackCommand iPbCmd; CMTPPbCmdParam* iParam; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/inc/cmtpplaybackevent.h --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/inc/cmtpplaybackevent.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/inc/cmtpplaybackevent.h Fri Sep 17 08:34:51 2010 +0300 @@ -21,7 +21,6 @@ #ifndef CMTPPLAYBACKEVENT_H #define CMTPPLAYBACKEVENT_H -#include "mtpdebug.h" #include "mmtpplaybackinterface.h" #include "cmtpplaybackparam.h" @@ -68,7 +67,7 @@ void ConstructL(); private: // Owned. - __FLOG_DECLARATION_MEMBER; + const TMTPPlaybackEvent iPbEvent; CMTPPbEventParam* iParam; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/inc/mmtpplaybackinterface.h --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/inc/mmtpplaybackinterface.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/inc/mmtpplaybackinterface.h Fri Sep 17 08:34:51 2010 +0300 @@ -21,6 +21,8 @@ #ifndef MMTPPLAYBACKINTERFACE_H #define MMTPPLAYBACKINTERFACE_H +#include "mtpdebug.h" + const TInt KPlaybackErrNone = 0; const TInt KPlaybackErrDeviceBusy = (-8000); const TInt KPlaybackErrDeviceUnavailable = (-8001); diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/src/cmtpplaybackcommand.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/src/cmtpplaybackcommand.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/src/cmtpplaybackcommand.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,9 +20,11 @@ #include "cmtpplaybackcommand.h" #include "mtpplaybackcontrolpanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpplaybackcommandTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"CMtpPbCmd");) /********************************************* class TMTPPbDataVolume @@ -30,11 +32,13 @@ TMTPPbDataVolume::TMTPPbDataVolume(TUint32 aMax, TUint32 aMin, TUint32 aDefault, TUint32 aCurrent, TUint32 aStep): iMaxVolume(aMax),iMinVolume(aMin), iDefaultVolume(aDefault), iCurrentVolume(aCurrent), iStep(aStep) { + OstTraceFunctionEntry0( TMTPPBDATAVOLUME_TMTPPBDATAVOLUME_ENTRY ); __ASSERT_DEBUG((aMin < aMax), Panic(EMTPPBArgumentErr)); __ASSERT_DEBUG((aMin <= aDefault && aDefault <= aMax), Panic(EMTPPBArgumentErr)); __ASSERT_DEBUG((aMin <= aCurrent && aCurrent <= aMax), Panic(EMTPPBArgumentErr)); __ASSERT_DEBUG((aStep <= (aMax-aMin)), Panic(EMTPPBArgumentErr)); __ASSERT_DEBUG((aStep != 0), Panic(EMTPPBArgumentErr)); + OstTraceFunctionExit0( TMTPPBDATAVOLUME_TMTPPBDATAVOLUME_EXIT ); } TMTPPbDataVolume::TMTPPbDataVolume(const TMTPPbDataVolume& aVol): @@ -44,11 +48,14 @@ iCurrentVolume(aVol.CurrentVolume()), iStep(aVol.Step()) { + OstTraceFunctionEntry0( DUP1_TMTPPBDATAVOLUME_TMTPPBDATAVOLUME_ENTRY ); + OstTraceFunctionExit0( DUP1_TMTPPBDATAVOLUME_TMTPPBDATAVOLUME_EXIT ); } void TMTPPbDataVolume::SetVolume(TUint32 aMax, TUint32 aMin, TUint32 aDefault, TUint32 aCurrent, TUint32 aStep) { + OstTraceFunctionEntry0( TMTPPBDATAVOLUME_SETVOLUME_ENTRY ); __ASSERT_DEBUG((aMin < aMax), Panic(EMTPPBArgumentErr)); __ASSERT_DEBUG((aMin <= aDefault && aDefault <= aMax), Panic(EMTPPBArgumentErr)); __ASSERT_DEBUG((aMin <= aCurrent && aCurrent <= aMax), Panic(EMTPPBArgumentErr)); @@ -59,39 +66,52 @@ iDefaultVolume = aDefault; iCurrentVolume = aCurrent, iStep = aStep; + OstTraceFunctionExit0( TMTPPBDATAVOLUME_SETVOLUME_EXIT ); } void TMTPPbDataVolume::operator =(const TMTPPbDataVolume& aVol) { + OstTraceFunctionEntry0( _ENTRY ); iMaxVolume = aVol.MaxVolume(); iMinVolume = aVol.MinVolume(); iDefaultVolume = aVol.DefaultVolume(); iCurrentVolume = aVol.CurrentVolume(); iStep = aVol.Step(); + OstTraceFunctionExit0( _EXIT ); } TUint32 TMTPPbDataVolume::MaxVolume() const { + OstTraceFunctionEntry0( TMTPPBDATAVOLUME_MAXVOLUME_ENTRY ); + OstTraceFunctionExit0( TMTPPBDATAVOLUME_MAXVOLUME_EXIT ); return iMaxVolume; } TUint32 TMTPPbDataVolume::MinVolume() const { + OstTraceFunctionEntry0( TMTPPBDATAVOLUME_MINVOLUME_ENTRY ); + OstTraceFunctionExit0( TMTPPBDATAVOLUME_MINVOLUME_EXIT ); return iMinVolume; } TUint32 TMTPPbDataVolume::DefaultVolume() const { + OstTraceFunctionEntry0( TMTPPBDATAVOLUME_DEFAULTVOLUME_ENTRY ); + OstTraceFunctionExit0( TMTPPBDATAVOLUME_DEFAULTVOLUME_EXIT ); return iDefaultVolume; } TUint32 TMTPPbDataVolume::CurrentVolume() const { + OstTraceFunctionEntry0( TMTPPBDATAVOLUME_CURRENTVOLUME_ENTRY ); + OstTraceFunctionExit0( TMTPPBDATAVOLUME_CURRENTVOLUME_EXIT ); return iCurrentVolume; } TUint32 TMTPPbDataVolume::Step() const { + OstTraceFunctionEntry0( TMTPPBDATAVOLUME_STEP_ENTRY ); + OstTraceFunctionExit0( TMTPPBDATAVOLUME_STEP_EXIT ); return iStep; } @@ -101,111 +121,142 @@ CMTPPbCmdParam* CMTPPbCmdParam::NewL(TMTPPbCategory aCategory, const TDesC& aSuid) { + OstTraceFunctionEntry0( CMTPPBCMDPARAM_NEWL_ENTRY ); CMTPPbCmdParam* self = new (ELeave) CMTPPbCmdParam(aCategory, aSuid); CleanupStack::PushL(self); self->ConstructL(aCategory, aSuid); CleanupStack::Pop(self); + OstTraceFunctionExit0( CMTPPBCMDPARAM_NEWL_EXIT ); return self; } CMTPPbCmdParam* CMTPPbCmdParam::NewL(TInt32 aValue) { + OstTraceFunctionEntry0( DUP1_CMTPPBCMDPARAM_NEWL_ENTRY ); CMTPPbCmdParam* self = new (ELeave) CMTPPbCmdParam(aValue); CleanupStack::PushL(self); self->ConstructL(aValue); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP1_CMTPPBCMDPARAM_NEWL_EXIT ); return self; } CMTPPbCmdParam* CMTPPbCmdParam::NewL(TUint32 aValue) { + OstTraceFunctionEntry0( DUP2_CMTPPBCMDPARAM_NEWL_ENTRY ); CMTPPbCmdParam* self = new (ELeave) CMTPPbCmdParam(aValue); CleanupStack::PushL(self); self->ConstructL(aValue); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP2_CMTPPBCMDPARAM_NEWL_EXIT ); return self; } CMTPPbCmdParam* CMTPPbCmdParam::NewL(const TMTPPbDataVolume& aVolume) { + OstTraceFunctionEntry0( DUP3_CMTPPBCMDPARAM_NEWL_ENTRY ); CMTPPbCmdParam* self = new (ELeave) CMTPPbCmdParam(aVolume); CleanupStack::PushL(self); self->ConstructL(aVolume); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP3_CMTPPBCMDPARAM_NEWL_EXIT ); return self; } CMTPPbCmdParam* CMTPPbCmdParam::NewL(const CMTPPbCmdParam& aParam) { + OstTraceFunctionEntry0( DUP4_CMTPPBCMDPARAM_NEWL_ENTRY ); CMTPPbCmdParam* self = new (ELeave) CMTPPbCmdParam(); CleanupStack::PushL(self); self->ConstructL(aParam); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP4_CMTPPBCMDPARAM_NEWL_EXIT ); return self; } CMTPPbCmdParam::~CMTPPbCmdParam() { + OstTraceFunctionEntry0( CMTPPBCMDPARAM_CMTPPBCMDPARAM_ENTRY ); + OstTraceFunctionExit0( CMTPPBCMDPARAM_CMTPPBCMDPARAM_EXIT ); } CMTPPbCmdParam::CMTPPbCmdParam(): CMTPPbParamBase() { +OstTraceFunctionEntry0( DUP1_CMTPPBCMDPARAM_CMTPPBCMDPARAM_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPBCMDPARAM_CMTPPBCMDPARAM_EXIT ); } CMTPPbCmdParam::CMTPPbCmdParam(TMTPPbCategory aCategory, const TDesC& aSuid): CMTPPbParamBase(aCategory, aSuid) { +OstTraceFunctionEntry0( DUP2_CMTPPBCMDPARAM_CMTPPBCMDPARAM_ENTRY ); + OstTraceFunctionExit0( DUP2_CMTPPBCMDPARAM_CMTPPBCMDPARAM_EXIT ); } CMTPPbCmdParam::CMTPPbCmdParam(TInt32 aValue): CMTPPbParamBase(aValue) { + OstTraceFunctionEntry0( DUP3_CMTPPBCMDPARAM_CMTPPBCMDPARAM_ENTRY ); + OstTraceFunctionExit0( DUP3_CMTPPBCMDPARAM_CMTPPBCMDPARAM_EXIT ); } CMTPPbCmdParam::CMTPPbCmdParam(TUint32 aValue): CMTPPbParamBase(aValue) { + OstTraceFunctionEntry0( DUP4_CMTPPBCMDPARAM_CMTPPBCMDPARAM_ENTRY ); + OstTraceFunctionExit0( DUP4_CMTPPBCMDPARAM_CMTPPBCMDPARAM_EXIT ); } CMTPPbCmdParam::CMTPPbCmdParam(const TMTPPbDataVolume& /*aVolume*/): CMTPPbParamBase() { + OstTraceFunctionEntry0( DUP5_CMTPPBCMDPARAM_CMTPPBCMDPARAM_ENTRY ); CMTPPbParamBase::SetType(EMTPPbVolumeSet); + OstTraceFunctionExit0( DUP5_CMTPPBCMDPARAM_CMTPPBCMDPARAM_EXIT ); } void CMTPPbCmdParam::ConstructL(TMTPPbCategory aCategory, const TDesC& aSuid) { + OstTraceFunctionEntry0( CMTPPBCMDPARAM_CONSTRUCTL_ENTRY ); CMTPPbParamBase::ConstructL(aCategory, aSuid); + OstTraceFunctionExit0( CMTPPBCMDPARAM_CONSTRUCTL_EXIT ); } void CMTPPbCmdParam::ConstructL(TInt32 aValue) { + OstTraceFunctionEntry0( DUP1_CMTPPBCMDPARAM_CONSTRUCTL_ENTRY ); CMTPPbParamBase::ConstructL(aValue); + OstTraceFunctionExit0( DUP1_CMTPPBCMDPARAM_CONSTRUCTL_EXIT ); } void CMTPPbCmdParam::ConstructL(TUint32 aValue) { + OstTraceFunctionEntry0( DUP2_CMTPPBCMDPARAM_CONSTRUCTL_ENTRY ); CMTPPbParamBase::ConstructL(aValue); + OstTraceFunctionExit0( DUP2_CMTPPBCMDPARAM_CONSTRUCTL_EXIT ); } void CMTPPbCmdParam::ConstructL(const TMTPPbDataVolume& aVolume) { + OstTraceFunctionEntry0( DUP3_CMTPPBCMDPARAM_CONSTRUCTL_ENTRY ); TMTPPbDataVolume* val = new (ELeave) TMTPPbDataVolume(aVolume); CMTPPbParamBase::SetData(static_cast(val)); + OstTraceFunctionExit0( DUP3_CMTPPBCMDPARAM_CONSTRUCTL_EXIT ); } void CMTPPbCmdParam::ConstructL(const CMTPPbCmdParam& aParam) { + OstTraceFunctionEntry0( DUP4_CMTPPBCMDPARAM_CONSTRUCTL_ENTRY ); TMTPPbDataType type(aParam.Type()); __ASSERT_DEBUG((type > EMTPPbTypeNone && type < EMTPPbTypeEnd), Panic(EMTPPBArgumentErr)); - __ASSERT_ALWAYS((type > EMTPPbTypeNone && type < EMTPPbTypeEnd), User::Leave(KErrArgument)); + __ASSERT_ALWAYS_OST((type > EMTPPbTypeNone && type < EMTPPbTypeEnd), OstTrace0( TRACE_ERROR, CMTPPBCMDPARAM_CONSTRUCTL, "Error argument" ), User::Leave(KErrArgument)); if(type == EMTPPbVolumeSet) { @@ -217,12 +268,15 @@ { CMTPPbParamBase::ConstructL(aParam); } + OstTraceFunctionExit0( DUP4_CMTPPBCMDPARAM_CONSTRUCTL_EXIT ); } const TMTPPbDataVolume& CMTPPbCmdParam::VolumeSetL() const { + OstTraceFunctionEntry0( CMTPPBCMDPARAM_VOLUMESETL_ENTRY ); __ASSERT_DEBUG((CMTPPbParamBase::Type() == EMTPPbVolumeSet), Panic(EMTPPBDataTypeErr)); - __ASSERT_ALWAYS((CMTPPbParamBase::Type() == EMTPPbVolumeSet), User::Leave(KErrArgument)); + __ASSERT_ALWAYS_OST((CMTPPbParamBase::Type() == EMTPPbVolumeSet), OstTrace0( TRACE_ERROR, CMTPPBCMDPARAM_VOLUMESETL, "Error argument" ), User::Leave(KErrArgument)); + OstTraceFunctionExit0( CMTPPBCMDPARAM_VOLUMESETL_EXIT ); return *static_cast(CMTPPbParamBase::GetData()); } @@ -231,22 +285,26 @@ **********************************************/ CMTPPlaybackCommand* CMTPPlaybackCommand::NewL(TMTPPlaybackCommand aCmd, CMTPPbCmdParam* aParam) { + OstTraceFunctionEntry0( CMTPPLAYBACKCOMMAND_NEWL_ENTRY ); __ASSERT_DEBUG((aCmd > EPlaybackCmdNone && aCmd < EPlaybackCmdEnd), Panic(EMTPPBArgumentErr)); - __ASSERT_ALWAYS((aCmd > EPlaybackCmdNone && aCmd < EPlaybackCmdEnd), User::Leave(KErrArgument)); + __ASSERT_ALWAYS_OST((aCmd > EPlaybackCmdNone && aCmd < EPlaybackCmdEnd), OstTrace0( TRACE_ERROR, CMTPPLAYBACKCOMMAND_NEWL, "Error argument" ), User::Leave(KErrArgument)); CMTPPlaybackCommand* self = new (ELeave) CMTPPlaybackCommand(aCmd, aParam); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CMTPPLAYBACKCOMMAND_NEWL_EXIT ); return self; } CMTPPlaybackCommand* CMTPPlaybackCommand::NewL(const CMTPPlaybackCommand& aCmd) { + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKCOMMAND_NEWL_ENTRY ); CMTPPlaybackCommand* self = new (ELeave) CMTPPlaybackCommand(aCmd.PlaybackCommand(), NULL); CleanupStack::PushL(self); self->ConstructL(aCmd); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKCOMMAND_NEWL_EXIT ); return self; } @@ -255,10 +313,9 @@ */ CMTPPlaybackCommand::~CMTPPlaybackCommand() { - __FLOG(_L8("~CMTPPlaybackCommand - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCOMMAND_CMTPPLAYBACKCOMMAND_ENTRY ); delete iParam; - __FLOG(_L8("~CMTPPlaybackCommand - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPLAYBACKCOMMAND_CMTPPLAYBACKCOMMAND_EXIT ); } /** @@ -268,6 +325,8 @@ CMTPPbCmdParam* aParam): iPbCmd(aCmd),iParam(aParam) { + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKCOMMAND_CMTPPLAYBACKCOMMAND_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKCOMMAND_CMTPPLAYBACKCOMMAND_EXIT ); } /** @@ -275,9 +334,8 @@ */ void CMTPPlaybackCommand::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPPlaybackCommand: ConstructL - Entry")); - __FLOG(_L8("CMTPPlaybackCommand: ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPPLAYBACKCOMMAND_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKCOMMAND_CONSTRUCTL_EXIT ); } /** @@ -285,35 +343,43 @@ */ void CMTPPlaybackCommand::ConstructL(const CMTPPlaybackCommand& aCmd) { - __FLOG(_L8("CMTPPlaybackCommand: ConstructL - Entry")); + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKCOMMAND_CONSTRUCTL_ENTRY ); if(aCmd.HasParam()) { iParam = CMTPPbCmdParam::NewL(aCmd.ParamL()); - } - __FLOG(_L8("CMTPPlaybackCommand: ConstructL - Exit")); + } + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKCOMMAND_CONSTRUCTL_EXIT ); } TMTPPlaybackCommand CMTPPlaybackCommand::PlaybackCommand() const { + OstTraceFunctionEntry0( CMTPPLAYBACKCOMMAND_PLAYBACKCOMMAND_ENTRY ); __ASSERT_DEBUG((iPbCmd > EPlaybackCmdNone && iPbCmd < EPlaybackCmdEnd), Panic(EMTPPBArgumentErr)); + OstTraceFunctionExit0( CMTPPLAYBACKCOMMAND_PLAYBACKCOMMAND_EXIT ); return iPbCmd; } TBool CMTPPlaybackCommand::HasParam() const { + OstTraceFunctionEntry0( CMTPPLAYBACKCOMMAND_HASPARAM_ENTRY ); TBool result(iParam != NULL); + OstTraceFunctionExit0( CMTPPLAYBACKCOMMAND_HASPARAM_EXIT ); return result; } const CMTPPbCmdParam& CMTPPlaybackCommand::ParamL() const { + OstTraceFunctionEntry0( CMTPPLAYBACKCOMMAND_PARAML_ENTRY ); __ASSERT_DEBUG((iParam != NULL), Panic(EMTPPBDataNullErr)); - __ASSERT_ALWAYS((iParam != NULL), User::Leave(KErrArgument)); - return *iParam; + __ASSERT_ALWAYS_OST((iParam != NULL), OstTrace0( TRACE_ERROR, CMTPPLAYBACKCOMMAND_PARAML, "Error argument" ), User::Leave(KErrArgument)); + OstTraceFunctionExit0( CMTPPLAYBACKCOMMAND_PARAML_EXIT ); + return *iParam; } void CMTPPlaybackCommand::SetParam(CMTPPbCmdParam* aParam) { + OstTraceFunctionEntry0( CMTPPLAYBACKCOMMAND_SETPARAM_ENTRY ); delete iParam; iParam = aParam; + OstTraceFunctionExit0( CMTPPLAYBACKCOMMAND_SETPARAM_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/src/cmtpplaybackevent.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/src/cmtpplaybackevent.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/src/cmtpplaybackevent.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,58 +20,70 @@ #include "cmtpplaybackevent.h" #include "mtpplaybackcontrolpanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpplaybackeventTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"CMtpPbEvent");) CMTPPbEventParam* CMTPPbEventParam::NewL(TMTPPbCategory aCategory, const TDesC& aSuid) { + OstTraceFunctionEntry0( CMTPPBEVENTPARAM_NEWL_ENTRY ); CMTPPbEventParam* self = new (ELeave) CMTPPbEventParam(aCategory, aSuid); CleanupStack::PushL(self); self->ConstructL(aCategory, aSuid); CleanupStack::Pop(self); + OstTraceFunctionExit0( CMTPPBEVENTPARAM_NEWL_EXIT ); return self; } CMTPPbEventParam* CMTPPbEventParam::NewL(TInt32 aValue) { + OstTraceFunctionEntry0( DUP1_CMTPPBEVENTPARAM_NEWL_ENTRY ); CMTPPbEventParam* self = new (ELeave) CMTPPbEventParam(aValue); CleanupStack::PushL(self); self->ConstructL(aValue); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP1_CMTPPBEVENTPARAM_NEWL_EXIT ); return self; } CMTPPbEventParam* CMTPPbEventParam::NewL(TUint32 aValue) { + OstTraceFunctionEntry0( DUP2_CMTPPBEVENTPARAM_NEWL_ENTRY ); CMTPPbEventParam* self = new (ELeave) CMTPPbEventParam(aValue); CleanupStack::PushL(self); self->ConstructL(aValue); CleanupStack::Pop(self); + OstTraceFunctionExit0( DUP2_CMTPPBEVENTPARAM_NEWL_EXIT ); return self; } CMTPPbEventParam::~CMTPPbEventParam() { - + OstTraceFunctionEntry0( CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_ENTRY ); + OstTraceFunctionExit0( CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_EXIT ); } CMTPPbEventParam::CMTPPbEventParam(TMTPPbCategory aCategory, const TDesC& aSuid): CMTPPbParamBase(aCategory, aSuid) { - + OstTraceFunctionEntry0( DUP1_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_EXIT ); } CMTPPbEventParam::CMTPPbEventParam(TInt32 aValue): CMTPPbParamBase(aValue) { - + OstTraceFunctionEntry0( DUP2_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_ENTRY ); + OstTraceFunctionExit0( DUP2_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_EXIT ); } CMTPPbEventParam::CMTPPbEventParam(TUint32 aValue): CMTPPbParamBase(aValue) { - + OstTraceFunctionEntry0( DUP3_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_ENTRY ); + OstTraceFunctionExit0( DUP3_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_EXIT ); } /** @@ -79,13 +91,15 @@ */ CMTPPlaybackEvent* CMTPPlaybackEvent::NewL(TMTPPlaybackEvent aEvent, CMTPPbEventParam* aParam) { + OstTraceFunctionEntry0( CMTPPLAYBACKEVENT_NEWL_ENTRY ); __ASSERT_DEBUG((aEvent > EPlaybackEventNone && aEvent < EPlaybackEventEnd), Panic(EMTPPBArgumentErr)); - __ASSERT_ALWAYS((aEvent > EPlaybackEventNone && aEvent < EPlaybackEventEnd), User::Leave(KErrArgument)); + __ASSERT_ALWAYS_OST((aEvent > EPlaybackEventNone && aEvent < EPlaybackEventEnd), OstTrace0( TRACE_ERROR, CMTPPLAYBACKEVENT_NEWL, "Error argument" ), User::Leave(KErrArgument)); CMTPPlaybackEvent* self = new (ELeave) CMTPPlaybackEvent(aEvent, aParam); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CMTPPLAYBACKEVENT_NEWL_EXIT ); return self; } @@ -94,10 +108,9 @@ */ CMTPPlaybackEvent::~CMTPPlaybackEvent() { - __FLOG(_L8("~CMTPPlaybackEvent - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKEVENT_CMTPPLAYBACKEVENT_ENTRY ); delete iParam; - __FLOG(_L8("~CMTPPlaybackEvent - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPLAYBACKEVENT_CMTPPLAYBACKEVENT_EXIT ); } /** @@ -107,6 +120,8 @@ CMTPPbEventParam* aParam): iPbEvent(aEvent),iParam(aParam) { + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKEVENT_CMTPPLAYBACKEVENT_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKEVENT_CMTPPLAYBACKEVENT_EXIT ); } /** @@ -114,27 +129,33 @@ */ void CMTPPlaybackEvent::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPPlaybackEvent: ConstructL - Entry")); - __FLOG(_L8("CMTPPlaybackEvent: ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPPLAYBACKEVENT_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKEVENT_CONSTRUCTL_EXIT ); } void CMTPPlaybackEvent::SetParam(CMTPPbEventParam* aParam) { + OstTraceFunctionEntry0( CMTPPLAYBACKEVENT_SETPARAM_ENTRY ); delete iParam; iParam = aParam; + OstTraceFunctionExit0( CMTPPLAYBACKEVENT_SETPARAM_EXIT ); } TMTPPlaybackEvent CMTPPlaybackEvent::PlaybackEvent() { + OstTraceFunctionEntry0( CMTPPLAYBACKEVENT_PLAYBACKEVENT_ENTRY ); __ASSERT_DEBUG((iPbEvent > EPlaybackEventNone && iPbEvent < EPlaybackEventEnd), Panic(EMTPPBArgumentErr)); + OstTraceFunctionExit0( CMTPPLAYBACKEVENT_PLAYBACKEVENT_EXIT ); return iPbEvent; } const CMTPPbEventParam& CMTPPlaybackEvent::ParamL() { + OstTraceFunctionEntry0( CMTPPLAYBACKEVENT_PARAML_ENTRY ); __ASSERT_DEBUG((iParam != NULL), Panic(EMTPPBDataNullErr)); - __ASSERT_ALWAYS((iParam != NULL), User::Leave(KErrArgument)); + __ASSERT_ALWAYS_OST((iParam != NULL), OstTrace0( TRACE_ERROR, CINTERNETCONNECTIONHANDLER_CONSTRUCTL, "Error argument" ), User::Leave(KErrArgument)); + + OstTraceFunctionExit0( CMTPPLAYBACKEVENT_PARAML_EXIT ); return *iParam; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/src/cmtpplaybackparam.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/src/cmtpplaybackparam.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackinterface/src/cmtpplaybackparam.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,6 +20,11 @@ #include "cmtpplaybackparam.h" #include "mtpplaybackcontrolpanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpplaybackparamTraces.h" +#endif + /********************************************* @@ -27,11 +32,15 @@ **********************************************/ TMTPPbCategory TMTPPbDataSuid::Category() const { + OstTraceFunctionEntry0( TMTPPBDATASUID_CATEGORY_ENTRY ); + OstTraceFunctionExit0( TMTPPBDATASUID_CATEGORY_EXIT ); return iPlayCategory; } const TDesC& TMTPPbDataSuid::Suid() const { + OstTraceFunctionEntry0( TMTPPBDATASUID_SUID_ENTRY ); + OstTraceFunctionExit0( TMTPPBDATASUID_SUID_EXIT ); return iSuid; } @@ -39,7 +48,9 @@ iPlayCategory(aCategory), iSuid(aSuid) { + OstTraceFunctionEntry0( TMTPPBDATASUID_TMTPPBDATASUID_ENTRY ); + OstTraceFunctionExit0( TMTPPBDATASUID_TMTPPBDATASUID_EXIT ); } /********************************************* @@ -48,58 +59,75 @@ CMTPPbParamBase::~CMTPPbParamBase() { + OstTraceFunctionEntry0( CMTPPBPARAMBASE_CMTPPBPARAMBASE_ENTRY ); delete iData; + OstTraceFunctionExit0( CMTPPBPARAMBASE_CMTPPBPARAMBASE_EXIT ); } CMTPPbParamBase::CMTPPbParamBase(): iParamType(EMTPPbTypeNone) { +OstTraceFunctionEntry0( DUP1_CMTPPBPARAMBASE_CMTPPBPARAMBASE_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPBPARAMBASE_CMTPPBPARAMBASE_EXIT ); } CMTPPbParamBase::CMTPPbParamBase(TMTPPbCategory /*aCategory*/, const TDesC& /*aSuid*/): iParamType(EMTPPbSuidSet) { +OstTraceFunctionEntry0( DUP2_CMTPPBPARAMBASE_CMTPPBPARAMBASE_ENTRY ); + OstTraceFunctionExit0( DUP2_CMTPPBPARAMBASE_CMTPPBPARAMBASE_EXIT ); } CMTPPbParamBase::CMTPPbParamBase(TInt32 /*aValue*/): iParamType(EMTPPbInt32) { + OstTraceFunctionEntry0( DUP3_CMTPPBPARAMBASE_CMTPPBPARAMBASE_ENTRY ); + OstTraceFunctionExit0( DUP3_CMTPPBPARAMBASE_CMTPPBPARAMBASE_EXIT ); } CMTPPbParamBase::CMTPPbParamBase(TUint32 /*aValue*/): iParamType(EMTPPbUint32) { + OstTraceFunctionEntry0( DUP4_CMTPPBPARAMBASE_CMTPPBPARAMBASE_ENTRY ); + OstTraceFunctionExit0( DUP4_CMTPPBPARAMBASE_CMTPPBPARAMBASE_EXIT ); } void CMTPPbParamBase::ConstructL(TMTPPbCategory aCategory, const TDesC& aSuid) { + OstTraceFunctionEntry0( CMTPPBPARAMBASE_CONSTRUCTL_ENTRY ); TMTPPbDataSuid* val = new (ELeave) TMTPPbDataSuid(aCategory, aSuid); iData = static_cast(val); + OstTraceFunctionExit0( CMTPPBPARAMBASE_CONSTRUCTL_EXIT ); } void CMTPPbParamBase::ConstructL(TInt32 aValue) { + OstTraceFunctionEntry0( DUP1_CMTPPBPARAMBASE_CONSTRUCTL_ENTRY ); TInt32* val = new (ELeave) TInt32(); *val = aValue; iData = static_cast(val); + OstTraceFunctionExit0( DUP1_CMTPPBPARAMBASE_CONSTRUCTL_EXIT ); } void CMTPPbParamBase::ConstructL(TUint32 aValue) { + OstTraceFunctionEntry0( DUP2_CMTPPBPARAMBASE_CONSTRUCTL_ENTRY ); TUint32* val = new (ELeave) TUint32(); *val = aValue; iData = static_cast(val); + OstTraceFunctionExit0( DUP2_CMTPPBPARAMBASE_CONSTRUCTL_EXIT ); } void CMTPPbParamBase::ConstructL(const CMTPPbParamBase& aParam) { + OstTraceFunctionEntry0( DUP3_CMTPPBPARAMBASE_CONSTRUCTL_ENTRY ); TMTPPbDataType type(aParam.Type()); __ASSERT_DEBUG((type > EMTPPbTypeNone && type < EMTPPbTypeEnd), Panic(EMTPPBArgumentErr)); - __ASSERT_ALWAYS((type > EMTPPbTypeNone && type < EMTPPbTypeEnd), User::Leave(KErrArgument)); + __ASSERT_ALWAYS_OST((type > EMTPPbTypeNone && type < EMTPPbTypeEnd), OstTrace0( TRACE_ERROR, CMTPPBPARAMBASE_CONSTRUCTL, "Error argument" ), User::Leave(KErrArgument)); switch(type) { @@ -119,59 +147,73 @@ } break; default: - User::Leave(KErrArgument); + LEAVEIFERROR(KErrArgument, + OstTrace0( TRACE_ERROR, DUP1_CMTPPBPARAMBASE_CONSTRUCTL, "Error argument" )); + break; } iParamType = type; + OstTraceFunctionExit0( DUP3_CMTPPBPARAMBASE_CONSTRUCTL_EXIT ); } TMTPPbDataType CMTPPbParamBase::Type() const { + OstTraceFunctionEntry0( CMTPPBPARAMBASE_TYPE_ENTRY ); __ASSERT_DEBUG((iParamType > EMTPPbTypeNone && iParamType < EMTPPbTypeEnd), Panic(EMTPPBDataTypeErr)); + OstTraceFunctionExit0( CMTPPBPARAMBASE_TYPE_EXIT ); return iParamType; } void CMTPPbParamBase::SetType(TMTPPbDataType aType) { + OstTraceFunctionEntry0( CMTPPBPARAMBASE_SETTYPE_ENTRY ); __ASSERT_DEBUG((iParamType == EMTPPbTypeNone), Panic(EMTPPBDataTypeErr)); __ASSERT_DEBUG((aType > EMTPPbTypeNone && aType < EMTPPbTypeEnd), Panic(EMTPPBDataTypeErr)); iParamType = aType; + OstTraceFunctionExit0( CMTPPBPARAMBASE_SETTYPE_EXIT ); } TAny* CMTPPbParamBase::GetData() const { + OstTraceFunctionEntry0( CMTPPBPARAMBASE_GETDATA_ENTRY ); __ASSERT_DEBUG((iData != NULL), Panic(EMTPPBDataNullErr)); + OstTraceFunctionExit0( CMTPPBPARAMBASE_GETDATA_EXIT ); return iData; } void CMTPPbParamBase::SetData(TAny* aData) { + OstTraceFunctionEntry0( CMTPPBPARAMBASE_SETDATA_ENTRY ); __ASSERT_DEBUG((aData != NULL), Panic(EMTPPBDataNullErr)); iData = aData; + OstTraceFunctionExit0( CMTPPBPARAMBASE_SETDATA_EXIT ); } const TMTPPbDataSuid& CMTPPbParamBase::SuidSetL() const { + OstTraceFunctionEntry0( CMTPPBPARAMBASE_SUIDSETL_ENTRY ); __ASSERT_DEBUG((iParamType == EMTPPbSuidSet), Panic(EMTPPBDataTypeErr)); - __ASSERT_ALWAYS((iParamType == EMTPPbSuidSet), User::Leave(KErrArgument)); + __ASSERT_ALWAYS_OST((iParamType == EMTPPbSuidSet), OstTrace0( TRACE_ERROR, CMTPPBPARAMBASE_SUIDSETL, "Error argument" ), User::Leave(KErrArgument)); return *static_cast(iData); } TInt32 CMTPPbParamBase::Int32L() const { + OstTraceFunctionEntry0( CMTPPBPARAMBASE_INT32L_ENTRY ); __ASSERT_DEBUG((iParamType == EMTPPbInt32), Panic(EMTPPBDataTypeErr)); - __ASSERT_ALWAYS((iParamType == EMTPPbInt32), User::Leave(KErrArgument)); + __ASSERT_ALWAYS_OST((iParamType == EMTPPbInt32), OstTrace0( TRACE_ERROR, CMTPPBPARAMBASE_INT32L, "Error argument" ), User::Leave(KErrArgument)); return *static_cast(iData); } TUint32 CMTPPbParamBase::Uint32L() const { + OstTraceFunctionEntry0( CMTPPBPARAMBASE_UINT32L_ENTRY ); __ASSERT_DEBUG((iParamType == EMTPPbUint32), Panic(EMTPPBDataTypeErr)); - __ASSERT_ALWAYS((iParamType == EMTPPbUint32), User::Leave(KErrArgument)); + __ASSERT_ALWAYS_OST((iParamType == EMTPPbUint32), OstTrace0( TRACE_ERROR, CMTPPBPARAMBASE_UINT32L, "Error argument" ), User::Leave(KErrArgument)); return *static_cast(iData); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/inc/cmtpplaybackcommandchecker.h --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/inc/cmtpplaybackcommandchecker.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/inc/cmtpplaybackcommandchecker.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define CMTPPLAYBACKCOMMANDCHECKER_H_ #include "cmtpplaybackcommand.h" -#include "mtpdebug.h" class CMTPPlaybackControlImpl; @@ -71,11 +70,6 @@ The handle of the owner */ CMTPPlaybackControlImpl& iMTPPlaybackControl; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER; }; #endif /* CMTPPLAYBACKCOMMANDCHECKER_H_ */ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/inc/cmtpplaybackcontrolimpl.h --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/inc/cmtpplaybackcontrolimpl.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/inc/cmtpplaybackcontrolimpl.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,6 @@ #include "mmtpplaybackinterface.h" #include "mtpplaybackcontrolconst.h" -#include "mtpdebug.h" class MMPXPlaybackUtility; class CMPXCollectionPath; @@ -304,11 +303,6 @@ TMTPPlaybackCommand iMTPPBCmd; TMPXPlaybackState iPreState; TMPXPlaybackState iState; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER; }; #endif // CMTPPLAYBACKCONTROLIMPL_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/inc/cmtpplaybackplaylisthelper.h --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/inc/cmtpplaybackplaylisthelper.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/inc/cmtpplaybackplaylisthelper.h Fri Sep 17 08:34:51 2010 +0300 @@ -24,7 +24,6 @@ #include #include -#include "mtpdebug.h" #include "cmtpplaybackparam.h" class MMPXCollectionUiHelper; @@ -218,11 +217,6 @@ TMTPPbCategory iPlayCategory; TInt iSongIndex; TInt iPathIndex; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER; }; #endif /* CMTPPLAYBACKPLAYLISTHELPER_H_ */ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/inc/cmtpplaybackresumehelper.h --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/inc/cmtpplaybackresumehelper.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/inc/cmtpplaybackresumehelper.h Fri Sep 17 08:34:51 2010 +0300 @@ -23,7 +23,6 @@ #include "mtpplaybackcontrolconst.h" #include "mmtpplaybackinterface.h" -#include "mtpdebug.h" class CMTPPlaybackControlImpl; @@ -115,11 +114,6 @@ CMTPPlaybackControlImpl& iMTPPlaybackControl; TBool iIfParepareArray; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER; }; #endif /* CMTPPLAYBACKRESUMEHELPER_H_ */ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/src/cmtpplaybackcommandchecker.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/src/cmtpplaybackcommandchecker.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/src/cmtpplaybackcommandchecker.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,9 +20,11 @@ #include "cmtpplaybackcommandchecker.h" #include "cmtpplaybackcontrolimpl.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpplaybackcommandcheckerTraces.h" +#endif -// Constants -__FLOG_STMT(_LIT8(KComponent,"PlaybackCommandChecker");) // ======== MEMBER FUNCTIONS ======== @@ -33,8 +35,10 @@ CMTPPlaybackCommandChecker* CMTPPlaybackCommandChecker::NewL( CMTPPlaybackControlImpl& aControlImpl ) { + OstTraceFunctionEntry0( CMTPPLAYBACKCOMMANDCHECKER_NEWL_ENTRY ); CMTPPlaybackCommandChecker* self = new ( ELeave ) CMTPPlaybackCommandChecker( aControlImpl ); + OstTraceFunctionExit0( CMTPPLAYBACKCOMMANDCHECKER_NEWL_EXIT ); return self; } @@ -44,9 +48,8 @@ // CMTPPlaybackCommandChecker::~CMTPPlaybackCommandChecker() { - __FLOG(_L8("+CMTPPlaybackCommandChecker::~CMTPPlaybackCommandChecker")); - __FLOG(_L8("-CMTPPlaybackCommandChecker::~CMTPPlaybackCommandChecker")); - __FLOG_CLOSE; + OstTraceFunctionEntry0( CMTPPLAYBACKCOMMANDCHECKER_CMTPPLAYBACKCOMMANDCHECKER_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKCOMMANDCHECKER_CMTPPLAYBACKCOMMANDCHECKER_EXIT ); } // --------------------------------------------------------------------------- @@ -55,7 +58,7 @@ // void CMTPPlaybackCommandChecker::CheckPlaybackCommandContextL( TMTPPlaybackCommand aMTPPBCommand ) { - __FLOG(_L8("+CMTPPlaybackCommandChecker::CheckPlaybackCommandContextL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL_ENTRY ); MTPPlaybackControlImpl().SetMTPPBCmd( aMTPPBCommand ); @@ -67,7 +70,7 @@ case EPlaybackCmdGetState: case EPlaybackCmdSetVolume: { - __FLOG(_L8("no context check for init object command")); + OstTrace0( TRACE_NORMAL, CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL, "no context check for init object command" ); } break; case EPlaybackCmdInitIndex: @@ -76,7 +79,8 @@ { if ( MTPPlaybackControlImpl().SongCount() < 0 ) { - User::Leave( KPlaybackErrContextInvalid ); + LEAVEIFERROR(KPlaybackErrContextInvalid, + OstTrace0( TRACE_ERROR, DUP2_CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL, "Context invalid" )); } } break; @@ -93,7 +97,8 @@ { case EPbStateNotInitialised: { - User::Leave( KPlaybackErrContextInvalid ); + LEAVEIFERROR(KPlaybackErrContextInvalid, + OstTrace0( TRACE_ERROR, DUP3_CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL, "Context invalid" )); } default: break; @@ -102,13 +107,15 @@ break; default: { - __FLOG(_L8("Not support command!")); - User::Leave( KPlaybackErrParamInvalid ); + OstTrace0( TRACE_NORMAL, DUP1_CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL, "Not support command!" ); + + LEAVEIFERROR(KPlaybackErrParamInvalid, + OstTrace0( TRACE_ERROR, DUP4_CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL, "Parameter invalid" )); } break; } - __FLOG(_L8("-CMTPPlaybackCommandChecker::CheckPlaybackCommandContextL")); + OstTraceFunctionExit0( CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL_EXIT ); } // --------------------------------------------------------------------------- @@ -118,7 +125,7 @@ void CMTPPlaybackCommandChecker::CheckAndUpdatePlaybackParamL( CMTPPlaybackCommand& aMTPPPBSourceCmd, CMTPPbCmdParam** aMTPPPBTargetParam ) { - __FLOG(_L8("+CMTPPlaybackCommandChecker::CheckAndUpdatePlaybackParamL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCOMMANDCHECKER_CHECKANDUPDATEPLAYBACKPARAML_ENTRY ); delete *aMTPPPBTargetParam; *aMTPPPBTargetParam = NULL; @@ -137,7 +144,8 @@ TUint32 songIndex = aMTPPPBSourceCmd.ParamL().Uint32L(); if ( songIndex > ( MTPPlaybackControlImpl().SongCount()-1 )) { - User::Leave( KPlaybackErrParamInvalid ); + LEAVEIFERROR(KPlaybackErrParamInvalid, + OstTrace0( TRACE_ERROR, DUP1_CMTPPLAYBACKCOMMANDCHECKER_CHECKANDUPDATEPLAYBACKPARAML, "Parameter invalid" )); } *aMTPPPBTargetParam = CMTPPbCmdParam::NewL( songIndex ); } @@ -165,7 +173,8 @@ TUint32 volume = aMTPPPBSourceCmd.ParamL().Uint32L(); if( volume > KPbPlaybackVolumeLevelMax ) { - User::Leave( KPlaybackErrParamInvalid ); + LEAVEIFERROR(KPlaybackErrParamInvalid, + OstTrace0( TRACE_ERROR, DUP2_CMTPPLAYBACKCOMMANDCHECKER_CHECKANDUPDATEPLAYBACKPARAML, "Parameter invalid" )); } *aMTPPPBTargetParam = CMTPPbCmdParam::NewL( volume ); } @@ -178,12 +187,12 @@ break; default: { - __FLOG(_L8("No param, just cache command")); + OstTrace0( TRACE_NORMAL, CMTPPLAYBACKCOMMANDCHECKER_CHECKANDUPDATEPLAYBACKPARAML, "No param, just cache command" ); } break; } - __FLOG(_L8("-CMTPPlaybackCommandChecker::CheckAndUpdatePlaybackParamL")); + OstTraceFunctionExit0( CMTPPLAYBACKCOMMANDCHECKER_CHECKANDUPDATEPLAYBACKPARAML_EXIT ); } // --------------------------------------------------------------------------- @@ -194,7 +203,8 @@ CMTPPlaybackControlImpl& aControlImpl ) : iMTPPlaybackControl( aControlImpl ) { - __FLOG_OPEN(KMTPSubsystem, KComponent); + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKCOMMANDCHECKER_CMTPPLAYBACKCOMMANDCHECKER_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKCOMMANDCHECKER_CMTPPLAYBACKCOMMANDCHECKER_EXIT ); } // --------------------------------------------------------------------------- @@ -203,6 +213,8 @@ // CMTPPlaybackControlImpl& CMTPPlaybackCommandChecker::MTPPlaybackControlImpl() { + OstTraceFunctionEntry0( CMTPPLAYBACKCOMMANDCHECKER_MTPPLAYBACKCONTROLIMPL_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKCOMMANDCHECKER_MTPPLAYBACKCONTROLIMPL_EXIT ); return iMTPPlaybackControl; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/src/cmtpplaybackcontrolimpl.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/src/cmtpplaybackcontrolimpl.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/src/cmtpplaybackcontrolimpl.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -34,9 +34,11 @@ #include "mtpplaybackcontrolpanic.h" #include "cmtpplaybackcommand.h" #include "cmtpplaybackevent.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpplaybackcontrolimplTraces.h" +#endif -// Constants -__FLOG_STMT(_LIT8(KComponent,"PlaybackControlImpl");) // ======== MEMBER FUNCTIONS ======== @@ -47,11 +49,13 @@ CMTPPlaybackControlImpl* CMTPPlaybackControlImpl::NewL( MMTPPlaybackObserver& aObserver ) { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_NEWL_ENTRY ); CMTPPlaybackControlImpl* self = new ( ELeave ) CMTPPlaybackControlImpl( aObserver ); CleanupStack::PushL( self ); self->ConstructL(); CleanupStack::Pop( self ); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_NEWL_EXIT ); return self; } @@ -61,7 +65,9 @@ // void CMTPPlaybackControlImpl::Close() { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_CLOSE_ENTRY ); delete this; + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_CLOSE_EXIT ); } // --------------------------------------------------------------------------- @@ -70,7 +76,7 @@ // CMTPPlaybackControlImpl::~CMTPPlaybackControlImpl() { - __FLOG(_L8("+CMTPPlaybackControlImpl::~CMTPPlaybackControlImpl")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_CMTPPLAYBACKCONTROLIMPL_ENTRY ); if ( iPlaybackUtility ) { @@ -95,8 +101,7 @@ iResumeCmdArray.Close(); delete iCmdParam; - __FLOG(_L8("-CMTPPlaybackControlImpl::~CMTPPlaybackControlImpl")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_CMTPPLAYBACKCONTROLIMPL_EXIT ); } // --------------------------------------------------------------------------- @@ -105,8 +110,8 @@ // void CMTPPlaybackControlImpl::CommandL( CMTPPlaybackCommand& aCmd, MMTPPlaybackCallback* aCallback ) { - __FLOG(_L8("+CMTPPlaybackControlImpl::CommandL")); - __FLOG_1(_L8("The command code is 0x%X"), aCmd.PlaybackCommand() ); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_COMMANDL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPLAYBACKCONTROLIMPL_COMMANDL, "The command code is 0x%X", aCmd.PlaybackCommand()); iCallback = aCallback; @@ -122,7 +127,7 @@ CompleteSelf( err ); } - __FLOG(_L8("-CMTPPlaybackControlImpl::CommandL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_COMMANDL_EXIT ); } // --------------------------------------------------------------------------- @@ -133,7 +138,8 @@ void CMTPPlaybackControlImpl::HandlePlaybackMessage( CMPXMessage* aMessage, TInt aError ) { - __FLOG_1(_L8("+CMTPPlaybackControlImpl::HandlePlaybackMessage( %d ) "), aError ); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_HANDLEPLAYBACKMESSAGE_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPLAYBACKCONTROLIMPL_HANDLEPLAYBACKMESSAGE, "CMTPPlaybackControlImpl::HandlePlaybackMessage( %d )", aError ); if (( KErrNone == aError ) && aMessage ) { @@ -145,7 +151,7 @@ DoHandleError( MapError( aError )); } - __FLOG(_L8("-CMTPPlaybackControlImpl::HandlePlaybackMessage")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_HANDLEPLAYBACKMESSAGE_EXIT ); } // --------------------------------------------------------------------------- @@ -156,7 +162,8 @@ void CMTPPlaybackControlImpl::HandlePropertyL( TMPXPlaybackProperty aProperty, TInt aValue, TInt aError ) { - __FLOG_VA((_L8("+CMTPPlaybackControlImpl::HandlePropertyL( aProperty = 0x%X, aValue = 0x%X, aError = %d ) "), aProperty, aValue, aError )); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_HANDLEPROPERTYL_ENTRY ); + OstTraceExt3( TRACE_NORMAL, CMTPPLAYBACKCONTROLIMPL_HANDLEPROPERTYL, "CMTPPlaybackControlImpl::HandlePropertyL( aProperty = 0x%X, aValue = 0x%X, aError = %d )", aProperty, aValue, aError ); if ( KErrNone == aError ) { @@ -168,7 +175,7 @@ DoHandleError( MapError( aError ) ); } - __FLOG(_L8("-CMTPPlaybackControlImpl::HandlePropertyL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_HANDLEPROPERTYL_EXIT ); } // --------------------------------------------------------------------------- @@ -184,8 +191,8 @@ TBool /* aComplete */, TInt /* aError */ ) { - __FLOG(_L8("+CMTPPlaybackControlImpl::HandleSubPlayerNamesL")); - __FLOG(_L8("-CMTPPlaybackControlImpl::HandleSubPlayerNamesL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_HANDLESUBPLAYERNAMESL_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_HANDLESUBPLAYERNAMESL_EXIT ); } // --------------------------------------------------------------------------- @@ -196,7 +203,7 @@ void CMTPPlaybackControlImpl::HandleMediaL( const CMPXMedia& aMedia, TInt aError ) { - __FLOG(_L8("+CMTPPlaybackControlImpl::HandleMediaL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_HANDLEMEDIAL_ENTRY ); if (( KErrNone == aError ) && ( aMedia.IsSupported( KMPXMediaGeneralUri ))) { @@ -208,7 +215,7 @@ DoHandleError( MapError( aError )); } - __FLOG(_L8("-CMTPPlaybackControlImpl::HandleMediaL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_HANDLEMEDIAL_EXIT ); } // --------------------------------------------------------------------------- @@ -218,8 +225,8 @@ // void CMTPPlaybackControlImpl::DoCancel() { - __FLOG(_L8("+CMTPPlaybackControlImpl::DoCancel")); - __FLOG(_L8("-CMTPPlaybackControlImpl::DoCancel")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_DOCANCEL_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_DOCANCEL_EXIT ); } // --------------------------------------------------------------------------- @@ -229,7 +236,7 @@ // void CMTPPlaybackControlImpl::RunL() { - __FLOG(_L8("+CMTPBTConnection::RunL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_RUNL_ENTRY ); if ( KPlaybackErrNone == iStatus.Int() ) { @@ -244,7 +251,7 @@ DoHandleError( iStatus.Int()); } - __FLOG(_L8("-CMTPBTConnection::RunL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_RUNL_EXIT ); } // --------------------------------------------------------------------------- @@ -256,7 +263,11 @@ : CActive( EPriorityStandard ), iObserver( &aObserver ) { + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKCONTROLIMPL_CMTPPLAYBACKCONTROLIMPL_ENTRY ); + CActiveScheduler::Add( this ); + + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKCONTROLIMPL_CMTPPLAYBACKCONTROLIMPL_EXIT ); } // --------------------------------------------------------------------------- @@ -265,8 +276,7 @@ // void CMTPPlaybackControlImpl::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("+CMTPPlaybackControlImpl::ConstructL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_CONSTRUCTL_ENTRY ); iPlaybackUtility = MMPXPlaybackUtility::NewL( KMTPPlaybackControlDpUid, this ); iNowActivePlaybackUtility = MMPXPlaybackUtility::NewL( KPbModeActivePlayer ); @@ -275,7 +285,7 @@ iPlaybackPlaylistHelper = CMTPPlaybackPlaylistHelper::NewL( *this ); iPlaybackResumeHelper = CMTPPlaybackResumeHelper::NewL( *this ); - __FLOG(_L8("-CMTPPlaybackControlImpl::ConstructL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_CONSTRUCTL_EXIT ); } // --------------------------------------------------------------------------- @@ -284,7 +294,7 @@ // void CMTPPlaybackControlImpl::GetPlaylistFromCollectionCompleteL( const CMPXCollectionPlaylist& aPlaylist ) { - __FLOG(_L8("+CMTPPlaybackControlImpl::GetPlaylistFromCollectionCompleteL ")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_GETPLAYLISTFROMCOLLECTIONCOMPLETEL_ENTRY ); CMPXCollectionPlaylist* tmp = CMPXCollectionPlaylist::NewL( aPlaylist ); @@ -295,7 +305,7 @@ iPlaybackUtility->InitL( *tmp, ETrue ); CleanupStack::PopAndDestroy( tmp ); - __FLOG(_L8("-CMTPPlaybackControlImpl::HandlePlaybackGetPlaylistCompleteL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_GETPLAYLISTFROMCOLLECTIONCOMPLETEL_EXIT ); } // ---------------------------------------------------- @@ -304,14 +314,14 @@ // void CMTPPlaybackControlImpl::DeActiveOtherPlayerL() { - __FLOG(_L8("+CMTPPlaybackControlImpl::DeActiveOtherPlayerL()")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_DEACTIVEOTHERPLAYERL_ENTRY ); if ( iNowActivePlaybackUtility->StateL() != iPlaybackUtility->StateL()) { SendMPXPlaybackCommandL( EPbCmdPause, EFalse ); } - __FLOG(_L8("-CMTPPlaybackControlImpl::DeActiveOtherPlayerL()")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_DEACTIVEOTHERPLAYERL_EXIT ); } // ---------------------------------------------------- @@ -320,12 +330,12 @@ // void CMTPPlaybackControlImpl::CheckPlaybackCmdAndCacheL( CMTPPlaybackCommand& aCmd ) { - __FLOG(_L8("+CMTPPlaybackControlImpl::CheckPlaybackCmdAndCacheL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_CHECKPLAYBACKCMDANDCACHEL_ENTRY ); iPlaybackCommandChecker->CheckPlaybackCommandContextL( aCmd.PlaybackCommand()); iPlaybackCommandChecker->CheckAndUpdatePlaybackParamL( aCmd, &iCmdParam ); - __FLOG(_L8("-CMTPPlaybackControlImpl::CheckPlaybackCmdAndCacheL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_CHECKPLAYBACKCMDANDCACHEL_EXIT ); } // ---------------------------------------------------- @@ -334,12 +344,12 @@ // void CMTPPlaybackControlImpl::UpdateCommandArray() { - __FLOG(_L8("+CMTPPlaybackControlImpl::UpdateCommandArrayL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_UPDATECOMMANDARRAY_ENTRY ); iPlaybackResumeHelper->UpdatePrepareCmdArray( iMTPPBCmd, iPrepareCmdArray ); iPlaybackResumeHelper->UpdateResumeCmdArray( iMTPPBCmd, iResumeCmdArray ); - __FLOG(_L8("-CMTPPlaybackControlImpl::UpdateCommandArrayL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_UPDATECOMMANDARRAY_EXIT ); } // ---------------------------------------------------- @@ -348,7 +358,7 @@ // void CMTPPlaybackControlImpl::RequestMediaL() { - __FLOG(_L8("+CMTPPlaybackControlImpl::RequestMediaL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_REQUESTMEDIAL_ENTRY ); if ( iPlayList ) { @@ -388,7 +398,7 @@ CompleteSelf( KPlaybackErrContextInvalid ); } - __FLOG(_L8("-CMTPPlaybackControlImpl::RequestMediaL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_REQUESTMEDIAL_EXIT ); } // ---------------------------------------------------- @@ -397,11 +407,12 @@ // void CMTPPlaybackControlImpl::DoCommandL() { - __FLOG(_L8("+CMTPPlaybackControlImpl::DoCommandL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_DOCOMMANDL_ENTRY ); if ( iPrepareCmdArray.Count() != 0 ) { InitiateMPXPlaybackCommandL( iPrepareCmdArray[0].iMPXCommand, ETrue ); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_DOCOMMANDL_EXIT ); return; } @@ -495,7 +506,7 @@ break; } - __FLOG(_L8("-CMTPPlaybackControlImpl::DoCommandL")); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKCONTROLIMPL_DOCOMMANDL_EXIT ); } // ---------------------------------------------------- @@ -504,7 +515,7 @@ // void CMTPPlaybackControlImpl::DoHandlePlaybackMessageL( const CMPXMessage& aMessage ) { - __FLOG(_L8("+CMTPPlaybackControlImpl::DoHandlePlaybackMessageL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_DOHANDLEPLAYBACKMESSAGEL_ENTRY ); TMPXMessageId id( aMessage.ValueTObjectL( KMPXMessageGeneralId ) ); @@ -541,12 +552,12 @@ } break; default: - __FLOG_VA((_L8("DoHandlePlaybackMessageL( TMPXPlaybackMessage event = 0x%X ) "), event )); + OstTrace1( TRACE_NORMAL, CMTPPLAYBACKCONTROLIMPL_DOHANDLEPLAYBACKMESSAGEL, "DoHandlePlaybackMessageL( TMPXPlaybackMessage event = 0x%X )", event ); break; } } - __FLOG(_L8("-CMTPPlaybackControlImpl::DoHandlePlaybackMessageL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_DOHANDLEPLAYBACKMESSAGEL_EXIT ); } @@ -556,7 +567,8 @@ // void CMTPPlaybackControlImpl::DoHandlePropertyL( TInt aProperty, TInt aValue ) { - __FLOG_VA((_L8("+CMTPPlaybackControlImpl::DoHandlePropertyL( aProperty = 0x%X, aValue = 0x%X ) "), aProperty, aValue )); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_DOHANDLEPROPERTYL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPPLAYBACKCONTROLIMPL_DOHANDLEPROPERTYL, "CMTPPlaybackControlImpl::DoHandlePropertyL( aProperty = 0x%X, aValue = 0x%X )", static_cast( aProperty ), aValue ); switch ( aProperty ) { @@ -640,7 +652,7 @@ break; } - __FLOG(_L8("-CMTPPlaybackControlImpl::DoHandlePropertyL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_DOHANDLEPROPERTYL_EXIT ); } // --------------------------------------------------------------------------- @@ -649,7 +661,8 @@ // void CMTPPlaybackControlImpl::DoHandleStateChangedL( TMPXPlaybackState aState ) { - __FLOG_VA((_L8("+CMTPPlaybackControlImpl::DoHandleStateChangedL( aState = 0x%X ) "), aState )); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_DOHANDLESTATECHANGEDL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPLAYBACKCONTROLIMPL_DOHANDLESTATECHANGEDL, "CMTPPlaybackControlImpl::DoHandleStateChangedL( aState = 0x%X )", aState ); if (( iPrepareCmdArray.Count() != 0 ) && ( iPrepareCmdArray[0].iMPXExpectState == aState )) { @@ -672,7 +685,7 @@ iState = aState; } - __FLOG(_L8("-CMTPPlaybackControlImpl::DoHandleStateChangedL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_DOHANDLESTATECHANGEDL_EXIT ); } // --------------------------------------------------------------------------- @@ -681,7 +694,7 @@ // void CMTPPlaybackControlImpl::DoHandleMediaL( const CMPXMedia& aMedia ) { - __FLOG(_L8("+CMTPPlaybackControlImpl::DoHandleMediaL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_DOHANDLEMEDIAL_ENTRY ); TFileName filePath(aMedia.ValueText(KMPXMediaGeneralUri) ); delete iCmdParam; @@ -689,7 +702,7 @@ iCmdParam = CMTPPbCmdParam::NewL( EMTPPbCatMusic, filePath ); SendPlaybackCommandCompleteL(); - __FLOG(_L8("-CMTPPlaybackControlImpl::DoHandleMediaL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_DOHANDLEMEDIAL_EXIT ); } // --------------------------------------------------------------------------- @@ -698,7 +711,7 @@ // void CMTPPlaybackControlImpl::DoHandleMediaChangedL() { - __FLOG(_L8("+CMTPPlaybackControlImpl::DoHandleMediaChangedL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_DOHANDLEMEDIACHANGEDL_ENTRY ); if (( EPbStateNotInitialised == iState ) || ( EPbStateInitialising == iState )) { @@ -743,7 +756,7 @@ } } - __FLOG(_L8("-CMTPPlaybackControlImpl::DoHandleMediaChangedL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_DOHANDLEMEDIACHANGEDL_EXIT ); } // --------------------------------------------------------------------------- @@ -752,7 +765,7 @@ // void CMTPPlaybackControlImpl::DoHandleInitializeCompleteL() { - __FLOG(_L8("+CMTPPlaybackControlImpl::DoHandleInitializeCompleteL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_DOHANDLEINITIALIZECOMPLETEL_ENTRY ); if ( EPlaybackCmdInitObject == MTPPBCmdHandling() || EPlaybackCmdInitIndex == MTPPBCmdHandling() @@ -769,7 +782,7 @@ } } - __FLOG(_L8("-CMTPPlaybackControlImpl::DoHandleInitializeCompleteL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_DOHANDLEINITIALIZECOMPLETEL_EXIT ); } // --------------------------------------------------------------------------- @@ -778,6 +791,8 @@ // void CMTPPlaybackControlImpl::DoHandleError( TInt aErr ) { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_DOHANDLEERROR_ENTRY ); + if ( aErr != KPlaybackErrNone ) { if ( iCallback ) @@ -790,6 +805,8 @@ TRAP_IGNORE( iObserver->HandlePlaybackEventL( NULL, aErr )); } } + + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_DOHANDLEERROR_EXIT ); } // --------------------------------------------------------------------------- @@ -798,21 +815,23 @@ // TBool CMTPPlaybackControlImpl::IfEqual( const CMPXCollectionPath& aPathBase, const CMPXCollectionPath& aPathNew, TUint aLevel ) { - __FLOG(_L8("+CMTPPlaybackControlImpl::IfEqual")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_IFEQUAL_ENTRY ); if (( aPathBase.Levels() < aLevel ) || ( aPathNew.Levels() < aLevel )) { + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_IFEQUAL_EXIT ); return EFalse; } for ( TInt i = 0; i < aLevel; i++ ) { if ( aPathBase.Index( i ) != aPathNew.Index( i ) ) { + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKCONTROLIMPL_IFEQUAL_EXIT ); return EFalse; } } - __FLOG(_L8("-CMTPPlaybackControlImpl::IfEqual")); + OstTraceFunctionExit0( DUP2_CMTPPLAYBACKCONTROLIMPL_IFEQUAL_EXIT ); return ETrue; } @@ -822,7 +841,8 @@ // TMTPPlaybackState CMTPPlaybackControlImpl::MapState( TMPXPlaybackState aState ) { - __FLOG_VA((_L8("+CMTPPlaybackControlImpl::MapState( aState = 0x%X ) "), aState )); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_MAPSTATE_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPLAYBACKCONTROLIMPL_MAPSTATE, "CMTPPlaybackControlImpl::MapState( aState = 0x%X )", aState ); TMTPPlaybackState state = EPlayStateError; @@ -856,7 +876,7 @@ break; } - __FLOG(_L8("-CMTPPlaybackControlImpl::MapState")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_MAPSTATE_EXIT ); return state; } @@ -866,6 +886,8 @@ // TInt CMTPPlaybackControlImpl::MapError( TInt aError ) { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_MAPERROR_ENTRY ); + TInt err( KPlaybackErrNone ); if ( KErrHardwareNotAvailable == aError ) @@ -880,6 +902,8 @@ { err = KPlaybackErrDeviceBusy; } + + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_MAPERROR_EXIT ); return err; } @@ -889,13 +913,15 @@ // void CMTPPlaybackControlImpl::CompleteSelf( TInt aCompletionCode ) { - __FLOG_1(_L8("+CMTPPlaybackControlImpl::CompleteSelf( %d )"), aCompletionCode ); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_COMPLETESELF_ENTRY ); + + OstTrace1( TRACE_NORMAL, CMTPPLAYBACKCONTROLIMPL_COMPLETESELF, "CMTPPlaybackControlImpl::CompleteSelf( %d )", aCompletionCode ); SetActive(); TRequestStatus* status = &iStatus; User::RequestComplete( status, aCompletionCode ); - __FLOG(_L8("-CMTPPlaybackControlImpl::CompleteSelf")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_COMPLETESELF_EXIT ); } // --------------------------------------------------------------------------- @@ -904,7 +930,7 @@ // void CMTPPlaybackControlImpl::InitiateMPXPlaybackCommandL( TMPXPlaybackCommand aCommand, TBool aIsMTPPlaybackUtility ) { - __FLOG(_L8("+CMTPPlaybackControlImpl::InitiateMPXPlaybackCommandL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_INITIATEMPXPLAYBACKCOMMANDL_ENTRY ); switch ( aCommand ) { @@ -927,7 +953,7 @@ break; } - __FLOG(_L8("-CMTPPlaybackControlImpl::InitiateMPXPlaybackCommandL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_INITIATEMPXPLAYBACKCOMMANDL_EXIT ); } // --------------------------------------------------------------------------- @@ -936,7 +962,7 @@ // void CMTPPlaybackControlImpl::SendMPXPlaybackCommandL( TMPXPlaybackCommand aCommand, TBool aIsMTPPlaybackUtility ) { - __FLOG(_L8("+CMTPPlaybackControlImpl::SendPlaybackCommandL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_SENDMPXPLAYBACKCOMMANDL_ENTRY ); CMPXCommand* cmd( CMPXCommand::NewL() ); CleanupStack::PushL( cmd ); @@ -956,7 +982,7 @@ CleanupStack::PopAndDestroy( cmd ); - __FLOG(_L8("-CMTPPlaybackControlImpl::SendPlaybackCommandL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_SENDMPXPLAYBACKCOMMANDL_EXIT ); } // --------------------------------------------------------------------------- @@ -965,7 +991,7 @@ // void CMTPPlaybackControlImpl::SendPlaybackCommandCompleteL() { - __FLOG(_L8("+CMTPPlaybackControlImpl::SendPlaybackCommandCompleteL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_SENDPLAYBACKCOMMANDCOMPLETEL_ENTRY ); __ASSERT_DEBUG( iCallback, Panic( EMTPPBCallbackInvalid )); __ASSERT_DEBUG(( iMTPPBCmd > EPlaybackCmdNone ) && ( iMTPPBCmd < EPlaybackCmdEnd ), Panic( EMTPPBCallbackInvalid )); @@ -985,7 +1011,7 @@ ResetPlaybackCommand(); } - __FLOG(_L8("-CMTPPlaybackControlImpl::SendPlaybackCommandCompleteL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_SENDPLAYBACKCOMMANDCOMPLETEL_EXIT ); } // --------------------------------------------------------------------------- @@ -994,14 +1020,14 @@ // void CMTPPlaybackControlImpl::SendPlaybackEventL( TMTPPlaybackEvent aEvt ) { - __FLOG(_L8("+CMTPPlaybackControlImpl::SendPlaybackEventL")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_SENDPLAYBACKEVENTL_ENTRY ); CMTPPlaybackEvent* event = CMTPPlaybackEvent::NewL( aEvt, NULL ); CleanupStack::PushL(event); iObserver->HandlePlaybackEventL( event ); CleanupStack::PopAndDestroy(event); - __FLOG(_L8("-CMTPPlaybackControlImpl::SendPlaybackEventL")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_SENDPLAYBACKEVENTL_EXIT ); } // --------------------------------------------------------------------------- @@ -1010,7 +1036,7 @@ // void CMTPPlaybackControlImpl::ResetPlaybackCommand() { - __FLOG(_L8("+CMTPPlaybackControlImpl::ResetPlaybackCommand")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_RESETPLAYBACKCOMMAND_ENTRY ); iCallback = NULL; iMTPPBCmd = EPlaybackCmdNone; @@ -1019,7 +1045,7 @@ delete iCmdParam; iCmdParam = NULL; - __FLOG(_L8("-CMTPPlaybackControlImpl::ResetPlaybackCommand")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_RESETPLAYBACKCOMMAND_EXIT ); } // --------------------------------------------------------------------------- @@ -1028,6 +1054,8 @@ // TMPXPlaybackState CMTPPlaybackControlImpl::CurrentState() const { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_CURRENTSTATE_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_CURRENTSTATE_EXIT ); return iState; } @@ -1037,6 +1065,8 @@ // TMPXPlaybackState CMTPPlaybackControlImpl::PreviousState() const { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_PREVIOUSSTATE_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_PREVIOUSSTATE_EXIT ); return iPreState; } @@ -1046,11 +1076,15 @@ // TInt32 CMTPPlaybackControlImpl::SongCount() const { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_SONGCOUNT_ENTRY ); + TInt32 songCount = -1; if ( iPlayList ) { songCount = iPlayList->Count(); } + + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_SONGCOUNT_EXIT ); return songCount; } @@ -1060,12 +1094,16 @@ // TInt32 CMTPPlaybackControlImpl::SongIndex() const { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_SONGINDEX_ENTRY ); + TInt32 songIndex = -1; if ( iPlayList ) { TInt level = iPlayList->Path().Levels(); songIndex = iPlayList->Path().Index( level-1 ); } + + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_SONGINDEX_EXIT ); return songIndex; } @@ -1075,7 +1113,11 @@ // void CMTPPlaybackControlImpl::SetMTPPBCmd( TMTPPlaybackCommand aMTPPBCmd ) { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_SETMTPPBCMD_ENTRY ); + iMTPPBCmd = aMTPPBCmd; + + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_SETMTPPBCMD_EXIT ); } // --------------------------------------------------------------------------- @@ -1084,14 +1126,17 @@ // TMTPPlaybackCommand CMTPPlaybackControlImpl::MTPPBCmdHandling() const { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLIMPL_MTPPBCMDHANDLING_ENTRY ); + if ( iPrepareCmdArray.Count() == 0 ) { + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLIMPL_MTPPBCMDHANDLING_EXIT ); return iMTPPBCmd; } else { + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKCONTROLIMPL_MTPPBCMDHANDLING_EXIT ); return EPlaybackCmdNone; } - } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/src/cmtpplaybackplaylisthelper.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/src/cmtpplaybackplaylisthelper.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/src/cmtpplaybackplaylisthelper.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -36,9 +36,11 @@ #include "cmtpplaybackcontrolimpl.h" #include "cmtpplaybackplaylisthelper.h" #include "mtpplaybackcontrolpanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpplaybackplaylisthelperTraces.h" +#endif -// Constants -__FLOG_STMT(_LIT8(KComponent,"PlaybackPlaylistHelper");) // ======== MEMBER FUNCTIONS ======== @@ -48,11 +50,15 @@ // CMTPPlaybackPlaylistHelper* CMTPPlaybackPlaylistHelper::NewL( CMTPPlaybackControlImpl& aControlImpl ) { + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_NEWL_ENTRY ); + CMTPPlaybackPlaylistHelper* self = new ( ELeave ) CMTPPlaybackPlaylistHelper( aControlImpl ); CleanupStack::PushL( self ); self->ConstructL(); CleanupStack::Pop( self ); + + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_NEWL_EXIT ); return self; } @@ -62,7 +68,7 @@ // CMTPPlaybackPlaylistHelper::~CMTPPlaybackPlaylistHelper() { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::~CMTPPlaybackPlaylistHelper")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_CMTPPLAYBACKPLAYLISTHELPER_ENTRY ); if( iCollectionUiHelper ) { @@ -81,8 +87,7 @@ delete iPlayObject; - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::~CMTPPlaybackPlaylistHelper")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_CMTPPLAYBACKPLAYLISTHELPER_EXIT ); } // --------------------------------------------------------------------------- @@ -92,7 +97,7 @@ // void CMTPPlaybackPlaylistHelper::GetPlayListFromCollectionL( const TMTPPbDataSuid& aPlayObject ) { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::GetPlayListFromCollectionL")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_GETPLAYLISTFROMCOLLECTIONL_ENTRY ); //Reset ResetPlaySource(); @@ -119,7 +124,7 @@ break; } - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::GetPlayListFromCollectionL")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_GETPLAYLISTFROMCOLLECTIONL_EXIT ); } // --------------------------------------------------------------------------- @@ -129,13 +134,13 @@ // void CMTPPlaybackPlaylistHelper::GetPlayListFromCollectionL( TInt aIndex ) { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::GetPlayListFromCollectionL")); + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKPLAYLISTHELPER_GETPLAYLISTFROMCOLLECTIONL_ENTRY ); iSongIndex = aIndex; UpdatePathAndOpenL(); - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::GetPlayListFromCollectionL")); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKPLAYLISTHELPER_GETPLAYLISTFROMCOLLECTIONL_EXIT ); } // --------------------------------------------------------------------------- @@ -145,7 +150,7 @@ TMTPPbDataSuid CMTPPlaybackPlaylistHelper::GetMTPPBSuidFromCollectionL( const CMPXCollectionPlaylist& aPlaylist ) { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::GetPlayListFromCollectionL")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_GETMTPPBSUIDFROMCOLLECTIONL_ENTRY ); CMPXCollectionPath* path = iCollectionUiHelper->MusicPlaylistPathL(); if ( path->Id() == aPlaylist.Path().Id( KMTPPlaybackPlaylistAblumLevel -1 )) @@ -159,7 +164,7 @@ TFileName uri = ItemIdToUriL( aPlaylist.Path().Id( KMTPPlaybackPlaylistAblumLevel )); TMTPPbDataSuid dataSuid( iPlayCategory, uri ); - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::GetPlayListFromCollectionL")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_GETMTPPBSUIDFROMCOLLECTIONL_EXIT ); return dataSuid; } @@ -169,6 +174,8 @@ // TMTPPbCategory CMTPPlaybackPlaylistHelper::MTPPbCategory() const { + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_MTPPBCATEGORY_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_MTPPBCATEGORY_EXIT ); return iPlayCategory; } // --------------------------------------------------------------------------- @@ -177,6 +184,8 @@ // TFileName CMTPPlaybackPlaylistHelper::MTPPbSuid() const { + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_MTPPBSUID_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_MTPPBSUID_EXIT ); return TFileName( *iPlayObject ); } @@ -187,8 +196,9 @@ // void CMTPPlaybackPlaylistHelper::HandleCollectionMessage( CMPXMessage* aMsg, TInt aErr ) { - __FLOG_1(_L8("+CMTPPlaybackPlaylistHelper::HandleCollectionMessage( %d ) "), aErr ); - + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_HANDLECOLLECTIONMESSAGE_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPLAYBACKPLAYLISTHELPER_HANDLECOLLECTIONMESSAGE, "CMTPPlaybackPlaylistHelper::HandleCollectionMessage( %d )", aErr ); + if (( KErrNone == aErr ) && aMsg ) { TRAP( aErr, DoHandleCollectionMessageL( *aMsg )); @@ -200,7 +210,7 @@ MTPPlaybackControlImpl().DoHandleError( error ); } - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::HandleCollectionMessage")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_HANDLECOLLECTIONMESSAGE_EXIT ); } // --------------------------------------------------------------------------- // From MMPXCollectionObserver @@ -209,7 +219,8 @@ void CMTPPlaybackPlaylistHelper::HandleOpenL( const CMPXMedia& aEntries, TInt /*aIndex*/, TBool /*aComplete*/, TInt aError ) { - __FLOG_1(_L8("+CMTPPlaybackPlaylistHelper::HandleOpenL( %d )"), aError ); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_HANDLEOPENL_ENTRY ); + OstTrace1( TRACE_FLOW, CMTPPLAYBACKPLAYLISTHELPER_HANDLEOPENL, "CMTPPlaybackPlaylistHelper::HandleOpenL( %d )", aError ); if ( KErrNone == aError ) { @@ -222,7 +233,7 @@ MTPPlaybackControlImpl().DoHandleError( error ); } - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::HandleOpenL")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_HANDLEOPENL_EXIT ); } // --------------------------------------------------------------------------- @@ -232,7 +243,8 @@ void CMTPPlaybackPlaylistHelper::HandleOpenL( const CMPXCollectionPlaylist& aPlaylist, TInt aError ) { - __FLOG_1(_L8("+CMTPPlaybackPlaylistHelper::HandleOpenL( aPlaylist, aError = %d )"), aError ); + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKPLAYLISTHELPER_HANDLEOPENL_ENTRY ); + OstTrace1( TRACE_FLOW, DUP1_CMTPPLAYBACKPLAYLISTHELPER_HANDLEOPENL, "CMTPPlaybackPlaylistHelper::HandleOpenL( aPlaylist, aError = %d )", aError ); if ( KErrNone == aError ) { @@ -245,7 +257,7 @@ MTPPlaybackControlImpl().DoHandleError( error ); } - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::HandleOpenL( aPlaylist, aError )")); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKPLAYLISTHELPER_HANDLEOPENL_EXIT ); } // --------------------------------------------------------------------------- @@ -253,8 +265,8 @@ // --------------------------------------------------------------------------- void CMTPPlaybackPlaylistHelper::HandleCollectionMediaL( const CMPXMedia& /*aMedia*/, TInt /*aError*/ ) { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::HandleCollectionMediaL")); - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::HandleCollectionMediaL")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_HANDLECOLLECTIONMEDIAL_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_HANDLECOLLECTIONMEDIAL_EXIT ); } // @@ -268,6 +280,8 @@ iPlayObject( NULL ), iMTPPlaybackControl( aControlImpl ) { + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKPLAYLISTHELPER_CMTPPLAYBACKPLAYLISTHELPER_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKPLAYLISTHELPER_CMTPPLAYBACKPLAYLISTHELPER_EXIT ); } // --------------------------------------------------------------------------- @@ -276,13 +290,12 @@ // void CMTPPlaybackPlaylistHelper::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::ConstructL")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_CONSTRUCTL_ENTRY ); iCollectionUiHelper = CMPXCollectionHelperFactory::NewCollectionUiHelperL(); iCollectionUtil = MMPXCollectionUtility::NewL( this, KMcModeDefault ); - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::ConstructL")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_CONSTRUCTL_EXIT ); } // --------------------------------------------------------------------------- @@ -291,7 +304,7 @@ // void CMTPPlaybackPlaylistHelper::DoHandleCollectionMessageL( const CMPXMessage& aMsg ) { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::DoHandleCollectionMessage")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_DOHANDLECOLLECTIONMESSAGEL_ENTRY ); TMPXMessageId id( aMsg.ValueTObjectL( KMPXMessageGeneralId ) ); @@ -301,8 +314,8 @@ TInt type( aMsg.ValueTObjectL( KMPXMessageGeneralType ) ); TInt data( aMsg.ValueTObjectL( KMPXMessageGeneralData ) ); - __FLOG_VA((_L8("Event code is 0x%X, type code is 0x%X"), event, type )); - __FLOG_1(_L8("Data code is 0x%X"), data ); + OstTraceExt2( TRACE_FLOW, CMTPPLAYBACKPLAYLISTHELPER_DOHANDLECOLLECTIONMESSAGEL, "Event code is 0x%X, type code is 0x%X", static_cast( event ), type ); + OstTrace1( TRACE_FLOW, DUP1_CMTPPLAYBACKPLAYLISTHELPER_DOHANDLECOLLECTIONMESSAGEL, "Data code is 0x%X", data ); if ( event == TMPXCollectionMessage::EPathChanged && type == EMcPathChangedByOpen && @@ -318,11 +331,11 @@ } else if ( event == TMPXCollectionMessage::ECollectionChanged ) { - __FLOG(_L8("Ignore this event")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPPLAYBACKPLAYLISTHELPER_DOHANDLECOLLECTIONMESSAGEL, "Ignore this event" ); } } - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::DoHandleCollectionMessage")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_DOHANDLECOLLECTIONMESSAGEL_EXIT ); } // ---------------------------------------------------- @@ -331,7 +344,7 @@ // void CMTPPlaybackPlaylistHelper::DoHandleOpenL( const CMPXMedia& aEntries ) { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::DoHandleOpenL( const CMPXMedia )")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_DOHANDLEOPENL_ENTRY ); if ( EMTPPbCatAlbum == iPlayCategory ) { @@ -361,7 +374,7 @@ } } - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::DoHandleOpenL( const CMPXMedia )")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_DOHANDLEOPENL_EXIT ); } // ---------------------------------------------------- @@ -370,14 +383,14 @@ // void CMTPPlaybackPlaylistHelper::OpenMusicPlayListPathL() { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::OpenMusicPlayListPathL")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_OPENMUSICPLAYLISTPATHL_ENTRY ); CMPXCollectionPath* path = iCollectionUiHelper->MusicPlaylistPathL(); CleanupStack::PushL( path ); iCollectionUtil->Collection().OpenL( *path ); CleanupStack::PopAndDestroy( path ); - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::OpenMusicPlayListPathL")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_OPENMUSICPLAYLISTPATHL_EXIT ); } // ---------------------------------------------------- @@ -386,7 +399,7 @@ // void CMTPPlaybackPlaylistHelper::OpenMusicAblumPathL() { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::OpenMusicAblumPathL")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_OPENMUSICABLUMPATHL_ENTRY ); CMPXCollectionPath* path = iCollectionUiHelper->MusicMenuPathL(); CleanupStack::PushL( path ); @@ -394,7 +407,7 @@ iCollectionUtil->Collection().OpenL( *path ); CleanupStack::PopAndDestroy( path ); - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::OpenMusicAblumPathL")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_OPENMUSICABLUMPATHL_EXIT ); } // ---------------------------------------------------- @@ -403,14 +416,14 @@ // void CMTPPlaybackPlaylistHelper::ResetPlaySource() { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::ResetPlaySourceL")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_RESETPLAYSOURCE_ENTRY ); iPathIndex = -1; iSongIndex = 0; delete iPlayObject; iPlayObject = NULL; - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::ResetPlaySourceL")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_RESETPLAYSOURCE_EXIT ); } // ---------------------------------------------------- @@ -419,7 +432,7 @@ // void CMTPPlaybackPlaylistHelper::UpdatePlaylistPathIndexL( const CMPXMedia& aEntries ) { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::UpdatePlaylistPathIndexL")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_UPDATEPLAYLISTPATHINDEXL_ENTRY ); __ASSERT_DEBUG( iPlayCategory == EMTPPbCatPlayList, Panic( EMTPPBCollectionErrCall )); const CMPXMediaArray* refArray = aEntries.Value ( KMPXMediaArrayContents ); @@ -444,7 +457,7 @@ } } - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::UpdatePlaylistPathIndexL")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_UPDATEPLAYLISTPATHINDEXL_EXIT ); } // --------------------------------------------------------------------------- @@ -453,7 +466,7 @@ // MMPXCollectionHelper* CMTPPlaybackPlaylistHelper::CollectionHelperL() { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::CollectionHelperL")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_COLLECTIONHELPERL_ENTRY ); if ( iCollectionHelper == NULL ) { @@ -478,11 +491,15 @@ */ TChar driveChar = 'c'; TInt driveNumber; - User::LeaveIfError( RFs::CharToDrive( driveChar, driveNumber ) ); + TInt ret = RFs::CharToDrive( driveChar, driveNumber ); + LEAVEIFERROR( ret, + OstTrace0( TRACE_ERROR, CMTPPLAYBACKPLAYLISTHELPER_COLLECTIONHELPERL, "Can't get driveNumber" )); // get root path TBuf storeRoot; - User::LeaveIfError( PathInfo::GetRootPath( storeRoot, driveNumber ) ); + ret = PathInfo::GetRootPath( storeRoot, driveNumber ); + LEAVEIFERROR( ret, + OstTrace0( TRACE_ERROR, DUP1_CMTPPLAYBACKPLAYLISTHELPER_COLLECTIONHELPERL, "Can't get storeRoot" )); searchMedia->SetTextValueL( KMPXMediaGeneralDrive, storeRoot ); @@ -504,12 +521,13 @@ { iCollectionHelper->Close(); iCollectionHelper = NULL; - User::Leave( KErrGeneral ); + LEAVEIFERROR( KErrGeneral, + OstTrace0( TRACE_ERROR, DUP2_CMTPPLAYBACKPLAYLISTHELPER_COLLECTIONHELPERL, "MPX database error" )); } CleanupStack::PopAndDestroy( foundMedia ); // - foundMedia } - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::CollectionHelperL")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_COLLECTIONHELPERL_EXIT ); return iCollectionHelper; } @@ -519,8 +537,7 @@ // const TMPXItemId CMTPPlaybackPlaylistHelper::UriToItemIdL() { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::UriToItemIdL")); - + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_URITOITEMIDL_ENTRY ); TMPXItemId itemId( KMPXInvalidItemId ); TInt error = KErrNone; @@ -551,7 +568,7 @@ CleanupStack::PopAndDestroy( &atts ); } - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::UriToItemIdL")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_URITOITEMIDL_EXIT ); return itemId; } @@ -561,7 +578,7 @@ // const TFileName CMTPPlaybackPlaylistHelper::ItemIdToUriL( const TMPXItemId& aId ) { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::ItemIdToUriL")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_ITEMIDTOURIL_ENTRY ); TFileName itemUri( KNullDesC ); @@ -598,11 +615,13 @@ CleanupStack::PushL( foundMedia ); // + foundMedia if ( !foundMedia->IsSupported( KMPXMediaArrayCount )) { - User::Leave( KErrNotSupported ); + LEAVEIFERROR( KErrNotSupported, + OstTrace0( TRACE_ERROR, CMTPPLAYBACKPLAYLISTHELPER_ITEMIDTOURIL, "ItemId convert to Uri error" )); } else if ( *foundMedia->Value( KMPXMediaArrayCount ) != 1 ) { - User::Leave( KErrNotSupported ); + LEAVEIFERROR( KErrNotSupported, + OstTrace0( TRACE_ERROR, DUP1_CMTPPLAYBACKPLAYLISTHELPER_ITEMIDTOURIL, "ItemId convert to Uri error" )); } const CMPXMediaArray* tracksArray = foundMedia->Value ( KMPXMediaArrayContents ); @@ -615,7 +634,7 @@ CleanupStack::PopAndDestroy( foundMedia ); // - foundMedia - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::ItemIdToUriL")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_ITEMIDTOURIL_EXIT ); return itemUri; } @@ -625,7 +644,7 @@ // CMPXMedia* CMTPPlaybackPlaylistHelper::FindAlbumSongsL( const TMPXItemId& aAlbumId ) { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::FindAlbumSongsL")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_FINDALBUMSONGSL_ENTRY ); // Fetch the songs for the selected album CMPXMedia* findCriteria = CMPXMedia::NewL(); @@ -647,19 +666,22 @@ if ( !foundMedia->IsSupported( KMPXMediaArrayCount ) ) { - User::Leave( KErrNotSupported ); + LEAVEIFERROR( KErrNotSupported, + OstTrace0( TRACE_ERROR, CMTPPLAYBACKPLAYLISTHELPER_FINDALBUMSONGSL, "Find album song error" )); } TInt foundItemCount = *foundMedia->Value( KMPXMediaArrayCount ); if ( foundItemCount == 0 ) { - User::Leave( KErrNotFound ); + LEAVEIFERROR( KErrNotFound, + OstTrace0( TRACE_ERROR, DUP1_CMTPPLAYBACKPLAYLISTHELPER_FINDALBUMSONGSL, "Can't find album song" )); } if ( !foundMedia->IsSupported( KMPXMediaArrayContents ) ) { - User::Leave( KErrNotSupported ); + LEAVEIFERROR( KErrNotSupported, + OstTrace0( TRACE_ERROR, DUP2_CMTPPLAYBACKPLAYLISTHELPER_FINDALBUMSONGSL, "Find album song error" )); } - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::FindAlbumSongsL")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_FINDALBUMSONGSL_EXIT ); return foundMedia; } @@ -670,7 +692,7 @@ // void CMTPPlaybackPlaylistHelper::UpdateAlbumPathAndOpenL() { - __FLOG(_L8("+CMTPPlaybackPlaylistHelper::UpdateAlbumPathAndOpenL")); + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_UPDATEALBUMPATHANDOPENL_ENTRY ); RArray ids; CleanupClosePushL(ids); @@ -690,6 +712,7 @@ MTPPlaybackControlImpl().DoHandleError( KPlaybackErrParamInvalid ); CleanupStack::PopAndDestroy( cpath ); CleanupStack::PopAndDestroy(&ids); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_UPDATEALBUMPATHANDOPENL_EXIT ); return; } @@ -701,7 +724,11 @@ CMPXMedia* songs = FindAlbumSongsL( id ); CleanupStack::PushL( songs ); const CMPXMediaArray* tracksArray = songs->Value ( KMPXMediaArrayContents ); - User::LeaveIfNull(const_cast(tracksArray)); + if ( const_cast(tracksArray) == NULL ) + { + LEAVEIFERROR( KErrNoMemory, + OstTrace0( TRACE_ERROR, CMTPPLAYBACKPLAYLISTHELPER_UPDATEALBUMPATHANDOPENL, "Find album song error" )); + } TUint count = tracksArray->Count(); for (TInt i=0; i ids; CleanupClosePushL(ids); @@ -741,7 +768,7 @@ CleanupStack::PopAndDestroy( cpath ); CleanupStack::PopAndDestroy(&ids); - __FLOG(_L8("-CMTPPlaybackPlaylistHelper::UpdatePathAndOpenL( aSong Index )")); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_UPDATEPATHANDOPENL_EXIT ); } // --------------------------------------------------------------------------- @@ -750,6 +777,8 @@ // CMTPPlaybackControlImpl& CMTPPlaybackPlaylistHelper::MTPPlaybackControlImpl() { + OstTraceFunctionEntry0( CMTPPLAYBACKPLAYLISTHELPER_MTPPLAYBACKCONTROLIMPL_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKPLAYLISTHELPER_MTPPLAYBACKCONTROLIMPL_EXIT ); return iMTPPlaybackControl; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/src/cmtpplaybackresumehelper.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/src/cmtpplaybackresumehelper.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/mtpplaybackmpximplementation/src/cmtpplaybackresumehelper.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,9 +21,11 @@ #include "cmtpplaybackresumehelper.h" #include "cmtpplaybackcommand.h" #include "cmtpplaybackcontrolimpl.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpplaybackresumehelperTraces.h" +#endif -// Constants -__FLOG_STMT(_LIT8(KComponent,"PlaybackResumeHelper");) // ======== MEMBER FUNCTIONS ======== @@ -34,8 +36,12 @@ CMTPPlaybackResumeHelper* CMTPPlaybackResumeHelper::NewL( CMTPPlaybackControlImpl& aControlImpl ) { + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_NEWL_ENTRY ); + CMTPPlaybackResumeHelper* self = new ( ELeave ) CMTPPlaybackResumeHelper( aControlImpl ); + + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_NEWL_EXIT ); return self; } @@ -45,9 +51,8 @@ // CMTPPlaybackResumeHelper::~CMTPPlaybackResumeHelper() { - __FLOG(_L8("+CMTPPlaybackResumeHelper::~CMTPPlaybackResumeHelper")); - __FLOG(_L8("-CMTPPlaybackResumeHelper::~CMTPPlaybackResumeHelper")); - __FLOG_CLOSE; + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_CMTPPLAYBACKRESUMEHELPER_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_CMTPPLAYBACKRESUMEHELPER_EXIT ); } // --------------------------------------------------------------------------- @@ -57,7 +62,7 @@ void CMTPPlaybackResumeHelper::UpdatePrepareCmdArray( TMTPPlaybackCommand aMTPPPBCmd, RResumeCmdArray& aMTPPBMPXCmd ) { - __FLOG(_L8("+CMTPPlaybackResumeHelper::UpdatePrepareCmdArrayL")); + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_UPDATEPREPARECMDARRAY_ENTRY ); aMTPPBMPXCmd.Reset(); iIfParepareArray = ETrue; @@ -73,7 +78,7 @@ break; } - __FLOG(_L8("-CMTPPlaybackResumeHelper::UpdatePrepareCmdArrayL")); + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_UPDATEPREPARECMDARRAY_EXIT ); } // --------------------------------------------------------------------------- @@ -83,7 +88,7 @@ void CMTPPlaybackResumeHelper::UpdateResumeCmdArray( TMTPPlaybackCommand aMTPPPBCmd, RResumeCmdArray& aMTPPBMPXCmd) { - __FLOG(_L8("+CMTPPlaybackResumeHelper::MapMTPPBCommandToMPXCommandL")); + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_UPDATERESUMECMDARRAY_ENTRY ); aMTPPBMPXCmd.Reset(); iIfParepareArray = EFalse; @@ -134,7 +139,7 @@ break; } - __FLOG(_L8("-CMTPPlaybackResumeHelper::MapPlaybackControlCommandL")); + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_UPDATERESUMECMDARRAY_EXIT ); } // --------------------------------------------------------------------------- @@ -145,7 +150,8 @@ CMTPPlaybackControlImpl& aControlImpl ) : iMTPPlaybackControl( aControlImpl ) { - __FLOG_OPEN(KMTPSubsystem, KComponent); + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKRESUMEHELPER_CMTPPLAYBACKRESUMEHELPER_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKRESUMEHELPER_CMTPPLAYBACKRESUMEHELPER_EXIT ); } // --------------------------------------------------------------------------- @@ -154,6 +160,8 @@ // void CMTPPlaybackResumeHelper::HandlePlaybackCmdInitObject( RResumeCmdArray& aMTPPBMPXCmdArray ) { + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDINITOBJECT_ENTRY ); + switch ( MTPPlaybackControlImpl().CurrentState() ) { case EPbStatePlaying: @@ -165,6 +173,8 @@ default: break; } + + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDINITOBJECT_EXIT ); } // --------------------------------------------------------------------------- @@ -173,6 +183,8 @@ // void CMTPPlaybackResumeHelper::HandlePlaybackCmdInitIndex( RResumeCmdArray& aMTPPBMPXCmdArray ) { + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDINITINDEX_ENTRY ); + switch ( MTPPlaybackControlImpl().CurrentState() ) { case EPbStatePlaying: @@ -184,6 +196,8 @@ default: break; } + + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDINITINDEX_EXIT ); } // --------------------------------------------------------------------------- @@ -192,6 +206,8 @@ // void CMTPPlaybackResumeHelper::HandlePlaybackCmdPlay(RResumeCmdArray& aMTPPBMPXCmdArray ) { + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDPLAY_ENTRY ); + switch ( MTPPlaybackControlImpl().CurrentState() ) { case EPbStatePaused: @@ -222,6 +238,8 @@ default: break; } + + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDPLAY_EXIT ); } @@ -231,6 +249,8 @@ // void CMTPPlaybackResumeHelper::HandlePlaybackCmdPause( RResumeCmdArray& aMTPPBMPXCmdArray ) { + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDPAUSE_ENTRY ); + switch ( MTPPlaybackControlImpl().CurrentState() ) { case EPbStatePlaying: @@ -259,6 +279,8 @@ default: break; } + + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDPAUSE_EXIT ); } // --------------------------------------------------------------------------- @@ -267,6 +289,8 @@ // void CMTPPlaybackResumeHelper::HandlePlaybackCmdSeekForward( RResumeCmdArray& aMTPPBMPXCmd ) { + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSEEKFORWARD_ENTRY ); + switch ( MTPPlaybackControlImpl().CurrentState() ) { case EPbStatePlaying: @@ -305,6 +329,8 @@ default: break; } + + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSEEKFORWARD_EXIT ); } // --------------------------------------------------------------------------- @@ -313,6 +339,8 @@ // void CMTPPlaybackResumeHelper::HandlePlaybackCmdSeekBackward( RResumeCmdArray& aMTPPBMPXCmd ) { + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSEEKBACKWARD_ENTRY ); + switch ( MTPPlaybackControlImpl().CurrentState() ) { case EPbStatePlaying: @@ -343,6 +371,8 @@ default: break; } + + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSEEKBACKWARD_EXIT ); } // --------------------------------------------------------------------------- @@ -351,6 +381,8 @@ // void CMTPPlaybackResumeHelper::HandlePlaybackCmdSkip( RResumeCmdArray& aMTPPBMPXCmd ) { + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSKIP_ENTRY ); + switch ( MTPPlaybackControlImpl().CurrentState() ) { case EPbStatePlaying: @@ -362,6 +394,8 @@ default: break; } + + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSKIP_EXIT ); } // --------------------------------------------------------------------------- @@ -370,6 +404,8 @@ // void CMTPPlaybackResumeHelper::HandlePlaybackCmdSetPosition( RResumeCmdArray& aMTPPBMPXCmd ) { + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSETPOSITION_ENTRY ); + switch ( MTPPlaybackControlImpl().CurrentState() ) { case EPbStatePlaying: @@ -389,6 +425,8 @@ default: break; } + + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSETPOSITION_EXIT ); } // --------------------------------------------------------------------------- @@ -397,6 +435,8 @@ // CMTPPlaybackControlImpl& CMTPPlaybackResumeHelper::MTPPlaybackControlImpl() { + OstTraceFunctionEntry0( CMTPPLAYBACKRESUMEHELPER_MTPPLAYBACKCONTROLIMPL_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKRESUMEHELPER_MTPPLAYBACKCONTROLIMPL_EXIT ); return iMTPPlaybackControl; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcgetdevicepropdesc.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcgetdevicepropdesc.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcgetdevicepropdesc.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,9 +27,11 @@ #include "cmtpplaybackmap.h" #include "cmtpplaybackcommand.h" #include "mtpplaybackcontrolpanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppbcgetdevicepropdescTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"GetPlaybackDevicePropDesc");) /** Two-phase constructor. @@ -42,7 +44,9 @@ MMTPConnection& aConnection, CMTPPlaybackControlDataProvider& aDataProvider) { + OstTraceFunctionEntry0( CMTPPBCGETDEVICEPROPDESC_NEWL_ENTRY ); CMTPPbcGetDevicePropDesc* self = new (ELeave) CMTPPbcGetDevicePropDesc(aFramework, aConnection, aDataProvider); + OstTraceFunctionExit0( CMTPPBCGETDEVICEPROPDESC_NEWL_EXIT ); return self; } @@ -51,11 +55,10 @@ */ CMTPPbcGetDevicePropDesc::~CMTPPbcGetDevicePropDesc() { - __FLOG(_L8("~CMTPPbcGetDevicePropDesc - Entry")); + OstTraceFunctionEntry0( CMTPPBCGETDEVICEPROPDESC_CMTPPBCGETDEVICEPROPDESC_ENTRY ); delete iPropDesc; delete iPbCmd; - __FLOG(_L8("~CMTPPbcGetDevicePropDesc - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPBCGETDEVICEPROPDESC_CMTPPBCGETDEVICEPROPDESC_EXIT ); } /** @@ -67,8 +70,8 @@ CMTPRequestProcessor(aFramework, aConnection, 0, NULL), iPlaybackControlDp(aDataProvider) { - //Open the log system - __FLOG_OPEN(KMTPSubsystem, KComponent); + OstTraceFunctionEntry0( DUP1_CMTPPBCGETDEVICEPROPDESC_CMTPPBCGETDEVICEPROPDESC_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPBCGETDEVICEPROPDESC_CMTPPBCGETDEVICEPROPDESC_EXIT ); } /** @@ -77,7 +80,7 @@ */ TMTPResponseCode CMTPPbcGetDevicePropDesc::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPPBCGETDEVICEPROPDESC_CHECKREQUESTL_ENTRY ); TMTPResponseCode respCode = CMTPRequestProcessor::CheckRequestL(); if(respCode == EMTPRespCodeOK) { @@ -94,7 +97,7 @@ } } - __FLOG(_L8("CheckRequestL - Exit")); + OstTraceFunctionExit0( CMTPPBCGETDEVICEPROPDESC_CHECKREQUESTL_EXIT ); return respCode; } @@ -103,7 +106,7 @@ */ void CMTPPbcGetDevicePropDesc::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPPBCGETDEVICEPROPDESC_SERVICEL_ENTRY ); //Destroy the previous playback command. delete iPbCmd; iPbCmd = NULL; @@ -135,13 +138,14 @@ SendResponseL(EMTPRespCodeParameterNotSupported); } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPPBCGETDEVICEPROPDESC_SERVICEL_EXIT ); } void CMTPPbcGetDevicePropDesc::HandlePlaybackCommandCompleteL(CMTPPlaybackCommand* aCmd, TInt aErr) { - __FLOG(_L8("HandlePlaybackCommandCompleteL - Entry")); - __FLOG_1(_L8("aErr %d"), aErr); + OstTraceFunctionEntry0( CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL, "aErr %d", aErr ); + TBool useDefault = EFalse; switch(aErr) @@ -150,9 +154,9 @@ { __ASSERT_DEBUG((aCmd != NULL), Panic(EMTPPBDataNullErr)); __ASSERT_DEBUG((aCmd->PlaybackCommand() == iPbCmd->PlaybackCommand()), Panic(EMTPPBArgumentErr)); - __ASSERT_ALWAYS((aCmd != NULL), User::Leave(KErrArgument)); - __ASSERT_ALWAYS((aCmd->PlaybackCommand() == iPbCmd->PlaybackCommand()), User::Leave(KErrArgument)); - __FLOG_1(_L8("aCmd %d"), aCmd->PlaybackCommand()); + __ASSERT_ALWAYS_OST((aCmd != NULL), OstTrace0( TRACE_ERROR, DUP2_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL, "Error argument" ), User::Leave(KErrArgument)); + __ASSERT_ALWAYS_OST((aCmd->PlaybackCommand() == iPbCmd->PlaybackCommand()), OstTrace0( TRACE_ERROR, DUP3_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL, "Error argument" ), User::Leave(KErrArgument)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL, "aCmd %d", aCmd->PlaybackCommand()); } break; case KPlaybackErrContextInvalid: @@ -165,12 +169,14 @@ iPlaybackControlDp.RequestToResetPbCtrl(); SendResponseL(EMTPRespCodeDeviceBusy); } + OstTraceFunctionExit0( CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT ); return; default: { SendResponseL(EMTPRespCodeDeviceBusy); } + OstTraceFunctionExit0( DUP1_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT ); return; } @@ -303,10 +309,11 @@ default: { - User::Leave(KErrArgument); + LEAVEIFERROR( KErrArgument, + OstTrace0( TRACE_ERROR, DUP4_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL, "Error argument" )); } break; } - __FLOG(_L8("HandlePlaybackCommandCompleteL - Exit")); + OstTraceFunctionExit0( DUP2_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcgetdevicepropvalue.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcgetdevicepropvalue.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcgetdevicepropvalue.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -28,10 +28,11 @@ #include "cmtpplaybackproperty.h" #include "cmtpplaybackcommand.h" #include "mtpplaybackcontrolpanic.h" - +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppbcgetdevicepropvalueTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"GetPlaybackDevicePropValue");) /** Two-phase constructor. @@ -44,7 +45,9 @@ MMTPConnection& aConnection, CMTPPlaybackControlDataProvider& aDataProvider) { + OstTraceFunctionEntry0( CMTPPBCGETDEVICEPROPVALUE_NEWL_ENTRY ); CMTPPbcGetDevicePropValue* self = new (ELeave) CMTPPbcGetDevicePropValue(aFramework, aConnection, aDataProvider); + OstTraceFunctionExit0( CMTPPBCGETDEVICEPROPVALUE_NEWL_EXIT ); return self; } @@ -53,10 +56,9 @@ */ CMTPPbcGetDevicePropValue::~CMTPPbcGetDevicePropValue() { - __FLOG(_L8("~CMTPPbcGetDevicePropValue - Entry")); + OstTraceFunctionEntry0( CMTPPBCGETDEVICEPROPVALUE_CMTPPBCGETDEVICEPROPVALUE_ENTRY ); delete iPbCmd; - __FLOG(_L8("~CMTPPbcGetDevicePropValue - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPBCGETDEVICEPROPVALUE_CMTPPBCGETDEVICEPROPVALUE_EXIT ); } /** @@ -68,8 +70,8 @@ CMTPRequestProcessor(aFramework, aConnection, 0, NULL), iPlaybackControlDp(aDataProvider) { - //Open the log system - __FLOG_OPEN(KMTPSubsystem, KComponent); + OstTraceFunctionEntry0( DUP1_CMTPPBCGETDEVICEPROPVALUE_CMTPPBCGETDEVICEPROPVALUE_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPBCGETDEVICEPROPVALUE_CMTPPBCGETDEVICEPROPVALUE_EXIT ); } /** @@ -78,7 +80,7 @@ */ TMTPResponseCode CMTPPbcGetDevicePropValue::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPPBCGETDEVICEPROPVALUE_CHECKREQUESTL_ENTRY ); TMTPResponseCode respCode = CMTPRequestProcessor::CheckRequestL(); if(respCode == EMTPRespCodeOK) { @@ -95,7 +97,7 @@ } } } - __FLOG(_L8("CheckRequestL - Exit")); + OstTraceFunctionExit0( CMTPPBCGETDEVICEPROPVALUE_CHECKREQUESTL_EXIT ); return respCode; } @@ -104,7 +106,7 @@ */ void CMTPPbcGetDevicePropValue::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPPBCGETDEVICEPROPVALUE_SERVICEL_ENTRY ); //Destroy the previous playback command. delete iPbCmd; iPbCmd = NULL; @@ -135,13 +137,14 @@ { SendResponseL(EMTPRespCodeParameterNotSupported); } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPPBCGETDEVICEPROPVALUE_SERVICEL_EXIT ); } void CMTPPbcGetDevicePropValue::HandlePlaybackCommandCompleteL(CMTPPlaybackCommand* aCmd, TInt aErr) { - __FLOG(_L8("HandlePlaybackCommandCompleteL - Entry")); - __FLOG_1(_L8("aErr %d"), aErr); + OstTraceFunctionEntry0( CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL, "aErr %d", aErr ); + //Handle the error TBool useDefault = EFalse; @@ -151,9 +154,9 @@ { __ASSERT_DEBUG((aCmd != NULL), Panic(EMTPPBDataNullErr)); __ASSERT_DEBUG((aCmd->PlaybackCommand() == iPbCmd->PlaybackCommand()), Panic(EMTPPBArgumentErr)); - __ASSERT_ALWAYS((aCmd != NULL), User::Leave(KErrArgument)); - __ASSERT_ALWAYS((aCmd->PlaybackCommand() == iPbCmd->PlaybackCommand()), User::Leave(KErrArgument)); - __FLOG_1(_L8("aCmd %d"), aCmd->PlaybackCommand()); + __ASSERT_ALWAYS_OST((aCmd != NULL), OstTrace0( TRACE_ERROR, DUP2_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL, "Error argument" ), User::Leave(KErrArgument)); + __ASSERT_ALWAYS_OST((aCmd->PlaybackCommand() == iPbCmd->PlaybackCommand()), OstTrace0( TRACE_ERROR, DUP3_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL, "Error argument" ), User::Leave(KErrArgument)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL, "aCmd %d", aCmd->PlaybackCommand() ); } break; case KPlaybackErrContextInvalid: @@ -166,11 +169,13 @@ iPlaybackControlDp.RequestToResetPbCtrl(); SendResponseL(EMTPRespCodeDeviceBusy); } + OstTraceFunctionExit0( CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT ); return; default: { SendResponseL(EMTPRespCodeDeviceBusy); } + OstTraceFunctionExit0( DUP1_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT ); return; } @@ -237,6 +242,6 @@ SendResponseL(EMTPRespCodeDevicePropNotSupported); break; } - __FLOG(_L8("HandlePlaybackCommandCompleteL - Exit")); + OstTraceFunctionExit0( DUP2_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcresetdevicepropvalue.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcresetdevicepropvalue.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcresetdevicepropvalue.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -24,9 +24,11 @@ #include "cmtpplaybackproperty.h" #include "cmtpplaybackcommand.h" #include "mtpplaybackcontrolpanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppbcresetdevicepropvalueTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"ResetPlaybackDevicePropValue");) /** Two-phase constructor. @@ -39,7 +41,9 @@ MMTPConnection& aConnection, CMTPPlaybackControlDataProvider& aDataProvider) { + OstTraceFunctionEntry0( CMTPPBCRESETDEVICEPROPVALUE_NEWL_ENTRY ); CMTPPbcResetDevicePropValue* self = new (ELeave) CMTPPbcResetDevicePropValue(aFramework, aConnection, aDataProvider); + OstTraceFunctionExit0( CMTPPBCRESETDEVICEPROPVALUE_NEWL_EXIT ); return self; } @@ -48,10 +52,9 @@ */ CMTPPbcResetDevicePropValue::~CMTPPbcResetDevicePropValue() { - __FLOG(_L8("~CMTPPbcResetDevicePropValue - Entry")); + OstTraceFunctionEntry0( CMTPPBCRESETDEVICEPROPVALUE_CMTPPBCRESETDEVICEPROPVALUE_ENTRY ); delete iPbCmd; - __FLOG(_L8("~CMTPPbcResetDevicePropValue - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPBCRESETDEVICEPROPVALUE_CMTPPBCRESETDEVICEPROPVALUE_EXIT ); } /** @@ -63,8 +66,8 @@ CMTPRequestProcessor(aFramework, aConnection, 0, NULL), iPlaybackControlDp(aDataProvider) { - //Open the log system - __FLOG_OPEN(KMTPSubsystem, KComponent); + OstTraceFunctionEntry0( DUP1_CMTPPBCRESETDEVICEPROPVALUE_CMTPPBCRESETDEVICEPROPVALUE_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPBCRESETDEVICEPROPVALUE_CMTPPBCRESETDEVICEPROPVALUE_EXIT ); } /** @@ -73,7 +76,7 @@ */ TMTPResponseCode CMTPPbcResetDevicePropValue::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPPBCRESETDEVICEPROPVALUE_CHECKREQUESTL_ENTRY ); TMTPResponseCode respCode = CMTPRequestProcessor::CheckRequestL(); if(respCode == EMTPRespCodeOK) { @@ -89,8 +92,7 @@ } } } - - __FLOG(_L8("CheckRequestL - Exit")); + OstTraceFunctionExit0( CMTPPBCRESETDEVICEPROPVALUE_CHECKREQUESTL_EXIT ); return respCode; } /** @@ -98,7 +100,7 @@ */ void CMTPPbcResetDevicePropValue::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPPBCRESETDEVICEPROPVALUE_SERVICEL_ENTRY ); CMTPPlaybackMap& map(iPlaybackControlDp.GetPlaybackMap()); //Destroy the previous playback command. @@ -129,14 +131,13 @@ { SendResponseL(EMTPRespCodeParameterNotSupported); } - - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPPBCRESETDEVICEPROPVALUE_SERVICEL_EXIT ); } void CMTPPbcResetDevicePropValue::HandlePlaybackCommandCompleteL(CMTPPlaybackCommand* aCmd, TInt aErr) { - __FLOG(_L8("HandlePlaybackCommandCompleteL - Entry")); - __FLOG_1(_L8("aErr %d"), aErr); + OstTraceFunctionEntry0( CMTPPBCRESETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPBCRESETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL, "aErr %d", aErr ); //Handle error response. TMTPResponseCode response; @@ -170,8 +171,8 @@ if(aCmd != NULL) { __ASSERT_DEBUG((aCmd->PlaybackCommand() == iPbCmd->PlaybackCommand()), Panic(EMTPPBArgumentErr)); - __FLOG_1(_L8("aCmd %d"), aCmd->PlaybackCommand()); + OstTrace1( TRACE_NORMAL, DUP1_CMTPPBCRESETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL, "aCmd %d", aCmd->PlaybackCommand() ); } - __FLOG(_L8("HandlePlaybackCommandCompleteL - Exit")); + OstTraceFunctionExit0( CMTPPBCRESETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcsetdevicepropvalue.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcsetdevicepropvalue.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcsetdevicepropvalue.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,9 +27,11 @@ #include "cmtpplaybackproperty.h" #include "cmtpplaybackcommand.h" #include "mtpplaybackcontrolpanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppbcsetdevicepropvalueTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"SetPlaybackDevicePropValue");) /** Two-phase constructor. @@ -42,7 +44,9 @@ MMTPConnection& aConnection, CMTPPlaybackControlDataProvider& aDataProvider) { + OstTraceFunctionEntry0( CMTPPBCSETDEVICEPROPVALUE_NEWL_ENTRY ); CMTPPbcSetDevicePropValue* self = new (ELeave) CMTPPbcSetDevicePropValue(aFramework, aConnection, aDataProvider); + OstTraceFunctionExit0( CMTPPBCSETDEVICEPROPVALUE_NEWL_EXIT ); return self; } @@ -51,10 +55,9 @@ */ CMTPPbcSetDevicePropValue::~CMTPPbcSetDevicePropValue() { - __FLOG(_L8("~CMTPPbcSetDevicePropValue - Entry")); + OstTraceFunctionEntry0( CMTPPBCSETDEVICEPROPVALUE_CMTPPBCSETDEVICEPROPVALUE_ENTRY ); delete iPbCmd; - __FLOG(_L8("~CMTPPbcSetDevicePropValue - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPBCSETDEVICEPROPVALUE_CMTPPBCSETDEVICEPROPVALUE_EXIT ); } /** @@ -66,8 +69,8 @@ CMTPRequestProcessor(aFramework, aConnection, 0, NULL), iPlaybackControlDp(aDataProvider) { - //Open the log system - __FLOG_OPEN(KMTPSubsystem, KComponent); + OstTraceFunctionEntry0( DUP1_CMTPPBCSETDEVICEPROPVALUE_CMTPPBCSETDEVICEPROPVALUE_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPBCSETDEVICEPROPVALUE_CMTPPBCSETDEVICEPROPVALUE_EXIT ); } /** @@ -76,7 +79,7 @@ */ TMTPResponseCode CMTPPbcSetDevicePropValue::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPPBCSETDEVICEPROPVALUE_CHECKREQUESTL_ENTRY ); TMTPResponseCode respCode = CMTPRequestProcessor::CheckRequestL(); if(respCode == EMTPRespCodeOK) { @@ -93,7 +96,7 @@ } } - __FLOG(_L8("CheckRequestL - Exit")); + OstTraceFunctionExit0( CMTPPBCSETDEVICEPROPVALUE_CHECKREQUESTL_EXIT ); return respCode; } @@ -102,7 +105,7 @@ */ TBool CMTPPbcSetDevicePropValue::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPPBCSETDEVICEPROPVALUE_DOHANDLERESPONSEPHASEL_ENTRY ); CMTPPlaybackMap& map(iPlaybackControlDp.GetPlaybackMap()); //Destroy the previous playback command. @@ -126,14 +129,14 @@ { SendResponseL(EMTPRespCodeInvalidDevicePropValue); } - - __FLOG(_L8("DoHandleResponsePhaseL - Exit")); + + OstTraceFunctionExit0( CMTPPBCSETDEVICEPROPVALUE_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } void CMTPPbcSetDevicePropValue::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPPBCSETDEVICEPROPVALUE_SERVICEL_ENTRY ); TMTPDevicePropertyCode propCode(static_cast(Request(). Uint32(TMTPTypeRequest::ERequestParameter1))); iData.iOptCode = EMTPOpCodeSetDevicePropValue; @@ -160,13 +163,13 @@ } break; } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPPBCSETDEVICEPROPVALUE_SERVICEL_EXIT ); } void CMTPPbcSetDevicePropValue::HandlePlaybackCommandCompleteL(CMTPPlaybackCommand* aCmd, TInt aErr) { - __FLOG(_L8("HandlePlaybackCommandCompleteL - Entry")); - __FLOG_1(_L8("aErr %d"), aErr); + OstTraceFunctionEntry0( CMTPPBCSETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPBCSETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL, "aErr %d", aErr ); //Handle error response. TMTPResponseCode response; @@ -213,8 +216,7 @@ if(aCmd != NULL) { __ASSERT_DEBUG((aCmd->PlaybackCommand() == iPbCmd->PlaybackCommand()), Panic(EMTPPBArgumentErr)); - __FLOG_1(_L8("aCmd %d"), aCmd->PlaybackCommand()); + OstTrace1( TRACE_NORMAL, DUP1_CMTPPBCSETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL, "aCmd %d", aCmd->PlaybackCommand() ); } - - __FLOG(_L8("HandlePlaybackCommandCompleteL - Exit")); + OstTraceFunctionExit0( CMTPPBCSETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcskip.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcskip.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/src/cmtppbcskip.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -29,10 +29,11 @@ #include "cmtpplaybackproperty.h" #include "cmtpplaybackcommand.h" #include "mtpplaybackcontrolpanic.h" - +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppbcskipTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"Skip");) /** Two-phase constructor. @@ -45,7 +46,9 @@ MMTPConnection& aConnection, CMTPPlaybackControlDataProvider& aDataProvider) { + OstTraceFunctionEntry0( CMTPPBCSKIP_NEWL_ENTRY ); CMTPPbcSkip* self = new (ELeave) CMTPPbcSkip(aFramework, aConnection, aDataProvider); + OstTraceFunctionExit0( CMTPPBCSKIP_NEWL_EXIT ); return self; } @@ -54,10 +57,9 @@ */ CMTPPbcSkip::~CMTPPbcSkip() { - __FLOG(_L8("CMTPPbcSkip - Entry")); + OstTraceFunctionEntry0( CMTPPBCSKIP_CMTPPBCSKIP_ENTRY ); delete iPbCmd; - __FLOG(_L8("CMTPPbcSkip - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPBCSKIP_CMTPPBCSKIP_EXIT ); } /** @@ -69,8 +71,8 @@ CMTPRequestProcessor(aFramework, aConnection, 0, NULL), iPlaybackControlDp(aDataProvider) { - //Open the log system - __FLOG_OPEN(KMTPSubsystem, KComponent); + OstTraceFunctionEntry0( DUP1_CMTPPBCSKIP_CMTPPBCSKIP_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPBCSKIP_CMTPPBCSKIP_EXIT ); } /** @@ -78,7 +80,7 @@ */ TMTPResponseCode CMTPPbcSkip::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPPBCSKIP_CHECKREQUESTL_ENTRY ); TMTPResponseCode respCode = CMTPRequestProcessor::CheckRequestL(); if(respCode == EMTPRespCodeOK) { @@ -89,7 +91,7 @@ respCode = EMTPRespCodeOK; } } - __FLOG(_L8("CheckRequestL - Exit")); + OstTraceFunctionExit0( CMTPPBCSKIP_CHECKREQUESTL_EXIT ); return respCode; } @@ -98,7 +100,7 @@ */ void CMTPPbcSkip::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPPBCSKIP_SERVICEL_ENTRY ); CMTPPlaybackMap& map(iPlaybackControlDp.GetPlaybackMap()); MMTPPlaybackControl& control(iPlaybackControlDp.GetPlaybackControlL()); @@ -117,14 +119,14 @@ { SendResponseL(EMTPRespCodeInvalidParameter); } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPPBCSKIP_SERVICEL_EXIT ); } void CMTPPbcSkip::HandlePlaybackCommandCompleteL(CMTPPlaybackCommand* aCmd, TInt aErr) { - __FLOG(_L8("HandlePlaybackCommandCompleteL - Entry")); - __FLOG_1(_L8("aErr %d"), aErr); - + OstTraceFunctionEntry0( CMTPPBCSKIP_HANDLEPLAYBACKCOMMANDCOMPLETEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPBCSKIP_HANDLEPLAYBACKCOMMANDCOMPLETEL, "aErr %d", aErr ); + //Handle error response. TMTPResponseCode response; switch(aErr) @@ -157,8 +159,8 @@ if(aCmd != NULL) { __ASSERT_DEBUG((aCmd->PlaybackCommand() == iPbCmd->PlaybackCommand()), Panic(EMTPPBArgumentErr)); - __FLOG_1(_L8("aCmd %d"), aCmd->PlaybackCommand()); + OstTrace1( TRACE_NORMAL, DUP1_CMTPPBCSKIP_HANDLEPLAYBACKCOMMANDCOMPLETEL, "aCmd %d", aCmd->PlaybackCommand() ); } - __FLOG(_L8("HandlePlaybackCommandCompleteL - Exit")); + OstTraceFunctionExit0( CMTPPBCSKIP_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/src/cmtpplaybackcontroldp.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/src/cmtpplaybackcontroldp.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/src/cmtpplaybackcontroldp.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -30,10 +30,12 @@ #include "mmtpplaybackinterface.h" #include "cmtpplaybackevent.h" #include "mtpplaybackcontrolpanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpplaybackcontroldpTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"PlaybackControlDataProvider");) static const TInt KMTPPlaybackControlDpSessionGranularity(3); /** @@ -44,10 +46,12 @@ */ TAny* CMTPPlaybackControlDataProvider::NewL(TAny* aParams) { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_NEWL_ENTRY ); CMTPPlaybackControlDataProvider* self = new (ELeave) CMTPPlaybackControlDataProvider(aParams); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_NEWL_EXIT ); return self; } @@ -56,7 +60,7 @@ */ CMTPPlaybackControlDataProvider::~CMTPPlaybackControlDataProvider() { - __FLOG(_L8("~CMTPPlaybackControlDataProvider - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_CMTPPLAYBACKCONTROLDATAPROVIDER_ENTRY ); TInt count = iActiveProcessors.Count(); while(count--) { @@ -69,24 +73,25 @@ { iPlaybackControl->Close(); } - __FLOG(_L8("~CMTPPlaybackControlDataProvider - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_CMTPPLAYBACKCONTROLDATAPROVIDER_EXIT ); } void CMTPPlaybackControlDataProvider::Cancel() { +OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_CANCEL_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_CANCEL_EXIT ); } void CMTPPlaybackControlDataProvider::ProcessEventL(const TMTPTypeEvent& /*aEvent*/, MMTPConnection& /*aConnection*/) { - __FLOG(_L8("ProcessEventL - Entry")); - __FLOG(_L8("ProcessEventL - Exit")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_PROCESSEVENTL_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_PROCESSEVENTL_EXIT ); } void CMTPPlaybackControlDataProvider::ProcessNotificationL(TMTPNotification aNotification, const TAny* aParams) { - __FLOG(_L8("ProcessNotificationL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_PROCESSNOTIFICATIONL_ENTRY ); switch (aNotification) { case EMTPSessionClosed: @@ -100,12 +105,12 @@ // Ignore all other notifications. break; } - __FLOG(_L8("ProcessNotificationL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_PROCESSNOTIFICATIONL_EXIT ); } void CMTPPlaybackControlDataProvider::ProcessRequestPhaseL(TMTPTransactionPhase aPhase, const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG(_L8("ProcessRequestPhaseL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_PROCESSREQUESTPHASEL_ENTRY ); TInt index = LocateRequestProcessorL(aRequest, aConnection); __ASSERT_DEBUG(index != KErrNotFound, Panic(EMTPPBArgumentErr)); MMTPRequestProcessor* processor = iActiveProcessors[index]; @@ -122,12 +127,12 @@ iActiveProcessors.Remove(index); } iActiveProcessor = -1; - __FLOG(_L8("ProcessRequestPhaseL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_PROCESSREQUESTPHASEL_EXIT ); } void CMTPPlaybackControlDataProvider::Supported(TMTPSupportCategory aCategory, RArray& aArray) const { - __FLOG(_L8("Supported - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_SUPPORTED_ENTRY ); switch (aCategory) { @@ -165,7 +170,7 @@ // Unrecognised category, leave aArray unmodified. break; } - __FLOG(_L8("Supported - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_SUPPORTED_EXIT ); } /** @@ -177,7 +182,9 @@ iActiveProcessor(-1), iRequestToResetPbCtrl(EFalse) { +OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKCONTROLDATAPROVIDER_CMTPPLAYBACKCONTROLDATAPROVIDER_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKCONTROLDATAPROVIDER_CMTPPLAYBACKCONTROLDATAPROVIDER_EXIT ); } /** @@ -185,23 +192,22 @@ */ void CMTPPlaybackControlDataProvider::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_CONSTRUCTL_ENTRY ); iPlaybackProperty = CMTPPlaybackProperty::NewL(); iPlaybackMap = CMTPPlaybackMap::NewL(Framework(),*iPlaybackProperty); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_CONSTRUCTL_EXIT ); } void CMTPPlaybackControlDataProvider::SendEventL(TMTPDevicePropertyCode aPropCode) { - __FLOG(_L8("SendEventL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_SENDEVENTL_ENTRY ); iEvent.Reset(); iEvent.SetUint16(TMTPTypeEvent::EEventCode, EMTPEventCodeDevicePropChanged ); iEvent.SetUint32(TMTPTypeEvent::EEventSessionID, KMTPSessionAll); iEvent.SetUint32(TMTPTypeEvent::EEventTransactionID, KMTPTransactionIdNone); iEvent.SetUint32(TMTPTypeEvent::EEventParameter1, aPropCode); Framework().SendEventL(iEvent); - __FLOG(_L8("SendEventL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_SENDEVENTL_EXIT ); } /** @@ -212,7 +218,7 @@ */ TInt CMTPPlaybackControlDataProvider::LocateRequestProcessorL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG(_L8("LocateRequestProcessorL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY ); TInt index = KErrNotFound; TInt count = iActiveProcessors.Count(); for(TInt i = 0; i < count; i++) @@ -233,7 +239,7 @@ index = count; } - __FLOG(_L8("LocateRequestProcessorL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT ); return index; } @@ -243,7 +249,7 @@ */ void CMTPPlaybackControlDataProvider::SessionClosedL(const TMTPNotificationParamsSessionChange& aSession) { - __FLOG(_L8("SessionClosedL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_SESSIONCLOSEDL_ENTRY ); TInt count = iActiveProcessors.Count(); while (count--) { @@ -269,43 +275,39 @@ iPlaybackControl = NULL; } - __FLOG(_L8("SessionClosedL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_SESSIONCLOSEDL_EXIT ); } /** Prepares for a newly-opened session. @param aSession notification parameter block */ -#ifdef __FLOG_ACTIVE void CMTPPlaybackControlDataProvider::SessionOpenedL(const TMTPNotificationParamsSessionChange& aSession) -#else -void CMTPPlaybackControlDataProvider::SessionOpenedL(const TMTPNotificationParamsSessionChange& /*aSession*/) -#endif { - __FLOG(_L8("SessionOpenedL - Entry")); - __FLOG_VA((_L8("SessionID = %d"), aSession.iMTPId)); - __FLOG(_L8("SessionOpenedL - Exit")); + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKCONTROLDATAPROVIDER_SESSIONOPENEDL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPPLAYBACKCONTROLDATAPROVIDER_SESSIONOPENEDL, "SessionID = %d", aSession.iMTPId ); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_SESSIONOPENEDL_EXIT ); } void CMTPPlaybackControlDataProvider::StartObjectEnumerationL(TUint32 aStorageId, TBool /*aPersistentFullEnumeration*/) { - __FLOG(_L8("StartObjectEnumerationL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_STARTOBJECTENUMERATIONL_ENTRY ); //This DP doesn't manage data. Framework().ObjectEnumerationCompleteL(aStorageId); - __FLOG(_L8("StartObjectEnumerationL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_STARTOBJECTENUMERATIONL_EXIT ); } void CMTPPlaybackControlDataProvider::StartStorageEnumerationL() { - __FLOG(_L8("StartStorageEnumerationL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_STARTSTORAGEENUMERATIONL_ENTRY ); //This DP doesn't manage data. Framework().StorageEnumerationCompleteL(); - __FLOG(_L8("StartStorageEnumerationL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_STARTSTORAGEENUMERATIONL_EXIT ); } void CMTPPlaybackControlDataProvider::HandlePlaybackEventL(CMTPPlaybackEvent* aEvent, TInt aErr) { - __FLOG(_L8("HandlePlaybackEventL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL_ENTRY ); if(aErr != KPlaybackErrNone) { @@ -318,13 +320,14 @@ SendEventL(EMTPDevicePropCodePlaybackContainerIndex); SendEventL(EMTPDevicePropCodePlaybackPosition); } + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL_EXIT ); return; } __ASSERT_DEBUG((aEvent != NULL), Panic(EMTPPBDataNullErr)); - __ASSERT_ALWAYS((aEvent != NULL), User::Leave(KErrArgument)); - __FLOG_1(_L8("aEvent %d"), aEvent->PlaybackEvent()); - + __ASSERT_ALWAYS_OST((aEvent != NULL), OstTrace0( TRACE_ERROR, DUP1_CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL, "Error argument" ), User::Leave(KErrArgument)); + OstTrace1( TRACE_NORMAL, CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL, "aEvent %d", aEvent->PlaybackEvent()); + switch(aEvent->PlaybackEvent()) { case EPlaybackEventVolumeUpdate: @@ -349,28 +352,33 @@ break; default: - User::Leave(KErrArgument); + LEAVEIFERROR(KErrArgument, + OstTrace0( TRACE_ERROR, DUP2_CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL, "Error argument" )); break; } - __FLOG(_L8("HandlePlaybackEventL - Exit")); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL_EXIT ); } CMTPPlaybackMap& CMTPPlaybackControlDataProvider::GetPlaybackMap() const { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_GETPLAYBACKMAP_ENTRY ); __ASSERT_DEBUG((iPlaybackMap != NULL), Panic(EMTPPBDataNullErr)); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_GETPLAYBACKMAP_EXIT ); return *iPlaybackMap; } CMTPPlaybackProperty& CMTPPlaybackControlDataProvider::GetPlaybackProperty() const { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_GETPLAYBACKPROPERTY_ENTRY ); __ASSERT_DEBUG((iPlaybackProperty != NULL), Panic(EMTPPBDataNullErr)); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_GETPLAYBACKPROPERTY_EXIT ); return *iPlaybackProperty; } MMTPPlaybackControl& CMTPPlaybackControlDataProvider::GetPlaybackControlL() { - __FLOG(_L8("GetPlaybackControlL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_GETPLAYBACKCONTROLL_ENTRY ); if(iPlaybackControl == NULL) { iPlaybackControl = MMTPPlaybackControl::NewL(*this); @@ -382,11 +390,13 @@ iPlaybackControl = NULL; iPlaybackControl = MMTPPlaybackControl::NewL(*this); } - __FLOG(_L8("GetPlaybackControlL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_GETPLAYBACKCONTROLL_EXIT ); return *iPlaybackControl; } void CMTPPlaybackControlDataProvider::RequestToResetPbCtrl() { + OstTraceFunctionEntry0( CMTPPLAYBACKCONTROLDATAPROVIDER_REQUESTTORESETPBCTRL_ENTRY ); iRequestToResetPbCtrl = ETrue; + OstTraceFunctionExit0( CMTPPLAYBACKCONTROLDATAPROVIDER_REQUESTTORESETPBCTRL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/src/cmtpplaybackmap.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/src/cmtpplaybackmap.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/src/cmtpplaybackmap.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -26,10 +26,11 @@ #include "cmtpplaybackcommand.h" #include "cmtpplaybackcontroldp.h" #include "mtpplaybackcontrolpanic.h" - +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpplaybackmapTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"MTPPlaybackMap");) const TInt KPlaybackRatePlay = 1000; const TInt KPlaybackRatePause = 0; @@ -43,10 +44,12 @@ CMTPPlaybackMap* CMTPPlaybackMap::NewL(MMTPDataProviderFramework& aFramework, CMTPPlaybackProperty& aProperty) { + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_NEWL_ENTRY ); CMTPPlaybackMap* self = new (ELeave) CMTPPlaybackMap(aFramework, aProperty); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_NEWL_EXIT ); return self; } @@ -55,9 +58,8 @@ */ CMTPPlaybackMap::~CMTPPlaybackMap() { - __FLOG(_L8("~CMTPPlaybackMap - Entry")); - __FLOG(_L8("~CMTPPlaybackMap - Exit")); - __FLOG_CLOSE; + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_CMTPPLAYBACKMAP_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_CMTPPLAYBACKMAP_EXIT ); } /** @@ -67,6 +69,8 @@ CMTPPlaybackProperty& aProperty): iFramework(aFramework),iProperty(aProperty) { + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKMAP_CMTPPLAYBACKMAP_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKMAP_CMTPPLAYBACKMAP_EXIT ); } /** @@ -74,15 +78,14 @@ */ void CMTPPlaybackMap::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPPlaybackMap: ConstructL - Entry")); - __FLOG(_L8("CMTPPlaybackMap: ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_CONSTRUCTL_EXIT ); } TInt CMTPPlaybackMap::GetPlaybackControlCommand(const TMTPPbCtrlData& aData, CMTPPlaybackCommand** aCmd) { - __FLOG(_L8("GetPlaybackControlCommand - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_GETPLAYBACKCONTROLCOMMAND_ENTRY ); TInt result = KErrNotSupported; switch(aData.iOptCode) { @@ -106,21 +109,23 @@ default: break; } - __FLOG(_L8("GetPlaybackControlCommand - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_GETPLAYBACKCONTROLCOMMAND_EXIT ); return result; } TInt CMTPPlaybackMap::HandleSetDevicePropValue(const TMTPPbCtrlData& aData, CMTPPlaybackCommand** aCmd) { + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUE_ENTRY ); TRAPD(err, HandleSetDevicePropValueL(aData, aCmd)); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUE_EXIT ); return err; } void CMTPPlaybackMap::HandleSetDevicePropValueL(const TMTPPbCtrlData& aData, CMTPPlaybackCommand** aCmd) { - __FLOG(_L8("HandleSetDevicePropValueL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUEL_ENTRY ); __ASSERT_DEBUG((aData.iOptCode == EMTPOpCodeSetDevicePropValue) || (aData.iOptCode == EMTPOpCodeResetDevicePropValue), Panic(EMTPPBArgumentErr)); @@ -156,7 +161,8 @@ cmd = EPlaybackCmdSeekBackward; break; default: - User::Leave(KErrArgument); + LEAVEIFERROR( KErrArgument, + OstTrace0( TRACE_ERROR, CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUEL, "Error argument" )); break; } if(cmd != EPlaybackCmdNone) @@ -199,7 +205,8 @@ cat = EMTPPbCatMusic; break; default: - User::Leave(KErrArgument); + LEAVEIFERROR(KErrArgument, + OstTrace0( TRACE_ERROR, DUP1_CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUEL, "Error argument" )); break; } if(cat != EMTPPbCatNone) @@ -238,22 +245,25 @@ break; default: - User::Leave(KErrArgument); + LEAVEIFERROR(KErrArgument, + OstTrace0( TRACE_ERROR, DUP2_CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUEL, "Error argument" )); break; } - __FLOG(_L8("HandleSetDevicePropValueL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUEL_EXIT ); } TInt CMTPPlaybackMap::HandleGetDevicePropValue(const TMTPPbCtrlData& aData, CMTPPlaybackCommand** aCmd) { + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_HANDLEGETDEVICEPROPVALUE_ENTRY ); TRAPD(err, HandleGetDevicePropValueL(aData, aCmd)); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_HANDLEGETDEVICEPROPVALUE_EXIT ); return err; } void CMTPPlaybackMap::HandleGetDevicePropValueL(const TMTPPbCtrlData& aData, CMTPPlaybackCommand** aCmd) { - __FLOG(_L8("HandleGetDevicePropValueL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_HANDLEGETDEVICEPROPVALUEL_ENTRY ); __ASSERT_DEBUG((aData.iOptCode == EMTPOpCodeGetDevicePropValue) || (aData.iOptCode == EMTPOpCodeGetDevicePropDesc), Panic(EMTPPBArgumentErr)); @@ -296,34 +306,37 @@ break; default: - User::Leave(KErrArgument); + LEAVEIFERROR(KErrArgument, + OstTrace0( TRACE_ERROR, CMTPPLAYBACKMAP_HANDLEGETDEVICEPROPVALUEL, "Error argument" )); break; } - __FLOG(_L8("HandleGetDevicePropValueL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_HANDLEGETDEVICEPROPVALUEL_EXIT ); } TInt CMTPPlaybackMap::HandleSkip(const TMTPPbCtrlData& aData, CMTPPlaybackCommand** aCmd) { + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_HANDLESKIP_ENTRY ); TRAPD(err, HandleSkipL(aData, aCmd)); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_HANDLESKIP_EXIT ); return err; } void CMTPPlaybackMap::HandleSkipL(const TMTPPbCtrlData& aData, CMTPPlaybackCommand** aCmd) { - __FLOG(_L8("HandleSkipL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_HANDLESKIPL_ENTRY ); TInt32 step = aData.iPropValInt32.Value(); CMTPPbCmdParam* param = CMTPPbCmdParam::NewL(step); CleanupStack::PushL(param); *aCmd = CMTPPlaybackCommand::NewL(EPlaybackCmdSkip, param); CleanupStack::Pop(param); - __FLOG(_L8("HandleSkipL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_HANDLESKIPL_EXIT ); } TInt32 CMTPPlaybackMap::PlaybackRateL(TMTPPlaybackState aState) { - __FLOG(_L8("PlaybackRate - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_PLAYBACKRATEL_ENTRY ); TInt32 rate = KPlaybackRatePause; switch(aState) { @@ -344,35 +357,36 @@ break; default: - User::Leave(KErrArgument); + LEAVEIFERROR(KErrArgument, + OstTrace0( TRACE_ERROR, CMTPPLAYBACKMAP_PLAYBACKRATEL, "Error argument" )); break; } - __FLOG(_L8("PlaybackRate - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_PLAYBACKRATEL_EXIT ); return rate; } TUint32 CMTPPlaybackMap::ObjectHandleL(const TDesC& aSuid) { - __FLOG(_L8("ObjectHandleL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_OBJECTHANDLEL_ENTRY ); CMTPObjectMetaData* meta(CMTPObjectMetaData::NewLC()); TBool result = iFramework.ObjectMgr().ObjectL(aSuid, *meta); - __ASSERT_ALWAYS(result, User::Leave(KErrBadHandle)); + __ASSERT_ALWAYS_OST(result,OstTrace0( TRACE_ERROR, CMTPPLAYBACKMAP_OBJECTHANDLEL, "bad handle" ), User::Leave(KErrBadHandle)); __ASSERT_DEBUG(meta, Panic(EMTPPBDataNullErr)); TUint32 handle = meta->Uint(CMTPObjectMetaData::EHandle); CleanupStack::PopAndDestroy(meta); - __FLOG(_L8("ObjectHandleL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_OBJECTHANDLEL_EXIT ); return handle; } void CMTPPlaybackMap::GetObjecInfoFromHandleL(TUint32 aHandle, TDes& aSuid, TUint& aFormat) const { - __FLOG(_L8("GetObjecInfoFromHandleL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKMAP_GETOBJECINFOFROMHANDLEL_ENTRY ); CMTPObjectMetaData* meta(CMTPObjectMetaData::NewLC()); TBool result = iFramework.ObjectMgr().ObjectL(aHandle, *meta); - __ASSERT_ALWAYS(result, User::Leave(KErrBadHandle)); + __ASSERT_ALWAYS_OST(result, OstTrace0( TRACE_ERROR, CMTPPLAYBACKMAP_GETOBJECINFOFROMHANDLEL, "bad handle" ), User::Leave(KErrBadHandle)); __ASSERT_DEBUG(meta, Panic(EMTPPBDataNullErr)); aSuid = meta->DesC(CMTPObjectMetaData::ESuid); aFormat = meta->Uint(CMTPObjectMetaData::EFormatCode); CleanupStack::PopAndDestroy(meta); - __FLOG(_L8("GetObjecInfoFromHandleL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKMAP_GETOBJECINFOFROMHANDLEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/src/cmtpplaybackproperty.cpp --- a/mtpdataproviders/mtpplaybackcontroldp/src/cmtpplaybackproperty.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpdataproviders/mtpplaybackcontroldp/src/cmtpplaybackproperty.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,9 +21,11 @@ #include "cmtpplaybackmap.h" #include "cmtpplaybackproperty.h" #include "mtpplaybackcontrolpanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpplaybackpropertyTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"MTPPlaybackProperty");) const TInt32 KMTPDefaultPlaybackRate = 0; @@ -44,10 +46,12 @@ */ CMTPPlaybackProperty* CMTPPlaybackProperty::NewL() { + OstTraceFunctionEntry0( CMTPPLAYBACKPROPERTY_NEWL_ENTRY ); CMTPPlaybackProperty* self = new (ELeave) CMTPPlaybackProperty(); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CMTPPLAYBACKPROPERTY_NEWL_EXIT ); return self; } @@ -56,10 +60,9 @@ */ CMTPPlaybackProperty::~CMTPPlaybackProperty() { - __FLOG(_L8("~CMTPPlaybackProperty - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKPROPERTY_CMTPPLAYBACKPROPERTY_ENTRY ); delete iPlaybackVolumeData; - __FLOG(_L8("~CMTPPlaybackProperty - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPLAYBACKPROPERTY_CMTPPLAYBACKPROPERTY_EXIT ); } /** @@ -67,6 +70,8 @@ */ CMTPPlaybackProperty::CMTPPlaybackProperty() { + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKPROPERTY_CMTPPLAYBACKPROPERTY_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKPROPERTY_CMTPPLAYBACKPROPERTY_EXIT ); } /** @@ -74,24 +79,24 @@ */ void CMTPPlaybackProperty::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPPLAYBACKPROPERTY_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPPLAYBACKPROPERTY_CONSTRUCTL_EXIT ); } void CMTPPlaybackProperty::GetDefaultPropertyValueL(TMTPDevicePropertyCode aProp, TInt32& aValue) { - __FLOG(_L8("GetDefaultPropertyValueL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL_ENTRY ); - __ASSERT_ALWAYS((aProp == EMTPDevicePropCodePlaybackRate), User::Leave(KErrArgument)); + __ASSERT_ALWAYS_OST((aProp == EMTPDevicePropCodePlaybackRate), OstTrace0( TRACE_ERROR, CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL, "Error argument" ), User::Leave(KErrArgument)); + aValue = KMTPDefaultPlaybackRate; - __FLOG(_L8("GetDefaultPropertyValueL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL_EXIT ); } void CMTPPlaybackProperty::GetDefaultPropertyValueL(TMTPDevicePropertyCode aProp, TUint32& aValue) { - __FLOG(_L8("GetDefaultPropertyValueL - Entry")); + OstTraceFunctionEntry0( DUP1_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL_ENTRY ); switch(aProp) { case EMTPDevicePropCodeVolume: @@ -126,13 +131,15 @@ break; default: - User::Leave(KErrArgument); + LEAVEIFERROR(KErrArgument, + OstTrace0( TRACE_ERROR, DUP1_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL, "Error argument" )); } - __FLOG(_L8("GetDefaultPropertyValueL - Exit")); + OstTraceFunctionExit0( DUP1_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL_EXIT ); } void CMTPPlaybackProperty::GetDefaultVolSet(TMTPPbDataVolume& aValue) { + OstTraceFunctionEntry0( CMTPPLAYBACKPROPERTY_GETDEFAULTVOLSET_ENTRY ); if(iPlaybackVolumeData == NULL) { aValue.SetVolume(KMTPMaxPlaybackVolume, @@ -145,10 +152,12 @@ { aValue = (*iPlaybackVolumeData); } + OstTraceFunctionExit0( CMTPPLAYBACKPROPERTY_GETDEFAULTVOLSET_EXIT ); } void CMTPPlaybackProperty::SetDefaultVolSetL(const TMTPPbDataVolume& aValue) { + OstTraceFunctionEntry0( CMTPPLAYBACKPROPERTY_SETDEFAULTVOLSETL_ENTRY ); if(iPlaybackVolumeData == NULL) { iPlaybackVolumeData = new (ELeave) TMTPPbDataVolume(aValue); @@ -157,11 +166,12 @@ { (*iPlaybackVolumeData) = aValue; } + OstTraceFunctionExit0( CMTPPLAYBACKPROPERTY_SETDEFAULTVOLSETL_EXIT ); } void CMTPPlaybackProperty::GetDefaultPropertyValueL(TMTPPbCtrlData& aValue) { - __FLOG(_L8("GetDefaultPropertyValueL - Entry")); + OstTraceFunctionEntry0( DUP2_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL_ENTRY ); __ASSERT_DEBUG((aValue.iOptCode == EMTPOpCodeResetDevicePropValue), Panic(EMTPPBArgumentErr)); switch(aValue.iDevPropCode) @@ -186,14 +196,15 @@ break; default: - User::Leave(KErrArgument); + LEAVEIFERROR(KErrArgument, + OstTrace0( TRACE_ERROR, DUP2_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL, "Error argument" )); } - __FLOG(_L8("GetDefaultPropertyValueL - Exit")); + OstTraceFunctionExit0( DUP2_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL_EXIT ); } TBool CMTPPlaybackProperty::IsDefaultPropertyValueL(const TMTPPbCtrlData& aValue) const { - __FLOG(_L8("EqualToDefaultPropertyValueL - Entry")); + OstTraceFunctionEntry0( CMTPPLAYBACKPROPERTY_ISDEFAULTPROPERTYVALUEL_ENTRY ); TInt result(EFalse); @@ -255,11 +266,12 @@ break; default: - User::Leave(KErrArgument); + LEAVEIFERROR(KErrArgument, + OstTrace0( TRACE_ERROR, CMTPPLAYBACKPROPERTY_ISDEFAULTPROPERTYVALUEL, "error argument" )); } - __FLOG(_L8("EqualToDefaultPropertyValueL - Exit")); + OstTraceFunctionExit0( CMTPPLAYBACKPROPERTY_ISDEFAULTPROPERTYVALUEL_EXIT ); return result; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpdataproviders/mtpplaybackcontroldp/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpdataproviders/mtpplaybackcontroldp/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpdataproviders/mtpplaybackcontroldp/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,563 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_NORMAL=0x86 +[TRACE]TRACE_ERROR[0x82]_CINTERNETCONNECTIONHANDLER_CONSTRUCTL=0x35 +[TRACE]TRACE_ERROR[0x82]_CMTPPBCMDPARAM_CONSTRUCTL=0x32 +[TRACE]TRACE_ERROR[0x82]_CMTPPBCMDPARAM_VOLUMESETL=0x17 +[TRACE]TRACE_ERROR[0x82]_CMTPPBPARAMBASE_CONSTRUCTL=0x1c +[TRACE]TRACE_ERROR[0x82]_CMTPPBPARAMBASE_INT32L=0x2b +[TRACE]TRACE_ERROR[0x82]_CMTPPBPARAMBASE_SUIDSETL=0x1e +[TRACE]TRACE_ERROR[0x82]_CMTPPBPARAMBASE_UINT32L=0x2c +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKCOMMAND_NEWL=0x18 +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKCOMMAND_PARAML=0x19 +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKEVENT_NEWL=0x1a +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKMAP_GETOBJECINFOFROMHANDLEL=0xa +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKMAP_HANDLEGETDEVICEPROPVALUEL=0x8 +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUEL=0x3c +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKMAP_OBJECTHANDLEL=0x34 +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKMAP_PLAYBACKRATEL=0x9 +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKPLAYLISTHELPER_COLLECTIONHELPERL=0x23 +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKPLAYLISTHELPER_FINDALBUMSONGSL=0x27 +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKPLAYLISTHELPER_ITEMIDTOURIL=0x25 +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKPLAYLISTHELPER_UPDATEALBUMPATHANDOPENL=0x2a +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL=0x3f +[TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKPROPERTY_ISDEFAULTPROPERTYVALUEL=0x12 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPBPARAMBASE_CONSTRUCTL=0x1d +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPLAYBACKCOMMANDCHECKER_CHECKANDUPDATEPLAYBACKPARAML=0x21 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL=0x3a +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUEL=0xf +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPLAYBACKPLAYLISTHELPER_COLLECTIONHELPERL=0x2f +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPLAYBACKPLAYLISTHELPER_FINDALBUMSONGSL=0x28 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPLAYBACKPLAYLISTHELPER_ITEMIDTOURIL=0x26 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL=0x40 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x3e +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x38 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPLAYBACKCOMMANDCHECKER_CHECKANDUPDATEPLAYBACKPARAML=0x22 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL=0x1f +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL=0x3b +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUEL=0x3d +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPLAYBACKPLAYLISTHELPER_COLLECTIONHELPERL=0x30 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPLAYBACKPLAYLISTHELPER_FINDALBUMSONGSL=0x29 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL=0x41 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x42 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x39 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL=0x2d +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x43 +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL=0x2e +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPDESC_CHECKREQUESTL_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPDESC_CHECKREQUESTL_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPDESC_CMTPPBCGETDEVICEPROPDESC_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPDESC_CMTPPBCGETDEVICEPROPDESC_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPDESC_NEWL_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPDESC_NEWL_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPDESC_SERVICEL_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPDESC_SERVICEL_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPVALUE_CHECKREQUESTL_ENTRY=0x15 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPVALUE_CHECKREQUESTL_EXIT=0x16 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPVALUE_CMTPPBCGETDEVICEPROPVALUE_ENTRY=0x11 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPVALUE_CMTPPBCGETDEVICEPROPVALUE_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_ENTRY=0x19 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT=0x1a +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPVALUE_NEWL_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPVALUE_NEWL_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPVALUE_SERVICEL_ENTRY=0x17 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCGETDEVICEPROPVALUE_SERVICEL_EXIT=0x18 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCMDPARAM_CMTPPBCMDPARAM_ENTRY=0xb8 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCMDPARAM_CMTPPBCMDPARAM_EXIT=0xb9 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCMDPARAM_CONSTRUCTL_ENTRY=0xc4 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCMDPARAM_CONSTRUCTL_EXIT=0xc5 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCMDPARAM_NEWL_ENTRY=0xae +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCMDPARAM_NEWL_EXIT=0xaf +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCMDPARAM_VOLUMESETL_ENTRY=0xce +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCMDPARAM_VOLUMESETL_EXIT=0x1b4 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCRESETDEVICEPROPVALUE_CHECKREQUESTL_ENTRY=0x23 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCRESETDEVICEPROPVALUE_CHECKREQUESTL_EXIT=0x24 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCRESETDEVICEPROPVALUE_CMTPPBCRESETDEVICEPROPVALUE_ENTRY=0x1f +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCRESETDEVICEPROPVALUE_CMTPPBCRESETDEVICEPROPVALUE_EXIT=0x20 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCRESETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_ENTRY=0x27 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCRESETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT=0x28 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCRESETDEVICEPROPVALUE_NEWL_ENTRY=0x1d +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCRESETDEVICEPROPVALUE_NEWL_EXIT=0x1e +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCRESETDEVICEPROPVALUE_SERVICEL_ENTRY=0x25 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCRESETDEVICEPROPVALUE_SERVICEL_EXIT=0x26 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSETDEVICEPROPVALUE_CHECKREQUESTL_ENTRY=0x2f +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSETDEVICEPROPVALUE_CHECKREQUESTL_EXIT=0x30 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSETDEVICEPROPVALUE_CMTPPBCSETDEVICEPROPVALUE_ENTRY=0x2b +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSETDEVICEPROPVALUE_CMTPPBCSETDEVICEPROPVALUE_EXIT=0x2c +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSETDEVICEPROPVALUE_DOHANDLERESPONSEPHASEL_ENTRY=0x31 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSETDEVICEPROPVALUE_DOHANDLERESPONSEPHASEL_EXIT=0x32 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_ENTRY=0x35 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT=0x36 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSETDEVICEPROPVALUE_NEWL_ENTRY=0x29 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSETDEVICEPROPVALUE_NEWL_EXIT=0x2a +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSETDEVICEPROPVALUE_SERVICEL_ENTRY=0x33 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSETDEVICEPROPVALUE_SERVICEL_EXIT=0x34 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSKIP_CHECKREQUESTL_ENTRY=0x3d +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSKIP_CHECKREQUESTL_EXIT=0x3e +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSKIP_CMTPPBCSKIP_ENTRY=0x39 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSKIP_CMTPPBCSKIP_EXIT=0x3a +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSKIP_HANDLEPLAYBACKCOMMANDCOMPLETEL_ENTRY=0x41 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSKIP_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT=0x42 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSKIP_NEWL_ENTRY=0x37 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSKIP_NEWL_EXIT=0x38 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSKIP_SERVICEL_ENTRY=0x3f +[TRACE]TRACE_FLOW[0x8A]_CMTPPBCSKIP_SERVICEL_EXIT=0x40 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_ENTRY=0xe9 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_EXIT=0xea +[TRACE]TRACE_FLOW[0x8A]_CMTPPBEVENTPARAM_NEWL_ENTRY=0xe3 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBEVENTPARAM_NEWL_EXIT=0xe4 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_CMTPPBPARAMBASE_ENTRY=0x1bc +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_CMTPPBPARAMBASE_EXIT=0x1bd +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_CONSTRUCTL_ENTRY=0x1c6 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_CONSTRUCTL_EXIT=0x1c7 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_GETDATA_ENTRY=0x1d2 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_GETDATA_EXIT=0x1d3 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_INT32L_ENTRY=0x1d7 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_SETDATA_ENTRY=0x1d4 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_SETDATA_EXIT=0x1d5 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_SETTYPE_ENTRY=0x1d0 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_SETTYPE_EXIT=0x1d1 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_SUIDSETL_ENTRY=0x1d6 +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_TYPE_ENTRY=0x1ce +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_TYPE_EXIT=0x1cf +[TRACE]TRACE_FLOW[0x8A]_CMTPPBPARAMBASE_UINT32L_ENTRY=0x1d8 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMANDCHECKER_CHECKANDUPDATEPLAYBACKPARAML_ENTRY=0x105 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMANDCHECKER_CHECKANDUPDATEPLAYBACKPARAML_EXIT=0x106 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL_ENTRY=0x103 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL_EXIT=0x104 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMANDCHECKER_CMTPPLAYBACKCOMMANDCHECKER_ENTRY=0x101 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMANDCHECKER_CMTPPLAYBACKCOMMANDCHECKER_EXIT=0x102 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMANDCHECKER_MTPPLAYBACKCONTROLIMPL_ENTRY=0x109 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMANDCHECKER_MTPPLAYBACKCONTROLIMPL_EXIT=0x10a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMANDCHECKER_NEWL_ENTRY=0xff +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMANDCHECKER_NEWL_EXIT=0x100 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_CMTPPLAYBACKCOMMAND_ENTRY=0xd3 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_CMTPPLAYBACKCOMMAND_EXIT=0xd4 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_CONSTRUCTL_ENTRY=0xd7 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_CONSTRUCTL_EXIT=0xd8 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_HASPARAM_ENTRY=0xdd +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_HASPARAM_EXIT=0xde +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_NEWL_ENTRY=0xcf +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_NEWL_EXIT=0xd0 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_PARAML_ENTRY=0xdf +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_PARAML_EXIT=0x1b5 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_PLAYBACKCOMMAND_ENTRY=0xdb +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_PLAYBACKCOMMAND_EXIT=0xdc +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_SETPARAM_ENTRY=0xe1 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_SETPARAM_EXIT=0xe2 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_CANCEL_ENTRY=0x47 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_CANCEL_EXIT=0x48 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_CMTPPLAYBACKCONTROLDATAPROVIDER_ENTRY=0x45 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_CMTPPLAYBACKCONTROLDATAPROVIDER_EXIT=0x46 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_CONSTRUCTL_ENTRY=0x53 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_CONSTRUCTL_EXIT=0x54 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_GETPLAYBACKCONTROLL_ENTRY=0x68 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_GETPLAYBACKCONTROLL_EXIT=0x69 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_GETPLAYBACKMAP_ENTRY=0x64 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_GETPLAYBACKMAP_EXIT=0x65 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_GETPLAYBACKPROPERTY_ENTRY=0x66 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_GETPLAYBACKPROPERTY_EXIT=0x67 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL_ENTRY=0x61 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL_EXIT=0x62 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_LOCATEREQUESTPROCESSORL_ENTRY=0x57 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_LOCATEREQUESTPROCESSORL_EXIT=0x58 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_NEWL_ENTRY=0x43 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_NEWL_EXIT=0x44 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_PROCESSEVENTL_ENTRY=0x49 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_PROCESSEVENTL_EXIT=0x4a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_PROCESSNOTIFICATIONL_ENTRY=0x4b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_PROCESSNOTIFICATIONL_EXIT=0x4c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_PROCESSREQUESTPHASEL_ENTRY=0x4d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_PROCESSREQUESTPHASEL_EXIT=0x4e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_REQUESTTORESETPBCTRL_ENTRY=0x6a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_REQUESTTORESETPBCTRL_EXIT=0x6b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_SENDEVENTL_ENTRY=0x55 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_SENDEVENTL_EXIT=0x56 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_SESSIONCLOSEDL_ENTRY=0x59 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_SESSIONCLOSEDL_EXIT=0x5a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_SESSIONOPENEDL_EXIT=0x5c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_STARTOBJECTENUMERATIONL_ENTRY=0x5d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_STARTOBJECTENUMERATIONL_EXIT=0x5e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_STARTSTORAGEENUMERATIONL_ENTRY=0x5f +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_STARTSTORAGEENUMERATIONL_EXIT=0x60 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_SUPPORTED_ENTRY=0x4f +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_SUPPORTED_EXIT=0x50 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_CHECKPLAYBACKCMDANDCACHEL_ENTRY=0x127 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_CHECKPLAYBACKCMDANDCACHEL_EXIT=0x128 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_CLOSE_ENTRY=0x10d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_CLOSE_EXIT=0x10e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_CMTPPLAYBACKCONTROLIMPL_ENTRY=0x10f +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_CMTPPLAYBACKCONTROLIMPL_EXIT=0x110 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_COMMANDL_ENTRY=0x111 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_COMMANDL_EXIT=0x112 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_COMPLETESELF_ENTRY=0x146 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_COMPLETESELF_EXIT=0x147 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_CONSTRUCTL_ENTRY=0x121 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_CONSTRUCTL_EXIT=0x122 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_CURRENTSTATE_ENTRY=0x152 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_CURRENTSTATE_EXIT=0x153 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DEACTIVEOTHERPLAYERL_ENTRY=0x125 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DEACTIVEOTHERPLAYERL_EXIT=0x126 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOCANCEL_ENTRY=0x11b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOCANCEL_EXIT=0x11c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOCOMMANDL_ENTRY=0x12d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOCOMMANDL_EXIT=0x12e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEERROR_ENTRY=0x13c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEERROR_EXIT=0x13d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEINITIALIZECOMPLETEL_ENTRY=0x13a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEINITIALIZECOMPLETEL_EXIT=0x13b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEMEDIACHANGEDL_ENTRY=0x138 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEMEDIACHANGEDL_EXIT=0x139 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEMEDIAL_ENTRY=0x136 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEMEDIAL_EXIT=0x137 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEPLAYBACKMESSAGEL_ENTRY=0x130 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEPLAYBACKMESSAGEL_EXIT=0x131 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEPROPERTYL_ENTRY=0x132 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEPROPERTYL_EXIT=0x133 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLESTATECHANGEDL_ENTRY=0x134 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_DOHANDLESTATECHANGEDL_EXIT=0x135 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_GETPLAYLISTFROMCOLLECTIONCOMPLETEL_ENTRY=0x123 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_GETPLAYLISTFROMCOLLECTIONCOMPLETEL_EXIT=0x124 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_HANDLEMEDIAL_ENTRY=0x119 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_HANDLEMEDIAL_EXIT=0x11a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_HANDLEPLAYBACKMESSAGE_ENTRY=0x113 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_HANDLEPLAYBACKMESSAGE_EXIT=0x114 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_HANDLEPROPERTYL_ENTRY=0x115 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_HANDLEPROPERTYL_EXIT=0x116 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_HANDLESUBPLAYERNAMESL_ENTRY=0x117 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_HANDLESUBPLAYERNAMESL_EXIT=0x118 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_IFEQUAL_ENTRY=0x13e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_IFEQUAL_EXIT=0x13f +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_INITIATEMPXPLAYBACKCOMMANDL_ENTRY=0x148 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_INITIATEMPXPLAYBACKCOMMANDL_EXIT=0x149 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_MAPERROR_ENTRY=0x144 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_MAPERROR_EXIT=0x145 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_MAPSTATE_ENTRY=0x142 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_MAPSTATE_EXIT=0x143 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_MTPPBCMDHANDLING_ENTRY=0x15c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_MTPPBCMDHANDLING_EXIT=0x15d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_NEWL_ENTRY=0x10b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_NEWL_EXIT=0x10c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_PREVIOUSSTATE_ENTRY=0x154 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_PREVIOUSSTATE_EXIT=0x155 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_REQUESTMEDIAL_ENTRY=0x12b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_REQUESTMEDIAL_EXIT=0x12c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_RESETPLAYBACKCOMMAND_ENTRY=0x150 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_RESETPLAYBACKCOMMAND_EXIT=0x151 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_RUNL_ENTRY=0x11d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_RUNL_EXIT=0x11e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_SENDMPXPLAYBACKCOMMANDL_ENTRY=0x14a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_SENDMPXPLAYBACKCOMMANDL_EXIT=0x14b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_SENDPLAYBACKCOMMANDCOMPLETEL_ENTRY=0x14c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_SENDPLAYBACKCOMMANDCOMPLETEL_EXIT=0x14d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_SENDPLAYBACKEVENTL_ENTRY=0x14e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_SENDPLAYBACKEVENTL_EXIT=0x14f +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_SETMTPPBCMD_ENTRY=0x15a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_SETMTPPBCMD_EXIT=0x15b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_SONGCOUNT_ENTRY=0x156 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_SONGCOUNT_EXIT=0x157 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_SONGINDEX_ENTRY=0x158 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_SONGINDEX_EXIT=0x159 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_UPDATECOMMANDARRAY_ENTRY=0x129 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLIMPL_UPDATECOMMANDARRAY_EXIT=0x12a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKEVENT_CMTPPLAYBACKEVENT_ENTRY=0xf3 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKEVENT_CMTPPLAYBACKEVENT_EXIT=0xf4 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKEVENT_CONSTRUCTL_ENTRY=0xf7 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKEVENT_CONSTRUCTL_EXIT=0xf8 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKEVENT_NEWL_ENTRY=0xf1 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKEVENT_NEWL_EXIT=0xf2 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKEVENT_PARAML_ENTRY=0xfd +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKEVENT_PARAML_EXIT=0xfe +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKEVENT_PLAYBACKEVENT_ENTRY=0xfb +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKEVENT_PLAYBACKEVENT_EXIT=0xfc +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKEVENT_SETPARAM_ENTRY=0xf9 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKEVENT_SETPARAM_EXIT=0xfa +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_CMTPPLAYBACKMAP_ENTRY=0x6e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_CMTPPLAYBACKMAP_EXIT=0x6f +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_CONSTRUCTL_ENTRY=0x72 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_CONSTRUCTL_EXIT=0x73 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_GETOBJECINFOFROMHANDLEL_ENTRY=0x86 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_GETOBJECINFOFROMHANDLEL_EXIT=0x87 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_GETPLAYBACKCONTROLCOMMAND_ENTRY=0x74 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_GETPLAYBACKCONTROLCOMMAND_EXIT=0x75 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_HANDLEGETDEVICEPROPVALUEL_ENTRY=0x7c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_HANDLEGETDEVICEPROPVALUEL_EXIT=0x7d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_HANDLEGETDEVICEPROPVALUE_ENTRY=0x7a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_HANDLEGETDEVICEPROPVALUE_EXIT=0x7b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUEL_ENTRY=0x78 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUEL_EXIT=0x79 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUE_ENTRY=0x76 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUE_EXIT=0x77 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_HANDLESKIPL_ENTRY=0x80 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_HANDLESKIPL_EXIT=0x81 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_HANDLESKIP_ENTRY=0x7e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_HANDLESKIP_EXIT=0x7f +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_NEWL_ENTRY=0x6c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_NEWL_EXIT=0x6d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_OBJECTHANDLEL_ENTRY=0x84 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_OBJECTHANDLEL_EXIT=0x85 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_PLAYBACKRATEL_ENTRY=0x82 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKMAP_PLAYBACKRATEL_EXIT=0x83 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_CMTPPLAYBACKPLAYLISTHELPER_ENTRY=0x161 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_CMTPPLAYBACKPLAYLISTHELPER_EXIT=0x162 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_COLLECTIONHELPERL_ENTRY=0x185 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_COLLECTIONHELPERL_EXIT=0x186 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_CONSTRUCTL_ENTRY=0x177 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_CONSTRUCTL_EXIT=0x178 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_DOHANDLECOLLECTIONMESSAGEL=0x196 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_DOHANDLECOLLECTIONMESSAGEL_ENTRY=0x179 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_DOHANDLECOLLECTIONMESSAGEL_EXIT=0x17a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_DOHANDLEOPENL_ENTRY=0x17b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_DOHANDLEOPENL_EXIT=0x17c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_FINDALBUMSONGSL_ENTRY=0x18b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_FINDALBUMSONGSL_EXIT=0x18c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_GETMTPPBSUIDFROMCOLLECTIONL_ENTRY=0x167 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_GETMTPPBSUIDFROMCOLLECTIONL_EXIT=0x168 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_GETPLAYLISTFROMCOLLECTIONL_ENTRY=0x163 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_GETPLAYLISTFROMCOLLECTIONL_EXIT=0x164 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_HANDLECOLLECTIONMEDIAL_ENTRY=0x173 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_HANDLECOLLECTIONMEDIAL_EXIT=0x174 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_HANDLECOLLECTIONMESSAGE_ENTRY=0x16d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_HANDLECOLLECTIONMESSAGE_EXIT=0x16e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_HANDLEOPENL=0x194 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_HANDLEOPENL_ENTRY=0x16f +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_HANDLEOPENL_EXIT=0x170 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_ITEMIDTOURIL_ENTRY=0x189 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_ITEMIDTOURIL_EXIT=0x18a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_MTPPBCATEGORY_ENTRY=0x169 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_MTPPBCATEGORY_EXIT=0x16a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_MTPPBSUID_ENTRY=0x16b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_MTPPBSUID_EXIT=0x16c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_MTPPLAYBACKCONTROLIMPL_ENTRY=0x192 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_MTPPLAYBACKCONTROLIMPL_EXIT=0x193 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_NEWL_ENTRY=0x15f +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_NEWL_EXIT=0x160 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_OPENMUSICABLUMPATHL_ENTRY=0x17f +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_OPENMUSICABLUMPATHL_EXIT=0x180 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_OPENMUSICPLAYLISTPATHL_ENTRY=0x17d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_OPENMUSICPLAYLISTPATHL_EXIT=0x17e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_RESETPLAYSOURCE_ENTRY=0x181 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_RESETPLAYSOURCE_EXIT=0x182 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_UPDATEALBUMPATHANDOPENL_ENTRY=0x18d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_UPDATEALBUMPATHANDOPENL_EXIT=0x18e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_UPDATEPATHANDOPENL_ENTRY=0x190 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_UPDATEPATHANDOPENL_EXIT=0x191 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_UPDATEPLAYLISTPATHINDEXL_ENTRY=0x183 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_UPDATEPLAYLISTPATHINDEXL_EXIT=0x184 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_URITOITEMIDL_ENTRY=0x187 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPLAYLISTHELPER_URITOITEMIDL_EXIT=0x188 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_CMTPPLAYBACKPROPERTY_ENTRY=0x8a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_CMTPPLAYBACKPROPERTY_EXIT=0x8b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_CONSTRUCTL_ENTRY=0x8e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_CONSTRUCTL_EXIT=0x8f +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL_ENTRY=0x90 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL_EXIT=0x91 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_GETDEFAULTVOLSET_ENTRY=0x94 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_GETDEFAULTVOLSET_EXIT=0x95 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_ISDEFAULTPROPERTYVALUEL_ENTRY=0x9a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_ISDEFAULTPROPERTYVALUEL_EXIT=0x9b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_NEWL_ENTRY=0x88 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_NEWL_EXIT=0x89 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_SETDEFAULTVOLSETL_ENTRY=0x96 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKPROPERTY_SETDEFAULTVOLSETL_EXIT=0x97 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_CMTPPLAYBACKRESUMEHELPER_ENTRY=0x19a +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_CMTPPLAYBACKRESUMEHELPER_EXIT=0x19b +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDINITINDEX_ENTRY=0x1a4 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDINITINDEX_EXIT=0x1a5 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDINITOBJECT_ENTRY=0x1a2 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDINITOBJECT_EXIT=0x1a3 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDPAUSE_ENTRY=0x1a8 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDPAUSE_EXIT=0x1a9 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDPLAY_ENTRY=0x1a6 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDPLAY_EXIT=0x1a7 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSEEKBACKWARD_ENTRY=0x1ac +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSEEKBACKWARD_EXIT=0x1ad +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSEEKFORWARD_ENTRY=0x1aa +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSEEKFORWARD_EXIT=0x1ab +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSETPOSITION_ENTRY=0x1b0 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSETPOSITION_EXIT=0x1b1 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSKIP_ENTRY=0x1ae +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_HANDLEPLAYBACKCMDSKIP_EXIT=0x1af +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_MTPPLAYBACKCONTROLIMPL_ENTRY=0x1b2 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_MTPPLAYBACKCONTROLIMPL_EXIT=0x1b3 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_NEWL_ENTRY=0x198 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_NEWL_EXIT=0x199 +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_UPDATEPREPARECMDARRAY_ENTRY=0x19c +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_UPDATEPREPARECMDARRAY_EXIT=0x19d +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_UPDATERESUMECMDARRAY_ENTRY=0x19e +[TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKRESUMEHELPER_UPDATERESUMECMDARRAY_EXIT=0x19f +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCGETDEVICEPROPDESC_CMTPPBCGETDEVICEPROPDESC_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCGETDEVICEPROPDESC_CMTPPBCGETDEVICEPROPDESC_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT=0xd +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCGETDEVICEPROPVALUE_CMTPPBCGETDEVICEPROPVALUE_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCGETDEVICEPROPVALUE_CMTPPBCGETDEVICEPROPVALUE_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT=0x1b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCMDPARAM_CMTPPBCMDPARAM_ENTRY=0xba +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCMDPARAM_CMTPPBCMDPARAM_EXIT=0xbb +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCMDPARAM_CONSTRUCTL_ENTRY=0xc6 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCMDPARAM_CONSTRUCTL_EXIT=0xc7 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCMDPARAM_NEWL_ENTRY=0xb0 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCMDPARAM_NEWL_EXIT=0xb1 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCRESETDEVICEPROPVALUE_CMTPPBCRESETDEVICEPROPVALUE_ENTRY=0x21 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCRESETDEVICEPROPVALUE_CMTPPBCRESETDEVICEPROPVALUE_EXIT=0x22 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCSETDEVICEPROPVALUE_CMTPPBCSETDEVICEPROPVALUE_ENTRY=0x2d +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCSETDEVICEPROPVALUE_CMTPPBCSETDEVICEPROPVALUE_EXIT=0x2e +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCSKIP_CMTPPBCSKIP_ENTRY=0x3b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBCSKIP_CMTPPBCSKIP_EXIT=0x3c +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_ENTRY=0xeb +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_EXIT=0xec +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBEVENTPARAM_NEWL_ENTRY=0xe5 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBEVENTPARAM_NEWL_EXIT=0xe6 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBPARAMBASE_CMTPPBPARAMBASE_ENTRY=0x1be +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBPARAMBASE_CMTPPBPARAMBASE_EXIT=0x1bf +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBPARAMBASE_CONSTRUCTL_ENTRY=0x1c8 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPBPARAMBASE_CONSTRUCTL_EXIT=0x1c9 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCOMMANDCHECKER_CMTPPLAYBACKCOMMANDCHECKER_ENTRY=0x107 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCOMMANDCHECKER_CMTPPLAYBACKCOMMANDCHECKER_EXIT=0x108 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCOMMAND_CMTPPLAYBACKCOMMAND_ENTRY=0xd5 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCOMMAND_CMTPPLAYBACKCOMMAND_EXIT=0xd6 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCOMMAND_CONSTRUCTL_ENTRY=0xd9 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCOMMAND_CONSTRUCTL_EXIT=0xda +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCOMMAND_NEWL_ENTRY=0xd1 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCOMMAND_NEWL_EXIT=0xd2 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCONTROLDATAPROVIDER_CMTPPLAYBACKCONTROLDATAPROVIDER_ENTRY=0x51 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCONTROLDATAPROVIDER_CMTPPLAYBACKCONTROLDATAPROVIDER_EXIT=0x52 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL_EXIT=0x63 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCONTROLDATAPROVIDER_SESSIONOPENEDL_ENTRY=0x1d9 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCONTROLIMPL_CMTPPLAYBACKCONTROLIMPL_ENTRY=0x11f +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCONTROLIMPL_CMTPPLAYBACKCONTROLIMPL_EXIT=0x120 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCONTROLIMPL_DOCOMMANDL_EXIT=0x12f +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCONTROLIMPL_IFEQUAL_EXIT=0x140 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKCONTROLIMPL_MTPPBCMDHANDLING_EXIT=0x15e +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKEVENT_CMTPPLAYBACKEVENT_ENTRY=0xf5 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKEVENT_CMTPPLAYBACKEVENT_EXIT=0xf6 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKMAP_CMTPPLAYBACKMAP_ENTRY=0x70 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKMAP_CMTPPLAYBACKMAP_EXIT=0x71 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPLAYLISTHELPER_CMTPPLAYBACKPLAYLISTHELPER_ENTRY=0x175 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPLAYLISTHELPER_CMTPPLAYBACKPLAYLISTHELPER_EXIT=0x176 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPLAYLISTHELPER_DOHANDLECOLLECTIONMESSAGEL=0x197 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPLAYLISTHELPER_GETPLAYLISTFROMCOLLECTIONL_ENTRY=0x165 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPLAYLISTHELPER_GETPLAYLISTFROMCOLLECTIONL_EXIT=0x166 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPLAYLISTHELPER_HANDLEOPENL=0x195 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPLAYLISTHELPER_HANDLEOPENL_ENTRY=0x171 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPLAYLISTHELPER_HANDLEOPENL_EXIT=0x172 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPLAYLISTHELPER_UPDATEALBUMPATHANDOPENL_EXIT=0x18f +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPROPERTY_CMTPPLAYBACKPROPERTY_ENTRY=0x8c +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPROPERTY_CMTPPLAYBACKPROPERTY_EXIT=0x8d +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL_ENTRY=0x92 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL_EXIT=0x93 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKRESUMEHELPER_CMTPPLAYBACKRESUMEHELPER_ENTRY=0x1a0 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPLAYBACKRESUMEHELPER_CMTPPLAYBACKRESUMEHELPER_EXIT=0x1a1 +[TRACE]TRACE_FLOW[0x8A]_DUP1_TMTPPBDATAVOLUME_TMTPPBDATAVOLUME_ENTRY=0x9e +[TRACE]TRACE_FLOW[0x8A]_DUP1_TMTPPBDATAVOLUME_TMTPPBDATAVOLUME_EXIT=0x9f +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL_EXIT=0x1c +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBCMDPARAM_CMTPPBCMDPARAM_ENTRY=0xbc +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBCMDPARAM_CMTPPBCMDPARAM_EXIT=0xbd +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBCMDPARAM_CONSTRUCTL_ENTRY=0xc8 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBCMDPARAM_CONSTRUCTL_EXIT=0xc9 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBCMDPARAM_NEWL_ENTRY=0xb2 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBCMDPARAM_NEWL_EXIT=0xb3 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_ENTRY=0xed +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_EXIT=0xee +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBEVENTPARAM_NEWL_ENTRY=0xe7 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBEVENTPARAM_NEWL_EXIT=0xe8 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBPARAMBASE_CMTPPBPARAMBASE_ENTRY=0x1c0 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBPARAMBASE_CMTPPBPARAMBASE_EXIT=0x1c1 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBPARAMBASE_CONSTRUCTL_ENTRY=0x1ca +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPBPARAMBASE_CONSTRUCTL_EXIT=0x1cb +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPLAYBACKCONTROLIMPL_IFEQUAL_EXIT=0x141 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL_ENTRY=0x98 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL_EXIT=0x99 +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPPBCMDPARAM_CMTPPBCMDPARAM_ENTRY=0xbe +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPPBCMDPARAM_CMTPPBCMDPARAM_EXIT=0xbf +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPPBCMDPARAM_CONSTRUCTL_ENTRY=0xca +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPPBCMDPARAM_CONSTRUCTL_EXIT=0xcb +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPPBCMDPARAM_NEWL_ENTRY=0xb4 +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPPBCMDPARAM_NEWL_EXIT=0xb5 +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_ENTRY=0xef +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPPBEVENTPARAM_CMTPPBEVENTPARAM_EXIT=0xf0 +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPPBPARAMBASE_CMTPPBPARAMBASE_ENTRY=0x1c2 +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPPBPARAMBASE_CMTPPBPARAMBASE_EXIT=0x1c3 +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPPBPARAMBASE_CONSTRUCTL_ENTRY=0x1cc +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPPBPARAMBASE_CONSTRUCTL_EXIT=0x1cd +[TRACE]TRACE_FLOW[0x8A]_DUP4_CMTPPBCMDPARAM_CMTPPBCMDPARAM_ENTRY=0xc0 +[TRACE]TRACE_FLOW[0x8A]_DUP4_CMTPPBCMDPARAM_CMTPPBCMDPARAM_EXIT=0xc1 +[TRACE]TRACE_FLOW[0x8A]_DUP4_CMTPPBCMDPARAM_CONSTRUCTL_ENTRY=0xcc +[TRACE]TRACE_FLOW[0x8A]_DUP4_CMTPPBCMDPARAM_CONSTRUCTL_EXIT=0xcd +[TRACE]TRACE_FLOW[0x8A]_DUP4_CMTPPBCMDPARAM_NEWL_ENTRY=0xb6 +[TRACE]TRACE_FLOW[0x8A]_DUP4_CMTPPBCMDPARAM_NEWL_EXIT=0xb7 +[TRACE]TRACE_FLOW[0x8A]_DUP4_CMTPPBPARAMBASE_CMTPPBPARAMBASE_ENTRY=0x1c4 +[TRACE]TRACE_FLOW[0x8A]_DUP4_CMTPPBPARAMBASE_CMTPPBPARAMBASE_EXIT=0x1c5 +[TRACE]TRACE_FLOW[0x8A]_DUP5_CMTPPBCMDPARAM_CMTPPBCMDPARAM_ENTRY=0xc2 +[TRACE]TRACE_FLOW[0x8A]_DUP5_CMTPPBCMDPARAM_CMTPPBCMDPARAM_EXIT=0xc3 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATASUID_CATEGORY_ENTRY=0x1b6 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATASUID_CATEGORY_EXIT=0x1b7 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATASUID_SUID_ENTRY=0x1b8 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATASUID_SUID_EXIT=0x1b9 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATASUID_TMTPPBDATASUID_ENTRY=0x1ba +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATASUID_TMTPPBDATASUID_EXIT=0x1bb +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_CURRENTVOLUME_ENTRY=0xaa +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_CURRENTVOLUME_EXIT=0xab +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_DEFAULTVOLUME_ENTRY=0xa8 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_DEFAULTVOLUME_EXIT=0xa9 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_MAXVOLUME_ENTRY=0xa4 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_MAXVOLUME_EXIT=0xa5 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_MINVOLUME_ENTRY=0xa6 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_MINVOLUME_EXIT=0xa7 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_SETVOLUME_ENTRY=0xa0 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_SETVOLUME_EXIT=0xa1 +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_STEP_ENTRY=0xac +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_STEP_EXIT=0xad +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_TMTPPBDATAVOLUME_ENTRY=0x9c +[TRACE]TRACE_FLOW[0x8A]_TMTPPBDATAVOLUME_TMTPPBDATAVOLUME_EXIT=0x9d +[TRACE]TRACE_FLOW[0x8A]__ENTRY=0xa2 +[TRACE]TRACE_FLOW[0x8A]__EXIT=0xa3 +[TRACE]TRACE_NORMAL[0x86]_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x1 +[TRACE]TRACE_NORMAL[0x86]_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x1a +[TRACE]TRACE_NORMAL[0x86]_CMTPPBCRESETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x5 +[TRACE]TRACE_NORMAL[0x86]_CMTPPBCSETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x7 +[TRACE]TRACE_NORMAL[0x86]_CMTPPBCSKIP_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x9 +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKCOMMANDCHECKER_CHECKANDUPDATEPLAYBACKPARAML=0xf +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL=0xd +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL=0xb +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKCONTROLDATAPROVIDER_SESSIONOPENEDL=0xa +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKCONTROLIMPL_COMMANDL=0x10 +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKCONTROLIMPL_COMPLETESELF=0x17 +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEPLAYBACKMESSAGEL=0x16 +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKCONTROLIMPL_DOHANDLEPROPERTYL=0x13 +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKCONTROLIMPL_DOHANDLESTATECHANGEDL=0x14 +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKCONTROLIMPL_HANDLEPLAYBACKMESSAGE=0x11 +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKCONTROLIMPL_HANDLEPROPERTYL=0x12 +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKCONTROLIMPL_MAPSTATE=0x15 +[TRACE]TRACE_NORMAL[0x86]_CMTPPLAYBACKPLAYLISTHELPER_HANDLECOLLECTIONMESSAGE=0x18 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x2 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x4 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPBCRESETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x6 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPBCSETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x8 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPBCSKIP_HANDLEPLAYBACKCOMMANDCOMPLETEL=0xc +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPLAYBACKCOMMANDCHECKER_CHECKPLAYBACKCOMMANDCONTEXTL=0xe +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPPLAYBACKPLAYLISTHELPER_DOHANDLECOLLECTIONMESSAGEL=0x19 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CINTERNETCONNECTIONHANDLER_CONSTRUCTL=0x1b +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x33 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CMTPPBCMDPARAM_CONSTRUCTL=0x16 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUEL=0xe +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL=0x13 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL=0xc +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPLAYBACKMAP_GETOBJECINFOFROMHANDLEL=0xb +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL=0x14 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x3 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x6 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPLAYBACKCONTROLDATAPROVIDER_HANDLEPLAYBACKEVENTL=0xd +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPLAYBACKMAP_HANDLESETDEVICEPROPVALUEL=0x10 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPLAYBACKPLAYLISTHELPER_DOHANDLECOLLECTIONMESSAGEL=0x31 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPLAYBACKPROPERTY_GETDEFAULTPROPERTYVALUEL=0x15 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x37 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP3_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x5 +[[OBSOLETE]][TRACE]TRACE_ERROR[0x82]_DUP4_CMTPPBCGETDEVICEPROPDESC_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x4 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCOMMAND_PARAML_EXIT=0xe0 +[[OBSOLETE]][TRACE]TRACE_FLOW[0x8A]_CMTPPLAYBACKCONTROLDATAPROVIDER_SESSIONOPENEDL_ENTRY=0x5b +[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CMTPPBCGETDEVICEPROPVALUE_HANDLEPLAYBACKCOMMANDCOMPLETEL=0x3 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/common/inc/mtpdebug.h --- a/mtpfws/mtpfw/common/inc/mtpdebug.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/common/inc/mtpdebug.h Fri Sep 17 08:34:51 2010 +0300 @@ -21,6 +21,9 @@ #ifndef MTPDEBUG_H #define MTPDEBUG_H +/* + * Todo: keep these macros temporarily, will discard them at last + */ #include __FLOG_STMT(_LIT8(KMTPSubsystem, "MTP");) @@ -39,4 +42,42 @@ #define __MTP_HEAP_FLOG #endif // __FLOG_ACTIVE +/* + * Unlike __FLOG_ACTIVE, every component has its own macro OST_TRACE_COMPILER_IN_USE . + * Thus the macro won't be used in this header file. + */ +#define __MTP_HEAP_OSTTRACE(r) \ + { \ + TInt allocated; \ + TInt largest; \ + TInt available(User::Heap().Available(largest)); \ + TInt size(User::Heap().Size()); \ + User::Heap().AllocSize(allocated); \ + r;\ + } + +#define LEAVEIFERROR(err, trace) \ +{ \ +TInt munged_err=(err); \ +if (munged_err < 0) \ +{ \ +trace; \ +User::Leave(munged_err);\ +}\ +} + +#define TRACEPANIC(aReason, trace) \ + { \ + tp; \ + User::Panic(KMyCategory, (aReason)); \ + } + +#if defined(_DEBUG) +#define __ASSERT_DEBUG_OST(c,trace,p) if(!c) {trace; p;} +#else +#define __ASSERT_DEBUG_OST(c,trace,p) +#endif + +#define __ASSERT_ALWAYS_OST(c,trace,p) if(!c) {trace; p;} + #endif // MTPDEBUG_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/daemon/client/group/mtpclient.mmp --- a/mtpfws/mtpfw/daemon/client/group/mtpclient.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/daemon/client/group/mtpclient.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -21,7 +21,7 @@ CAPABILITY All -Tcb MW_LAYER_SYSTEMINCLUDE_SYMBIAN -USERINCLUDE ../../common/inc/ +USERINCLUDE ../../common/inc/ USERINCLUDE ../../../common/inc SOURCEPATH ../src diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/daemon/server/group/mtpserver.mmp --- a/mtpfws/mtpfw/daemon/server/group/mtpserver.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/daemon/server/group/mtpserver.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -13,8 +13,6 @@ // Description: // -#include - TARGET mtpserver.exe TARGETTYPE EXE UID 0 0x102827A2 @@ -32,7 +30,8 @@ USERINCLUDE ../../common/inc/ USERINCLUDE ../../../common/inc USERINCLUDE ../../../inc -USERINCLUDE ../../../transports/transportapi/inc +USERINCLUDE ../../../transports/transportapi/inc +USERINCLUDE ../traces SOURCEPATH ../src/ SOURCE cmtpserver.cpp diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/daemon/server/inc/cmtpserver.h --- a/mtpfws/mtpfw/daemon/server/inc/cmtpserver.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/daemon/server/inc/cmtpserver.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,6 @@ #include #include -#include "mtpdebug.h" #include "rmtpframework.h" class CMTPShutdown; @@ -57,11 +56,6 @@ void ConstructL(); private: // Owned - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; /** The MTP framework singletons. diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/daemon/server/inc/cmtpserversession.h --- a/mtpfws/mtpfw/daemon/server/inc/cmtpserversession.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/daemon/server/inc/cmtpserversession.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #include "cmtpserver.h" #include "mtpclientserver.h" -#include "mtpdebug.h" #include "rmtpframework.h" /** @@ -51,11 +50,6 @@ TBool CheckIsBlueToothTransport(TUid aNewUid); private: - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; /** The MTP framework singletons. diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/daemon/server/src/cmtpserver.cpp --- a/mtpfws/mtpfw/daemon/server/src/cmtpserver.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/daemon/server/src/cmtpserver.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -28,11 +28,14 @@ #include "mtpclientserver.h" #include "mtpdebug.h" #include "rmtpframework.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpserverTraces.h" +#endif + #define UNUSED_VAR(a) (a) = (a) -__FLOG_STMT(_LIT8(KComponent,"Server");) - /** PlatSec policy. */ @@ -71,15 +74,14 @@ */ CMTPServer::~CMTPServer() { - __FLOG(_L8("~CMTPServer - Entry")); + OstTraceFunctionEntry0( CMTPSERVER_CMTPSERVER_DES_ENTRY ); delete iShutdown; iShutdown = NULL; iFrameworkSingletons.ConnectionMgr().StopTransports(); iFrameworkSingletons.DpController().UnloadDataProviders(); iFrameworkSingletons.Close(); REComSession::FinalClose(); - __FLOG(_L8("~CMTPServer - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSERVER_CMTPSERVER_DES_EXIT ); } /** @@ -88,10 +90,11 @@ */ void CMTPServer::RunServerL() { - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("RunServerL - Entry")); + OstTraceFunctionEntry0( CMTPSERVER_RUNSERVERL_ENTRY ); // Naming the server thread after the server helps to debug panics - User::LeaveIfError(User::RenameProcess(KMTPServerName)); + TInt ret = User::RenameProcess(KMTPServerName); + LEAVEIFERROR(ret, OstTrace0(TRACE_ERROR, CMTPSERVER_RUNSERVERL, "Rename process error")); // Create and install the active scheduler. CActiveScheduler* scheduler(new(ELeave) CActiveScheduler); @@ -105,13 +108,15 @@ RProcess::Rendezvous(KErrNone); // Execute the server. + OstTraceDef0( OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, DUP1_CMTPSERVER_RUNSERVERL, "MTP server starts up" ); CActiveScheduler::Start(); + OstTraceDef0( OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, DUP2_CMTPSERVER_RUNSERVERL, "MTP server closed" ); // Server shutting down. CleanupStack::PopAndDestroy(server); CleanupStack::PopAndDestroy(1); // scheduler - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("RunServerL - Exit")); + OstTraceFunctionExit0( CMTPSERVER_RUNSERVERL_EXIT ); } /** @@ -119,13 +124,13 @@ */ void CMTPServer::AddSession() { - __FLOG(_L8("AddSession - Entry")); + OstTraceFunctionEntry0( CMTPSERVER_ADDSESSION_ENTRY ); if(iShutdown && iShutdown->IsActive()) { iShutdown->Cancel(); } ++iSessionCount; - __FLOG(_L8("AddSession - Exit")); + OstTraceFunctionExit0( CMTPSERVER_ADDSESSION_EXIT ); } /** @@ -135,24 +140,24 @@ */ void CMTPServer::DropSession() { - __FLOG(_L8("DropSession - Entry")); + OstTraceFunctionEntry0( CMTPSERVER_DROPSESSION_ENTRY ); if (--iSessionCount==0 && iFrameworkSingletons.ConnectionMgr().TransportCount() == 0) { // No active MTP client API sessions remain, start the shutdown timer. if (iShutdown) { - __FLOG(_L8("Shutdown Started - Entry")); + OstTrace0( TRACE_NORMAL, CMTPSERVER_DROPSESSION, "Shutdown Started" ); iShutdown->Start(); } } - __FLOG(_L8("DropSession - Exit")); + OstTraceFunctionExit0( CMTPSERVER_DROPSESSION_EXIT ); } CSession2* CMTPServer::NewSessionL(const TVersion&,const RMessage2&) const { - __FLOG(_L8("NewSessionL - Entry")); - __FLOG(_L8("NewSessionL - Exit")); + OstTraceFunctionEntry0( CMTPSERVER_NEWSESSIONL_ENTRY ); + OstTraceFunctionExit0( CMTPSERVER_NEWSESSIONL_Exit ); return new(ELeave) CMTPServerSession(); } @@ -184,17 +189,16 @@ */ void CMTPServer::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSERVER_CONSTRUCTL_ENTRY ); StartL(KMTPServerName); iFrameworkSingletons.OpenL(); if (!iShutdown) { TRAPD(error, iShutdown = CMTPShutdown::NewL()); - __FLOG(_L8("CMTPShutdown Loaded- Entry")); + OstTrace0( TRACE_NORMAL, CMTPSERVER_CONSTRUCTL, "CMTPShutdown Loaded" ); UNUSED_VAR(error); } - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSERVER_CONSTRUCTL_EXIT ); } /* @@ -206,11 +210,12 @@ */ void PanicClient(const RMessagePtr2& aMessage,TMTPPanic aPanic) { - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("PanicClient - Entry")); - __FLOG_STATIC_VA((KMTPSubsystem, KComponent, _L8("Panic = %d"), aPanic)); + OstTraceFunctionEntry0( _PANICCLIENT_ENTRY ); + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, _PANICCLIENT, "Panic = %d", aPanic ); + _LIT(KPanic,"MTPServer"); aMessage.Panic(KPanic, aPanic); - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("PanicClient - Exit")); + OstTraceFunctionExit0( _PANICCLIENT_EXIT ); } /** @@ -219,8 +224,10 @@ TInt E32Main() { __UHEAP_MARK; - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("E32Main - Entry")); - __MTP_HEAP_FLOG + OstTraceFunctionEntry0( CMTPSERVER_E32MAIN_ENTRY ); +#ifdef OST_TRACE_COMPILER_IN_USE + __MTP_HEAP_OSTTRACE(OstTraceExt4(TRACE_NORMAL,CMTPSERVER_E32MAIN_HEAP,"Heap: Size = %d, Allocated = %d, Available = %d, Largest block = %d", size, allocated, available, largest)); +#endif CTrapCleanup* cleanup=CTrapCleanup::New(); TInt ret = KErrNoMemory; @@ -244,7 +251,9 @@ #endif delete cleanup; } - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("E32Main - Exit")); + + OstTraceFunctionExit0( CMTPSERVER_E32MAIN_EXIT ); __UHEAP_MARKEND; + return ret; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/daemon/server/src/cmtpserversession.cpp --- a/mtpfws/mtpfw/daemon/server/src/cmtpserversession.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/daemon/server/src/cmtpserversession.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,12 @@ #include "cmtpdataprovidercontroller.h" #include "cmtpparserrouter.h" #include "e32def.h" -__FLOG_STMT(_LIT8(KComponent,"ServerSession");) +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpserversessionTraces.h" +#endif + /** @@ -33,9 +38,8 @@ */ CMTPServerSession::CMTPServerSession() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPServerSession - Entry")); - __FLOG(_L8("CMTPServerSession - Exit")); + OstTraceFunctionEntry0( CMTPSERVERSESSION_CMTPSERVERSESSION_CONS_ENTRY ); + OstTraceFunctionExit0( CMTPSERVERSESSION_CMTPSERVERSESSION_CONS_EXIT ); } /** @@ -43,52 +47,54 @@ */ CMTPServerSession::~CMTPServerSession() { - __FLOG(_L8("~CMTPServerSession - Entry")); + OstTraceFunctionEntry0( CMTPSERVERSESSION_CMTPSERVERSESSION_DES_ENTRY ); static_cast(const_cast(CSession2::Server()))->DropSession(); iSingletons.Close(); - __FLOG(_L8("~CMTPServerSession - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSERVERSESSION_CMTPSERVERSESSION_DES_EXIT ); } void CMTPServerSession::CreateL() { - __FLOG(_L8("CreateL - Entry")); + OstTraceFunctionEntry0( CMTPSERVERSESSION_CREATEL_ENTRY ); iSingletons.OpenL(); static_cast(const_cast(CSession2::Server()))->AddSession(); - __FLOG(_L8("CreateL - Exit")); + OstTraceFunctionExit0( CMTPSERVERSESSION_CREATEL_EXIT ); } void CMTPServerSession::ServiceL(const RMessage2& aMessage) { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSERVERSESSION_SERVICEL_ENTRY ); switch (aMessage.Function()) { case EMTPClientStartTransport: - __FLOG(_L8("StartTransport message received")); + OstTrace0( TRACE_NORMAL, CMTPSERVERSESSION_SERVICEL, "StartTrasport message received" ); DoStartTransportL(aMessage); break; - case EMTPClientStopTransport: - __FLOG(_L8("StopTransport message received")); + case EMTPClientStopTransport: + OstTrace0( TRACE_NORMAL, DUP1_CMTPSERVERSESSION_SERVICEL, "StopTransport message received" ); DoStopTransport(aMessage); break; - case EMTPClientIsAvailable : - __FLOG(_L8("IsAvailable message received")); + case EMTPClientIsAvailable : + OstTrace0( TRACE_NORMAL, DUP2_CMTPSERVERSESSION_SERVICEL, "IsAvailable message received" ); DoIsAvailableL(aMessage); break; default: - __FLOG(_L8("Unrecognised message received")); + + OstTrace0( TRACE_WARNING, DUP3_CMTPSERVERSESSION_SERVICEL, "Unrecognised message received" ); break; } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSERVERSESSION_SERVICEL_EXIT ); } TBool CMTPServerSession::CheckIsAvailableL(TUid aNewUID,TUid aCurUID) { + OstTraceFunctionEntry0( CMTPSERVERSESSION_CHECKISAVAILABLEL_ENTRY ); TInt SwitchEnabled; iSingletons.FrameworkConfig().GetValueL(CMTPFrameworkConfig::ETransportSwitchEnabled, SwitchEnabled); if(!SwitchEnabled ) { + OstTraceFunctionExit0( CMTPSERVERSESSION_CHECKISAVAILABLEL_EXIT ); return EFalse; } TBuf<30> value; @@ -98,13 +104,16 @@ TInt conErr = lex.Val(HighUID,EHex); if(aCurUID.iUid == HighUID) { + OstTraceFunctionExit0( DUP1_CMTPSERVERSESSION_CHECKISAVAILABLEL_EXIT ); return EFalse; } else if(aNewUID.iUid ==HighUID) { + OstTraceFunctionExit0( DUP2_CMTPSERVERSESSION_CHECKISAVAILABLEL_EXIT ); return ETrue; } + OstTraceFunctionExit0( DUP3_CMTPSERVERSESSION_CHECKISAVAILABLEL_EXIT ); return EFalse; } /** @@ -114,7 +123,8 @@ */ void CMTPServerSession::DoStartTransportL(const RMessage2& aMessage) { - __FLOG(_L8("DoStartTransportL - Entry")); + OstTraceFunctionEntry0( CMTPSERVERSESSION_DOSTARTTRANSPORTL_ENTRY ); + TUid newUID = TUid::Uid(aMessage.Int0()); TUid curUID = iSingletons.ConnectionMgr().TransportUid(); if(curUID !=(KNullUid)) // Another Transport is already running @@ -123,6 +133,7 @@ { aMessage.Complete(KErrServerBusy); iSingletons.ConnectionMgr().QueueTransportL( newUID, NULL ); + OstTraceFunctionExit0( CMTPSERVERSESSION_DOSTARTTRANSPORTL_EXIT ); return; } iSingletons.ConnectionMgr().StopTransport(curUID); @@ -150,7 +161,7 @@ } else { - User::LeaveIfError( err ); + LEAVEIFERROR(err, OstTrace0(TRACE_ERROR, CMTPSERVERSESSION_DOSTARTTRANSPORTL, "start transport error")); } CleanupStack::PopAndDestroy(paramHbuf); } @@ -168,7 +179,7 @@ } - __FLOG(_L8("DoStartTransportL - Exit")); + OstTraceFunctionExit0( DUP1_CMTPSERVERSESSION_DOSTARTTRANSPORTL_EXIT ); } @@ -178,10 +189,10 @@ */ void CMTPServerSession::DoStopTransport(const RMessage2& aMessage) { - __FLOG(_L8("DoStopTransport - Entry")); + OstTraceFunctionEntry0( CMTPSERVERSESSION_DOSTOPTRANSPORT_ENTRY ); iSingletons.ConnectionMgr().StopTransport( TUid::Uid( aMessage.Int0() ), ETrue ); aMessage.Complete(KErrNone); - __FLOG(_L8("DoStopTransport - Exit")); + OstTraceFunctionExit0( CMTPSERVERSESSION_DOSTOPTRANSPORT_EXIT ); } /** @@ -191,7 +202,7 @@ */ void CMTPServerSession::DoIsAvailableL(const RMessage2& aMessage) { - __FLOG(_L8("DoStopTransport - Entry")); + OstTraceFunctionEntry0( CMTPSERVERSESSION_DOISAVAILABLEL_ENTRY ); TUid newUID = TUid::Uid(aMessage.Int0()); TUid curUID = iSingletons.ConnectionMgr().TransportUid(); @@ -201,17 +212,20 @@ if(curUID== newUID) { aMessage.Complete(KErrAlreadyExists); + OstTraceFunctionExit0( CMTPSERVERSESSION_DOISAVAILABLEL_EXIT ); return; } else if(!CheckIsAvailableL(newUID,curUID)) { aMessage.Complete(KErrServerBusy); + OstTraceFunctionExit0( DUP1_CMTPSERVERSESSION_DOISAVAILABLEL_EXIT ); return; } } aMessage.Complete(KErrNone); - __FLOG(_L8("DoStopTransport - Exit")); + + OstTraceFunctionExit0( DUP2_CMTPSERVERSESSION_DOISAVAILABLEL_EXIT ); } TBool CMTPServerSession::CheckIsBlueToothTransport(TUid aNewUid) diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/daemon/server/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpfws/mtpfw/daemon/server/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/daemon/server/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpfws/mtpfw/daemon/server/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,73 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_IMPORTANT=0x85 +[GROUP]TRACE_NORMAL=0x86 +[GROUP]TRACE_WARNING=0x83 +[TRACE]TRACE_ERROR[0x82]_CMTPSERVERSESSION_DOSTARTTRANSPORTL=0x2 +[TRACE]TRACE_ERROR[0x82]_CMTPSERVER_RUNSERVERL=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_CHECKISAVAILABLEL_ENTRY=0x19 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_CHECKISAVAILABLEL_EXIT=0x1a +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_CMTPSERVERSESSION_CONS_ENTRY=0x11 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_CMTPSERVERSESSION_CONS_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_CMTPSERVERSESSION_DES_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_CMTPSERVERSESSION_DES_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_CREATEL_ENTRY=0x15 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_CREATEL_EXIT=0x16 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_DOISAVAILABLEL_ENTRY=0x23 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_DOISAVAILABLEL_EXIT=0x24 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_DOSTARTTRANSPORTL_ENTRY=0x1e +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_DOSTARTTRANSPORTL_EXIT=0x1f +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_DOSTOPTRANSPORT_ENTRY=0x21 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_DOSTOPTRANSPORT_EXIT=0x22 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_SERVICEL_ENTRY=0x17 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVERSESSION_SERVICEL_EXIT=0x18 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_ADDSESSION_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_ADDSESSION_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_CMTPSERVER_DES_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_CMTPSERVER_DES_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_CONSTRUCTL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_CONSTRUCTL_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_DROPSESSION_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_DROPSESSION_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_E32MAIN_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_E32MAIN_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_NEWSESSIONL_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_NEWSESSIONL_Exit=0xa +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_RUNSERVERL_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVER_RUNSERVERL_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPSERVERSESSION_CHECKISAVAILABLEL_EXIT=0x1b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPSERVERSESSION_DOISAVAILABLEL_EXIT=0x25 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPSERVERSESSION_DOSTARTTRANSPORTL_EXIT=0x20 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPSERVERSESSION_CHECKISAVAILABLEL_EXIT=0x1c +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPSERVERSESSION_DOISAVAILABLEL_EXIT=0x26 +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPSERVERSESSION_CHECKISAVAILABLEL_EXIT=0x1d +[TRACE]TRACE_FLOW[0x8A]__PANICCLIENT_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]__PANICCLIENT_EXIT=0xe +[TRACE]TRACE_IMPORTANT[0x85]_DUP1_CMTPSERVER_RUNSERVERL=0x1 +[TRACE]TRACE_IMPORTANT[0x85]_DUP2_CMTPSERVER_RUNSERVERL=0x2 +[TRACE]TRACE_IMPORTANT[0x85]__PANICCLIENT=0x3 +[TRACE]TRACE_NORMAL[0x86]_CMTPSERVERSESSION_SERVICEL=0x4 +[TRACE]TRACE_NORMAL[0x86]_CMTPSERVER_CONSTRUCTL=0x2 +[TRACE]TRACE_NORMAL[0x86]_CMTPSERVER_DROPSESSION=0x1 +[TRACE]TRACE_NORMAL[0x86]_CMTPSERVER_E32MAIN_HEAP=0x3 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSERVERSESSION_SERVICEL=0x5 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPSERVERSESSION_SERVICEL=0x6 +[TRACE]TRACE_WARNING[0x83]_DUP3_CMTPSERVERSESSION_SERVICEL=0x1 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dataproviderapi/group/mtpdataproviderapi.mmp --- a/mtpfws/mtpfw/dataproviders/dataproviderapi/group/mtpdataproviderapi.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dataproviderapi/group/mtpdataproviderapi.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -43,3 +43,4 @@ LIBRARY euser.lib SMPSAFE +USERINCLUDE ../traces diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dataproviderapi/src/cmtpdataproviderplugin.cpp --- a/mtpfws/mtpfw/dataproviders/dataproviderapi/src/cmtpdataproviderplugin.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dataproviderapi/src/cmtpdataproviderplugin.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -16,6 +16,11 @@ #include #include #include +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdataproviderpluginTraces.h" +#endif + /** MTP data provider plug-in factory method. @@ -30,6 +35,7 @@ */ EXPORT_C CMTPDataProviderPlugin* CMTPDataProviderPlugin::NewL(TUid aImplementationUid, TAny* aParams) { + OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CMTPDATAPROVIDERPLUGIN_NEWL, "load DP with ImplementationUid 0x%X", aImplementationUid.iUid ); CMTPDataProviderPlugin* self = reinterpret_cast( REComSession::CreateImplementationL( aImplementationUid, diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dataproviderapi/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpfws/mtpfw/dataproviders/dataproviderapi/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dataproviderapi/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpfws/mtpfw/dataproviders/dataproviderapi/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,3 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_IMPORTANT=0x85 +[TRACE]TRACE_IMPORTANT[0x85]_CMTPDATAPROVIDERPLUGIN_NEWL=0x1 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/group/mtpdevicedp.mmp --- a/mtpfws/mtpfw/dataproviders/devdp/group/mtpdevicedp.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/group/mtpdevicedp.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -13,8 +13,6 @@ // Description: // -#include - TARGET mtpdevicedp.dll TARGETTYPE PLUGIN UID 0x10009D8D 0x102827A4 @@ -28,7 +26,8 @@ USERINCLUDE ../../../common/inc USERINCLUDE ../../../inc USERINCLUDE ../../../transports/transportapi/inc -USERINCLUDE ../devdpextnapi/interface +USERINCLUDE ../devdpextnapi/interface +USERINCLUDE ../traces SOURCEPATH ../src SOURCE cmtpclosesession.cpp diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpdevicedatastore.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpdevicedatastore.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpdevicedatastore.h Fri Sep 17 08:34:51 2010 +0300 @@ -26,7 +26,6 @@ #include #include -#include "mtpdebug.h" #include "rmtpframework.h" #include "mmtpdevdpextn.h" #include"cmtpextndevdp.h" @@ -133,11 +132,6 @@ private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - CTelephony::TBatteryInfoV1 iBatteryInfoV1; CTelephony::TBatteryInfoV1Pckg iBatteryInfoV1Pckg; CMTPTypeString* iDeviceFriendlyName; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpdevicedp.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpdevicedp.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpdevicedp.h Fri Sep 17 08:34:51 2010 +0300 @@ -23,7 +23,6 @@ #include #include #include -#include "mtpdebug.h" #include "mmtpenumerationcallback.h" #include "rmtpdevicedpsingletons.h" #include "rmtpdpsingletons.h" @@ -106,10 +105,6 @@ private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; /** The active request processors table. Multiple request processors may be @@ -203,11 +198,7 @@ CMTPDeviceInfoTimer(CMTPDeviceDataProvider& aDeviceProvider); void ConstructL(); -private: -/** -FLOGGER debug trace member variable. -*/ -__FLOG_DECLARATION_MEMBER_MUTABLE; +private: CMTPDeviceDataProvider& iDeviceProvider; RDevUsbcClient iLdd; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpdevicedpconfigmgr.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpdevicedpconfigmgr.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpdevicedpconfigmgr.h Fri Sep 17 08:34:51 2010 +0300 @@ -24,7 +24,6 @@ #include #include -#include "mtpdebug.h" #include "mtpdevicedpconst.h" class MMTPDataProviderFramework; @@ -122,10 +121,6 @@ void GetDriveInfoL(TInt aDriveNo, TDes& aVolumeName, TDes& aRootDirPath); private: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; MMTPDataProviderFramework& iFramework; TUint iResourceId; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetdeviceinfo.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetdeviceinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetdeviceinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define CMTPGETDEVICEINFO_H #include "cmtprequestprocessor.h" -#include "mtpdebug.h" #include "rmtpdevicedpsingletons.h" #include "rmtpframework.h" @@ -69,11 +68,6 @@ private: // Owned. /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - - /** The DeviceInfo dataset buffer. */ CMTPTypeDeviceInfo* iDeviceInfo; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetdevicepropdesc.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetdevicepropdesc.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetdevicepropdesc.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define CMTPGETDEVICEPROPDESC_H #include "cmtprequestprocessor.h" -#include "mtpdebug.h" #include "rmtpdevicedpsingletons.h" #include "mmtpdevdpextn.h" @@ -103,11 +102,6 @@ private: // Owned. - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPTypeDevicePropDesc* iPropDesc; TMTPTypeGuid* iData; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetdevicepropvalue.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetdevicepropvalue.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetdevicepropvalue.h Fri Sep 17 08:34:51 2010 +0300 @@ -60,11 +60,6 @@ private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - TMTPTypeUint8 iBatteryLevel; TMTPTypeUint32 iUint32; CMTPTypeString* iString; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetnumobjects.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetnumobjects.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetnumobjects.h Fri Sep 17 08:34:51 2010 +0300 @@ -57,11 +57,7 @@ void GetObjectHandlesByFormatCodeL(TUint32 aFormatCode, CMTPTypeArray &aObjectHandles); protected: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - + TUint iTimeoutCount; RMTPFramework iSingletons; RMTPDeviceDpSingletons iDevDpSingletons; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetobjecthandles.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetobjecthandles.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetobjecthandles.h Fri Sep 17 08:34:51 2010 +0300 @@ -46,10 +46,6 @@ void ServiceL(); private: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPTypeArray* iHandles; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetserviceinfo.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetserviceinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetserviceinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -23,7 +23,6 @@ #define CMTPGETSERVICEINFO_H_ #include "cmtprequestprocessor.h" -#include "mtpdebug.h" #include "rmtpdevicedpsingletons.h" #include "rmtpframework.h" #include "cmtpserviceinfo.h" @@ -68,11 +67,6 @@ private: // Owned. /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - - /** The DeviceInfo dataset buffer. */ CMTPTypeServiceInfo* iServiceInfo; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetstorageinfo.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetstorageinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpgetstorageinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,6 @@ #include "cmtprequestprocessor.h" #include "rmtpframework.h" -#include "mtpdebug.h" //forward declaration class CMTPTypeStorageInfo; @@ -76,11 +75,7 @@ void SetupDriveVolumeInfoL(); private: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - + CMTPTypeStorageInfo* iStorageInfo; TDriveInfo iDriveInfo; TVolumeInfo iVolumeInfo; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpresetdevicepropvalue.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpresetdevicepropvalue.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpresetdevicepropvalue.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define CMTPRESETDEVICEPROPVALUE_H #include "cmtpgetdevicepropdesc.h" -#include "mtpdebug.h" class CMTPTypeString; /** @@ -68,11 +67,6 @@ private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - // CMTPTypeString* iString; TUint32 iPropCode; TMTPTypeGuid* iData; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpsetdevicepropvalue.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpsetdevicepropvalue.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpsetdevicepropvalue.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define CMTPSETDEVICEPROPVALUE_H #include "cmtpgetdevicepropdesc.h" -#include "mtpdebug.h" class CMTPTypeString; @@ -77,11 +76,6 @@ private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - CMTPTypeString* iString; TMTPTypeUint32 iUint32; TMTPTypeUint8 iUint8; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/cmtpstoragewatcher.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpstoragewatcher.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/cmtpstoragewatcher.h Fri Sep 17 08:34:51 2010 +0300 @@ -24,7 +24,6 @@ #include #include -#include "mtpdebug.h" #include "rmtpframework.h" #include "rmtpdpsingletons.h" #include "rmtpdevicedpsingletons.h" @@ -77,11 +76,6 @@ private: // Owned /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - - /** The available drives configuration. */ TUint32 iDrivesConfig; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/mtpdevicedpconst.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/mtpdevicedpconst.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/mtpdevicedpconst.h Fri Sep 17 08:34:51 2010 +0300 @@ -110,7 +110,8 @@ EMTPObjectPropCodeParentObject, EMTPObjectPropCodePersistentUniqueObjectIdentifier, EMTPObjectPropCodeName, - EMTPObjectPropCodeNonConsumable + EMTPObjectPropCodeNonConsumable, + EMTPObjectPropCodeHidden }; static const TUint16 KMTPDeviceDpSupportedEvents[] = diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/inc/rmtpdevicedpsingletons.h --- a/mtpfws/mtpfw/dataproviders/devdp/inc/rmtpdevicedpsingletons.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/inc/rmtpdevicedpsingletons.h Fri Sep 17 08:34:51 2010 +0300 @@ -23,8 +23,6 @@ #include -#include "mtpdebug.h" - class CMTPDeviceDataStore; class CMTPDeviceDpConfigMgr; @@ -66,11 +64,6 @@ void ConstructL(MMTPDataProviderFramework& aFramework); public: // Owned - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; /** The device information data manager. @@ -91,14 +84,9 @@ private: // Owned /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - - /** The singletons reference block. */ CSingletons* iSingletons; }; -#endif // RMTPDEVICEDPSINGLETONS_H \ No newline at end of file +#endif // RMTPDEVICEDPSINGLETONS_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpdevicedatastore.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpdevicedatastore.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpdevicedatastore.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -31,9 +31,13 @@ #include "mmtpenumerationcallback.h" #include "mtpdevdppanic.h" #include "mtpdevicedpconst.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdevicedatastoreTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"DeviceDataStore");) _LIT( KFileName, "z:\\private\\102827a2\\mtpdevice.ico"); @@ -98,7 +102,7 @@ */ CMTPDeviceDataStore::~CMTPDeviceDataStore() { - __FLOG(_L8("~CMTPDeviceDataStore - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_CMTPDEVICEDATASTORE_DES_ENTRY ); Cancel(); delete iDeviceFriendlyNameDefault; delete iSyncPartnerNameDefault; @@ -113,8 +117,7 @@ iSerialNumber.Close(); iSingletons.Close(); iMTPExtensions.Close(); - __FLOG(_L8("~CMTPDeviceDataStore - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_CMTPDEVICEDATASTORE_DES_EXIT ); } /** @@ -132,12 +135,13 @@ void CMTPDeviceDataStore::BatteryLevelL(TRequestStatus& aStatus, TUint& aBatteryLevel) { - __FLOG(_L8("BatteryLevel - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_BATTERYLEVELL_ENTRY ); if (RequestPending()) { // We are already reading battery level // leave so we don't set ourselves active twice + OstTrace0( TRACE_ERROR, CMTPDEVICEDATASTORE_BATTERYLEVELL, "already reading battery level, no need to set active twice" ); User::Leave(KErrInUse); } @@ -156,7 +160,7 @@ aBatteryLevel = KMTPDefaultBatteryLevel; SetRequestComplete(*iPendingStatus, KErrNone); } - __FLOG(_L8("BatteryLevel - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_BATTERYLEVELL_EXIT ); } /** @@ -165,8 +169,8 @@ */ const TDesC& CMTPDeviceDataStore::DeviceFriendlyName() const { - __FLOG(_L8("DeviceFriendlyName - Entry")); - __FLOG(_L8("DeviceFriendlyName - Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_DEVICEFRIENDLYNAME_ENTRY ); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_DEVICEFRIENDLYNAME_EXIT ); return iDeviceFriendlyName->StringChars(); } @@ -176,8 +180,8 @@ */ const TDesC& CMTPDeviceDataStore::DeviceFriendlyNameDefault() const { - __FLOG(_L8("DeviceFriendlyNameDefault - Entry")); - __FLOG(_L8("DeviceFriendlyNameDefault - Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_DEVICEFRIENDLYNAMEDEFAULT_ENTRY ); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_DEVICEFRIENDLYNAMEDEFAULT_EXIT ); return *iDeviceFriendlyNameDefault; } @@ -187,8 +191,8 @@ */ const TDesC& CMTPDeviceDataStore::DeviceVersion() const { - __FLOG(_L8("DeviceVersion - Entry")); - __FLOG(_L8("DeviceVersion - Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_DEVICEVERSION_ENTRY ); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_DEVICEVERSION_EXIT ); return iDeviceVersion; } @@ -198,9 +202,9 @@ */ const TDesC& CMTPDeviceDataStore::Manufacturer() const { - __FLOG(_L8("Manufacturer - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_MANUFACTURER_ENTRY ); __ASSERT_DEBUG(Enumerated(), Panic(EMTPDevDpInvalidState)); - __FLOG(_L8("Manufacturer - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_MANUFACTURER_EXIT ); return iPhoneIdV1.iManufacturer; } @@ -210,9 +214,9 @@ */ const TDesC& CMTPDeviceDataStore::Model() const { - __FLOG(_L8("Model - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_MODEL_ENTRY ); __ASSERT_DEBUG(Enumerated(), Panic(EMTPDevDpInvalidState)); - __FLOG(_L8("Model - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_MODEL_EXIT ); return iPhoneIdV1.iModel; } @@ -222,8 +226,8 @@ */ const TDesC& CMTPDeviceDataStore::MTPExtensions() const { - __FLOG(_L8("MTPExtensions - Entry")); - __FLOG(_L8("MTPExtensions - Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_MTPEXTENSIONS_ENTRY ); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_MTPEXTENSIONS_EXIT ); return iMTPExtensions; } @@ -233,9 +237,9 @@ */ const TDesC& CMTPDeviceDataStore::SerialNumber() const { - __FLOG(_L8("SerialNumber - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SERIALNUMBER_ENTRY ); __ASSERT_DEBUG(Enumerated(), Panic(EMTPDevDpInvalidState)); - __FLOG(_L8("SerialNumber - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SERIALNUMBER_EXIT ); return iPhoneIdV1.iSerialNumber; } @@ -245,8 +249,8 @@ */ const TDesC& CMTPDeviceDataStore::SynchronisationPartner() const { - __FLOG(_L8("SynchronisationPartner - Entry")); - __FLOG(_L8("SynchronisationPartner - Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SYNCHRONISATIONPARTNER_ENTRY ); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SYNCHRONISATIONPARTNER_EXIT ); return iSynchronisationPartner->StringChars(); } @@ -256,8 +260,8 @@ */ const TDesC& CMTPDeviceDataStore::SynchronisationPartnerDefault() const { - __FLOG(_L8("SynchronisationPartnerDefault - Entry")); - __FLOG(_L8("SynchronisationPartnerDefault - Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SYNCHRONISATIONPARTNERDEFAULT_ENTRY ); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SYNCHRONISATIONPARTNERDEFAULT_EXIT ); return *iSyncPartnerNameDefault; } @@ -268,10 +272,10 @@ */ void CMTPDeviceDataStore::SetDeviceFriendlyNameL(const TDesC& aName) { - __FLOG(_L8("SetDeviceFriendlyNameL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SETDEVICEFRIENDLYNAMEL_ENTRY ); iDeviceFriendlyName->SetL(aName); StoreL(); - __FLOG(_L8("SetDeviceFriendlyNameL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SETDEVICEFRIENDLYNAMEL_EXIT ); } /** @@ -281,10 +285,10 @@ */ void CMTPDeviceDataStore::SetSynchronisationPartnerL(const TDesC& aName) { - __FLOG(_L8("SetSynchronisationPartnerL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SETSYNCHRONISATIONPARTNERL_ENTRY ); iSynchronisationPartner->SetL(aName); StoreL(); - __FLOG(_L8("SetSynchronisationPartnerL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SETSYNCHRONISATIONPARTNERL_EXIT ); } /** @@ -297,7 +301,7 @@ */ void CMTPDeviceDataStore::StartEnumerationL(TUint32 aStorageId, MMTPEnumerationCallback& aCallback) { - __FLOG(_L8("StartEnumerationL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_STARTENUMERATIONL_ENTRY ); if (State() != EUndefined) { aCallback.NotifyEnumerationCompleteL(aStorageId, KErrNone); @@ -308,12 +312,12 @@ iCallback = &aCallback; Schedule(EEnumeratingDevicePropertyStore); } - __FLOG(_L8("StartEnumerationL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_STARTENUMERATIONL_EXIT ); } void CMTPDeviceDataStore::DoCancel() { - __FLOG(_L8("DoCancel - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_DOCANCEL_ENTRY ); if (iTelephony) { switch (State()) @@ -331,7 +335,7 @@ break; } } - __FLOG(_L8("DoCancel - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_DOCANCEL_EXIT ); } /** @@ -341,8 +345,9 @@ */ TInt CMTPDeviceDataStore::RunError(TInt aError) { - __FLOG(_L8("RunError - Entry")); - __FLOG_VA((_L8("Error = %d, State = %d"), aError, State())); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_RUNERROR_ENTRY ); + OstTraceExt2(TRACE_NORMAL, CMTPDEVICEDATASTORE_RUNERROR, + "Error = %d, State = %d", aError, (TInt)State()); aError = aError; // suppress compiler warning switch (State()) @@ -374,13 +379,13 @@ break; } - __FLOG(_L8("RunError - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_RUNERROR_EXIT ); return KErrNone; } void CMTPDeviceDataStore::RunL() { - __FLOG(_L8("RunL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_RUNL_ENTRY ); switch (State()) { case EEnumeratingDevicePropertyStore: @@ -477,7 +482,7 @@ __DEBUG_ONLY(Panic(EMTPDevDpInvalidState)); break; } - __FLOG(_L8("RunL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_RUNL_EXIT ); } /** @@ -491,7 +496,9 @@ iIsConnectMac(EFalse), iHasPendingRequest(EFalse) { + OstTraceFunctionEntry0( DUP1_CMTPDEVICEDATASTORE_CMTPDEVICEDATASTORE_ENTRY ); CActiveScheduler::Add(this); + OstTraceFunctionExit0( DUP1_CMTPDEVICEDATASTORE_CMTPDEVICEDATASTORE_EXIT ); } /** @@ -499,8 +506,7 @@ */ void CMTPDeviceDataStore::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); /* @@ -545,7 +551,7 @@ //11 Device Icon property, Load the icon into Auint Atrray LoadDeviceIconL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_CONSTRUCTL_EXIT ); } /** @@ -554,9 +560,9 @@ */ TBool CMTPDeviceDataStore::Enumerated() const { - __FLOG(_L8("Enumerated - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_ENUMERATED_ENTRY ); TInt32 state(State()); - __FLOG(_L8("Enumerated - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_ENUMERATED_EXIT ); return (state & EEnumerated); } @@ -567,11 +573,11 @@ */ void CMTPDeviceDataStore::ExternalizeL(RWriteStream& aWriteStream) const { - __FLOG(_L8("ExternalizeL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_EXTERNALIZEL_ENTRY ); aWriteStream.WriteInt32L(KMTPDevicePropertyStoreVersion); aWriteStream << DeviceFriendlyName(); aWriteStream << SynchronisationPartner(); - __FLOG(_L8("ExternalizeL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_EXTERNALIZEL_EXIT ); } /** @@ -581,7 +587,7 @@ */ void CMTPDeviceDataStore::InternalizeL(RReadStream& aReadStream) { - __FLOG(_L8("InternalizeL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_INTERNALIZEL_ENTRY ); RBuf buf; buf.CleanupClosePushL(); @@ -602,7 +608,7 @@ buf.Close(); CleanupStack::Pop(); //buf - __FLOG(_L8("InternalizeL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_INTERNALIZEL_EXIT ); } /** @@ -611,7 +617,7 @@ */ const TDesC& CMTPDeviceDataStore::PropertyStoreName() { - __FLOG(_L8("PropertyStoreName - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_PROPERTYSTORENAME_ENTRY ); if (iPropertyStoreName.Length() == 0) { iSingletons.Fs().PrivatePath(iPropertyStoreName); @@ -620,7 +626,7 @@ iPropertyStoreName.Append(KMTPDevicePropertyStoreFileName); } - __FLOG(_L8("PropertyStoreName - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_PROPERTYSTORENAME_EXIT ); return iPropertyStoreName; } @@ -630,7 +636,7 @@ */ void CMTPDeviceDataStore::AppendMTPExtensionSetsL(TBool& aCompleted) { - __FLOG(_L8("AppendMTPExtensionSetsL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_APPENDMTPEXTENSIONSETSL_ENTRY ); CMTPDataProviderController& dps(iSingletons.DpController()); const TInt count = Min(iCurrentDpIndex + KExtensionSetIterationRunLength, dps.Count()); aCompleted = EFalse; @@ -648,7 +654,8 @@ len += (*extensions)[i].Length() + KMTPVendorExtensionSetDelimiter().Length(); if (len > KMTPMaxStringCharactersLength) { - __FLOG(_L8("MTP Extensions set exceeded the maximum MTP String length")); + OstTrace0(TRACE_WARNING, CMTPDEVICEDATASTORE_APPENDMTPEXTENSIONSETSL, + "MTP Extensions set exceeded the maximum MTP String length"); // End querying dps when the extension set exceeds the maximum mtp string length. aCompleted = ETrue; break; @@ -672,7 +679,7 @@ aCompleted = ETrue; } - __FLOG(_L8("AppendMTPExtensionSetsL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_APPENDMTPEXTENSIONSETSL_EXIT ); } /** @@ -681,7 +688,7 @@ */ void CMTPDeviceDataStore::RestoreL() { - __FLOG(_L8("RestoreL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_RESTOREL_ENTRY ); RFs& fs(iSingletons.Fs()); if(BaflUtils::FileExists(fs, PropertyStoreName())) { @@ -691,7 +698,7 @@ InternalizeL(instream); CleanupStack::PopAndDestroy(2, store); // instream, store } - __FLOG(_L8("RestoreL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_RESTOREL_EXIT ); } /** @@ -700,12 +707,12 @@ */ void CMTPDeviceDataStore::Schedule(TInt32 aState) { - __FLOG(_L8("Schedule - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SCHEDULE_ENTRY ); SetState(aState); SetRequestPending(iStatus); SetActive(); SetRequestComplete(iStatus,KErrNone); - __FLOG(_L8("Schedule - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SCHEDULE_EXIT ); } /** @@ -713,10 +720,10 @@ */ void CMTPDeviceDataStore::SetRequestComplete(TRequestStatus& aRequest, TUint aErr) { - __FLOG(_L8("CompleteRequest - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SETREQUESTCOMPLETE_ENTRY ); TRequestStatus* status(&aRequest); User::RequestComplete(status, aErr); - __FLOG(_L8("CompleteRequest - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SETREQUESTCOMPLETE_EXIT ); } @@ -725,9 +732,9 @@ */ void CMTPDeviceDataStore::SetRequestPending(TRequestStatus& aRequest) { - __FLOG(_L8("SetRequestPending - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SETREQUESTPENDING_ENTRY ); aRequest = KRequestPending; - __FLOG(_L8("SetRequestPending - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SETREQUESTPENDING_EXIT ); } /** @@ -736,10 +743,11 @@ */ void CMTPDeviceDataStore::SetState(TInt32 aState) { - __FLOG(_L8("SetState - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SETSTATE_ENTRY ); iState = ((EEnumerated & iState) | aState); - __FLOG_VA((_L8("State set to 0x%08X"), iState)); - __FLOG(_L8("SetState - Exit")); + OstTrace1(TRACE_NORMAL, CMTPDEVICEDATASTORE_SETSTATE, + "State set to 0x%08X", iState); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SETSTATE_EXIT ); } /** @@ -748,9 +756,10 @@ */ TInt32 CMTPDeviceDataStore::State() const { - __FLOG(_L8("State - Entry")); - __FLOG_VA((_L8("State = 0x%08X"), iState)); - __FLOG(_L8("State - Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_STATE_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDEVICEDATASTORE_STATE, + "State = 0x%08X", iState); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_STATE_EXIT ); return iState; } @@ -760,7 +769,7 @@ */ void CMTPDeviceDataStore::StoreL() { - __FLOG(_L8("StoreL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_STOREL_ENTRY ); CFileStore* store(CDirectFileStore::ReplaceLC(iSingletons.Fs(), PropertyStoreName(), EFileWrite)); store->SetTypeL(KDirectFileStoreLayoutUid); RStoreWriteStream outstream; @@ -771,7 +780,7 @@ store->SetRootL(id); store->CommitL(); CleanupStack::PopAndDestroy(store); - __FLOG(_L8("StoreL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_STOREL_EXIT ); } /** @@ -781,7 +790,7 @@ */ void CMTPDeviceDataStore::StoreFormattedSerialNumber(const TDesC& aSerialNo) { - __FLOG(_L8("FormatSerialNumber - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_STOREFORMATTEDSERIALNUMBER_ENTRY ); TBuf formatted; if (aSerialNo.Length() < KMTPSerialNumberLength) { @@ -799,7 +808,7 @@ // Store the formatted serial number. iPhoneIdV1.iSerialNumber = formatted; - __FLOG(_L8("FormatSerialNumber - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_STOREFORMATTEDSERIALNUMBER_EXIT ); } /** @@ -809,7 +818,8 @@ */ const TDesC& CMTPDeviceDataStore::SessionInitiatorVersionInfo() const { - __FLOG(_L8("SessionInitiatorVersionInfo - Entry:Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SESSIONINITIATORVERSIONINFO_ENTRY ); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SESSIONINITIATORVERSIONINFO_EXIT ); return iSessionInitiatorVersionInfo->StringChars(); } @@ -820,7 +830,8 @@ */ const TDesC& CMTPDeviceDataStore::SessionInitiatorVersionInfoDefault() const { - __FLOG(_L8("SessionInitiatorVersionInfoDefault - Entry:Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SESSIONINITIATORVERSIONINFODEFAULT_ENTRY ); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SESSIONINITIATORVERSIONINFODEFAULT_EXIT ); return KDefaultSessionInitiatorVersionInfo; } @@ -831,10 +842,10 @@ */ void CMTPDeviceDataStore::SetSessionInitiatorVersionInfoL(const TDesC& aVerInfo) { - __FLOG(_L8("SetDeviceFriendlyNameL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SETSESSIONINITIATORVERSIONINFOL_ENTRY ); iSessionInitiatorVersionInfo->SetL(aVerInfo); StoreL(); - __FLOG(_L8("SetDeviceFriendlyNameL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SETSESSIONINITIATORVERSIONINFOL_EXIT ); } /** @@ -844,7 +855,8 @@ */ TUint32 CMTPDeviceDataStore::PerceivedDeviceTypeDefault() const { - __FLOG(_L8("SessionInitiatorVersionInfoDefault - Entry:Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_PERCEIVEDDEVICETYPEDEFAULT_ENTRY ); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_PERCEIVEDDEVICETYPEDEFAULT_EXIT ); return DefaultPerceivedDeviceType; } @@ -862,7 +874,8 @@ */ TUint32 CMTPDeviceDataStore::PerceivedDeviceType() const { - __FLOG(_L8("SessionInitiatorVersionInfo - Entry:Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_PERCEIVEDDEVICETYPE_ENTRY ); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_PERCEIVEDDEVICETYPE_Exit ); return iPerceivedDeviceType.Value(); } @@ -872,11 +885,11 @@ **/ const TDesC& CMTPDeviceDataStore::DateTimeL() { - __FLOG(_L8("DateTime - Entry:Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_DATETIMEL_ENTRY ); TBuf<30> dateTimeString; DateTimeToStringL(dateTimeString); iDateTime->SetL(dateTimeString); - __FLOG(_L8("DateTime -Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_DATETIMEL_EXIT ); return iDateTime->StringChars(); } @@ -890,7 +903,7 @@ **/ TInt CMTPDeviceDataStore::SetDateTimeL(const TDesC& aDateTime ) { - __FLOG(_L8("SetDateTime - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_SETDATETIMEL_ENTRY ); TBuf<30> dateTime; TInt offset = User::UTCOffset().Int(); //get actul time to set, offset + ,- or UTC and offset from UTC in seconds. @@ -910,16 +923,21 @@ TTimeIntervalSeconds utcOffset(offset); // Subtract seconds ahead, to get to UTC timezone tt -= utcOffset; - __FLOG(_L8("Setting UTC time")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPDEVICEDATASTORE_SETDATETIMEL, + "Setting UTC time" ); errorCode = User::SetUTCTime(tt); - __FLOG_STMT(TBuf<30> readable;) - __FLOG_STMT(tt.FormatL(readable, _L("%F%Y%M%DT%H%T%SZ"));) - __FLOG_1(_L("Time now: %S"), &readable); + #ifdef OST_TRACE_COMPILER_IN_USE + TBuf<30> readable; + tt.FormatL(readable, _L("%F%Y%M%DT%H%T%SZ")); + #endif + OstTraceExt1( TRACE_NORMAL, DUP2_CMTPDEVICEDATASTORE_SETDATETIMEL, + "Time now: %S", readable); } } - __FLOG_1(_L8("SetDateTime - Exit %d"), errorCode); - - return errorCode; + + OstTrace1(TRACE_NORMAL, CMTPDEVICEDATASTORE_SETDATETIMEL, "Exit %d", errorCode); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_SETDATETIMEL_EXIT ); + return errorCode; } @@ -931,13 +949,13 @@ **/ void CMTPDeviceDataStore::DateTimeToStringL(TDes& aDateTime) { - __FLOG(_L8("DateTimeToString - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_DATETIMETOSTRINGL_ENTRY ); //get home time and convert it to string TTime tt; tt.UniversalTime(); _LIT(KFormat,"%F%Y%M%DT%H%T%SZ"); tt.FormatL(aDateTime, KFormat); - __FLOG(_L8("DateTimeToString - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_DATETIMETOSTRINGL_EXIT ); } /** @@ -947,7 +965,7 @@ **/ void CMTPDeviceDataStore::StringToDateTimeL(TDes& aDateTime ) { - __FLOG(_L8("StringToDateTime - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_STRINGTODATETIMEL_ENTRY ); TBuf<30> newTime; _LIT(KDlemMTP,"T"); _LIT(KDlemTTime,":"); @@ -978,10 +996,13 @@ } else { + OstTraceExt1( TRACE_ERROR, DUP1_CMTPDEVICEDATASTORE_STRINGTODATETIMEL, + "wrong argument, can't convert string %S to datetime", aDateTime); User::Leave( KErrArgument ); } - __FLOG_1(_L("Processed DateTime: %S"), &aDateTime); - __FLOG(_L8("StringToDateTime - Exit")); + OstTraceExt1(TRACE_NORMAL, CMTPDEVICEDATASTORE_STRINGTODATETIMEL, + "Processed DateTime: %S", aDateTime); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_STRINGTODATETIMEL_EXIT ); } /** @@ -994,8 +1015,9 @@ */ TInt CMTPDeviceDataStore::ValidateString(const TDesC& aDateTimeStr, TDes& aDateTime, TInt &aOffsetVal) { - __FLOG(_L8("ValidateString - Entry")); - __FLOG_1(_L("Supplied date: %S"), &aDateTimeStr); + OstTraceFunctionEntry0( CMTPDEVICEDATASTORE_VALIDATESTRING_ENTRY ); + OstTraceExt1(TRACE_NORMAL, CMTPDEVICEDATASTORE_VALIDATESTRING, + "Supplied date: %S", aDateTimeStr); _LIT(KDlemMTP,"T"); TInt errCode = KErrNone; TInt pos = aDateTimeStr.Find(KDlemMTP); @@ -1013,7 +1035,8 @@ if((KErrNotFound == pos ) || (aDateTimeStr.Length() > KMaxDateTimeLength) || (aDateTimeStr.Length() < KMinDateTimeLength) || pos != KPosDelemT) { - __FLOG_2(_L8("Invalid. pos: %d, len: %d"), pos, aDateTimeStr.Length()); + OstTraceExt2(TRACE_NORMAL, DUP1_CMTPDEVICEDATASTORE_VALIDATESTRING, + "Invalid. pos: %d, len: %d", pos, aDateTimeStr.Length()); errCode = KErrGeneral; } else @@ -1030,8 +1053,9 @@ case 't': if(i != pos) { - __FLOG_1(_L8("Invalid. 'T' encountered at offset %d"), i); - //error char at rong position + OstTrace1(TRACE_NORMAL, DUP2_CMTPDEVICEDATASTORE_VALIDATESTRING, + "Invalid. 'T' encountered at offset %d", i); + //error char at rong position errCode = KErrGeneral; }//else fine break; @@ -1042,7 +1066,8 @@ //error char at wrong position if(i 23) || (minuteOffset > 59)) { errCode = KErrGeneral; - __FLOG_2(_L8("Invalid. Hour(%d) or Minute(%d) offset out of range."), hourOffset, minuteOffset); + OstTraceExt2(TRACE_NORMAL, DUP5_CMTPDEVICEDATASTORE_VALIDATESTRING, + "Invalid. Hour(%d) or Minute(%d) offset out of range.", hourOffset, minuteOffset); break; } @@ -1084,7 +1111,8 @@ { aOffsetVal = -aOffsetVal; } - __FLOG_1(_L8("Info: Timezone offset %d seconds"), aOffsetVal); + OstTrace1(TRACE_NORMAL, DUP6_CMTPDEVICEDATASTORE_VALIDATESTRING, + "Info: Timezone offset %d seconds", aOffsetVal); } break; @@ -1094,26 +1122,34 @@ { //error char at wrong position errCode = KErrGeneral; - __FLOG_1(_L8("Invalid. '.' or NULL at offset %d"), i); + OstTrace1(TRACE_NORMAL, DUP7_CMTPDEVICEDATASTORE_VALIDATESTRING, + "Invalid. '.' or NULL at offset %d", i); } break; default : //wrong char errCode = KErrGeneral; - __FLOG_2(_L8("Invalid. Character %04x at offset %d"), aDateTimeStr[i], i); + OstTraceExt2(TRACE_NORMAL, DUP8_CMTPDEVICEDATASTORE_VALIDATESTRING, + "Invalid. Character %04x at offset %d", aDateTimeStr[i], i); break; } } if(KErrNone != errCode) { - __FLOG_2(_L("Processed date: %S, TimeZone: %ds ahead"), &aDateTimeStr, aOffsetVal); - __FLOG_1(_L8("ValidateString - Exit %d"), errCode); + OstTraceExt2(TRACE_NORMAL, DUP9_CMTPDEVICEDATASTORE_VALIDATESTRING, + "Processed date: %S, TimeZone: %ds ahead", aDateTimeStr, aOffsetVal); + OstTrace1(TRACE_NORMAL, DUP10_CMTPDEVICEDATASTORE_VALIDATESTRING, + "ValidateString - Exit %d", errCode); + OstTraceFunctionExit0( CMTPDEVICEDATASTORE_VALIDATESTRING_EXIT ); return errCode; } } } - __FLOG_2(_L("Processed date: %S, TimeZone: %ds ahead"), &aDateTimeStr, aOffsetVal); - __FLOG_1(_L8("ValidateString - Exit %d"), errCode); + OstTraceExt2(TRACE_NORMAL, DUP11_CMTPDEVICEDATASTORE_VALIDATESTRING, + "Processed date: %S, TimeZone: %ds ahead", aDateTimeStr, aOffsetVal); + OstTrace1(TRACE_NORMAL, DUP12_CMTPDEVICEDATASTORE_VALIDATESTRING, + "ValidateString - Exit %d", errCode); + OstTraceFunctionExit0( DUP1_CMTPDEVICEDATASTORE_VALIDATESTRING_EXIT ); return errCode; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpdevicedp.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpdevicedp.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpdevicedp.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -36,9 +36,14 @@ #include "cmtpconnectionmgr.h" #include "cmtpextndevdp.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdevicedpTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"DeviceDataProvider");) static const TInt KMTPDeviceDpSessionGranularity(3); static const TInt KMTPDeviceDpActiveEnumeration(0); @@ -62,7 +67,7 @@ */ CMTPDeviceDataProvider::~CMTPDeviceDataProvider() { - __FLOG(_L8("~CMTPDeviceDataProvider - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_CMTPDEVICEDATAPROVIDER_DES_ENTRY ); iPendingEnumerations.Close(); TInt count = iActiveProcessors.Count(); while(count--) @@ -82,8 +87,7 @@ delete iDeviceInfoTimer; iFrameWork.Close(); - __FLOG(_L8("~CMTPDeviceDataProvider - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_CMTPDEVICEDATAPROVIDER_DES_EXIT ); } void CMTPDeviceDataProvider::Cancel() @@ -93,18 +97,18 @@ void CMTPDeviceDataProvider::ProcessEventL(const TMTPTypeEvent& aEvent, MMTPConnection& aConnection) { - __FLOG(_L8("ProcessEventL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_PROCESSEVENTL_ENTRY ); TInt index = LocateRequestProcessorL(aEvent, aConnection); if(index != KErrNotFound) { iActiveProcessors[index]->HandleEventL(aEvent); } - __FLOG(_L8("ProcessEventL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_PROCESSEVENTL_EXIT ); } void CMTPDeviceDataProvider::ProcessNotificationL(TMTPNotification aNotification, const TAny* aParams) { - __FLOG(_L8("ProcessNotificationL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_PROCESSNOTIFICATIONL_ENTRY ); switch (aNotification) { case EMTPSessionClosed: @@ -121,12 +125,12 @@ // Ignore all other notifications. break; } - __FLOG(_L8("ProcessNotificationL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_PROCESSNOTIFICATIONL_EXIT ); } void CMTPDeviceDataProvider::ProcessRequestPhaseL(TMTPTransactionPhase aPhase, const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG(_L8("ProcessRequestPhaseL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL_ENTRY ); TUint16 opCode( aRequest.Uint16( TMTPTypeRequest::ERequestOperationCode ) ); TInt index = LocateRequestProcessorL(aRequest, aConnection); __ASSERT_DEBUG(index != KErrNotFound, Panic(EMTPDevDpNoMatchingProcessor)); @@ -145,54 +149,62 @@ } iActiveProcessor = -1; - __FLOG_VA((_L8("opCode = 0x%x"), opCode)); - __FLOG_VA((_L8("TranPort UID = 0x%x"), iFrameWork.ConnectionMgr().TransportUid().iUid)); - __FLOG_VA((_L8("CommandState = 0x%x"), iCommandState)); + OstTrace1(TRACE_NORMAL, CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL, "opCode = 0x%x", opCode); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL, + "TranPort UID = 0x%x", iFrameWork.ConnectionMgr().TransportUid().iUid); + OstTrace1(TRACE_NORMAL, DUP2_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL, "CommandState = 0x%x", iCommandState); const static TInt32 KMTPUsbTransportUid = 0x102827B2; if((EMTPOpCodeGetDeviceInfo == opCode)&&(KMTPUsbTransportUid == iFrameWork.ConnectionMgr().TransportUid().iUid)) { - __FLOG(_L8("EMTPOpCodeGetDeviceInfo == opCode")); + OstTrace0(TRACE_NORMAL, DUP3_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL, "EMTPOpCodeGetDeviceInfo == opCode"); //If GetDeviceInfo comes and there is no OpenSession before, the timer will start. And tread the host as Mac. //Only the first GetDeviceInfo in one session will start the timer. if((EIdle == iCommandState)&&(NULL == iDeviceInfoTimer)) { - __FLOG(_L8("EMTPOpCodeGetDeviceInfo == opCode, start timer")); + OstTrace0(TRACE_NORMAL, DUP4_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL, + "EMTPOpCodeGetDeviceInfo == opCode, start timer"); + iCommandState = EStartDeviceInfoTimer; iDeviceInfoTimer = CMTPDeviceInfoTimer::NewL(*this); iDeviceInfoTimer->Start(); } else { - __FLOG(_L8("EMTPOpCodeGetDeviceInfo == opCode, Not start timer")); + OstTrace0(TRACE_NORMAL, DUP5_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL, + "EMTPOpCodeGetDeviceInfo == opCode, Not start timer"); } } else { - __FLOG(_L8("EMTPOpCodeGetDeviceInfo != opCode")); + OstTrace0(TRACE_NORMAL, DUP6_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL, + "EMTPOpCodeGetDeviceInfo != opCode"); if((EMTPOpCodeOpenSession == opCode)&&(EIdle == iCommandState)) { - __FLOG(_L8("EMTPOpCodeGetDeviceInfo == opCode, set CommandState to be EOpenSession")); + OstTrace0(TRACE_NORMAL, DUP7_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL, + "EMTPOpCodeGetDeviceInfo == opCode, set CommandState to be EOpenSession"); iCommandState = EOpenSession; } if(iDeviceInfoTimer) { - __FLOG(_L8("iDeviceInfoTimer != NULL, stop timer")); + OstTrace0(TRACE_NORMAL, DUP8_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL, + "iDeviceInfoTimer != NULL, stop timer"); delete iDeviceInfoTimer; iDeviceInfoTimer = NULL; } else - { - __FLOG(_L8("iDeviceInfoTimer == NULL, NOT stop timer")); + { + OstTrace0(TRACE_NORMAL, DUP9_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL, + "iDeviceInfoTimer == NULL, NOT stop timer"); } } - __FLOG(_L8("ProcessRequestPhaseL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL_EXIT ); } void CMTPDeviceDataProvider::StartObjectEnumerationL(TUint32 aStorageId, TBool /*aPersistentFullEnumeration*/) { - __FLOG(_L8("StartObjectEnumerationL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_STARTOBJECTENUMERATIONL_ENTRY ); iPendingEnumerations.AppendL(aStorageId); if (iEnumeratingState == EUndefined) { @@ -205,20 +217,20 @@ iEnumeratingState = EEnumeratingFolders; NotifyEnumerationCompleteL(aStorageId, KErrNone); } - __FLOG(_L8("StartObjectEnumerationL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_STARTOBJECTENUMERATIONL_EXIT ); } void CMTPDeviceDataProvider::StartStorageEnumerationL() { - __FLOG(_L8("StartStorageEnumerationL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_STARTSTORAGEENUMERATIONL_ENTRY ); iStorageWatcher->EnumerateStoragesL(); Framework().StorageEnumerationCompleteL(); - __FLOG(_L8("StartStorageEnumerationL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_STARTSTORAGEENUMERATIONL_EXIT ); } void CMTPDeviceDataProvider::Supported(TMTPSupportCategory aCategory, RArray& aArray) const { - __FLOG(_L8("Supported - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_SUPPORTED_ENTRY ); TInt mode = Framework().Mode(); switch (aCategory) { @@ -329,12 +341,12 @@ // Unrecognised category, leave aArray unmodified. break; } - __FLOG(_L8("Supported - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_SUPPORTED_EXIT ); } void CMTPDeviceDataProvider::NotifyEnumerationCompleteL(TUint32 aStorageId, TInt /*aError*/) { - __FLOG(_L8("NotifyEnumerationCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_ENTRY ); __ASSERT_DEBUG((aStorageId == iPendingEnumerations[KMTPDeviceDpActiveEnumeration]), User::Invariant()); if (iPendingEnumerations.Count() > 0) { @@ -353,7 +365,7 @@ __DEBUG_ONLY(User::Invariant()); break; } - __FLOG(_L8("NotifyEnumerationCompleteL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_EXIT ); } /** @@ -374,7 +386,6 @@ */ void CMTPDeviceDataProvider::LoadExtnPluginsL() { - RArray extnUidArray; CleanupClosePushL(extnUidArray); iDevDpSingletons.ConfigMgr().GetRssConfigInfoArrayL( extnUidArray, EDevDpExtnUids); @@ -399,14 +410,16 @@ void CMTPDeviceDataProvider::AddFolderRecursiveL( const TMTPNotificationParamsFolderChange& aFolder ) { - __FLOG(_L8("AddFolderRecursiveL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_ADDFOLDERRECURSIVEL_ENTRY ); TPtrC folderRight( aFolder.iFolderChanged ); - __FLOG_VA((_L16("Folder Addition - DriveAndFullPath:%S"), &folderRight )); + OstTraceExt1(TRACE_NORMAL, CMTPDEVICEDATAPROVIDER_ADDFOLDERRECURSIVEL, + "Folder Addition - DriveAndFullPath:%S", folderRight); if ( !BaflUtils::FolderExists( Framework().Fs(), folderRight )) { - __FLOG(_L8("Folder not exist in file system")); + OstTrace0(TRACE_NORMAL, DUP1_CMTPDEVICEDATAPROVIDER_ADDFOLDERRECURSIVEL, + "Folder not exist in file system"); User::Leave( KErrArgument ); } @@ -416,7 +429,14 @@ TInt lengthOfRight( folderRight.Length()); TFileName folderLeft; - _LIT( KRootFolder, "?:\\"); + // get root path of storage + TInt driveNumber; + User::LeaveIfError(Framework().Fs().CharToDrive(folderRight[0], driveNumber)); + RBuf rootDirPath; + rootDirPath.CreateL(KMaxFileName); + rootDirPath.CleanupClosePushL(); + iDevDpSingletons.ConfigMgr().GetRootDirPathL(driveNumber, rootDirPath); + rootDirPath.Insert(0, folderRight.Mid(0, 2));// get drive: /* Go through from beginning. @@ -434,7 +454,7 @@ lengthOfRight = folderRight.Length()-pos -1; folderRight.Set( folderRight.Right( lengthOfRight )); - if ( KErrNotFound != folderLeft.Match( KRootFolder )) + if ( rootDirPath.FindF(folderLeft) != KErrNotFound) { //first time, root folder //continue @@ -444,11 +464,12 @@ handle = Framework().ObjectMgr().HandleL( folderLeft ); } while( KMTPHandleNone != handle ); - + CleanupStack::PopAndDestroy(&rootDirPath); if ( KMTPHandleNone == handle ) { - __FLOG(_L8("need to add entry into mtp database")); + OstTrace0(TRACE_NORMAL, DUP2_CMTPDEVICEDATAPROVIDER_ADDFOLDERRECURSIVEL, + "need to add entry into mtp database"); CMTPObjectMetaData* folderObject = CMTPObjectMetaData::NewL(); TUint32 storageId = GetStorageIdL( folderLeft ); @@ -471,12 +492,12 @@ delete folderObject; } - __FLOG(_L8("AddFolderRecursiveL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_ADDFOLDERRECURSIVEL_EXIT ); } TUint32 CMTPDeviceDataProvider::AddEntryL( const TDesC& aPath, TUint32 aParentHandle, TUint32 aStorageId, CMTPObjectMetaData& aObjectInfo ) { - __FLOG(_L8("AddEntryL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_ADDENTRYL_ENTRY ); TBool isFolder( EFalse ); BaflUtils::IsFolder( Framework().Fs(), aPath, isFolder ); @@ -485,7 +506,7 @@ __ASSERT_ALWAYS( aParentHandle != KMTPHandleNone, User::Leave( KErrArgument )); __ASSERT_ALWAYS( Framework().StorageMgr().ValidStorageId( aStorageId ), User::Leave( KErrArgument )); - __FLOG_VA((_L16("Add Entry for Path:%S"), &aPath )); + OstTraceExt1(TRACE_NORMAL, CMTPDEVICEDATAPROVIDER_ADDENTRYL, "Add Entry for Path:%S", aPath); aObjectInfo.SetUint( CMTPObjectMetaData::EDataProviderId, Framework().DataProviderId() ); aObjectInfo.SetUint( CMTPObjectMetaData::EFormatCode, EMTPFormatCodeAssociation ); aObjectInfo.SetUint( CMTPObjectMetaData::EStorageId, aStorageId ); @@ -505,27 +526,27 @@ aObjectInfo.SetDesCL( CMTPObjectMetaData::EName, tailFolder ); Framework().ObjectMgr().InsertObjectL( aObjectInfo ); - __FLOG(_L8("AddEntryL - Exit")); - + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_ADDENTRYL_EXIT ); return aObjectInfo.Uint( CMTPObjectMetaData::EHandle ); } TUint32 CMTPDeviceDataProvider::GetStorageIdL( const TDesC& aPath ) { - __FLOG(_L8("GetStorageId - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_GETSTORAGEIDL_ENTRY ); TChar driveLetter = aPath[0]; TInt drive; - User::LeaveIfError( Framework().Fs().CharToDrive( driveLetter, drive )); - - __FLOG(_L8("GetStorageId - Exit")); + LEAVEIFERROR( Framework().Fs().CharToDrive( driveLetter, drive ), + OstTraceExt1( TRACE_ERROR, CMTPDEVICEDATAPROVIDER_GETSTORAGEIDL, "can't convert driver letter %c to drive!", driveLetter)); + + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_GETSTORAGEIDL_EXIT ); return Framework().StorageMgr().FrameworkStorageId( static_cast( drive )); } void CMTPDeviceDataProvider::OnDeviceFolderChangedL( TMTPEventCode aEventCode, CMTPObjectMetaData& aObjectInfo ) { - __FLOG(_L8("OnDeviceFolderChangedL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_ONDEVICEFOLDERCHANGEDL_ENTRY ); iEvent.Reset(); @@ -533,7 +554,7 @@ { case EMTPEventCodeObjectAdded: { - __FLOG(_L8("Send event for object add")); + OstTrace0(TRACE_NORMAL, CMTPDEVICEDATAPROVIDER_ONDEVICEFOLDERCHANGEDL, "Send event for object add"); iEvent.SetUint16( TMTPTypeEvent::EEventCode, EMTPEventCodeObjectAdded ); iEvent.SetUint32( TMTPTypeEvent::EEventSessionID, KMTPSessionAll ); iEvent.SetUint32( TMTPTypeEvent::EEventTransactionID, KMTPTransactionIdNone ); @@ -547,7 +568,7 @@ Framework().SendEventL(iEvent); - __FLOG(_L8("OnDeviceFolderChangedL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_ONDEVICEFOLDERCHANGEDL_EXIT ); } /** @@ -555,8 +576,7 @@ */ void CMTPDeviceDataProvider::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_CONSTRUCTL_ENTRY ); iDevDpSingletons.OpenL(Framework()); iPtrDataStore = &(iDevDpSingletons.DeviceDataStore()); iDpSingletons.OpenL(Framework()); @@ -572,14 +592,14 @@ // __ASSERT_DEBUG((err == KErrNone), Panic(_L("Invalid resource file "))); if(KErrNone != err) { - __FLOG(_L8("\nTere is an issue in loading the plugin !!!!!\n")); + OstTrace0(TRACE_ERROR, CMTPDEVICEDATAPROVIDER_CONSTRUCTL, + "\nTere is an issue in loading the plugin !!!!!\n"); } iEnumerator = CMTPFSEnumerator::NewL(Framework(), iDpSingletons.ExclusionMgrL(), *this, KProcessLimit); iFrameWork.OpenL(); - - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_CONSTRUCTL_EXIT ); } void CMTPDeviceDataProvider::OnDevicePropertyChangedL (TMTPDevicePropertyCode& aPropCode) @@ -620,7 +640,7 @@ */ TInt CMTPDeviceDataProvider::LocateRequestProcessorL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG(_L8("LocateRequestProcessorL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_LOCATEREQUESTPROCESSORL_TMTPTYPEREQUEST_ENTRY ); TInt index = KErrNotFound; TInt count = iActiveProcessors.Count(); for(TInt i = 0; i < count; i++) @@ -651,7 +671,7 @@ CleanupStack::Pop(); index = count; } - __FLOG(_L8("LocateRequestProcessorL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_LOCATEREQUESTPROCESSORL_TMTPTYPEREQUEST_EXIT ); return index; } @@ -663,7 +683,7 @@ */ TInt CMTPDeviceDataProvider::LocateRequestProcessorL(const TMTPTypeEvent& aEvent, MMTPConnection& aConnection) { - __FLOG(_L8("LocateRequestProcessorL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_LOCATEREQUESTPROCESSORL_TMTPTYPEEVENT_ENTRY ); TInt index = KErrNotFound; TInt count = iActiveProcessors.Count(); for(TInt i = 0; i < count; i++) @@ -674,7 +694,7 @@ break; } } - __FLOG(_L8("LocateRequestProcessorL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_LOCATEREQUESTPROCESSORL_TMTPTYPEEVENT_EXIT ); return index; } @@ -684,7 +704,7 @@ */ void CMTPDeviceDataProvider::SessionClosedL(const TMTPNotificationParamsSessionChange& aSession) { - __FLOG(_L8("SessionClosedL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_SESSIONCLOSEDL_ENTRY ); TInt count = iActiveProcessors.Count(); while(count--) { @@ -702,8 +722,9 @@ processor->Release(); } } - } - __FLOG_VA((_L8("current state is =%d"), iCommandState)); + } + OstTrace1(TRACE_NORMAL, CMTPDEVICEDATAPROVIDER_SESSIONCLOSEDL, + "current state is =%d", iCommandState); if(iCommandState != EIdle) { if(iDeviceInfoTimer) @@ -714,31 +735,32 @@ iCommandState = EIdle; iDevDpSingletons.DeviceDataStore().SetConnectMac(EFalse); } - __FLOG(_L8("SessionClosedL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_SESSIONCLOSEDL_EXIT ); } /** Prepares for a newly-opened session. @param aSession notification parameter block */ -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE void CMTPDeviceDataProvider::SessionOpenedL(const TMTPNotificationParamsSessionChange& aSession) #else void CMTPDeviceDataProvider::SessionOpenedL(const TMTPNotificationParamsSessionChange& /*aSession*/) #endif { - __FLOG(_L8("SessionOpenedL - Entry")); - __FLOG_VA((_L8("SessionID = %d"), aSession.iMTPId)); - __FLOG(_L8("SessionOpenedL - Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_SESSIONOPENEDL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDEVICEDATAPROVIDER_SESSIONOPENEDL, "SessionID = %d", aSession.iMTPId); + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_SESSIONOPENEDL_EXIT); } void CMTPDeviceDataProvider::SetConnectMac() { - __FLOG(_L8("SetConnectMac - Entry")); - iDevDpSingletons.DeviceDataStore().SetConnectMac(ETrue); - __FLOG_VA((_L8("previous state = %d, current is ESetIsMac"), iCommandState)); - iCommandState = ESetIsMac; - __FLOG(_L8("SetConnectMac - Exit")); + OstTraceFunctionEntry0( CMTPDEVICEDATAPROVIDER_SETCONNECTMAC_ENTRY ); + iDevDpSingletons.DeviceDataStore().SetConnectMac(ETrue); + OstTrace1(TRACE_NORMAL, CMTPDEVICEDATAPROVIDER_SETCONNECTMAC, + "previous state = %d, current is ESetIsMac", iCommandState); + iCommandState = ESetIsMac; + OstTraceFunctionExit0( CMTPDEVICEDATAPROVIDER_SETCONNECTMAC_EXIT ); } /** @@ -762,7 +784,6 @@ { Cancel(); iLdd.Close(); - __FLOG_CLOSE; } /** @@ -772,37 +793,39 @@ const TUint KMTPDeviceInfoDelay = (1000000 * 5); void CMTPDeviceInfoTimer::Start() { - __FLOG(_L8("CMTPDeviceInfoTimer::Start - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEINFOTIMER_START_ENTRY ); After(KMTPDeviceInfoDelay); iState = EStartTimer; - __FLOG(_L8("CMTPDeviceInfoTimer::Start - Exit")); + OstTraceFunctionExit0( CMTPDEVICEINFOTIMER_START_EXIT ); } void CMTPDeviceInfoTimer::RunL() { - __FLOG(_L8("CMTPDeviceInfoTimer::RunL - Entry")); - __FLOG_VA((_L8("iStatus == %d"), iStatus.Int())); + OstTraceFunctionEntry0( CMTPDEVICEINFOTIMER_RUNL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDEVICEINFOTIMER_RUNL, + "iStatus == %d", iStatus.Int()); switch(iState) { case EStartTimer: - __FLOG(_L8("CMTPDeviceInfoTimer::RunL - EStartTimer")); + OstTrace0(TRACE_NORMAL, DUP1_CMTPDEVICEINFOTIMER_RUNL, "CMTPDeviceInfoTimer::RunL - EStartTimer"); // Open the USB device interface. - User::LeaveIfError(iLdd.Open(0)); + LEAVEIFERROR(iLdd.Open(0), + OstTrace0( TRACE_ERROR, DUP4_CMTPDEVICEINFOTIMER_RUNL, "Open the USB device interface error!" )); iLdd.ReEnumerate(iStatus); iDeviceProvider.SetConnectMac(); iState = EUSBReEnumerate; SetActive(); break; case EUSBReEnumerate: - __FLOG(_L8("CMTPDeviceInfoTimer::RunL - EUSBReEnumerate")); + OstTrace0(TRACE_NORMAL, DUP2_CMTPDEVICEINFOTIMER_RUNL, "CMTPDeviceInfoTimer::RunL - EUSBReEnumerate"); break; default: - __FLOG(_L8("CMTPDeviceInfoTimer::RunL - default")); + OstTrace0(TRACE_NORMAL, DUP3_CMTPDEVICEINFOTIMER_RUNL, "CMTPDeviceInfoTimer::RunL - default"); break; } - __FLOG(_L8("CMTPDeviceInfoTimer::RunL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEINFOTIMER_RUNL_EXIT ); } /** @@ -819,7 +842,6 @@ */ void CMTPDeviceInfoTimer::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); CTimer::ConstructL(); CActiveScheduler::Add(this); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpdevicedpconfigmgr.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpdevicedpconfigmgr.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpdevicedpconfigmgr.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,6 +20,11 @@ #include #include <102827af.rsg> #include "cmtpdevicedpconfigmgr.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdevicedpconfigmgrTraces.h" +#endif + enum PanicReason { @@ -31,7 +36,6 @@ #endif // Class constants. -__FLOG_STMT(_LIT8(KComponent,"DeviceDpConfigMgr");) CMTPDeviceDpConfigMgr* CMTPDeviceDpConfigMgr::NewL(MMTPDataProviderFramework& aFramework) { @@ -49,8 +53,7 @@ void CMTPDeviceDpConfigMgr::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDPCONFIGMGR_CONSTRUCTL_ENTRY ); iResourceId = iFramework.DataProviderConfig().UintValue(MMTPDataProviderConfig::EOpaqueResource); @@ -71,12 +74,11 @@ CleanupStack::PopAndDestroy(res); CleanupStack::PopAndDestroy(&resFile); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDPCONFIGMGR_CONSTRUCTL_EXIT ); } CMTPDeviceDpConfigMgr::~CMTPDeviceDpConfigMgr() { - __FLOG_CLOSE; } #ifdef _DEBUG @@ -124,7 +126,7 @@ void CMTPDeviceDpConfigMgr::GetDriveInfoL(TInt aDriveNo, TDes& aVolumeName, TDes& aRootDirPath) { - __FLOG(_L8("GetDriveInfoL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDPCONFIGMGR_GETDRIVEINFOL_ENTRY ); RResourceFile resFile; resFile.OpenL(iFramework.Fs(), iFramework.DataProviderConfig().DesCValue(MMTPDataProviderConfig::EResourceFileName)); CleanupClosePushL(resFile); @@ -133,7 +135,7 @@ TResourceReader reader; reader.SetBuffer(dataBuffer); TInt maxDrives = reader.ReadInt16(); - __FLOG_VA((_L8("aDriveNo = %d"), aDriveNo)); + OstTrace1(TRACE_NORMAL, CMTPDEVICEDPCONFIGMGR_GETDRIVEINFOL, "aDriveNo = %d", aDriveNo); TBool found = EFalse; for(TInt driveIndex = 0; driveIndex < maxDrives; driveIndex++) { @@ -144,7 +146,8 @@ if(driveNumber == aDriveNo) { found = ETrue; - __FLOG_VA((_L8("Found the drive! Drive Number = %d"), driveNumber)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDEVICEDPCONFIGMGR_GETDRIVEINFOL, + "Found the drive! Drive Number = %d", driveNumber); if ((KMaxFileName > volumeName.Length()) && (KMaxFileName > rootDirName.Length()) ) @@ -154,7 +157,8 @@ } else { - __FLOG(_L8("VolumeName or RootDirName length is more than KMaxFileName")); + OstTrace0(TRACE_NORMAL, DUP2_CMTPDEVICEDPCONFIGMGR_GETDRIVEINFOL, + "VolumeName or RootDirName length is more than KMaxFileName"); // volumeName and/or rootDirName specified in resource file is too lengthy. User::Leave(KErrArgument); } @@ -164,36 +168,37 @@ if (!found) { - __FLOG_VA((_L8("No match in resource file for Drive Number = %d"), aDriveNo)); + OstTrace1(TRACE_NORMAL, DUP3_CMTPDEVICEDPCONFIGMGR_GETDRIVEINFOL, + "No match in resource file for Drive Number = %d", aDriveNo); // Matching drive number was not found in resource file. User::Leave(KErrNotFound); } CleanupStack::PopAndDestroy(dataBuffer); CleanupStack::PopAndDestroy(&resFile); - __FLOG(_L8("GetDriveInfoL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDPCONFIGMGR_GETDRIVEINFOL_EXIT ); } void CMTPDeviceDpConfigMgr::GetFriendlyVolumeNameL(TInt aDriveNo, TDes& aVolumeName) { - __FLOG(_L8("GetFriendlyVolumeNameL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDPCONFIGMGR_GETFRIENDLYVOLUMENAMEL_ENTRY ); RBuf rootDirPath; rootDirPath.CreateL(KMaxFileName); rootDirPath.CleanupClosePushL(); GetDriveInfoL(aDriveNo, aVolumeName, rootDirPath); CleanupStack::PopAndDestroy(); - __FLOG(_L8("GetFriendlyVolumeNameL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDPCONFIGMGR_GETFRIENDLYVOLUMENAMEL_EXIT ); } void CMTPDeviceDpConfigMgr::GetRootDirPathL(TInt aDriveNo, TDes& aRootDirPath) { - __FLOG(_L8("GetRootDirPathL - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDPCONFIGMGR_GETROOTDIRPATHL_ENTRY ); RBuf volumeName; volumeName.CreateL(KMaxFileName); volumeName.CleanupClosePushL(); GetDriveInfoL(aDriveNo, volumeName, aRootDirPath); CleanupStack::PopAndDestroy(); - __FLOG(_L8("GetRootDirPathL - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDPCONFIGMGR_GETROOTDIRPATHL_EXIT ); } /** @@ -204,7 +209,7 @@ */ void CMTPDeviceDpConfigMgr::GetRssConfigInfoArrayL(RArray& aOrderInfoArray, TDevDPConfigRSSParams aParam) { - __FLOG(_L8("GetOrderedFormatInfo - Entry")); + OstTraceFunctionEntry0( CMTPDEVICEDPCONFIGMGR_GETRSSCONFIGINFOARRAYL_ENTRY ); RResourceFile resFile; resFile.OpenL(iFramework.Fs(), iFramework.DataProviderConfig().DesCValue(MMTPDataProviderConfig::EResourceFileName)); CleanupClosePushL(resFile); @@ -229,7 +234,7 @@ TResourceReader reader; reader.SetBuffer(dataBuffer); TInt noOfElem = reader.ReadInt16(); - //rewind to the begening else desc array can not read value. + //rewind to the beginning else desc array can not read value. reader.Rewind(sizeof(TInt16)); if(0 != noOfElem) { @@ -249,7 +254,8 @@ if(errorCode ) { - __FLOG(_L8("ERROR !!!Invalid entry in the config.rss file ")); + OstTrace0(TRACE_ERROR, CMTPDEVICEDPCONFIGMGR_GETRSSCONFIGINFOARRAYL, + "ERROR !!!Invalid entry in the config.rss file "); } else { @@ -269,9 +275,10 @@ { CleanupStack::PopAndDestroy(dataBuffer); CleanupStack::PopAndDestroy(&resFile); + OstTrace0( TRACE_ERROR, DUP1_CMTPDEVICEDPCONFIGMGR_GETRSSCONFIGINFOARRAYL, "resource file contains zero element" ); User::Leave(KErrArgument); } - __FLOG(_L8("GetOrderedFormatInfo - Exit")); + OstTraceFunctionExit0( CMTPDEVICEDPCONFIGMGR_GETRSSCONFIGINFOARRAYL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdeviceinfo.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdeviceinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdeviceinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -35,9 +35,13 @@ #include "rmtpdevicedpsingletons.h" #include "cmtpdevicedpconfigmgr.h" #include "cmtpservicemgr.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetdeviceinfoTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"GetDeviceInfo");) /** This identifies, in hundredths, the PTP version this device can support @@ -78,12 +82,11 @@ */ CMTPGetDeviceInfo::~CMTPGetDeviceInfo() { - __FLOG(_L8("~CMTPGetDeviceInfo - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEINFO_CMTPGETDEVICEINFO_ENTRY ); delete iDeviceInfo; iDpSingletons.Close(); iSingletons.Close(); - __FLOG(_L8("~CMTPGetDeviceInfo - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPGETDEVICEINFO_CMTPGETDEVICEINFO_EXIT ); } /** @@ -100,19 +103,21 @@ */ void CMTPGetDeviceInfo::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEINFO_SERVICEL_ENTRY ); if (!iDpSingletons.DeviceDataStore().Enumerated()) { - __FLOG(_L8("MTPExtensionReady not ready, reschedule request")); + OstTrace0(TRACE_NORMAL, CMTPGETDEVICEINFO_SERVICEL, + "MTPExtensionReady not ready, reschedule request"); iDpSingletons.DeviceDataStore().RegisterPendingRequest(); RegisterPendingRequest(); + OstTraceFunctionExit0( CMTPGETDEVICEINFO_SERVICEL_EXIT ); return; } BuildDeviceInfoL(); SendDataL(*iDeviceInfo); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( DUP1_CMTPGETDEVICEINFO_SERVICEL_EXIT ); } /** @@ -120,12 +125,11 @@ */ void CMTPGetDeviceInfo::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEINFO_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); iDpSingletons.OpenL(iFramework); iDeviceInfo = CMTPTypeDeviceInfo::NewL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEINFO_CONSTRUCTL_EXIT ); } /** @@ -133,13 +137,13 @@ */ void CMTPGetDeviceInfo::BuildDeviceInfoL() { - __FLOG(_L8("BuildDeviceInfoL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEINFO_BUILDDEVICEINFOL_ENTRY ); CMTPDeviceDataStore& device(iDpSingletons.DeviceDataStore()); iDeviceInfo->SetUint16L(CMTPTypeDeviceInfo::EStandardVersion, KMTPStandardVersion); if(iDpSingletons.DeviceDataStore().IsConnectMac()) { - __FLOG(_L8("Connect Mac = ETrue")); + OstTrace0(TRACE_NORMAL, CMTPGETDEVICEINFO_BUILDDEVICEINFOL, "Connect Mac = ETrue"); iDeviceInfo->SetUint32L(CMTPTypeDeviceInfo::EMTPVendorExtensionID, KMTPVendorExtensionId_Mac); iDeviceInfo->SetUint16L(CMTPTypeDeviceInfo::EMTPVersion, KMTPVersion); RBuf mtpExtensions; @@ -150,7 +154,7 @@ } else { - __FLOG(_L8("Connect Mac = EFalse")); + OstTrace0(TRACE_NORMAL, DUP1_CMTPGETDEVICEINFO_BUILDDEVICEINFOL, "Connect Mac = EFalse"); iDeviceInfo->SetUint32L(CMTPTypeDeviceInfo::EMTPVendorExtensionID, KMTPVendorExtensionId); iDeviceInfo->SetUint16L(CMTPTypeDeviceInfo::EMTPVersion, KMTPVersion); iDeviceInfo->SetStringL(CMTPTypeDeviceInfo::EMTPExtensions, iDpSingletons.DeviceDataStore().MTPExtensions()); @@ -168,8 +172,8 @@ SetSupportedDevicePropertiesL(dps); SetSupportedCaptureFormatsL(dps); SetSupportedPlaybackFormatsL(dps); - - __FLOG(_L8("BuildDeviceInfoL - Exit")); + + OstTraceFunctionExit0( CMTPGETDEVICEINFO_BUILDDEVICEINFOL_EXIT ); } /** @@ -179,7 +183,7 @@ */ void CMTPGetDeviceInfo::SetSupportedOperationsL(CMTPDataProviderController& aDpController) { - __FLOG(_L8("SetSupportedOperationsL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEINFO_SETSUPPORTEDOPERATIONSL_ENTRY ); TInt count = aDpController.Count(); RArray supportedOperations(KMTPArrayGranularity); @@ -212,8 +216,8 @@ CleanupStack::PopAndDestroy(&supportedOperations); CleanupStack::PushL(mtpOperationsArray); //unnecessary if Set operation below does not leave, iDeviceInfo->SetL(CMTPTypeDeviceInfo::EOperationsSupported, *mtpOperationsArray); - CleanupStack::PopAndDestroy(mtpOperationsArray); - __FLOG(_L8("SetSupportedOperationsL - Exit")); + CleanupStack::PopAndDestroy(mtpOperationsArray); + OstTraceFunctionExit0( CMTPGETDEVICEINFO_SETSUPPORTEDOPERATIONSL_EXIT ); } /** @@ -223,7 +227,7 @@ */ void CMTPGetDeviceInfo::SetSupportedEventsL(CMTPDataProviderController& aDpController) { - __FLOG(_L8("SetSupportedEventsL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEINFO_SETSUPPORTEDEVENTSL_ENTRY ); TInt count = aDpController.Count(); RArray supportedEvents(KMTPArrayGranularity); CleanupClosePushL(supportedEvents); @@ -237,7 +241,7 @@ CleanupStack::PushL(mtpEventArray); //unnecessary if Set operation below does not leave, iDeviceInfo->SetL(CMTPTypeDeviceInfo::EEventsSupported, *mtpEventArray); CleanupStack::PopAndDestroy(mtpEventArray); - __FLOG(_L8("SetSupportedEventsL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEINFO_SETSUPPORTEDEVENTSL_EXIT ); } /** @@ -245,7 +249,7 @@ */ void CMTPGetDeviceInfo::SetSupportedDevicePropertiesL(CMTPDataProviderController& aDpController) { - __FLOG(_L8("SetSupportedDevicePropertiesL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEINFO_SETSUPPORTEDDEVICEPROPERTIESL_ENTRY ); TInt count = aDpController.Count(); RArray supportedOperations(KMTPArrayGranularity); CleanupClosePushL(supportedOperations); @@ -278,8 +282,8 @@ CleanupStack::PushL(mtpOperationsArray); //unnecessary if Set operation below does not leave, iDeviceInfo->SetL(CMTPTypeDeviceInfo::EDevicePropertiesSupported, *mtpOperationsArray); CleanupStack::PopAndDestroy(mtpOperationsArray); - - __FLOG(_L8("SetSupportedDevicePropertiesL - Exit")); + + OstTraceFunctionExit0( CMTPGETDEVICEINFO_SETSUPPORTEDDEVICEPROPERTIESL_EXIT ); } /** @@ -289,7 +293,7 @@ */ void CMTPGetDeviceInfo::SetSupportedCaptureFormatsL(CMTPDataProviderController& aDpController) { - __FLOG(_L8("SetSupportedCaptureFormatsL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEINFO_SETSUPPORTEDCAPTUREFORMATSL_ENTRY ); TInt count = aDpController.Count(); RArray supportedCaptureFormats(KMTPArrayGranularity); CleanupClosePushL(supportedCaptureFormats); @@ -301,7 +305,8 @@ TRAPD(errorCode,iDpSingletons.ConfigMgr().GetRssConfigInfoArrayL(orderedFormats, EDevDpFormats)); if(KErrNone != errorCode) { - __FLOG(_L8("There is an issue in reading format info from rss file ")); + OstTrace0(TRACE_WARNING, CMTPGETDEVICEINFO_SETSUPPORTEDCAPTUREFORMATSL, + "There is an issue in reading format info from rss file "); } while(count--) @@ -329,7 +334,8 @@ #ifdef _DEBUG for(TInt i =0 ; i < supportedCaptureFormats.Count(); i++) { - __FLOG_VA((_L8("Playback formats = %d"), supportedCaptureFormats[i])); + OstTrace1(TRACE_NORMAL, DUP1_CMTPGETDEVICEINFO_SETSUPPORTEDCAPTUREFORMATSL, + "Playback formats = %d ", supportedCaptureFormats[i]); } #endif //before deleting make sure all the elements are added to supportedPlaybackFormats @@ -340,7 +346,7 @@ CleanupStack::PushL(mtpCaptureFormatArray); //unnecessary if Set operation below does not leave, iDeviceInfo->SetL(CMTPTypeDeviceInfo::ECaptureFormats, *mtpCaptureFormatArray); CleanupStack::PopAndDestroy(mtpCaptureFormatArray); - __FLOG(_L8("SetSupportedCaptureFormatsL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEINFO_SETSUPPORTEDCAPTUREFORMATSL_EXIT ); } /** @@ -350,7 +356,7 @@ */ void CMTPGetDeviceInfo::SetSupportedPlaybackFormatsL(CMTPDataProviderController& aDpController) { - __FLOG(_L8("SetSupportedPlaybackFormatsL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEINFO_SETSUPPORTEDPLAYBACKFORMATSL_ENTRY ); TInt count = aDpController.Count(); RArray supportedPlaybackFormats(KMTPArrayGranularity); CleanupClosePushL(supportedPlaybackFormats); @@ -363,7 +369,8 @@ TRAPD(errorCode,iDpSingletons.ConfigMgr().GetRssConfigInfoArrayL(orderedFormats, EDevDpFormats)); if(KErrNone != errorCode) { - __FLOG(_L8("There is an issue in reading format info from rss file ")); + OstTrace0(TRACE_WARNING, CMTPGETDEVICEINFO_SETSUPPORTEDPLAYBACKFORMATSL, + "There is an issue in reading format info from rss file "); } while(count--) @@ -392,7 +399,8 @@ #ifdef _DEBUG for(TInt i =0 ; i < supportedPlaybackFormats.Count(); i++) { - __FLOG_VA((_L8("Playback formats = %d"), supportedPlaybackFormats[i])); + OstTrace1(TRACE_NORMAL, DUP1_CMTPGETDEVICEINFO_SETSUPPORTEDPLAYBACKFORMATSL, + "Playback formats = %d ", supportedPlaybackFormats[i]); } #endif //before deleting make sure all the elements are added to supportedPlaybackFormats @@ -403,7 +411,7 @@ CleanupStack::PushL(mtpPlaybackFormatArray); //unnecessary if Set operation below does not leave, iDeviceInfo->SetL(CMTPTypeDeviceInfo::EPlaybackFormats, *mtpPlaybackFormatArray); CleanupStack::PopAndDestroy(mtpPlaybackFormatArray); - __FLOG(_L8("SetSupportedPlaybackFormatsL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEINFO_SETSUPPORTEDPLAYBACKFORMATSL_EXIT ); } /** @@ -419,13 +427,15 @@ // Apply filter if(aSrcArray[i] == EMTPOpCodeResetDevicePropValue) { - __FLOG_VA((_L8("Filter ignored operation: %d"), aSrcArray[i])); + OstTrace1(TRACE_NORMAL, CMTPGETDEVICEINFO_ADDTOARRAYL, "Filter ignored operation: %d", aSrcArray[i]); continue; } TInt err(aDestArray.InsertInOrder(aSrcArray[i])); if ((err != KErrNone) && (err != KErrAlreadyExists)) { + OstTrace1( TRACE_ERROR, DUP1_CMTPGETDEVICEINFO_ADDTOARRAYL, + "Add elements from source array to the destination array error! error code %d", err ); User::Leave(err); } } @@ -448,13 +458,16 @@ aSrcArray[i] == EMTPOpCodeSendObjectPropList || aSrcArray[i] == EMTPOpCodeGetFormatCapabilities ) { - __FLOG_VA((_L8("Filter ignored operation: %d"), aSrcArray[i])); + OstTrace1(TRACE_NORMAL, CMTPGETDEVICEINFO_ADDTOARRAYWITHFILTERL, + "Filter ignored operation: %d", aSrcArray[i]); continue; } TInt err(aDestArray.InsertInOrder(aSrcArray[i])); if ((err != KErrNone) && (err != KErrAlreadyExists)) { + OstTrace1( TRACE_ERROR, DUP1_CMTPGETDEVICEINFO_ADDTOARRAYWITHFILTERL, + "Add elements from source array to the destination array error! error code %d", err ); User::Leave(err); } } @@ -463,7 +476,7 @@ void CMTPGetDeviceInfo::RemoveServiceFormat(RArray& aSupportedCaptureFormats) { - __FLOG(_L8("RemovetServiceFormat - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEINFO_REMOVESERVICEFORMAT_ENTRY ); TInt count = aSupportedCaptureFormats.Count(); count--; @@ -473,5 +486,5 @@ aSupportedCaptureFormats.Remove(count); count--; } - __FLOG(_L8("RemovetServiceFormat - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEINFO_REMOVESERVICEFORMAT_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdevicepropdesc.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdevicepropdesc.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdevicepropdesc.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -31,9 +31,14 @@ #include "mtpdevicedpconst.h" #include "mtpdevdppanic.h" #include "cmtpdevicedpconfigmgr.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetdevicepropdescTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"GetDevicePropDesc");) _LIT(KSpace, " "); @@ -58,13 +63,12 @@ */ CMTPGetDevicePropDesc::~CMTPGetDevicePropDesc() { - __FLOG(_L8("~CMTPGetDevicePropDesc - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_CMTPGETDEVICEPROPDESC_DES_ENTRY ); delete iData; delete iPropDesc; delete iRepository; iDpSingletons.Close(); - __FLOG(_L8("~CMTPGetDevicePropDesc - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_CMTPGETDEVICEPROPDESC_DES_EXIT ); } /** @@ -81,7 +85,7 @@ */ TMTPResponseCode CMTPGetDevicePropDesc::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_CHECKREQUESTL_ENTRY ); TMTPResponseCode respCode(EMTPRespCodeDevicePropNotSupported); iPropCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1); const TInt count = sizeof(KMTPDeviceDpSupportedProperties) / sizeof(KMTPDeviceDpSupportedProperties[0]); @@ -96,7 +100,7 @@ { respCode = EMTPRespCodeOK; } - __FLOG(_L8("CheckRequestL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_CHECKREQUESTL_EXIT ); return respCode; } @@ -105,18 +109,19 @@ */ void CMTPGetDevicePropDesc::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEL_ENTRY ); iPropCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1); //before performing any operation will check the properties are supported or //not if not then return EMTPRespCodeDevicePropNotSupported const CMTPTypeArray *mtpArray = &(iDpSingletons.DeviceDataStore().GetSupportedDeviceProperties()); RArray supportedArray; mtpArray->Array(supportedArray); - __FLOG_VA((_L8("No of elements in supported property array = %d "), supportedArray.Count())); + OstTrace1(TRACE_NORMAL, CMTPGETDEVICEPROPDESC_SERVICEL, + "No of elements in supported property array = %d ", supportedArray.Count()); if(KErrNotFound == supportedArray.Find(iPropCode)) { SendResponseL(EMTPRespCodeDevicePropNotSupported); - __FLOG(_L8("CMTPGetDevicePropDesc::EMTPRespCodeDevicePropNotSupported ")); + OstTrace0(TRACE_NORMAL, DUP1_CMTPGETDEVICEPROPDESC_SERVICEL, "CMTPGetDevicePropDesc::EMTPRespCodeDevicePropNotSupported "); } else { @@ -184,12 +189,13 @@ } } supportedArray.Close(); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEL_EXIT ); } void CMTPGetDevicePropDesc::HandleExtnServiceL(TInt aPropCode, MExtnDevicePropDp* aExtnDevplugin ) { + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_HANDLEEXTNSERVICEL_ENTRY ); //call plugin ->desc MMTPType* mtptype; if(KErrNone == aExtnDevplugin->GetDevPropertyDescL((TMTPDevicePropertyCode)aPropCode, &mtptype)) @@ -202,20 +208,21 @@ } + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_HANDLEEXTNSERVICEL_EXIT ); } void CMTPGetDevicePropDesc::DoCancel() { - __FLOG(_L8("DoCancel - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_DOCANCEL_ENTRY ); if (iPropCode == EMTPDevicePropCodeBatteryLevel) { iDpSingletons.DeviceDataStore().Cancel(); } - __FLOG(_L8("DoCancel - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_DOCANCEL_EXIT ); } void CMTPGetDevicePropDesc::RunL() { - __FLOG(_L8("RunL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_RUNL_ENTRY ); if (iPropCode == EMTPDevicePropCodeBatteryLevel) { ServiceBatteryLevelL(); @@ -224,7 +231,7 @@ { __DEBUG_ONLY(Panic(EMTPDevDpUnknownDeviceProperty)); } - __FLOG(_L8("RunL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_RUNL_EXIT ); } /** @@ -232,13 +239,12 @@ */ void CMTPGetDevicePropDesc::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPGetDevicePropDesc: ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_CONSTRUCTL_ENTRY ); iDpSingletons.OpenL(iFramework); const TUint32 KUidMTPRepositoryValue(0x10282FCC); const TUid KUidMTPRepository = {KUidMTPRepositoryValue}; iRepository = CRepository::NewL(KUidMTPRepository); - __FLOG(_L8("CMTPGetDevicePropDesc: ConstructL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_CONSTRUCTL_EXIT ); } /** @@ -246,7 +252,7 @@ */ void CMTPGetDevicePropDesc::ServiceBatteryLevelL() { - __FLOG(_L8("ServiceBatteryLevelL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEBATTERYLEVELL_ENTRY ); CMTPTypeDevicePropDescRangeForm* form = CMTPTypeDevicePropDescRangeForm::NewLC(EMTPTypeUINT8); form->SetUint8L(CMTPTypeDevicePropDescRangeForm::EMinimumValue, 0); form->SetUint8L(CMTPTypeDevicePropDescRangeForm::EMaximumValue, 100); @@ -260,7 +266,7 @@ CleanupStack::PopAndDestroy(form); SendDataL(*iPropDesc); - __FLOG(_L8("ServiceBatteryLevelL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEBATTERYLEVELL_EXIT ); } /** @@ -268,7 +274,7 @@ */ void CMTPGetDevicePropDesc::ServiceDeviceFriendlyNameL() { - __FLOG(_L8("ServiceDeviceFriendlyNameL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEDEVICEFRIENDLYNAMEL_ENTRY ); delete iPropDesc; iPropDesc = NULL; iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeDeviceFriendlyName); @@ -303,7 +309,7 @@ } SendDataL(*iPropDesc); - __FLOG(_L8("ServiceDeviceFriendlyNameL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEDEVICEFRIENDLYNAMEL_EXIT ); } /** @@ -311,7 +317,7 @@ */ void CMTPGetDevicePropDesc::ServiceSynchronisationPartnerL() { - __FLOG(_L8("ServiceSynchronisationPartnerL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICESYNCHRONISATIONPARTNERL_ENTRY ); delete iPropDesc; iPropDesc = NULL; iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeSynchronizationPartner); @@ -321,7 +327,7 @@ iPropDesc->SetStringL(CMTPTypeDevicePropDesc::ECurrentValue, device.SynchronisationPartner()); SendDataL(*iPropDesc); - __FLOG(_L8("ServiceSynchronisationPartnerL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICESYNCHRONISATIONPARTNERL_EXIT ); } /** @@ -329,7 +335,7 @@ */ void CMTPGetDevicePropDesc::ServiceSessionInitiatorVersionInfoL() { - __FLOG(_L8("ServiceSessionInitiatorVersionInfoL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICESESSIONINITIATORVERSIONINFOL_ENTRY ); delete iPropDesc; iPropDesc = NULL; // this property is of type set or get @@ -338,7 +344,7 @@ iPropDesc->SetStringL(CMTPTypeDevicePropDesc::EFactoryDefaultValue, device.SessionInitiatorVersionInfoDefault()); iPropDesc->SetStringL(CMTPTypeDevicePropDesc::ECurrentValue, device.SessionInitiatorVersionInfo()); SendDataL(*iPropDesc); - __FLOG(_L8("ServiceSessionInitiatorVersionInfoL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICESESSIONINITIATORVERSIONINFOL_EXIT ); } /** @@ -346,7 +352,7 @@ */ void CMTPGetDevicePropDesc::ServicePerceivedDeviceTypeL() { - __FLOG(_L8("ServicePerceivedDeviceType - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEPERCEIVEDDEVICETYPEL_ENTRY ); delete iPropDesc; iPropDesc = NULL; iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodePerceivedDeviceType, 0x00/*get only*/, 0x00, NULL); @@ -354,7 +360,7 @@ iPropDesc->SetUint32L(CMTPTypeDevicePropDesc::EFactoryDefaultValue, device.PerceivedDeviceTypeDefault()); iPropDesc->SetUint32L(CMTPTypeDevicePropDesc::ECurrentValue, device.PerceivedDeviceType()); SendDataL(*iPropDesc); - __FLOG(_L8("ServicePerceivedDeviceType - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEPERCEIVEDDEVICETYPEL_EXIT ); } /** @@ -362,7 +368,7 @@ */ void CMTPGetDevicePropDesc::ServiceDateTimeL() { - __FLOG(_L8("ServicePerceivedDeviceType - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEDATETIMEL_ENTRY ); delete iPropDesc; iPropDesc = NULL; iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeDateTime, 0x01/*get/set*/, 0x00, NULL); @@ -370,7 +376,7 @@ iPropDesc->SetStringL(CMTPTypeDevicePropDesc::EFactoryDefaultValue, device.DateTimeL()); iPropDesc->SetStringL(CMTPTypeDevicePropDesc::ECurrentValue, device.DateTimeL()); SendDataL(*iPropDesc); - __FLOG(_L8("ServicePerceivedDeviceType - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEDATETIMEL_EXIT ); } /** @@ -378,7 +384,7 @@ */ void CMTPGetDevicePropDesc::ServiceDeviceIconL() { - __FLOG(_L8("ServiceDeviceIcon - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEDEVICEICONL_ENTRY ); delete iPropDesc; iPropDesc = NULL; iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeDeviceIcon, 0x00, 0x00, NULL); @@ -387,7 +393,7 @@ iPropDesc->SetL(CMTPTypeDevicePropDesc::EFactoryDefaultValue, device.DeviceIcon()); iPropDesc->SetL(CMTPTypeDevicePropDesc::ECurrentValue, device.DeviceIcon()); SendDataL(*iPropDesc); - __FLOG(_L8("ServiceDeviceIcon- Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEDEVICEICONL_EXIT ); } /* @@ -395,14 +401,14 @@ */ void CMTPGetDevicePropDesc::ServiceSupportedFormatsOrderedL() { - __FLOG(_L8("ServiceSupportedFormatsOrdered - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICESUPPORTEDFORMATSORDEREDL_ENTRY ); delete iPropDesc; iPropDesc = NULL; iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeSupportedFormatsOrdered, 0x00, 0x00, NULL); iPropDesc->SetUint8L(CMTPTypeDevicePropDesc::EFactoryDefaultValue, (TUint8)FORMAT_UNORDERED); iPropDesc->SetUint8L(CMTPTypeDevicePropDesc::ECurrentValue, GetFormatOrdered()); SendDataL(*iPropDesc); - __FLOG(_L8("ServiceSupportedFormatsOrdered - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICESUPPORTEDFORMATSORDEREDL_EXIT ); } /* @@ -410,7 +416,7 @@ */ void CMTPGetDevicePropDesc::ServiceFunctionalIDL() { - __FLOG(_L8("ServiceFuntionalIDL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEFUNCTIONALIDL_ENTRY ); delete iPropDesc; iPropDesc = NULL; iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeFunctionalID, 1, 0, NULL); @@ -423,7 +429,7 @@ iPropDesc->SetL(CMTPTypeDevicePropDesc::ECurrentValue, *iData); SendDataL(*iPropDesc); - __FLOG(_L8("ServiceFuntionalIDL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEFUNCTIONALIDL_EXIT ); } /* @@ -431,7 +437,7 @@ */ void CMTPGetDevicePropDesc::ServiceModelIDL() { - __FLOG(_L8("ServiceModelIDL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEMODELIDL_ENTRY ); delete iPropDesc; iPropDesc = NULL; iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeModelID, 0, 0, NULL); @@ -445,7 +451,7 @@ iPropDesc->SetL(CMTPTypeDevicePropDesc::ECurrentValue, *iData); SendDataL(*iPropDesc); - __FLOG(_L8("ServiceModelIDL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEMODELIDL_EXIT ); } /* @@ -453,7 +459,7 @@ */ void CMTPGetDevicePropDesc::ServiceUseDeviceStageL() { - __FLOG(_L8("ServiceUseDeviceStageL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPDESC_SERVICEUSEDEVICESTAGEL_ENTRY ); delete iPropDesc; iPropDesc = NULL; iPropDesc = CMTPTypeDevicePropDesc::NewL(EMTPDevicePropCodeUseDeviceStage, 0, 0, NULL); @@ -465,7 +471,7 @@ delete data; SendDataL(*iPropDesc); - __FLOG(_L8("ServiceUseDeviceStageL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPDESC_SERVICEUSEDEVICESTAGEL_EXIT ); } /* @@ -481,7 +487,8 @@ TRAPD(error,iDpSingletons.ConfigMgr().GetRssConfigInfoArrayL(orderedFormats, EDevDpFormats)); if(error!=KErrNone) { - __FLOG_VA((_L8("GetRssConfigArray returned with %d"), error)); + OstTrace1(TRACE_WARNING, CMTPGETDEVICEPROPDESC_GETFORMATORDERED, + "GetRssConfigArray returned with %d", error); } if(orderedFormats.Count() > 0) { @@ -499,7 +506,8 @@ { TBuf buf; - User::LeaveIfError(iRepository->Get(aKey,buf)); + LEAVEIFERROR(iRepository->Get(aKey,buf), + OstTrace1( TRACE_ERROR, CMTPGETDEVICEPROPDESC_GETGUIDL, "can't get from iRepository. the parameter is %d", aKey)); TMTPTypeGuid* ret = new (ELeave) TMTPTypeGuid( buf ); diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdevicepropvalue.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdevicepropvalue.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetdevicepropvalue.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,9 +23,13 @@ #include "cmtpgetdevicepropvalue.h" #include "mtpdevicedpconst.h" #include "mtpdevdppanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetdevicepropvalueTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"GetDevicePropValue");) _LIT(KSpace, " "); @@ -51,13 +55,12 @@ */ CMTPGetDevicePropValue::~CMTPGetDevicePropValue() { - __FLOG(_L8("~CMTPGetDevicePropValue - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_CMTPGETDEVICEPROPVALUE_DES_ENTRY ); delete iString; delete iData; //ownership of the iMtpArray pointer is belongs to devicedatastore so it should not //deleted. - __FLOG(_L8("~CMTPGetDevicePropValue - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_CMTPGETDEVICEPROPVALUE_DES_EXIT ); } /** @@ -66,7 +69,7 @@ CMTPGetDevicePropValue::CMTPGetDevicePropValue(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection) : CMTPGetDevicePropDesc(aFramework, aConnection) { - + } /** @@ -74,11 +77,10 @@ */ void CMTPGetDevicePropValue::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_CONSTRUCTL_ENTRY ); CMTPGetDevicePropDesc::ConstructL(); iString = CMTPTypeString::NewL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_CONSTRUCTL_EXIT ); } /** @@ -86,10 +88,10 @@ */ void CMTPGetDevicePropValue::ServiceBatteryLevelL() { - __FLOG(_L8("ServiceBatteryLevelL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_SERVICEBATTERYLEVELL_ENTRY ); iBatteryLevel.Set(iBatteryLevelValue); SendDataL(iBatteryLevel); - __FLOG(_L8("ServiceBatteryLevelL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_SERVICEBATTERYLEVELL_EXIT ); } /** @@ -97,7 +99,7 @@ */ void CMTPGetDevicePropValue::ServiceDeviceFriendlyNameL() { - __FLOG(_L8("ServiceDeviceFriendlyNameL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_SERVICEDEVICEFRIENDLYNAMEL_ENTRY ); //if device friendly name is blank, which means it is the first time the device get connected, //, so will use "manufacture + model id" firstly; if neither manufacture nor model //id not able to be fetched by API, then use the default device friendly name if ( iDpSingletons.DeviceDataStore().DeviceFriendlyName().Length()<=0 ) @@ -125,8 +127,8 @@ iString->SetL(iDpSingletons.DeviceDataStore().DeviceFriendlyName()); } - SendDataL(*iString); - __FLOG(_L8("ServiceDeviceFriendlyNameL - Exit")); + SendDataL(*iString); + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_SERVICEDEVICEFRIENDLYNAMEL_EXIT ); } /** @@ -134,10 +136,10 @@ */ void CMTPGetDevicePropValue::ServiceSynchronisationPartnerL() { - __FLOG(_L8("ServiceSynchronisationPartnerL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_SERVICESYNCHRONISATIONPARTNERL_ENTRY ); iString->SetL(iDpSingletons.DeviceDataStore().SynchronisationPartner()); SendDataL(*iString); - __FLOG(_L8("ServiceSynchronisationPartnerL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_SERVICESYNCHRONISATIONPARTNERL_EXIT ); } /** @@ -145,10 +147,10 @@ */ void CMTPGetDevicePropValue::ServiceSessionInitiatorVersionInfoL() { - __FLOG(_L8("ServiceSessionInitiatorVersionInfo - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_ENTRY ); iString->SetL(iDpSingletons.DeviceDataStore().SessionInitiatorVersionInfo()); SendDataL(*iString); - __FLOG(_L8("ServiceSessionInitiatorVersionInfo - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_EXIT ); } /** @@ -156,10 +158,10 @@ */ void CMTPGetDevicePropValue::ServicePerceivedDeviceTypeL() { - __FLOG(_L8("ServiceSessionInitiatorVersionInfo - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_ENTRY ); iUint32.Set(iDpSingletons.DeviceDataStore().PerceivedDeviceType()); SendDataL(iUint32); - __FLOG(_L8("ServiceSessionInitiatorVersionInfo - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_EXIT ); } /** @@ -167,10 +169,10 @@ */ void CMTPGetDevicePropValue::ServiceDateTimeL() { - __FLOG(_L8("ServiceDateTime - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_SERVICEDATETIMEL_ENTRY ); iString->SetL(iDpSingletons.DeviceDataStore().DateTimeL()); SendDataL(*iString); - __FLOG(_L8("ServiceDateTime - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_SERVICEDATETIMEL_EXIT ); } /** @@ -178,11 +180,11 @@ */ void CMTPGetDevicePropValue::ServiceDeviceIconL() { - __FLOG(_L8("DeviceIcon - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_SERVICEDEVICEICONL_ENTRY ); //iMtpArray is not owned by this class DO NOT DELET IT. iMtpArray = &(iDpSingletons.DeviceDataStore().DeviceIcon()); SendDataL(*iMtpArray); - __FLOG(_L8("DeviceIcon - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_SERVICEDEVICEICONL_EXIT ); } /** @@ -190,14 +192,15 @@ */ void CMTPGetDevicePropValue::ServiceSupportedFormatsOrderedL() { - __FLOG(_L8("ServiceSessionInitiatorVersionInfo - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_ENTRY ); iUint8.Set(GetFormatOrdered()); SendDataL(iUint8); - __FLOG(_L8("ServiceSessionInitiatorVersionInfo - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_EXIT ); } void CMTPGetDevicePropValue::HandleExtnServiceL(TInt aPropCode, MExtnDevicePropDp* aExtnDevplugin) { + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_HANDLEEXTNSERVICEL_ENTRY ); MMTPType* mtptype = NULL; aExtnDevplugin->GetDevPropertyL((TMTPDevicePropertyCode)aPropCode, &mtptype); @@ -209,6 +212,7 @@ { SendResponseL(EMTPRespCodeDevicePropNotSupported); } + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_HANDLEEXTNSERVICEL_EXIT ); } /* @@ -216,13 +220,13 @@ */ void CMTPGetDevicePropValue::ServiceFunctionalIDL() { - __FLOG(_L8("ServiceFuntionalIDL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_ENTRY ); delete iData; iData = GetGUIDL(MMTPFrameworkConfig::EDeviceCurrentFuncationalID); SendDataL(*iData); - __FLOG(_L8("ServiceFuntionalIDL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_EXIT ); } /* @@ -230,13 +234,13 @@ */ void CMTPGetDevicePropValue::ServiceModelIDL() { - __FLOG(_L8("ServiceModelIDL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_SERVICEMODELIDL_ENTRY ); delete iData; iData = GetGUIDL(MMTPFrameworkConfig::EDeviceCurrentModelID); SendDataL(*iData); - __FLOG(_L8("ServiceModelIDL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_SERVICEMODELIDL_EXIT ); } /* @@ -244,10 +248,10 @@ */ void CMTPGetDevicePropValue::ServiceUseDeviceStageL() { - __FLOG(_L8("ServiceUseDeviceStageL - Entry")); + OstTraceFunctionEntry0( CMTPGETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_ENTRY ); iUint8.Set(1); SendDataL(iUint8); - __FLOG(_L8("ServiceUseDeviceStageL - Exit")); + OstTraceFunctionExit0( CMTPGETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetnumobjects.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetnumobjects.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetnumobjects.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -29,9 +29,13 @@ #include "cmtpgetnumobjects.h" #include "mtpdevicedpconst.h" #include "mtpdevdppanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetnumobjectsTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"GetNumObjects");) static const TInt KMTPGetObjectNumTimeOut(1); /** @@ -67,7 +71,6 @@ { iDevDpSingletons.Close(); iSingletons.Close(); - __FLOG_CLOSE; } /** Standard c++ constructor @@ -83,7 +86,6 @@ */ void CMTPGetNumObjects::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); iSingletons.OpenL(); iDevDpSingletons.OpenL(iFramework); } @@ -122,8 +124,9 @@ */ void CMTPGetNumObjects::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); - __FLOG_VA((_L8("IsConnectMac = %d; ERequestParameter2 = %d" ), iDevDpSingletons.DeviceDataStore().IsConnectMac(), Request().Uint32(TMTPTypeRequest::ERequestParameter2))); + OstTraceFunctionEntry0( CMTPGETNUMOBJECTS_SERVICEL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPGETNUMOBJECTS_SERVICEL, + "IsConnectMac = %d; ERequestParameter2 = %d", iDevDpSingletons.DeviceDataStore().IsConnectMac(), Request().Uint32(TMTPTypeRequest::ERequestParameter2)); if(iSingletons.DpController().EnumerateState() != CMTPDataProviderController::EEnumeratedFulllyCompleted) { @@ -135,15 +138,19 @@ { if (iTimeoutCount++ >= KMTPGetObjectNumTimeOut) { - __FLOG(_L8("Wait for enumeration time out, return busy.")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPGETNUMOBJECTS_SERVICEL, + "Wait for enumeration time out, return busy." ); SendResponseL(EMTPRespCodeDeviceBusy); iTimeoutCount = 0; + OstTraceFunctionExit0( CMTPGETNUMOBJECTS_SERVICEL_EXIT ); return; } else { - __FLOG(_L8("Enumeration not completed, suspend request.")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPGETNUMOBJECTS_SERVICEL, + "Enumeration not completed, suspend request." ); RegisterPendingRequest(20); + OstTraceFunctionExit0( DUP1_CMTPGETNUMOBJECTS_SERVICEL_EXIT ); return; } } @@ -159,17 +166,19 @@ HandleObjectHandlesUnderMacL(*handles); count = handles->NumElements(); CleanupStack::PopAndDestroy(handles); - __FLOG_VA((_L8("ConnectMac and Fetch all, total count = %d"), count)); + OstTrace1( TRACE_NORMAL, DUP3_CMTPGETNUMOBJECTS_SERVICEL, + "ConnectMac and Fetch all, total count = %d", count ); SendResponseL(EMTPRespCodeOK, 1, &count); } else { TMTPObjectMgrQueryParams params(Request().Uint32(TMTPTypeRequest::ERequestParameter1), Request().Uint32(TMTPTypeRequest::ERequestParameter2), Request().Uint32(TMTPTypeRequest::ERequestParameter3)); TUint32 count = iFramework.ObjectMgr().CountL(params); - __FLOG_VA((_L8("NOT ConnectMac or NOT Fetch all, total count = %d"), count)); - SendResponseL(EMTPRespCodeOK, 1, &count); + OstTrace1( TRACE_NORMAL, DUP4_CMTPGETNUMOBJECTS_SERVICEL, + "NOT ConnectMac or NOT Fetch all, total count = %d", count ); + SendResponseL(EMTPRespCodeOK, 1, &count); } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( DUP2_CMTPGETNUMOBJECTS_SERVICEL_EXIT ); } /** @@ -201,7 +210,7 @@ */ void CMTPGetNumObjects::HandleObjectHandlesUnderMacL(CMTPTypeArray &aObjectHandles) { - __FLOG(_L8("HandleObjectHandlesUnderMacL - Entry")); + OstTraceFunctionEntry0( CMTPGETNUMOBJECTS_HANDLEOBJECTHANDLESUNDERMACL_ENTRY ); CMTPTypeArray* totalHandles = CMTPTypeArray::NewLC(EMTPTypeAUINT32); @@ -238,11 +247,12 @@ iFramework.ObjectMgr().ObjectL(totalHandles->ElementUint(i),*object); const TDesC& suid(object->DesC(CMTPObjectMetaData::ESuid)); -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE TBuf8 tmp; tmp.Copy(suid); - __FLOG_VA((_L8("HandleObjectHandlesUnderMacL - suid: %S"), &tmp)); -#endif // __FLOG_ACTIVE + OstTraceExt1( TRACE_NORMAL, DUP2_CMTPGETNUMOBJECTS_HANDLEOBJECTHANDLESUNDERMACL, + "HandleObjectHandlesUnderMacL - suid: %s", tmp); +#endif // OST_TRACE_COMPILER_IN_USE if((KErrNotFound != suid.MatchF(KImagesFolderPre)) || (KErrNotFound != suid.MatchF(KViedosFolderPre))) { @@ -255,11 +265,13 @@ (KErrNotFound != suid.Find(KUnderline))|| (KErrNotFound != suid.Find(Ksemicolon))) { - __FLOG(_L8("HandleObjectHandlesUnderMacL - Skip handle")); + OstTrace0( TRACE_NORMAL, CMTPGETNUMOBJECTS_HANDLEOBJECTHANDLESUNDERMACL, + "HandleObjectHandlesUnderMacL - Skip handle" ); } else { - __FLOG_VA((_L8("HandleObjectHandlesUnderMacL - Add handle: %x"), totalHandles->ElementUint(i))); + OstTrace1( TRACE_NORMAL, DUP1_CMTPGETNUMOBJECTS_HANDLEOBJECTHANDLESUNDERMACL, + "HandleObjectHandlesUnderMacL - Add handle: %x", totalHandles->ElementUint(i)); RArray tmphandles; CleanupClosePushL(tmphandles); tmphandles.AppendL(totalHandles->ElementUint(i)); @@ -274,14 +286,16 @@ //get script object handles GetObjectHandlesByFormatCodeL(EMTPFormatCodeScript,aObjectHandles); - __FLOG(_L8("HandleObjectHandlesUnderMacL - Exit")); + OstTraceFunctionExit0( CMTPGETNUMOBJECTS_HANDLEOBJECTHANDLESUNDERMACL_EXIT ); } /** Get Object Handles by format code */ void CMTPGetNumObjects::GetObjectHandlesByFormatCodeL(TUint32 aFormatCode, CMTPTypeArray &aObjectHandles) { - __FLOG_VA((_L8("GetObjectHandlesByFormatCodeL - Entry FormatCode: %x"), aFormatCode)); + OstTraceFunctionEntry0( CMTPGETNUMOBJECTS_GETOBJECTHANDLESBYFORMATCODEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPGETNUMOBJECTS_GETOBJECTHANDLESBYFORMATCODEL, + "FormatCode: %x", aFormatCode); RMTPObjectMgrQueryContext context; RArray handles; CleanupClosePushL(context); @@ -295,6 +309,6 @@ while (!context.QueryComplete()); CleanupStack::PopAndDestroy(&context); CleanupStack::PopAndDestroy(&handles); - __FLOG(_L8("GetObjectHandlesByFormatCode - Exit")); + OstTraceFunctionExit0( CMTPGETNUMOBJECTS_GETOBJECTHANDLESBYFORMATCODEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetobjecthandles.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetobjecthandles.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetobjecthandles.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -25,9 +25,13 @@ #include "cmtpgetobjecthandles.h" #include "mtpdevicedpconst.h" #include "mtpdevdppanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetobjecthandlesTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"GetObjectHandles");) static const TInt KMTPGetObjectHandlesTimeOut(1); @@ -53,7 +57,6 @@ CMTPGetObjectHandles::~CMTPGetObjectHandles() { delete iHandles; - __FLOG_CLOSE; } /** @@ -70,7 +73,6 @@ */ void CMTPGetObjectHandles::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); CMTPGetNumObjects::ConstructL(); } @@ -79,7 +81,7 @@ */ void CMTPGetObjectHandles::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPGETOBJECTHANDLES_SERVICEL_ENTRY ); if(iSingletons.DpController().EnumerateState() != CMTPDataProviderController::EEnumeratedFulllyCompleted) { @@ -91,15 +93,19 @@ { if (iTimeoutCount++ >= KMTPGetObjectHandlesTimeOut) { - __FLOG(_L8("Wait for enumeration time out, return busy.")); + OstTrace0( TRACE_NORMAL, CMTPGETOBJECTHANDLES_SERVICEL, + "Wait for enumeration time out, return busy." ); SendResponseL(EMTPRespCodeDeviceBusy); iTimeoutCount = 0; + OstTraceFunctionExit0( CMTPGETOBJECTHANDLES_SERVICEL_EXIT ); return; } else { - __FLOG(_L8("Enumeration not completed, suspend request.")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPGETOBJECTHANDLES_SERVICEL, + "Enumeration not completed, suspend request." ); RegisterPendingRequest(20); + OstTraceFunctionExit0( DUP1_CMTPGETOBJECTHANDLES_SERVICEL_EXIT ); return; } } @@ -110,11 +116,12 @@ delete iHandles; iHandles = CMTPTypeArray::NewL(EMTPTypeAUINT32); - __FLOG_VA((_L8("IsConnectMac = %d; ERequestParameter2 = %d" ), iDevDpSingletons.DeviceDataStore().IsConnectMac(), Request().Uint32(TMTPTypeRequest::ERequestParameter2))); - if(iDevDpSingletons.DeviceDataStore().IsConnectMac() + OstTraceExt2( TRACE_NORMAL, DUP2_CMTPGETOBJECTHANDLES_SERVICEL, + "IsConnectMac = %d; ERequestParameter2 = %d", iDevDpSingletons.DeviceDataStore().IsConnectMac(), Request().Uint32(TMTPTypeRequest::ERequestParameter2)); + if(iDevDpSingletons.DeviceDataStore().IsConnectMac() &&(KMTPFormatsAll == Request().Uint32(TMTPTypeRequest::ERequestParameter2))) { - __FLOG(_L8("ConnectMac and Fetch all.")); + OstTrace0( TRACE_NORMAL, DUP3_CMTPGETOBJECTHANDLES_SERVICEL, "ConnectMac and Fetch all." ); HandleObjectHandlesUnderMacL(*iHandles); } else @@ -163,6 +170,6 @@ } SendDataL(*iHandles); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( DUP2_CMTPGETOBJECTHANDLES_SERVICEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetserviceinfo.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetserviceinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetserviceinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -33,11 +33,15 @@ #include "rmtpframework.h" #include "mtpdevdppanic.h" #include "cmtpservicemgr.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetserviceinfoTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"GetServiceInfo");) /** Two-phase construction method @@ -60,12 +64,11 @@ */ CMTPGetServiceInfo::~CMTPGetServiceInfo() { - __FLOG(_L8("~CMTPGetServiceInfo - Entry")); + OstTraceFunctionEntry0( CMTPGETSERVICEINFO_CMTPGETSERVICEINFO_ENTRY ); delete iServiceInfo; iSingletons.Close(); - __FLOG(_L8("~CMTPGetServiceInfo - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPGETSERVICEINFO_CMTPGETSERVICEINFO_EXIT ); } /** @@ -82,7 +85,7 @@ */ void CMTPGetServiceInfo::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPGETSERVICEINFO_SERVICEL_ENTRY ); TUint32 serviceId = Request().Uint32(TMTPTypeRequest::ERequestParameter1); if ( KErrNotFound == iSingletons.ServiceMgr().GetServiceIDs().Find(serviceId) ) @@ -104,7 +107,7 @@ __DEBUG_ONLY(Panic(EMTPDevDpUnknownServiceID)); } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPGETSERVICEINFO_SERVICEL_EXIT ); } /** @@ -112,10 +115,9 @@ */ void CMTPGetServiceInfo::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPGETSERVICEINFO_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPGETSERVICEINFO_CONSTRUCTL_EXIT ); } /** @@ -123,7 +125,7 @@ */ void CMTPGetServiceInfo::BuildServiceInfoL() { - __FLOG(_L8("BuildServiceInfoL - Entry")); + OstTraceFunctionEntry0( CMTPGETSERVICEINFO_BUILDSERVICEINFOL_ENTRY ); delete iServiceInfo; iServiceInfo = CMTPTypeServiceInfo::NewL(); @@ -132,8 +134,9 @@ CMTPServiceInfo* svcinfo = iSingletons.ServiceMgr().ServiceInfo( serviceId ); if( NULL == svcinfo ) { - __FLOG_1(_L8("BuildServiceInfoL - CMTPServiceInfo is NULL!!! ServiceID is %d."),serviceId ); - __FLOG(_L8("BuildServiceInfoL - Exit")); + OstTrace1( TRACE_WARNING, CMTPGETSERVICEINFO_BUILDSERVICEINFOL, + "BuildServiceInfoL - CMTPServiceInfo is NULL!!! ServiceID is %d.", serviceId ); + OstTraceFunctionExit0( CMTPGETSERVICEINFO_BUILDSERVICEINFOL_EXIT ); return; } BuildServiceInfoHeadL(*svcinfo); @@ -142,14 +145,14 @@ BuildServiceFormatL(*svcinfo); BuildServiceMethodL(*svcinfo); BuildDataBlockL(*svcinfo); - - __FLOG(_L8("BuildServiceInfoL - Exit")); + + OstTraceFunctionExit0( DUP1_CMTPGETSERVICEINFO_BUILDSERVICEINFOL_EXIT ); } void CMTPGetServiceInfo::BuildServiceInfoHeadL(CMTPServiceInfo& aServiceInfo) { - __FLOG(_L8("BuildServiceInfoHeadL - Entry")); + OstTraceFunctionEntry0( CMTPGETSERVICEINFO_BUILDSERVICEINFOHEADL_ENTRY ); iServiceInfo->SetUint32L(CMTPTypeServiceInfo::EServiceID,aServiceInfo.ServiceID()); iServiceInfo->SetUint32L(CMTPTypeServiceInfo::EServiceStorageID,aServiceInfo.ServiceStorageID()); @@ -159,13 +162,13 @@ iServiceInfo->SetStringL(CMTPTypeServiceInfo::EServiceName,aServiceInfo.ServiceName()); iServiceInfo->SetUint32L(CMTPTypeServiceInfo::EServiceType,aServiceInfo.ServiceType()); iServiceInfo->SetUint32L(CMTPTypeServiceInfo::EBaseServiceID,aServiceInfo.BaseServiceID()); - - __FLOG(_L8("BuildServiceInfoHeadL - Exit")); + + OstTraceFunctionExit0( CMTPGETSERVICEINFO_BUILDSERVICEINFOHEADL_EXIT ); } void CMTPGetServiceInfo::BuildUsedServiceGUIDL(CMTPServiceInfo& aServiceInfo) { - __FLOG(_L8("BuildUsedServiceGUIDL - Entry")); + OstTraceFunctionEntry0( CMTPGETSERVICEINFO_BUILDUSEDSERVICEGUIDL_ENTRY ); TInt count = aServiceInfo.UsedServiceGUIDs().Count(); const RArray UsedServiceGUIDs = aServiceInfo.UsedServiceGUIDs(); for (TInt i=0;iAppendUsedServiceL( UsedServiceGUIDs[i] ); } - __FLOG(_L8("BuildUsedServiceGUIDL - Exit")); + OstTraceFunctionExit0( CMTPGETSERVICEINFO_BUILDUSEDSERVICEGUIDL_EXIT ); } void CMTPGetServiceInfo::BuildServicePropertyL(CMTPServiceInfo& aServiceInfo) { - __FLOG(_L8("BuildServicePropertyL - Entry")); + OstTraceFunctionEntry0( CMTPGETSERVICEINFO_BUILDSERVICEPROPERTYL_ENTRY ); TInt count = aServiceInfo.ServiceProperties().Count(); CMTPTypeServicePropertyElement* PropElement = NULL; @@ -195,12 +198,12 @@ CleanupStack::Pop(PropElement); } - __FLOG(_L8("BuildServicePropertyL - Exit")); + OstTraceFunctionExit0( CMTPGETSERVICEINFO_BUILDSERVICEPROPERTYL_EXIT ); } void CMTPGetServiceInfo::BuildServiceFormatL(CMTPServiceInfo& aServiceInfo) { - __FLOG(_L8("BuildServiceFormatL - Entry")); + OstTraceFunctionEntry0( CMTPGETSERVICEINFO_BUILDSERVICEFORMATL_ENTRY ); CMTPTypeServiceFormatElement* FormatElement = NULL; CServiceFormat* format = NULL; @@ -217,12 +220,12 @@ CleanupStack::Pop(FormatElement); } - __FLOG(_L8("BuildServiceFormatL - Exit")); + OstTraceFunctionExit0( CMTPGETSERVICEINFO_BUILDSERVICEFORMATL_EXIT ); } void CMTPGetServiceInfo::BuildServiceMethodL(CMTPServiceInfo& aServiceInfo) { - __FLOG(_L8("BuildServiceMethodL - Entry")); + OstTraceFunctionEntry0( CMTPGETSERVICEINFO_BUILDSERVICEMETHODL_ENTRY ); CMTPTypeServiceMethodElement* methodElement = NULL; CServiceMethod* method = NULL; @@ -238,21 +241,21 @@ CleanupStack::Pop(methodElement); } - __FLOG(_L8("BuildServiceMethodL - Exit")); + OstTraceFunctionExit0( CMTPGETSERVICEINFO_BUILDSERVICEMETHODL_EXIT ); } void CMTPGetServiceInfo::BuildDataBlockL(CMTPServiceInfo& aServiceInfo) { - __FLOG(_L8("BuildDataBlockL - Entry")); + OstTraceFunctionEntry0( CMTPGETSERVICEINFO_BUILDDATABLOCKL_ENTRY ); TInt count = aServiceInfo.DataBlockGUIDs().Count(); const RArray DataBlockGUIDs = aServiceInfo.DataBlockGUIDs(); for (TInt i=0;iAppendServiceDataBlockL( DataBlockGUIDs[i] ); } - - __FLOG(_L8("BuildDataBlockL - Exit")); + + OstTraceFunctionExit0( CMTPGETSERVICEINFO_BUILDDATABLOCKL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetstorageinfo.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetstorageinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpgetstorageinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,9 +27,14 @@ #include "cmtpdevicedpconfigmgr.h" #include "mtpframeworkconst.h" #include "mtpcommonconst.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetstorageinfoTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"GetStorageInfo");) /** Verification data for GetStorageInfo request @@ -64,7 +69,6 @@ { delete iStorageInfo; iSingletons.Close(); - __FLOG_CLOSE; } /** @@ -121,7 +125,6 @@ */ void CMTPGetStorageInfo::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); iStorageInfo = CMTPTypeStorageInfo::NewL(); iSingletons.OpenL(); } @@ -150,10 +153,13 @@ { TUint32 storageId = Request().Uint32(TMTPTypeRequest::ERequestParameter1); TInt driveNo(iFramework.StorageMgr().DriveNumber(storageId)); - User::LeaveIfError(driveNo); + LEAVEIFERROR(driveNo, + OstTrace1( TRACE_ERROR, CMTPGETSTORAGEINFO_SETUPDRIVEVOLUMEINFOL, "can't get driver number for storageId %d", storageId)); RFs& fs = iFramework.Fs(); - User::LeaveIfError(fs.Drive(iDriveInfo, driveNo)); - User::LeaveIfError(fs.Volume(iVolumeInfo, driveNo)); + LEAVEIFERROR(fs.Drive(iDriveInfo, driveNo), + OstTrace1( TRACE_ERROR, DUP1_CMTPGETSTORAGEINFO_SETUPDRIVEVOLUMEINFOL, "can't get drive info for driver number %d", driveNo)); + LEAVEIFERROR(fs.Volume(iVolumeInfo, driveNo), + OstTrace1( TRACE_ERROR, DUP2_CMTPGETSTORAGEINFO_SETUPDRIVEVOLUMEINFOL, "can't get volume info for driver no %d", driveNo )); const TInt KCDriveNo = 2; if(KCDriveNo == driveNo) @@ -173,6 +179,7 @@ switch(iDriveInfo.iType) { case EMediaNotPresent: + OstTrace0( TRACE_ERROR, DUP3_CMTPGETSTORAGEINFO_SETSTORAGETYPEL, "drive media not present!" ); User::Leave(KErrDisMounted); break; case EMediaUnknown: @@ -198,18 +205,21 @@ //So here we need to deal with this case to set it as FixedRam if(iDriveInfo.iDriveAtt & KDriveAttLogicallyRemovable) { - __FLOG(_L8("removable but internal drive, set as Fixed RAM")); + OstTrace0( TRACE_NORMAL, CMTPGETSTORAGEINFO_SETSTORAGETYPEL, + "removable but internal drive, set as Fixed RAM" ); storageType = EMTPStorageFixedRAM; } else { - __FLOG(_L8("non internal,set as removable RAM")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPGETSTORAGEINFO_SETSTORAGETYPEL, + "non internal,set as removable RAM" ); storageType = EMTPStorageRemovableRAM; } } else { - __FLOG(_L8("Non removable, set as Fixed RAM")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPGETSTORAGEINFO_SETSTORAGETYPEL, + "Non removable, set as Fixed RAM" ); storageType = EMTPStorageFixedRAM; } break; @@ -276,7 +286,9 @@ err = repository->Get(KUikOODDiskFreeSpaceWarningNoteLevelMassMemory,thresholdValue); if (err == KErrNone) { - __FLOG_1(_L8("Read from central repo:%d"),thresholdValue); + OstTrace1( TRACE_NORMAL, CMTPGETSTORAGEINFO_SETFREESPACEINBYTESL, + "Read from central repo:%d", thresholdValue); + thresholdValue += KFreeSpaceExtraReserved; } delete repository; @@ -284,20 +296,23 @@ if (err != KErrNone) { - __FLOG(_L8("Fail in read ,use default")); + OstTrace0( TRACE_WARNING, DUP1_CMTPGETSTORAGEINFO_SETFREESPACEINBYTESL, "Fail in read ,use default" ); thresholdValue = KFreeSpaceThreshHoldDefaultValue + KFreeSpaceExtraReserved; } - __FLOG_2(_L8("threshold:%d free space:%ld"),thresholdValue,iVolumeInfo.iFree); + OstTraceExt2( TRACE_NORMAL, DUP2_CMTPGETSTORAGEINFO_SETFREESPACEINBYTESL, + "threshold:%d free space:%Ld",thresholdValue,iVolumeInfo.iFree ); + //Exclude the reserved disk space when reporting free space TInt64 free = (iVolumeInfo.iFree > thresholdValue) ? (iVolumeInfo.iFree - thresholdValue) : 0; mtpFreeSpace.Set(free); - __FLOG_1(_L8("set free:%ld"),free); + OstTrace1( TRACE_NORMAL, DUP3_CMTPGETSTORAGEINFO_SETFREESPACEINBYTESL, "set free:%ld", free); } - __FLOG_2(_L8("SetFreeSpaceInBytesL volume free:%ld report:%ld"), - iVolumeInfo.iFree,mtpFreeSpace.Value()); + OstTraceExt2( TRACE_NORMAL, DUP4_CMTPGETSTORAGEINFO_SETFREESPACEINBYTESL, + "SetFreeSpaceInBytesL volume free:%Ld report:%Ld", iVolumeInfo.iFree,mtpFreeSpace.Value()); + iStorageInfo->SetL(CMTPTypeStorageInfo::EFreeSpaceInBytes, mtpFreeSpace); } @@ -315,31 +330,34 @@ */ void CMTPGetStorageInfo::SetStorageDescriptionL() { - __FLOG(_L8("SetStorageDescriptionL - Entry")); + OstTraceFunctionEntry0( CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL_ENTRY ); TUint32 storage(Request().Uint32(TMTPTypeRequest::ERequestParameter1)); TInt driveNumber = iFramework.StorageMgr().DriveNumber(storage); - __FLOG_1(_L8("driveNumber:%d"),driveNumber); + OstTrace1( TRACE_NORMAL, CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL, "driveNumber:%d", driveNumber); CMTPTypeString* mtpDescription = CMTPTypeString::NewLC(); //Firstly, read name from VolumeInfo if (0 < iVolumeInfo.iName.Length()) { - __FLOG_1(_L8("Using standard volume name:%S"),&iVolumeInfo.iName); + OstTraceExt1( TRACE_NORMAL, DUP1_CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL, + "Using standard volume name:%S", iVolumeInfo.iName); mtpDescription->SetL(iVolumeInfo.iName); } else //If name not set, set name according to type { TMTPTypeUint16 storageType(EMTPStorageUndefined); iStorageInfo->GetL(CMTPTypeStorageInfo::EStorageType,storageType); - __FLOG_1(_L8("Set name according to storage type: %d"),storageType.Value()); + OstTrace1( TRACE_NORMAL, DUP2_CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL, + "Set name according to storage type: %d",storageType.Value() ); + switch (storageType.Value()) { case EMTPStorageFixedROM: if (driveNumber == EDriveC)//Phone Memory { - __FLOG(_L8("drive c")); + OstTrace0( TRACE_NORMAL, DUP3_CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL, "drive c" ); mtpDescription->SetL(KPhoneMemory); } break; @@ -362,7 +380,8 @@ { TChar driveChar; TInt err = iFramework.Fs().DriveToChar(driveNumber,driveChar); - __FLOG_2(_L8("Use default name,driveNumber:%d err:%d"),driveNumber,err); + OstTraceExt2( TRACE_NORMAL, DUP4_CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL, + "Use default name,driveNumber:%d err:%d",driveNumber,err ); if (err == KErrNone) { TBuf driveName; @@ -379,8 +398,8 @@ iStorageInfo->SetL(CMTPTypeStorageInfo::EStorageDescription,*mtpDescription); CleanupStack::PopAndDestroy(mtpDescription); - - __FLOG(_L8("SetStorageDescriptionL - Exit")); + + OstTraceFunctionExit0( CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL_EXIT ); } /** diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpresetdevicepropvalue.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpresetdevicepropvalue.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpresetdevicepropvalue.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -25,9 +25,14 @@ #include "cmtpresetdevicepropvalue.h" #include "mtpdevicedpconst.h" #include "mtpdevdppanic.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpresetdevicepropvalueTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"ResetDevicePropValue");) /** Two-phase constructor. @@ -50,12 +55,11 @@ */ CMTPResetDevicePropValue::~CMTPResetDevicePropValue() { - __FLOG(_L8("~CMTPResetDevicePropValue - Entry")); - iDpSingletons.Close(); - delete iData; - delete iRepository; - __FLOG(_L8("~CMTPResetDevicePropValue - Exit")); - __FLOG_CLOSE; + OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_CMTPRESETDEVICEPROPVALUE_DES_ENTRY ); + iDpSingletons.Close(); + delete iData; + delete iRepository; + OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_CMTPRESETDEVICEPROPVALUE_DES_EXIT ); } /** @@ -64,7 +68,7 @@ CMTPResetDevicePropValue::CMTPResetDevicePropValue(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection) : CMTPRequestProcessor(aFramework, aConnection, 0, NULL) { - + } /** @@ -72,13 +76,12 @@ */ void CMTPResetDevicePropValue::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_CONSTRUCTL_ENTRY ); iDpSingletons.OpenL(iFramework); const TUint32 KUidMTPRepositoryValue(0x10282FCC); const TUid KUidMTPRepository = {KUidMTPRepositoryValue}; iRepository = CRepository::NewL(KUidMTPRepository); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_CONSTRUCTL_EXIT ); } /** @@ -87,7 +90,7 @@ */ TMTPResponseCode CMTPResetDevicePropValue::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_CHECKREQUESTL_ENTRY ); TMTPResponseCode respCode(EMTPRespCodeDevicePropNotSupported); iPropCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1); const TInt count = sizeof(KMTPDeviceDpSupportedProperties) / sizeof(KMTPDeviceDpSupportedProperties[0]); @@ -103,7 +106,7 @@ { respCode = EMTPRespCodeOK; } - __FLOG(_L8("CheckRequestL - Exit")); + OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_CHECKREQUESTL_EXIT ); return respCode; } /** @@ -111,7 +114,7 @@ */ void CMTPResetDevicePropValue::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEL_ENTRY ); iPropCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1); MExtnDevicePropDp* extnDevplugin = iDpSingletons.DeviceDataStore().ExtnDevicePropDp(); switch (iPropCode) @@ -155,6 +158,7 @@ } break; } + OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEL_EXIT ); } void CMTPResetDevicePropValue::HandleExtnServiceL(TInt aPropCode, MExtnDevicePropDp* aExtnDevplugin) @@ -167,7 +171,7 @@ { SendResponseL(EMTPRespCodeDevicePropNotSupported); } - + } /** @@ -175,10 +179,10 @@ */ void CMTPResetDevicePropValue::ServiceSessionInitiatorVersionInfoL() { - __FLOG(_L8("SetSessionInitiatorVersionInfo - Entry")); + OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_ENTRY ); iDpSingletons.DeviceDataStore().SetSessionInitiatorVersionInfoL( iDpSingletons.DeviceDataStore().SessionInitiatorVersionInfoDefault()); SendResponseL(EMTPRespCodeOK); - __FLOG(_L8("SetSessionInitiatorVersionInfo - Exit")); + OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_EXIT ); } /** @@ -187,10 +191,10 @@ **/ void CMTPResetDevicePropValue::ServicePerceivedDeviceTypeL() { - __FLOG(_L8("ServicePerceivedDeviceType - Entry")); + OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_ENTRY ); //PerceivedDeviceType is of type get only . SendResponseL(EMTPRespCodeAccessDenied); - __FLOG(_L8("ServicePerceivedDeviceType - Exit")); + OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_EXIT ); } /** @@ -198,9 +202,9 @@ */ void CMTPResetDevicePropValue::ServiceDateTimeL() { - __FLOG(_L8("ServiceDateTime - Entry")); + OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEDATETIMEL_ENTRY ); SendResponseL(EMTPRespCodeOperationNotSupported); - __FLOG(_L8("ServiceDateTime - Exit")); + OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEDATETIMEL_EXIT ); } @@ -210,10 +214,10 @@ */ void CMTPResetDevicePropValue::ServiceDeviceIconL() { - __FLOG(_L8("ServiceDeviceIcon - Entry")); + OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEDEVICEICONL_ENTRY ); //DeviceIcon property is implemented as get only . SendResponseL(EMTPRespCodeAccessDenied); - __FLOG(_L8("ServiceDeviceIcon - Exit")); + OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEDEVICEICONL_EXIT ); } /* @@ -221,11 +225,11 @@ */ void CMTPResetDevicePropValue::ServiceSupportedFormatsOrderedL() { - __FLOG(_L8("ServiceSupportedFormatsOrdered - Entry")); + OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_ENTRY ); //no need to recive this data beacuse it is Get property //iDpSingletons.DeviceDataStore().SetFormatOrdered( iDpSingletons.DeviceDataStore().FormatOrderedDefault()); SendResponseL(EMTPRespCodeAccessDenied); - __FLOG(_L8("ServicePerceivedDeviceType - Exit")); + OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_EXIT ); } /* @@ -233,12 +237,12 @@ */ void CMTPResetDevicePropValue::ServiceFunctionalIDL() { - __FLOG(_L8("ServiceFunctionalIDL - Entry")); + OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_ENTRY ); delete iData; iData = GetGUIDL( MMTPFrameworkConfig::EDeviceDefaultFuncationalID ); SaveGUID(MMTPFrameworkConfig::EDeviceCurrentFuncationalID, *iData); SendResponseL(EMTPRespCodeOK); - __FLOG(_L8("ServiceFunctionalIDL - Exit")); + OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_EXIT ); } /* @@ -246,9 +250,9 @@ */ void CMTPResetDevicePropValue::ServiceModelIDL() { - __FLOG(_L8("ServiceModelIDL - Entry")); + OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEMODELIDL_ENTRY ); SendResponseL(EMTPRespCodeAccessDenied); - __FLOG(_L8("ServiceModelIDL - Exit")); + OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEMODELIDL_EXIT ); } /* @@ -256,16 +260,17 @@ */ void CMTPResetDevicePropValue::ServiceUseDeviceStageL() { - __FLOG(_L8("ServiceUseDeviceStageL - Entry")); + OstTraceFunctionEntry0( CMTPRESETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_ENTRY ); SendResponseL(EMTPRespCodeAccessDenied); - __FLOG(_L8("ServiceUseDeviceStageL - Exit")); + OstTraceFunctionExit0( CMTPRESETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_EXIT ); } TMTPTypeGuid* CMTPResetDevicePropValue::GetGUIDL(const TUint aKey) { TBuf buf; - User::LeaveIfError(iRepository->Get(aKey,buf)); + LEAVEIFERROR(iRepository->Get(aKey,buf), + OstTrace1( TRACE_ERROR, CMTPRESETDEVICEPROPVALUE_GETGUIDL, "get from iRepository with key %d", aKey )); TMTPTypeGuid* ret = new (ELeave) TMTPTypeGuid( buf ); diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpsetdevicepropvalue.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpsetdevicepropvalue.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpsetdevicepropvalue.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -24,9 +24,13 @@ #include "cmtpsetdevicepropvalue.h" #include "mtpdevicedpconst.h" #include "mtpdevdppanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsetdevicepropvalueTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"SetDevicePropValue");) /** Two-phase constructor. @@ -49,12 +53,11 @@ */ CMTPSetDevicePropValue::~CMTPSetDevicePropValue() { - __FLOG(_L8("~CMTPSetDevicePropValue - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_CMTPSETDEVICEPROPVALUE_DES_ENTRY ); delete iString; delete iMtparray; delete iData; - __FLOG(_L8("~CMTPSetDevicePropValue - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_CMTPSETDEVICEPROPVALUE_DES_EXIT ); } /** @@ -71,13 +74,12 @@ */ void CMTPSetDevicePropValue::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_CONSTRUCTL_ENTRY ); CMTPGetDevicePropDesc::ConstructL(); iString = CMTPTypeString::NewL(); iMtparray = CMTPTypeArray::NewL(EMTPTypeAUINT8); iData = new(ELeave) TMTPTypeGuid(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_CONSTRUCTL_EXIT ); } /** @@ -85,9 +87,9 @@ */ void CMTPSetDevicePropValue::ServiceBatteryLevelL() { - __FLOG(_L8("ServiceBatteryLevelL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_SERVICEBATTERYLEVELL_ENTRY ); SendResponseL(EMTPRespCodeAccessDenied); - __FLOG(_L8("ServiceBatteryLevelL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_SERVICEBATTERYLEVELL_EXIT ); } /** @@ -95,10 +97,10 @@ */ void CMTPSetDevicePropValue::ServiceDeviceFriendlyNameL() { - __FLOG(_L8("ServiceDeviceFriendlyNameL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_SERVICEDEVICEFRIENDLYNAMEL_ENTRY ); iString->SetL(KNullDesC); ReceiveDataL(*iString); - __FLOG(_L8("ServiceDeviceFriendlyNameL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_SERVICEDEVICEFRIENDLYNAMEL_EXIT ); } /** @@ -106,10 +108,10 @@ */ void CMTPSetDevicePropValue::ServiceSynchronisationPartnerL() { - __FLOG(_L8("ServiceSynchronisationPartnerL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_SERVICESYNCHRONISATIONPARTNERL_ENTRY ); iString->SetL(KNullDesC); ReceiveDataL(*iString); - __FLOG(_L8("ServiceSynchronisationPartnerL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_SERVICESYNCHRONISATIONPARTNERL_EXIT ); } /** @@ -118,7 +120,7 @@ */ TMTPResponseCode CMTPSetDevicePropValue::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPGetDevicePropDesc::CheckRequestL(); TUint32 propCode = Request().Uint32(TMTPTypeRequest::ERequestParameter1); @@ -126,7 +128,7 @@ { responseCode = EMTPRespCodeAccessDenied; } - __FLOG(_L8("CheckRequestL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_CHECKREQUESTL_EXIT ); return responseCode; } @@ -135,7 +137,7 @@ */ TBool CMTPSetDevicePropValue::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_DOHANDLERESPONSEPHASEL_ENTRY ); MExtnDevicePropDp* extnDevplugin = iDpSingletons.DeviceDataStore().ExtnDevicePropDp(); TUint32 propCode(Request().Uint32(TMTPTypeRequest::ERequestParameter1)); switch(propCode) @@ -185,7 +187,7 @@ } break; } - __FLOG(_L8("DoHandleResponsePhaseL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } @@ -199,10 +201,10 @@ */ void CMTPSetDevicePropValue::CompleteServiceDeviceFriendlyNameL() { - __FLOG(_L8("CompleteServiceDeviceFriendlyNameL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICEDEVICEFRIENDLYNAMEL_ENTRY ); iDpSingletons.DeviceDataStore().SetDeviceFriendlyNameL(iString->StringChars()); SendResponseL(EMTPRespCodeOK); - __FLOG(_L8("CompleteServiceDeviceFriendlyNameL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICEDEVICEFRIENDLYNAMEL_EXIT ); } /** @@ -210,14 +212,15 @@ */ void CMTPSetDevicePropValue::CompleteServiceSynchronisationPartnerL() { - __FLOG(_L8("CompleteServiceSynchronisationPartnerL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICESYNCHRONISATIONPARTNERL_ENTRY ); iDpSingletons.DeviceDataStore().SetSynchronisationPartnerL(iString->StringChars()); SendResponseL(EMTPRespCodeOK); - __FLOG(_L8("CompleteServiceSynchronisationPartnerL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICESYNCHRONISATIONPARTNERL_EXIT ); } void CMTPSetDevicePropValue::HandleExtnServiceL(TInt aPropCode, MExtnDevicePropDp* aExtnDevplugin) { + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_HANDLEEXTNSERVICEL_ENTRY ); MMTPType* ammtptype = NULL; aExtnDevplugin->GetDevicePropertyContainerL((TMTPDevicePropertyCode)aPropCode, &ammtptype); if(ammtptype != NULL) @@ -228,6 +231,7 @@ { SendResponseL(EMTPRespCodeDevicePropNotSupported); } + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_HANDLEEXTNSERVICEL_EXIT ); } /** @@ -235,12 +239,12 @@ */ void CMTPSetDevicePropValue::CompleteServiceSessionInitiatorVersionInfoL() { - __FLOG(_L8("CompleteServiceSynchronisationPartnerL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICESESSIONINITIATORVERSIONINFOL_ENTRY ); RProcess process; RProperty::Set(process.SecureId(), EMTPConnStateKey, iString->StringChars()); iDpSingletons.DeviceDataStore().SetSessionInitiatorVersionInfoL(iString->StringChars()); SendResponseL(EMTPRespCodeOK); - __FLOG(_L8("CompleteServiceSynchronisationPartnerL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICESESSIONINITIATORVERSIONINFOL_EXIT ); } /** @@ -248,10 +252,10 @@ */ void CMTPSetDevicePropValue::ServiceSessionInitiatorVersionInfoL() { - __FLOG(_L8("SetSessionInitiatorVersionInfoL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_ENTRY ); iString->SetL(KNullDesC); ReceiveDataL(*iString); - __FLOG(_L8("SetSessionInitiatorVersionInfoL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_EXIT ); } @@ -260,9 +264,9 @@ */ void CMTPSetDevicePropValue::CompletePerceivedDeviceTypeL() { - __FLOG(_L8("CompletePerceivedDeviceType - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_COMPLETEPERCEIVEDDEVICETYPEL_ENTRY ); SendResponseL(EMTPRespCodeAccessDenied); - __FLOG(_L8("CompletePerceivedDeviceType - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_COMPLETEPERCEIVEDDEVICETYPEL_EXIT ); } /** @@ -271,9 +275,9 @@ **/ void CMTPSetDevicePropValue::ServicePerceivedDeviceTypeL() { - __FLOG(_L8("ServicePerceivedDeviceType - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_ENTRY ); ReceiveDataL(iUint32); - __FLOG(_L8("ServicePerceivedDeviceType - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_EXIT ); } /** @@ -281,7 +285,7 @@ */ void CMTPSetDevicePropValue::CompleteServiceDateTimeL() { - __FLOG(_L8("CompleteDateTime - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICEDATETIMEL_ENTRY ); //validate the incoming date time string first and then set it. if(KErrNone == iDpSingletons.DeviceDataStore().SetDateTimeL(iString->StringChars()) ) @@ -293,7 +297,7 @@ SendResponseL(EMTPRespCodeInvalidDataset); } - __FLOG(_L8("CompleteDateTime - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICEDATETIMEL_EXIT ); } /** @@ -301,10 +305,10 @@ */ void CMTPSetDevicePropValue::ServiceDateTimeL() { - __FLOG(_L8("ServiceDateTime - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_SERVICEDATETIMEL_ENTRY ); iString->SetL(KNullDesC); ReceiveDataL(*iString); - __FLOG(_L8("ServiceDateTime - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_SERVICEDATETIMEL_EXIT ); } /* @@ -313,10 +317,10 @@ */ void CMTPSetDevicePropValue::CompleteDeviceIconL() { - __FLOG(_L8("CompleteDeviceIcon - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_COMPLETEDEVICEICONL_ENTRY ); //it is Get only device property SendResponseL(EMTPRespCodeAccessDenied); - __FLOG(_L8("CompleteDeviceIcon - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_COMPLETEDEVICEICONL_EXIT ); } /* @@ -325,10 +329,10 @@ */ void CMTPSetDevicePropValue::ServiceDeviceIconL() { - __FLOG(_L8("ServiceDeviceIcon - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_SERVICEDEVICEICONL_ENTRY ); //no need to recive this data beacuse it is Get property ReceiveDataL(*iMtparray); - __FLOG(_L8("ServiceDeviceIcon - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_SERVICEDEVICEICONL_EXIT ); } @@ -337,10 +341,10 @@ */ void CMTPSetDevicePropValue::CompleteServiceSupportedFormatsOrderedL() { - __FLOG(_L8("CompleteServiceSupportedFormatsOrdered - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICESUPPORTEDFORMATSORDEREDL_ENTRY ); //it is Get only device property SendResponseL(EMTPRespCodeAccessDenied); - __FLOG(_L8("CompleteServiceSupportedFormatsOrdered - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICESUPPORTEDFORMATSORDEREDL_EXIT ); } /* @@ -348,10 +352,10 @@ */ void CMTPSetDevicePropValue::ServiceSupportedFormatsOrderedL() { - __FLOG(_L8("ServiceSupportedFormatsOrdered - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_ENTRY ); //no need to recive this data beacuse it is Get property ReceiveDataL(iUint8); - __FLOG(_L8("ServicePerceivedDeviceType - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_EXIT ); } /* @@ -359,7 +363,7 @@ */ void CMTPSetDevicePropValue::CompleteServiceFunctionalIDL() { - __FLOG(_L8("CompleteServiceFunctionalIDL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICEFUNCTIONALIDL_ENTRY ); TPtrC8 ptr(NULL,0); if ( KMTPChunkSequenceCompletion == iData->FirstReadChunk(ptr) ) @@ -368,7 +372,7 @@ SendResponseL(EMTPRespCodeOK); } - __FLOG(_L8("CompleteServiceFunctionalIDL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICEFUNCTIONALIDL_EXIT ); } /* @@ -376,9 +380,9 @@ */ void CMTPSetDevicePropValue::ServiceFunctionalIDL() { - __FLOG(_L8("ServiceFunctionalIDL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_ENTRY ); ReceiveDataL(*iData); - __FLOG(_L8("ServiceFunctionalIDL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_EXIT ); } /* @@ -386,9 +390,9 @@ */ void CMTPSetDevicePropValue::CompleteServiceModelIDL() { - __FLOG(_L8("CompleteServiceModelIDL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICEMODELIDL_ENTRY ); SendResponseL(EMTPRespCodeAccessDenied); - __FLOG(_L8("CompleteServiceModelIDL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICEMODELIDL_EXIT ); } /* @@ -396,9 +400,9 @@ */ void CMTPSetDevicePropValue::ServiceModelIDL() { - __FLOG(_L8("ServiceModelIDL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_SERVICEMODELIDL_ENTRY ); ReceiveDataL(*iData); - __FLOG(_L8("ServiceModelIDL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_SERVICEMODELIDL_EXIT ); } /* @@ -406,9 +410,9 @@ */ void CMTPSetDevicePropValue::CompleteServiceUseDeviceStageL() { - __FLOG(_L8("CompleteServiceUseDeviceStageL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICEUSEDEVICESTAGEL_ENTRY ); SendResponseL(EMTPRespCodeAccessDenied); - __FLOG(_L8("CompleteServiceUseDeviceStageL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_COMPLETESERVICEUSEDEVICESTAGEL_EXIT ); } /* @@ -416,7 +420,7 @@ */ void CMTPSetDevicePropValue::ServiceUseDeviceStageL() { - __FLOG(_L8("ServiceUseDeviceStageL - Entry")); + OstTraceFunctionEntry0( CMTPSETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_ENTRY ); ReceiveDataL(iUint8); - __FLOG(_L8("ServiceUseDeviceStageL - Exit")); + OstTraceFunctionExit0( CMTPSETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/cmtpstoragewatcher.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/cmtpstoragewatcher.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/cmtpstoragewatcher.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -25,10 +25,15 @@ #include "cmtpobjectmgr.h" #include "cmtpstoragewatcher.h" #include "cmtpdevicedpconfigmgr.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpstoragewatcherTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"StorageWatcher");) static const TBool KAllDrives(ETrue); static const TBool KAvailableDrives(EFalse); @@ -54,20 +59,19 @@ */ CMTPStorageWatcher::~CMTPStorageWatcher() { - __FLOG(_L8("~CMTPStorageWatcher - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_CMTPSTORAGEWATCHER_ENTRY ); Cancel(); delete iFolderExclusionList; iDpSingletons.Close(); iDrivesExcluded.Close(); iFrameworkSingletons.Close(); iDevDpSingletons.Close(); - __FLOG(_L8("~CMTPStorageWatcher - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_CMTPSTORAGEWATCHER_EXIT ); } void CMTPStorageWatcher::EnumerateStoragesL() { - __FLOG(_L8("EnumerateStoragesL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_ENUMERATESTORAGESL_ENTRY ); //Use Hash to replace it AppendFolderExclusionListL(); @@ -99,7 +103,8 @@ if (iDrivesConfig & mask) { TChar driveChar; - User::LeaveIfError(iFramework.Fs().DriveToChar(drive, driveChar)); + LEAVEIFERROR(iFramework.Fs().DriveToChar(drive, driveChar), + OstTrace1( TRACE_ERROR, CMTPSTORAGEWATCHER_ENUMERATESTORAGESL, "drive %d convert to char error!", drive )); suid[0] = driveChar; storage->SetDesCL(CMTPStorageMetaData::EStorageSuid, suid); @@ -151,7 +156,7 @@ mgr.SetDefaultStorageId(defaultDrive); } - __FLOG(_L8("EnumerateStoragesL - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_ENUMERATESTORAGESL_EXIT ); } /** @@ -159,25 +164,25 @@ */ void CMTPStorageWatcher::Start() { - __FLOG(_L8("Start - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_START_ENTRY ); if (!(iState & EStarted)) { - __FLOG(_L8("Starting RFs notifier")); + OstTrace0( TRACE_NORMAL, CMTPSTORAGEWATCHER_START, "Starting RFs notifier" ); TRequestStatus* status(&iStatus); User::RequestComplete(status, KErrNone); SetActive(); iState |= EStarted; } - __FLOG(_L8("Start - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_START_EXIT ); } void CMTPStorageWatcher::DoCancel() { - __FLOG(_L8("DoCancel - Entry")); - __FLOG(_L8("Stopping RFs notifier")); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_DOCANCEL_ENTRY ); + OstTrace0( TRACE_NORMAL, CMTPSTORAGEWATCHER_DOCANCEL, "Stopping RFs notifier" ); iFrameworkSingletons.Fs().NotifyChangeCancel(); iState &= (!EStarted); - __FLOG(_L8("DoCancel - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_DOCANCEL_EXIT ); } /** @@ -212,25 +217,25 @@ @param aError leave error code @return KErrNone */ -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE TInt CMTPStorageWatcher::RunError(TInt aError) #else TInt CMTPStorageWatcher::RunError(TInt /*aError*/) #endif { - __FLOG(_L8("RunError - Entry")); - __FLOG_VA((_L8("Error = %d"), aError)); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_RUNERROR_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPSTORAGEWATCHER_RUNERROR, "Error = %d", aError ); // Ignore the error, meaning that the storages may not be accurately accounted for RequestNotification(); - __FLOG(_L8("RunError - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_RUNERROR_EXIT ); return KErrNone; } void CMTPStorageWatcher::RunL() { - __FLOG(_L8("RunL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_RUNL_ENTRY ); const TUint32 previous(iDrivesConfig); const TUint32 current(DriveConfigurationL(KAvailableDrives)); if (current != previous) @@ -254,7 +259,7 @@ } iDrivesConfig = current; RequestNotification(); - __FLOG(_L8("RunL - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_RUNL_EXIT ); } /** @@ -273,8 +278,7 @@ */ void CMTPStorageWatcher::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_CONSTRUCTL_ENTRY ); iFrameworkSingletons.OpenL(); iFrameworkSingletons.FrameworkConfig().GetValueL(CMTPFrameworkConfig::ELogicalStorageIdsAllocationEnable, iAllocateLogicalStorages); @@ -282,12 +286,12 @@ iDevDpSingletons.OpenL(iFramework); iFolderExclusionList = iDevDpSingletons.ConfigMgr().GetArrayValueL(CMTPDeviceDpConfigMgr::EFolderExclusionList); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_CONSTRUCTL_EXIT ); } TUint32 CMTPStorageWatcher::DriveConfigurationL(TBool aAllDrives) const { - __FLOG(_L8("DriveConfigurationL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_DRIVECONFIGURATIONL_ENTRY ); TUint32 config(0); TDriveList drives; RFs& fs(iFrameworkSingletons.Fs()); @@ -295,12 +299,15 @@ TInt i(KMaxDrives); while (i--) { - __FLOG_VA((_L8("Drive number %d, available = 0x%02d"), i, drives [i])); + OstTraceExt2( TRACE_NORMAL, CMTPSTORAGEWATCHER_DRIVECONFIGURATIONL, + "Drive number %d, available = 0x%02d", i, drives[i] ); if ((drives[i]) && (!Excluded(static_cast(i)))) { TDriveInfo info; - User::LeaveIfError(fs.Drive(info, i)); + LEAVEIFERROR(fs.Drive(info, i), + OstTrace1( TRACE_ERROR, DUP2_CMTPSTORAGEWATCHER_DRIVECONFIGURATIONL, "can't get info for drive %d", i )); + if ((info.iType != EMediaNotPresent) || (aAllDrives)) { TVolumeInfo volumeInfo; @@ -311,35 +318,38 @@ } } } - __FLOG_VA((_L8("Drives list = 0x%08X, AllDrives = %d"), config, aAllDrives)); - __FLOG(_L8("DriveConfigurationL - Exit")); + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPSTORAGEWATCHER_DRIVECONFIGURATIONL, + "Drives list = 0x%08X, AllDrives = %d", config, (TUint32)aAllDrives ); + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_DRIVECONFIGURATIONL_EXIT ); return config; } TBool CMTPStorageWatcher::Excluded(TDriveNumber aDriveNumber) const { - __FLOG(_L8("Excluded - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_EXCLUDED_ENTRY ); TBool ret(iDrivesExcluded.FindInOrder(aDriveNumber) != KErrNotFound); - __FLOG_VA((_L8("Drive = %d, excluded = %d"), aDriveNumber, ret)); - __FLOG(_L8("Excluded - Exit")); + OstTraceExt2( TRACE_NORMAL, CMTPSTORAGEWATCHER_EXCLUDED, + "Drive = %d, excluded = %d", aDriveNumber, ret ); + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_EXCLUDED_EXIT ); return ret; } void CMTPStorageWatcher::RequestNotification() { - __FLOG(_L8("RequestNotification - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_REQUESTNOTIFICATION_ENTRY ); _LIT(KPath, "?:\\.."); iFrameworkSingletons.Fs().NotifyChange(ENotifyEntry, iStatus, KPath); SetActive(); - __FLOG(_L8("RequestNotification - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_REQUESTNOTIFICATION_EXIT ); } void CMTPStorageWatcher::SendEventL(TUint16 aEvent, TUint32 aStorageId) { - __FLOG(_L8("SendEventL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_SENDEVENTL_ENTRY ); if (iState & EStarted) { - __FLOG_VA((_L8("Sending event 0x%04X for StorageID 0x%08X"), aEvent, aStorageId)); + OstTraceExt2( TRACE_NORMAL, CMTPSTORAGEWATCHER_SENDEVENTL, + "Sending event 0x%04X for StorageID 0x%08X", (TUint32)aEvent, aStorageId ); iEvent.Reset(); iEvent.SetUint16(TMTPTypeEvent::EEventCode, aEvent); iEvent.SetUint32(TMTPTypeEvent::EEventSessionID, KMTPSessionAll); @@ -347,7 +357,7 @@ iEvent.SetUint32(TMTPTypeEvent::EEventParameter1, aStorageId); iFramework.SendEventL(iEvent); } - __FLOG(_L8("SendEventL - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_SENDEVENTL_EXIT ); } /** @@ -357,8 +367,8 @@ */ void CMTPStorageWatcher::StorageAvailableL(TDriveNumber aDriveNumber) { - __FLOG(_L8("StorageAvailableL - Entry")); - __FLOG_VA((_L8("Drive = %d is available."), aDriveNumber)); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_STORAGEAVAILABLEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPSTORAGEWATCHER_STORAGEAVAILABLEL, "Drive = %d is available.", aDriveNumber); CMTPStorageMgr& mgr(iFrameworkSingletons.StorageMgr()); TInt32 physical(mgr.PhysicalStorageId(aDriveNumber)); _LIT(KSuidTemplate, "?:"); @@ -367,7 +377,8 @@ suid.CleanupClosePushL(); suid.Assign((KSuidTemplate().AllocL())); TChar driveChar; - User::LeaveIfError(iFramework.Fs().DriveToChar(aDriveNumber, driveChar)); + LEAVEIFERROR(iFramework.Fs().DriveToChar(aDriveNumber, driveChar), + OstTrace1( TRACE_ERROR, DUP6_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL, "driver %d convert to char error!", aDriveNumber )); driveChar.LowerCase(); suid[0] = driveChar; // Create the storage meta-data. @@ -380,14 +391,15 @@ mgr.SetDriveMappingL(aDriveNumber, id); } physical = mgr.PhysicalStorageId(aDriveNumber); - - User::LeaveIfError(physical); + LEAVEIFERROR(physical, + OstTrace1( TRACE_ERROR, DUP7_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL, "can't get physical storage id for drive %d", aDriveNumber)); + TUint32 logical(physical); // If configured to do so, assign a logical storage ID mapping. if (iAllocateLogicalStorages) { - __FLOG(_L8("Assigning local storage ID mapping")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL, "Assigning local storage ID mapping" ); // Try to read from resource file to use a specified root dir path, if available. RBuf rootDirPath; @@ -397,10 +409,10 @@ devSingletons.OpenL(iFramework); CleanupClosePushL(devSingletons); TRAPD(resError, devSingletons.ConfigMgr().GetRootDirPathL(aDriveNumber, rootDirPath)); - __FLOG_VA((_L8("ResError = %d"), resError)); + OstTrace1( TRACE_NORMAL, DUP2_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL, "ResError = %d", resError); if ((KErrNone == resError) && (0 < rootDirPath.Length())) { - __FLOG(_L8("Reading resource file succeeded")); + OstTrace0(TRACE_NORMAL, DUP3_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL, "Reading resource file succeeded"); // If there is a root directory information in rss file then check the directory exist or not. // If not exists, then create it. // Before doing anything, delete the leading and trailing white space. @@ -419,7 +431,7 @@ if ((KErrNone == error) || (KErrAlreadyExists == error)) { - __FLOG(_L8("Overwriting SUID to specified root dir path from resource file")); + OstTrace0( TRACE_NORMAL, DUP4_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL, "Overwriting SUID to specified root dir path from resource file" ); //if dir already existed or created, make that as root directory suid.ReAllocL(buffer.Length()); suid = buffer; @@ -461,7 +473,8 @@ logical = mgr.AllocateLogicalStorageIdL(iFramework.DataProviderId(), physical, *storage); mgr.SetDriveMappingL(aDriveNumber, logical); - __FLOG_VA((_L8("Drive = %d mapped as storage 0x%08X"), aDriveNumber, logical)); + OstTraceExt2( TRACE_NORMAL, DUP5_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL, + "Drive = %d mapped as storage 0x%08X", (TUint32)aDriveNumber, logical); } CleanupStack::PopAndDestroy(storage); @@ -485,7 +498,7 @@ SendEventL(EMTPEventCodeStoreAdded, logical); } - __FLOG(_L8("StorageAvailableL - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_STORAGEAVAILABLEL_EXIT ); } /** @@ -495,11 +508,13 @@ */ void CMTPStorageWatcher::StorageUnavailableL(TDriveNumber aDriveNumber) { - __FLOG(_L8("StorageUnavailableL - Entry")); - __FLOG_VA((_L8("Drive = %d is unavailable."), aDriveNumber)); + OstTraceFunctionEntry0( CMTPSTORAGEWATCHER_STORAGEUNAVAILABLEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPSTORAGEWATCHER_STORAGEUNAVAILABLEL, "Drive = %d is unavailable.", aDriveNumber ); + CMTPStorageMgr& mgr(iFrameworkSingletons.StorageMgr()); TInt32 physical(mgr.PhysicalStorageId(aDriveNumber)); - User::LeaveIfError(physical); + LEAVEIFERROR(physical, + OstTrace1( TRACE_ERROR, DUP2_CMTPSTORAGEWATCHER_STORAGEUNAVAILABLEL, "can't get physical storage id for drive %d", aDriveNumber)); TUint32 logical(0); // If configured to do so, assign a logical storage ID mapping. @@ -510,7 +525,8 @@ // Deassign the logical storage ID mapping. mgr.DeallocateLogicalStorageIds(iFramework.DataProviderId(), physical); mgr.SetDriveMappingL(aDriveNumber, physical); - __FLOG_VA((_L8("Drive = %d unmapped as storage 0x%08X"), aDriveNumber, logical)); + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPSTORAGEWATCHER_STORAGEUNAVAILABLEL, + "Drive = %d unmapped as storage 0x%08X", (TUint32)aDriveNumber, logical); } // Notify the active data providers. @@ -528,5 +544,5 @@ { SendEventL(EMTPEventCodeStoreRemoved, logical); } - __FLOG(_L8("StorageUnavailableL - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEWATCHER_STORAGEUNAVAILABLEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/src/rmtpdevicedpsingletons.cpp --- a/mtpfws/mtpfw/dataproviders/devdp/src/rmtpdevicedpsingletons.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/devdp/src/rmtpdevicedpsingletons.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,9 +23,13 @@ #include "cmtpdevicedpconfigmgr.h" #include "cmtpstoragewatcher.h" #include "rmtpdevicedpsingletons.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "rmtpdevicedpsingletonsTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"DeviceDpSingletons");) /** Constructor. @@ -41,10 +45,7 @@ */ void RMTPDeviceDpSingletons::OpenL(MMTPDataProviderFramework& aFramework) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("OpenL - Entry")); iSingletons = &CSingletons::OpenL(aFramework); - __FLOG(_L8("OpenL - Exit")); } /** @@ -52,14 +53,13 @@ */ void RMTPDeviceDpSingletons::Close() { - __FLOG(_L8("Close - Entry")); + OstTraceFunctionEntry0( RMTPDEVICEDPSINGLETONS_CLOSE_ENTRY ); if (iSingletons) { iSingletons->Close(); iSingletons = NULL; } - __FLOG(_L8("Close - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( RMTPDEVICEDPSINGLETONS_CLOSE_EXIT ); } /** @@ -69,10 +69,10 @@ */ CMTPDeviceDataStore& RMTPDeviceDpSingletons::DeviceDataStore() { - __FLOG(_L8("DeviceDataStore - Entry")); + OstTraceFunctionEntry0( RMTPDEVICEDPSINGLETONS_DEVICEDATASTORE_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); __ASSERT_DEBUG(iSingletons->iDeviceDataStore, User::Invariant()); - __FLOG(_L8("DeviceDataStore - Exit")); + OstTraceFunctionExit0( RMTPDEVICEDPSINGLETONS_DEVICEDATASTORE_EXIT ); return *iSingletons->iDeviceDataStore; } @@ -83,25 +83,27 @@ CMTPDeviceDpConfigMgr& RMTPDeviceDpSingletons::ConfigMgr() { - __FLOG(_L8("ConfigMgr - Entry")); + OstTraceFunctionEntry0( RMTPDEVICEDPSINGLETONS_CONFIGMGR_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); __ASSERT_DEBUG(iSingletons->iConfigMgr, User::Invariant()); - __FLOG(_L8("ConfigMgr - Exit")); + OstTraceFunctionExit0( RMTPDEVICEDPSINGLETONS_CONFIGMGR_EXIT ); return *iSingletons->iConfigMgr; } RMTPDeviceDpSingletons::CSingletons* RMTPDeviceDpSingletons::CSingletons::NewL(MMTPDataProviderFramework& aFramework) { + OstTraceFunctionEntry0( CSINGLETONS_NEWL_ENTRY ); CSingletons* self(new(ELeave) CSingletons()); CleanupStack::PushL(self); self->ConstructL(aFramework); CleanupStack::Pop(self); + OstTraceFunctionExit0( CSINGLETONS_NEWL_EXIT ); return self; } RMTPDeviceDpSingletons::CSingletons& RMTPDeviceDpSingletons::CSingletons::OpenL(MMTPDataProviderFramework& aFramework) { - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("CSingletons::OpenL - Entry")); + OstTraceFunctionEntry0( CSINGLETONS_OPENL_ENTRY ); CSingletons* self(reinterpret_cast(Dll::Tls())); if (!self) { @@ -112,7 +114,7 @@ { self->Inc(); } - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("CSingletons::OpenL - Exit")); + OstTraceFunctionExit0( CSINGLETONS_OPENL_EXIT ); return *self; } @@ -121,45 +123,43 @@ CSingletons* self(reinterpret_cast(Dll::Tls())); if (self) { - __FLOG(_L8("CSingletons::Close - Entry")); + OstTraceFunctionEntry0( RMTPDEVICEDPSINGLETONS_CSINGLETONS_CLOSE_ENTRY ); self->Dec(); if (self->AccessCount() == 0) { - __FLOG(_L8("CSingletons::Close - Exit")); + OstTraceFunctionExit0( RMTPDEVICEDPSINGLETONS_CSINGLETONS_CLOSE_EXIT ); delete self; Dll::SetTls(NULL); } else { - __FLOG(_L8("CSingletons::Close - Exit")); + OstTraceFunctionExit0( DUP1_RMTPDEVICEDPSINGLETONS_CSINGLETONS_CLOSE_EXIT ); } } } RMTPDeviceDpSingletons::CSingletons::~CSingletons() { - __FLOG(_L8("CSingletons::~CSingletons - Entry")); + OstTraceFunctionEntry0( CSINGLETONS_CSINGLETONS_ENTRY ); delete iConfigMgr; delete iDeviceDataStore; iPendingStorages.Close(); - __FLOG(_L8("CSingletons::~CSingletons - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CSINGLETONS_CSINGLETONS_EXIT ); } void RMTPDeviceDpSingletons::CSingletons::ConstructL(MMTPDataProviderFramework& aFramework) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CSingletons::ConstructL - Entry")); + OstTraceFunctionEntry0( CSINGLETONS_CONSTRUCTL_ENTRY ); iDeviceDataStore = CMTPDeviceDataStore::NewL(); iConfigMgr = CMTPDeviceDpConfigMgr::NewL(aFramework); - __FLOG(_L8("CSingletons::ConstructL - Exit")); + OstTraceFunctionExit0( CSINGLETONS_CONSTRUCTL_EXIT ); } RArray& RMTPDeviceDpSingletons::PendingStorages() { - __FLOG(_L8("PendingStorages - Entry")); + OstTraceFunctionEntry0( RMTPDEVICEDPSINGLETONS_PENDINGSTORAGES_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); - __FLOG(_L8("PendingStorages - Exit")); + OstTraceFunctionExit0( RMTPDEVICEDPSINGLETONS_PENDINGSTORAGES_EXIT ); return iSingletons->iPendingStorages; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpfws/mtpfw/dataproviders/devdp/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/devdp/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpfws/mtpfw/dataproviders/devdp/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,519 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_NORMAL=0x86 +[GROUP]TRACE_WARNING=0x83 +[TRACE]TRACE_ERROR[0x82]_CMTPDEVICEDATAPROVIDER_CONSTRUCTL=0x4 +[TRACE]TRACE_ERROR[0x82]_CMTPDEVICEDATAPROVIDER_GETSTORAGEIDL=0x3 +[TRACE]TRACE_ERROR[0x82]_CMTPDEVICEDATASTORE_BATTERYLEVELL=0x1 +[TRACE]TRACE_ERROR[0x82]_CMTPDEVICEDPCONFIGMGR_GETRSSCONFIGINFOARRAYL=0x6 +[TRACE]TRACE_ERROR[0x82]_CMTPGETDEVICEPROPDESC_GETGUIDL=0xa +[TRACE]TRACE_ERROR[0x82]_CMTPGETSTORAGEINFO_SETUPDRIVEVOLUMEINFOL=0xb +[TRACE]TRACE_ERROR[0x82]_CMTPRESETDEVICEPROPVALUE_GETGUIDL=0xf +[TRACE]TRACE_ERROR[0x82]_CMTPSTORAGEWATCHER_ENUMERATESTORAGESL=0x10 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPDEVICEDATASTORE_STRINGTODATETIMEL=0x2 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPDEVICEDPCONFIGMGR_GETRSSCONFIGINFOARRAYL=0x7 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPGETDEVICEINFO_ADDTOARRAYL=0x8 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPGETDEVICEINFO_ADDTOARRAYWITHFILTERL=0x9 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPGETSTORAGEINFO_SETUPDRIVEVOLUMEINFOL=0xc +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPGETSTORAGEINFO_SETUPDRIVEVOLUMEINFOL=0xd +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPSTORAGEWATCHER_DRIVECONFIGURATIONL=0x11 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPSTORAGEWATCHER_STORAGEUNAVAILABLEL=0x14 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPGETSTORAGEINFO_SETSTORAGETYPEL=0xe +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPDEVICEINFOTIMER_RUNL=0x5 +[TRACE]TRACE_ERROR[0x82]_DUP6_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL=0x12 +[TRACE]TRACE_ERROR[0x82]_DUP7_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL=0x13 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_ADDENTRYL_ENTRY=0x68 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_ADDENTRYL_EXIT=0x69 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_ADDFOLDERRECURSIVEL_ENTRY=0x66 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_ADDFOLDERRECURSIVEL_EXIT=0x67 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_CMTPDEVICEDATAPROVIDER_DES_ENTRY=0x56 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_CMTPDEVICEDATAPROVIDER_DES_EXIT=0x57 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_CONSTRUCTL_ENTRY=0x6e +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_CONSTRUCTL_EXIT=0x6f +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_GETSTORAGEIDL_ENTRY=0x6a +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_GETSTORAGEIDL_EXIT=0x6b +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_LOCATEREQUESTPROCESSORL_TMTPTYPEEVENT_ENTRY=0x72 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_LOCATEREQUESTPROCESSORL_TMTPTYPEEVENT_EXIT=0x73 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_LOCATEREQUESTPROCESSORL_TMTPTYPEREQUEST_ENTRY=0x70 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_LOCATEREQUESTPROCESSORL_TMTPTYPEREQUEST_EXIT=0x71 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_ENTRY=0x64 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_NOTIFYENUMERATIONCOMPLETEL_EXIT=0x65 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_ONDEVICEFOLDERCHANGEDL_ENTRY=0x6c +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_ONDEVICEFOLDERCHANGEDL_EXIT=0x6d +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_PROCESSEVENTL_ENTRY=0x58 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_PROCESSEVENTL_EXIT=0x59 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_PROCESSNOTIFICATIONL_ENTRY=0x5a +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_PROCESSNOTIFICATIONL_EXIT=0x5b +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL_ENTRY=0x5c +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL_EXIT=0x5d +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_SESSIONCLOSEDL_ENTRY=0x74 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_SESSIONCLOSEDL_EXIT=0x75 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_SESSIONOPENEDL_ENTRY=0x76 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_SESSIONOPENEDL_EXIT=0x77 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_SETCONNECTMAC_ENTRY=0x78 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_SETCONNECTMAC_EXIT=0x79 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_STARTOBJECTENUMERATIONL_ENTRY=0x5e +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_STARTOBJECTENUMERATIONL_EXIT=0x5f +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_STARTSTORAGEENUMERATIONL_ENTRY=0x60 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_STARTSTORAGEENUMERATIONL_EXIT=0x61 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_SUPPORTED_ENTRY=0x62 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATAPROVIDER_SUPPORTED_EXIT=0x63 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_APPENDMTPEXTENSIONSETSL_ENTRY=0x2f +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_APPENDMTPEXTENSIONSETSL_EXIT=0x30 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_BATTERYLEVELL_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_BATTERYLEVELL_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_CMTPDEVICEDATASTORE_DES_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_CMTPDEVICEDATASTORE_DES_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_CONSTRUCTL_ENTRY=0x25 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_CONSTRUCTL_EXIT=0x26 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_DATETIMEL_ENTRY=0x4b +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_DATETIMEL_EXIT=0x4c +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_DATETIMETOSTRINGL_ENTRY=0x4f +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_DATETIMETOSTRINGL_EXIT=0x50 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_DEVICEFRIENDLYNAMEDEFAULT_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_DEVICEFRIENDLYNAMEDEFAULT_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_DEVICEFRIENDLYNAME_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_DEVICEFRIENDLYNAME_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_DEVICEVERSION_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_DEVICEVERSION_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_DOCANCEL_ENTRY=0x1d +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_DOCANCEL_EXIT=0x1e +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_ENUMERATED_ENTRY=0x27 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_ENUMERATED_EXIT=0x28 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_EXTERNALIZEL_ENTRY=0x29 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_EXTERNALIZEL_EXIT=0x2a +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_INTERNALIZEL_ENTRY=0x2b +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_INTERNALIZEL_EXIT=0x2c +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_MANUFACTURER_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_MANUFACTURER_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_MODEL_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_MODEL_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_MTPEXTENSIONS_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_MTPEXTENSIONS_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_PERCEIVEDDEVICETYPEDEFAULT_ENTRY=0x47 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_PERCEIVEDDEVICETYPEDEFAULT_EXIT=0x48 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_PERCEIVEDDEVICETYPE_ENTRY=0x49 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_PERCEIVEDDEVICETYPE_Exit=0x4a +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_PROPERTYSTORENAME_ENTRY=0x2d +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_PROPERTYSTORENAME_EXIT=0x2e +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_RESTOREL_ENTRY=0x31 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_RESTOREL_EXIT=0x32 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_RUNERROR_ENTRY=0x1f +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_RUNERROR_EXIT=0x20 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_RUNL_ENTRY=0x21 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_RUNL_EXIT=0x22 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SCHEDULE_ENTRY=0x33 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SCHEDULE_EXIT=0x34 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SERIALNUMBER_ENTRY=0x11 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SERIALNUMBER_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SESSIONINITIATORVERSIONINFODEFAULT_ENTRY=0x43 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SESSIONINITIATORVERSIONINFODEFAULT_EXIT=0x44 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SESSIONINITIATORVERSIONINFO_ENTRY=0x41 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SESSIONINITIATORVERSIONINFO_EXIT=0x42 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETDATETIMEL_ENTRY=0x4d +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETDATETIMEL_EXIT=0x4e +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETDEVICEFRIENDLYNAMEL_ENTRY=0x17 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETDEVICEFRIENDLYNAMEL_EXIT=0x18 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETREQUESTCOMPLETE_ENTRY=0x35 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETREQUESTCOMPLETE_EXIT=0x36 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETREQUESTPENDING_ENTRY=0x37 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETREQUESTPENDING_EXIT=0x38 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETSESSIONINITIATORVERSIONINFOL_ENTRY=0x45 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETSESSIONINITIATORVERSIONINFOL_EXIT=0x46 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETSTATE_ENTRY=0x39 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETSTATE_EXIT=0x3a +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETSYNCHRONISATIONPARTNERL_ENTRY=0x19 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SETSYNCHRONISATIONPARTNERL_EXIT=0x1a +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_STARTENUMERATIONL_ENTRY=0x1b +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_STARTENUMERATIONL_EXIT=0x1c +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_STATE_ENTRY=0x3b +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_STATE_EXIT=0x3c +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_STOREFORMATTEDSERIALNUMBER_ENTRY=0x3f +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_STOREFORMATTEDSERIALNUMBER_EXIT=0x40 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_STOREL_ENTRY=0x3d +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_STOREL_EXIT=0x3e +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_STRINGTODATETIMEL_ENTRY=0x51 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_STRINGTODATETIMEL_EXIT=0x52 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SYNCHRONISATIONPARTNERDEFAULT_ENTRY=0x15 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SYNCHRONISATIONPARTNERDEFAULT_EXIT=0x16 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SYNCHRONISATIONPARTNER_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_SYNCHRONISATIONPARTNER_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_VALIDATESTRING_ENTRY=0x53 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDATASTORE_VALIDATESTRING_EXIT=0x54 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDPCONFIGMGR_CONSTRUCTL_ENTRY=0x7e +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDPCONFIGMGR_CONSTRUCTL_EXIT=0x7f +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDPCONFIGMGR_GETDRIVEINFOL_ENTRY=0x80 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDPCONFIGMGR_GETDRIVEINFOL_EXIT=0x81 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDPCONFIGMGR_GETFRIENDLYVOLUMENAMEL_ENTRY=0x82 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDPCONFIGMGR_GETFRIENDLYVOLUMENAMEL_EXIT=0x83 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDPCONFIGMGR_GETROOTDIRPATHL_ENTRY=0x84 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDPCONFIGMGR_GETROOTDIRPATHL_EXIT=0x85 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDPCONFIGMGR_GETRSSCONFIGINFOARRAYL_ENTRY=0x86 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEDPCONFIGMGR_GETRSSCONFIGINFOARRAYL_EXIT=0x87 +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEINFOTIMER_RUNL_ENTRY=0x7c +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEINFOTIMER_RUNL_EXIT=0x7d +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEINFOTIMER_START_ENTRY=0x7a +[TRACE]TRACE_FLOW[0x8A]_CMTPDEVICEINFOTIMER_START_EXIT=0x7b +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_BUILDDEVICEINFOL_ENTRY=0x8f +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_BUILDDEVICEINFOL_EXIT=0x90 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_CMTPGETDEVICEINFO_ENTRY=0x88 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_CMTPGETDEVICEINFO_EXIT=0x89 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_CONSTRUCTL_ENTRY=0x8d +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_CONSTRUCTL_EXIT=0x8e +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_REMOVESERVICEFORMAT_ENTRY=0x9b +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_REMOVESERVICEFORMAT_EXIT=0x9c +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_SERVICEL_ENTRY=0x8a +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_SERVICEL_EXIT=0x8b +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_SETSUPPORTEDCAPTUREFORMATSL_ENTRY=0x97 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_SETSUPPORTEDCAPTUREFORMATSL_EXIT=0x98 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_SETSUPPORTEDDEVICEPROPERTIESL_ENTRY=0x95 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_SETSUPPORTEDDEVICEPROPERTIESL_EXIT=0x96 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_SETSUPPORTEDEVENTSL_ENTRY=0x93 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_SETSUPPORTEDEVENTSL_EXIT=0x94 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_SETSUPPORTEDOPERATIONSL_ENTRY=0x91 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_SETSUPPORTEDOPERATIONSL_EXIT=0x92 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_SETSUPPORTEDPLAYBACKFORMATSL_ENTRY=0x99 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEINFO_SETSUPPORTEDPLAYBACKFORMATSL_EXIT=0x9a +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_CHECKREQUESTL_ENTRY=0x9f +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_CHECKREQUESTL_EXIT=0xa0 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_CMTPGETDEVICEPROPDESC_DES_ENTRY=0x9d +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_CMTPGETDEVICEPROPDESC_DES_EXIT=0x9e +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_CONSTRUCTL_ENTRY=0xa9 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_CONSTRUCTL_EXIT=0xaa +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_DOCANCEL_ENTRY=0xa5 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_DOCANCEL_EXIT=0xa6 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_HANDLEEXTNSERVICEL_ENTRY=0xa3 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_HANDLEEXTNSERVICEL_EXIT=0xa4 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_RUNL_ENTRY=0xa7 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_RUNL_EXIT=0xa8 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEBATTERYLEVELL_ENTRY=0xab +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEBATTERYLEVELL_EXIT=0xac +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEDATETIMEL_ENTRY=0xb5 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEDATETIMEL_EXIT=0xb6 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEDEVICEFRIENDLYNAMEL_ENTRY=0xad +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEDEVICEFRIENDLYNAMEL_EXIT=0xae +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEDEVICEICONL_ENTRY=0xb7 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEDEVICEICONL_EXIT=0xb8 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEFUNCTIONALIDL_ENTRY=0xbb +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEFUNCTIONALIDL_EXIT=0xbc +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEL_ENTRY=0xa1 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEL_EXIT=0xa2 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEMODELIDL_ENTRY=0xbd +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEMODELIDL_EXIT=0xbe +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEPERCEIVEDDEVICETYPEL_ENTRY=0xb3 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEPERCEIVEDDEVICETYPEL_EXIT=0xb4 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICESESSIONINITIATORVERSIONINFOL_ENTRY=0xb1 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICESESSIONINITIATORVERSIONINFOL_EXIT=0xb2 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICESUPPORTEDFORMATSORDEREDL_ENTRY=0xb9 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICESUPPORTEDFORMATSORDEREDL_EXIT=0xba +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICESYNCHRONISATIONPARTNERL_ENTRY=0xaf +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICESYNCHRONISATIONPARTNERL_EXIT=0xb0 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEUSEDEVICESTAGEL_ENTRY=0xbf +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPDESC_SERVICEUSEDEVICESTAGEL_EXIT=0xc0 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_CMTPGETDEVICEPROPVALUE_DES_ENTRY=0xc1 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_CMTPGETDEVICEPROPVALUE_DES_EXIT=0xc2 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_CONSTRUCTL_ENTRY=0xc3 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_CONSTRUCTL_EXIT=0xc4 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_HANDLEEXTNSERVICEL_ENTRY=0xd5 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_HANDLEEXTNSERVICEL_EXIT=0xd6 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEBATTERYLEVELL_ENTRY=0xc5 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEBATTERYLEVELL_EXIT=0xc6 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEDATETIMEL_ENTRY=0xcf +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEDATETIMEL_EXIT=0xd0 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEDEVICEFRIENDLYNAMEL_ENTRY=0xc7 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEDEVICEFRIENDLYNAMEL_EXIT=0xc8 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEDEVICEICONL_ENTRY=0xd1 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEDEVICEICONL_EXIT=0xd2 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_ENTRY=0xd7 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_EXIT=0xd8 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEMODELIDL_ENTRY=0xd9 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEMODELIDL_EXIT=0xda +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_ENTRY=0xcd +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_EXIT=0xce +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_ENTRY=0xcb +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_EXIT=0xcc +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_ENTRY=0xd3 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_EXIT=0xd4 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICESYNCHRONISATIONPARTNERL_ENTRY=0xc9 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICESYNCHRONISATIONPARTNERL_EXIT=0xca +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_ENTRY=0xdb +[TRACE]TRACE_FLOW[0x8A]_CMTPGETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_EXIT=0xdc +[TRACE]TRACE_FLOW[0x8A]_CMTPGETNUMOBJECTS_GETOBJECTHANDLESBYFORMATCODEL_ENTRY=0xe3 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETNUMOBJECTS_GETOBJECTHANDLESBYFORMATCODEL_EXIT=0xe4 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETNUMOBJECTS_HANDLEOBJECTHANDLESUNDERMACL_ENTRY=0xe1 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETNUMOBJECTS_HANDLEOBJECTHANDLESUNDERMACL_EXIT=0xe2 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETNUMOBJECTS_SERVICEL_ENTRY=0xdd +[TRACE]TRACE_FLOW[0x8A]_CMTPGETNUMOBJECTS_SERVICEL_EXIT=0xde +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTHANDLES_SERVICEL_ENTRY=0xe5 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTHANDLES_SERVICEL_EXIT=0xe6 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDDATABLOCKL_ENTRY=0xfc +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDDATABLOCKL_EXIT=0xfd +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDSERVICEFORMATL_ENTRY=0xf8 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDSERVICEFORMATL_EXIT=0xf9 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDSERVICEINFOHEADL_ENTRY=0xf2 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDSERVICEINFOHEADL_EXIT=0xf3 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDSERVICEINFOL_ENTRY=0xef +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDSERVICEINFOL_EXIT=0xf0 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDSERVICEMETHODL_ENTRY=0xfa +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDSERVICEMETHODL_EXIT=0xfb +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDSERVICEPROPERTYL_ENTRY=0xf6 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDSERVICEPROPERTYL_EXIT=0xf7 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDUSEDSERVICEGUIDL_ENTRY=0xf4 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_BUILDUSEDSERVICEGUIDL_EXIT=0xf5 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_CMTPGETSERVICEINFO_ENTRY=0xe9 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_CMTPGETSERVICEINFO_EXIT=0xea +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_CONSTRUCTL_ENTRY=0xed +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_CONSTRUCTL_EXIT=0xee +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_SERVICEL_ENTRY=0xeb +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSERVICEINFO_SERVICEL_EXIT=0xec +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL_ENTRY=0xfe +[TRACE]TRACE_FLOW[0x8A]_CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL_EXIT=0xff +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_CHECKREQUESTL_ENTRY=0x104 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_CHECKREQUESTL_EXIT=0x105 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_CMTPRESETDEVICEPROPVALUE_DES_ENTRY=0x100 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_CMTPRESETDEVICEPROPVALUE_DES_EXIT=0x101 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_CONSTRUCTL_ENTRY=0x102 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_CONSTRUCTL_EXIT=0x103 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEDATETIMEL_ENTRY=0x10c +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEDATETIMEL_EXIT=0x10d +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEDEVICEICONL_ENTRY=0x10e +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEDEVICEICONL_EXIT=0x10f +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_ENTRY=0x112 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_EXIT=0x113 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEL_ENTRY=0x106 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEL_EXIT=0x107 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEMODELIDL_ENTRY=0x114 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEMODELIDL_EXIT=0x115 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_ENTRY=0x10a +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_EXIT=0x10b +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_ENTRY=0x108 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_EXIT=0x109 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_ENTRY=0x110 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_EXIT=0x111 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_ENTRY=0x116 +[TRACE]TRACE_FLOW[0x8A]_CMTPRESETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_EXIT=0x117 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_CHECKREQUESTL_ENTRY=0x122 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_CHECKREQUESTL_EXIT=0x123 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_CMTPSETDEVICEPROPVALUE_DES_ENTRY=0x118 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_CMTPSETDEVICEPROPVALUE_DES_EXIT=0x119 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETEDEVICEICONL_ENTRY=0x138 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETEDEVICEICONL_EXIT=0x139 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETEPERCEIVEDDEVICETYPEL_ENTRY=0x130 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETEPERCEIVEDDEVICETYPEL_EXIT=0x131 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICEDATETIMEL_ENTRY=0x134 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICEDATETIMEL_EXIT=0x135 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICEDEVICEFRIENDLYNAMEL_ENTRY=0x126 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICEDEVICEFRIENDLYNAMEL_EXIT=0x127 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICEFUNCTIONALIDL_ENTRY=0x140 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICEFUNCTIONALIDL_EXIT=0x141 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICEMODELIDL_ENTRY=0x144 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICEMODELIDL_EXIT=0x145 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICESESSIONINITIATORVERSIONINFOL_ENTRY=0x12c +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICESESSIONINITIATORVERSIONINFOL_EXIT=0x12d +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICESUPPORTEDFORMATSORDEREDL_ENTRY=0x13c +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICESUPPORTEDFORMATSORDEREDL_EXIT=0x13d +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICESYNCHRONISATIONPARTNERL_ENTRY=0x128 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICESYNCHRONISATIONPARTNERL_EXIT=0x129 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICEUSEDEVICESTAGEL_ENTRY=0x148 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_COMPLETESERVICEUSEDEVICESTAGEL_EXIT=0x149 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_CONSTRUCTL_ENTRY=0x11a +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_CONSTRUCTL_EXIT=0x11b +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_DOHANDLERESPONSEPHASEL_ENTRY=0x124 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_DOHANDLERESPONSEPHASEL_EXIT=0x125 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_HANDLEEXTNSERVICEL_ENTRY=0x12a +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_HANDLEEXTNSERVICEL_EXIT=0x12b +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEBATTERYLEVELL_ENTRY=0x11c +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEBATTERYLEVELL_EXIT=0x11d +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEDATETIMEL_ENTRY=0x136 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEDATETIMEL_EXIT=0x137 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEDEVICEFRIENDLYNAMEL_ENTRY=0x11e +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEDEVICEFRIENDLYNAMEL_EXIT=0x11f +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEDEVICEICONL_ENTRY=0x13a +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEDEVICEICONL_EXIT=0x13b +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_ENTRY=0x142 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEFUNCTIONALIDL_EXIT=0x143 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEMODELIDL_ENTRY=0x146 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEMODELIDL_EXIT=0x147 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_ENTRY=0x132 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEPERCEIVEDDEVICETYPEL_EXIT=0x133 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_ENTRY=0x12e +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICESESSIONINITIATORVERSIONINFOL_EXIT=0x12f +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_ENTRY=0x13e +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICESUPPORTEDFORMATSORDEREDL_EXIT=0x13f +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICESYNCHRONISATIONPARTNERL_ENTRY=0x120 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICESYNCHRONISATIONPARTNERL_EXIT=0x121 +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_ENTRY=0x14a +[TRACE]TRACE_FLOW[0x8A]_CMTPSETDEVICEPROPVALUE_SERVICEUSEDEVICESTAGEL_EXIT=0x14b +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_CMTPSTORAGEWATCHER_ENTRY=0x14c +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_CMTPSTORAGEWATCHER_EXIT=0x14d +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_CONSTRUCTL_ENTRY=0x158 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_CONSTRUCTL_EXIT=0x159 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_DOCANCEL_ENTRY=0x152 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_DOCANCEL_EXIT=0x153 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_DRIVECONFIGURATIONL_ENTRY=0x15a +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_DRIVECONFIGURATIONL_EXIT=0x15b +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_ENUMERATESTORAGESL_ENTRY=0x14e +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_ENUMERATESTORAGESL_EXIT=0x14f +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_EXCLUDED_ENTRY=0x15c +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_EXCLUDED_EXIT=0x15d +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_REQUESTNOTIFICATION_ENTRY=0x15e +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_REQUESTNOTIFICATION_EXIT=0x15f +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_RUNERROR_ENTRY=0x154 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_RUNERROR_EXIT=0x155 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_RUNL_ENTRY=0x156 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_RUNL_EXIT=0x157 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_SENDEVENTL_ENTRY=0x160 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_SENDEVENTL_EXIT=0x161 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_START_ENTRY=0x150 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_START_EXIT=0x151 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL_ENTRY=0x162 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL_EXIT=0x163 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_STORAGEUNAVAILABLEL_ENTRY=0x164 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEWATCHER_STORAGEUNAVAILABLEL_EXIT=0x165 +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CONSTRUCTL_ENTRY=0x175 +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CONSTRUCTL_EXIT=0x176 +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CSINGLETONS_ENTRY=0x173 +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CSINGLETONS_EXIT=0x174 +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_NEWL_ENTRY=0x16c +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_NEWL_EXIT=0x16d +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_OPENL_ENTRY=0x16e +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_OPENL_EXIT=0x16f +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDEVICEDATASTORE_CMTPDEVICEDATASTORE_ENTRY=0x23 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDEVICEDATASTORE_CMTPDEVICEDATASTORE_EXIT=0x24 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDEVICEDATASTORE_VALIDATESTRING_EXIT=0x55 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPGETDEVICEINFO_SERVICEL_EXIT=0x8c +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPGETNUMOBJECTS_SERVICEL_EXIT=0xdf +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPGETOBJECTHANDLES_SERVICEL_EXIT=0xe7 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPGETSERVICEINFO_BUILDSERVICEINFOL_EXIT=0xf1 +[TRACE]TRACE_FLOW[0x8A]_DUP1_RMTPDEVICEDPSINGLETONS_CSINGLETONS_CLOSE_EXIT=0x172 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPGETNUMOBJECTS_SERVICEL_EXIT=0xe0 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPGETOBJECTHANDLES_SERVICEL_EXIT=0xe8 +[TRACE]TRACE_FLOW[0x8A]_RMTPDEVICEDPSINGLETONS_CLOSE_ENTRY=0x166 +[TRACE]TRACE_FLOW[0x8A]_RMTPDEVICEDPSINGLETONS_CLOSE_EXIT=0x167 +[TRACE]TRACE_FLOW[0x8A]_RMTPDEVICEDPSINGLETONS_CONFIGMGR_ENTRY=0x16a +[TRACE]TRACE_FLOW[0x8A]_RMTPDEVICEDPSINGLETONS_CONFIGMGR_EXIT=0x16b +[TRACE]TRACE_FLOW[0x8A]_RMTPDEVICEDPSINGLETONS_CSINGLETONS_CLOSE_ENTRY=0x170 +[TRACE]TRACE_FLOW[0x8A]_RMTPDEVICEDPSINGLETONS_CSINGLETONS_CLOSE_EXIT=0x171 +[TRACE]TRACE_FLOW[0x8A]_RMTPDEVICEDPSINGLETONS_DEVICEDATASTORE_ENTRY=0x168 +[TRACE]TRACE_FLOW[0x8A]_RMTPDEVICEDPSINGLETONS_DEVICEDATASTORE_EXIT=0x169 +[TRACE]TRACE_FLOW[0x8A]_RMTPDEVICEDPSINGLETONS_PENDINGSTORAGES_ENTRY=0x177 +[TRACE]TRACE_FLOW[0x8A]_RMTPDEVICEDPSINGLETONS_PENDINGSTORAGES_EXIT=0x178 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATAPROVIDER_ADDENTRYL=0x22 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATAPROVIDER_ADDFOLDERRECURSIVEL=0x1f +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATAPROVIDER_ONDEVICEFOLDERCHANGEDL=0x23 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL=0x15 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATAPROVIDER_SESSIONCLOSEDL=0x24 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATAPROVIDER_SESSIONOPENEDL=0x25 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATAPROVIDER_SETCONNECTMAC=0x26 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATASTORE_RUNERROR=0x1 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATASTORE_SETDATETIMEL=0x6 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATASTORE_SETSTATE=0x2 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATASTORE_STATE=0x3 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATASTORE_STRINGTODATETIMEL=0x7 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDATASTORE_VALIDATESTRING=0x8 +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEDPCONFIGMGR_GETDRIVEINFOL=0x2b +[TRACE]TRACE_NORMAL[0x86]_CMTPDEVICEINFOTIMER_RUNL=0x27 +[TRACE]TRACE_NORMAL[0x86]_CMTPGETDEVICEINFO_ADDTOARRAYL=0x34 +[TRACE]TRACE_NORMAL[0x86]_CMTPGETDEVICEINFO_ADDTOARRAYWITHFILTERL=0x35 +[TRACE]TRACE_NORMAL[0x86]_CMTPGETDEVICEINFO_BUILDDEVICEINFOL=0x30 +[TRACE]TRACE_NORMAL[0x86]_CMTPGETDEVICEINFO_SERVICEL=0x2f +[TRACE]TRACE_NORMAL[0x86]_CMTPGETDEVICEPROPDESC_SERVICEL=0x36 +[TRACE]TRACE_NORMAL[0x86]_CMTPGETNUMOBJECTS_GETOBJECTHANDLESBYFORMATCODEL=0x40 +[TRACE]TRACE_NORMAL[0x86]_CMTPGETNUMOBJECTS_HANDLEOBJECTHANDLESUNDERMACL=0x3e +[TRACE]TRACE_NORMAL[0x86]_CMTPGETNUMOBJECTS_SERVICEL=0x38 +[TRACE]TRACE_NORMAL[0x86]_CMTPGETOBJECTHANDLES_SERVICEL=0x41 +[TRACE]TRACE_NORMAL[0x86]_CMTPGETSTORAGEINFO_SETFREESPACEINBYTESL=0x48 +[TRACE]TRACE_NORMAL[0x86]_CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL=0x4c +[TRACE]TRACE_NORMAL[0x86]_CMTPGETSTORAGEINFO_SETSTORAGETYPEL=0x45 +[TRACE]TRACE_NORMAL[0x86]_CMTPSTORAGEWATCHER_DOCANCEL=0x52 +[TRACE]TRACE_NORMAL[0x86]_CMTPSTORAGEWATCHER_DRIVECONFIGURATIONL=0x54 +[TRACE]TRACE_NORMAL[0x86]_CMTPSTORAGEWATCHER_EXCLUDED=0x56 +[TRACE]TRACE_NORMAL[0x86]_CMTPSTORAGEWATCHER_RUNERROR=0x53 +[TRACE]TRACE_NORMAL[0x86]_CMTPSTORAGEWATCHER_SENDEVENTL=0x57 +[TRACE]TRACE_NORMAL[0x86]_CMTPSTORAGEWATCHER_START=0x51 +[TRACE]TRACE_NORMAL[0x86]_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL=0x58 +[TRACE]TRACE_NORMAL[0x86]_CMTPSTORAGEWATCHER_STORAGEUNAVAILABLEL=0x5e +[TRACE]TRACE_NORMAL[0x86]_DUP10_CMTPDEVICEDATASTORE_VALIDATESTRING=0x12 +[TRACE]TRACE_NORMAL[0x86]_DUP11_CMTPDEVICEDATASTORE_VALIDATESTRING=0x13 +[TRACE]TRACE_NORMAL[0x86]_DUP12_CMTPDEVICEDATASTORE_VALIDATESTRING=0x14 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDEVICEDATAPROVIDER_ADDFOLDERRECURSIVEL=0x20 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL=0x16 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDEVICEDATASTORE_SETDATETIMEL=0x4 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDEVICEDATASTORE_VALIDATESTRING=0x9 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDEVICEDPCONFIGMGR_GETDRIVEINFOL=0x2c +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDEVICEINFOTIMER_RUNL=0x28 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPGETDEVICEINFO_BUILDDEVICEINFOL=0x31 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPGETDEVICEINFO_SETSUPPORTEDCAPTUREFORMATSL=0x32 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPGETDEVICEINFO_SETSUPPORTEDPLAYBACKFORMATSL=0x33 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPGETDEVICEPROPDESC_SERVICEL=0x37 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPGETNUMOBJECTS_HANDLEOBJECTHANDLESUNDERMACL=0x3f +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPGETNUMOBJECTS_SERVICEL=0x39 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPGETOBJECTHANDLES_SERVICEL=0x42 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL=0x4d +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPGETSTORAGEINFO_SETSTORAGETYPEL=0x46 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSTORAGEWATCHER_DRIVECONFIGURATIONL=0x55 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL=0x59 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSTORAGEWATCHER_STORAGEUNAVAILABLEL=0x5f +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDEVICEDATAPROVIDER_ADDFOLDERRECURSIVEL=0x21 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL=0x17 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDEVICEDATASTORE_SETDATETIMEL=0x5 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDEVICEDATASTORE_VALIDATESTRING=0xa +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDEVICEDPCONFIGMGR_GETDRIVEINFOL=0x2d +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDEVICEINFOTIMER_RUNL=0x29 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPGETNUMOBJECTS_HANDLEOBJECTHANDLESUNDERMACL=0x3d +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPGETNUMOBJECTS_SERVICEL=0x3a +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPGETOBJECTHANDLES_SERVICEL=0x43 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPGETSTORAGEINFO_SETFREESPACEINBYTESL=0x49 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL=0x4e +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPGETSTORAGEINFO_SETSTORAGETYPEL=0x47 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL=0x5a +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL=0x18 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPDEVICEDATASTORE_VALIDATESTRING=0xb +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPDEVICEDPCONFIGMGR_GETDRIVEINFOL=0x2e +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPDEVICEINFOTIMER_RUNL=0x2a +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPGETNUMOBJECTS_SERVICEL=0x3b +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPGETOBJECTHANDLES_SERVICEL=0x44 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPGETSTORAGEINFO_SETFREESPACEINBYTESL=0x4a +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL=0x4f +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL=0x5b +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL=0x19 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPDEVICEDATASTORE_VALIDATESTRING=0xc +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPGETNUMOBJECTS_SERVICEL=0x3c +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPGETSTORAGEINFO_SETFREESPACEINBYTESL=0x4b +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPGETSTORAGEINFO_SETSTORAGEDESCRIPTIONL=0x50 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL=0x5c +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL=0x1a +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPDEVICEDATASTORE_VALIDATESTRING=0xd +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPSTORAGEWATCHER_STORAGEAVAILABLEL=0x5d +[TRACE]TRACE_NORMAL[0x86]_DUP6_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL=0x1b +[TRACE]TRACE_NORMAL[0x86]_DUP6_CMTPDEVICEDATASTORE_VALIDATESTRING=0xe +[TRACE]TRACE_NORMAL[0x86]_DUP7_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL=0x1c +[TRACE]TRACE_NORMAL[0x86]_DUP7_CMTPDEVICEDATASTORE_VALIDATESTRING=0xf +[TRACE]TRACE_NORMAL[0x86]_DUP8_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL=0x1d +[TRACE]TRACE_NORMAL[0x86]_DUP8_CMTPDEVICEDATASTORE_VALIDATESTRING=0x10 +[TRACE]TRACE_NORMAL[0x86]_DUP9_CMTPDEVICEDATAPROVIDER_PROCESSREQUESTPHASEL=0x1e +[TRACE]TRACE_NORMAL[0x86]_DUP9_CMTPDEVICEDATASTORE_VALIDATESTRING=0x11 +[TRACE]TRACE_WARNING[0x83]_CMTPDEVICEDATASTORE_APPENDMTPEXTENSIONSETSL=0x1 +[TRACE]TRACE_WARNING[0x83]_CMTPGETDEVICEINFO_SETSUPPORTEDCAPTUREFORMATSL=0x2 +[TRACE]TRACE_WARNING[0x83]_CMTPGETDEVICEINFO_SETSUPPORTEDPLAYBACKFORMATSL=0x3 +[TRACE]TRACE_WARNING[0x83]_CMTPGETDEVICEPROPDESC_GETFORMATORDERED=0x4 +[TRACE]TRACE_WARNING[0x83]_CMTPGETSERVICEINFO_BUILDSERVICEINFOL=0x5 +[TRACE]TRACE_WARNING[0x83]_DUP1_CMTPGETSTORAGEINFO_SETFREESPACEINBYTESL=0x6 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/group/mtpdataproviderutility.mmp --- a/mtpfws/mtpfw/dataproviders/dputility/group/mtpdataproviderutility.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/group/mtpdataproviderutility.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -12,8 +12,7 @@ // // Description: // - -#include + TARGET mtpdataproviderutility.dll TARGETTYPE DLL UID 0x1000008D 0x10282FC9 @@ -25,7 +24,8 @@ USERINCLUDE ../inc USERINCLUDE ../../../common/inc USERINCLUDE ../../../inc -USERINCLUDE ../../../transports/transportapi/inc +USERINCLUDE ../../../transports/transportapi/inc +USERINCLUDE ../traces SOURCEPATH ../src SOURCE cmtpcopyobject.cpp diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpabstractdatacodemgr.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpabstractdatacodemgr.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpabstractdatacodemgr.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,6 @@ #include #include -#include "mtpdebug.h" #include "mtpsvcdpconst.h" class MMTPDataProviderFramework; @@ -110,10 +109,5 @@ TUint iServiceID; TMTPTypeGuid iServiceGUID; TMTPTypeGuid iPersistentServiceGUID; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPABSTRACTDATACODEMGR_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpcopyobject.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpcopyobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpcopyobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -23,7 +23,6 @@ #include "rmtpframework.h" #include "cmtprequestprocessor.h" -#include "mtpdebug.h" #include "rmtpdpsingletons.h" class RFs; @@ -84,13 +83,10 @@ TUint32 iNewParentHandle; TUint32 iStorageId; TTime iPreviousModifiedTime; + TBool iIsHidden; RMTPFramework iSingletons; RMTPDpSingletons iDpSingletons; CPeriodic* iTimer; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpdeleteobject.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpdeleteobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpdeleteobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -26,7 +26,6 @@ #include "rmtpframework.h" #include "cmtprequestprocessor.h" -#include "mtpdebug.h" class MMTPObjectMgr; @@ -58,11 +57,6 @@ private: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - /** True if any deletion succeeded */ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpfsentrycache.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpfsentrycache.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpfsentrycache.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define CMTPFSENTRYCACHE_H #include -#include "mtpdebug.h" /** This class is used to cache the fs entry information of the big file (>1G) which is being @@ -65,10 +64,6 @@ used to return to getobjectproplist and getobjectinfo operations */ TEntry iFileEntry; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // CMTPFSENTRYCACHE_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpfsenumerator.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpfsenumerator.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpfsenumerator.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,6 @@ #include #include "rmtpdpsingletons.h" -#include "mtpdebug.h" #include "rmtpframework.h" class MMTPDataProviderFramework; @@ -108,11 +107,7 @@ TInt iObjectNeedToScan; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; + }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpfsexclusionmgr.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpfsexclusionmgr.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpfsexclusionmgr.h Fri Sep 17 08:34:51 2010 +0300 @@ -23,7 +23,6 @@ #include #include -#include "mtpdebug.h" #include #include #include @@ -54,11 +53,7 @@ protected: MMTPDataProviderFramework& iFramework; TLinearOrder iOrder; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; + }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpfullenumservicehandler.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpfullenumservicehandler.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpfullenumservicehandler.h Fri Sep 17 08:34:51 2010 +0300 @@ -26,7 +26,6 @@ #include #include -#include "mtpdebug.h" #include "mmtpservicehandler.h" class CMTPTypeServiceInfo; @@ -105,10 +104,6 @@ TMTPSyncSvcSyncObjectReferences iSyncObjectReference; TMTPSyncSvcFilterType iFilterType; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPFULLENUMSERVICEHANDLER_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetformatcapabilities.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetformatcapabilities.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetformatcapabilities.h Fri Sep 17 08:34:51 2010 +0300 @@ -52,6 +52,7 @@ CMTPTypeObjectPropDesc* ServiceProtectionStatusL(); CMTPTypeObjectPropDesc* ServiceAssociationTypeL(); CMTPTypeObjectPropDesc* ServiceNonConsumableL(); + CMTPTypeObjectPropDesc* ServiceHiddenL(); private: // Owned diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobject.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define CMTPGETOBJECT_H #include "cmtprequestprocessor.h" -#include "mtpdebug.h" class CMTPTypeFile; @@ -51,11 +50,6 @@ private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - CMTPTypeFile* iFileObject; TMTPResponseCode iError; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobjectinfo.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobjectinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobjectinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -60,10 +60,6 @@ TEntry iFileEntry; RFs& iRfs; RMTPDpSingletons iDpSingletons; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif CMTPGETOBJECTINFO_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobjectpropdesc.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobjectpropdesc.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobjectpropdesc.h Fri Sep 17 08:34:51 2010 +0300 @@ -62,6 +62,7 @@ void ServicePuidL(); void ServiceNameL(); void ServiceNonConsumableL(); + void ServiceHiddenL(); TUint16 GetPropertyGroupNumber(const TUint16 aPropCode) const; private: diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobjectproplist.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobjectproplist.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobjectproplist.h Fri Sep 17 08:34:51 2010 +0300 @@ -70,11 +70,7 @@ CMTPTypeObjectPropList* iPropertyList; RMTPDpSingletons iDpSingletons; CMTPObjectMetaData* iObjMeta; - TEntry iFileEntry; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; + TEntry iFileEntry; }; #endif // CMTPGETOBJECTPROPLIST_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobjectpropvalue.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobjectpropvalue.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetobjectpropvalue.h Fri Sep 17 08:34:51 2010 +0300 @@ -69,6 +69,8 @@ void ServicePuidL(); void ServiceNameL(); void ServiceNonConsumableL(); + void ServiceHiddenL(); + private: TMTPTypeUint8 iMTPTypeUint8; TMTPTypeUint16 iMTPTypeUint16; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetpartialobject.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetpartialobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpgetpartialobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define CMTPGETPARTIALOBJECT_H #include "cmtprequestprocessor.h" -#include "mtpdebug.h" class CMTPTypeFile; @@ -51,11 +50,6 @@ private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - CMTPTypeFile* iFileObject; CMTPObjectMetaData* iObjectInfo; TUint iOffset; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpknowledgehandler.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpknowledgehandler.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpknowledgehandler.h Fri Sep 17 08:34:51 2010 +0300 @@ -24,7 +24,6 @@ #include #include -#include "mtpdebug.h" #include "mtpsvcdpconst.h" #include "mmtpsvcobjecthandler.h" @@ -110,12 +109,6 @@ RBuf iDateModified; RBuf iName; TMTPTypeUint128 iLastAuthorProxyID; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - }; /** @@ -180,10 +173,6 @@ // Knowledge object swap file CMTPTypeFile* iKnowledgeSwpBuffer; const TDesC& iSuid; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPKNOWLEDGEHANDLER_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpmoveobject.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpmoveobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpmoveobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -23,7 +23,6 @@ #include "rmtpframework.h" #include "cmtprequestprocessor.h" -#include "mtpdebug.h" #include "rmtpdpsingletons.h" class CFileMan; @@ -85,10 +84,7 @@ CPeriodic* iTimer; HBufC* iNewFileName; TBool iIsFolder; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; + TBool iIsHidden; }; #endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtprequestchecker.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtprequestchecker.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtprequestchecker.h Fri Sep 17 08:34:51 2010 +0300 @@ -26,7 +26,6 @@ #include #include #include -#include "mtpdebug.h" #include "rmtpdpsingletons.h" class CMTPObjectMetaData; @@ -147,10 +146,6 @@ RArray iHandles; //these two arrays contain the mapping from the handle to objectinfo RPointerArray iObjectArray; RMTPDpSingletons iDpSingletons; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtprequestprocessor.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtprequestprocessor.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtprequestprocessor.h Fri Sep 17 08:34:51 2010 +0300 @@ -27,7 +27,6 @@ #include #include #include "cmtprequestchecker.h" -#include "mtpdebug.h" class MMTPConnection; class TMTPTypeRequest; @@ -194,10 +193,6 @@ TMTPResponseCode iResponseCode; // contains response from CheckRequestL call RBuf8 iNullBuffer; // buffer to receive data from discarded data phase TMTPTypeNull iNull; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPREQUESTPROCESSOR_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsendobjectinfo.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsendobjectinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsendobjectinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -27,7 +27,6 @@ #include "cmtprequestprocessor.h" #include "rmtpdpsingletons.h" #include "rmtpframework.h" -#include "mtpdebug.h" class CMTPTypeFile; class CMTPTypeObjectInfo; @@ -102,11 +101,6 @@ private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - CMTPTypeFile* iFileReceived; CMTPTypeObjectInfo* iObjectInfo; CMTPTypeObjectPropList* iObjectPropList; @@ -123,6 +117,7 @@ TBool iIsFolder; TMTPTypeNull iNullObject; TUint16 iProtectionStatus; + TUint16 iHiddenStatus; TUint32 iPreviousTransactionID; RMTPDpSingletons iDpSingletons; TFileName iName; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvccompoundprocessor.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvccompoundprocessor.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvccompoundprocessor.h Fri Sep 17 08:34:51 2010 +0300 @@ -125,10 +125,6 @@ TUint32 iLastSessionID; // Last valid session id TBool iIsCommited; // Is received ObjectInfo or ObjectPropList commited TBool iIsRollBackHandlerObject; // Roll back handle which has been insert in handler db - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCCOMPOUNDPROCESSOR_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcdeleteobject.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcdeleteobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcdeleteobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -62,10 +62,6 @@ TBool iSuccessDeletion; TInt32 iFormatCode; CMTPObjectMetaData* iReceivedObjectMetaData; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCDELETEOBJECT_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcdeleteobjectproplist.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcdeleteobjectproplist.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcdeleteobjectproplist.h Fri Sep 17 08:34:51 2010 +0300 @@ -54,10 +54,6 @@ MMTPServiceDataProvider& iDataProvider; CMTPTypeDeleteObjectPropList* iPropertyList; CMTPObjectMetaData* iReceivedObjectMetaData; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCDELETEOBJECTPROPLIST_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcdeleteserviceproplist.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcdeleteserviceproplist.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcdeleteserviceproplist.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define __CMTPSVCDELETESERVICEPROPLIST_H__ #include "cmtprequestprocessor.h" -#include "mtpdebug.h" class MMTPServiceDataProvider; class CMTPTypeDeleteServicePropList; @@ -50,10 +49,6 @@ private: CMTPTypeDeleteServicePropList* iDeleteServicePropList; MMTPServiceDataProvider& iDataProvider; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCDELETESERVICEPROPLIST_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetobject.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -48,9 +48,5 @@ MMTPSvcObjectHandler* iObjectHandler; // Not own MMTPType* iBuffer; // Not own CMTPObjectMetaData* iReceivedObjectMetaData; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCGETOBJECT_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetobjectinfo.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetobjectinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetobjectinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -50,10 +50,6 @@ MMTPServiceDataProvider& iDataProvider; MMTPSvcObjectHandler* iObjectHandler; // Not own CMTPObjectMetaData* iReceivedObjectMetaData; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCGETOBJECTINFO_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetobjectproplist.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetobjectproplist.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetobjectproplist.h Fri Sep 17 08:34:51 2010 +0300 @@ -69,10 +69,6 @@ TMTPResponseCode iResponseCode; CMTPObjectMetaData* iReceivedObjectMetaData; TUint32 iGroupId; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCGETOBJECTPROPLIST_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetreferences.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetreferences.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetreferences.h Fri Sep 17 08:34:51 2010 +0300 @@ -51,10 +51,6 @@ CMTPTypeArray* iReferences; MMTPServiceDataProvider& iDataProvider; CMTPObjectMetaData* iReceivedObjectMetaData; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCGETREFERENCES_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetservicecapabilities.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetservicecapabilities.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetservicecapabilities.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define __CMTPSVCGETSERVICECAPABILITIES_H__ #include "cmtprequestprocessor.h" -#include "mtpdebug.h" class CMTPTypeServiceCapabilityList; class MMTPServiceDataProvider; @@ -51,10 +50,6 @@ CMTPTypeServiceCapabilityList* iServiceCapabilityList; MMTPServiceDataProvider& iDataProvider; TMTPResponseCode iResponseCode; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCGETSERVICECAPABILITIES_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetserviceinfo.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetserviceinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetserviceinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define __CMTPSVCGETSERVICEINFO_H__ #include "cmtprequestprocessor.h" -#include "mtpdebug.h" #include "cmtpserviceinfo.h" class MMTPServiceDataProvider; @@ -51,10 +50,6 @@ CMTPTypeServiceInfo* iServiceInfo; MMTPServiceDataProvider& iDataProvider; TMTPResponseCode iResponseCode; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCGETSERVICEINFO_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetservicepropdesc.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetservicepropdesc.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetservicepropdesc.h Fri Sep 17 08:34:51 2010 +0300 @@ -49,10 +49,6 @@ MMTPServiceDataProvider& iDataProvider; CMTPTypeServicePropDescList* iPropDescList; TMTPResponseCode iResponseCode; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCGETSERVICEPROPDESC_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetserviceproplist.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetserviceproplist.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetserviceproplist.h Fri Sep 17 08:34:51 2010 +0300 @@ -49,10 +49,6 @@ CMTPTypeServicePropList* iServicePropList; MMTPServiceDataProvider& iDataProvider; TMTPResponseCode iResponseCode; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCGETSERVICEPROPLIST_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetstorageinfo.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetstorageinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcgetstorageinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,7 +22,6 @@ #define __CMTPSVCGETSTORAGEINFO_H__ #include "cmtprequestprocessor.h" -#include "mtpdebug.h" class MMTPServiceDataProvider; class CMTPTypeStorageInfo; @@ -59,10 +58,6 @@ private: CMTPTypeStorageInfo* iStorageInfo; MMTPServiceDataProvider& iDataProvider; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCGETSTORAGEINFO_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcsetobjectproplist.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcsetobjectproplist.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcsetobjectproplist.h Fri Sep 17 08:34:51 2010 +0300 @@ -48,10 +48,6 @@ private: MMTPServiceDataProvider& iDataProvider; CMTPTypeObjectPropList* iPropertyList; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCSETOBJECTPROPLIST_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcsetreferences.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcsetreferences.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcsetreferences.h Fri Sep 17 08:34:51 2010 +0300 @@ -53,10 +53,6 @@ CMTPTypeArray* iReferences; MMTPServiceDataProvider& iDataProvider; CMTPObjectMetaData* iReceivedObjectMetaData; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCSETREFERENCES_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcsetserviceproplist.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcsetserviceproplist.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/cmtpsvcsetserviceproplist.h Fri Sep 17 08:34:51 2010 +0300 @@ -49,10 +49,6 @@ private: CMTPTypeServicePropList* iServicePropList; MMTPServiceDataProvider& iDataProvider; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // __CMTPSVCSETSERVICEPROPLIST_H__ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/mtpdpconst.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/mtpdpconst.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/mtpdpconst.h Fri Sep 17 08:34:51 2010 +0300 @@ -40,7 +40,8 @@ EMTPObjectPropCodeParentObject, EMTPObjectPropCodePersistentUniqueObjectIdentifier, EMTPObjectPropCodeName, - EMTPObjectPropCodeNonConsumable + EMTPObjectPropCodeNonConsumable, + EMTPObjectPropCodeHidden }; /** @@ -64,7 +65,7 @@ static const TUint16 KMTPDpPropertyGroups[KMTPDpPropertyGroupNumber+1][KMTPDpPropertyNumber] = { {}, // group 0 is not used. - // group 1 contains 10 proeprties + // group 1 contains 11 proeprties { EMTPObjectPropCodeStorageID, EMTPObjectPropCodeObjectFormat, EMTPObjectPropCodeProtectionStatus, @@ -74,7 +75,8 @@ EMTPObjectPropCodeParentObject, EMTPObjectPropCodePersistentUniqueObjectIdentifier, EMTPObjectPropCodeName, - EMTPObjectPropCodeNonConsumable } + EMTPObjectPropCodeNonConsumable, + EMTPObjectPropCodeHidden} }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/rmtpdpsingletons.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/rmtpdpsingletons.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/rmtpdpsingletons.h Fri Sep 17 08:34:51 2010 +0300 @@ -21,8 +21,6 @@ #ifndef RMTPDPSINGLETONS_H #define RMTPDPSINGLETONS_H -#include "mtpdebug.h" - #include "rmtputility.h" class MMTPDataProviderFramework; @@ -80,11 +78,6 @@ public: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - /** The file system exclusion manager list. This list contains all the Data Providers' @@ -109,10 +102,6 @@ MMTPDataProviderFramework* iFramework; private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; /** The singletons reference block. diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/inc/rmtputility.h --- a/mtpfws/mtpfw/dataproviders/dputility/inc/rmtputility.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/inc/rmtputility.h Fri Sep 17 08:34:51 2010 +0300 @@ -26,8 +26,8 @@ #include #include #include +#include "mtpdebug.h" #include "rmtpframework.h" -#include "mtpdebug.h" class MMTPDataProviderFramework; class CMTPObjectMetaData; @@ -84,10 +84,6 @@ void ParseEnumerationFlag(const TDesC& aString, CMTPExtensionMapping& aMapping, TParseState& aState); void Parse(const TDesC& aString, CMTPExtensionMapping& aMapping, TParseState& aState); private: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; MMTPDataProviderFramework* iFramework; RMTPFramework iSingleton; RPointerArray iFormatMappings; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpabstractdatacodemgr.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpabstractdatacodemgr.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpabstractdatacodemgr.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -18,8 +18,12 @@ #include #include "cmtpabstractdatacodemgr.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpabstractdatacodemgrTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent, "FullEnumDataCodeMgr");) EXPORT_C RMTPServiceFormat::~RMTPServiceFormat() { @@ -53,11 +57,10 @@ EXPORT_C CMTPFullEnumDataCodeMgr::~CMTPFullEnumDataCodeMgr() { - __FLOG(_L8("~CMTPFullEnumDataCodeMgr - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMDATACODEMGR_CMTPFULLENUMDATACODEMGR_DES_ENTRY ); delete iKnowledgeFormat; iServiceProperties.Close(); - __FLOG(_L8("~CMTPFullEnumDataCodeMgr - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPFULLENUMDATACODEMGR_CMTPFULLENUMDATACODEMGR_DES_EXIT ); } CMTPFullEnumDataCodeMgr::CMTPFullEnumDataCodeMgr(MMTPDataProviderFramework& aFramework) : @@ -71,12 +74,11 @@ void CMTPFullEnumDataCodeMgr::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMDATACODEMGR_CONSTRUCTL_ENTRY ); BuildServiceIDL(); BuildFormatL(); BuildServicePropertyL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPFULLENUMDATACODEMGR_CONSTRUCTL_EXIT ); } EXPORT_C TUint CMTPFullEnumDataCodeMgr::ServiceID() const @@ -91,18 +93,21 @@ void CMTPFullEnumDataCodeMgr::BuildServiceIDL() { - __FLOG(_L8("BuildServiceIDL - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMDATACODEMGR_BUILDSERVICEIDL_ENTRY ); //Allocate abstract service ID - User::LeaveIfError(iFramework.DataCodeGenerator().AllocateServiceID( + LEAVEIFERROR(iFramework.DataCodeGenerator().AllocateServiceID( iPersistentServiceGUID, EMTPServiceTypeAbstract, - iServiceID)); - __FLOG(_L8("BuildServiceIDL - Exit")); + iServiceID), + OstTrace0( TRACE_ERROR, CMTPFULLENUMDATACODEMGR_BUILDSERVICEIDL, + "allocate abstract service ID faled!" )); + + OstTraceFunctionExit0( CMTPFULLENUMDATACODEMGR_BUILDSERVICEIDL_EXIT ); } void CMTPFullEnumDataCodeMgr::BuildFormatL() { - __FLOG(_L8("BuildFormatL - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMDATACODEMGR_BUILDFORMATL_ENTRY ); iKnowledgeFormat = new(ELeave) RMTPServiceFormat; @@ -115,22 +120,25 @@ iKnowledgeFormat->iBaseFormatCode = KBaseFormatCode; iKnowledgeFormat->iFormatName.Set(KNameFullEnumSyncKnowledege()); iKnowledgeFormat->iMIMEType.Set(KNameFullEnumSyncKnowledegeMIMEType()); - User::LeaveIfError(iFramework.DataCodeGenerator().AllocateServiceFormatCode( + LEAVEIFERROR(iFramework.DataCodeGenerator().AllocateServiceFormatCode( iPersistentServiceGUID, iKnowledgeFormat->iFormatGUID, - iKnowledgeFormat->iFormatCode)); + iKnowledgeFormat->iFormatCode), + OstTrace0( TRACE_ERROR, CMTPFULLENUMDATACODEMGR_BUILDFORMATL, + "allocate service format code failed!" )); + TUint propertyCount = sizeof(KMTPFullEnumSyncKnowledgeObjectProperties) / sizeof(KMTPFullEnumSyncKnowledgeObjectProperties[0]); for (TUint j = 0; j < propertyCount; j++) { iKnowledgeFormat->iProps.AppendL(KMTPFullEnumSyncKnowledgeObjectProperties[j]); } - __FLOG(_L8("BuildFormatL - Exit")); + OstTraceFunctionExit0( CMTPFULLENUMDATACODEMGR_BUILDFORMATL_EXIT ); } void CMTPFullEnumDataCodeMgr::BuildServicePropertyL() { - __FLOG(_L8("BuildServicePropertyL - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMDATACODEMGR_BUILDSERVICEPROPERTYL_ENTRY ); const TMTPTypeGuid KMTPFullEnumSyncServiceNamespace( MAKE_TUINT64(KMTPFullEnumSyncServiceNSGUID[0], KMTPFullEnumSyncServiceNSGUID[1]), @@ -159,23 +167,24 @@ for (TUint i = 0; i < propCount; i++) { TMTPServicePropertyInfo servicePropertyInfo = KMTPFullEnumSyncServiceProperties[i]; - User::LeaveIfError(iFramework.DataCodeGenerator().AllocateServicePropertyCode(iPersistentServiceGUID, - servicePropertyInfo.iServicePropPKeyNamespace, servicePropertyInfo.iServicePropPKeyID, servicePropertyInfo.iServicePropCode)); + LEAVEIFERROR(iFramework.DataCodeGenerator().AllocateServicePropertyCode(iPersistentServiceGUID, + servicePropertyInfo.iServicePropPKeyNamespace, servicePropertyInfo.iServicePropPKeyID, servicePropertyInfo.iServicePropCode), + OstTrace0( TRACE_ERROR, CMTPFULLENUMDATACODEMGR_BUILDSERVICEPROPERTYL, "allocate service property code failed!" )); iServiceProperties.InsertInOrder(servicePropertyInfo, TMTPServicePropertyInfo::LinearOrderServicePropOrder); } - __FLOG(_L8("BuildServicePropertyL - Exit")); + OstTraceFunctionExit0( CMTPFULLENUMDATACODEMGR_BUILDSERVICEPROPERTYL_EXIT ); } EXPORT_C void CMTPFullEnumDataCodeMgr::GetSevicePropCodesL(RArray& aArray) const { - __FLOG(_L8("GetSevicePropCodesL - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMDATACODEMGR_GETSEVICEPROPCODESL_ENTRY ); TInt count = iServiceProperties.Count(); for (TInt i = 0; i < count; i++) { aArray.AppendL(iServiceProperties[i].iServicePropCode); } - __FLOG(_L8("GetSevicePropCodesL - Exit")); + OstTraceFunctionExit0( CMTPFULLENUMDATACODEMGR_GETSEVICEPROPCODESL_EXIT ); } EXPORT_C const RMTPServiceFormat& CMTPFullEnumDataCodeMgr::KnowledgeFormat() const @@ -190,14 +199,14 @@ */ EXPORT_C const TMTPServicePropertyInfo* CMTPFullEnumDataCodeMgr::ServicePropertyInfo(TUint16 aPropCode) const { - __FLOG(_L8("ServicePropertyInfo - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMDATACODEMGR_SERVICEPROPERTYINFO_ENTRY ); const TMTPServicePropertyInfo* pPropInfo = NULL; TInt index = iServiceProperties.FindInOrder(aPropCode, TMTPServicePropertyInfo::LinearOrderServicePropOrder); if (KErrNotFound != index) { pPropInfo = &(iServiceProperties[index]); } - __FLOG(_L8("ServicePropertyInfo - Exit")); + OstTraceFunctionExit0( CMTPFULLENUMDATACODEMGR_SERVICEPROPERTYINFO_EXIT ); return pPropInfo; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpcopyobject.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpcopyobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpcopyobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,8 +27,12 @@ #include "cmtpstoragemgr.h" #include "cmtpcopyobject.h" #include "mtpdppanic.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpcopyobjectTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"CopyObject");) /** Verification data for the CopyObject request @@ -62,7 +66,7 @@ */ EXPORT_C CMTPCopyObject::~CMTPCopyObject() { - __FLOG(_L8("~CMTPCopyObject - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_CMTPCOPYOBJECT_DES_ENTRY ); Cancel(); iDpSingletons.Close(); iSingletons.Close(); @@ -71,9 +75,8 @@ delete iDest; delete iNewFileName; delete iFileMan; - - __FLOG(_L8("~CMTPCopyObject - Exit")); - __FLOG_CLOSE; + + OstTraceFunctionExit0( CMTPCOPYOBJECT_CMTPCOPYOBJECT_DES_EXIT ); } /** @@ -83,14 +86,13 @@ CMTPRequestProcessor(aFramework, aConnection, sizeof(KMTPCopyObjectPolicy)/sizeof(TMTPRequestElementInfo), KMTPCopyObjectPolicy), iTimer(NULL) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } TMTPResponseCode CMTPCopyObject::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_CHECKREQUESTL_ENTRY ); TMTPResponseCode result = CMTPRequestProcessor::CheckRequestL(); if ( (EMTPRespCodeOK == result) && (!iSingletons.StorageMgr().IsReadWriteStorage(Request().Uint32(TMTPTypeRequest::ERequestParameter2))) ) { @@ -104,19 +106,21 @@ { const TDesC& suid(object->DesC(CMTPObjectMetaData::ESuid)); iIsFolder = EFalse; - User::LeaveIfError(BaflUtils::IsFolder(iFramework.Fs(), suid, iIsFolder)); + LEAVEIFERROR(BaflUtils::IsFolder(iFramework.Fs(), suid, iIsFolder), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPCOPYOBJECT_CHECKREQUESTL, "can't judge whether %S is a folder", suid )); if(!iIsFolder) { if(iDpSingletons.CopyingBigFileCache().IsOnGoing()) { - __FLOG(_L8("CheckRequestL - A big file copying is ongoing, respond with access denied")); + OstTrace0( TRACE_NORMAL, CMTPCOPYOBJECT_CHECKREQUESTL, + "CheckRequestL - A big file copying is ongoing, respond with access denied" ); result = EMTPRespCodeAccessDenied; } } } CleanupStack::PopAndDestroy(object); } - __FLOG(_L8("CheckRequestL - Exit")); + OstTraceFunctionExit0( CMTPCOPYOBJECT_CHECKREQUESTL_EXIT ); return result; } @@ -125,7 +129,7 @@ */ void CMTPCopyObject::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_SERVICEL_ENTRY ); TUint32 handle = KMTPHandleNone; TMTPResponseCode responseCode = EMTPRespCodeOK; TRAPD(err, responseCode = CopyObjectL(handle)); @@ -135,15 +139,15 @@ } else if(responseCode != EMTPRespCodeOK) { - __FLOG_VA((_L8("ServiceL, sending response with respond code %d"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPCOPYOBJECT_SERVICEL, "ServiceL, sending response with respond code %d", responseCode ); SendResponseL(responseCode); } else if (iIsFolder) { - __FLOG_VA((_L8("ServiceL, sending response with handle=%d, respond code OK"), handle)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPCOPYOBJECT_SERVICEL, "ServiceL, sending response with handle=%d, respond code OK", handle ); SendResponseL(EMTPRespCodeOK, 1, &handle); } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPCOPYOBJECT_SERVICEL_EXIT ); } @@ -152,8 +156,10 @@ */ void CMTPCopyObject::ConstructL() { + OstTraceFunctionEntry0( CMTPCOPYOBJECT_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); iDpSingletons.OpenL(iFramework); + OstTraceFunctionExit0( CMTPCOPYOBJECT_CONSTRUCTL_EXIT ); } @@ -164,14 +170,15 @@ */ void CMTPCopyObject::CopyFileL(const TDesC& aNewFileName) { - __FLOG(_L8("CopyFileL - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_COPYFILEL_ENTRY ); delete iNewFileName; iNewFileName = NULL; iNewFileName = aNewFileName.AllocL(); // Store the new file name const TDesC& suid(iObjectInfo->DesC(CMTPObjectMetaData::ESuid)); GetPreviousPropertiesL(suid); - User::LeaveIfError(iFileMan->Copy(suid, *iDest, CFileMan::EOverWrite, iStatus)); + LEAVEIFERROR(iFileMan->Copy(suid, *iDest, CFileMan::EOverWrite, iStatus), + OstTraceExt2( TRACE_ERROR, CMTPCOPYOBJECT_COPYFILEL, "copy %S to %S failed!", suid, *iDest)); if ( !IsActive() ) { SetActive(); @@ -182,8 +189,8 @@ iTimer = CPeriodic::NewL(EPriorityStandard); TTimeIntervalMicroSeconds32 KCopyObjectIntervalNone = 0; iTimer->Start(TTimeIntervalMicroSeconds32(KCopyObjectTimeOut), KCopyObjectIntervalNone, TCallBack(CMTPCopyObject::OnTimeoutL, this)); - - __FLOG(_L8("CopyFileL - Exit")); + + OstTraceFunctionExit0( CMTPCOPYOBJECT_COPYFILEL_EXIT ); } /** @@ -193,13 +200,14 @@ */ TUint32 CMTPCopyObject::CopyFolderL(const TDesC& aNewFolderName) { - __FLOG(_L8("CopyFolderL - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_COPYFOLDERL_ENTRY ); const TDesC& suid(iObjectInfo->DesC(CMTPObjectMetaData::ESuid)); TUint32 handle; if (iObjectInfo->Uint(CMTPObjectMetaData::EDataProviderId) == iFramework.DataProviderId()) { GetPreviousPropertiesL(suid); - User::LeaveIfError(iFramework.Fs().MkDir(aNewFolderName)); + LEAVEIFERROR(iFramework.Fs().MkDir(aNewFolderName), + OstTraceExt1( TRACE_ERROR, CMTPCOPYOBJECT_COPYFOLDERL, "create directory %S failed!", aNewFolderName)); SetPreviousPropertiesL(aNewFolderName); handle = UpdateObjectInfoL(aNewFolderName); } @@ -207,7 +215,7 @@ { handle = iFramework.ObjectMgr().HandleL(aNewFolderName); } - __FLOG(_L8("CopyFolderL - Exit")); + OstTraceFunctionExit0( CMTPCOPYOBJECT_COPYFOLDERL_EXIT ); return handle; } @@ -217,7 +225,7 @@ */ TMTPResponseCode CMTPCopyObject::CopyObjectL(TUint32& aNewHandle) { - __FLOG(_L8("CopyObjectL - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_COPYOBJECTL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; aNewHandle = KMTPHandleNone; @@ -241,7 +249,8 @@ else // It is a folder. { TFileName rightMostFolderName; - User::LeaveIfError(BaflUtils::MostSignificantPartOfFullName(suid, rightMostFolderName)); + LEAVEIFERROR(BaflUtils::MostSignificantPartOfFullName(suid, rightMostFolderName), + OstTraceExt1( TRACE_ERROR, CMTPCOPYOBJECT_COPYOBJECTL, "can't extract most significant part from %S", suid)); if((newObjectName.Length() + rightMostFolderName.Length() + 1) <= newObjectName.MaxLength()) { newObjectName.Append(rightMostFolderName); @@ -268,7 +277,7 @@ } CleanupStack::PopAndDestroy(); // newObjectName. - __FLOG(_L8("CopyObjectL - Exit")); + OstTraceFunctionExit0( CMTPCOPYOBJECT_COPYOBJECTL_EXIT ); return responseCode; } @@ -277,7 +286,7 @@ */ void CMTPCopyObject::GetParametersL() { - __FLOG(_L8("GetParametersL - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_GETPARAMETERSL_ENTRY ); __ASSERT_DEBUG(iRequestChecker, Panic(EMTPDpRequestCheckNull)); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); @@ -301,7 +310,7 @@ iDest = parentObjectInfo->DesC(CMTPObjectMetaData::ESuid).AllocL(); iNewParentHandle = parentObjectHandle; } - __FLOG(_L8("GetParametersL - Exit")); + OstTraceFunctionExit0( CMTPCOPYOBJECT_GETPARAMETERSL_EXIT ); } /** @@ -309,7 +318,7 @@ */ void CMTPCopyObject::SetDefaultParentObjectL() { - __FLOG(_L8("SetDefaultParentObjectL - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_SETDEFAULTPARENTOBJECTL_ENTRY ); const CMTPStorageMetaData& storageMetaData( iFramework.StorageMgr().StorageL(iStorageId) ); const TDesC& driveBuf( storageMetaData.DesC(CMTPStorageMetaData::EStorageSuid) ); @@ -318,7 +327,7 @@ iDest = driveBuf.AllocL(); iNewParentHandle = KMTPHandleNoParent; - __FLOG(_L8("SetDefaultParentObjectL - Exit")); + OstTraceFunctionExit0( CMTPCOPYOBJECT_SETDEFAULTPARENTOBJECTL_EXIT ); } /** @@ -326,16 +335,21 @@ */ TMTPResponseCode CMTPCopyObject::CanCopyObjectL(const TDesC& aOldName, const TDesC& aNewName) const { - __FLOG(_L8("CanCopyObjectL - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_CANCOPYOBJECTL_ENTRY ); TMTPResponseCode result = EMTPRespCodeOK; TEntry fileEntry; - User::LeaveIfError(iFramework.Fs().Entry(aOldName, fileEntry)); + LEAVEIFERROR(iFramework.Fs().Entry(aOldName, fileEntry), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPCOPYOBJECT_CANCOPYOBJECTL, "Can't get entry details for %S", aOldName )); TInt drive(iFramework.StorageMgr().DriveNumber(iStorageId)); - User::LeaveIfError(drive); + LEAVEIFERROR(drive, + OstTraceExt2( TRACE_ERROR, DUP2_CMTPCOPYOBJECT_CANCOPYOBJECTL, + "Get driver number for storage %d failed! error code %d", iStorageId, drive)); + TVolumeInfo volumeInfo; - User::LeaveIfError(iFramework.Fs().Volume(volumeInfo, drive)); - + LEAVEIFERROR(iFramework.Fs().Volume(volumeInfo, drive), + OstTrace1( TRACE_ERROR, DUP3_CMTPCOPYOBJECT_CANCOPYOBJECTL, "can't get volume information for driver %d", drive)); + #ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API if(volumeInfo.iFree < fileEntry.FileSize()) #else @@ -348,7 +362,8 @@ { result = EMTPRespCodeInvalidParentObject; } - __FLOG_VA((_L8("CanCopyObjectL - Exit with response code 0x%04X"), result)); + OstTrace1( TRACE_NORMAL, CMTPCOPYOBJECT_CANCOPYOBJECTL, "response code 0x%04X", result ); + OstTraceFunctionExit0( CMTPCOPYOBJECT_CANCOPYOBJECTL_EXIT ); return result; } @@ -357,9 +372,17 @@ */ void CMTPCopyObject::GetPreviousPropertiesL(const TDesC& aFileName) { - __FLOG(_L8("GetPreviousPropertiesL - Entry")); - User::LeaveIfError(iFramework.Fs().Modified(aFileName, iPreviousModifiedTime)); - __FLOG(_L8("GetPreviousPropertiesL - Exit")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_GETPREVIOUSPROPERTIESL_ENTRY ); + LEAVEIFERROR(iFramework.Fs().Modified(aFileName, iPreviousModifiedTime), + OstTraceExt1( TRACE_ERROR, CMTPCOPYOBJECT_GETPREVIOUSPROPERTIESL, "Can't get the last modification date and time for %S", aFileName)); + if ( iIsFolder ) + { + TEntry fileEntry; + User::LeaveIfError(iFramework.Fs().Entry( aFileName, fileEntry )); + iIsHidden = fileEntry.IsHidden(); + } + + OstTraceFunctionExit0( CMTPCOPYOBJECT_GETPREVIOUSPROPERTIESL_EXIT ); } /** @@ -367,9 +390,18 @@ */ void CMTPCopyObject::SetPreviousPropertiesL(const TDesC& aFileName) { - __FLOG(_L8("SetPreviousPropertiesL - Entry")); - User::LeaveIfError(iFramework.Fs().SetModified(aFileName, iPreviousModifiedTime)); - __FLOG(_L8("SetPreviousPropertiesL - Exit")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_SETPREVIOUSPROPERTIESL_ENTRY ); + LEAVEIFERROR(iFramework.Fs().SetModified(aFileName, iPreviousModifiedTime), + OstTraceExt1( TRACE_ERROR, CMTPCOPYOBJECT_SETPREVIOUSPROPERTIESL, "Sets the date and time for %S failed", aFileName)); + if ( iIsFolder && iIsHidden ) + { + TEntry fileEntry; + User::LeaveIfError(iFramework.Fs().Entry( aFileName, fileEntry )); + fileEntry.iAtt &= ~KEntryAttHidden; + fileEntry.iAtt |= KEntryAttHidden; + User::LeaveIfError(iFramework.Fs().SetAtt( aFileName, fileEntry.iAtt, ~fileEntry.iAtt)); + } + OstTraceFunctionExit0( CMTPCOPYOBJECT_SETPREVIOUSPROPERTIESL_EXIT ); } /** @@ -377,7 +409,7 @@ */ TUint32 CMTPCopyObject::UpdateObjectInfoL(const TDesC& aNewObjectName) { - __FLOG(_L8("UpdateObjectInfoL - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_UPDATEOBJECTINFOL_ENTRY ); // We should not modify this object's handle, so just get a "copy". CMTPObjectMetaData* objectInfo(CMTPObjectMetaData::NewLC()); @@ -392,13 +424,13 @@ } else { + OstTrace0( TRACE_ERROR, CMTPCOPYOBJECT_UPDATEOBJECTINFOL, "the specified object handle doesn't exist"); User::Leave(KErrCorrupt); } TUint32 handle = objectInfo->Uint(CMTPObjectMetaData::EHandle); CleanupStack::PopAndDestroy(objectInfo); - __FLOG(_L8("UpdateObjectInfoL - Exit")); - + OstTraceFunctionExit0( CMTPCOPYOBJECT_UPDATEOBJECTINFOL_EXIT ); return handle; } @@ -416,7 +448,7 @@ void CMTPCopyObject::DoOnTimeoutL() { - __FLOG(_L8("DoOnTimeoutL - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_DOONTIMEOUTL_ENTRY ); if (iTimer) { @@ -430,7 +462,9 @@ const TDesC& suid(iObjectInfo->DesC(CMTPObjectMetaData::ESuid)); TEntry fileEntry; - User::LeaveIfError(iFramework.Fs().Entry(suid, fileEntry)); + LEAVEIFERROR(iFramework.Fs().Entry(suid, fileEntry), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPCOPYOBJECT_DOONTIMEOUTL, "Gets the entry details for %S failed!", suid)); + TUint32 handle = KMTPHandleNone; handle = UpdateObjectInfoL(*iNewFileName); CMTPFSEntryCache& aCache = iDpSingletons.CopyingBigFileCache(); @@ -439,11 +473,12 @@ aCache.SetOnGoing(ETrue); aCache.SetTargetHandle(handle); aCache.SetFileEntry(fileEntry); - - __FLOG_VA((_L8("UpdateFSEntryCache, sending response with handle=%d, respond code OK for a big file copy"), handle)); + + OstTrace1( TRACE_NORMAL, CMTPCOPYOBJECT_DOONTIMEOUTL, + "UpdateFSEntryCache, sending response with handle=%d, respond code OK for a big file copy", handle ); SendResponseL(EMTPRespCodeOK, 1, &handle); - __FLOG(_L8("DoOnTimeoutL - Exit")); + OstTraceFunctionExit0( CMTPCOPYOBJECT_DOONTIMEOUTL_EXIT ); } /** @@ -451,15 +486,16 @@ */ void CMTPCopyObject::RunL() { - __FLOG(_L8("RunL - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_RUNL_ENTRY ); - User::LeaveIfError(iStatus.Int()); + LEAVEIFERROR(iStatus.Int(), + OstTrace1( TRACE_ERROR, DUP2_CMTPCOPYOBJECT_RUNL, "wrong istatus %d", iStatus.Int())); SetPreviousPropertiesL(*iNewFileName); CMTPFSEntryCache& aCache = iDpSingletons.CopyingBigFileCache(); // Check to see if we are copying a big file if(aCache.IsOnGoing()) { - __FLOG(_L8("RunL - Big file copy complete")); + OstTrace0( TRACE_NORMAL, CMTPCOPYOBJECT_RUNL, "RunL - Big file copy complete" ); aCache.SetOnGoing(EFalse); aCache.SetTargetHandle(KMTPHandleNone); } @@ -477,10 +513,11 @@ } TUint32 handle = UpdateObjectInfoL(*iNewFileName); - __FLOG_VA((_L8("RunL, sending response with handle=%d, respond code OK for a normal file copy"), handle)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPCOPYOBJECT_RUNL, + "RunL, sending response with handle=%d, respond code OK for a normal file copy", handle ); SendResponseL(EMTPRespCodeOK, 1, &handle); } - __FLOG(_L8("RunL - Exit")); + OstTraceFunctionExit0( CMTPCOPYOBJECT_RUNL_EXIT ); } /** @@ -489,15 +526,18 @@ */ TBool CMTPCopyObject::DoHandleCompletingPhaseL() { + OstTraceFunctionEntry0( CMTPCOPYOBJECT_DOHANDLECOMPLETINGPHASEL_ENTRY ); CMTPRequestProcessor::DoHandleCompletingPhaseL(); CMTPFSEntryCache& aCache = iDpSingletons.CopyingBigFileCache(); if(aCache.IsOnGoing()) { + OstTraceFunctionExit0( CMTPCOPYOBJECT_DOHANDLECOMPLETINGPHASEL_EXIT ); return EFalse; } else { + OstTraceFunctionExit0( DUP1_CMTPCOPYOBJECT_DOHANDLECOMPLETINGPHASEL_EXIT ); return ETrue; } } @@ -510,13 +550,13 @@ */ TBool CMTPCopyObject::Match(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) const { - __FLOG(_L8("Match - Entry")); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_MATCH_ENTRY ); TBool result = EFalse; TUint16 operationCode = aRequest.Uint16(TMTPTypeRequest::ERequestOperationCode); if ((operationCode == EMTPOpCodeCopyObject) && &iConnection == &aConnection) { result = ETrue; } - __FLOG_VA((_L8("Match -- Exit with result = %d"), result)); + OstTraceFunctionExit0( CMTPCOPYOBJECT_MATCH_EXIT ); return result; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpdeleteobject.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpdeleteobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpdeleteobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,10 +27,14 @@ #include "cmtpdeleteobject.h" #include "mtpdpconst.h" #include "mtpdppanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdeleteobjectTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"DeleteObject");) /** Verification data for the DeleteObject request @@ -68,10 +72,9 @@ void CMTPDeleteObject::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECT_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPDELETEOBJECT_CONSTRUCTL_EXIT ); } /** @@ -79,10 +82,9 @@ */ EXPORT_C CMTPDeleteObject::~CMTPDeleteObject() { - __FLOG(_L8("~CMTPDeleteObject - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECT_CMTPDELETEOBJECT_DES_ENTRY ); iSingletons.Close(); - __FLOG(_L8("~CMTPDeleteObject - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPDELETEOBJECT_CMTPDELETEOBJECT_DES_EXIT ); } /** @@ -93,7 +95,7 @@ TMTPResponseCode CMTPDeleteObject::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECT_CHECKREQUESTL_ENTRY ); TMTPResponseCode result = CMTPRequestProcessor::CheckRequestL(); const TUint32 KObjectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); if ((EMTPRespCodeOK == result) && (IsStoreReadOnlyL(KObjectHandle)) ) @@ -101,7 +103,7 @@ result = EMTPRespCodeStoreReadOnly; } - __FLOG(_L8("CheckRequestL - Exit")); + OstTraceFunctionExit0( CMTPDELETEOBJECT_CHECKREQUESTL_EXIT ); return result; } @@ -110,12 +112,12 @@ __ASSERT_DEBUG(aMeta, Panic(EMTPDpObjectNull)); if (IsFolderObject(*aMeta)) { - __FLOG( _L8("Delete the folder itself which is empty ") ); + OstTrace0( TRACE_NORMAL, CMTPDELETEOBJECT_DELETEFOLDERORFILEL, "Delete the folder itself which is empty " ); DeleteFolderL(aMeta); } else { - __FLOG(_L8("Going to delete a file.")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPDELETEOBJECT_DELETEFOLDERORFILEL, "Going to delete a file." ); DeleteFileL(aMeta); } ProcessFinalPhaseL(); @@ -176,7 +178,7 @@ */ void CMTPDeleteObject::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECT_SERVICEL_ENTRY ); const TUint32 KHandle(Request().Uint32(TMTPTypeRequest::ERequestParameter1)); iObjectWritePotected = EFalse; iSuccessDeletion = EFalse; @@ -184,9 +186,10 @@ CMTPObjectMetaData* meta = NULL; meta = iRequestChecker->GetObjectInfo(KHandle); __ASSERT_DEBUG(meta, Panic(EMTPDpObjectNull)); - __FLOG_VA((_L8("meta->Uint(CMTPObjectMetaData::EDataProviderId) is %d"), meta->Uint(CMTPObjectMetaData::EDataProviderId))); - __FLOG_VA((_L8("iFramework.DataProviderId() is %d"), iFramework.DataProviderId())); - + OstTrace1( TRACE_NORMAL, CMTPDELETEOBJECT_SERVICEL, + "meta->Uint(CMTPObjectMetaData::EDataProviderId) is %d", meta->Uint(CMTPObjectMetaData::EDataProviderId)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPDELETEOBJECT_SERVICEL, "iFramework.DataProviderId() is %d", iFramework.DataProviderId() ); + if ( meta != NULL && meta->Uint(CMTPObjectMetaData::EDataProviderId) == iFramework.DataProviderId()) { DeleteFolderOrFileL(meta); @@ -195,8 +198,8 @@ { SendResponseL(EMTPRespCodeInvalidObjectHandle); } - - __FLOG(_L8("ServiceL - Exit")); + + OstTraceFunctionExit0( CMTPDELETEOBJECT_SERVICEL_EXIT ); } /** @@ -204,7 +207,7 @@ */ void CMTPDeleteObject::ProcessFinalPhaseL() { - __FLOG(_L8("ProcessFinalPhaseL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECT_PROCESSFINALPHASEL_ENTRY ); TMTPResponseCode rsp = EMTPRespCodeOK; if ( iObjectWritePotected ) { @@ -215,7 +218,7 @@ rsp = EMTPRespCodeAccessDenied; } SendResponseL(rsp); - __FLOG(_L8("ProcessFinalPhaseL - Exit")); + OstTraceFunctionExit0( CMTPDELETEOBJECT_PROCESSFINALPHASEL_EXIT ); } /** @@ -236,7 +239,7 @@ */ TBool CMTPDeleteObject::IsStoreReadOnlyL(TUint32 aObjectHandle) { - __FLOG(_L8("IsStoreReadOnlyL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECT_ISSTOREREADONLYL_ENTRY ); TBool result(EFalse); CMTPObjectMetaData *info(CMTPObjectMetaData::NewLC()); if (iFramework.ObjectMgr().ObjectL(aObjectHandle, *info)) @@ -244,7 +247,7 @@ result = !iSingletons.StorageMgr().IsReadWriteStorage(info->Uint(CMTPObjectMetaData::EStorageId)); } CleanupStack::PopAndDestroy(info); - __FLOG(_L8("IsStoreReadOnlyL - Exit")); + OstTraceFunctionExit0( CMTPDELETEOBJECT_ISSTOREREADONLYL_EXIT ); return result; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpfsentrycache.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpfsentrycache.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpfsentrycache.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -16,9 +16,12 @@ #include #include "cmtpfsentrycache.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpfsentrycacheTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"MTPFSEntryCache");) // ----------------------------------------------------------------------------- // CMTPFSEntryCache::NewL @@ -36,9 +39,8 @@ EXPORT_C CMTPFSEntryCache::~CMTPFSEntryCache() { - __FLOG(_L8("~CMTPFSEntryCache - Entry")); - __FLOG(_L8("~CMTPFSEntryCache - Exit")); - __FLOG_CLOSE; + OstTraceFunctionEntry0( CMTPFSENTRYCACHE_CMTPFSENTRYCACHE_DES_ENTRY ); + OstTraceFunctionExit0( CMTPFSENTRYCACHE_CMTPFSENTRYCACHE_DES_EXIT ); } EXPORT_C TBool CMTPFSEntryCache::IsOnGoing() const @@ -48,9 +50,9 @@ EXPORT_C void CMTPFSEntryCache::SetOnGoing(TBool aOnGoing) { - __FLOG(_L8("SetOnGoing - Entry")); + OstTraceFunctionEntry0( CMTPFSENTRYCACHE_SETONGOING_ENTRY ); iIsOngoing = aOnGoing; - __FLOG(_L8("SetOnGoing - Exit")); + OstTraceFunctionExit0( CMTPFSENTRYCACHE_SETONGOING_EXIT ); } EXPORT_C TUint32 CMTPFSEntryCache::TargetHandle() const @@ -60,9 +62,9 @@ EXPORT_C void CMTPFSEntryCache::SetTargetHandle(TUint32 aHandle) { - __FLOG(_L8("SetTargetHandle - Entry")); + OstTraceFunctionEntry0( CMTPFSENTRYCACHE_SETTARGETHANDLE_ENTRY ); iTargetHandle = aHandle; - __FLOG(_L8("SetTargetHandle - Exit")); + OstTraceFunctionExit0( CMTPFSENTRYCACHE_SETTARGETHANDLE_EXIT ); } EXPORT_C TEntry& CMTPFSEntryCache::FileEntry() @@ -72,18 +74,17 @@ EXPORT_C void CMTPFSEntryCache::SetFileEntry(const TEntry& aEntry) { - __FLOG(_L8("SetFileEntry - Entry")); + OstTraceFunctionEntry0( CMTPFSENTRYCACHE_SETFILEENTRY_ENTRY ); iFileEntry = aEntry; - __FLOG(_L8("SetFileEntry - Exit")); + OstTraceFunctionExit0( CMTPFSENTRYCACHE_SETFILEENTRY_EXIT ); } CMTPFSEntryCache::CMTPFSEntryCache():iIsOngoing(EFalse), iTargetHandle(KMTPHandleNone) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPFSEntryCache - Entry")); - __FLOG(_L8("CMTPFSEntryCache - Exit")); } void CMTPFSEntryCache::ConstructL() { + OstTraceFunctionEntry0( CMTPFSENTRYCACHE_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPFSENTRYCACHE_CONSTRUCTL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpfsenumerator.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpfsenumerator.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpfsenumerator.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -28,10 +28,15 @@ #include "cmtpdataprovidercontroller.h" #include "cmtpdataprovider.h" #include "mtpframeworkconst.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpfsenumeratorTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"FSEnumerator");) /* * @@ -81,6 +86,7 @@ */ EXPORT_C CMTPFSEnumerator::~CMTPFSEnumerator() { + OstTraceFunctionEntry0( CMTPFSENUMERATOR_CMTPFSENUMERATOR_DES_ENTRY ); Cancel(); iDir.Close(); iDirStack.Close(); @@ -88,7 +94,7 @@ iDpSingletons.Close(); iSingletons.Close(); delete iObject; - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPFSENUMERATOR_CMTPFSENUMERATOR_DES_EXIT ); } /** @@ -109,7 +115,7 @@ { iObjectNeedToScan = KMAX_FILECOUNT_ENUMERATINGPHASE1; } - __FLOG_VA((_L8("iScanAll %d files %d Storage 0x%x"), iScanAll, iObjectNeedToScan, aStorageId)); + OstTraceExt3(TRACE_NORMAL, CMTPFSENUMERATOR_STARTL, "iScanAll %d files %d Storage 0x%x", (TInt32)iScanAll, (TInt32)iObjectNeedToScan, aStorageId); MMTPStorageMgr& storageMgr(iFramework.StorageMgr()); if (aStorageId == KMTPStorageAll) { @@ -123,7 +129,8 @@ for (TUint i(0); (i < KCount); i++) { iStorages.InsertL(storages[i]->Uint(CMTPStorageMetaData::EStorageId),0); - __FLOG_VA((_L8("FileEnumerator is doing storage id = %x\r\n"), storages[i]->Uint(CMTPStorageMetaData::EStorageId) )); + OstTrace1( TRACE_NORMAL, DUP1_CMTPFSENUMERATOR_STARTL, + "FileEnumerator is doing storage id = %x\r\n", storages[i]->Uint(CMTPStorageMetaData::EStorageId)); } CleanupStack::PopAndDestroy(&storages); } @@ -164,7 +171,7 @@ { //Scan storage leave because storage(memory card) removed. //Scan next specified storage in RunL, if there is. - __FLOG_VA(_L8("StartL - iSkipCurrentStorage - ETrue.")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPFSENUMERATOR_STARTL, "StartL - iSkipCurrentStorage - ETrue." ); iSkipCurrentStorage = ETrue; TRequestStatus* status = &iStatus; User::RequestComplete(status, iStatus.Int()); @@ -172,6 +179,7 @@ } else { + OstTrace1(TRACE_ERROR, DUP3_CMTPFSENUMERATOR_STARTL, "invalid storage %d", iStorages[iScanPos]); User::Leave(err); } } @@ -198,22 +206,23 @@ void CMTPFSEnumerator::ScanStorageL(TUint32 aStorageId) { - __FLOG_VA(_L8("ScanStorageL - entry")); + OstTraceFunctionEntry0( CMTPFSENUMERATOR_SCANSTORAGEL_ENTRY ); const CMTPStorageMetaData& storage(iFramework.StorageMgr().StorageL(aStorageId)); __ASSERT_DEBUG((storage.Uint(CMTPStorageMetaData::EStorageSystemType) == CMTPStorageMetaData::ESystemTypeDefaultFileSystem), User::Invariant()); TFileName root(storage.DesC(CMTPStorageMetaData::EStorageSuid)); - #ifdef __FLOG_ACTIVE + #ifdef OST_TRACE_COMPILER_IN_USE TBuf8 tmp; tmp.Copy(root); - __FLOG_VA((_L8("StorageSuid - %S"), &tmp)); - #endif // __FLOG_ACTIVE + OstTraceExt1( TRACE_NORMAL, CMTPFSENUMERATOR_SCANSTORAGEL, "StorageSuid - %s", tmp ); + #endif // OST_TRACE_COMPILER_IN_USE if ( iExclusionMgr.IsFolderAcceptedL(root, aStorageId) ) { iParentHandle = KMTPHandleNoParent; iCurrentPath = root; - User::LeaveIfError(iDir.Open(iFramework.Fs(), iCurrentPath, KEntryAttNormal | KEntryAttHidden | KEntryAttDir)); + LEAVEIFERROR(iDir.Open(iFramework.Fs(), iCurrentPath, KEntryAttNormal | KEntryAttHidden | KEntryAttDir), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPFSENUMERATOR_SCANSTORAGEL, "open %S failed!", iCurrentPath )); ScanDirL(); } else @@ -222,7 +231,7 @@ User::RequestComplete(status, iStatus.Int()); SetActive(); } - __FLOG_VA(_L8("ScanStorageL - exit")); + OstTraceFunctionExit0( CMTPFSENUMERATOR_SCANSTORAGEL_EXIT ); } /** @@ -247,17 +256,17 @@ void CMTPFSEnumerator::ScanDirL() { - __FLOG_VA(_L8("ScanDirL - entry")); + OstTraceFunctionEntry0( CMTPFSENUMERATOR_SCANDIRL_ENTRY ); iFirstUnprocessed = 0; iDir.Read(iEntries, iStatus); SetActive(); - __FLOG_VA(_L8("ScanDirL - exit")); + OstTraceFunctionExit0( CMTPFSENUMERATOR_SCANDIRL_EXIT ); } void CMTPFSEnumerator::ScanNextStorageL() { + OstTraceFunctionEntry0( CMTPFSENUMERATOR_SCANNEXTSTORAGEL_ENTRY ); iDirStack.Reset(); - __FLOG_VA(_L8("ScanNextStorageL - entry")); // If there are one or more unscanned storages left // (the currently scanned one is still on the list) if (++ iScanPos < iStorages.Count()) @@ -297,12 +306,12 @@ } } } - __FLOG_VA(_L8("ScanNextStorageL - exit")); + OstTraceFunctionExit0( CMTPFSENUMERATOR_SCANNEXTSTORAGEL_EXIT ); } void CMTPFSEnumerator::ScanNextSubdirL() { - __FLOG_VA(_L8("ScanNextSubdirL - entry")); + OstTraceFunctionEntry0( CMTPFSENUMERATOR_SCANNEXTSUBDIRL_ENTRY ); // A empty (non-constructed) TEntry is our marker telling us to pop a directory // from iPath when we see this //iDirStack.AppendL(TEntry()); @@ -314,12 +323,13 @@ iParentHandle = iDirStack[iDirStack.Count() - 1].iHandle;//iFramework.ObjectMgr().HandleL(suid); iCurrentPath = iDirStack[iDirStack.Count() - 1].iPath; iDirStack.Remove(iDirStack.Count() - 1); - __FLOG_VA((_L8("ScanNextSubdirL path %S"), &iCurrentPath)); + OstTraceExt1( TRACE_NORMAL, CMTPFSENUMERATOR_SCANNEXTSUBDIRL, "ScanNextSubdirL path %S", iCurrentPath); // Kick-off a scan of the next directory iDir.Close(); - User::LeaveIfError(iDir.Open(iFramework.Fs(), iCurrentPath, KEntryAttNormal | KEntryAttHidden | KEntryAttDir)); + LEAVEIFERROR(iDir.Open(iFramework.Fs(), iCurrentPath, KEntryAttNormal | KEntryAttHidden | KEntryAttDir), + OstTraceExt1(TRACE_ERROR, DUP1_CMTPFSENUMERATOR_SCANNEXTSUBDIRL, "Open %S failed!", iCurrentPath)); ScanDirL(); - __FLOG_VA(_L8("ScanNextSubdirL - exit")); + OstTraceFunctionExit0( CMTPFSENUMERATOR_SCANNEXTSUBDIRL_EXIT ); } /** @@ -329,7 +339,7 @@ void CMTPFSEnumerator::ScanNextL() { - __FLOG_VA(_L8("ScanNextL - entry")); + OstTraceFunctionEntry0( CMTPFSENUMERATOR_SCANNEXTL_ENTRY ); TInt count = iDirStack.Count(); if ((count == 0) || !iScanAll) @@ -342,15 +352,15 @@ // Remove directory so we don't think it's a subdirectory ScanNextSubdirL(); } - __FLOG_VA(_L8("ScanNextL - exit")); + OstTraceFunctionExit0( CMTPFSENUMERATOR_SCANNEXTL_EXIT ); } void CMTPFSEnumerator::RunL() { - __FLOG_VA(_L8("RunL - entry")); + OstTraceFunctionEntry0( CMTPFSENUMERATOR_RUNL_ENTRY ); if(iSkipCurrentStorage) { - __FLOG_VA(_L8("RunL - iSkipCurrentStorage - ETrue.")); + OstTrace0( TRACE_NORMAL, CMTPFSENUMERATOR_RUNL, "RunL - iSkipCurrentStorage - ETrue." ); iSkipCurrentStorage = EFalse; ScanNextStorageL(); } @@ -387,7 +397,7 @@ break; } } - __FLOG_VA(_L8("RunL - exit")); + OstTraceFunctionExit0( CMTPFSENUMERATOR_RUNL_EXIT ); } /** @@ -395,14 +405,15 @@ */ TInt CMTPFSEnumerator::RunError(TInt aError) { - __FLOG_VA((_L8("RunError - entry with error %d"), aError)); + OstTraceFunctionEntry0( CMTPFSENUMERATOR_RUNERROR_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPFSENUMERATOR_RUNERROR, "with error %d", aError); // avoid to access overflow of iStorages if (iScanPos < iStorages.Count()) { if(!iFramework.StorageMgr().ValidStorageId(iStorages[iScanPos])) { - __FLOG_VA((_L8("Invalid StorageID = %d"),iStorages[iScanPos] )); + OstTrace1( TRACE_WARNING, DUP1_CMTPFSENUMERATOR_RUNERROR, "Invalid StorageID = %d",iStorages[iScanPos] ); if (iStorages.Count()>1) { //Not necessary to process any entry on the storage, since the storage removed. @@ -422,8 +433,8 @@ TRequestStatus* status = &iStatus; User::RequestComplete(status, aError); SetActive(); - - __FLOG(_L8("RunError - Exit")); + + OstTraceFunctionExit0( CMTPFSENUMERATOR_RUNERROR_EXIT ); return KErrNone; } @@ -437,16 +448,17 @@ iCallback(aCallback), iProcessLimit(aProcessLimit) { - __FLOG_OPEN(KMTPSubsystem, KComponent); CActiveScheduler::Add(this); } void CMTPFSEnumerator::ConstructL() { + OstTraceFunctionEntry0( CMTPFSENUMERATOR_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); iDpSingletons.OpenL(iFramework); iObject = CMTPObjectMetaData::NewL(); iDpID = iFramework.DataProviderId(); + OstTraceFunctionExit0( CMTPFSENUMERATOR_CONSTRUCTL_EXIT ); } /** @@ -467,14 +479,16 @@ TInt len = entry.iName.Length(); if(iCurrentPath.Length() + len > KMaxFileName) { - __FLOG_VA(_L8("Full name exceeds KMaxFileName, ignored.")); + OstTrace0( TRACE_WARNING, CMTPFSENUMERATOR_PROCESSENTRIESL, "Full name exceeds KMaxFileName, ignored." ); continue; } iCurrentPath.Append(entry.iName); - __FLOG_VA((_L("Process path %S name %S"), &iCurrentPath, &entry.iName)); -#ifdef __FLOG_ACTIVE + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPFSENUMERATOR_PROCESSENTRIESL, + "Process path %S name %S", iCurrentPath, entry.iName ); + +#ifdef OST_TRACE_COMPILER_IN_USE TBuf8 tmp; tmp.Copy(iCurrentPath); TInt pathLen=iCurrentPath.Length(); @@ -482,18 +496,19 @@ { TBuf8 tmp1; tmp1.Copy(tmp.Ptr(),KLogBufferSize); - __FLOG_VA(_L8("Entry - ")); - __FLOG_VA((_L8("%S"), &tmp1)); + OstTrace0( TRACE_NORMAL, DUP2_CMTPFSENUMERATOR_PROCESSENTRIESL, "Entry - " ); + OstTraceExt1( TRACE_NORMAL, DUP3_CMTPFSENUMERATOR_PROCESSENTRIESL, "%s", tmp1); + tmp1.Copy(tmp.Ptr()+KLogBufferSize, pathLen-KLogBufferSize); - __FLOG_VA((_L8("%S"), &tmp1)); + OstTraceExt1( TRACE_NORMAL, DUP4_CMTPFSENUMERATOR_PROCESSENTRIESL, "%s", tmp1); } else { - __FLOG_VA(_L8("Entry - ")); - __FLOG_VA((_L8("%S"), &tmp)); + OstTrace0( TRACE_NORMAL, DUP5_CMTPFSENUMERATOR_PROCESSENTRIESL, "Entry - " ); + OstTraceExt1( TRACE_NORMAL, DUP6_CMTPFSENUMERATOR_PROCESSENTRIESL, "%s", tmp); } -#endif // __FLOG_ACTIVE +#endif // OST_TRACE_COMPILER_IN_USE TUint32 handle = 0; TMTPFormatCode format; @@ -554,9 +569,9 @@ CleanupStack::PushL(mime); if ( mime != NULL ) { - __FLOG_VA((_L("mime %S"), mime)); + OstTraceExt1( TRACE_NORMAL, DUP7_CMTPFSENUMERATOR_PROCESSENTRIESL, "mime %S", *mime ); DpId = iDpSingletons.MTPUtility().GetDpIdL(parse.Ext().Mid(1),*mime); - __FLOG_VA((_L("DpId find %d"), DpId)); + OstTrace1( TRACE_NORMAL, DUP8_CMTPFSENUMERATOR_PROCESSENTRIESL, "DpId find %d", DpId ); format = iDpSingletons.MTPUtility().GetFormatCodeByMimeTypeL(parse.Ext().Mid(1),*mime); AddFileEntryForOtherDpL(iCurrentPath, handle, format, DpId, entry, iStorages[iScanPos], @@ -600,12 +615,13 @@ */ void CMTPFSEnumerator::AddEntryL(const TDesC& aPath, TUint32 &aHandle, TMTPFormatCode format, TUint32 aDPId, const TEntry& aEntry, TUint32 aStorageId, TUint32 aParentHandle) { -#ifdef __FLOG_ACTIVE + OstTraceFunctionEntry0( CMTPFSENUMERATOR_ADDENTRYL_ENTRY ); +#ifdef OST_TRACE_COMPILER_IN_USE TBuf8 tmp; tmp.Copy(aPath); - __FLOG_VA((_L8("AddEntryL - entry: %S"), &tmp)); -#endif // __FLOG_ACTIVE + OstTraceExt1( TRACE_NORMAL, CMTPFSENUMERATOR_ADDENTRYL, "entry: %s", tmp ); +#endif // OST_TRACE_COMPILER_IN_USE TUint16 assoc; TPtrC name; @@ -638,17 +654,18 @@ aHandle = iObject->Uint(CMTPObjectMetaData::EHandle); } - __FLOG_VA(_L8("AddEntryL - exit")); + OstTraceFunctionExit0( CMTPFSENUMERATOR_ADDENTRYL_EXIT ); } void CMTPFSEnumerator::AddFileEntryForOtherDpL(const TDesC& aPath, TUint32 &aHandle, TMTPFormatCode format, TUint32 aDPId, const TEntry& /*aEntry*/, TUint32 aStorageId, TUint32 aParentHandle, TUint16 aSubFormatCode/* = 0*/) { -#ifdef __FLOG_ACTIVE + OstTraceFunctionEntry0( CMTPFSENUMERATOR_ADDFILEENTRYFOROTHERDPL_ENTRY ); +#ifdef OST_TRACE_COMPILER_IN_USE TBuf8 tmp; tmp.Copy(aPath); - __FLOG_VA((_L8("AddFileEntryForOtherDpL - entry: %S"), &tmp)); -#endif // __FLOG_ACTIVE + OstTraceExt1( TRACE_NORMAL, CMTPFSENUMERATOR_ADDFILEENTRYFOROTHERDPL, "%S", tmp ); +#endif // OST_TRACE_COMPILER_IN_USE TParsePtrC pathParser(aPath); TPtrC name(pathParser.Name()); @@ -664,7 +681,7 @@ iObject->SetUint(CMTPObjectMetaData::ENonConsumable, EMTPConsumable); iObject->SetDesCL(CMTPObjectMetaData::EName, name); iFramework.ObjectMgr().InsertObjectL(*iObject); - __FLOG_VA(_L8("AddEntryL - exit")); + OstTraceFunctionExit0( CMTPFSENUMERATOR_ADDFILEENTRYFOROTHERDPL_EXIT ); } void CMTPFSEnumerator::NotifyObjectAddToDP(const TUint32 aHandle,const TUint DpId) diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpfsexclusionmgr.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpfsexclusionmgr.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpfsexclusionmgr.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,22 +20,23 @@ #include #include #include +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpfsexclusionmgrTraces.h" +#endif + //[SP-Format-0x3002] //The full path of DDISCVRY.DPS of PictBridge DP. _LIT(KFullNameOfPictBridgeDiscovery, "C:\\DATA\\DDISCVRY.DPS"); -__FLOG_STMT(_LIT8(KComponent,"CMTPFSExclusionMgr");) - EXPORT_C CMTPFSExclusionMgr::CMTPFSExclusionMgr(MMTPDataProviderFramework& aFramework) : iFramework(aFramework), iOrder(CMTPMetaData::CompareTPathHash) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } EXPORT_C CMTPFSExclusionMgr::~CMTPFSExclusionMgr() { - __FLOG_CLOSE; } EXPORT_C TBool CMTPFSExclusionMgr::IsFolderAcceptedL(const TDesC& aPath, TUint32 aStorageId) const @@ -45,7 +46,7 @@ EXPORT_C TBool CMTPFSExclusionMgr::IsFileAcceptedL(const TDesC& aPath, TUint32 /*aStorageId*/) const { - __FLOG(_L8("IsFileAcceptedL - Entry")); + OstTraceFunctionEntry0( CMTPFSEXCLUSIONMGR_ISFILEACCEPTEDL_ENTRY ); TBool accepted = ETrue; TParsePtrC parse(aPath); @@ -53,7 +54,7 @@ if (parse.ExtPresent()) { accepted = IsExtensionValid(parse.Ext().Mid(1)); - __FLOG_VA((_L8("IsExtensionValid = %d"), accepted)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPFSEXCLUSIONMGR_ISFILEACCEPTEDL, "IsExtensionValid = %d", accepted ); } //[SP-Format-0x3002] @@ -67,12 +68,14 @@ accepted = EFalse; } } - __FLOG_VA((_L8("Exit IsFileAcceptedL = %d"), accepted)); + OstTrace1( TRACE_NORMAL, CMTPFSEXCLUSIONMGR_ISFILEACCEPTEDL, "IsFileAcceptedL = %d", accepted); + OstTraceFunctionExit0( CMTPFSEXCLUSIONMGR_ISFILEACCEPTEDL_EXIT ); return accepted; } EXPORT_C TBool CMTPFSExclusionMgr::IsPathAcceptedL(const TDesC& aPath, TUint32 aStorageId) const { + OstTraceFunctionEntry0( CMTPFSEXCLUSIONMGR_ISPATHACCEPTEDL_ENTRY ); CMTPStorageMetaData* storageMetaData = (CMTPStorageMetaData *)& iFramework.StorageMgr().StorageL(aStorageId); TBool accepted = EFalse; @@ -105,5 +108,7 @@ } } + OstTrace1( TRACE_NORMAL, CMTPFSEXCLUSIONMGR_ISPATHACCEPTEDL, "IsPathAcceptedL = %d", accepted); + OstTraceFunctionExit0( CMTPFSEXCLUSIONMGR_ISPATHACCEPTEDL_EXIT ); return accepted; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpfullenumservicehandler.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpfullenumservicehandler.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpfullenumservicehandler.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -25,9 +25,13 @@ #include "mtpsvcdpconst.h" #include "cmtpfullenumservicehandler.h" #include "cmtpabstractdatacodemgr.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpfullenumservicehandlerTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent, "FullEnumServiceHandler");) + EXPORT_C CMTPFullEnumServiceHandler* CMTPFullEnumServiceHandler::NewL(MMTPDataProviderFramework& aFramework, const CMTPFullEnumDataCodeMgr& aDataCodeMgr, @@ -47,8 +51,8 @@ EXPORT_C CMTPFullEnumServiceHandler::~CMTPFullEnumServiceHandler() { - __FLOG(_L8("~CMTPFullEnumServiceHandler - Destructed")); - __FLOG_CLOSE; + OstTraceFunctionEntry0( CMTPFULLENUMSERVICEHANDLER_CMTPFULLENUMSERVICEHANDLER_DES_ENTRY ); + OstTraceFunctionExit0( CMTPFULLENUMSERVICEHANDLER_CMTPFULLENUMSERVICEHANDLER__DES_EXIT ); } CMTPFullEnumServiceHandler::CMTPFullEnumServiceHandler(MMTPDataProviderFramework& aFramework, @@ -63,18 +67,17 @@ void CMTPFullEnumServiceHandler::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMSERVICEHANDLER_CONSTRUCTL_ENTRY ); // Initialize the service properties's value stored in iRepository LoadServicePropValueL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPFULLENUMSERVICEHANDLER_CONSTRUCTL_EXIT ); } // GetServiceCapabilities EXPORT_C TMTPResponseCode CMTPFullEnumServiceHandler::GetServiceCapabilityL( TUint16 aServiceFormatCode, CMTPTypeServiceCapabilityList& aServiceCapabilityList) const { - __FLOG(_L8("GetServiceCapabilitiesL - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMSERVICEHANDLER_GETSERVICECAPABILITYL_ENTRY ); __ASSERT_DEBUG((aServiceFormatCode == iDataCodeMgr.KnowledgeFormat().iFormatCode), User::Invariant()); @@ -97,7 +100,7 @@ } // End of loop for every format aServiceCapabilityList.AppendL(element); CleanupStack::Pop(element); - __FLOG(_L8("GetServiceCapabilitiesL - Exit")); + OstTraceFunctionExit0( CMTPFULLENUMSERVICEHANDLER_GETSERVICECAPABILITYL_EXIT ); return EMTPRespCodeOK; } @@ -105,7 +108,7 @@ EXPORT_C TMTPResponseCode CMTPFullEnumServiceHandler::GetServicePropDescL( TUint16 aServicePropertyCode, CMTPTypeServicePropDescList& aPropDescList) const { - __FLOG(_L8("GetServicePropDescL - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMSERVICEHANDLER_GETSERVICEPROPDESCL_ENTRY ); TMTPResponseCode respCode(EMTPRespCodeOK); CMTPTypeServicePropDesc* servicePropDesc = NULL; const TMTPServicePropertyInfo* pPropInfo = iDataCodeMgr.ServicePropertyInfo(aServicePropertyCode); @@ -234,14 +237,14 @@ aPropDescList.AppendL(servicePropDesc); CleanupStack::Pop(servicePropDesc); } - __FLOG(_L8("GetServicePropDescL - Exit")); + OstTraceFunctionExit0( CMTPFULLENUMSERVICEHANDLER_GETSERVICEPROPDESCL_EXIT ); return respCode; } // Get specific property of the service EXPORT_C TMTPResponseCode CMTPFullEnumServiceHandler::GetServicePropetyL(TUint16 aPropertyCode, CMTPTypeServicePropList& aPropList) const { - __FLOG(_L8("GetServicePropetyL - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMSERVICEHANDLER_GETSERVICEPROPETYL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; const TMTPServicePropertyInfo* pPropInfo = iDataCodeMgr.ServicePropertyInfo(aPropertyCode); @@ -371,14 +374,15 @@ aPropList.AppendL(propertyElement); CleanupStack::Pop(propertyElement); } - __FLOG_VA((_L8("GetServicePropetyL - Exit with responseCode = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPFULLENUMSERVICEHANDLER_GETSERVICEPROPETYL, "responseCode = 0x%04X", responseCode); + OstTraceFunctionExit0( CMTPFULLENUMSERVICEHANDLER_GETSERVICEPROPETYL_EXIT ); return responseCode; } EXPORT_C TMTPResponseCode CMTPFullEnumServiceHandler::SetServicePropetyL( TUint16 aPropEnumIndex, const CMTPTypeServicePropListElement& aElement) { - __FLOG(_L8("SetServicePropetyL - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMSERVICEHANDLER_SETSERVICEPROPETYL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; TUint16 dataType = aElement.Uint16L(CMTPTypeServicePropListElement::EDatatype); @@ -472,13 +476,14 @@ responseCode = EMTPRespCodeInvalidServicePropCode; break; } //End of switch - __FLOG_VA((_L8("SetServicePropertyL - Exit with responseCode = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPFULLENUMSERVICEHANDLER_SETSERVICEPROPETYL, "responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPFULLENUMSERVICEHANDLER_SETSERVICEPROPETYL_EXIT ); return responseCode; } EXPORT_C TMTPResponseCode CMTPFullEnumServiceHandler::DeleteServiceProperty(TUint16 aPropEnumIndex) { - __FLOG(_L8("DeleteServiceProperty - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMSERVICEHANDLER_DELETESERVICEPROPERTY_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; switch (aPropEnumIndex) { @@ -523,33 +528,37 @@ default: { responseCode = EMTPRespCodeInvalidServicePropCode; - __FLOG(_L8("Invalid service propcode")); + OstTrace0( TRACE_ERROR, CMTPFULLENUMSERVICEHANDLER_DELETESERVICEPROPERTY, "Invalid service propcode" ); break; } } - __FLOG(_L8("DeleteServiceProperty - Exit")); + OstTraceFunctionExit0( CMTPFULLENUMSERVICEHANDLER_DELETESERVICEPROPERTY_EXIT ); return responseCode; } void CMTPFullEnumServiceHandler::LoadServicePropValueL() { - __FLOG(_L8("LoadServicePropValueL - Entry")); + OstTraceFunctionEntry0( CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL_ENTRY ); // Load ReplicaID: TPtr8 writeBuf(NULL, 0); //walkaroud for the TMTPTypeGuid iReplicateID.FirstWriteChunk(writeBuf); - User::LeaveIfError(iRepository.Get(EReplicaID, writeBuf)); + LEAVEIFERROR(iRepository.Get(EReplicaID, writeBuf), + OstTrace0( TRACE_ERROR, CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL, "Can't load ReplicaID from iRepository!")); //load LastSyncProxyID iLastSyncProxyID.FirstWriteChunk(writeBuf); - User::LeaveIfError(iRepository.Get(ELastSyncProxyID, writeBuf)); + LEAVEIFERROR(iRepository.Get(ELastSyncProxyID, writeBuf), + OstTrace0( TRACE_ERROR, DUP1_CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL, "Can't load LastSyncProxyID from iRepository!")); TInt value; // Load LocalOnlyDelete - User::LeaveIfError(iRepository.Get(ELocalOnlyDelete, value)); + LEAVEIFERROR(iRepository.Get(ELocalOnlyDelete, value), + OstTrace0( TRACE_ERROR, DUP2_CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL, "Can't load LocalOnlyDelete from iRepository!")); iLocalOnlyDelete = static_cast(value); // Load EFilterType - User::LeaveIfError(iRepository.Get(EFilterType, value)); + LEAVEIFERROR(iRepository.Get(EFilterType, value), + OstTrace0( TRACE_ERROR, DUP3_CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL, "Can't load FilterType from iRepository!")); iFilterType = static_cast(value); //Load SyncObjectReferenceEnabled @@ -558,10 +567,12 @@ TInt ret = iRepository.Get(ESyncObjectReference, value); if (ret != KErrNone && ret != KErrNotFound ) { + OstTrace1( TRACE_ERROR, DUP4_CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL, + "can't load SyncObjectReferenceEnabled from iRepository! error code %d", ret ); User::Leave(ret); } iSyncObjectReference = static_cast(value); - __FLOG(_L8("LoadServicePropValueL - Exit")); + OstTraceFunctionExit0( CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL_EXIT ); return; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetformatcapabilities.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetformatcapabilities.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetformatcapabilities.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -160,6 +160,12 @@ CleanupStack::PushL(nonConsumable); frmCap->AppendL(nonConsumable); CleanupStack::Pop(nonConsumable); + + //Hidden + CMTPTypeObjectPropDesc* hidden = ServiceHiddenL(); + CleanupStack::PushL( hidden ); + frmCap->AppendL( hidden ); + CleanupStack::Pop( hidden ); iCapabilityList->AppendL(frmCap); CleanupStack::Pop(frmCap); @@ -227,6 +233,11 @@ CleanupStack::PushL(nonConsumable); frmCap->AppendL(nonConsumable); CleanupStack::Pop(nonConsumable); + //Hidden + CMTPTypeObjectPropDesc* hidden = ServiceHiddenL(); + CleanupStack::PushL( hidden ); + frmCap->AppendL( hidden ); + CleanupStack::Pop( hidden ); iCapabilityList->AppendL(frmCap); CleanupStack::Pop(frmCap); @@ -295,6 +306,23 @@ return ret; } +CMTPTypeObjectPropDesc* CMTPGetFormatCapabilities::ServiceHiddenL() + { + CMTPTypeObjectPropDescEnumerationForm* expectedForm = CMTPTypeObjectPropDescEnumerationForm::NewL(EMTPTypeUINT16); + CleanupStack::PushL(expectedForm); + TUint16 values[] = {EMTPVisible, EMTPHidden}; + TUint numValues((sizeof(values) / sizeof(values[0]))); + for (TUint i = 0; i < numValues; i++) + { + TMTPTypeUint16 data(values[i]); + expectedForm->AppendSupportedValueL(data); + } + CMTPTypeObjectPropDesc* ret = CMTPTypeObjectPropDesc::NewL(EMTPObjectPropCodeHidden, *expectedForm); + CleanupStack::PopAndDestroy(expectedForm); + + return ret; + } + TMTPResponseCode CMTPGetFormatCapabilities::CheckRequestL() { TMTPResponseCode response = CMTPRequestProcessor::CheckRequestL(); diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobject.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -25,9 +25,11 @@ #include "cmtpgetobject.h" #include "mtpdppanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetobjectTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"GetObject");) /** Verification data for the GetNumObjects request @@ -58,10 +60,9 @@ */ EXPORT_C CMTPGetObject::~CMTPGetObject() { - __FLOG(_L8("~CMTPGetObject - Entry")); + OstTraceFunctionEntry0( CMTPGETOBJECT_CMTPGETOBJECT_DES_ENTRY ); delete iFileObject; - __FLOG(_L8("~CMTPGetObject - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPGETOBJECT_CMTPGETOBJECT_DES_EXIT ); } /** @@ -79,9 +80,8 @@ */ void CMTPGetObject::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPGETOBJECT_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPGETOBJECT_CONSTRUCTL_EXIT ); } /** @@ -89,7 +89,7 @@ */ void CMTPGetObject::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPGETOBJECT_SERVICEL_ENTRY ); __ASSERT_DEBUG(iRequestChecker, Panic(EMTPDpRequestCheckNull)); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); //does not take ownership @@ -118,7 +118,7 @@ SendResponseL(EMTPRespCodeAccessDenied); } } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPGETOBJECT_SERVICEL_EXIT ); } @@ -128,11 +128,11 @@ */ void CMTPGetObject::BuildFileObjectL(const TDesC& aFileName) { - __FLOG(_L8("BuildFileObjectL - Entry")); + OstTraceFunctionEntry0( CMTPGETOBJECT_BUILDFILEOBJECTL_ENTRY ); delete iFileObject; iFileObject = NULL; iFileObject = CMTPTypeFile::NewL(iFramework.Fs(), aFileName, EFileRead); - __FLOG(_L8("BuildFileObjectL - Exit")); + OstTraceFunctionExit0( CMTPGETOBJECT_BUILDFILEOBJECTL_EXIT ); } @@ -142,9 +142,9 @@ */ TBool CMTPGetObject::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPGETOBJECT_DOHANDLERESPONSEPHASEL_ENTRY ); TMTPResponseCode responseCode = (iCancelled ? EMTPRespCodeIncompleteTransfer : iError); SendResponseL(responseCode); - __FLOG(_L8("DoHandleResponsePhaseL - Exit")); + OstTraceFunctionExit0( CMTPGETOBJECT_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobjectinfo.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobjectinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobjectinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -24,8 +24,12 @@ #include "cmtpgetobjectinfo.h" #include "mtpdppanic.h" #include "cmtpfsentrycache.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetobjectinfoTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"MTPGetObjectInfo");) /** Verification data for GetObjectInfo request @@ -56,9 +60,10 @@ */ EXPORT_C CMTPGetObjectInfo::~CMTPGetObjectInfo() { + OstTraceFunctionEntry0( CMTPGETOBJECTINFO_CMTPGETOBJECTINFO_DES_ENTRY ); delete iObjectInfoToBuild; iDpSingletons.Close(); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPGETOBJECTINFO_CMTPGETOBJECTINFO_DES_EXIT ); } /** @@ -69,7 +74,6 @@ :CMTPRequestProcessor(aFramework, aConnection, sizeof(KMTPGetObjectInfoPolicy)/sizeof(TMTPRequestElementInfo), KMTPGetObjectInfoPolicy), iRfs(aFramework.Fs()) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } /** @@ -86,8 +90,10 @@ */ void CMTPGetObjectInfo::ConstructL() { + OstTraceFunctionEntry0( CMTPGETOBJECTINFO_CONSTRUCTL_ENTRY ); iObjectInfoToBuild = CMTPTypeObjectInfo::NewL(); iDpSingletons.OpenL(iFramework); + OstTraceFunctionExit0( CMTPGETOBJECTINFO_CONSTRUCTL_EXIT ); } /** @@ -95,6 +101,7 @@ */ void CMTPGetObjectInfo::BuildObjectInfoL() { + OstTraceFunctionEntry0( CMTPGETOBJECTINFO_BUILDOBJECTINFOL_ENTRY ); __ASSERT_DEBUG(iRequestChecker, Panic(EMTPDpRequestCheckNull)); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); //does not take owernship @@ -110,7 +117,8 @@ (iDpSingletons.CopyingBigFileCache().IsOnGoing())) { // The object is being copied, it is not created in fs yet. Use its cache entry to get objectinfo - __FLOG(_L8("BuildObjectInfoL - The object is being copied, use its cache entry to get objectinfo")); + OstTrace0( TRACE_NORMAL, CMTPGETOBJECTINFO_BUILDOBJECTINFOL, + "BuildObjectInfoL - The object is being copied, use its cache entry to get objectinfo" ); fileEntry = iDpSingletons.CopyingBigFileCache().FileEntry(); err = KErrNone; } @@ -118,14 +126,17 @@ (iDpSingletons.MovingBigFileCache().IsOnGoing())) { // The object is being moved, it is not created in fs yet. Use its cache entry to get objectinfo - __FLOG(_L8("BuildObjectInfoL - The object is being moved, use its cache entry to get objectinfo")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPGETOBJECTINFO_BUILDOBJECTINFOL, + "BuildObjectInfoL - The object is being moved, use its cache entry to get objectinfo" ); fileEntry = iDpSingletons.MovingBigFileCache().FileEntry(); err = KErrNone; } } - User::LeaveIfError(err); - + LEAVEIFERROR(err, + OstTraceExt2( TRACE_ERROR, DUP2_CMTPGETOBJECTINFO_BUILDOBJECTINFOL, + "Can't get entry details for %S even after error handling! error code %d", objectInfoFromStore->DesC(CMTPObjectMetaData::ESuid), err)); + //1. storage id iObjectInfoToBuild->SetUint32L(CMTPTypeObjectInfo::EStorageID, objectInfoFromStore->Uint(CMTPObjectMetaData::EStorageId)); @@ -190,5 +201,6 @@ //19. keyword iObjectInfoToBuild->SetStringL(CMTPTypeObjectInfo::EKeywords, KNullDesC); + OstTraceFunctionExit0( CMTPGETOBJECTINFO_BUILDOBJECTINFOL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobjectpropdesc.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobjectpropdesc.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobjectpropdesc.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -24,6 +24,11 @@ #include "cmtpgetobjectpropdesc.h" #include "mtpdpconst.h" #include "mtpdppanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetobjectpropdescTraces.h" +#endif + _LIT(KMtpObjDescObjFileName, "[a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~][a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~ ]{0, 7}\\.[[a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~][a-zA-Z!#\\$%&'\\(\\)\\-0-9@\\^_\\`\\{\\}\\~ ]{0, 2}]?"); @@ -157,7 +162,11 @@ case EMTPObjectPropCodeNonConsumable: ServiceNonConsumableL(); break; + case EMTPObjectPropCodeHidden: + ServiceHiddenL(); + break; default: + OstTrace1( TRACE_ERROR, CMTPGETOBJECTPROPDESC_SERVICEL, "invalid propCode %d!", propCode ); User::Leave( KErrNotSupported ); break; } @@ -294,7 +303,20 @@ CleanupStack::PopAndDestroy(expectedForm); } - +void CMTPGetObjectPropDesc::ServiceHiddenL() + { + CMTPTypeObjectPropDescEnumerationForm* expectedForm = CMTPTypeObjectPropDescEnumerationForm::NewL(EMTPTypeUINT16); + CleanupStack::PushL(expectedForm); + TUint16 values[] = {EMTPVisible,EMTPHidden}; + TUint numValues((sizeof(values) / sizeof(values[0]))); + for (TUint i = 0; i < numValues; i++) + { + TMTPTypeUint16 data(values[i]); + expectedForm->AppendSupportedValueL(data); + } + iObjectProperty = CMTPTypeObjectPropDesc::NewL(EMTPObjectPropCodeHidden, *expectedForm); + CleanupStack::PopAndDestroy(expectedForm); + } TUint16 CMTPGetObjectPropDesc::GetPropertyGroupNumber(const TUint16 aPropCode) const { diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobjectproplist.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobjectproplist.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobjectproplist.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -28,8 +28,12 @@ #include "mtpdpconst.h" #include "mtpdppanic.h" #include "cmtpfsentrycache.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetobjectproplistTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"MTPGetObjectPropList");) /** Verification data for the GetNumObjects request @@ -50,16 +54,17 @@ EXPORT_C CMTPGetObjectPropList::~CMTPGetObjectPropList() { + OstTraceFunctionEntry0( CMTPGETOBJECTPROPLIST_CMTPGETOBJECTPROPLIST_DES_ENTRY ); delete iHandles; delete iPropertyList; iDpSingletons.Close(); delete iObjMeta; - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPGETOBJECTPROPLIST_CMTPGETOBJECTPROPLIST_DES_EXIT ); } void CMTPGetObjectPropList::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPGETOBJECTPROPLIST_SERVICEL_ENTRY ); TUint32 propCode(Request().Uint32(TMTPTypeRequest::ERequestParameter3)); TUint32 groupCode(Request().Uint32(TMTPTypeRequest::ERequestParameter4)); @@ -80,7 +85,8 @@ (iDpSingletons.CopyingBigFileCache().IsOnGoing())) { // The object is being copied, it is not created in fs yet. Use its cache entry to get properties - __FLOG(_L8("ServiceL - The object is being copied, use its cache entry to get properties")); + OstTrace0( TRACE_NORMAL, CMTPGETOBJECTPROPLIST_SERVICEL, + "ServiceL - The object is being copied, use its cache entry to get properties" ); iFileEntry = iDpSingletons.CopyingBigFileCache().FileEntry(); err = KErrNone; } @@ -88,14 +94,17 @@ (iDpSingletons.MovingBigFileCache().IsOnGoing())) { // The object is being moved, it is not created in fs yet. Use its cache entry to get properties - __FLOG(_L8("ServiceL - The object is being moved, use its cache entry to get properties")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPGETOBJECTPROPLIST_SERVICEL, + "ServiceL - The object is being moved, use its cache entry to get properties" ); iFileEntry = iDpSingletons.MovingBigFileCache().FileEntry(); err = KErrNone; } } - User::LeaveIfError(err); - + LEAVEIFERROR(err, + OstTraceExt2( TRACE_ERROR, DUP2_CMTPGETOBJECTPROPLIST_SERVICEL, + "Can't get entry details for %S even after error handling! error code %d", iObjMeta->DesC(CMTPObjectMetaData::ESuid), err)); + if (propCode == KMaxTUint) { ServiceAllPropertiesL(handle); @@ -115,8 +124,8 @@ //but we use one empty ObjectPropList to replace the EMTPRespCodeGroupNotSupported(0xA805) response. SendDataL(*iPropertyList); - - __FLOG(_L8("ServiceL - Exit")); + + OstTraceFunctionExit0( CMTPGETOBJECTPROPLIST_SERVICEL_EXIT ); } TMTPResponseCode CMTPGetObjectPropList::CheckRequestL() @@ -143,14 +152,15 @@ CMTPGetObjectPropList::CMTPGetObjectPropList(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection) : CMTPRequestProcessor(aFramework, aConnection, (sizeof(KMTPGetObjectPropListPolicy) / sizeof(TMTPRequestElementInfo)), KMTPGetObjectPropListPolicy) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } void CMTPGetObjectPropList::ConstructL() { + OstTraceFunctionEntry0( CMTPGETOBJECTPROPLIST_CONSTRUCTL_ENTRY ); iDpSingletons.OpenL(iFramework); iPropertyList = CMTPTypeObjectPropList::NewL(); iObjMeta = CMTPObjectMetaData::NewL(); + OstTraceFunctionExit0( CMTPGETOBJECTPROPLIST_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPGetObjectPropList::CheckFormatL() const @@ -477,8 +487,24 @@ iPropertyList->CommitPropElemL(propElem); } } - break; + break; + case EMTPObjectPropCodeHidden: + { + TBool isHidden = iFileEntry.IsHidden(); + CMTPTypeObjectPropListElement& propElem = iPropertyList->ReservePropElemL(aHandle, aPropCode); + if ( isHidden ) + { + propElem.SetUint16L(CMTPTypeObjectPropListElement::EValue, EMTPHidden); + } + else + { + propElem.SetUint16L(CMTPTypeObjectPropListElement::EValue, EMTPVisible); + } + iPropertyList->CommitPropElemL(propElem); + } + break; default: + OstTrace1(TRACE_ERROR, CMTPGETOBJECTPROPLIST_SERVICEONEOBJECTPROPERTYL, "invalid property code %d", aPropCode); User::Leave( KErrNotSupported ); break; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobjectpropvalue.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobjectpropvalue.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetobjectpropvalue.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,6 +27,12 @@ #include "cmtpgetobjectpropvalue.h" #include "mtpdpconst.h" #include "mtpdppanic.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetobjectpropvalueTraces.h" +#endif + /** @@ -124,8 +130,10 @@ TUint32 handle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); iFramework.ObjectMgr().ObjectL(TMTPTypeUint32(handle), *iObjMeta); - User::LeaveIfError(iRfs.Entry(iObjMeta->DesC(CMTPObjectMetaData::ESuid), iFileEntry)); - + LEAVEIFERROR(iRfs.Entry(iObjMeta->DesC(CMTPObjectMetaData::ESuid), iFileEntry), + OstTraceExt1(TRACE_ERROR, CMTPGETOBJECTPROPVALUE_SERVICEL, + "can't get entry details for %S!", iObjMeta->DesC(CMTPObjectMetaData::ESuid))); + TUint32 propCode = Request().Uint32(TMTPTypeRequest::ERequestParameter2); switch(propCode) { @@ -165,7 +173,11 @@ case EMTPObjectPropCodeNonConsumable: ServiceNonConsumableL(); break; + case EMTPObjectPropCodeHidden: + ServiceHiddenL(); + break; default: + OstTrace1(TRACE_ERROR, DUP1_CMTPGETOBJECTPROPVALUE_SERVICEL, "Invalid property code %d", propCode ); User::Leave( KErrNotSupported ); break; } @@ -265,6 +277,19 @@ SendDataL(iMTPTypeUint8); } +void CMTPGetObjectPropValue::ServiceHiddenL() + { + TBool isHidden = iFileEntry.IsHidden(); + if ( isHidden ) + { + iMTPTypeUint16.Set(EMTPHidden); + } + else + { + iMTPTypeUint16.Set(EMTPVisible); + } + SendDataL(iMTPTypeUint16); + } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetpartialobject.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetpartialobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpgetpartialobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -25,9 +25,12 @@ #include "cmtpgetpartialobject.h" #include "mtpdppanic.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetpartialobjectTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"GetObject");) /** Verification data for the GetNumObjects request @@ -58,10 +61,9 @@ */ EXPORT_C CMTPGetPartialObject::~CMTPGetPartialObject() { - __FLOG(_L8("~CMTPGetPartialObject - Entry")); + OstTraceFunctionEntry0( CMTPGETPARTIALOBJECT_CMTPGETPARTIALOBJECT_DES_ENTRY ); delete iFileObject; - __FLOG(_L8("~CMTPGetPartialObject - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPGETPARTIALOBJECT_CMTPGETPARTIALOBJECT_DES_EXIT ); } /** @@ -78,9 +80,8 @@ */ void CMTPGetPartialObject::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPGETPARTIALOBJECT_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPGETPARTIALOBJECT_CONSTRUCTL_EXIT ); } /** @@ -89,7 +90,7 @@ */ TMTPResponseCode CMTPGetPartialObject::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPGETPARTIALOBJECT_CHECKREQUESTL_ENTRY ); TMTPResponseCode result = CMTPRequestProcessor::CheckRequestL(); if(result == EMTPRespCodeOK) { @@ -109,7 +110,9 @@ else { TEntry fileEntry; - User::LeaveIfError(iFramework.Fs().Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), fileEntry)); + LEAVEIFERROR(iFramework.Fs().Entry(iObjectInfo->DesC(CMTPObjectMetaData::ESuid), fileEntry), + OstTraceExt1(TRACE_ERROR, CMTPGETPARTIALOBJECT_CHECKREQUESTL, + "can't get entry details for %S!", iObjectInfo->DesC(CMTPObjectMetaData::ESuid))); if((iOffset >= fileEntry.FileSize())) { @@ -118,7 +121,7 @@ } } - __FLOG(_L8("CheckRequestL - Exit")); + OstTraceFunctionExit0( CMTPGETPARTIALOBJECT_CHECKREQUESTL_EXIT ); return result; } @@ -127,7 +130,7 @@ */ void CMTPGetPartialObject::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPGETPARTIALOBJECT_SERVICEL_ENTRY ); if (!iObjectInfo) { @@ -139,8 +142,8 @@ iFileObject = CMTPTypeFile::NewL(iFramework.Fs(), iObjectInfo->DesC(CMTPObjectMetaData::ESuid), EFileRead, iLength, iOffset); SendDataL(*iFileObject); } - - __FLOG(_L8("ServiceL - Exit")); + + OstTraceFunctionExit0( CMTPGETPARTIALOBJECT_SERVICEL_EXIT ); } /** @@ -149,13 +152,13 @@ */ TBool CMTPGetPartialObject::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPGETPARTIALOBJECT_DOHANDLERESPONSEPHASEL_ENTRY ); __ASSERT_DEBUG(iFileObject, Panic(EMTPDpObjectNull)); TUint32 dataLength = iFileObject->GetByteSent(); SendResponseL(EMTPRespCodeOK, 1, &dataLength); - - __FLOG(_L8("DoHandleResponsePhaseL - Exit")); + + OstTraceFunctionExit0( CMTPGETPARTIALOBJECT_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpknowledgehandler.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpknowledgehandler.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpknowledgehandler.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -25,9 +25,12 @@ #include #include "cmtpknowledgehandler.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpknowledgehandlerTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"KwgObjHdler");) const TInt KDateTimeMaxLength = 22; const TInt KNameMaxLength = 255; @@ -55,59 +58,61 @@ } CKnowledgeObject::~CKnowledgeObject() { - __FLOG(_L8("~CKnowledgeObject - Entry")); + OstTraceFunctionEntry0( CKNOWLEDGEOBJECT_CKNOWLEDGEOBJECT_DES_ENTRY ); iDateModified.Close(); iName.Close(); - __FLOG(_L8("~CKnowledgeObject - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CKNOWLEDGEOBJECT_CKNOWLEDGEOBJECT_DES_EXIT ); } void CKnowledgeObject::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CKnowledgeObject Construct - Entry")); + OstTraceFunctionEntry0( CKNOWLEDGEOBJECT_CONSTRUCTL_ENTRY ); iKnowledgeObjectSize = KObjectSizeNotAvaiable; iDateModified.CreateL(KDateTimeMaxLength); iName.CreateL(KNameMaxLength); iLastAuthorProxyID.Set(KMTPUnInitialized64, KMTPUnInitialized64); iDirty = EBitFlagAll; - __FLOG(_L8("CKnowledgeObject Construct - Exit")); + OstTraceFunctionExit0( CKNOWLEDGEOBJECT_CONSTRUCTL_EXIT ); } void CKnowledgeObject::LoadL() { - __FLOG(_L8("CKnowledgeObject LoadL - Entry")); + OstTraceFunctionEntry0( CKNOWLEDGEOBJECT_LOADL_ENTRY ); // Load ObjectSize TInt objSize; - User::LeaveIfError(iRepository.Get(ESize, objSize)); + LEAVEIFERROR(iRepository.Get(ESize, objSize), + OstTrace0( TRACE_ERROR, CKNOWLEDGEOBJECT_LOADL, "Can't Load ObjectSize from iRepository!" )); iKnowledgeObjectSize = objSize; // Load DateModify iDateModified.Zero(); - User::LeaveIfError(iRepository.Get(EDateModified, iDateModified)); + LEAVEIFERROR(iRepository.Get(EDateModified, iDateModified), + OstTrace0( TRACE_ERROR, DUP1_CKNOWLEDGEOBJECT_LOADL, "Can't Load DateModify from iRepository!" )); // Load Name iName.Zero(); - User::LeaveIfError(iRepository.Get(EName, iName)); + LEAVEIFERROR(iRepository.Get(EName, iName), + OstTrace0( TRACE_ERROR, DUP2_CKNOWLEDGEOBJECT_LOADL, "Can't Load Name from iRepository!" )); // Load LastAuthorProxyID: TPtr8 writeBuf(NULL, 0); //walkaroud for the TMTPTypeUint128 iLastAuthorProxyID.FirstWriteChunk(writeBuf); - User::LeaveIfError(iRepository.Get(ELastAuthorProxyID, writeBuf)); + LEAVEIFERROR(iRepository.Get(ELastAuthorProxyID, writeBuf), + OstTrace0( TRACE_ERROR, DUP3_CKNOWLEDGEOBJECT_LOADL, "Can't Load LastAuthorProxyID from iRepository!" )); iDirty = EBitFlagNone; - __FLOG(_L8("CKnowledgeObject LoadL - Exit")); + OstTraceFunctionExit0( CKNOWLEDGEOBJECT_LOADL_EXIT ); return; } void CKnowledgeObject::Clear() { - __FLOG(_L8("CKnowledgeObject Clear - Entry")); + OstTraceFunctionEntry0( CKNOWLEDGEOBJECT_CLEAR_ENTRY ); iKnowledgeObjectSize = KObjectSizeNotAvaiable; iDateModified.Zero(); iName.Zero(); iLastAuthorProxyID.Set(KMTPUnInitialized64, KMTPUnInitialized64); iDirty = EBitFlagAll; - __FLOG(_L8("CKnowledgeObject Clear - Exit")); + OstTraceFunctionExit0( CKNOWLEDGEOBJECT_CLEAR_EXIT ); } void CKnowledgeObject::SetSize(TUint64 aSize) @@ -141,39 +146,43 @@ void CKnowledgeObject::CommitL() { - __FLOG(_L8("CKnowledgeObject CommitL - Entry")); + OstTraceFunctionEntry0( CKNOWLEDGEOBJECT_COMMITL_ENTRY ); if (EBitFlagSize == (iDirty & EBitFlagSize)) { // TUint64 -> TInt, some capability is lost, // anyway, it's enough for knowledge object. - User::LeaveIfError(iRepository.Set(ESize, (TInt)iKnowledgeObjectSize)); + LEAVEIFERROR(iRepository.Set(ESize, (TInt)iKnowledgeObjectSize), + OstTrace1( TRACE_ERROR, CKNOWLEDGEOBJECT_COMMITL, "set Size to %d failed against iRepository!", iKnowledgeObjectSize)); } if (EBitFlagName == (iDirty & EBitFlagName)) { - User::LeaveIfError(iRepository.Set(EName, iName)); + LEAVEIFERROR(iRepository.Set(EName, iName), + OstTraceExt1( TRACE_ERROR, DUP1_CKNOWLEDGEOBJECT_COMMITL, "set name to %S failed against iRepository!", iName)); } if (EBitFlagLastAuthorProxyID == (iDirty & EBitFlagLastAuthorProxyID)) { if (EMTPRespCodeOK != SetColumnType128Value(ELastAuthorProxyID, iLastAuthorProxyID)) { + OstTrace0( TRACE_ERROR, DUP2_CKNOWLEDGEOBJECT_COMMITL, "set LastAuthorProxyID failed!" ); User::Leave(KErrGeneral); } } // update DateModified to be the time of Commit RefreshDateModifed(); - User::LeaveIfError(iRepository.Set(EDateModified, iDateModified)); + LEAVEIFERROR(iRepository.Set(EDateModified, iDateModified), + OstTraceExt1( TRACE_ERROR, DUP3_CKNOWLEDGEOBJECT_COMMITL, "set DateModified to %S failed against iRepository!", iDateModified)); iDirty = EBitFlagNone; - __FLOG(_L8("CKnowledgeObject KnowledgeObject CommitL - Exit")); + OstTraceFunctionExit0( CKNOWLEDGEOBJECT_COMMITL_EXIT ); return; } TMTPResponseCode CKnowledgeObject::SetColumnType128Value(TMTPKnowledgeStoreKeyNum aColumnNum, TMTPTypeUint128& aNewData) { - __FLOG(_L8("CKnowledgeObject SetColumnType128ValueL - Entry")); + OstTraceFunctionEntry0( CKNOWLEDGEOBJECT_SETCOLUMNTYPE128VALUE_ENTRY ); TInt ret; TMTPResponseCode responseCode = EMTPRespCodeOK; TBuf8 data; @@ -198,21 +207,22 @@ { responseCode = EMTPRespCodeGeneralError; } - __FLOG_VA((_L8("CKnowledgeObject SetColumnType128ValueL - Exit with responseCode = 0x%04X"), responseCode)); + OstTraceFunctionExit0( CKNOWLEDGEOBJECT_SETCOLUMNTYPE128VALUE_EXIT ); + OstTrace1( TRACE_NORMAL, CKNOWLEDGEOBJECT_SETCOLUMNTYPE128VALUE, "responseCode = 0x%04X", responseCode ); return responseCode; } void CKnowledgeObject::RefreshDateModifed() { - __FLOG(_L8("CKnowledgeObject RefreshDateModifed - Entry")); + OstTraceFunctionEntry0( CKNOWLEDGEOBJECT_REFRESHDATEMODIFED_ENTRY ); //get current time TTime now; now.UniversalTime(); _LIT(KFormat,"%F%Y%M%DT%H%T%SZ"); iDateModified.Zero(); now.FormatL(iDateModified, KFormat); - __FLOG(_L8("CKnowledgeObject RefreshDateModifed - Exit")); + OstTraceFunctionExit0( CKNOWLEDGEOBJECT_REFRESHDATEMODIFED_EXIT ); return; } @@ -228,12 +238,11 @@ EXPORT_C CMTPKnowledgeHandler::~CMTPKnowledgeHandler() { - __FLOG(_L8("~CMTPKnowledgeHandler - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_CMTPKNOWLEDGEHANDLER_DES_ENTRY ); delete iKnowledgeObj; delete iKnowledgeSwpBuffer; delete iCachedKnowledgeObject; - __FLOG(_L8("~CMTPKnowledgeHandler - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_CMTPKNOWLEDGEHANDLER_DES_EXIT ); } CMTPKnowledgeHandler::CMTPKnowledgeHandler(MMTPDataProviderFramework& aFramework, TUint16 aFormatCode, @@ -244,8 +253,7 @@ void CMTPKnowledgeHandler::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("Construct - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_CONSTRUCTL_ENTRY ); iFramework.Fs().PrivatePath(iKnowObjFileName); iKnowObjFileName.Insert(0, KMTPKnowledgeObjDriveLocation); @@ -265,13 +273,14 @@ if(BaflUtils::FileExists(iFramework.Fs(), iKnowObjSwpFileName)) { // In case DP received some object content - User::LeaveIfError(iFramework.Fs().Delete(iKnowObjSwpFileName)); + LEAVEIFERROR(iFramework.Fs().Delete(iKnowObjSwpFileName), + OstTraceExt1( TRACE_ERROR, CMTPKNOWLEDGEHANDLER_CONSTRUCTL, "delete %S failed!", iKnowObjSwpFileName )); } // create and load knowledge object properties iCachedKnowledgeObject = CKnowledgeObject::NewL(iRepository); iCachedKnowledgeObject->LoadL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_CONSTRUCTL_EXIT ); } EXPORT_C void CMTPKnowledgeHandler::SetStorageId(TUint32 aStorageId) @@ -281,8 +290,10 @@ void CMTPKnowledgeHandler::CommitL() { - __FLOG(_L8("CommitL - Entry")); - User::LeaveIfError(iRepository.StartTransaction(CRepository::EReadWriteTransaction)); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_COMMITL_ENTRY ); + LEAVEIFERROR(iRepository.StartTransaction(CRepository::EReadWriteTransaction), + OstTrace0( TRACE_ERROR, CMTPKNOWLEDGEHANDLER_COMMITL, "start readwrite transaction for iRepository failed!")); + iRepository.CleanupCancelTransactionPushL(); iCachedKnowledgeObject->CommitL(); @@ -300,47 +311,55 @@ iKnowledgeSwpBuffer = NULL; } - if(BaflUtils::FileExists(iFramework.Fs(), iKnowObjSwpFileName)) + if(BaflUtils::FileExists(iFramework.Fs(), iKnowObjSwpFileName) && iCachedKnowledgeObject->Size() > 0) { // In case DP received some object content - User::LeaveIfError(iFramework.Fs().Replace(iKnowObjSwpFileName, iKnowObjFileName)); + LEAVEIFERROR(iFramework.Fs().Replace(iKnowObjSwpFileName, iKnowObjFileName), + OstTraceExt2( TRACE_ERROR, DUP1_CMTPKNOWLEDGEHANDLER_COMMITL, + "replace %S with %S failed!", iKnowObjSwpFileName, iKnowObjFileName)); } // If swp file isn't exsited, that means 0 sized object received, need do nothing. TUint32 keyInfo; - User::LeaveIfError(iRepository.CommitTransaction(keyInfo)); + LEAVEIFERROR(iRepository.CommitTransaction(keyInfo), + OstTrace1( TRACE_ERROR, DUP2_CMTPKNOWLEDGEHANDLER_COMMITL, + "Commits transaction failed. The number of keys whose values were modified is %d", keyInfo)); + + CleanupStack::Pop(&iRepository); - __FLOG(_L8("CommitL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_COMMITL_EXIT ); } void CMTPKnowledgeHandler::CommitForNewObjectL(TDes& aSuid) { + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_COMMITFORNEWOBJECTL_ENTRY ); aSuid = iSuid; CommitL(); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_COMMITFORNEWOBJECTL_EXIT ); } void CMTPKnowledgeHandler::RollBack() { - __FLOG(_L8("Rollback - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_ROLLBACK_ENTRY ); iCachedKnowledgeObject->Clear(); TRAP_IGNORE(iCachedKnowledgeObject->LoadL()); - __FLOG(_L8("Rollback - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_ROLLBACK_EXIT ); } EXPORT_C void CMTPKnowledgeHandler::GetObjectSuidL(TDes& aSuid) const { - __FLOG(_L8("GetObjectSuidL - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_GETOBJECTSUIDL_ENTRY ); if(iCachedKnowledgeObject->Size() != KObjectSizeNotAvaiable) { aSuid.Append(iSuid); } - __FLOG(_L8("GetObjectSuidL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_GETOBJECTSUIDL_EXIT ); } TMTPResponseCode CMTPKnowledgeHandler::SendObjectInfoL(const CMTPTypeObjectInfo& aObjectInfo, TUint32& aParentHandle, TDes& aSuid) { - __FLOG(_L("SendObjectInfoL - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_SENDOBJECTINFOL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; if (aParentHandle != KMTPHandleNone && aParentHandle != KMTPHandleNoParent) { @@ -351,7 +370,7 @@ //if there's a read error reread if(iCachedKnowledgeObject->IsDirty()) { - __FLOG(_L8("Warning: The cached knowledge is dirty")); + OstTrace0( TRACE_WARNING, CMTPKNOWLEDGEHANDLER_SENDOBJECTINFOL, "The cached knowledge is dirty" ); iCachedKnowledgeObject->Clear(); iCachedKnowledgeObject->LoadL(); } @@ -368,14 +387,14 @@ aSuid = iSuid; } } - __FLOG(_L("SendObjectInfoL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_SENDOBJECTINFOL_EXIT ); return responseCode; } TMTPResponseCode CMTPKnowledgeHandler::SendObjectPropListL(TUint64 aObjectSize, const CMTPTypeObjectPropList& /*aObjectPropList*/, TUint32& aParentHandle, TDes& aSuid) { - __FLOG(_L8("SendObjectPropListL - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_SENDOBJECTPROPLISTL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; if (aParentHandle != KMTPHandleNone && aParentHandle != KMTPHandleNoParent) { @@ -387,7 +406,7 @@ aParentHandle = KMTPHandleNoParent; if(iCachedKnowledgeObject->IsDirty()) { - __FLOG(_L8("Warning: The cached knowledge is dirty")); + OstTrace0( TRACE_WARNING, CMTPKNOWLEDGEHANDLER_SENDOBJECTPROPLISTL, "The cached knowledge is dirty" ); iCachedKnowledgeObject->Clear(); iCachedKnowledgeObject->LoadL(); } @@ -403,21 +422,21 @@ aSuid = iSuid; } } - __FLOG(_L8("SendObjectPropListL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_SENDOBJECTPROPLISTL_EXIT ); return responseCode; } TMTPResponseCode CMTPKnowledgeHandler::GetObjectPropertyL(const CMTPObjectMetaData& aObjectMetaData, TUint16 aPropertyCode, CMTPTypeObjectPropList& aPropList) { - __FLOG(_L8("GetObjectPropertyL - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_GETOBJECTPROPERTYL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; CMTPTypeObjectPropListElement* propertyElement = NULL; TUint32 aHandle = aObjectMetaData.Uint(CMTPObjectMetaData::EHandle); if(iCachedKnowledgeObject->IsDirty()) { - __FLOG(_L8("Warning: The cached knowledge is dirty")); + OstTrace0( TRACE_WARNING, CMTPKNOWLEDGEHANDLER_GETOBJECTPROPERTYL, "The cached knowledge is dirty" ); iCachedKnowledgeObject->LoadL(); } @@ -524,7 +543,7 @@ { aPropList.CommitPropElemL(*propertyElement); } - __FLOG(_L8("GetObjectPropertyL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_GETOBJECTPROPERTYL_EXIT ); return responseCode; } @@ -532,7 +551,7 @@ const CMTPTypeObjectPropListElement& aElement, TMTPOperationCode aOperationCode) { - __FLOG(_L8("SetObjectPropertyL - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_SETOBJECTPROPERTYL_ENTRY ); TMTPResponseCode responseCode = CheckGenObjectPropertyL(aElement, aOperationCode); if (responseCode == EMTPRespCodeOK) { @@ -569,16 +588,17 @@ break; } } - __FLOG(_L8("SetObjectPropertyL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_SETOBJECTPROPERTYL_EXIT ); return responseCode; } // Remove the knowledge object TMTPResponseCode CMTPKnowledgeHandler::DeleteObjectL(const CMTPObjectMetaData& /*aObjectMetaData*/) { - __FLOG(_L8("DeleteObjectL - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_DELETEOBJECTL_ENTRY ); - User::LeaveIfError(iRepository.StartTransaction(CRepository::EReadWriteTransaction)); + LEAVEIFERROR(iRepository.StartTransaction(CRepository::EReadWriteTransaction), + OstTrace0( TRACE_ERROR, CMTPKNOWLEDGEHANDLER_DELETEOBJECTL, "Start readwrite transaction failed!")); iRepository.CleanupCancelTransactionPushL(); // Delete obejct properties in transaction, if leave, mgr will rollback all properties. @@ -595,26 +615,31 @@ // Keep file delete is atomic. if (BaflUtils::FileExists(iFramework.Fs(), iKnowObjFileName)) { - User::LeaveIfError(iFramework.Fs().Delete(iKnowObjFileName)); + LEAVEIFERROR(iFramework.Fs().Delete(iKnowObjFileName), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPKNOWLEDGEHANDLER_DELETEOBJECTL, "delete %S failed!", iKnowObjFileName)); } TUint32 keyInfo; - User::LeaveIfError(iRepository.CommitTransaction(keyInfo)); + LEAVEIFERROR(iRepository.CommitTransaction(keyInfo), + OstTrace1( TRACE_ERROR, DUP2_CMTPKNOWLEDGEHANDLER_DELETEOBJECTL, + "Commits transaction failed. The number of keys whose values were modified is %d", keyInfo)); + CleanupStack::Pop(&iRepository); - __FLOG(_L8("DeleteObjectL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_DELETEOBJECTL_EXIT ); return EMTPRespCodeOK; } // Return the knowledge object content TMTPResponseCode CMTPKnowledgeHandler::GetObjectL(const CMTPObjectMetaData& /*aObjectMetaData*/, MMTPType** aBuffer) { - __FLOG(_L8("GetObjectL - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_GETOBJECTL_ENTRY ); if (!BaflUtils::FileExists(iFramework.Fs(), iKnowObjFileName)) { RFile file; CleanupClosePushL(file); - User::LeaveIfError(file.Create(iFramework.Fs(), iKnowObjFileName, EFileRead)); + LEAVEIFERROR(file.Create(iFramework.Fs(), iKnowObjFileName, EFileRead), + OstTraceExt1( TRACE_ERROR, CMTPKNOWLEDGEHANDLER_GETOBJECTL, "Create readonly %S failed!", iKnowObjFileName)); CleanupStack::PopAndDestroy(&file); } @@ -625,13 +650,13 @@ iKnowledgeObj = CMTPTypeFile::NewL(iFramework.Fs(), iKnowObjFileName, EFileRead); } *aBuffer = iKnowledgeObj; - __FLOG(_L8("GetObjectL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_GETOBJECTL_EXIT ); return EMTPRespCodeOK; } TMTPResponseCode CMTPKnowledgeHandler::DeleteObjectPropertyL(const CMTPObjectMetaData& /*aObjectMetaData*/, const TUint16 aPropertyCode) { - __FLOG(_L8("DeleteObjectPropertyL - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_DELETEOBJECTPROPERTYL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; switch (aPropertyCode) { @@ -660,13 +685,13 @@ responseCode = EMTPRespCodeInvalidObjectPropCode; break; } - __FLOG(_L8("DeleteObjectPropertyL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_DELETEOBJECTPROPERTYL_EXIT ); return responseCode; } TMTPResponseCode CMTPKnowledgeHandler::GetBufferForSendObjectL(const CMTPObjectMetaData& /*aObjectMetaData*/, MMTPType** aBuffer) { - __FLOG(_L8("GetBufferForSendObjectL - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_GETBUFFERFORSENDOBJECTL_ENTRY ); if (iKnowledgeSwpBuffer) { delete iKnowledgeSwpBuffer; @@ -675,12 +700,13 @@ iKnowledgeSwpBuffer = CMTPTypeFile::NewL(iFramework.Fs(), iKnowObjSwpFileName, EFileWrite); iKnowledgeSwpBuffer->SetSizeL(0); *aBuffer = iKnowledgeSwpBuffer; - __FLOG(_L8("GetBufferForSendObjectL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_GETBUFFERFORSENDOBJECTL_EXIT ); return EMTPRespCodeOK; } void CMTPKnowledgeHandler::BuildObjectInfoL(CMTPTypeObjectInfo& aObjectInfo) const { + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_BUILDOBJECTINFOL_ENTRY ); aObjectInfo.SetUint32L(CMTPTypeObjectInfo::EStorageID, iStorageID); aObjectInfo.SetUint16L(CMTPTypeObjectInfo::EObjectFormat, iKnowledgeFormatCode); // Not use @@ -701,46 +727,48 @@ aObjectInfo.SetStringL(CMTPTypeObjectInfo::EDateModified, KNullDesC); aObjectInfo.SetStringL(CMTPTypeObjectInfo::EDateCreated, KNullDesC); aObjectInfo.SetStringL(CMTPTypeObjectInfo::EKeywords, KNullDesC); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_BUILDOBJECTINFOL_EXIT ); } TMTPResponseCode CMTPKnowledgeHandler::GetObjectInfoL(const CMTPObjectMetaData& /*aObjectMetaData*/, CMTPTypeObjectInfo& aObjectInfo) { - __FLOG(_L8("GetObjectInfoL - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_GETOBJECTINFOL_ENTRY ); if(iCachedKnowledgeObject->Size() != KObjectSizeNotAvaiable) { BuildObjectInfoL(aObjectInfo); } - __FLOG(_L8("GetObjectInfoL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_GETOBJECTINFOL_EXIT ); return EMTPRespCodeOK; } void CMTPKnowledgeHandler::ReleaseObjectBuffer() { - __FLOG(_L8("ReleaseObjectBuffer - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_RELEASEOBJECTBUFFER_ENTRY ); if (iKnowledgeObj) { delete iKnowledgeObj; iKnowledgeObj = NULL; } - __FLOG(_L8("ReleaseObjectBuffer - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_RELEASEOBJECTBUFFER_EXIT ); } TMTPResponseCode CMTPKnowledgeHandler::GetObjectSizeL(const TDesC& aSuid, TUint64& aObjectSize) { - __FLOG(_L8("GetObjectSizeL - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_GETOBJECTSIZEL_ENTRY ); if (aSuid != iSuid) { + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_GETOBJECTSIZEL_EXIT ); return EMTPRespCodeGeneralError; } aObjectSize = iCachedKnowledgeObject->Size(); - __FLOG(_L8("GetObjectSizeL - Exit")); + OstTraceFunctionExit0( DUP1_CMTPKNOWLEDGEHANDLER_GETOBJECTSIZEL_EXIT ); return EMTPRespCodeOK; } TMTPResponseCode CMTPKnowledgeHandler::GetAllObjectPropCodeByGroupL(TUint32 aGroupId, RArray& aPropCodes) { - __FLOG(_L8("GetAllObjectPropCodeByGroupL - Entry")); + OstTraceFunctionEntry0( CMTPKNOWLEDGEHANDLER_GETALLOBJECTPROPCODEBYGROUPL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; if (0 == aGroupId) { @@ -770,7 +798,7 @@ { responseCode = (TMTPResponseCode)0xA805; } - __FLOG(_L8("GetAllObjectPropCodeByGroupL - Exit")); + OstTraceFunctionExit0( CMTPKNOWLEDGEHANDLER_GETALLOBJECTPROPCODEBYGROUPL_EXIT ); return responseCode; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpmoveobject.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpmoveobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpmoveobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,9 +27,13 @@ #include "cmtpstoragemgr.h" #include "cmtpmoveobject.h" #include "mtpdppanic.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpmoveobjectTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"MoveObject");) /** Verification data for the MoveObject request @@ -63,6 +67,7 @@ */ EXPORT_C CMTPMoveObject::~CMTPMoveObject() { + OstTraceFunctionEntry0( CMTPMOVEOBJECT_CMTPMOVEOBJECT_ENTRY ); Cancel(); iDpSingletons.Close(); iSingletons.Close(); @@ -73,7 +78,7 @@ delete iFileMan; delete iPathToMove; delete iNewRootFolder; - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPMOVEOBJECT_CMTPMOVEOBJECT_EXIT ); } /** @@ -83,16 +88,15 @@ CMTPRequestProcessor(aFramework, aConnection, sizeof(KMTPMoveObjectPolicy)/sizeof(TMTPRequestElementInfo), KMTPMoveObjectPolicy), iMoveObjectIndex(0), iTimer(NULL) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } TMTPResponseCode CMTPMoveObject::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_CHECKREQUESTL_ENTRY ); TMTPResponseCode result = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK != result) { - __FLOG(_L8("CheckRequestL with error- Exit")); + OstTraceFunctionExit0( CMTPMOVEOBJECT_CHECKREQUESTL_EXIT ); return result; } @@ -114,18 +118,21 @@ { const TDesC& suid(iObjectInfo->DesC(CMTPObjectMetaData::ESuid)); iIsFolder = EFalse; - User::LeaveIfError(BaflUtils::IsFolder(iFramework.Fs(), suid, iIsFolder)); + LEAVEIFERROR(BaflUtils::IsFolder(iFramework.Fs(), suid, iIsFolder), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPMOVEOBJECT_CHECKREQUESTL, "can't judge whether %S is folder", suid)); + if(!iIsFolder) { if(iDpSingletons.MovingBigFileCache().IsOnGoing()) { - __FLOG(_L8("CheckRequestL - A big file moving is ongoing, respond with access denied")); + OstTrace0( TRACE_NORMAL, CMTPMOVEOBJECT_CHECKREQUESTL, + "CheckRequestL - A big file moving is ongoing, respond with access denied" ); result = EMTPRespCodeAccessDenied; } } } - - __FLOG(_L8("CheckRequestL - Exit")); + + OstTraceFunctionExit0( DUP1_CMTPMOVEOBJECT_CHECKREQUESTL_EXIT ); return result; } @@ -134,7 +141,7 @@ */ void CMTPMoveObject::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_SERVICEL_ENTRY ); TMTPResponseCode ret = EMTPRespCodeOK; TRAPD(err, ret = MoveObjectL()); if (err != KErrNone) @@ -145,7 +152,7 @@ { SendResponseL(ret); } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPMOVEOBJECT_SERVICEL_EXIT ); } /** @@ -153,8 +160,10 @@ */ void CMTPMoveObject::ConstructL() { + OstTraceFunctionEntry0( CMTPMOVEOBJECT_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); iDpSingletons.OpenL(iFramework); + OstTraceFunctionExit0( CMTPMOVEOBJECT_CONSTRUCTL_EXIT ); } @@ -164,7 +173,7 @@ */ void CMTPMoveObject::MoveFileL(const TDesC& aNewFileName) { - __FLOG(_L8("MoveFileL - Entry")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_MOVEFILEL_ENTRY ); const TDesC& suid(iObjectInfo->DesC(CMTPObjectMetaData::ESuid)); GetPreviousPropertiesL(suid); @@ -172,7 +181,8 @@ iFramework.StorageMgr().DriveNumber(iStorageId)) //Move file to the same storage { - User::LeaveIfError(iFileMan->Move(suid, *iDest)); + LEAVEIFERROR(iFileMan->Move(suid, *iDest), + OstTraceExt2( TRACE_ERROR, CMTPMOVEOBJECT_MOVEFILEL, "move %S to %S failed!", suid, *iDest )); SetPreviousPropertiesL(aNewFileName); iObjectInfo->SetDesCL(CMTPObjectMetaData::ESuid, aNewFileName); iObjectInfo->SetUint(CMTPObjectMetaData::EStorageId, iStorageId); @@ -187,7 +197,8 @@ iNewFileName = NULL; iNewFileName = aNewFileName.AllocL(); // Store the new file name - User::LeaveIfError(iFileMan->Move(suid, *iDest, CFileMan::EOverWrite, iStatus)); + LEAVEIFERROR(iFileMan->Move(suid, *iDest, CFileMan::EOverWrite, iStatus), + OstTraceExt2( TRACE_ERROR, DUP1_CMTPMOVEOBJECT_MOVEFILEL, "move %S to %S failed!", suid, *iDest)); if ( !IsActive() ) { SetActive(); @@ -199,7 +210,7 @@ TTimeIntervalMicroSeconds32 KMoveObjectIntervalNone = 0; iTimer->Start(TTimeIntervalMicroSeconds32(KMoveObjectTimeOut), KMoveObjectIntervalNone, TCallBack(CMTPMoveObject::OnTimeoutL, this)); } - __FLOG(_L8("MoveFileL - Exit")); + OstTraceFunctionExit0( CMTPMOVEOBJECT_MOVEFILEL_EXIT ); } /** @@ -208,7 +219,7 @@ */ void CMTPMoveObject::MoveFolderL() { - __FLOG(_L8("MoveFolderL - Entry")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_MOVEFOLDERL_ENTRY ); RBuf oldFolderName; oldFolderName.CreateL(KMaxFileName); @@ -232,8 +243,8 @@ } CleanupStack::PopAndDestroy(); // oldFolderName. - - __FLOG(_L8("MoveFolderL - Exit")); + + OstTraceFunctionExit0( CMTPMOVEOBJECT_MOVEFOLDERL_EXIT ); } /** @@ -242,7 +253,7 @@ */ TMTPResponseCode CMTPMoveObject::MoveObjectL() { - __FLOG(_L8("MoveObjectL - Entry")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_MOVEOBJECTL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; GetParametersL(); @@ -267,7 +278,9 @@ else // It is a folder. { TFileName rightMostFolderName; - User::LeaveIfError(BaflUtils::MostSignificantPartOfFullName(suid, rightMostFolderName)); + LEAVEIFERROR(BaflUtils::MostSignificantPartOfFullName(suid, rightMostFolderName), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPMOVEOBJECT_MOVEOBJECTL, "extract most significant part of %S failed", suid)); + if((newObjectName.Length() + rightMostFolderName.Length() + 1) <= newObjectName.MaxLength()) { newObjectName.Append(rightMostFolderName); @@ -278,8 +291,8 @@ } iNewRootFolder = newObjectName.AllocL(); - __FLOG(*iNewRootFolder); - + OstTraceExt1( TRACE_NORMAL, CMTPMOVEOBJECT_MOVEOBJECTL, "%S", *iNewRootFolder ); + if(responseCode == EMTPRespCodeOK) { delete iFileMan; @@ -297,7 +310,7 @@ } } CleanupStack::PopAndDestroy(); // newObjectName. - __FLOG(_L8("MoveObjectL - Exit")); + OstTraceFunctionExit0( CMTPMOVEOBJECT_MOVEOBJECTL_EXIT ); return responseCode; } @@ -306,7 +319,7 @@ */ void CMTPMoveObject::GetParametersL() { - __FLOG(_L8("GetParametersL - Entry")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_GETPARAMETERSL_ENTRY ); __ASSERT_DEBUG(iRequestChecker, Panic(EMTPDpRequestCheckNull)); iStorageId = Request().Uint32(TMTPTypeRequest::ERequestParameter2); @@ -324,7 +337,7 @@ iDest = NULL; iDest = parentObjectInfo->DesC(CMTPObjectMetaData::ESuid).AllocL(); } - __FLOG(_L8("GetParametersL - Exit")); + OstTraceFunctionExit0( CMTPMOVEOBJECT_GETPARAMETERSL_EXIT ); } /** @@ -332,14 +345,14 @@ */ void CMTPMoveObject::SetDefaultParentObjectL() { - __FLOG(_L8("SetDefaultParentObjectL - Entry")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_SETDEFAULTPARENTOBJECTL_ENTRY ); const CMTPStorageMetaData& storageMetaData( iFramework.StorageMgr().StorageL(iStorageId) ); const TDesC& driveBuf( storageMetaData.DesC(CMTPStorageMetaData::EStorageSuid) ); delete iDest; iDest = NULL; iDest = driveBuf.AllocL(); iNewParentHandle = KMTPHandleNoParent; - __FLOG(_L8("SetDefaultParentObjectL - Exit")); + OstTraceFunctionExit0( CMTPMOVEOBJECT_SETDEFAULTPARENTOBJECTL_EXIT ); } /** @@ -347,15 +360,18 @@ */ TMTPResponseCode CMTPMoveObject::CanMoveObjectL(const TDesC& aOldName, const TDesC& aNewName) const { - __FLOG(_L8("CanMoveObjectL - Entry")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_CANMOVEOBJECTL_ENTRY ); TMTPResponseCode result = EMTPRespCodeOK; TEntry fileEntry; - User::LeaveIfError(iFramework.Fs().Entry(aOldName, fileEntry)); + LEAVEIFERROR(iFramework.Fs().Entry(aOldName, fileEntry), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPMOVEOBJECT_CANMOVEOBJECTL, "can't get entry details from %S", aOldName)); TInt drive(iFramework.StorageMgr().DriveNumber(iStorageId)); - User::LeaveIfError(drive); + LEAVEIFERROR(drive, + OstTrace1( TRACE_ERROR, DUP2_CMTPMOVEOBJECT_CANMOVEOBJECTL, "can't get driver number for storage %d", iStorageId)); TVolumeInfo volumeInfo; - User::LeaveIfError(iFramework.Fs().Volume(volumeInfo, drive)); + LEAVEIFERROR(iFramework.Fs().Volume(volumeInfo, drive), + OstTrace1( TRACE_ERROR, DUP3_CMTPMOVEOBJECT_CANMOVEOBJECTL, "can't get volume info for drive %d", drive)); #ifdef SYMBIAN_ENABLE_64_BIT_FILE_SERVER_API if(volumeInfo.iFree < fileEntry.FileSize()) @@ -369,7 +385,8 @@ { result = EMTPRespCodeInvalidParentObject; } - __FLOG_VA((_L8("CanMoveObjectL - Exit with response code 0x%04X"), result)); + OstTraceFunctionExit0( CMTPMOVEOBJECT_CANMOVEOBJECTL_EXIT ); + OstTrace1( TRACE_NORMAL, CMTPMOVEOBJECT_CANMOVEOBJECTL, "response code 0x%04X", result ); return result; } @@ -378,9 +395,17 @@ */ void CMTPMoveObject::GetPreviousPropertiesL(const TDesC& aFileName) { - __FLOG(_L8("GetPreviousPropertiesL - Entry")); - User::LeaveIfError(iFramework.Fs().Modified(aFileName, iPreviousModifiedTime)); - __FLOG(_L8("GetPreviousPropertiesL - Exit")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_GETPREVIOUSPROPERTIESL_ENTRY ); + LEAVEIFERROR(iFramework.Fs().Modified(aFileName, iPreviousModifiedTime), + OstTraceExt1( TRACE_ERROR, CMTPMOVEOBJECT_GETPREVIOUSPROPERTIESL, + "Can't get the last modification date and time for %S", aFileName)); + if ( iIsFolder ) + { + TEntry fileEntry; + User::LeaveIfError(iFramework.Fs().Entry( aFileName, fileEntry )); + iIsHidden = fileEntry.IsHidden(); + } + OstTraceFunctionExit0( CMTPMOVEOBJECT_GETPREVIOUSPROPERTIESL_EXIT ); } /** @@ -388,9 +413,18 @@ */ void CMTPMoveObject::SetPreviousPropertiesL(const TDesC& aFileName) { - __FLOG(_L8("SetPreviousPropertiesL - Entry")); - User::LeaveIfError(iFramework.Fs().SetModified(aFileName, iPreviousModifiedTime)); - __FLOG(_L8("SetPreviousPropertiesL - Exit")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_SETPREVIOUSPROPERTIESL_ENTRY ); + LEAVEIFERROR(iFramework.Fs().SetModified(aFileName, iPreviousModifiedTime), + OstTraceExt1( TRACE_ERROR, CMTPMOVEOBJECT_SETPREVIOUSPROPERTIESL, "Sets the date and time for %S failed", aFileName)); + if ( iIsFolder && iIsHidden ) + { + TEntry fileEntry; + User::LeaveIfError(iFramework.Fs().Entry( aFileName, fileEntry )); + fileEntry.iAtt &= ~KEntryAttHidden; + fileEntry.iAtt |= KEntryAttHidden; + User::LeaveIfError(iFramework.Fs().SetAtt( aFileName, fileEntry.iAtt, ~fileEntry.iAtt)); + } + OstTraceFunctionExit0( CMTPMOVEOBJECT_SETPREVIOUSPROPERTIESL_EXIT ); } /** @@ -407,7 +441,7 @@ void CMTPMoveObject::DoOnTimeoutL() { - __FLOG(_L8("DoOnTimeoutL - Entry")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_DOONTIMEOUTL_ENTRY ); if (iTimer) { @@ -421,7 +455,8 @@ const TDesC& suid(iObjectInfo->DesC(CMTPObjectMetaData::ESuid)); TEntry fileEntry; - User::LeaveIfError(iFramework.Fs().Entry(suid, fileEntry)); + LEAVEIFERROR(iFramework.Fs().Entry(suid, fileEntry), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPMOVEOBJECT_DOONTIMEOUTL, "Gets the entry details for %S failed!", suid)); TUint32 handle = iObjectInfo->Uint(CMTPObjectMetaData::EHandle); iObjectInfo->SetDesCL(CMTPObjectMetaData::ESuid, *iNewFileName); @@ -436,10 +471,11 @@ aCache.SetTargetHandle(handle); aCache.SetFileEntry(fileEntry); - __FLOG(_L8("UpdateFSEntryCache, sending response with respond code OK for a big file move")); + OstTrace0( TRACE_NORMAL, CMTPMOVEOBJECT_DOONTIMEOUTL, + "UpdateFSEntryCache, sending response with respond code OK for a big file move" ); SendResponseL(EMTPRespCodeOK); - __FLOG(_L8("DoOnTimeoutL - Exit")); + OstTraceFunctionExit0( CMTPMOVEOBJECT_DOONTIMEOUTL_EXIT ); } /** @@ -447,15 +483,16 @@ */ void CMTPMoveObject::RunL() { - __FLOG(_L8("RunL - Entry")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_RUNL_ENTRY ); - User::LeaveIfError(iStatus.Int()); + LEAVEIFERROR(iStatus.Int(), + OstTrace1( TRACE_ERROR, DUP2_CMTPMOVEOBJECT_RUNL, "wrong istatus %d", iStatus.Int())); SetPreviousPropertiesL(*iNewFileName); CMTPFSEntryCache& aCache = iDpSingletons.MovingBigFileCache(); // Check to see if we are moving a big file if(aCache.IsOnGoing()) { - __FLOG(_L8("RunL - Big file move complete")); + OstTrace0( TRACE_NORMAL, CMTPMOVEOBJECT_RUNL, "RunL - Big file move complete" ); aCache.SetOnGoing(EFalse); aCache.SetTargetHandle(KMTPHandleNone); } @@ -477,10 +514,11 @@ iObjectInfo->SetUint(CMTPObjectMetaData::EParentHandle, iNewParentHandle); iFramework.ObjectMgr().ModifyObjectL(*iObjectInfo); - __FLOG(_L8("RunL, sending response with respond code OK for a normal file move")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPMOVEOBJECT_RUNL, + "RunL, sending response with respond code OK for a normal file move" ); SendResponseL(EMTPRespCodeOK); } - __FLOG(_L8("RunL - Exit")); + OstTraceFunctionExit0( CMTPMOVEOBJECT_RUNL_EXIT ); } /** @@ -509,13 +547,14 @@ */ TBool CMTPMoveObject::Match(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) const { - __FLOG(_L8("Match - Entry")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_MATCH_ENTRY ); TBool result = EFalse; TUint16 operationCode = aRequest.Uint16(TMTPTypeRequest::ERequestOperationCode); if ((operationCode == EMTPOpCodeMoveObject) && &iConnection == &aConnection) { result = ETrue; } - __FLOG_VA((_L8("Match -- Exit with result = %d"), result)); + OstTrace1( TRACE_NORMAL, CMTPMOVEOBJECT_MATCH, "with result = %d", result ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_MATCH_EXIT ); return result; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtprequestchecker.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtprequestchecker.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtprequestchecker.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,9 +23,14 @@ #include "cmtprequestchecker.h" #include "cmtpfsexclusionmgr.h" #include "cmtpfsentrycache.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtprequestcheckerTraces.h" +#endif + static const TInt KMTPRequestCheckerHandleGranularity = 2; -__FLOG_STMT(_LIT8(KComponent,"MTPRequestChecker");) /** Two-phase construction method @@ -47,10 +52,11 @@ */ EXPORT_C CMTPRequestChecker::~CMTPRequestChecker() { + OstTraceFunctionEntry0( CMTPREQUESTCHECKER_CMTPREQUESTCHECKER_ENTRY ); iDpSingletons.Close(); iHandles.Close(); iObjectArray.ResetAndDestroy(); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPREQUESTCHECKER_CMTPREQUESTCHECKER_EXIT ); } /** @@ -206,7 +212,8 @@ */ TMTPResponseCode CMTPRequestChecker::VerifyObjectHandleL(TUint32 aHandle, const TMTPRequestElementInfo& aElementInfo) { - __FLOG_VA((_L8("VerifyObjectHandleL entry with handle 0x%08X"), aHandle)); + OstTraceFunctionEntry0( CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL, "with handle 0x%08X", aHandle ); TMTPResponseCode ret = EMTPRespCodeOK; CMTPObjectMetaData* object(CMTPObjectMetaData::NewLC()); @@ -221,12 +228,14 @@ TUint storageID = object->Uint(CMTPObjectMetaData::EStorageId); if(!iFramework.StorageMgr().ValidStorageId(storageID)) { + OstTraceFunctionExit0( CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL_EXIT ); return EMTPRespCodeInvalidObjectHandle; } CMTPStorageMetaData* storageMetaData = (CMTPStorageMetaData *)& iFramework.StorageMgr().StorageL(storageID); if (storageMetaData->Uint(CMTPStorageMetaData::EStorageSystemType) != CMTPStorageMetaData::ESystemTypeDefaultFileSystem) { + OstTraceFunctionExit0( DUP1_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL_EXIT ); return ret; } @@ -238,6 +247,7 @@ (object->Uint(CMTPObjectMetaData::EFormatSubCode) != EMTPAssociationTypeGenericFolder ) ) { // Special association type .. not always present on the filesystem. + OstTraceFunctionExit0( DUP2_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL_EXIT ); return ret; } else @@ -248,7 +258,8 @@ (iDpSingletons.CopyingBigFileCache().IsOnGoing())) { // The object is being copied, it is not created in fs yet. Use its cache entry for check - __FLOG(_L8("VerifyObjectHandleL - The object is being copied, use its cache entry for check")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL, + "VerifyObjectHandleL - The object is being copied, use its cache entry for check" ); entry = iDpSingletons.CopyingBigFileCache().FileEntry(); err = KErrNone; } @@ -256,12 +267,15 @@ (iDpSingletons.MovingBigFileCache().IsOnGoing())) { // The object is being moved, it is not created in fs yet. Use its cache entry for check - __FLOG(_L8("VerifyObjectHandleL - The object is being moved, use its cache entry for check")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL, + "VerifyObjectHandleL - The object is being moved, use its cache entry for check" ); entry = iDpSingletons.MovingBigFileCache().FileEntry(); err = KErrNone; } } - User::LeaveIfError(err); + LEAVEIFERROR(err, + OstTraceExt2( TRACE_ERROR, DUP5_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL, + "Can't get entry details for %S even after error handling! error code %d", suid, err)); } if (aElementInfo.iElementAttr & EMTPElementAttrWrite) @@ -297,10 +311,11 @@ } else { - __FLOG(_L8("Object does not exist.")); + OstTrace0( TRACE_WARNING, DUP3_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL, "Object does not exist." ); ret = EMTPRespCodeInvalidObjectHandle; } - __FLOG_VA((_L8("VerifyObjectHandleL exit with repsonse code 0x%04X"), ret)); + OstTrace1( TRACE_WARNING, DUP4_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL, "with repsonse code 0x%04X", ret ); + OstTraceFunctionExit0( DUP3_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL_EXIT ); return ret; } @@ -329,7 +344,8 @@ if (drive != KErrNotFound) { TDriveInfo info; - User::LeaveIfError(iFramework.Fs().Drive(info, drive)); + LEAVEIFERROR(iFramework.Fs().Drive(info, drive), + OstTrace1( TRACE_ERROR, CMTPREQUESTCHECKER_VERIFYSTORAGEIDL, "Gets information about drive %d failed!", drive)); if (info.iType == EMediaNotPresent) { /* @@ -413,7 +429,6 @@ iHandles(KMTPRequestCheckerHandleGranularity), iObjectArray(KMTPRequestCheckerHandleGranularity) { - __FLOG_OPEN(KMTPSubsystem, KComponent); } /** @@ -421,7 +436,9 @@ */ void CMTPRequestChecker::ConstructL() { + OstTraceFunctionEntry0( CMTPREQUESTCHECKER_CONSTRUCTL_ENTRY ); iDpSingletons.OpenL(iFramework); + OstTraceFunctionExit0( CMTPREQUESTCHECKER_CONSTRUCTL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtprequestprocessor.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtprequestprocessor.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtprequestprocessor.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,8 +22,12 @@ #include "cmtprequestprocessor.h" #include "cmtprequestchecker.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtprequestprocessorTraces.h" +#endif + const static TInt KNullBufferSize = 4096; -__FLOG_STMT(_LIT8(KComponent,"MTPRequestProcessor");) /** Standard c++ constructor @@ -45,7 +49,6 @@ iElements(aElements) { CActiveScheduler::Add(this); - __FLOG_OPEN(KMTPSubsystem, KComponent); } /** @@ -53,10 +56,11 @@ */ EXPORT_C CMTPRequestProcessor::~CMTPRequestProcessor() { + OstTraceFunctionEntry0( CMTPREQUESTPROCESSOR_CMTPREQUESTPROCESSOR_DES_ENTRY ); Cancel(); iNullBuffer.Close(); delete iRequestChecker; - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPREQUESTPROCESSOR_CMTPREQUESTPROCESSOR_DES_EXIT ); } /** @@ -244,15 +248,16 @@ */ EXPORT_C TBool CMTPRequestProcessor::DoHandleRequestPhaseL() { - __FLOG(_L8("DoHandleRequestPhaseL - Entry.")); + OstTraceFunctionEntry0( CMTPREQUESTPROCESSOR_DOHANDLEREQUESTPHASEL_ENTRY ); TRAPD(err, iResponseCode = CheckRequestL()); if ((err != KErrNone) || (iResponseCode != EMTPRespCodeOK)) { if (HasDataphase()) { // If we have a dataphase - // we need to read in the data and discard it - __FLOG(_L8("Response code is not OK, there is data phase.")); + // we need to read in the data and discard it + OstTrace0( TRACE_NORMAL, CMTPREQUESTPROCESSOR_DOHANDLEREQUESTPHASEL, + "Response code is not OK, there is data phase." ); iNullBuffer.Close(); iNullBuffer.CreateMaxL(KNullBufferSize); iNull.SetBuffer(iNullBuffer); @@ -262,6 +267,8 @@ { if(err != KErrNone) { + OstTraceExt2( TRACE_ERROR, DUP1_CMTPREQUESTPROCESSOR_DOHANDLEREQUESTPHASEL, + "Can't deal with CheckRequestL error! error code %d, responseCode %d", err, iResponseCode); User::Leave(err); } SendResponseL(TMTPResponseCode(iResponseCode)); @@ -284,11 +291,13 @@ } else { + OstTrace1( TRACE_ERROR, DUP2_CMTPREQUESTPROCESSOR_DOHANDLEREQUESTPHASEL, + "Can't deal with ServiceL error! error code %d", err); User::Leave(err); } } } - __FLOG(_L8("DoHandleRequestPhaseL - Exit.")); + OstTraceFunctionExit0( CMTPREQUESTPROCESSOR_DOHANDLEREQUESTPHASEL_EXIT ); return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsendobjectinfo.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsendobjectinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsendobjectinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -37,10 +37,13 @@ #include "cmtpdataprovidercontroller.h" #include "cmtpdataprovider.h" #include "cmtpstoragemgr.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsendobjectinfoTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"SendObjectInfo");) /** Verification data for the SendObjectInfo request @@ -72,8 +75,9 @@ */ EXPORT_C CMTPSendObjectInfo::~CMTPSendObjectInfo() { - __FLOG(_L8("~CMTPSendObjectInfo - Entry")); - __FLOG_2(_L8("iProgress:%d NoRollback:%d"),iProgress,iNoRollback); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_CMTPSENDOBJECTINFO_DES_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPSENDOBJECTINFO_CMTPSENDOBJECTINFO, + "iProgress:%d NoRollback:%d", iProgress,iNoRollback ); if ((iProgress == EObjectInfoSucceed || iProgress == EObjectInfoFail || iProgress == EObjectInfoInProgress) && !iNoRollback) @@ -90,8 +94,7 @@ delete iObjectInfo; delete iObjectPropList; iSingletons.Close(); - __FLOG(_L8("~CMTPSendObjectInfo - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_CMTPSENDOBJECTINFO_DES_EXIT ); } /** @@ -100,7 +103,8 @@ @param aConnection The connection from which the request comes */ CMTPSendObjectInfo::CMTPSendObjectInfo(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection) : - CMTPRequestProcessor(aFramework, aConnection, 0, NULL) + CMTPRequestProcessor(aFramework, aConnection, 0, NULL), + iHiddenStatus( EMTPVisible ) { } @@ -110,11 +114,12 @@ */ TMTPResponseCode CMTPSendObjectInfo::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_CHECKREQUESTL_ENTRY ); TMTPResponseCode result = CheckSendingStateL(); if (result != EMTPRespCodeOK) { + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_CHECKREQUESTL_EXIT ); return result; } @@ -170,8 +175,8 @@ } } - __FLOG_VA((_L8("Result = 0x%04X"), result)); - __FLOG(_L8("CheckRequestL - Exit")); + OstTrace1( TRACE_NORMAL, CMTPSENDOBJECTINFO_CHECKREQUESTL, "Result = 0x%04X", result ); + OstTraceFunctionExit0( DUP1_CMTPSENDOBJECTINFO_CHECKREQUESTL_EXIT ); return result; } @@ -187,7 +192,7 @@ */ void CMTPSendObjectInfo::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_SERVICEL_ENTRY ); if (iProgress == EObjectNone) { iIsFolder = EFalse; @@ -204,7 +209,7 @@ { ServiceSendObjectL(); } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_SERVICEL_EXIT ); } /** @@ -212,8 +217,7 @@ */ void CMTPSendObjectInfo::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_CONSTRUCTL_ENTRY ); iExpectedSendObjectRequest.SetUint16(TMTPTypeRequest::ERequestOperationCode, EMTPOpCodeSendObject); iReceivedObject = CMTPObjectMetaData::NewL(); iReceivedObject->SetUint(CMTPObjectMetaData::EDataProviderId, iFramework.DataProviderId()); @@ -224,7 +228,7 @@ _LIT(KODF, ".odf"); iExceptionList.AppendL(KM4A()); iExceptionList.AppendL(KODF()); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_CONSTRUCTL_EXIT ); } /** @@ -235,7 +239,7 @@ */ TBool CMTPSendObjectInfo::Match(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) const { - __FLOG(_L8("Match - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_MATCH_ENTRY ); TBool result = EFalse; TUint16 operationCode = aRequest.Uint16(TMTPTypeRequest::ERequestOperationCode); if ((operationCode == EMTPOpCodeSendObjectInfo || @@ -245,7 +249,7 @@ { result = ETrue; } - __FLOG(_L8("Match - Exit")); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_MATCH_EXIT ); return result; } @@ -255,7 +259,7 @@ */ TBool CMTPSendObjectInfo::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_ENTRY ); //to check if the sending/receiving data is successful TBool successful = !iCancelled; if (iProgress == EObjectInfoInProgress) @@ -280,7 +284,7 @@ iProgress = (successful ? ESendObjectSucceed : ESendObjectFail); } - __FLOG(_L8("DoHandleResponsePhaseL - Exit")); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } @@ -290,7 +294,7 @@ */ TBool CMTPSendObjectInfo::DoHandleCompletingPhaseL() { - __FLOG(_L8("DoHandleCompletingPhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_ENTRY ); TBool result = ETrue; CMTPRequestProcessor::DoHandleCompletingPhaseL(); if (iProgress == EObjectInfoSucceed) @@ -310,8 +314,10 @@ iProgress = EObjectInfoSucceed; result = EFalse; } - - __FLOG_2(_L8("DoHandleCompletingPhaseL - Exit result:%d progress:%d"),result,iProgress); + + OstTraceExt2( TRACE_NORMAL, CMTPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL, + "Exit result:%d progress:%d",result,iProgress ); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_EXIT ); return result; } @@ -323,7 +329,7 @@ */ TMTPResponseCode CMTPSendObjectInfo::CheckSendingStateL() { - __FLOG(_L8("CheckSendingState - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_CHECKSENDINGSTATEL_ENTRY ); TMTPResponseCode result = EMTPRespCodeOK; iOperationCode = Request().Uint16(TMTPTypeRequest::ERequestOperationCode); @@ -364,9 +370,11 @@ } else { + OstTrace1( TRACE_ERROR, CMTPSENDOBJECTINFO_CHECKSENDINGSTATEL, + "The progress state is not right. Current state is %d", iProgress ); User::Leave( KErrGeneral ); } - __FLOG(_L8("CheckSendingState - Exit")); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_CHECKSENDINGSTATEL_EXIT ); return result; } @@ -375,14 +383,14 @@ */ void CMTPSendObjectInfo::ServiceSendObjectInfoL() { - __FLOG(_L8("ServiceSendObjectInfoL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_SERVICESENDOBJECTINFOL_ENTRY ); delete iObjectInfo; iObjectInfo = NULL; iObjectInfo = CMTPTypeObjectInfo::NewL(); iCancelled = EFalse; ReceiveDataL(*iObjectInfo); iProgress = EObjectInfoInProgress; - __FLOG(_L8("ServiceSendObjectInfoL - Exit")); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_SERVICESENDOBJECTINFOL_EXIT ); } /** @@ -390,7 +398,7 @@ */ void CMTPSendObjectInfo::ServiceSendObjectPropListL() { - __FLOG(_L8("ServiceSendObjectPropListL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_SERVICESENDOBJECTPROPLISTL_ENTRY ); delete iObjectPropList; iObjectPropList = NULL; iObjectPropList = CMTPTypeObjectPropList::NewL(); @@ -398,7 +406,7 @@ iReceivedObject->SetUint(CMTPObjectMetaData::EFormatCode, iRequest->Uint32(TMTPTypeRequest::ERequestParameter3)); ReceiveDataL(*iObjectPropList); iProgress = EObjectInfoInProgress; - __FLOG(_L8("ServiceSendObjectPropListL - Exit")); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_SERVICESENDOBJECTPROPLISTL_EXIT ); } /** @@ -406,7 +414,7 @@ */ void CMTPSendObjectInfo::ServiceSendObjectL() { - __FLOG(_L8("ServiceSendObjectL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_SERVICESENDOBJECTL_ENTRY ); if (iIsFolder) { // A generic folder doesn't have anything interesting during its data phase @@ -418,7 +426,7 @@ } iProgress = ESendObjectInProgress; - __FLOG(_L8("ServiceSendObjectL - Exit")); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_SERVICESENDOBJECTL_EXIT ); } /** @@ -426,13 +434,14 @@ */ void CMTPSendObjectInfo::GetDefaultParentObjectL() { - __FLOG(_L8("GetDefaultParentObjectL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_ENTRY ); if (iStorageId == KMTPStorageDefault) { iStorageId = iFramework.StorageMgr().DefaultStorageId(); } TInt drive(iFramework.StorageMgr().DriveNumber(iStorageId)); - User::LeaveIfError(drive); + LEAVEIFERROR(drive, + OstTrace1( TRACE_ERROR, CMTPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL, "can't get driver number for storage %d", iStorageId)); // Obtain the root of the drive. Logical storages can sometimes have a filesystem root // other than :\ . For example an MP3 DP might have a root of c:\media\music\ @@ -441,8 +450,8 @@ delete iParentSuid; iParentSuid = NULL; iParentSuid=(iFramework.StorageMgr().StorageL(iStorageId).DesC(CMTPStorageMetaData::EStorageSuid)).AllocL(); - iReceivedObject->SetUint(CMTPObjectMetaData::EParentHandle, KMTPHandleNoParent); - __FLOG(_L8("GetDefaultParentObjectL - Exit")); + iReceivedObject->SetUint(CMTPObjectMetaData::EParentHandle, KMTPHandleNoParent); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_EXIT ); } /** @@ -451,7 +460,7 @@ */ TMTPResponseCode CMTPSendObjectInfo::GetParentObjectAndStorageIdL() { - __FLOG(_L8("GetParentObjectAndStorageIdL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_ENTRY ); __ASSERT_DEBUG(iRequestChecker, Panic(EMTPDpRequestCheckNull)); iStorageId = Request().Uint32(TMTPTypeRequest::ERequestParameter1); @@ -471,8 +480,8 @@ iReceivedObject->SetUint(CMTPObjectMetaData::EParentHandle, iParentHandle); } - __FLOG_VA((_L8("iParentSuid = %S"), iParentSuid)); - __FLOG(_L8("GetParentObjectAndStorageIdL - Exit")); + OstTraceExt1( TRACE_NORMAL, CMTPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL, "iParentSuid = %S", *iParentSuid ); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_EXIT ); return EMTPRespCodeOK; } @@ -482,16 +491,18 @@ */ TBool CMTPSendObjectInfo::DoHandleSendObjectInfoCompleteL() { - __FLOG(_L8("DoHandleSendObjectInfoCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_ENTRY ); TBool result(ETrue); TUint16 format(iObjectInfo->Uint16L(CMTPTypeObjectInfo::EObjectFormat)); result = iDpSingletons.ExclusionMgrL().IsFormatValid(TMTPFormatCode(format)); if (result) - { - __FLOG_VA((_L8("ASSOCIATION TYPE IS: %X"), iObjectInfo->Uint16L(CMTPTypeObjectInfo::EAssociationType))); - if(format == EMTPFormatCodeAssociation) + { + OstTrace1( TRACE_NORMAL, CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL, + "ASSOCIATION TYPE IS: %X", iObjectInfo->Uint16L(CMTPTypeObjectInfo::EAssociationType)); + + if(format == EMTPFormatCodeAssociation) { if((iObjectInfo->Uint16L(CMTPTypeObjectInfo::EAssociationType) == EMTPAssociationTypeGenericFolder) || (iObjectInfo->Uint16L(CMTPTypeObjectInfo::EAssociationType) == EMTPAssociationTypeUndefined)) @@ -564,7 +575,7 @@ if (err != KErrNone) { - __FLOG_1(_L8("Fail to create fs object %d"),err); + OstTrace1( TRACE_ERROR, DUP1_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL, "Fail to create fs object %d", err ); SendResponseL(ErrorToMTPError(err)); result = EFalse; } @@ -573,7 +584,7 @@ ReserveObjectL(); } } - __FLOG(_L8("DoHandleSendObjectInfoCompleteL - Exit")); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_EXIT ); return result; } @@ -583,7 +594,7 @@ */ TBool CMTPSendObjectInfo::DoHandleSendObjectPropListCompleteL() { - __FLOG(_L8("DoHandleSendObjectPropListCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_ENTRY ); TBool result(ETrue); TMTPResponseCode responseCode(GetParentObjectAndStorageIdL()); @@ -635,7 +646,7 @@ if (err != KErrNone) { - __FLOG_1(_L8("Fail to create fs object %d"),err); + OstTrace1( TRACE_ERROR, CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL, "Fail to create fs object %d", err ); SendResponseL(ErrorToMTPError(err)); result = EFalse; } @@ -644,8 +655,8 @@ ReserveObjectL(); } } - - __FLOG(_L8("DoHandleSendObjectPropListCompleteL - Exit")); + + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_EXIT ); return result; } @@ -655,7 +666,7 @@ */ TBool CMTPSendObjectInfo::DoHandleSendObjectCompleteL() { - __FLOG(_L8("DoHandleSendObjectCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_ENTRY ); TBool result(ETrue); if (!iIsFolder) @@ -664,10 +675,12 @@ iFileReceived = NULL; TEntry fileEntry; - User::LeaveIfError(iFramework.Fs().Entry(iFullPath, fileEntry)); - + LEAVEIFERROR(iFramework.Fs().Entry(iFullPath, fileEntry), + OstTraceExt1( TRACE_ERROR, CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL, "Gets the entry details for %S failed!", iFullPath)); if (fileEntry.FileSize() != iObjectSize) { + delete iFileReceived; + iFileReceived = NULL; iFramework.RouteRequestUnregisterL(iExpectedSendObjectRequest, iConnection); iFramework.Fs().Delete(iFullPath); @@ -694,7 +707,7 @@ // SendObject is cancelled or connection is dropped. if(result && (iCancelled || (ret == KErrAbort))) { - __FLOG(_L8("It is a cancel for sendObject.")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL, "It is a cancel for sendObject." ); iFramework.RouteRequestUnregisterL(iExpectedSendObjectRequest, iConnection); Rollback(); SendResponseL(EMTPRespCodeTransactionCancelled); @@ -713,9 +726,11 @@ if(!iIsFolder) { SetPropertiesL(); + delete iFileReceived; + iFileReceived = NULL; iFramework.ObjectMgr().CommitReservedObjectHandleL(*iReceivedObject); iFullPath.LowerCase(); - __FLOG_VA((_L8("File Name %S"), &iFullPath)); + OstTraceExt1( TRACE_NORMAL, DUP2_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL, "File Name %S", iFullPath); TParsePtrC file( iFullPath ); if ( file.ExtPresent() && file.Ext().Length()<=KExtensionLength && iExceptionList.Find(file.Ext()) != KErrNotFound) { @@ -756,7 +771,7 @@ SendResponseL(EMTPRespCodeOK); } - __FLOG(_L8("DoHandleSendObjectCompleteL - Exit")); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_EXIT ); return result; } @@ -769,7 +784,7 @@ */ TBool CMTPSendObjectInfo::GetFullPathNameL(const TDesC& aFileName) { - __FLOG(_L8("GetFullPathNameL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_GETFULLPATHNAMEL_ENTRY ); TBool result(EFalse); if (aFileName.Length() > 0) { @@ -794,13 +809,13 @@ } } -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE TFileName tempName; tempName.Copy(iFullPath); tempName.Collapse(); - __FLOG_VA((_L8("iFullPath = %S, Result = %d"), &tempName, result)); - __FLOG(_L8("GetFullPathNameL - Exit")); + OstTraceExt2( TRACE_NORMAL, CMTPSENDOBJECTINFO_GETFULLPATHNAMEL, "iFullPath = %S, Result = %d", tempName, result); #endif + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_GETFULLPATHNAMEL_EXIT ); return result; } @@ -810,7 +825,7 @@ */ TBool CMTPSendObjectInfo::IsTooLarge(TUint64 aObjectSize) const { - __FLOG(_L8("IsTooLarge - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_ISTOOLARGE_ENTRY ); TBool ret(aObjectSize > KMaxTInt64); if(!ret) @@ -822,7 +837,8 @@ storageId = iFramework.StorageMgr().DefaultStorageId(); } TInt drive( iFramework.StorageMgr().DriveNumber(storageId) ); - User::LeaveIfError(drive); + LEAVEIFERROR(drive, + OstTrace1( TRACE_ERROR, CMTPSENDOBJECTINFO_ISTOOLARGE, "can't get driver number for storage %d", storageId)); iFramework.Fs().FileSystemSubType(drive, fsname); const TUint64 KMaxFatFileSize = 0xFFFFFFFF; //Maximal file size supported by all FAT filesystems (4GB-1) @@ -834,8 +850,8 @@ ret = ETrue; } } - __FLOG_VA((_L8("Result = %d"), ret)); - __FLOG(_L8("IsTooLarge - Exit")); + OstTrace1( TRACE_NORMAL, DUP1_CMTPSENDOBJECTINFO_ISTOOLARGE, "Result = %d", ret ); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_ISTOOLARGE_EXIT ); return ret; } @@ -845,12 +861,12 @@ */ TBool CMTPSendObjectInfo::Exists(const TDesC& aName) const { - __FLOG(_L8("Exists - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_EXISTS_ENTRY ); // This detects both files and folders TBool ret(EFalse); ret = BaflUtils::FileExists(iFramework.Fs(), aName); - __FLOG_VA((_L8("Result = %d"), ret)); - __FLOG(_L8("Exists - Exit")); + OstTrace1( TRACE_NORMAL, CMTPSENDOBJECTINFO_EXISTS, "Result = %d", ret ); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_EXISTS_EXIT ); return ret; } @@ -861,7 +877,7 @@ */ TMTPResponseCode CMTPSendObjectInfo::VerifyObjectPropListL(TInt& aInvalidParameterIndex) { - __FLOG(_L8("VerifyObjectPropListL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_ENTRY ); TMTPResponseCode responseCode(EMTPRespCodeOK); const TUint KCount(iObjectPropList->NumberOfElements()); iObjectPropList->ResetCursor(); @@ -887,8 +903,8 @@ break; } } - __FLOG_VA((_L8("Result = 0x%04X"), responseCode)); - __FLOG(_L8("VerifyObjectPropListL - Exit")); + OstTrace1( TRACE_NORMAL, CMTPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL, "Result = 0x%04X", responseCode); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_EXIT ); return responseCode; } @@ -900,7 +916,7 @@ */ TMTPResponseCode CMTPSendObjectInfo::ExtractPropertyL(const CMTPTypeObjectPropListElement& aElement) { - __FLOG(_L8("ExtractPropertyL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_EXTRACTPROPERTYL_ENTRY ); TMTPResponseCode responseCode(EMTPRespCodeOK); switch (aElement.Uint16L(CMTPTypeObjectPropListElement::EPropertyCode)) { @@ -939,11 +955,14 @@ case EMTPObjectPropCodeName: iName = aElement.StringL(CMTPTypeObjectPropListElement::EValue); break; + case EMTPObjectPropCodeHidden: + iHiddenStatus = aElement.Uint16L(CMTPTypeObjectPropListElement::EValue); + break; default: break; } - __FLOG_VA((_L8("Result = 0x%04X"), responseCode)); - __FLOG(_L8("ExtractPropertyL - Exit")); + OstTrace1( TRACE_NORMAL, CMTPSENDOBJECTINFO_EXTRACTPROPERTYL, "Result = 0x%04X", responseCode); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_EXTRACTPROPERTYL_EXIT ); return responseCode; } @@ -955,7 +974,7 @@ */ TMTPResponseCode CMTPSendObjectInfo::CheckPropCodeL(const CMTPTypeObjectPropListElement& aElement) const { - __FLOG(_L8("CheckPropCode - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_CHECKPROPCODEL_ENTRY ); TMTPResponseCode responseCode(EMTPRespCodeOK); switch(aElement.Uint16L(CMTPTypeObjectPropListElement::EPropertyCode)) { @@ -1031,6 +1050,7 @@ break; case EMTPObjectPropCodeAssociationType: + case EMTPObjectPropCodeHidden: if (aElement.Uint16L(CMTPTypeObjectPropListElement::EDatatype) != EMTPTypeUINT16) { responseCode = EMTPRespCodeInvalidObjectPropFormat; @@ -1048,8 +1068,8 @@ responseCode = EMTPRespCodeInvalidObjectPropCode; break; } - __FLOG_VA((_L8("Result = 0x%04X"), responseCode)); - __FLOG(_L8("CheckPropCode - Exit")); + OstTrace1( TRACE_NORMAL, CMTPSENDOBJECTINFO_CHECKPROPCODEL, "Result = 0x%04X", responseCode); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_CHECKPROPCODEL_EXIT ); return responseCode; } @@ -1086,7 +1106,7 @@ } } } - + return ret; } @@ -1096,7 +1116,7 @@ */ void CMTPSendObjectInfo::ReserveObjectL() { - __FLOG(_L8("ReserveObjectL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_RESERVEOBJECTL_ENTRY ); iReceivedObject->SetUint(CMTPObjectMetaData::EStorageId, iStorageId); iReceivedObject->SetDesCL(CMTPObjectMetaData::ESuid, iFullPath); @@ -1127,7 +1147,7 @@ parameters[1] = iParentHandle; parameters[2] = iReceivedObject->Uint(CMTPObjectMetaData::EHandle); SendResponseL(EMTPRespCodeOK, (sizeof(parameters) / sizeof(parameters[0])), parameters); - __FLOG(_L8("ReserveObjectL - Exit")); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_RESERVEOBJECTL_EXIT ); } void CMTPSendObjectInfo::CreateFsObjectL() @@ -1136,7 +1156,8 @@ { if (!Exists(iFullPath)) { - User::LeaveIfError(iFramework.Fs().MkDirAll(iFullPath)); + LEAVEIFERROR(iFramework.Fs().MkDirAll(iFullPath), + OstTraceExt1( TRACE_ERROR, CMTPSENDOBJECTINFO_CREATEFSOBJECTL, "Makes directories failed for %S", iFullPath)); } } else @@ -1152,14 +1173,14 @@ { if(iIsFolder) { - __FLOG(_L8("Rollback the dir created.")); + OstTrace0( TRACE_NORMAL, CMTPSENDOBJECTINFO_ROLLBACK, "Rollback the dir created." ); iFramework.Fs().RmDir(iFullPath); // If it is folder, delete it from MTP database, i.e ObjectStore. TRAP_IGNORE(iFramework.ObjectMgr().RemoveObjectL(iFullPath)); } else { - __FLOG(_L8("Rollback the file created.")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPSENDOBJECTINFO_ROLLBACK, "Rollback the file created." ); delete iFileReceived; iFileReceived = NULL; // Delete this object from file system. @@ -1189,7 +1210,7 @@ default: break; } - + return resp; } @@ -1198,9 +1219,10 @@ */ void CMTPSendObjectInfo::SetPropertiesL() { - __FLOG(_L8("SetPropertiesL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_SETPROPERTIESL_ENTRY ); TEntry entry; - User::LeaveIfError(iFramework.Fs().Entry(iFullPath, entry)); + LEAVEIFERROR(iFramework.Fs().Entry(iFullPath, entry), + OstTraceExt1( TRACE_ERROR, CMTPSENDOBJECTINFO_SETPROPERTIESL, "can't get entry details from %S", iFullPath)); TUint16 assoc(EMTPAssociationTypeUndefined); if (entry.IsDir()) @@ -1235,18 +1257,47 @@ { entry.iAtt |= KEntryAttReadOnly; } - User::LeaveIfError(iFramework.Fs().SetAtt(iFullPath, entry.iAtt, ~entry.iAtt)); + if ( iFileReceived ) + { + User::LeaveIfError(iFileReceived->File().SetAtt(entry.iAtt, ~entry.iAtt)); + } + else + { + LEAVEIFERROR(iFramework.Fs().SetAtt(iFullPath, entry.iAtt, ~entry.iAtt), + OstTraceExt2( TRACE_ERROR, DUP1_CMTPSENDOBJECTINFO_SETPROPERTIESL, "set attribute %d for %S failed!", (TInt32)entry.iAtt, iFullPath)); + } } - + + if ( EMTPHidden == iHiddenStatus ) + { + entry.iAtt &= ~KEntryAttHidden; + entry.iAtt |= KEntryAttHidden; + if ( iFileReceived ) + { + User::LeaveIfError(iFileReceived->File().SetAtt(entry.iAtt, ~entry.iAtt)); + } + else + { + User::LeaveIfError(iFramework.Fs().SetAtt(iFullPath, entry.iAtt, ~entry.iAtt)); + } + } + if(iDateMod != NULL && iDateMod->Length()) { TTime modifiedTime; iDpSingletons.MTPUtility().MTPTimeStr2TTime(*iDateMod, modifiedTime); - User::LeaveIfError(iFramework.Fs().SetModified(iFullPath, modifiedTime)); + if ( iFileReceived ) + { + User::LeaveIfError(iFileReceived->File().SetModified( modifiedTime )); + } + else + { + User::LeaveIfError(iFramework.Fs().SetModified(iFullPath, modifiedTime)); + } } iReceivedObject->SetDesCL(CMTPObjectMetaData::EName, iName); - __FLOG(_L8("SetPropertiesL - Exit")); + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_SETPROPERTIESL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsetobjectproplist.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsetobjectproplist.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsetobjectproplist.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -128,7 +128,35 @@ } } break; - + case EMTPObjectPropCodeHidden: + { + TUint16 hiddenStatus = element.Uint16L(CMTPTypeObjectPropListElement::EValue); + TEntry entry; + if ( EMTPHidden == hiddenStatus ) + { + User::LeaveIfError(iFramework.Fs().Entry(iObjMeta->DesC(CMTPObjectMetaData::ESuid), entry)); + if ( !entry.IsHidden()) + { + entry.iAtt &= ~KEntryAttHidden; + entry.iAtt |= KEntryAttHidden; + User::LeaveIfError(iFramework.Fs().SetAtt(iObjMeta->DesC(CMTPObjectMetaData::ESuid), entry.iAtt, ~entry.iAtt)); + } + } + else if ( EMTPVisible == hiddenStatus ) + { + User::LeaveIfError(iFramework.Fs().Entry(iObjMeta->DesC(CMTPObjectMetaData::ESuid), entry)); + if ( entry.IsHidden()) + { + entry.iAtt &= ~KEntryAttHidden; + User::LeaveIfError(iFramework.Fs().SetAtt(iObjMeta->DesC(CMTPObjectMetaData::ESuid), entry.iAtt, ~entry.iAtt)); + } + } + else + { + responseCode = EMTPRespCodeInvalidObjectPropValue; + } + break; + } case EMTPObjectPropCodeNonConsumable: iObjMeta->SetUint( CMTPObjectMetaData::ENonConsumable, element.Uint8L(CMTPTypeObjectPropListElement::EValue)); iFramework.ObjectMgr().ModifyObjectL(*iObjMeta); @@ -211,6 +239,7 @@ } break; case EMTPObjectPropCodeAssociationType: + case EMTPObjectPropCodeHidden: if (aDataType != EMTPTypeUINT16) { responseCode = EMTPRespCodeInvalidObjectPropFormat; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsetobjectpropvalue.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsetobjectpropvalue.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsetobjectpropvalue.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -29,6 +29,12 @@ #include "rmtpdpsingletons.h" #include "rmtputility.h" #include "cmtpstoragemgr.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsetobjectpropvalueTraces.h" +#endif + /** Verification data for the SetObjectPropValue request @@ -152,8 +158,8 @@ { const TDesC& suid(meta->DesC(CMTPObjectMetaData::ESuid)); TEntry entry; - User::LeaveIfError( iFramework.Fs().Entry(suid, entry) ); - + LEAVEIFERROR( iFramework.Fs().Entry(suid, entry), + OstTraceExt1( TRACE_ERROR, CMTPSETOBJECTPROPVALUE_CHECKREQUESTL, "Gets entry details for %S failed!", suid)); //According to spec, there are 4 statuses: No Protection; Read-only; Read-only data; Non-transferrable data //Currently, we only use FS's Read-only attribute to support No Protection and Read-only statuses. //so if the attribute is read-only, we will return EMTPRespCodeAccessDenied. @@ -176,7 +182,9 @@ TUint32 propCode = Request().Uint32(TMTPTypeRequest::ERequestParameter2); iFramework.ObjectMgr().ObjectL(TMTPTypeUint32(handle), *iObjMeta); - User::LeaveIfError(iRfs.Entry(iObjMeta->DesC(CMTPObjectMetaData::ESuid), iFileEntry)); + LEAVEIFERROR(iRfs.Entry(iObjMeta->DesC(CMTPObjectMetaData::ESuid), iFileEntry), + OstTraceExt1(TRACE_ERROR, CMTPSETOBJECTPROPVALUE_SERVICEL, + "can't get entry details for %S!", iObjMeta->DesC(CMTPObjectMetaData::ESuid))); delete iMTPTypeString; iMTPTypeString = NULL; @@ -192,6 +200,7 @@ ReceiveDataL(iMTPTypeUint8); break; case EMTPObjectPropCodeAssociationType: + case EMTPObjectPropCodeHidden: { ReceiveDataL(iMTPTypeUint16); } @@ -214,6 +223,7 @@ //No break sentance, goto Panic } default: + OstTrace1( TRACE_ERROR, DUP1_CMTPSETOBJECTPROPVALUE_SERVICEL, "Invalid property code %d", propCode); User::Leave( KErrNotSupported ); break; } @@ -245,7 +255,37 @@ } } break; - + case EMTPObjectPropCodeHidden: + { + if ( EMTPHidden == iMTPTypeUint16.Value()) + { + TEntry entry; + User::LeaveIfError(iFramework.Fs().Entry(iObjMeta->DesC(CMTPObjectMetaData::ESuid), entry)); + if ( !entry.IsHidden()) + { + entry.iAtt &= ~KEntryAttHidden; + entry.iAtt |= KEntryAttHidden; + User::LeaveIfError(iFramework.Fs().SetAtt(iObjMeta->DesC(CMTPObjectMetaData::ESuid), entry.iAtt, ~entry.iAtt)); + } + responseCode = EMTPRespCodeOK; + } + else if ( EMTPVisible == iMTPTypeUint16.Value()) + { + TEntry entry; + User::LeaveIfError(iFramework.Fs().Entry(iObjMeta->DesC(CMTPObjectMetaData::ESuid), entry)); + if ( entry.IsHidden()) + { + entry.iAtt &= ~KEntryAttHidden; + User::LeaveIfError(iFramework.Fs().SetAtt(iObjMeta->DesC(CMTPObjectMetaData::ESuid), entry.iAtt, ~entry.iAtt)); + } + responseCode = EMTPRespCodeOK; + } + else + { + responseCode = EMTPRespCodeInvalidObjectPropValue; + } + } + break; case EMTPObjectPropCodeObjectFileName: { @@ -317,6 +357,7 @@ default: + OstTrace1( TRACE_ERROR, CMTPSETOBJECTPROPVALUE_DOHANDLERESPONSEPHASEL, "Invalid property code %d", propCode); User::Leave( KErrNotSupported ); break; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvccompoundprocessor.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvccompoundprocessor.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvccompoundprocessor.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -32,9 +32,13 @@ #include "cmtpconnection.h" #include "cmtpconnectionmgr.h" #include "mtpsvcdpconst.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvccompoundprocessorTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"SvcCompound");) EXPORT_C MMTPRequestProcessor* CMTPSvcCompoundProcessor::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) { @@ -47,12 +51,11 @@ EXPORT_C CMTPSvcCompoundProcessor::~CMTPSvcCompoundProcessor() { - __FLOG(_L8("~CMTPSvcCompoundProcessor - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_CMTPSVCCOMPOUNDPROCESSOR_DES_ENTRY ); delete iReceivedObjectMetaData; delete iObjectInfo; delete iObjectPropList; - __FLOG(_L8("~CMTPSvcCompoundProcessor - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_CMTPSVCCOMPOUNDPROCESSOR_DES_EXIT ); } CMTPSvcCompoundProcessor::CMTPSvcCompoundProcessor(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) : @@ -63,12 +66,11 @@ void CMTPSvcCompoundProcessor::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_CONSTRUCTL_ENTRY ); iExpectedSendObjectRequest.SetUint16(TMTPTypeRequest::ERequestOperationCode, EMTPOpCodeSendObject); iReceivedObjectMetaData = CMTPObjectMetaData::NewL(); iReceivedObjectMetaData->SetUint(CMTPObjectMetaData::EDataProviderId, iFramework.DataProviderId()); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_CONSTRUCTL_EXIT ); } /** @@ -79,7 +81,7 @@ */ TBool CMTPSvcCompoundProcessor::Match(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) const { - __FLOG(_L8("Match - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_MATCH_ENTRY ); TBool result = EFalse; TUint16 operationCode = aRequest.Uint16(TMTPTypeRequest::ERequestOperationCode); if ((&iConnection == &aConnection) && @@ -90,7 +92,7 @@ { result = ETrue; } - __FLOG(_L8("Match - Exit")); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_MATCH_EXIT ); return result; } @@ -105,7 +107,7 @@ */ TMTPResponseCode CMTPSvcCompoundProcessor::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -115,7 +117,9 @@ responseCode = CheckRequestParametersL(); } } - __FLOG_VA((_L8("CheckRequestL - Exit with code: 0x%04X"), responseCode)); + + OstTrace1( TRACE_NORMAL, CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTL, "Exit with code: 0x%04X", responseCode); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTL_EXIT ); return responseCode; } @@ -126,7 +130,7 @@ */ TMTPResponseCode CMTPSvcCompoundProcessor::CheckSendingStateL() { - __FLOG(_L8("CheckSendingStateL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_CHECKSENDINGSTATEL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; iOperationCode = Request().Uint16(TMTPTypeRequest::ERequestOperationCode); @@ -146,7 +150,7 @@ if (iOperationCode == EMTPOpCodeSendObject) { responseCode = EMTPRespCodeNoValidObjectInfo; - __FLOG(_L8("EIdle: Received an orphan SendObject request")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPSVCCOMPOUNDPROCESSOR_CHECKSENDINGSTATEL, "EIdle: Received an orphan SendObject request" ); } break; case EObjectInfoSucceed: @@ -181,13 +185,16 @@ iState = EIdle; // Reset commit state to false iIsCommited = EFalse; - __FLOG(_L8("EObjectInfoSucceed: Receive send obj info request again, return to EIdle")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPSVCCOMPOUNDPROCESSOR_CHECKSENDINGSTATEL, + "EObjectInfoSucceed: Receive send obj info request again, return to EIdle" ); } break; default: + OstTrace1( TRACE_ERROR, DUP3_CMTPSVCCOMPOUNDPROCESSOR_CHECKSENDINGSTATEL, "wrong iState %d", iState); User::Leave(KErrGeneral); } - __FLOG_VA((_L8("CheckSendingStateL - Exit with code: 0x%04X, state: %u"), responseCode, iState)); + OstTraceExt2( TRACE_NORMAL, CMTPSVCCOMPOUNDPROCESSOR_CHECKSENDINGSTATEL, "Exit with code: 0x%04X, state: %u", (TUint32)responseCode, iState ); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_CHECKSENDINGSTATEL_EXIT ); return responseCode; } @@ -197,14 +204,15 @@ */ TMTPResponseCode CMTPSvcCompoundProcessor::CheckRequestParametersL() { - __FLOG(_L8("CheckRequestParametersL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; switch (iOperationCode) { case EMTPOpCodeSendObject: { - __FLOG(_L8("Check SendObject request parameters")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL, + "Check SendObject request parameters" ); // Check SendObject's session ID if (iSessionId != iLastSessionID) { @@ -220,14 +228,16 @@ case EMTPOpCodeSendObjectInfo: { - __FLOG(_L8("Check SendObjectInfo request parameters")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL, + "Check SendObjectInfo request parameters" ); responseCode = CheckStoreAndParent(); break; } case EMTPOpCodeSendObjectPropList: { - __FLOG(_L8("Check SendObjectPropList request parameters")); + OstTrace0( TRACE_NORMAL, DUP3_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL, + "Check SendObjectPropList request parameters" ); responseCode = CheckStoreAndParent(); if (EMTPRespCodeOK == responseCode) { @@ -245,7 +255,8 @@ case EMTPOpCodeUpdateObjectPropList: { - __FLOG(_L8("Check UpdateObjectPropList request parameters")); + OstTrace0( TRACE_NORMAL, DUP4_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL, + "Check UpdateObjectPropList request parameters" ); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); if (objectHandle != KMTPHandleNone) { @@ -280,7 +291,8 @@ responseCode = EMTPRespCodeOperationNotSupported; break; } - __FLOG_VA((_L8("CheckRequestParametersL exit with code: 0x%x"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL, "exit with code: 0x%x", responseCode ); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL_EXIT ); return responseCode; } @@ -290,7 +302,7 @@ */ TMTPResponseCode CMTPSvcCompoundProcessor::CheckStoreAndParent() { - __FLOG(_L8("CheckStoreAndParent - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_CHECKSTOREANDPARENT_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; iStorageId = Request().Uint32(TMTPTypeRequest::ERequestParameter1); iParentHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter2); @@ -320,7 +332,8 @@ } } - __FLOG_VA((_L8("CheckStoreAndParent - Exit with code: 0x%x"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCCOMPOUNDPROCESSOR_CHECKSTOREANDPARENT, "Exit with code: 0x%x", responseCode ); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_CHECKSTOREANDPARENT_EXIT ); return responseCode; } @@ -331,7 +344,7 @@ */ void CMTPSvcCompoundProcessor::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_SERVICEL_ENTRY ); switch (iState) { case EIdle: @@ -341,15 +354,15 @@ ServiceSendObjectL(); break; default: - __FLOG(_L8("Wrong state in ServiceL")); + OstTrace0( TRACE_WARNING, CMTPSVCCOMPOUNDPROCESSOR_SERVICEL, "Wrong state in ServiceL" ); break; } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_SERVICEL_EXIT ); } void CMTPSvcCompoundProcessor::ServiceObjectPropertiesL() { - __FLOG(_L8("ServiceObjectPropertiesL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_SERVICEOBJECTPROPERTIESL_ENTRY ); switch (iOperationCode) { case EMTPOpCodeSendObjectInfo: @@ -363,7 +376,7 @@ default: break; } - __FLOG(_L8("ServiceObjectPropertiesL - Exit")); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_SERVICEOBJECTPROPERTIESL_EXIT ); } /** @@ -371,7 +384,7 @@ */ void CMTPSvcCompoundProcessor::ServiceSendObjectL() { - __FLOG(_L8("ServiceSendObjectL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTL_ENTRY ); MMTPSvcObjectHandler* pHandler = iDataProvider.ObjectHandler(iFormatCode); if (pHandler) { @@ -379,11 +392,13 @@ } else { + OstTrace1( TRACE_ERROR, CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTL, + "can't get object handler for format code %d", iFormatCode); User::Leave(KErrGeneral); } ReceiveDataL(*iObjectContent); iState = EObjectSendProcessing; - __FLOG(_L8("ServiceSendObjectL - Exit")); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTL_EXIT ); } /** @@ -391,13 +406,13 @@ */ void CMTPSvcCompoundProcessor::ServiceSendObjectInfoL() { - __FLOG(_L8("ServiceSendObjectInfoL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTINFOL_ENTRY ); delete iObjectInfo; iObjectInfo = NULL; iObjectInfo = CMTPTypeObjectInfo::NewL(); ReceiveDataL(*iObjectInfo); iState = EObjectInfoProcessing; - __FLOG(_L8("ServiceSendObjectInfoL - Exit")); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTINFOL_EXIT ); } /** @@ -405,13 +420,13 @@ */ void CMTPSvcCompoundProcessor::ServiceSendObjectPropListL() { - __FLOG(_L8("ServiceSendObjectPropListL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTPROPLISTL_ENTRY ); delete iObjectPropList; iObjectPropList = NULL; iObjectPropList = CMTPTypeObjectPropList::NewL(); ReceiveDataL(*iObjectPropList); iState = EObjectInfoProcessing; - __FLOG(_L8("ServiceSendObjectPropListL - Exit")); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTPROPLISTL_EXIT ); } /** @@ -420,7 +435,7 @@ */ TBool CMTPSvcCompoundProcessor::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSEPHASEL_ENTRY ); TBool successful = !iCancelled; switch (iState) { @@ -449,10 +464,11 @@ } default: // Wrong State value. - __FLOG_VA((_L8("DoHandleResponsePhaseL enter an abnormal state %d"), iState)); + OstTrace1( TRACE_WARNING, CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSEPHASEL, + "DoHandleResponsePhaseL enter an abnormal state %d", iState ); break; } - __FLOG(_L8("DoHandleResponsePhaseL - Exit")); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } @@ -462,11 +478,12 @@ */ TBool CMTPSvcCompoundProcessor::DoHandleCompletingPhaseL() { - __FLOG(_L8("DoHandleCompletingPhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_DOHANDLECOMPLETINGPHASEL_ENTRY ); TBool result = ETrue; CMTPRequestProcessor::DoHandleCompletingPhaseL(); - - __FLOG_VA((_L8("DoHandleCompletingPhaseL - Progress State: %u"), iState)); + + OstTrace1( TRACE_WARNING, CMTPSVCCOMPOUNDPROCESSOR_DOHANDLECOMPLETINGPHASEL, + "DoHandleCompletingPhaseL - Progress State: %u", iState ); switch (iState) { case EObjectInfoSucceed: @@ -485,7 +502,9 @@ iLastInfoOperationCode = iOperationCode; } result = EFalse; - __FLOG_VA((_L8("EObjectInfoSucceed: Save send info transaction id: %u, operation: 0x%x"), iLastTransactionID, iOperationCode)); + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLECOMPLETINGPHASEL, + "EObjectInfoSucceed: Save send info transaction id: %u, operation: 0x%x", iLastTransactionID, iOperationCode ); + break; } case EObjectSendFail: @@ -504,7 +523,7 @@ // 4. First request is orphan SendObject, state is Idle break; } - __FLOG(_L8("DoHandleCompletingPhaseL - Exit")); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_DOHANDLECOMPLETINGPHASEL_EXIT ); return result; } @@ -514,7 +533,7 @@ */ TBool CMTPSvcCompoundProcessor::DoHandleResponseSendObjectInfoL() { - __FLOG(_L8("DoHandleResponseSendObjectInfoL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTINFOL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; TBool result(ETrue); iFormatCode = iObjectInfo->Uint16L(CMTPTypeObjectInfo::EObjectFormat); @@ -541,7 +560,8 @@ //if object size is zero, then directly store object without waiting for sendobject operation. if (iObjectSize == 0) { - __FLOG(_L8("CommitReservedObject because object size is 0 and register for SendObject")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTINFOL, + "CommitReservedObject because object size is 0 and register for SendObject" ); // Commit new temp object to object mgr, if leave, CleanupStack will rollback new temp object. TCleanupItem rollBackTempObject(RollBackObject, this); CleanupStack::PushL(rollBackTempObject); @@ -576,7 +596,8 @@ } } result = (responseCode == EMTPRespCodeOK) ? ETrue : EFalse; - __FLOG_VA((_L8("DoHandleResponseSendObjectInfoL exit with code: 0x%x"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTINFOL, "exit with code: 0x%x", responseCode); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTINFOL_EXIT ); return result; } @@ -586,7 +607,7 @@ */ TBool CMTPSvcCompoundProcessor::DoHandleResponseSendObjectPropListL() { - __FLOG(_L8("DoHandleResponseSendObjectPropListL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTPROPLISTL_ENTRY ); TBool result = ETrue; TMTPResponseCode responseCode = EMTPRespCodeOK; @@ -602,7 +623,8 @@ //if object size is zero, then directly store object without waiting for sendobject operation. if (iObjectSize == 0) { - __FLOG(_L8("CommitReservedObject because object size is 0 and register for SendObject")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTPROPLISTL, + "CommitReservedObject because object size is 0 and register for SendObject" ); // Commit new temp object to object mgr, if leave, CleanupStack will rollback new temp object. TCleanupItem rollBackTempObject(RollBackObject, this); CleanupStack::PushL(rollBackTempObject); @@ -637,7 +659,8 @@ } result = (responseCode == EMTPRespCodeOK) ? ETrue : EFalse; - __FLOG_VA((_L8("DoHandleResponseSendObjectPropListL exit with code = 0x%x"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTPROPLISTL, "exit with code = 0x%x", responseCode ); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTPROPLISTL_EXIT ); return result; } @@ -647,7 +670,7 @@ */ TBool CMTPSvcCompoundProcessor::DoHandleResponseUpdateObjectPropListL() { - __FLOG(_L8("DoHandleResponseUpdateObjectPropListL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSEUPDATEOBJECTPROPLISTL_ENTRY ); TBool result = ETrue; TUint32 parameter = 0; TMTPResponseCode responseCode = EMTPRespCodeOK; @@ -682,7 +705,8 @@ } SendResponseL(responseCode, 1, ¶meter); result = (responseCode == EMTPRespCodeOK) ? ETrue: EFalse; - __FLOG_VA((_L8("DoHandleResponseUpdateObjectPropListL exit with code: 0x%x"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSEUPDATEOBJECTPROPLISTL, "exit with code: 0x%x", responseCode ); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSEUPDATEOBJECTPROPLISTL_EXIT ); return result; } @@ -692,7 +716,7 @@ */ TBool CMTPSvcCompoundProcessor::DoHandleResponseSendObjectL() { - __FLOG(_L8("DoHandleResponseSendObjectL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; TBool result = ETrue; @@ -767,13 +791,15 @@ { iFramework.RouteRequestUnregisterL(iExpectedSendObjectRequest, iConnection); } - __FLOG_VA((_L8("DoHandleResponseSendObjectL exit with code = 0x%x"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTL, "exit with code = 0x%x", responseCode ); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTL_EXIT ); + return result; } TMTPResponseCode CMTPSvcCompoundProcessor::ExtractObjectSizeL() { - __FLOG(_L8("ExtractObjectSizeL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_EXTRACTOBJECTSIZEL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; TBool foundSizeProp = EFalse; const TUint KCount(iObjectPropList->NumberOfElements()); @@ -800,7 +826,7 @@ } } - __FLOG(_L8("ExtractObjectSizeL - Exit")); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_EXTRACTOBJECTSIZEL_EXIT ); return responseCode; } @@ -810,17 +836,18 @@ */ void CMTPSvcCompoundProcessor::ReserveObjectL() { - __FLOG(_L8("ReserveObjectL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_RESERVEOBJECTL_ENTRY ); iReceivedObjectMetaData->SetUint(CMTPObjectMetaData::EStorageId, iStorageId); iReceivedObjectMetaData->SetUint(CMTPObjectMetaData::EParentHandle, iParentHandle); iReceivedObjectMetaData->SetUint(CMTPObjectMetaData::EFormatCode, iFormatCode); iFramework.ObjectMgr().ReserveObjectHandleL(*iReceivedObjectMetaData, iObjectSize); - __FLOG_VA((_L8("ReserveObjectL Exit Storage:%u, ParentHandle:%u, FormatCode:%u, Size:%u "), iStorageId, iParentHandle, iFormatCode, iObjectSize)); + OstTraceExt4( TRACE_NORMAL, CMTPSVCCOMPOUNDPROCESSOR_RESERVEOBJECTL, "Exit Storage:%u, ParentHandle:%u, FormatCode:%u, Size:%u", iStorageId, iParentHandle, iFormatCode, iObjectSize ); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_RESERVEOBJECTL_EXIT ); } void CMTPSvcCompoundProcessor::RegisterRequestAndSendResponseL(TMTPResponseCode aResponseCode) { - __FLOG(_L8("RegisterRequestAndSendResponseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_REGISTERREQUESTANDSENDRESPONSEL_ENTRY ); // Register to framework for handle the next sendobj request iExpectedSendObjectRequest.SetUint32(TMTPTypeRequest::ERequestSessionID, iSessionId); iFramework.RouteRequestRegisterL(iExpectedSendObjectRequest, iConnection); @@ -830,7 +857,7 @@ // Responder’s reserved ObjectHandle for the incoming object parameters[2] = iReceivedObjectMetaData->Uint(CMTPObjectMetaData::EHandle); SendResponseL(aResponseCode, 3, parameters); - __FLOG(_L8("RegisterRequestAndSendResponseL - Exit")); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_REGISTERREQUESTANDSENDRESPONSEL_EXIT ); } void CMTPSvcCompoundProcessor::RollBackObject(TAny* aObject) @@ -850,21 +877,21 @@ TMTPResponseCode CMTPSvcCompoundProcessor::CheckFmtAndSetHandler(TUint32 aFormatCode) { - __FLOG(_L8("CheckFmtAndSetHandler - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_CHECKFMTANDSETHANDLER_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; iObjectHandler = iDataProvider.ObjectHandler(aFormatCode); if (!iObjectHandler) { responseCode = EMTPRespCodeInvalidObjectFormatCode; } - __FLOG(_L8("CheckFmtAndSetHandler - Exit")); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_CHECKFMTANDSETHANDLER_EXIT ); return responseCode; } TMTPResponseCode CMTPSvcCompoundProcessor::SendObjectPropListL(const CMTPTypeObjectPropList& aObjectPropList, TUint32& aParentHandle, TUint32& aParameter, TDes& aSuid, TUint64 aObjectSize) { - __FLOG(_L8("SendObjectPropListL - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_SENDOBJECTPROPLISTL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; aParameter = 0; @@ -905,7 +932,8 @@ iObjectHandler->RollBack(); } } - __FLOG_VA((_L8("SendObjectPropListL - Exit with responseCode = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCCOMPOUNDPROCESSOR_SENDOBJECTPROPLISTL, "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_SENDOBJECTPROPLISTL_EXIT ); return responseCode; } @@ -915,7 +943,7 @@ const CMTPTypeObjectPropList& aObjectPropList, TUint32& /*aParameter*/) { - __FLOG(_L8("UpdateObjectPropList - Entry")); + OstTraceFunctionEntry0( CMTPSVCCOMPOUNDPROCESSOR_UPDATEOBJECTPROPLISTL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; const TUint count = aObjectPropList.NumberOfElements(); aObjectPropList.ResetCursor(); @@ -940,6 +968,7 @@ break; } } - __FLOG_VA((_L8("UpdateObjectPropListL - Exit with responseCode = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCCOMPOUNDPROCESSOR_UPDATEOBJECTPROPLISTL, "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCCOMPOUNDPROCESSOR_UPDATEOBJECTPROPLISTL_EXIT ); return responseCode; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcdeleteobject.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcdeleteobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcdeleteobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,9 +21,13 @@ #include "mtpdpconst.h" #include "mmtpservicedataprovider.h" #include "mmtpsvcobjecthandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcdeleteobjectTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"SvcDeleteObject");) EXPORT_C MMTPRequestProcessor* CMTPSvcDeleteObject::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, @@ -35,18 +39,16 @@ EXPORT_C CMTPSvcDeleteObject::~CMTPSvcDeleteObject() { - __FLOG(_L8("~CMTPSvcDeleteObject - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECT_CMTPSVCDELETEOBJECT_DES_ENTRY ); iObjectHandles.Close(); delete iReceivedObjectMetaData; - __FLOG(_L8("~CMTPSvcDeleteObject - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCDELETEOBJECT_CMTPSVCDELETEOBJECT_DES_EXIT ); } CMTPSvcDeleteObject::CMTPSvcDeleteObject(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) : CMTPRequestProcessor(aFramework, aConnection, 0, NULL), iDataProvider(aDataProvider), iDeleteError(KErrNone) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPSvcDeleteObject - Constructed")); + OstTrace0( TRACE_NORMAL, CMTPSVCDELETEOBJECT_CMTPSVCDELETEOBJECT, "CMTPSvcDeleteObject - Constructed" ); } /** @@ -54,7 +56,7 @@ */ void CMTPSvcDeleteObject::LoadAllObjHandlesL(TUint32 aParentHandle) { - __FLOG(_L8("LoadAllObjHandlesL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECT_LOADALLOBJHANDLESL_ENTRY ); const TUint32 KFormatCode = Request().Uint32(TMTPTypeRequest::ERequestParameter2); RMTPObjectMgrQueryContext context; CleanupClosePushL(context); @@ -67,16 +69,17 @@ } while (!context.QueryComplete()); CleanupStack::PopAndDestroy(&context); - __FLOG(_L8("LoadAllObjHandlesL - Exit")); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECT_LOADALLOBJHANDLESL_EXIT ); } void CMTPSvcDeleteObject::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECT_SERVICEL_ENTRY ); if (iFormatCode == EMTPFormatCodeAssociation) { // Framework may send deleteobject for a directory, allow framework do this. SendResponseL(EMTPRespCodeOK); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECT_SERVICEL_EXIT ); return; } @@ -95,15 +98,17 @@ // Remove from framework. iFramework.ObjectMgr().RemoveObjectL(iReceivedObjectMetaData->DesC(CMTPObjectMetaData::ESuid)); SendResponseL(responseCode); - __FLOG_VA((_L8("Delete single object exit with response code = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCDELETEOBJECT_SERVICEL, + "Delete single object exit with response code = 0x%04X", responseCode ); } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( DUP1_CMTPSVCDELETEOBJECT_SERVICEL_EXIT ); } void CMTPSvcDeleteObject::RunL() { - __FLOG(_L8("RunL - Entry")); - __FLOG_VA((_L8("the number of objects to be deleted is %d, iDeleteIndex is %d"), iObjectHandles.Count(), iDeleteIndex)); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECT_RUNL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPSVCDELETEOBJECT_RUNL, + "the number of objects to be deleted is %d, iDeleteIndex is %d", iObjectHandles.Count(), iDeleteIndex ); if (iStatus != KErrNone) { @@ -128,7 +133,8 @@ else { ++errCount; - __FLOG_VA((_L8("Delete object failed, SUID:%S"), &(iReceivedObjectMetaData->DesC(CMTPObjectMetaData::ESuid)))); + OstTraceExt1( TRACE_NORMAL, DUP1_CMTPSVCDELETEOBJECT_RUNL, + "Delete object failed, SUID:%S", iReceivedObjectMetaData->DesC(CMTPObjectMetaData::ESuid)); } } @@ -145,7 +151,7 @@ TInt err = (errCount > 0) ? KErrGeneral : KErrNone; CompleteSelf(err); } - __FLOG(_L8("RunL - Exit")); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECT_RUNL_EXIT ); } /** @@ -153,9 +159,9 @@ */ TInt CMTPSvcDeleteObject::RunError(TInt aError) { - __FLOG(_L8("RunError - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECT_RUNERROR_ENTRY ); CompleteSelf(aError); - __FLOG(_L8("RunError - Exit")); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECT_RUNERROR_EXIT ); return KErrNone; } @@ -164,17 +170,17 @@ */ void CMTPSvcDeleteObject::CompleteSelf(TInt aError) { - __FLOG(_L8("CompleteSelf - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECT_COMPLETESELF_ENTRY ); SetActive(); TRequestStatus* status = &iStatus; *status = KRequestPending; User::RequestComplete(status, aError); - __FLOG(_L8("CompleteSelf - Exit")); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECT_COMPLETESELF_EXIT ); } TMTPResponseCode CMTPSvcDeleteObject::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECT_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -192,7 +198,7 @@ if (iReceivedObjectMetaData->Uint(CMTPObjectMetaData::EDataProviderId) != iFramework.DataProviderId() && (iFormatCode != EMTPFormatCodeAssociation)) { responseCode = EMTPRespCodeInvalidObjectHandle; - __FLOG(_L8("DataProviderId dismatch")); + OstTrace0( TRACE_WARNING, DUP1_CMTPSVCDELETEOBJECT_CHECKREQUESTL, "DataProviderId dismatch" ); } else { @@ -216,13 +222,14 @@ } } - __FLOG_VA((_L8("CheckRequestL Exit with response code = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCDELETEOBJECT_CHECKREQUESTL, "Exit with response code = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECT_CHECKREQUESTL_EXIT ); return responseCode; } void CMTPSvcDeleteObject::ProcessFinalPhaseL() { - __FLOG(_L8("ProcessFinalPhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECT_PROCESSFINALPHASEL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; if (iDeleteError != KErrNone) { @@ -236,25 +243,26 @@ } } SendResponseL(responseCode); - __FLOG_VA((_L8("ProcessFinalPhaseL - Exit with response code = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCDELETEOBJECT_PROCESSFINALPHASEL, "Exit with response code = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECT_PROCESSFINALPHASEL_EXIT ); } TMTPResponseCode CMTPSvcDeleteObject::CheckFmtAndSetHandler(TUint32 aFormatCode) { - __FLOG(_L8("CheckFmtAndSetHandler - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECT_CHECKFMTANDSETHANDLER_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; iObjectHandler = iDataProvider.ObjectHandler(aFormatCode); if (!iObjectHandler) { responseCode = EMTPRespCodeInvalidObjectFormatCode; } - __FLOG(_L8("CheckFmtAndSetHandler - Exit")); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECT_CHECKFMTANDSETHANDLER_EXIT ); return responseCode; } TMTPResponseCode CMTPSvcDeleteObject::DeleteObjectL(const CMTPObjectMetaData& aObjectMetaData) { - __FLOG(_L8("DeleteObjectL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECT_DELETEOBJECTL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; TUint16 formatCode = aObjectMetaData.Uint(CMTPObjectMetaData::EFormatCode); responseCode = CheckFmtAndSetHandler(formatCode); @@ -262,6 +270,6 @@ { responseCode = iObjectHandler->DeleteObjectL(aObjectMetaData); } - __FLOG(_L8("DeleteObjectL - Exit")); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECT_DELETEOBJECTL_EXIT ); return responseCode; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcdeleteobjectproplist.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcdeleteobjectproplist.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcdeleteobjectproplist.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,9 +22,12 @@ #include "cmtpsvcdeleteobjectproplist.h" #include "mmtpservicedataprovider.h" #include "mmtpsvcobjecthandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcdeleteobjectproplistTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"SvcDelObjPropList");) + EXPORT_C MMTPRequestProcessor* CMTPSvcDeleteObjectPropList::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, @@ -39,11 +42,10 @@ EXPORT_C CMTPSvcDeleteObjectPropList::~CMTPSvcDeleteObjectPropList() { - __FLOG(_L8("~CMTPSvcDeleteObjectPropList - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECTPROPLIST_CMTPSVCDELETEOBJECTPROPLIST_DES_ENTRY ); delete iPropertyList; delete iReceivedObjectMetaData; - __FLOG(_L8("~CMTPSvcDeleteObjectPropList - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCDELETEOBJECTPROPLIST_CMTPSVCDELETEOBJECTPROPLIST_DES_EXIT ); } CMTPSvcDeleteObjectPropList::CMTPSvcDeleteObjectPropList(MMTPDataProviderFramework& aFramework, @@ -56,15 +58,14 @@ void CMTPSvcDeleteObjectPropList::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECTPROPLIST_CONSTRUCTL_ENTRY ); iPropertyList = CMTPTypeDeleteObjectPropList::NewL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECTPROPLIST_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPSvcDeleteObjectPropList::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECTPROPLIST_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -81,7 +82,7 @@ if (iReceivedObjectMetaData->Uint(CMTPObjectMetaData::EDataProviderId) != iFramework.DataProviderId()) { responseCode = EMTPRespCodeInvalidObjectHandle; - __FLOG(_L8("CheckRequestL - DataProviderId dismatch")); + OstTrace0( TRACE_WARNING, DUP1_CMTPSVCDELETEOBJECTPROPLIST_CHECKREQUESTL, "CheckRequestL - DataProviderId dismatch" ); } else { @@ -103,27 +104,31 @@ iReceivedObjectMetaData->SetUint(CMTPObjectMetaData::EHandle, KMTPHandleAll); } } - __FLOG_VA((_L8("CheckRequestL - Exit with responseCode = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCDELETEOBJECTPROPLIST_CHECKREQUESTL, "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECTPROPLIST_CHECKREQUESTL_EXIT ); return responseCode; } void CMTPSvcDeleteObjectPropList::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECTPROPLIST_SERVICEL_ENTRY ); ReceiveDataL(*iPropertyList); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECTPROPLIST_SERVICEL_EXIT ); } TBool CMTPSvcDeleteObjectPropList::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY ); TUint32 parameter(0); TMTPResponseCode responseCode = EMTPRespCodeOK; responseCode = DeleteObjectPropListL(*iReceivedObjectMetaData, *iPropertyList, parameter); SendResponseL(responseCode, 1, ¶meter); - __FLOG_VA((_L8("DeleteObjectPropListL responseCode = 0x%x, failed index = %u"), responseCode, parameter)); + OstTraceExt2( TRACE_NORMAL, CMTPSVCDELETEOBJECTPROPLIST_DOHANDLERESPONSEPHASEL, + "DeleteObjectPropListL responseCode = 0x%x, failed index = %u", responseCode, parameter ); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_EXIT ); + return EFalse; } @@ -136,7 +141,7 @@ const CMTPTypeDeleteObjectPropList& aPropList, TUint32& aParameter) { - __FLOG(_L8("DeleteObjectPropList- Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETEOBJECTPROPLIST_DELETEOBJECTPROPLISTL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; TUint handle = aObjectMetaData.Uint(CMTPObjectMetaData::EHandle); MMTPSvcObjectHandler* lastHandler = NULL; @@ -265,6 +270,8 @@ aParameter = errIndex; } } - __FLOG_VA((_L8("DeleteObjectPropList - Exit with responseCode = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCDELETEOBJECTPROPLIST_DELETEOBJECTPROPLISTL, + "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCDELETEOBJECTPROPLIST_DELETEOBJECTPROPLISTL_EXIT ); return responseCode; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcdeleteserviceproplist.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcdeleteserviceproplist.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcdeleteserviceproplist.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -19,8 +19,11 @@ #include "cmtpsvcdeleteserviceproplist.h" #include "mmtpservicedataprovider.h" #include "mmtpservicehandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcdeleteserviceproplistTraces.h" +#endif -__FLOG_STMT (_LIT8(KComponent, "SvcDelSvcPList");) EXPORT_C MMTPRequestProcessor* CMTPSvcDeleteServicePropList::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, @@ -35,10 +38,9 @@ EXPORT_C CMTPSvcDeleteServicePropList::~CMTPSvcDeleteServicePropList() { - __FLOG(_L8("~CMTPSvcDeleteServicePropList - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETESERVICEPROPLIST_CMTPSVCDELETESERVICEPROPLIST_DES_ENTRY ); delete iDeleteServicePropList; - __FLOG(_L8("~CMTPSvcDeleteServicePropList - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCDELETESERVICEPROPLIST_CMTPSVCDELETESERVICEPROPLIST_DES_EXIT ); } CMTPSvcDeleteServicePropList::CMTPSvcDeleteServicePropList(MMTPDataProviderFramework& aFramework, @@ -50,15 +52,14 @@ void CMTPSvcDeleteServicePropList::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETESERVICEPROPLIST_CONSTRUCTL_ENTRY ); iDeleteServicePropList = CMTPTypeDeleteServicePropList::NewL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSVCDELETESERVICEPROPLIST_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPSvcDeleteServicePropList::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETESERVICEPROPLIST_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -68,21 +69,23 @@ responseCode = EMTPRespCodeInvalidServiceID; } } - __FLOG_VA((_L8("CheckRequestL - Exit with responseCode = 0x%04X"), responseCode)); + + OstTrace1( TRACE_NORMAL, CMTPSVCDELETESERVICEPROPLIST_CHECKREQUESTL, "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCDELETESERVICEPROPLIST_CHECKREQUESTL_EXIT ); return responseCode; } void CMTPSvcDeleteServicePropList::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETESERVICEPROPLIST_SERVICEL_ENTRY ); //Recieve the data from the property list ReceiveDataL(*iDeleteServicePropList); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCDELETESERVICEPROPLIST_SERVICEL_EXIT ); } TBool CMTPSvcDeleteServicePropList::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCDELETESERVICEPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; TUint32 parameter = 0; const TUint count = iDeleteServicePropList->NumberOfElements(); @@ -106,7 +109,9 @@ } } SendResponseL(responseCode, 1, ¶meter); - __FLOG_VA((_L8("DoHandleResponsePhaseL - Exit responseCode = 0x%04X, failed index = %u"), responseCode, parameter)); + OstTraceExt2( TRACE_NORMAL, CMTPSVCDELETESERVICEPROPLIST_DOHANDLERESPONSEPHASEL, + "Exit responseCode = 0x%04X, failed index = %u", responseCode, parameter ); + OstTraceFunctionExit0( CMTPSVCDELETESERVICEPROPLIST_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetobject.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,9 +21,13 @@ #include "cmtpsvcgetobject.h" #include "mmtpservicedataprovider.h" #include "mmtpsvcobjecthandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcgetobjectTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"SvcGetObject");) EXPORT_C MMTPRequestProcessor* CMTPSvcGetObject::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) { @@ -36,15 +40,14 @@ EXPORT_C CMTPSvcGetObject::~CMTPSvcGetObject() { - __FLOG(_L8("~CMTPSvcGetObject - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECT_CMTPSVCGETOBJECT_ENTRY ); if (iReceivedObjectMetaData && iObjectHandler) { iObjectHandler->ReleaseObjectBuffer(); } delete iReceivedObjectMetaData; - __FLOG(_L8("~CMTPSvcGetObject - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCGETOBJECT_CMTPSVCGETOBJECT_EXIT ); } CMTPSvcGetObject::CMTPSvcGetObject(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) : @@ -55,14 +58,13 @@ void CMTPSvcGetObject::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECT_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPSVCGETOBJECT_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPSvcGetObject::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECT_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -76,7 +78,7 @@ if (iReceivedObjectMetaData->Uint(CMTPObjectMetaData::EDataProviderId) != iFramework.DataProviderId()) { responseCode = EMTPRespCodeInvalidObjectHandle; - __FLOG(_L8("CheckRequestL - DataProviderId dismatch")); + OstTrace0( TRACE_WARNING, DUP1_CMTPSVCGETOBJECT_CHECKREQUESTL, "CheckRequestL - DataProviderId dismatch" ); } else { @@ -94,14 +96,16 @@ responseCode = EMTPRespCodeInvalidObjectHandle; } } - __FLOG_VA((_L8("CheckRequestL - Exit with response code = 0x%04X"), responseCode)); + + OstTrace1( TRACE_NORMAL, CMTPSVCGETOBJECT_CHECKREQUESTL, "Exit with response code = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETOBJECT_CHECKREQUESTL_EXIT ); return responseCode; } void CMTPSvcGetObject::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECT_SERVICEL_ENTRY ); iObjectHandler->GetObjectL(*iReceivedObjectMetaData, &iBuffer); SendDataL(*iBuffer); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETOBJECT_SERVICEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetobjectinfo.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetobjectinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetobjectinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,8 +23,11 @@ #include "cmtpsvcgetobjectinfo.h" #include "mmtpservicedataprovider.h" #include "mmtpsvcobjecthandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcgetobjectinfoTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"SvcGetObjInfo");) EXPORT_C MMTPRequestProcessor* CMTPSvcGetObjectInfo::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, @@ -39,10 +42,10 @@ EXPORT_C CMTPSvcGetObjectInfo::~CMTPSvcGetObjectInfo() { - __FLOG(_L8("~CMTPSvcGetObjectInfo - Destructed")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTINFO_CMTPSVCGETOBJECTINFO_ENTRY ); delete iReceivedObjectMetaData; delete iObjectInfo; - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCGETOBJECTINFO_CMTPSVCGETOBJECTINFO_EXIT ); } CMTPSvcGetObjectInfo::CMTPSvcGetObjectInfo(MMTPDataProviderFramework& aFramework, @@ -53,17 +56,16 @@ void CMTPSvcGetObjectInfo::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTINFO_CONSTRUCTL_ENTRY ); iObjectInfo = CMTPTypeObjectInfo::NewL(); - - __FLOG(_L8("ConstructL - - Exit")); + + OstTraceFunctionExit0( CMTPSVCGETOBJECTINFO_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPSvcGetObjectInfo::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTINFO_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -76,7 +78,7 @@ if (iReceivedObjectMetaData->Uint(CMTPObjectMetaData::EDataProviderId) != iFramework.DataProviderId()) { responseCode = EMTPRespCodeInvalidObjectHandle; - __FLOG(_L8("CheckRequestL - DataProviderId dismatch")); + OstTrace0( TRACE_WARNING, DUP1_CMTPSVCGETOBJECTINFO_CHECKREQUESTL, "CheckRequestL - DataProviderId dismatch" ); } else { @@ -94,16 +96,18 @@ responseCode = EMTPRespCodeInvalidObjectHandle; } } - __FLOG_VA((_L8("CheckRequestL - Exit with response code = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETOBJECTINFO_CHECKREQUESTL, "Exit with response code = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETOBJECTINFO_CHECKREQUESTL_EXIT ); + return responseCode; } void CMTPSvcGetObjectInfo::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTINFO_SERVICEL_ENTRY ); __ASSERT_DEBUG(iObjectHandler, User::Invariant()); TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); iObjectHandler->GetObjectInfoL(*iReceivedObjectMetaData, *iObjectInfo); SendDataL(*iObjectInfo); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETOBJECTINFO_SERVICEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetobjectproplist.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetobjectproplist.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetobjectproplist.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,9 +23,12 @@ #include "mtpsvcdpconst.h" #include "mmtpservicedataprovider.h" #include "mmtpsvcobjecthandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcgetobjectproplistTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"SvcGetObjPL");) + EXPORT_C MMTPRequestProcessor* CMTPSvcGetObjectPropList::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) { @@ -38,12 +41,11 @@ EXPORT_C CMTPSvcGetObjectPropList::~CMTPSvcGetObjectPropList() { - __FLOG(_L8("~CMTPSvcGetObjectPropList - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTPROPLIST_CMTPSVCGETOBJECTPROPLIST_DES_ENTRY ); delete iPropertyList; delete iReceivedObjectMetaData; iObjectHandles.Close(); - __FLOG(_L8("~CMTPSvcGetObjectPropList - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCGETOBJECTPROPLIST_CMTPSVCGETOBJECTPROPLIST_DES_EXIT ); } CMTPSvcGetObjectPropList::CMTPSvcGetObjectPropList(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) : @@ -56,15 +58,14 @@ void CMTPSvcGetObjectPropList::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTPROPLIST_CONSTRUCTL_ENTRY ); iPropertyList = CMTPTypeObjectPropList::NewL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETOBJECTPROPLIST_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPSvcGetObjectPropList::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTPROPLIST_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -76,13 +77,15 @@ responseCode = CheckDepth(); } - __FLOG_VA((_L8("CheckRequestL - Exit with responseCode = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETOBJECTPROPLIST_CHECKREQUESTL, "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETOBJECTPROPLIST_CHECKREQUESTL_EXIT ); + return responseCode; } TMTPResponseCode CMTPSvcGetObjectPropList::CheckObjectHandleAndFormatL() { - __FLOG(_L8("CheckObjectHandleAndFormatL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTPROPLIST_CHECKOBJECTHANDLEANDFORMATL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; TUint32 objectHandle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); @@ -99,7 +102,7 @@ if (iReceivedObjectMetaData->Uint(CMTPObjectMetaData::EDataProviderId) != iFramework.DataProviderId()) { responseCode = EMTPRespCodeInvalidObjectHandle; - __FLOG(_L8("CheckRequestL - DataProviderId dismatch")); + OstTrace0( TRACE_WARNING, DUP1_CMTPSVCGETOBJECTPROPLIST_CHECKOBJECTHANDLEANDFORMATL, "CheckRequestL - DataProviderId dismatch" ); } else { @@ -139,13 +142,15 @@ } } } - __FLOG_VA((_L8("CheckObjectHandleAndFormatL - Exit with response code = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETOBJECTPROPLIST_CHECKOBJECTHANDLEANDFORMATL, "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETOBJECTPROPLIST_CHECKOBJECTHANDLEANDFORMATL_EXIT ); + return responseCode; } TMTPResponseCode CMTPSvcGetObjectPropList::CheckPropertyCodeForFormatL(TUint32 aFormatCode) const { - __FLOG(_L8("CheckPropertyCodeForFormatL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTPROPLIST_CHECKPROPERTYCODEFORFORMATL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; if (iPropCode != KMTPObjectPropCodeAll && iPropCode != KMTPNotSpecified32) { @@ -154,7 +159,8 @@ responseCode = EMTPRespCodeInvalidObjectPropCode; } } - __FLOG_VA((_L8("CheckPropertyCodeForFormatL - Exit with response code = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETOBJECTPROPLIST_CHECKPROPERTYCODEFORFORMATL, "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETOBJECTPROPLIST_CHECKPROPERTYCODEFORFORMATL_EXIT ); return responseCode; } @@ -164,7 +170,7 @@ */ TMTPResponseCode CMTPSvcGetObjectPropList::CheckDepth() const { - __FLOG(_L8("CheckDepth - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTPROPLIST_CHECKDEPTH_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeSpecificationByDepthUnsupported; // Support depth 0 or 1 or 0xFFFFFFFF TUint32 handle = Request().Uint32(TMTPTypeRequest::ERequestParameter1); @@ -173,13 +179,14 @@ { responseCode = EMTPRespCodeOK; } - __FLOG_VA((_L8("CheckDepth - Exit with response code = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETOBJECTPROPLIST_CHECKDEPTH, "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETOBJECTPROPLIST_CHECKDEPTH_EXIT ); return responseCode; } void CMTPSvcGetObjectPropList::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTPROPLIST_SERVICEL_ENTRY ); TUint32 handle(Request().Uint32(TMTPTypeRequest::ERequestParameter1)); TUint32 formatCode(Request().Uint32(TMTPTypeRequest::ERequestParameter2)); TUint32 depth(Request().Uint32(TMTPTypeRequest::ERequestParameter5)); @@ -206,7 +213,7 @@ GetObjectPropertyHelperL(); SendDataL(*iPropertyList); } - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETOBJECTPROPLIST_SERVICEL_EXIT ); } /** @@ -215,17 +222,19 @@ */ TBool CMTPSvcGetObjectPropList::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY ); TMTPResponseCode responseCode = (iCancelled ? EMTPRespCodeIncompleteTransfer : iResponseCode); SendResponseL(responseCode); - __FLOG_VA((_L8("DoHandleResponsePhaseL - Exit with response code = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL, "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } void CMTPSvcGetObjectPropList::RunL() { - __FLOG(_L8("RunL - Entry")); - __FLOG_VA((_L8("the number of objects to be queried is %d, iHandleIndex is %d"), iObjectHandles.Count(), iHandleIndex)); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTPROPLIST_RUNL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPSVCGETOBJECTPROPLIST_RUNL, + "the number of objects to be queried is %d, iHandleIndex is %d", iObjectHandles.Count(), iHandleIndex); TInt count = iObjectHandles.Count(); const TUint32 granularity = iDataProvider.OperationGranularity(); @@ -245,7 +254,8 @@ // An unsupport object got from object mgr. iResponseCode = EMTPRespCodeInvalidObjectHandle; } - __FLOG_VA((_L8("Get a object property list, SUID:%S, response code: 0x%4x"), &(iReceivedObjectMetaData->DesC(CMTPObjectMetaData::ESuid)), iResponseCode)); + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPSVCGETOBJECTPROPLIST_RUNL, + "Get a object property list, SUID:%S, response code: 0x%4x",iReceivedObjectMetaData->DesC(CMTPObjectMetaData::ESuid), (TUint32)iResponseCode ); } if (iHandleIndex >= count) @@ -256,14 +266,14 @@ { CompleteSelf(KErrNone); } - __FLOG(_L8("RunL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETOBJECTPROPLIST_RUNL_EXIT ); } TInt CMTPSvcGetObjectPropList::RunError(TInt aError) { - __FLOG(_L8("RunError - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTPROPLIST_RUNERROR_ENTRY ); CompleteSelf(aError); - __FLOG(_L8("RunError - Exit")); + OstTraceFunctionExit0( CMTPSVCGETOBJECTPROPLIST_RUNERROR_EXIT ); return KErrNone; } @@ -272,12 +282,12 @@ */ void CMTPSvcGetObjectPropList::CompleteSelf(TInt aError) { - __FLOG(_L8("CompleteSelf - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTPROPLIST_COMPLETESELF_ENTRY ); SetActive(); TRequestStatus* status = &iStatus; *status = KRequestPending; User::RequestComplete(status, aError); - __FLOG(_L8("CompleteSelf - Exit")); + OstTraceFunctionExit0( CMTPSVCGETOBJECTPROPLIST_COMPLETESELF_EXIT ); } /** @@ -285,9 +295,9 @@ */ void CMTPSvcGetObjectPropList::ProcessFinalPhaseL() { - __FLOG(_L8("ProcessFinalPhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETOBJECTPROPLIST_PROCESSFINALPHASEL_ENTRY ); SendDataL(*iPropertyList); - __FLOG(_L8("ProcessFinalPhaseL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETOBJECTPROPLIST_PROCESSFINALPHASEL_EXIT ); } void CMTPSvcGetObjectPropList::GetObjectPropertyHelperL() diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetreferences.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetreferences.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetreferences.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,8 +23,12 @@ #include "cmtpsvcgetreferences.h" #include "mmtpservicedataprovider.h" #include "mmtpsvcobjecthandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcgetreferencesTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"SvcGetRef");) + EXPORT_C MMTPRequestProcessor* CMTPSvcGetReferences::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, @@ -39,11 +43,10 @@ */ EXPORT_C CMTPSvcGetReferences::~CMTPSvcGetReferences() { - __FLOG(_L8("~CMTPSvcGetReferences - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETREFERENCES_CMTPSVCGETREFERENCES_DES_ENTRY ); delete iReferences; delete iReceivedObjectMetaData; - __FLOG(_L8("~CMTPSvcGetReferences - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCGETREFERENCES_CMTPSVCGETREFERENCES_DES_EXIT ); } /** @@ -55,13 +58,13 @@ :CMTPRequestProcessor(aFramework, aConnection, 0, NULL), iDataProvider(aDataProvider) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("Constructed")); + OstTraceFunctionEntry0( CMTPSVCGETREFERENCES_CMTPSVCGETREFERENCES_CONS_ENTRY ); + OstTraceFunctionExit0( CMTPSVCGETREFERENCES_CMTPSVCGETREFERENCES_CONS_EXIT ); } TMTPResponseCode CMTPSvcGetReferences::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETREFERENCES_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) @@ -77,7 +80,7 @@ if (iReceivedObjectMetaData->Uint(CMTPObjectMetaData::EDataProviderId) != iFramework.DataProviderId()) { responseCode = EMTPRespCodeInvalidObjectHandle; - __FLOG(_L8("CheckRequestL - DataProviderId dismatch")); + OstTrace0( TRACE_WARNING, DUP1_CMTPSVCGETREFERENCES_CHECKREQUESTL, "CheckRequestL - DataProviderId dismatch" ); } else { @@ -94,18 +97,19 @@ responseCode = EMTPRespCodeInvalidObjectHandle; } } - __FLOG_VA((_L8("CheckRequestL - Exit with code: 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETREFERENCES_CHECKREQUESTL, "Exit with code: 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETREFERENCES_CHECKREQUESTL_EXIT ); return responseCode; } void CMTPSvcGetReferences::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETREFERENCES_SERVICEL_ENTRY ); TUint16 formatCode = iReceivedObjectMetaData->Uint(CMTPObjectMetaData::EFormatCode); delete iReferences; iReferences = NULL; iReferences = CMTPTypeArray::NewL(EMTPTypeAUINT32); iDataProvider.ObjectHandler(formatCode)->GetObjectReferenceL(*iReceivedObjectMetaData, *iReferences); SendDataL(*iReferences); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETREFERENCES_SERVICEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetservicecapabilities.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetservicecapabilities.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetservicecapabilities.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -18,9 +18,13 @@ #include "cmtpsvcgetservicecapabilities.h" #include "mmtpservicedataprovider.h" #include "mmtpservicehandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcgetservicecapabilitiesTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"SvcGetSvcCap");) EXPORT_C MMTPRequestProcessor* CMTPSvcGetServiceCapabilities::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, @@ -35,10 +39,9 @@ EXPORT_C CMTPSvcGetServiceCapabilities::~CMTPSvcGetServiceCapabilities() { - __FLOG(_L8("~CMTPSvcGetServiceCapabilities - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICECAPABILITIES_CMTPSVCGETSERVICECAPABILITIES_ENTRY ); delete iServiceCapabilityList; - __FLOG(_L8("~CMTPSvcGetServiceCapabilities - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCGETSERVICECAPABILITIES_CMTPSVCGETSERVICECAPABILITIES_EXIT ); } CMTPSvcGetServiceCapabilities::CMTPSvcGetServiceCapabilities(MMTPDataProviderFramework& aFramework, @@ -50,15 +53,14 @@ void CMTPSvcGetServiceCapabilities::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICECAPABILITIES_CONSTRUCTL_ENTRY ); iServiceCapabilityList = CMTPTypeServiceCapabilityList::NewL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETSERVICECAPABILITIES_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPSvcGetServiceCapabilities::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICECAPABILITIES_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -78,13 +80,14 @@ } } } - __FLOG_VA((_L8("CheckRequestL - Exit with response code = 0x%04X"), responseCode)); + OstTrace1(TRACE_NORMAL, CMTPSVCGETSERVICECAPABILITIES_CHECKREQUESTL, "Exit with response code = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETSERVICECAPABILITIES_CHECKREQUESTL_EXIT ); return responseCode; } void CMTPSvcGetServiceCapabilities::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICECAPABILITIES_SERVICEL_ENTRY ); TUint32 formatCode = Request().Uint32(TMTPTypeRequest::ERequestParameter2); if (KMTPFormatsAll == formatCode) { @@ -103,14 +106,15 @@ iResponseCode = (iDataProvider.ServiceHandler())->GetServiceCapabilityL(formatCode, *iServiceCapabilityList); } SendDataL(*iServiceCapabilityList); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETSERVICECAPABILITIES_SERVICEL_EXIT ); } TBool CMTPSvcGetServiceCapabilities::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICECAPABILITIES_DOHANDLERESPONSEPHASEL_ENTRY ); TMTPResponseCode responseCode = (iCancelled ? EMTPRespCodeIncompleteTransfer : iResponseCode); SendResponseL(responseCode); - __FLOG_VA((_L8("DoHandleResponsePhaseL - Exit with Response Code: 0x%x"), iResponseCode)); + OstTrace1(TRACE_NORMAL, CMTPSVCGETSERVICECAPABILITIES_DOHANDLERESPONSEPHASEL, "Exit with response code = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETSERVICECAPABILITIES_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetserviceinfo.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetserviceinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetserviceinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -18,9 +18,12 @@ #include "cmtpsvcgetserviceinfo.h" #include "mmtpservicedataprovider.h" #include "mmtpservicehandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcgetserviceinfoTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent, "SvcGetSvcInfo");) + EXPORT_C MMTPRequestProcessor* CMTPSvcGetServiceInfo::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, @@ -35,10 +38,9 @@ EXPORT_C CMTPSvcGetServiceInfo::~CMTPSvcGetServiceInfo() { - __FLOG(_L8("~CMTPSvcGetServiceInfo - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEINFO_CMTPSVCGETSERVICEINFO_DES_ENTRY ); delete iServiceInfo; - __FLOG(_L8("~CMTPSvcGetServiceInfo - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCGETSERVICEINFO_CMTPSVCGETSERVICEINFO_DES_EXIT ); } CMTPSvcGetServiceInfo::CMTPSvcGetServiceInfo(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, @@ -49,15 +51,14 @@ void CMTPSvcGetServiceInfo::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEINFO_CONSTRUCTL_ENTRY ); iServiceInfo = CMTPTypeServiceInfo::NewL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETSERVICEINFO_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPSvcGetServiceInfo::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEINFO_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -67,23 +68,25 @@ responseCode = EMTPRespCodeInvalidServiceID; } } - __FLOG_VA((_L8("CheckRequestL - Exit with response code = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETSERVICEINFO_CHECKREQUESTL, "Exit with response code = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETSERVICEINFO_CHECKREQUESTL_EXIT ); return responseCode; } void CMTPSvcGetServiceInfo::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEINFO_SERVICEL_ENTRY ); iResponseCode = (iDataProvider.ServiceHandler())->GetServiceInfoL(*iServiceInfo); SendDataL(*iServiceInfo); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETSERVICEINFO_SERVICEL_EXIT ); } TBool CMTPSvcGetServiceInfo::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEINFO_DOHANDLERESPONSEPHASEL_ENTRY ); TMTPResponseCode responseCode = (iCancelled ? EMTPRespCodeIncompleteTransfer : iResponseCode); SendResponseL(responseCode); - __FLOG_VA((_L8("DoHandleResponsePhaseL - Exit with Response Code: 0x%x"), iResponseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETSERVICEINFO_DOHANDLERESPONSEPHASEL, "Exit with response code = 0x%04X", iResponseCode ); + OstTraceFunctionExit0( CMTPSVCGETSERVICEINFO_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetservicepropdesc.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetservicepropdesc.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetservicepropdesc.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,8 +20,11 @@ #include "cmtpsvcgetservicepropdesc.h" #include "mmtpservicedataprovider.h" #include "mmtpservicehandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcgetservicepropdescTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"SvcGetSvcPDesc");) EXPORT_C MMTPRequestProcessor* CMTPSvcGetServicePropDesc::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) { @@ -34,10 +37,9 @@ EXPORT_C CMTPSvcGetServicePropDesc::~CMTPSvcGetServicePropDesc() { - __FLOG(_L8("~CMTPSvcGetServicePropDesc - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEPROPDESC_CMTPSVCGETSERVICEPROPDESC_ENTRY ); delete iPropDescList; - __FLOG(_L8("~CMTPSvcGetServicePropDesc - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCGETSERVICEPROPDESC_CMTPSVCGETSERVICEPROPDESC_EXIT ); } CMTPSvcGetServicePropDesc::CMTPSvcGetServicePropDesc(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) : @@ -49,15 +51,14 @@ void CMTPSvcGetServicePropDesc::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEPROPDESC_CONSTRUCTL_ENTRY ); iPropDescList = CMTPTypeServicePropDescList::NewL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETSERVICEPROPDESC_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPSvcGetServicePropDesc::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEPROPDESC_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -67,7 +68,7 @@ if ((iDataProvider.ServiceID() != serviceID)) { responseCode = EMTPRespCodeInvalidServiceID; - __FLOG(_L8("Service Id Parameter don't be supported")); + OstTrace0( TRACE_WARNING, DUP1_CMTPSVCGETSERVICEPROPDESC_CHECKREQUESTL, "Service Id Parameter don't be supported" ); } if (EMTPRespCodeOK == responseCode) @@ -76,17 +77,18 @@ !(iDataProvider.IsValidServicePropCodeL(propCode))) { responseCode = EMTPRespCodeInvalidServicePropCode; - __FLOG(_L8("Service Object PropCode Parameter don't be supported")); + OstTrace0( TRACE_WARNING, DUP2_CMTPSVCGETSERVICEPROPDESC_CHECKREQUESTL, "Service Object PropCode Parameter don't be supported" ); } } } - __FLOG_VA((_L8("CheckRequestL - Exit with response code = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETSERVICEPROPDESC_CHECKREQUESTL, "Exit with response code = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETSERVICEPROPDESC_CHECKREQUESTL_EXIT ); return responseCode; } void CMTPSvcGetServicePropDesc::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEPROPDESC_SERVICEL_ENTRY ); TUint32 propCode = Request().Uint32(TMTPTypeRequest::ERequestParameter2); if (KMTPNotSpecified32 != propCode) @@ -106,15 +108,19 @@ CleanupStack::PopAndDestroy(&propCodeArray); } SendDataL(*iPropDescList); - __FLOG_VA((_L8("ServiceL - Exit with Response Code: 0x%x, Service Property Count: %u"), iResponseCode, iPropDescList->NumberOfElements())); + OstTraceExt2( TRACE_NORMAL, CMTPSVCGETSERVICEPROPDESC_SERVICEL, + "Exit with Response Code: 0x%x, Service Property Count: %u", iResponseCode, iPropDescList->NumberOfElements()); + OstTraceFunctionExit0( CMTPSVCGETSERVICEPROPDESC_SERVICEL_EXIT ); } TBool CMTPSvcGetServicePropDesc::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEPROPDESC_DOHANDLERESPONSEPHASEL_ENTRY ); TMTPResponseCode responseCode = (iCancelled ? EMTPRespCodeIncompleteTransfer : iResponseCode); SendResponseL(responseCode); - __FLOG_VA((_L8("DoHandleResponsePhaseL - Exit with Response Code: 0x%x"), iResponseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETSERVICEPROPDESC_DOHANDLERESPONSEPHASEL, "Exit with Response Code: 0x%x", iResponseCode ); + OstTraceFunctionExit0( CMTPSVCGETSERVICEPROPDESC_DOHANDLERESPONSEPHASEL_EXIT ); + return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetserviceproplist.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetserviceproplist.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetserviceproplist.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -16,8 +16,11 @@ #include "cmtpsvcgetserviceproplist.h" #include "mmtpservicedataprovider.h" #include "mmtpservicehandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcgetserviceproplistTraces.h" +#endif -__FLOG_STMT (_LIT8(KComponent,"SvcGetSvcPList");) const TUint16 KMTPServicePropsAll(0x0000); @@ -32,10 +35,9 @@ EXPORT_C CMTPSvcGetServicePropList::~CMTPSvcGetServicePropList() { - __FLOG(_L8("~CMTPSvcGetServicePropList - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEPROPLIST_CMTPSVCGETSERVICEPROPLIST_ENTRY ); delete iServicePropList; - __FLOG(_L8("~CMTPSvcGetServicePropList - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCGETSERVICEPROPLIST_CMTPSVCGETSERVICEPROPLIST_EXIT ); } CMTPSvcGetServicePropList::CMTPSvcGetServicePropList(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) : @@ -45,15 +47,14 @@ void CMTPSvcGetServicePropList::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEPROPLIST_CONSTRUCTL_ENTRY ); iServicePropList = CMTPTypeServicePropList::NewL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETSERVICEPROPLIST_CONSTRUCTL_EXIT ); } void CMTPSvcGetServicePropList::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEPROPLIST_SERVICEL_ENTRY ); TUint32 propcode = Request().Uint32(TMTPTypeRequest::ERequestParameter2); if (KMTPServicePropertyAll == propcode) { @@ -72,12 +73,12 @@ iResponseCode = (iDataProvider.ServiceHandler())->GetServicePropertyL(propcode, *iServicePropList); } SendDataL(*iServicePropList); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETSERVICEPROPLIST_SERVICEL_EXIT ); } TMTPResponseCode CMTPSvcGetServicePropList::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEPROPLIST_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -96,15 +97,18 @@ } } } - __FLOG_VA((_L8("CheckRequestL - Exit with responseCode = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETSERVICEPROPLIST_CHECKREQUESTL, "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCGETSERVICEPROPLIST_CHECKREQUESTL_EXIT ); + return responseCode; } TBool CMTPSvcGetServicePropList::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSERVICEPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY ); TMTPResponseCode responseCode = (iCancelled ? EMTPRespCodeIncompleteTransfer : iResponseCode); SendResponseL(responseCode); - __FLOG_VA((_L8("DoHandleResponsePhaseL - Exit with Response Code: 0x%x"), iResponseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETSERVICEPROPLIST_DOHANDLERESPONSEPHASEL, "Exit with responseCode = 0x%04X", iResponseCode ); + OstTraceFunctionExit0( CMTPSVCGETSERVICEPROPLIST_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetstorageinfo.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetstorageinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcgetstorageinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,8 +21,12 @@ #include "cmtpsvcgetstorageinfo.h" #include "mmtpservicedataprovider.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcgetstorageinfoTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"SvcGetStgInfo");) + EXPORT_C MMTPRequestProcessor* CMTPSvcGetStorageInfo::NewL( MMTPDataProviderFramework& aFramework, @@ -38,10 +42,9 @@ EXPORT_C CMTPSvcGetStorageInfo::~CMTPSvcGetStorageInfo() { - __FLOG(_L8("~CMTPSvcGetStorageInfo - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSTORAGEINFO_CMTPSVCGETSTORAGEINFO_ENTRY ); delete iStorageInfo; - __FLOG(_L8("~CMTPSvcGetStorageInfo - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCGETSTORAGEINFO_CMTPSVCGETSTORAGEINFO_EXIT ); } CMTPSvcGetStorageInfo::CMTPSvcGetStorageInfo( @@ -58,23 +61,22 @@ */ void CMTPSvcGetStorageInfo::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSTORAGEINFO_CONSTRUCTL_ENTRY ); iStorageInfo = CMTPTypeStorageInfo::NewL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETSTORAGEINFO_CONSTRUCTL_EXIT ); } void CMTPSvcGetStorageInfo::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSTORAGEINFO_SERVICEL_ENTRY ); iDataProvider.GetStorageInfoL(*iStorageInfo); SendDataL(*iStorageInfo); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCGETSTORAGEINFO_SERVICEL_EXIT ); } TMTPResponseCode CMTPSvcGetStorageInfo::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCGETSTORAGEINFO_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -84,6 +86,7 @@ responseCode = EMTPRespCodeInvalidStorageID; } } - __FLOG_VA((_L8("CheckRequestL Exit with response code = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCGETSTORAGEINFO_CHECKREQUESTL, "Exit with response code = 0x%04X", responseCode); + OstTraceFunctionExit0( CMTPSVCGETSTORAGEINFO_CHECKREQUESTL_EXIT ); return responseCode; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcsetobjectproplist.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcsetobjectproplist.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcsetobjectproplist.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,9 +22,12 @@ #include "cmtpsvcsetobjectproplist.h" #include "mmtpservicedataprovider.h" #include "mmtpsvcobjecthandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcsetobjectproplistTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"SvcSetObjPropList");) + EXPORT_C MMTPRequestProcessor* CMTPSvcSetObjectPropList::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) { @@ -37,10 +40,9 @@ EXPORT_C CMTPSvcSetObjectPropList::~CMTPSvcSetObjectPropList() { - __FLOG(_L8("~CMTPSvcSetObjectPropList - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETOBJECTPROPLIST_CMTPSVCSETOBJECTPROPLIST_ENTRY ); delete iPropertyList; - __FLOG(_L8("~CMTPSvcSetObjectPropList - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCSETOBJECTPROPLIST_CMTPSVCSETOBJECTPROPLIST_EXIT ); } CMTPSvcSetObjectPropList::CMTPSvcSetObjectPropList(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) : @@ -51,36 +53,38 @@ void CMTPSvcSetObjectPropList::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETOBJECTPROPLIST_CONSTRUCTL_ENTRY ); iPropertyList = CMTPTypeObjectPropList::NewL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSVCSETOBJECTPROPLIST_CONSTRUCTL_EXIT ); } void CMTPSvcSetObjectPropList::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETOBJECTPROPLIST_SERVICEL_ENTRY ); ReceiveDataL(*iPropertyList); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCSETOBJECTPROPLIST_SERVICEL_EXIT ); } TBool CMTPSvcSetObjectPropList::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY ); TUint32 parameter = 0; TMTPResponseCode responseCode = EMTPRespCodeOK; responseCode = SetObjectPropListL(*iPropertyList, parameter); - __FLOG_VA((_L8("SetObjectPropListL - ResponsCode: 0x%x, error index: %u"), responseCode, parameter)); + OstTraceExt2( TRACE_NORMAL, CMTPSVCSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL, + "SetObjectPropListL - ResponsCode: 0x%x, error index: %u", responseCode, parameter ); SendResponseL(responseCode, 1, ¶meter); - __FLOG_VA((_L8("DoHandleResponsePhaseL - Exit with responseCode = 0x%04X and failed index: %u"), responseCode, parameter)); + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPSVCSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL, + "Exit with responseCode = 0x%04X and failed index: %u", responseCode, parameter ); + OstTraceFunctionExit0( CMTPSVCSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } TMTPResponseCode CMTPSvcSetObjectPropList::SetObjectPropListL(const CMTPTypeObjectPropList& aObjectPropList, TUint32& aParameter) { - __FLOG(_L8("SetObjectPropListL - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETOBJECTPROPLIST_SETOBJECTPROPLISTL_ENTRY ); TMTPResponseCode responseCode = EMTPRespCodeOK; const TUint count = aObjectPropList.NumberOfElements(); aObjectPropList.ResetCursor(); @@ -156,6 +160,7 @@ } } CleanupStack::PopAndDestroy(objectMetaData); - __FLOG_VA((_L8("SetObjectPropListL - Exit with responseCode = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCSETOBJECTPROPLIST_SETOBJECTPROPLISTL, "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCSETOBJECTPROPLIST_SETOBJECTPROPLISTL_EXIT ); return responseCode; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcsetreferences.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcsetreferences.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcsetreferences.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -25,8 +25,11 @@ #include "cmtpsvcsetreferences.h" #include "mmtpservicedataprovider.h" #include "mmtpsvcobjecthandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcsetreferencesTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"SvcSetRef");) EXPORT_C MMTPRequestProcessor* CMTPSvcSetReferences::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, @@ -38,11 +41,10 @@ EXPORT_C CMTPSvcSetReferences::~CMTPSvcSetReferences() { - __FLOG(_L8("~CMTPSvcGetReferences - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETREFERENCES_CMTPSVCSETREFERENCES_DES_ENTRY ); delete iReferences; delete iReceivedObjectMetaData; - __FLOG(_L8("~CMTPSvcGetReferences - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCSETREFERENCES_CMTPSVCSETREFERENCES_DES_EXIT ); } /** @@ -54,8 +56,8 @@ CMTPRequestProcessor(aFramework, aConnection, 0, NULL), iDataProvider(aDataProvider) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("Constructed")); + OstTraceFunctionEntry0( CMTPSVCSETREFERENCES_CMTPSVCSETREFERENCES_CONS_ENTRY ); + OstTraceFunctionExit0( CMTPSVCSETREFERENCES_CMTPSVCSETREFERENCES_CONS_EXIT ); } /** @@ -64,17 +66,17 @@ */ void CMTPSvcSetReferences::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETREFERENCES_SERVICEL_ENTRY ); delete iReferences; iReferences = NULL; iReferences = CMTPTypeArray::NewL(EMTPTypeAUINT32); ReceiveDataL(*iReferences); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCSETREFERENCES_SERVICEL_EXIT ); } TBool CMTPSvcSetReferences::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETREFERENCES_DOHANDLERESPONSEPHASEL_ENTRY ); if(!VerifyReferenceHandlesL()) { SendResponseL(EMTPRespCodeInvalidObjectReference); @@ -86,18 +88,20 @@ responseCode = (iDataProvider.ObjectHandler(formatCode))->SetObjectReferenceL(*iReceivedObjectMetaData, *iReferences); SendResponseL(responseCode); } - __FLOG(_L8("DoHandleResponsePhaseL - Exit")); + OstTraceFunctionExit0( CMTPSVCSETREFERENCES_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } TBool CMTPSvcSetReferences::HasDataphase() const { + OstTraceFunctionEntry0( CMTPSVCSETREFERENCES_HASDATAPHASE_ENTRY ); + OstTraceFunctionExit0( CMTPSVCSETREFERENCES_HASDATAPHASE_EXIT ); return ETrue; } TBool CMTPSvcSetReferences::VerifyReferenceHandlesL() const { - __FLOG(_L8("VerifyReferenceHandlesL - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETREFERENCES_VERIFYREFERENCEHANDLESL_ENTRY ); __ASSERT_DEBUG(iReferences, User::Invariant()); TBool result = ETrue; TInt count = iReferences->NumElements(); @@ -114,13 +118,13 @@ } } CleanupStack::PopAndDestroy(object); - __FLOG(_L8("VerifyReferenceHandlesL - Exit")); + OstTraceFunctionExit0( CMTPSVCSETREFERENCES_VERIFYREFERENCEHANDLESL_EXIT ); return result; } TMTPResponseCode CMTPSvcSetReferences::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETREFERENCES_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) @@ -136,7 +140,7 @@ if (iReceivedObjectMetaData->Uint(CMTPObjectMetaData::EDataProviderId) != iFramework.DataProviderId()) { responseCode = EMTPRespCodeInvalidObjectHandle; - __FLOG(_L8("CheckRequestL - DataProviderId dismatch")); + OstTrace0( TRACE_WARNING, DUP1_CMTPSVCSETREFERENCES_CHECKREQUESTL, "CheckRequestL - DataProviderId dismatch" ); } else { @@ -153,6 +157,8 @@ responseCode = EMTPRespCodeInvalidObjectHandle; } } - __FLOG_VA((_L8("CheckRequestL - Exit with code: 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCSETREFERENCES_CHECKREQUESTL, "Exit with code: 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCSETREFERENCES_CHECKREQUESTL_EXIT ); + return responseCode; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcsetserviceproplist.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcsetserviceproplist.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/cmtpsvcsetserviceproplist.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -16,8 +16,12 @@ #include "cmtpsvcsetserviceproplist.h" #include "mmtpservicedataprovider.h" #include "mmtpservicehandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsvcsetserviceproplistTraces.h" +#endif -__FLOG_STMT (_LIT8(KComponent, "SvcSetSvcPList");) + EXPORT_C MMTPRequestProcessor* CMTPSvcSetServicePropList::NewL(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) { @@ -30,10 +34,9 @@ EXPORT_C CMTPSvcSetServicePropList::~CMTPSvcSetServicePropList() { - __FLOG(_L8("~CMTPSvcSetServicePropList - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETSERVICEPROPLIST_CMTPSVCSETSERVICEPROPLIST_DES_ENTRY ); delete iServicePropList; - __FLOG(_L8("~CMTPSvcSetServicePropList - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSVCSETSERVICEPROPLIST_CMTPSVCSETSERVICEPROPLIST_DES_EXIT ); } CMTPSvcSetServicePropList::CMTPSvcSetServicePropList(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection, MMTPServiceDataProvider& aDataProvider) : @@ -43,15 +46,14 @@ void CMTPSvcSetServicePropList::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETSERVICEPROPLIST_CONSTRUCTL_ENTRY ); iServicePropList = CMTPTypeServicePropList::NewL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSVCSETSERVICEPROPLIST_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPSvcSetServicePropList::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETSERVICEPROPLIST_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); if (EMTPRespCodeOK == responseCode) { @@ -62,21 +64,22 @@ } } - __FLOG_VA((_L8("CheckRequestL - Exit with responseCode = 0x%04X"), responseCode)); + OstTrace1( TRACE_NORMAL, CMTPSVCSETSERVICEPROPLIST_CHECKREQUESTL, "Exit with responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPSVCSETSERVICEPROPLIST_CHECKREQUESTL_EXIT ); return responseCode; } void CMTPSvcSetServicePropList::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETSERVICEPROPLIST_SERVICEL_ENTRY ); //Recieve the data from the property list ReceiveDataL(*iServicePropList); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPSVCSETSERVICEPROPLIST_SERVICEL_EXIT ); } TBool CMTPSvcSetServicePropList::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPSVCSETSERVICEPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY ); TUint32 parameter = 0; TMTPResponseCode responseCode = EMTPRespCodeOK; const TUint count = iServicePropList->NumberOfElements(); @@ -99,7 +102,10 @@ } } SendResponseL(responseCode, 1, ¶meter); - __FLOG_VA((_L8("DoHandleResponsePhaseL - Exit with responseCode = 0x%04X and failed index: %u"), responseCode, parameter)); + OstTraceExt2( TRACE_NORMAL, CMTPSVCSETSERVICEPROPLIST_DOHANDLERESPONSEPHASEL, + "Exit with responseCode = 0x%04X and failed index: %u", responseCode, parameter ); + OstTraceFunctionExit0( CMTPSVCSETSERVICEPROPLIST_DOHANDLERESPONSEPHASEL_EXIT ); + return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/rmtpdpsingletons.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/rmtpdpsingletons.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/rmtpdpsingletons.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -18,10 +18,12 @@ #include #include +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "rmtpdpsingletonsTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"DataProviderSingletons");) /** Constructor. @@ -36,11 +38,10 @@ */ EXPORT_C void RMTPDpSingletons::OpenL(MMTPDataProviderFramework& aFramework) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("OpenL - Entry")); + OstTraceFunctionEntry0( RMTPDPSINGLETONS_OPENL_ENTRY ); iFramework = &aFramework; iSingletons = &CSingletons::OpenL(aFramework); - __FLOG(_L8("OpenL - Exit")); + OstTraceFunctionExit0( RMTPDPSINGLETONS_OPENL_EXIT ); } /** @@ -48,14 +49,13 @@ */ EXPORT_C void RMTPDpSingletons::Close() { - __FLOG(_L8("Close - Entry")); + OstTraceFunctionEntry0( RMTPDPSINGLETONS_CLOSE_ENTRY ); if (iSingletons) { iSingletons->Close(); iSingletons = NULL; } - __FLOG(_L8("Close - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( RMTPDPSINGLETONS_CLOSE_EXIT ); } @@ -98,7 +98,7 @@ RMTPDpSingletons::CSingletons& RMTPDpSingletons::CSingletons::OpenL(MMTPDataProviderFramework& aFramework) { - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("CSingletons::OpenL - Entry")); + OstTraceFunctionEntry0( RMTPDPSIGNGLETONS_CSINGLETONS_OPENL_ENTRY ); CSingletons* self(reinterpret_cast(Dll::Tls())); if (!self) { @@ -109,51 +109,49 @@ { self->Inc(); } - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("CSingletons::OpenL - Exit")); + OstTraceFunctionExit0( RMTPDPSIGNGLETONS_CSINGLETONS_OPENL_EXIT ); return *self; } void RMTPDpSingletons::CSingletons::Close() { + OstTraceFunctionEntry0( CSINGLETONS_CLOSE_ENTRY ); CSingletons* self(reinterpret_cast(Dll::Tls())); if (self) { - __FLOG(_L8("CSingletons::Close - Entry")); self->Dec(); if (self->AccessCount() == 0) { - __FLOG(_L8("CSingletons::Close - Exit")); delete self; Dll::SetTls(NULL); + OstTraceFunctionExit0( CSINGLETONS_CLOSE_EXIT ); } else { - __FLOG(_L8("CSingletons::Close - Exit")); + OstTraceFunctionExit0( DUP1_CSINGLETONS_CLOSE_EXIT ); } } } RMTPDpSingletons::CSingletons::~CSingletons() { - __FLOG(_L8("CSingletons::~CSingletons - Entry")); + OstTraceFunctionEntry0( CSINGLETONS_CSINGLETONS_DES_ENTRY ); iExclusionList.Close(); iMTPUtility.Close(); delete iCopyingBigFileCache; delete iMovingBigFileCache; - __FLOG(_L8("CSingletons::~CSingletons - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CSINGLETONS_CSINGLETONS_DES_EXIT ); } void RMTPDpSingletons::CSingletons::ConstructL(MMTPDataProviderFramework& aFramework) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CSingletons::ConstructL - Entry")); + OstTraceFunctionEntry0( CSINGLETONS_CONSTRUCTL_ENTRY ); iMTPUtility.OpenL(aFramework); iCopyingBigFileCache = CMTPFSEntryCache::NewL(); iMovingBigFileCache = CMTPFSEntryCache::NewL(); - - __FLOG(_L8("CSingletons::ConstructL - Exit")); + + OstTraceFunctionExit0( CSINGLETONS_CONSTRUCTL_EXIT ); } EXPORT_C RMTPUtility& RMTPDpSingletons::MTPUtility() const diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/src/rmtputility.cpp --- a/mtpfws/mtpfw/dataproviders/dputility/src/rmtputility.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/dputility/src/rmtputility.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -32,6 +32,12 @@ #include "cmtpextensionmapping.h" #include "cmtpdataprovider.h" #include "mtpframeworkconst.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "rmtputilityTraces.h" +#endif + using namespace ContentAccess; // Class constants. @@ -49,8 +55,6 @@ _LIT( KMimeTypeAudioMp4, "audio/mp4" ); _LIT( KMimeTypeVideoMp4, "video/mp4" ); -__FLOG_STMT(_LIT8(KComponent,"RMTPUtility");) - RMTPUtility::RMTPUtility(): iFramework(NULL) { @@ -58,13 +62,12 @@ void RMTPUtility::OpenL(MMTPDataProviderFramework& aFramework) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("OpenL - Entry")); + OstTraceFunctionEntry0( RMTPUTILITY_OPENL_ENTRY ); iFramework = &aFramework; iSingleton.OpenL(); - - __FLOG(_L8("OpenL - Exit")); + + OstTraceFunctionExit0( RMTPUTILITY_OPENL_EXIT ); } void RMTPUtility::Close() @@ -72,7 +75,6 @@ iSingleton.Close(); iFramework = NULL; iFormatMappings.ResetAndDestroy(); - __FLOG_CLOSE; } /* @@ -105,7 +107,7 @@ */ EXPORT_C TBool RMTPUtility::MTPTimeStr2TTime(const TDesC& aTimeString, TTime& aRet) const { - __FLOG(_L8("ConvertMTPTimeStr2TTimeL - Entry")); + OstTraceFunctionEntry0( RMTPUTILITY_MTPTIMESTR2TTIME_ENTRY ); TBool result = EFalse; TInt year = 0; @@ -142,6 +144,7 @@ result = ETrue; } + OstTraceFunctionExit0( RMTPUTILITY_MTPTIMESTR2TTIME_EXIT ); return result; } @@ -252,22 +255,25 @@ EXPORT_C void RMTPUtility::RenameObjectL( TUint aObjectHandle, const TDesC& aNewName ) { - __FLOG(_L8("RenameAssocationObjectL - Entry")); + OstTraceFunctionEntry0( RMTPUTILITY_RENAMEOBJECTL_ENTRY ); CMTPObjectMetaData* meta = CMTPObjectMetaData::NewLC(); if( !iFramework->ObjectMgr().ObjectL(aObjectHandle, *meta) ) { + OstTrace1( TRACE_ERROR, RMTPUTILITY_RENAMEOBJECTL, "Object information associated with the object handle %d doesn't exist", aObjectHandle ); User::Leave(KErrNotFound); } if( !BaflUtils::FileExists( iFramework->Fs(), meta->DesC(CMTPObjectMetaData::ESuid) ) ) { + OstTraceExt1( TRACE_ERROR, DUP1_RMTPUTILITY_RENAMEOBJECTL, "%S doesn't exist", meta->DesC(CMTPObjectMetaData::ESuid)); User::Leave(KErrNotFound); } TFileName filename; - User::LeaveIfError(BaflUtils::MostSignificantPartOfFullName(meta->DesC(CMTPObjectMetaData::ESuid), filename)); + LEAVEIFERROR(BaflUtils::MostSignificantPartOfFullName(meta->DesC(CMTPObjectMetaData::ESuid), filename), + OstTraceExt1( TRACE_ERROR, DUP2_RMTPUTILITY_RENAMEOBJECTL, "extract most significant part of %S failed", meta->DesC(CMTPObjectMetaData::ESuid))); RBuf oldFullName; oldFullName.CleanupClosePushL(); @@ -299,8 +305,9 @@ if(meta->Uint(CMTPObjectMetaData::EFormatCode) != EMTPFormatCodeAssociation) { // Modify the filename - User::LeaveIfError( iFramework->Fs().Rename(meta->DesC(CMTPObjectMetaData::ESuid), newFullName) ); - + LEAVEIFERROR( iFramework->Fs().Rename(meta->DesC(CMTPObjectMetaData::ESuid), newFullName), + OstTraceExt2( TRACE_ERROR, DUP3_RMTPUTILITY_RENAMEOBJECTL, "Rename %S to %S failed!", + meta->DesC(CMTPObjectMetaData::ESuid), newFullName)); meta->SetDesCL( CMTPObjectMetaData::ESuid, newFullName ); iFramework->ObjectMgr().ModifyObjectL(*meta); } @@ -310,7 +317,9 @@ _LIT(KBackSlash, "\\"); newFullName.Append(KBackSlash); // Modify the filename - User::LeaveIfError( iFramework->Fs().Rename(meta->DesC(CMTPObjectMetaData::ESuid), newFullName) ); + LEAVEIFERROR( iFramework->Fs().Rename(meta->DesC(CMTPObjectMetaData::ESuid), newFullName), + OstTraceExt2( TRACE_ERROR, DUP4_RMTPUTILITY_RENAMEOBJECTL, "Rename %S to %S failed!", + meta->DesC(CMTPObjectMetaData::ESuid), newFullName)); meta->SetDesCL( CMTPObjectMetaData::ESuid, newFullName ); iFramework->ObjectMgr().ModifyObjectL(*meta); @@ -325,7 +334,7 @@ } CleanupStack::PopAndDestroy(3);//oldFullName, newFullName,meta - __FLOG(_L8("RenameAssocationObjectL - Exit")); + OstTraceFunctionExit0( RMTPUTILITY_RENAMEOBJECTL_EXIT ); } EXPORT_C TMTPFormatCode RMTPUtility::FormatFromFilename( const TDesC& aFullFileName ) @@ -374,7 +383,7 @@ if ( file.Ext().CompareF( KTxtExtensionODF ) == 0 ) { TRAP( err, mime = OdfMimeTypeL( aFullPath ) ); - __FLOG_VA((_L("ContainerMimeType err %d mime %S"), err, mime)); + OstTraceExt2( TRACE_NORMAL, RMTPUTILITY_CONTAINERMIMETYPE, "ContainerMimeType err %d mime %S", err, *mime ); } return mime; } @@ -476,7 +485,7 @@ void RMTPUtility::RenameAllChildrenL(TUint32 aStorageId, TUint32 aParentHandle, const TDesC& aNewFolderName, const TDesC& aOldFolderName) { - __FLOG(_L8("RenameAllChildrenL - Entry")); + OstTraceFunctionEntry0( RMTPUTILITY_RENAMEALLCHILDRENL_ENTRY ); CMTPObjectMetaData* objectInfo(CMTPObjectMetaData::NewLC()); TInt count = 0; @@ -490,6 +499,7 @@ { if (!iFramework->ObjectMgr().ObjectL(handles[i], *objectInfo)) { + OstTrace1( TRACE_ERROR, DUP1_RMTPUTILITY_RENAMEALLCHILDRENL, "Object information associated with the object handle %d doesn't exist", handles[i]); User::Leave(KErrCorrupt); } @@ -546,8 +556,8 @@ } CleanupStack::PopAndDestroy(2); //objectInfo; &handles; - - __FLOG(_L8("RenameAllChildrenL - Exit")); + + OstTraceFunctionExit0( RMTPUTILITY_RENAMEALLCHILDRENL_EXIT ); } void RMTPUtility::GetAllDecendents(TUint32 aStorageId, TUint aParentHandle, RArray& aHandles) const @@ -613,7 +623,8 @@ if (mimebuf == NULL) { - User::LeaveIfError( KErrNotFound ); + OstTrace0( TRACE_ERROR, RMTPUTILITY_ODFMIMETYPEL, "malloc buffer for mime failed!" ); + User::Leave(KErrNotFound); } mimebuf->Des().Copy( *buffer ); @@ -622,6 +633,7 @@ // leave if NULL if ( mimebuf == NULL ) { + OstTrace0( TRACE_ERROR, DUP1_RMTPUTILITY_ODFMIMETYPEL, "malloc buffer for mime failed!" ); User::Leave( KErrNotFound ); } @@ -630,6 +642,7 @@ } else { + OstTrace0( TRACE_ERROR, DUP2_RMTPUTILITY_ODFMIMETYPEL, "Not ODF type file!" ); User::Leave( KErrNotSupported ); } @@ -643,19 +656,19 @@ lex.Val(formatCode, EHex); aMapping.SetFormatCode(static_cast(formatCode)); aState = Extension; - __FLOG_VA((_L("ParseFormatCode %S, 0x%x"), &aString, formatCode)); + OstTraceExt2( TRACE_NORMAL, RMTPUTILITY_PARSEFORMATCODE, "ParseFormatCode %S, 0x%x", aString, formatCode ); } void RMTPUtility::ParseExtension(const TDesC& aString, CMTPExtensionMapping& aMapping, TParseState& aState) { aMapping.SetExtensionL(aString); aState = EMimeType; - __FLOG_VA((_L("ParseExtension %S"), &aString)); + OstTraceExt1( TRACE_NORMAL, RMTPUTILITY_PARSEEXTENSION, "ParseExtension %S", aString ); } void RMTPUtility::ParseMimeType(const TDesC& aString, CMTPExtensionMapping& aMapping, TParseState& aState) { aMapping.SetMIMETypeL(aString); aState = ESubFormatCode; - __FLOG_VA((_L("ParseMimeType %S"), &aString)); + OstTraceExt1( TRACE_NORMAL, RMTPUTILITY_PARSEMIMETYPEL, "ParseMimeType %S", aString ); } void RMTPUtility::ParseSubFormatCode(const TDesC& aString, CMTPExtensionMapping& aMapping, TParseState& aState) { @@ -676,7 +689,7 @@ } aMapping.SetSubFormatCode(subFormatCode); aState = EnumerationFlag; - __FLOG_VA((_L("ParseSubFormatCode %S, 0x%x"), &aString, subFormatCode)); + OstTraceExt2( TRACE_NORMAL, RMTPUTILITY_PARSESUBFORMATCODE, "ParseSubFormatCode %S, 0x%x", aString, subFormatCode ); } void RMTPUtility::ParseEnumerationFlag(const TDesC& aString, CMTPExtensionMapping& aMapping, TParseState& aState) { @@ -688,8 +701,8 @@ lex.Val(enumFlag, EDecimal); } aMapping.SetEnumerationFlag(enumFlag); - - __FLOG_VA((_L8("ParseEnumerationFlag %S, %d"), &aString, enumFlag)); + + OstTraceExt2( TRACE_NORMAL, RMTPUTILITY_PARSEENUMERATIONFLAG, "ParseEnumerationFlag %S, %d", aString, enumFlag ); aState = EParseStateEnd; } void RMTPUtility::Parse(const TDesC& aString, CMTPExtensionMapping& aMapping, TParseState& aState) diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpfws/mtpfw/dataproviders/dputility/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/dputility/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpfws/mtpfw/dataproviders/dputility/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,788 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_NORMAL=0x86 +[GROUP]TRACE_WARNING=0x83 +[TRACE]TRACE_ERROR[0x82]_CKNOWLEDGEOBJECT_COMMITL=0x26 +[TRACE]TRACE_ERROR[0x82]_CKNOWLEDGEOBJECT_LOADL=0x22 +[TRACE]TRACE_ERROR[0x82]_CMTPCOPYOBJECT_COPYFILEL=0x5 +[TRACE]TRACE_ERROR[0x82]_CMTPCOPYOBJECT_COPYFOLDERL=0x6 +[TRACE]TRACE_ERROR[0x82]_CMTPCOPYOBJECT_COPYOBJECTL=0x7 +[TRACE]TRACE_ERROR[0x82]_CMTPCOPYOBJECT_GETPREVIOUSPROPERTIESL=0xb +[TRACE]TRACE_ERROR[0x82]_CMTPCOPYOBJECT_SETPREVIOUSPROPERTIESL=0xc +[TRACE]TRACE_ERROR[0x82]_CMTPCOPYOBJECT_UPDATEOBJECTINFOL=0xd +[TRACE]TRACE_ERROR[0x82]_CMTPFULLENUMDATACODEMGR_BUILDFORMATL=0x2 +[TRACE]TRACE_ERROR[0x82]_CMTPFULLENUMDATACODEMGR_BUILDSERVICEIDL=0x1 +[TRACE]TRACE_ERROR[0x82]_CMTPFULLENUMDATACODEMGR_BUILDSERVICEPROPERTYL=0x3 +[TRACE]TRACE_ERROR[0x82]_CMTPFULLENUMSERVICEHANDLER_DELETESERVICEPROPERTY=0x15 +[TRACE]TRACE_ERROR[0x82]_CMTPFULLENUMSERVICEHANDLER_GETSERVICEPROPETYL=0x13 +[TRACE]TRACE_ERROR[0x82]_CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL=0x16 +[TRACE]TRACE_ERROR[0x82]_CMTPFULLENUMSERVICEHANDLER_SETSERVICEPROPETYL=0x14 +[TRACE]TRACE_ERROR[0x82]_CMTPGETOBJECTPROPDESC_SERVICEL=0x1c +[TRACE]TRACE_ERROR[0x82]_CMTPGETOBJECTPROPLIST_SERVICEONEOBJECTPROPERTYL=0x1e +[TRACE]TRACE_ERROR[0x82]_CMTPGETOBJECTPROPVALUE_SERVICEL=0x1f +[TRACE]TRACE_ERROR[0x82]_CMTPGETPARTIALOBJECT_CHECKREQUESTL=0x21 +[TRACE]TRACE_ERROR[0x82]_CMTPKNOWLEDGEHANDLER_COMMITL=0x2b +[TRACE]TRACE_ERROR[0x82]_CMTPKNOWLEDGEHANDLER_CONSTRUCTL=0x2a +[TRACE]TRACE_ERROR[0x82]_CMTPKNOWLEDGEHANDLER_DELETEOBJECTL=0x2e +[TRACE]TRACE_ERROR[0x82]_CMTPKNOWLEDGEHANDLER_GETOBJECTL=0x31 +[TRACE]TRACE_ERROR[0x82]_CMTPMOVEOBJECT_GETPREVIOUSPROPERTIESL=0x39 +[TRACE]TRACE_ERROR[0x82]_CMTPMOVEOBJECT_MOVEFILEL=0x33 +[TRACE]TRACE_ERROR[0x82]_CMTPMOVEOBJECT_SETPREVIOUSPROPERTIESL=0x3a +[TRACE]TRACE_ERROR[0x82]_CMTPREQUESTCHECKER_VERIFYSTORAGEIDL=0x3e +[TRACE]TRACE_ERROR[0x82]_CMTPSENDOBJECTINFO_CHECKSENDINGSTATEL=0x41 +[TRACE]TRACE_ERROR[0x82]_CMTPSENDOBJECTINFO_CREATEFSOBJECTL=0x47 +[TRACE]TRACE_ERROR[0x82]_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL=0x45 +[TRACE]TRACE_ERROR[0x82]_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL=0x44 +[TRACE]TRACE_ERROR[0x82]_CMTPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL=0x42 +[TRACE]TRACE_ERROR[0x82]_CMTPSENDOBJECTINFO_ISTOOLARGE=0x46 +[TRACE]TRACE_ERROR[0x82]_CMTPSENDOBJECTINFO_SETPROPERTIESL=0x48 +[TRACE]TRACE_ERROR[0x82]_CMTPSETOBJECTPROPVALUE_CHECKREQUESTL=0x4b +[TRACE]TRACE_ERROR[0x82]_CMTPSETOBJECTPROPVALUE_DOHANDLERESPONSEPHASEL=0x4e +[TRACE]TRACE_ERROR[0x82]_CMTPSETOBJECTPROPVALUE_SERVICEL=0x4c +[TRACE]TRACE_ERROR[0x82]_CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTL=0x50 +[TRACE]TRACE_ERROR[0x82]_DUP1_CKNOWLEDGEOBJECT_COMMITL=0x27 +[TRACE]TRACE_ERROR[0x82]_DUP1_CKNOWLEDGEOBJECT_LOADL=0x23 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPCOPYOBJECT_CANCOPYOBJECTL=0x8 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPCOPYOBJECT_CHECKREQUESTL=0x4 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPCOPYOBJECT_DOONTIMEOUTL=0xe +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPFSENUMERATOR_SCANNEXTSUBDIRL=0x12 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPFSENUMERATOR_SCANSTORAGEL=0x11 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL=0x17 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPGETOBJECTPROPVALUE_SERVICEL=0x20 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPKNOWLEDGEHANDLER_COMMITL=0x2c +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPKNOWLEDGEHANDLER_DELETEOBJECTL=0x2f +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPMOVEOBJECT_CANMOVEOBJECTL=0x36 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPMOVEOBJECT_CHECKREQUESTL=0x32 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPMOVEOBJECT_DOONTIMEOUTL=0x3b +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPMOVEOBJECT_MOVEFILEL=0x34 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPMOVEOBJECT_MOVEOBJECTL=0x35 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPREQUESTPROCESSOR_DOHANDLEREQUESTPHASEL=0x3f +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x43 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPSENDOBJECTINFO_SETPROPERTIESL=0x49 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPSETOBJECTPROPVALUE_SERVICEL=0x4d +[TRACE]TRACE_ERROR[0x82]_DUP1_RMTPUTILITY_ODFMIMETYPEL=0x58 +[TRACE]TRACE_ERROR[0x82]_DUP1_RMTPUTILITY_RENAMEALLCHILDRENL=0x56 +[TRACE]TRACE_ERROR[0x82]_DUP1_RMTPUTILITY_RENAMEOBJECTL=0x52 +[TRACE]TRACE_ERROR[0x82]_DUP2_CKNOWLEDGEOBJECT_COMMITL=0x28 +[TRACE]TRACE_ERROR[0x82]_DUP2_CKNOWLEDGEOBJECT_LOADL=0x24 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPCOPYOBJECT_CANCOPYOBJECTL=0x9 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPCOPYOBJECT_RUNL=0xf +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL=0x18 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPGETOBJECTINFO_BUILDOBJECTINFOL=0x1b +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPGETOBJECTPROPLIST_SERVICEL=0x1d +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPKNOWLEDGEHANDLER_COMMITL=0x2d +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPKNOWLEDGEHANDLER_DELETEOBJECTL=0x30 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPMOVEOBJECT_CANMOVEOBJECTL=0x37 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPMOVEOBJECT_RUNL=0x3c +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPREQUESTPROCESSOR_DOHANDLEREQUESTPHASEL=0x40 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPSENDOBJECTINFO_SETPROPERTIESL=0x4a +[TRACE]TRACE_ERROR[0x82]_DUP2_RMTPUTILITY_ODFMIMETYPEL=0x59 +[TRACE]TRACE_ERROR[0x82]_DUP2_RMTPUTILITY_RENAMEOBJECTL=0x53 +[TRACE]TRACE_ERROR[0x82]_DUP3_CKNOWLEDGEOBJECT_COMMITL=0x29 +[TRACE]TRACE_ERROR[0x82]_DUP3_CKNOWLEDGEOBJECT_LOADL=0x25 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPCOPYOBJECT_CANCOPYOBJECTL=0xa +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPFSENUMERATOR_STARTL=0x10 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL=0x19 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPMOVEOBJECT_CANMOVEOBJECTL=0x38 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPSVCCOMPOUNDPROCESSOR_CHECKSENDINGSTATEL=0x4f +[TRACE]TRACE_ERROR[0x82]_DUP3_RMTPUTILITY_RENAMEOBJECTL=0x54 +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL=0x1a +[TRACE]TRACE_ERROR[0x82]_DUP4_RMTPUTILITY_RENAMEOBJECTL=0x55 +[TRACE]TRACE_ERROR[0x82]_DUP5_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL=0x3d +[TRACE]TRACE_ERROR[0x82]_RMTPUTILITY_ODFMIMETYPEL=0x57 +[TRACE]TRACE_ERROR[0x82]_RMTPUTILITY_RENAMEOBJECTL=0x51 +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_CKNOWLEDGEOBJECT_DES_ENTRY=0x92 +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_CKNOWLEDGEOBJECT_DES_EXIT=0x93 +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_CLEAR_ENTRY=0x98 +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_CLEAR_EXIT=0x99 +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_COMMITL_ENTRY=0x9a +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_COMMITL_EXIT=0x9b +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_CONSTRUCTL_ENTRY=0x94 +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_CONSTRUCTL_EXIT=0x95 +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_LOADL_ENTRY=0x96 +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_LOADL_EXIT=0x97 +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_REFRESHDATEMODIFED_ENTRY=0x9e +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_REFRESHDATEMODIFED_EXIT=0x9f +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_SETCOLUMNTYPE128VALUE_ENTRY=0x9c +[TRACE]TRACE_FLOW[0x8A]_CKNOWLEDGEOBJECT_SETCOLUMNTYPE128VALUE_EXIT=0x9d +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_CANCOPYOBJECTL_ENTRY=0x21 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_CANCOPYOBJECTL_EXIT=0x22 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_CHECKREQUESTL_ENTRY=0x11 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_CHECKREQUESTL_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_CMTPCOPYOBJECT_DES_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_CMTPCOPYOBJECT_DES_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_CONSTRUCTL_ENTRY=0x15 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_CONSTRUCTL_EXIT=0x16 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_COPYFILEL_ENTRY=0x17 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_COPYFILEL_EXIT=0x18 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_COPYFOLDERL_ENTRY=0x19 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_COPYFOLDERL_EXIT=0x1a +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_COPYOBJECTL_ENTRY=0x1b +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_COPYOBJECTL_EXIT=0x1c +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_DOHANDLECOMPLETINGPHASEL_ENTRY=0x2d +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_DOHANDLECOMPLETINGPHASEL_EXIT=0x2e +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_DOONTIMEOUTL_ENTRY=0x29 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_DOONTIMEOUTL_EXIT=0x2a +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_GETPARAMETERSL_ENTRY=0x1d +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_GETPARAMETERSL_EXIT=0x1e +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_GETPREVIOUSPROPERTIESL_ENTRY=0x23 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_GETPREVIOUSPROPERTIESL_EXIT=0x24 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_MATCH_ENTRY=0x30 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_MATCH_EXIT=0x31 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_RUNL_ENTRY=0x2b +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_RUNL_EXIT=0x2c +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_SERVICEL_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_SERVICEL_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_SETDEFAULTPARENTOBJECTL_ENTRY=0x1f +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_SETDEFAULTPARENTOBJECTL_EXIT=0x20 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_SETPREVIOUSPROPERTIESL_ENTRY=0x25 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_SETPREVIOUSPROPERTIESL_EXIT=0x26 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_UPDATEOBJECTINFOL_ENTRY=0x27 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_UPDATEOBJECTINFOL_EXIT=0x28 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_CHECKREQUESTL_ENTRY=0x36 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_CHECKREQUESTL_EXIT=0x37 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_CMTPDELETEOBJECT_DES_ENTRY=0x34 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_CMTPDELETEOBJECT_DES_EXIT=0x35 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_CONSTRUCTL_ENTRY=0x32 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_CONSTRUCTL_EXIT=0x33 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_ISSTOREREADONLYL_ENTRY=0x3c +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_ISSTOREREADONLYL_EXIT=0x3d +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_PROCESSFINALPHASEL_ENTRY=0x3a +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_PROCESSFINALPHASEL_EXIT=0x3b +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_SERVICEL_ENTRY=0x38 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_SERVICEL_EXIT=0x39 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENTRYCACHE_CMTPFSENTRYCACHE_DES_ENTRY=0x3e +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENTRYCACHE_CMTPFSENTRYCACHE_DES_EXIT=0x3f +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENTRYCACHE_CONSTRUCTL_ENTRY=0x46 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENTRYCACHE_CONSTRUCTL_EXIT=0x47 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENTRYCACHE_SETFILEENTRY_ENTRY=0x44 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENTRYCACHE_SETFILEENTRY_EXIT=0x45 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENTRYCACHE_SETONGOING_ENTRY=0x40 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENTRYCACHE_SETONGOING_EXIT=0x41 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENTRYCACHE_SETTARGETHANDLE_ENTRY=0x42 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENTRYCACHE_SETTARGETHANDLE_EXIT=0x43 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_ADDENTRYL_ENTRY=0x5a +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_ADDENTRYL_EXIT=0x5b +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_ADDFILEENTRYFOROTHERDPL_ENTRY=0x5c +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_ADDFILEENTRYFOROTHERDPL_EXIT=0x5d +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_CMTPFSENUMERATOR_DES_ENTRY=0x48 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_CMTPFSENUMERATOR_DES_EXIT=0x49 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_CONSTRUCTL_ENTRY=0x58 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_CONSTRUCTL_EXIT=0x59 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_RUNERROR_ENTRY=0x56 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_RUNERROR_EXIT=0x57 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_RUNL_ENTRY=0x54 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_RUNL_EXIT=0x55 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_SCANDIRL_ENTRY=0x4c +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_SCANDIRL_EXIT=0x4d +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_SCANNEXTL_ENTRY=0x52 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_SCANNEXTL_EXIT=0x53 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_SCANNEXTSTORAGEL_ENTRY=0x4e +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_SCANNEXTSTORAGEL_EXIT=0x4f +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_SCANNEXTSUBDIRL_ENTRY=0x50 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_SCANNEXTSUBDIRL_EXIT=0x51 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_SCANSTORAGEL_ENTRY=0x4a +[TRACE]TRACE_FLOW[0x8A]_CMTPFSENUMERATOR_SCANSTORAGEL_EXIT=0x4b +[TRACE]TRACE_FLOW[0x8A]_CMTPFSEXCLUSIONMGR_ISFILEACCEPTEDL_ENTRY=0x5e +[TRACE]TRACE_FLOW[0x8A]_CMTPFSEXCLUSIONMGR_ISFILEACCEPTEDL_EXIT=0x5f +[TRACE]TRACE_FLOW[0x8A]_CMTPFSEXCLUSIONMGR_ISPATHACCEPTEDL_ENTRY=0x60 +[TRACE]TRACE_FLOW[0x8A]_CMTPFSEXCLUSIONMGR_ISPATHACCEPTEDL_EXIT=0x61 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_BUILDFORMATL_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_BUILDFORMATL_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_BUILDSERVICEIDL_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_BUILDSERVICEIDL_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_BUILDSERVICEPROPERTYL_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_BUILDSERVICEPROPERTYL_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_CMTPFULLENUMDATACODEMGR_DES_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_CMTPFULLENUMDATACODEMGR_DES_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_CONSTRUCTL_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_CONSTRUCTL_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_GETSEVICEPROPCODESL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_GETSEVICEPROPCODESL_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_SERVICEPROPERTYINFO_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMDATACODEMGR_SERVICEPROPERTYINFO_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_CMTPFULLENUMSERVICEHANDLER_DES_ENTRY=0x62 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_CMTPFULLENUMSERVICEHANDLER__DES_EXIT=0x63 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_CONSTRUCTL_ENTRY=0x64 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_CONSTRUCTL_EXIT=0x65 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_DELETESERVICEPROPERTY_ENTRY=0x6e +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_DELETESERVICEPROPERTY_EXIT=0x6f +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_GETSERVICECAPABILITYL_ENTRY=0x66 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_GETSERVICECAPABILITYL_EXIT=0x67 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_GETSERVICEPROPDESCL_ENTRY=0x68 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_GETSERVICEPROPDESCL_EXIT=0x69 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_GETSERVICEPROPETYL_ENTRY=0x6a +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_GETSERVICEPROPETYL_EXIT=0x6b +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL_ENTRY=0x70 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_LOADSERVICEPROPVALUEL_EXIT=0x71 +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_SETSERVICEPROPETYL_ENTRY=0x6c +[TRACE]TRACE_FLOW[0x8A]_CMTPFULLENUMSERVICEHANDLER_SETSERVICEPROPETYL_EXIT=0x6d +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTINFO_BUILDOBJECTINFOL_ENTRY=0x80 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTINFO_BUILDOBJECTINFOL_EXIT=0x81 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTINFO_CMTPGETOBJECTINFO_DES_ENTRY=0x7c +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTINFO_CMTPGETOBJECTINFO_DES_EXIT=0x7d +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTINFO_CONSTRUCTL_ENTRY=0x7e +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTINFO_CONSTRUCTL_EXIT=0x7f +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_CMTPGETOBJECTPROPLIST_DES_ENTRY=0x82 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_CMTPGETOBJECTPROPLIST_DES_EXIT=0x83 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_CONSTRUCTL_ENTRY=0x86 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_CONSTRUCTL_EXIT=0x87 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_SERVICEL_ENTRY=0x84 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_SERVICEL_EXIT=0x85 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECT_BUILDFILEOBJECTL_ENTRY=0x78 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECT_BUILDFILEOBJECTL_EXIT=0x79 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECT_CMTPGETOBJECT_DES_ENTRY=0x72 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECT_CMTPGETOBJECT_DES_EXIT=0x73 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECT_CONSTRUCTL_ENTRY=0x74 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECT_CONSTRUCTL_EXIT=0x75 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECT_DOHANDLERESPONSEPHASEL_ENTRY=0x7a +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECT_DOHANDLERESPONSEPHASEL_EXIT=0x7b +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECT_SERVICEL_ENTRY=0x76 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECT_SERVICEL_EXIT=0x77 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETPARTIALOBJECT_CHECKREQUESTL_ENTRY=0x8c +[TRACE]TRACE_FLOW[0x8A]_CMTPGETPARTIALOBJECT_CHECKREQUESTL_EXIT=0x8d +[TRACE]TRACE_FLOW[0x8A]_CMTPGETPARTIALOBJECT_CMTPGETPARTIALOBJECT_DES_ENTRY=0x88 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETPARTIALOBJECT_CMTPGETPARTIALOBJECT_DES_EXIT=0x89 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETPARTIALOBJECT_CONSTRUCTL_ENTRY=0x8a +[TRACE]TRACE_FLOW[0x8A]_CMTPGETPARTIALOBJECT_CONSTRUCTL_EXIT=0x8b +[TRACE]TRACE_FLOW[0x8A]_CMTPGETPARTIALOBJECT_DOHANDLERESPONSEPHASEL_ENTRY=0x90 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETPARTIALOBJECT_DOHANDLERESPONSEPHASEL_EXIT=0x91 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETPARTIALOBJECT_SERVICEL_ENTRY=0x8e +[TRACE]TRACE_FLOW[0x8A]_CMTPGETPARTIALOBJECT_SERVICEL_EXIT=0x8f +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_BUILDOBJECTINFOL_ENTRY=0xbc +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_BUILDOBJECTINFOL_EXIT=0xbd +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_CMTPKNOWLEDGEHANDLER_DES_ENTRY=0xa0 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_CMTPKNOWLEDGEHANDLER_DES_EXIT=0xa1 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_COMMITFORNEWOBJECTL_ENTRY=0xa6 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_COMMITFORNEWOBJECTL_EXIT=0xa7 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_COMMITL_ENTRY=0xa4 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_COMMITL_EXIT=0xa5 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_CONSTRUCTL_ENTRY=0xa2 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_CONSTRUCTL_EXIT=0xa3 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_DELETEOBJECTL_ENTRY=0xb4 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_DELETEOBJECTL_EXIT=0xb5 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_DELETEOBJECTPROPERTYL_ENTRY=0xb8 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_DELETEOBJECTPROPERTYL_EXIT=0xb9 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETALLOBJECTPROPCODEBYGROUPL_ENTRY=0xc5 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETALLOBJECTPROPCODEBYGROUPL_EXIT=0xc6 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETBUFFERFORSENDOBJECTL_ENTRY=0xba +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETBUFFERFORSENDOBJECTL_EXIT=0xbb +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETOBJECTINFOL_ENTRY=0xbe +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETOBJECTINFOL_EXIT=0xbf +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETOBJECTL_ENTRY=0xb6 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETOBJECTL_EXIT=0xb7 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETOBJECTPROPERTYL_ENTRY=0xb0 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETOBJECTPROPERTYL_EXIT=0xb1 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETOBJECTSIZEL_ENTRY=0xc2 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETOBJECTSIZEL_EXIT=0xc3 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETOBJECTSUIDL_ENTRY=0xaa +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_GETOBJECTSUIDL_EXIT=0xab +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_RELEASEOBJECTBUFFER_ENTRY=0xc0 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_RELEASEOBJECTBUFFER_EXIT=0xc1 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_ROLLBACK_ENTRY=0xa8 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_ROLLBACK_EXIT=0xa9 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_SENDOBJECTINFOL_ENTRY=0xac +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_SENDOBJECTINFOL_EXIT=0xad +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_SENDOBJECTPROPLISTL_ENTRY=0xae +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_SENDOBJECTPROPLISTL_EXIT=0xaf +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_SETOBJECTPROPERTYL_ENTRY=0xb2 +[TRACE]TRACE_FLOW[0x8A]_CMTPKNOWLEDGEHANDLER_SETOBJECTPROPERTYL_EXIT=0xb3 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CANMOVEOBJECTL_ENTRY=0xda +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CANMOVEOBJECTL_EXIT=0xdb +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CHECKREQUESTL_ENTRY=0xc9 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CHECKREQUESTL_EXIT=0xca +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CMTPMOVEOBJECT_ENTRY=0xc7 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CMTPMOVEOBJECT_EXIT=0xc8 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CONSTRUCTL_ENTRY=0xce +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CONSTRUCTL_EXIT=0xcf +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_DOONTIMEOUTL_ENTRY=0xe0 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_DOONTIMEOUTL_EXIT=0xe1 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_GETPARAMETERSL_ENTRY=0xd6 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_GETPARAMETERSL_EXIT=0xd7 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_GETPREVIOUSPROPERTIESL_ENTRY=0xdc +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_GETPREVIOUSPROPERTIESL_EXIT=0xdd +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_MATCH_ENTRY=0xe4 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_MATCH_EXIT=0xe5 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_MOVEFILEL_ENTRY=0xd0 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_MOVEFILEL_EXIT=0xd1 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_MOVEFOLDERL_ENTRY=0xd2 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_MOVEFOLDERL_EXIT=0xd3 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_MOVEOBJECTL_ENTRY=0xd4 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_MOVEOBJECTL_EXIT=0xd5 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_RUNL_ENTRY=0xe2 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_RUNL_EXIT=0xe3 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_SERVICEL_ENTRY=0xcc +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_SERVICEL_EXIT=0xcd +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_SETDEFAULTPARENTOBJECTL_ENTRY=0xd8 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_SETDEFAULTPARENTOBJECTL_EXIT=0xd9 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_SETPREVIOUSPROPERTIESL_ENTRY=0xde +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_SETPREVIOUSPROPERTIESL_EXIT=0xdf +[TRACE]TRACE_FLOW[0x8A]_CMTPREQUESTCHECKER_CMTPREQUESTCHECKER_ENTRY=0xe6 +[TRACE]TRACE_FLOW[0x8A]_CMTPREQUESTCHECKER_CMTPREQUESTCHECKER_EXIT=0xe7 +[TRACE]TRACE_FLOW[0x8A]_CMTPREQUESTCHECKER_CONSTRUCTL_ENTRY=0xed +[TRACE]TRACE_FLOW[0x8A]_CMTPREQUESTCHECKER_CONSTRUCTL_EXIT=0xee +[TRACE]TRACE_FLOW[0x8A]_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL_ENTRY=0xe8 +[TRACE]TRACE_FLOW[0x8A]_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL_EXIT=0xe9 +[TRACE]TRACE_FLOW[0x8A]_CMTPREQUESTPROCESSOR_CMTPREQUESTPROCESSOR_DES_ENTRY=0xef +[TRACE]TRACE_FLOW[0x8A]_CMTPREQUESTPROCESSOR_CMTPREQUESTPROCESSOR_DES_EXIT=0xf0 +[TRACE]TRACE_FLOW[0x8A]_CMTPREQUESTPROCESSOR_DOHANDLEREQUESTPHASEL_ENTRY=0xf1 +[TRACE]TRACE_FLOW[0x8A]_CMTPREQUESTPROCESSOR_DOHANDLEREQUESTPHASEL_EXIT=0xf2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CHECKPROPCODEL_ENTRY=0x11e +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CHECKPROPCODEL_EXIT=0x11f +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CHECKREQUESTL_ENTRY=0xf5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CHECKREQUESTL_EXIT=0xf6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CHECKSENDINGSTATEL_ENTRY=0x102 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CHECKSENDINGSTATEL_EXIT=0x103 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CMTPSENDOBJECTINFO_DES_ENTRY=0xf3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CMTPSENDOBJECTINFO_DES_EXIT=0xf4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CONSTRUCTL_ENTRY=0xfa +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CONSTRUCTL_EXIT=0xfb +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_ENTRY=0x100 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL_EXIT=0x101 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_ENTRY=0xfe +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_DOHANDLERESPONSEPHASEL_EXIT=0xff +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_ENTRY=0x112 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL_EXIT=0x113 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_ENTRY=0x10e +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_EXIT=0x10f +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_ENTRY=0x110 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTPROPLISTCOMPLETEL_EXIT=0x111 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_EXISTS_ENTRY=0x118 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_EXISTS_EXIT=0x119 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_EXTRACTPROPERTYL_ENTRY=0x11c +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_EXTRACTPROPERTYL_EXIT=0x11d +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_ENTRY=0x10a +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_GETDEFAULTPARENTOBJECTL_EXIT=0x10b +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_GETFULLPATHNAMEL_ENTRY=0x114 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_GETFULLPATHNAMEL_EXIT=0x115 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_ENTRY=0x10c +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL_EXIT=0x10d +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_ISTOOLARGE_ENTRY=0x116 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_ISTOOLARGE_EXIT=0x117 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_MATCH_ENTRY=0xfc +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_MATCH_EXIT=0xfd +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_RESERVEOBJECTL_ENTRY=0x120 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_RESERVEOBJECTL_EXIT=0x121 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_SERVICEL_ENTRY=0xf8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_SERVICEL_EXIT=0xf9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_SERVICESENDOBJECTINFOL_ENTRY=0x104 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_SERVICESENDOBJECTINFOL_EXIT=0x105 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_SERVICESENDOBJECTL_ENTRY=0x108 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_SERVICESENDOBJECTL_EXIT=0x109 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_SERVICESENDOBJECTPROPLISTL_ENTRY=0x106 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_SERVICESENDOBJECTPROPLISTL_EXIT=0x107 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_SETPROPERTIESL_ENTRY=0x122 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_SETPROPERTIESL_EXIT=0x123 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_ENTRY=0x11a +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL_EXIT=0x11b +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CHECKFMTANDSETHANDLER_ENTRY=0x14e +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CHECKFMTANDSETHANDLER_EXIT=0x14f +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTL_ENTRY=0x12a +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTL_EXIT=0x12b +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL_ENTRY=0x12e +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL_EXIT=0x12f +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CHECKSENDINGSTATEL_ENTRY=0x12c +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CHECKSENDINGSTATEL_EXIT=0x12d +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CHECKSTOREANDPARENT_ENTRY=0x130 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CHECKSTOREANDPARENT_EXIT=0x131 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CMTPSVCCOMPOUNDPROCESSOR_DES_ENTRY=0x124 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CMTPSVCCOMPOUNDPROCESSOR_DES_EXIT=0x125 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CONSTRUCTL_ENTRY=0x126 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_CONSTRUCTL_EXIT=0x127 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLECOMPLETINGPHASEL_ENTRY=0x13e +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLECOMPLETINGPHASEL_EXIT=0x13f +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSEPHASEL_ENTRY=0x13c +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSEPHASEL_EXIT=0x13d +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTINFOL_ENTRY=0x140 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTINFOL_EXIT=0x141 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTL_ENTRY=0x146 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTL_EXIT=0x147 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTPROPLISTL_ENTRY=0x142 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTPROPLISTL_EXIT=0x143 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSEUPDATEOBJECTPROPLISTL_ENTRY=0x144 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSEUPDATEOBJECTPROPLISTL_EXIT=0x145 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_EXTRACTOBJECTSIZEL_ENTRY=0x148 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_EXTRACTOBJECTSIZEL_EXIT=0x149 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_MATCH_ENTRY=0x128 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_MATCH_EXIT=0x129 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_REGISTERREQUESTANDSENDRESPONSEL_ENTRY=0x14c +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_REGISTERREQUESTANDSENDRESPONSEL_EXIT=0x14d +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_RESERVEOBJECTL_ENTRY=0x14a +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_RESERVEOBJECTL_EXIT=0x14b +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_SENDOBJECTPROPLISTL_ENTRY=0x150 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_SENDOBJECTPROPLISTL_EXIT=0x151 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_SERVICEL_ENTRY=0x132 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_SERVICEL_EXIT=0x133 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_SERVICEOBJECTPROPERTIESL_ENTRY=0x134 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_SERVICEOBJECTPROPERTIESL_EXIT=0x135 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTINFOL_ENTRY=0x138 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTINFOL_EXIT=0x139 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTL_ENTRY=0x136 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTL_EXIT=0x137 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTPROPLISTL_ENTRY=0x13a +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_SERVICESENDOBJECTPROPLISTL_EXIT=0x13b +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_UPDATEOBJECTPROPLISTL_ENTRY=0x152 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCCOMPOUNDPROCESSOR_UPDATEOBJECTPROPLISTL_EXIT=0x153 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECTPROPLIST_CHECKREQUESTL_ENTRY=0x16d +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECTPROPLIST_CHECKREQUESTL_EXIT=0x16e +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECTPROPLIST_CMTPSVCDELETEOBJECTPROPLIST_DES_ENTRY=0x169 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECTPROPLIST_CMTPSVCDELETEOBJECTPROPLIST_DES_EXIT=0x16a +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECTPROPLIST_CONSTRUCTL_ENTRY=0x16b +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECTPROPLIST_CONSTRUCTL_EXIT=0x16c +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECTPROPLIST_DELETEOBJECTPROPLISTL_ENTRY=0x173 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECTPROPLIST_DELETEOBJECTPROPLISTL_EXIT=0x174 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY=0x171 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_EXIT=0x172 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECTPROPLIST_SERVICEL_ENTRY=0x16f +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECTPROPLIST_SERVICEL_EXIT=0x170 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_CHECKFMTANDSETHANDLER_ENTRY=0x165 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_CHECKFMTANDSETHANDLER_EXIT=0x166 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_CHECKREQUESTL_ENTRY=0x161 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_CHECKREQUESTL_EXIT=0x162 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_CMTPSVCDELETEOBJECT_DES_ENTRY=0x154 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_CMTPSVCDELETEOBJECT_DES_EXIT=0x155 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_COMPLETESELF_ENTRY=0x15f +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_COMPLETESELF_EXIT=0x160 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_DELETEOBJECTL_ENTRY=0x167 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_DELETEOBJECTL_EXIT=0x168 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_LOADALLOBJHANDLESL_ENTRY=0x156 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_LOADALLOBJHANDLESL_EXIT=0x157 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_PROCESSFINALPHASEL_ENTRY=0x163 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_PROCESSFINALPHASEL_EXIT=0x164 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_RUNERROR_ENTRY=0x15d +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_RUNERROR_EXIT=0x15e +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_RUNL_ENTRY=0x15b +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_RUNL_EXIT=0x15c +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_SERVICEL_ENTRY=0x158 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETEOBJECT_SERVICEL_EXIT=0x159 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETESERVICEPROPLIST_CHECKREQUESTL_ENTRY=0x179 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETESERVICEPROPLIST_CHECKREQUESTL_EXIT=0x17a +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETESERVICEPROPLIST_CMTPSVCDELETESERVICEPROPLIST_DES_ENTRY=0x175 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETESERVICEPROPLIST_CMTPSVCDELETESERVICEPROPLIST_DES_EXIT=0x176 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETESERVICEPROPLIST_CONSTRUCTL_ENTRY=0x177 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETESERVICEPROPLIST_CONSTRUCTL_EXIT=0x178 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETESERVICEPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY=0x17d +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETESERVICEPROPLIST_DOHANDLERESPONSEPHASEL_EXIT=0x17e +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETESERVICEPROPLIST_SERVICEL_ENTRY=0x17b +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCDELETESERVICEPROPLIST_SERVICEL_EXIT=0x17c +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTINFO_CHECKREQUESTL_ENTRY=0x18b +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTINFO_CHECKREQUESTL_EXIT=0x18c +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTINFO_CMTPSVCGETOBJECTINFO_ENTRY=0x187 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTINFO_CMTPSVCGETOBJECTINFO_EXIT=0x188 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTINFO_CONSTRUCTL_ENTRY=0x189 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTINFO_CONSTRUCTL_EXIT=0x18a +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTINFO_SERVICEL_ENTRY=0x18d +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTINFO_SERVICEL_EXIT=0x18e +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_CHECKDEPTH_ENTRY=0x199 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_CHECKDEPTH_EXIT=0x19a +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_CHECKOBJECTHANDLEANDFORMATL_ENTRY=0x195 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_CHECKOBJECTHANDLEANDFORMATL_EXIT=0x196 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_CHECKPROPERTYCODEFORFORMATL_ENTRY=0x197 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_CHECKPROPERTYCODEFORFORMATL_EXIT=0x198 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_CHECKREQUESTL_ENTRY=0x193 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_CHECKREQUESTL_EXIT=0x194 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_CMTPSVCGETOBJECTPROPLIST_DES_ENTRY=0x18f +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_CMTPSVCGETOBJECTPROPLIST_DES_EXIT=0x190 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_COMPLETESELF_ENTRY=0x1a3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_COMPLETESELF_EXIT=0x1a4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_CONSTRUCTL_ENTRY=0x191 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_CONSTRUCTL_EXIT=0x192 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY=0x19d +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_EXIT=0x19e +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_PROCESSFINALPHASEL_ENTRY=0x1a5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_PROCESSFINALPHASEL_EXIT=0x1a6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_RUNERROR_ENTRY=0x1a1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_RUNERROR_EXIT=0x1a2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_RUNL_ENTRY=0x19f +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_RUNL_EXIT=0x1a0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_SERVICEL_ENTRY=0x19b +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECTPROPLIST_SERVICEL_EXIT=0x19c +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECT_CHECKREQUESTL_ENTRY=0x183 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECT_CHECKREQUESTL_EXIT=0x184 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECT_CMTPSVCGETOBJECT_ENTRY=0x17f +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECT_CMTPSVCGETOBJECT_EXIT=0x180 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECT_CONSTRUCTL_ENTRY=0x181 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECT_CONSTRUCTL_EXIT=0x182 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECT_SERVICEL_ENTRY=0x185 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETOBJECT_SERVICEL_EXIT=0x186 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETREFERENCES_CHECKREQUESTL_ENTRY=0x1ab +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETREFERENCES_CHECKREQUESTL_EXIT=0x1ac +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETREFERENCES_CMTPSVCGETREFERENCES_CONS_ENTRY=0x1a9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETREFERENCES_CMTPSVCGETREFERENCES_CONS_EXIT=0x1aa +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETREFERENCES_CMTPSVCGETREFERENCES_DES_ENTRY=0x1a7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETREFERENCES_CMTPSVCGETREFERENCES_DES_EXIT=0x1a8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETREFERENCES_SERVICEL_ENTRY=0x1ad +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETREFERENCES_SERVICEL_EXIT=0x1ae +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICECAPABILITIES_CHECKREQUESTL_ENTRY=0x1b3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICECAPABILITIES_CHECKREQUESTL_EXIT=0x1b4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICECAPABILITIES_CMTPSVCGETSERVICECAPABILITIES_ENTRY=0x1af +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICECAPABILITIES_CMTPSVCGETSERVICECAPABILITIES_EXIT=0x1b0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICECAPABILITIES_CONSTRUCTL_ENTRY=0x1b1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICECAPABILITIES_CONSTRUCTL_EXIT=0x1b2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICECAPABILITIES_DOHANDLERESPONSEPHASEL_ENTRY=0x1b7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICECAPABILITIES_DOHANDLERESPONSEPHASEL_EXIT=0x1b8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICECAPABILITIES_SERVICEL_ENTRY=0x1b5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICECAPABILITIES_SERVICEL_EXIT=0x1b6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEINFO_CHECKREQUESTL_ENTRY=0x1bd +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEINFO_CHECKREQUESTL_EXIT=0x1be +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEINFO_CMTPSVCGETSERVICEINFO_DES_ENTRY=0x1b9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEINFO_CMTPSVCGETSERVICEINFO_DES_EXIT=0x1ba +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEINFO_CONSTRUCTL_ENTRY=0x1bb +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEINFO_CONSTRUCTL_EXIT=0x1bc +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEINFO_DOHANDLERESPONSEPHASEL_ENTRY=0x1c1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEINFO_DOHANDLERESPONSEPHASEL_EXIT=0x1c2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEINFO_SERVICEL_ENTRY=0x1bf +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEINFO_SERVICEL_EXIT=0x1c0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPDESC_CHECKREQUESTL_ENTRY=0x1c7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPDESC_CHECKREQUESTL_EXIT=0x1c8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPDESC_CMTPSVCGETSERVICEPROPDESC_ENTRY=0x1c3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPDESC_CMTPSVCGETSERVICEPROPDESC_EXIT=0x1c4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPDESC_CONSTRUCTL_ENTRY=0x1c5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPDESC_CONSTRUCTL_EXIT=0x1c6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPDESC_DOHANDLERESPONSEPHASEL_ENTRY=0x1cb +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPDESC_DOHANDLERESPONSEPHASEL_EXIT=0x1cc +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPDESC_SERVICEL_ENTRY=0x1c9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPDESC_SERVICEL_EXIT=0x1ca +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPLIST_CHECKREQUESTL_ENTRY=0x1d3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPLIST_CHECKREQUESTL_EXIT=0x1d4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPLIST_CMTPSVCGETSERVICEPROPLIST_ENTRY=0x1cd +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPLIST_CMTPSVCGETSERVICEPROPLIST_EXIT=0x1ce +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPLIST_CONSTRUCTL_ENTRY=0x1cf +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPLIST_CONSTRUCTL_EXIT=0x1d0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY=0x1d5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPLIST_DOHANDLERESPONSEPHASEL_EXIT=0x1d6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPLIST_SERVICEL_ENTRY=0x1d1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSERVICEPROPLIST_SERVICEL_EXIT=0x1d2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSTORAGEINFO_CHECKREQUESTL_ENTRY=0x1dd +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSTORAGEINFO_CHECKREQUESTL_EXIT=0x1de +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSTORAGEINFO_CMTPSVCGETSTORAGEINFO_ENTRY=0x1d7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSTORAGEINFO_CMTPSVCGETSTORAGEINFO_EXIT=0x1d8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSTORAGEINFO_CONSTRUCTL_ENTRY=0x1d9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSTORAGEINFO_CONSTRUCTL_EXIT=0x1da +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSTORAGEINFO_SERVICEL_ENTRY=0x1db +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCGETSTORAGEINFO_SERVICEL_EXIT=0x1dc +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETOBJECTPROPLIST_CMTPSVCSETOBJECTPROPLIST_ENTRY=0x1df +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETOBJECTPROPLIST_CMTPSVCSETOBJECTPROPLIST_EXIT=0x1e0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETOBJECTPROPLIST_CONSTRUCTL_ENTRY=0x1e1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETOBJECTPROPLIST_CONSTRUCTL_EXIT=0x1e2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY=0x1e5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_EXIT=0x1e6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETOBJECTPROPLIST_SERVICEL_ENTRY=0x1e3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETOBJECTPROPLIST_SERVICEL_EXIT=0x1e4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETOBJECTPROPLIST_SETOBJECTPROPLISTL_ENTRY=0x1e7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETOBJECTPROPLIST_SETOBJECTPROPLISTL_EXIT=0x1e8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_CHECKREQUESTL_ENTRY=0x1f5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_CHECKREQUESTL_EXIT=0x1f6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_CMTPSVCSETREFERENCES_CONS_ENTRY=0x1eb +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_CMTPSVCSETREFERENCES_CONS_EXIT=0x1ec +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_CMTPSVCSETREFERENCES_DES_ENTRY=0x1e9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_CMTPSVCSETREFERENCES_DES_EXIT=0x1ea +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_DOHANDLERESPONSEPHASEL_ENTRY=0x1ef +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_DOHANDLERESPONSEPHASEL_EXIT=0x1f0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_HASDATAPHASE_ENTRY=0x1f1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_HASDATAPHASE_EXIT=0x1f2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_SERVICEL_ENTRY=0x1ed +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_SERVICEL_EXIT=0x1ee +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_VERIFYREFERENCEHANDLESL_ENTRY=0x1f3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETREFERENCES_VERIFYREFERENCEHANDLESL_EXIT=0x1f4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETSERVICEPROPLIST_CHECKREQUESTL_ENTRY=0x1fb +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETSERVICEPROPLIST_CHECKREQUESTL_EXIT=0x1fc +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETSERVICEPROPLIST_CMTPSVCSETSERVICEPROPLIST_DES_ENTRY=0x1f7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETSERVICEPROPLIST_CMTPSVCSETSERVICEPROPLIST_DES_EXIT=0x1f8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETSERVICEPROPLIST_CONSTRUCTL_ENTRY=0x1f9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETSERVICEPROPLIST_CONSTRUCTL_EXIT=0x1fa +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETSERVICEPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY=0x1ff +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETSERVICEPROPLIST_DOHANDLERESPONSEPHASEL_EXIT=0x200 +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETSERVICEPROPLIST_SERVICEL_ENTRY=0x1fd +[TRACE]TRACE_FLOW[0x8A]_CMTPSVCSETSERVICEPROPLIST_SERVICEL_EXIT=0x1fe +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CLOSE_ENTRY=0x207 +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CLOSE_EXIT=0x208 +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CONSTRUCTL_ENTRY=0x20c +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CONSTRUCTL_EXIT=0x20d +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CSINGLETONS_DES_ENTRY=0x20a +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CSINGLETONS_DES_EXIT=0x20b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPCOPYOBJECT_DOHANDLECOMPLETINGPHASEL_EXIT=0x2f +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPKNOWLEDGEHANDLER_GETOBJECTSIZEL_EXIT=0xc4 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPMOVEOBJECT_CHECKREQUESTL_EXIT=0xcb +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL_EXIT=0xea +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPSENDOBJECTINFO_CHECKREQUESTL_EXIT=0xf7 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPSVCDELETEOBJECT_SERVICEL_EXIT=0x15a +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSINGLETONS_CLOSE_EXIT=0x209 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL_EXIT=0xeb +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL_EXIT=0xec +[TRACE]TRACE_FLOW[0x8A]_RMTPDPSIGNGLETONS_CSINGLETONS_OPENL_ENTRY=0x205 +[TRACE]TRACE_FLOW[0x8A]_RMTPDPSIGNGLETONS_CSINGLETONS_OPENL_EXIT=0x206 +[TRACE]TRACE_FLOW[0x8A]_RMTPDPSINGLETONS_CLOSE_ENTRY=0x203 +[TRACE]TRACE_FLOW[0x8A]_RMTPDPSINGLETONS_CLOSE_EXIT=0x204 +[TRACE]TRACE_FLOW[0x8A]_RMTPDPSINGLETONS_OPENL_ENTRY=0x201 +[TRACE]TRACE_FLOW[0x8A]_RMTPDPSINGLETONS_OPENL_EXIT=0x202 +[TRACE]TRACE_FLOW[0x8A]_RMTPUTILITY_MTPTIMESTR2TTIME_ENTRY=0x210 +[TRACE]TRACE_FLOW[0x8A]_RMTPUTILITY_MTPTIMESTR2TTIME_EXIT=0x211 +[TRACE]TRACE_FLOW[0x8A]_RMTPUTILITY_OPENL_ENTRY=0x20e +[TRACE]TRACE_FLOW[0x8A]_RMTPUTILITY_OPENL_EXIT=0x20f +[TRACE]TRACE_FLOW[0x8A]_RMTPUTILITY_RENAMEALLCHILDRENL_ENTRY=0x214 +[TRACE]TRACE_FLOW[0x8A]_RMTPUTILITY_RENAMEALLCHILDRENL_EXIT=0x215 +[TRACE]TRACE_FLOW[0x8A]_RMTPUTILITY_RENAMEOBJECTL_ENTRY=0x212 +[TRACE]TRACE_FLOW[0x8A]_RMTPUTILITY_RENAMEOBJECTL_EXIT=0x213 +[TRACE]TRACE_NORMAL[0x86]_CKNOWLEDGEOBJECT_SETCOLUMNTYPE128VALUE=0x24 +[TRACE]TRACE_NORMAL[0x86]_CMTPCOPYOBJECT_CANCOPYOBJECTL=0x4 +[TRACE]TRACE_NORMAL[0x86]_CMTPCOPYOBJECT_CHECKREQUESTL=0x1 +[TRACE]TRACE_NORMAL[0x86]_CMTPCOPYOBJECT_DOONTIMEOUTL=0x5 +[TRACE]TRACE_NORMAL[0x86]_CMTPCOPYOBJECT_RUNL=0x6 +[TRACE]TRACE_NORMAL[0x86]_CMTPCOPYOBJECT_SERVICEL=0x2 +[TRACE]TRACE_NORMAL[0x86]_CMTPDELETEOBJECT_DELETEFOLDERORFILEL=0x8 +[TRACE]TRACE_NORMAL[0x86]_CMTPDELETEOBJECT_SERVICEL=0xa +[TRACE]TRACE_NORMAL[0x86]_CMTPFSENUMERATOR_ADDENTRYL=0x1b +[TRACE]TRACE_NORMAL[0x86]_CMTPFSENUMERATOR_ADDFILEENTRYFOROTHERDPL=0x1c +[TRACE]TRACE_NORMAL[0x86]_CMTPFSENUMERATOR_RUNERROR=0x12 +[TRACE]TRACE_NORMAL[0x86]_CMTPFSENUMERATOR_RUNL=0x11 +[TRACE]TRACE_NORMAL[0x86]_CMTPFSENUMERATOR_SCANNEXTSUBDIRL=0x10 +[TRACE]TRACE_NORMAL[0x86]_CMTPFSENUMERATOR_SCANSTORAGEL=0xf +[TRACE]TRACE_NORMAL[0x86]_CMTPFSENUMERATOR_STARTL=0xc +[TRACE]TRACE_NORMAL[0x86]_CMTPFSEXCLUSIONMGR_ISFILEACCEPTEDL=0x1e +[TRACE]TRACE_NORMAL[0x86]_CMTPFSEXCLUSIONMGR_ISPATHACCEPTEDL=0x1f +[TRACE]TRACE_NORMAL[0x86]_CMTPGETOBJECTINFO_BUILDOBJECTINFOL=0x20 +[TRACE]TRACE_NORMAL[0x86]_CMTPGETOBJECTPROPLIST_SERVICEL=0x22 +[TRACE]TRACE_NORMAL[0x86]_CMTPMOVEOBJECT_CANMOVEOBJECTL=0x27 +[TRACE]TRACE_NORMAL[0x86]_CMTPMOVEOBJECT_CHECKREQUESTL=0x25 +[TRACE]TRACE_NORMAL[0x86]_CMTPMOVEOBJECT_DOONTIMEOUTL=0x28 +[TRACE]TRACE_NORMAL[0x86]_CMTPMOVEOBJECT_MATCH=0x2b +[TRACE]TRACE_NORMAL[0x86]_CMTPMOVEOBJECT_MOVEOBJECTL=0x26 +[TRACE]TRACE_NORMAL[0x86]_CMTPMOVEOBJECT_RUNL=0x29 +[TRACE]TRACE_NORMAL[0x86]_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL=0x2c +[TRACE]TRACE_NORMAL[0x86]_CMTPREQUESTPROCESSOR_DOHANDLEREQUESTPHASEL=0x2f +[TRACE]TRACE_NORMAL[0x86]_CMTPSENDOBJECTINFO_CHECKPROPCODEL=0x3c +[TRACE]TRACE_NORMAL[0x86]_CMTPSENDOBJECTINFO_CHECKREQUESTL=0x31 +[TRACE]TRACE_NORMAL[0x86]_CMTPSENDOBJECTINFO_CMTPSENDOBJECTINFO=0x30 +[TRACE]TRACE_NORMAL[0x86]_CMTPSENDOBJECTINFO_DOHANDLECOMPLETINGPHASEL=0x32 +[TRACE]TRACE_NORMAL[0x86]_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x34 +[TRACE]TRACE_NORMAL[0x86]_CMTPSENDOBJECTINFO_EXISTS=0x39 +[TRACE]TRACE_NORMAL[0x86]_CMTPSENDOBJECTINFO_EXTRACTPROPERTYL=0x3b +[TRACE]TRACE_NORMAL[0x86]_CMTPSENDOBJECTINFO_GETFULLPATHNAMEL=0x37 +[TRACE]TRACE_NORMAL[0x86]_CMTPSENDOBJECTINFO_GETPARENTOBJECTANDSTORAGEIDL=0x33 +[TRACE]TRACE_NORMAL[0x86]_CMTPSENDOBJECTINFO_ROLLBACK=0x3d +[TRACE]TRACE_NORMAL[0x86]_CMTPSENDOBJECTINFO_VERIFYOBJECTPROPLISTL=0x3a +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTL=0x3f +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL=0x47 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCCOMPOUNDPROCESSOR_CHECKSENDINGSTATEL=0x42 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCCOMPOUNDPROCESSOR_CHECKSTOREANDPARENT=0x48 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTINFOL=0x4b +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTL=0x4f +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTPROPLISTL=0x4d +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSEUPDATEOBJECTPROPLISTL=0x4e +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCCOMPOUNDPROCESSOR_RESERVEOBJECTL=0x50 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCCOMPOUNDPROCESSOR_SENDOBJECTPROPLISTL=0x51 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCCOMPOUNDPROCESSOR_UPDATEOBJECTPROPLISTL=0x52 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCDELETEOBJECTPROPLIST_CHECKREQUESTL=0x59 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCDELETEOBJECTPROPLIST_DELETEOBJECTPROPLISTL=0x5b +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCDELETEOBJECTPROPLIST_DOHANDLERESPONSEPHASEL=0x5a +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCDELETEOBJECT_CHECKREQUESTL=0x57 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCDELETEOBJECT_CMTPSVCDELETEOBJECT=0x53 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCDELETEOBJECT_PROCESSFINALPHASEL=0x58 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCDELETEOBJECT_RUNL=0x55 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCDELETEOBJECT_SERVICEL=0x54 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCDELETESERVICEPROPLIST_CHECKREQUESTL=0x5c +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCDELETESERVICEPROPLIST_DOHANDLERESPONSEPHASEL=0x5d +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETOBJECTINFO_CHECKREQUESTL=0x5f +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETOBJECTPROPLIST_CHECKDEPTH=0x63 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETOBJECTPROPLIST_CHECKOBJECTHANDLEANDFORMATL=0x61 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETOBJECTPROPLIST_CHECKPROPERTYCODEFORFORMATL=0x62 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETOBJECTPROPLIST_CHECKREQUESTL=0x60 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL=0x64 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETOBJECTPROPLIST_RUNL=0x65 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETOBJECT_CHECKREQUESTL=0x5e +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETREFERENCES_CHECKREQUESTL=0x67 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETSERVICECAPABILITIES_CHECKREQUESTL=0x68 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETSERVICECAPABILITIES_DOHANDLERESPONSEPHASEL=0x69 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETSERVICEINFO_CHECKREQUESTL=0x6a +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETSERVICEINFO_DOHANDLERESPONSEPHASEL=0x6b +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETSERVICEPROPDESC_CHECKREQUESTL=0x6c +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETSERVICEPROPDESC_DOHANDLERESPONSEPHASEL=0x6e +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETSERVICEPROPDESC_SERVICEL=0x6d +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETSERVICEPROPLIST_CHECKREQUESTL=0x6f +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETSERVICEPROPLIST_DOHANDLERESPONSEPHASEL=0x70 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCGETSTORAGEINFO_CHECKREQUESTL=0x71 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL=0x72 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCSETOBJECTPROPLIST_SETOBJECTPROPLISTL=0x74 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCSETREFERENCES_CHECKREQUESTL=0x75 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCSETSERVICEPROPLIST_CHECKREQUESTL=0x76 +[TRACE]TRACE_NORMAL[0x86]_CMTPSVCSETSERVICEPROPLIST_DOHANDLERESPONSEPHASEL=0x77 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPCOPYOBJECT_RUNL=0x7 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPCOPYOBJECT_SERVICEL=0x3 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDELETEOBJECT_DELETEFOLDERORFILEL=0x9 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDELETEOBJECT_SERVICEL=0xb +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPFSENUMERATOR_PROCESSENTRIESL=0x13 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPFSENUMERATOR_STARTL=0xd +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPFSEXCLUSIONMGR_ISFILEACCEPTEDL=0x1d +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPGETOBJECTINFO_BUILDOBJECTINFOL=0x21 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPGETOBJECTPROPLIST_SERVICEL=0x23 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPMOVEOBJECT_RUNL=0x2a +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL=0x2d +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL=0x35 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSENDOBJECTINFO_ISTOOLARGE=0x38 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSENDOBJECTINFO_ROLLBACK=0x3e +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL=0x43 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSVCCOMPOUNDPROCESSOR_CHECKSENDINGSTATEL=0x40 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLECOMPLETINGPHASEL=0x49 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTINFOL=0x4a +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSESENDOBJECTPROPLISTL=0x4c +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSVCDELETEOBJECT_RUNL=0x56 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSVCGETOBJECTPROPLIST_RUNL=0x66 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSVCSETOBJECTPROPLIST_DOHANDLERESPONSEPHASEL=0x73 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPFSENUMERATOR_PROCESSENTRIESL=0x14 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPFSENUMERATOR_STARTL=0xe +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL=0x2e +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTCOMPLETEL=0x36 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL=0x44 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPSVCCOMPOUNDPROCESSOR_CHECKSENDINGSTATEL=0x41 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPFSENUMERATOR_PROCESSENTRIESL=0x15 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL=0x45 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPFSENUMERATOR_PROCESSENTRIESL=0x16 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPSVCCOMPOUNDPROCESSOR_CHECKREQUESTPARAMETERSL=0x46 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPFSENUMERATOR_PROCESSENTRIESL=0x17 +[TRACE]TRACE_NORMAL[0x86]_DUP6_CMTPFSENUMERATOR_PROCESSENTRIESL=0x18 +[TRACE]TRACE_NORMAL[0x86]_DUP7_CMTPFSENUMERATOR_PROCESSENTRIESL=0x19 +[TRACE]TRACE_NORMAL[0x86]_DUP8_CMTPFSENUMERATOR_PROCESSENTRIESL=0x1a +[TRACE]TRACE_NORMAL[0x86]_RMTPUTILITY_CONTAINERMIMETYPE=0x78 +[TRACE]TRACE_NORMAL[0x86]_RMTPUTILITY_PARSEENUMERATIONFLAG=0x7d +[TRACE]TRACE_NORMAL[0x86]_RMTPUTILITY_PARSEEXTENSION=0x7a +[TRACE]TRACE_NORMAL[0x86]_RMTPUTILITY_PARSEFORMATCODE=0x79 +[TRACE]TRACE_NORMAL[0x86]_RMTPUTILITY_PARSEMIMETYPEL=0x7b +[TRACE]TRACE_NORMAL[0x86]_RMTPUTILITY_PARSESUBFORMATCODE=0x7c +[TRACE]TRACE_WARNING[0x83]_CMTPFSENUMERATOR_PROCESSENTRIESL=0x2 +[TRACE]TRACE_WARNING[0x83]_CMTPKNOWLEDGEHANDLER_GETOBJECTPROPERTYL=0x5 +[TRACE]TRACE_WARNING[0x83]_CMTPKNOWLEDGEHANDLER_SENDOBJECTINFOL=0x3 +[TRACE]TRACE_WARNING[0x83]_CMTPKNOWLEDGEHANDLER_SENDOBJECTPROPLISTL=0x4 +[TRACE]TRACE_WARNING[0x83]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLECOMPLETINGPHASEL=0xa +[TRACE]TRACE_WARNING[0x83]_CMTPSVCCOMPOUNDPROCESSOR_DOHANDLERESPONSEPHASEL=0x9 +[TRACE]TRACE_WARNING[0x83]_CMTPSVCCOMPOUNDPROCESSOR_SERVICEL=0x8 +[TRACE]TRACE_WARNING[0x83]_DUP1_CMTPFSENUMERATOR_RUNERROR=0x1 +[TRACE]TRACE_WARNING[0x83]_DUP1_CMTPSVCDELETEOBJECTPROPLIST_CHECKREQUESTL=0xc +[TRACE]TRACE_WARNING[0x83]_DUP1_CMTPSVCDELETEOBJECT_CHECKREQUESTL=0xb +[TRACE]TRACE_WARNING[0x83]_DUP1_CMTPSVCGETOBJECTINFO_CHECKREQUESTL=0xe +[TRACE]TRACE_WARNING[0x83]_DUP1_CMTPSVCGETOBJECTPROPLIST_CHECKOBJECTHANDLEANDFORMATL=0xf +[TRACE]TRACE_WARNING[0x83]_DUP1_CMTPSVCGETOBJECT_CHECKREQUESTL=0xd +[TRACE]TRACE_WARNING[0x83]_DUP1_CMTPSVCGETREFERENCES_CHECKREQUESTL=0x10 +[TRACE]TRACE_WARNING[0x83]_DUP1_CMTPSVCGETSERVICEPROPDESC_CHECKREQUESTL=0x11 +[TRACE]TRACE_WARNING[0x83]_DUP1_CMTPSVCSETREFERENCES_CHECKREQUESTL=0x13 +[TRACE]TRACE_WARNING[0x83]_DUP2_CMTPSVCGETSERVICEPROPDESC_CHECKREQUESTL=0x12 +[TRACE]TRACE_WARNING[0x83]_DUP3_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL=0x6 +[TRACE]TRACE_WARNING[0x83]_DUP4_CMTPREQUESTCHECKER_VERIFYOBJECTHANDLEL=0x7 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/group/mtpproxydp.mmp --- a/mtpfws/mtpfw/dataproviders/proxydp/group/mtpproxydp.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/group/mtpproxydp.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -13,8 +13,6 @@ // Description: // -#include - TARGET mtpproxydp.dll TARGETTYPE PLUGIN UID 0x10009D8D 0x102827A6 @@ -26,7 +24,8 @@ USERINCLUDE ../inc USERINCLUDE ../../dputility/inc USERINCLUDE ../../../common/inc -USERINCLUDE ../../../inc +USERINCLUDE ../../../inc +USERINCLUDE ../traces SOURCEPATH ../src SOURCE cmtpcopyobject.cpp diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpcopyobject.h --- a/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpcopyobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpcopyobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -65,8 +65,7 @@ static void OnBrowseObjectL( TAny* aSelf, TUint aHandle, TUint32 aCurDepth ); private: - __FLOG_DECLARATION_MEMBER_MUTABLE; - + RMTPFramework iSingletons; TUint iOwnerDp; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpdeleteobject.h --- a/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpdeleteobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpdeleteobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -71,7 +71,6 @@ static void OnBrowseObjectL( TAny* aSelf, TUint aHandle, TUint32 aCurDepth ); private: - __FLOG_DECLARATION_MEMBER_MUTABLE; RMTPFramework iSingletons; TUint iOwnerDp; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpdeleteobjectproplist.h --- a/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpdeleteobjectproplist.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpdeleteobjectproplist.h Fri Sep 17 08:34:51 2010 +0300 @@ -68,11 +68,6 @@ private: // Owned - /* - *FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - /* * DeleteObjectPropList dataset. */ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpgetformatcapabilities.h --- a/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpgetformatcapabilities.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpgetformatcapabilities.h Fri Sep 17 08:34:51 2010 +0300 @@ -62,12 +62,6 @@ private: // Owned - /* - *FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - - /* * CMTPTypeCapabilityList dataset. */ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpgetobjectproplist.h --- a/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpgetobjectproplist.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpgetobjectproplist.h Fri Sep 17 08:34:51 2010 +0300 @@ -72,7 +72,6 @@ static void OnBrowseObjectL( TAny* aSelf, TUint aHandle, TUint32 aCurDepth ); private: // Owned - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPTypeObjectPropList* iObjectPropList; RMTPFramework iSingletons; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpmoveobject.h --- a/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpmoveobject.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpmoveobject.h Fri Sep 17 08:34:51 2010 +0300 @@ -85,11 +85,7 @@ static void OnBrowseObjectL( TAny* aSelf, TUint aHandle, TUint32 aCurDepth ); private: - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - + RMTPFramework iSingletons; TUint iOwnerDp; RBuf iNewParent; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpobjectbrowser.h --- a/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpobjectbrowser.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpobjectbrowser.h Fri Sep 17 08:34:51 2010 +0300 @@ -23,7 +23,6 @@ #include #include -#include "mtpdebug.h" class CMTPTypeArray; class CMTPRequestChecker; @@ -68,8 +67,7 @@ void GetAllObjectHandlesL( TUint32 aFormatCode,const TBrowseCallback& aBrowseCallback ) const; private: - __FLOG_DECLARATION_MEMBER_MUTABLE; - + MMTPDataProviderFramework& iDpFw; CMTPObjectMetaData* iObjMetaCache; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpproxydp.h --- a/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpproxydp.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpproxydp.h Fri Sep 17 08:34:51 2010 +0300 @@ -47,7 +47,6 @@ void StartObjectEnumerationL(TUint32 aStorageId, TBool aPersistentFullEnumeration); void StartStorageEnumerationL(); void Supported(TMTPSupportCategory aCategory, RArray& aArray) const; - TAny* GetExtendedInterface(TUid aInterfaceUid); void SupportedL(TMTPSupportCategory aCategory, CDesCArray& aStrings) const; void ConstructL(); @@ -71,10 +70,5 @@ TBool iActiveProcessorRemoved; RMTPProxyDpSingletons iSingletons; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - }; #endif // CMTPPROXYDP_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpproxydpconfigmgr.h --- a/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpproxydpconfigmgr.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpproxydpconfigmgr.h Fri Sep 17 08:34:51 2010 +0300 @@ -20,7 +20,6 @@ #ifndef CMTPPROXYDPPCONFIGMGR_H #define CMTPPROXYDPPCONFIGMGR_H -#include "mtpdebug.h" #include #include struct FileMappingStruct @@ -44,10 +43,6 @@ private: MMTPDataProviderFramework& iFramework; RArray iMappingStruct; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // CMTPPROXYDPPCONFIGMGR_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpsendobjectinfo.h --- a/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpsendobjectinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/inc/cmtpsendobjectinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,6 @@ #include "mmtptransactionproxy.h" #include "rmtpframework.h" #include "rmtpproxydpsingletons.h" -#include "mtpdebug.h" class CMTPTypeObjectInfo; class MMTPRequestProcessor; @@ -70,11 +69,7 @@ TMTPTypeResponse iResponse; RMTPFramework iSingletons; RMTPProxyDpSingletons iProxyDpSingletons; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; + }; #endif // CMTPSENDOBJECTINFO_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/src/cmtpcopyobject.cpp --- a/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpcopyobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpcopyobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,8 +22,12 @@ #include "cmtpobjectbrowser.h" #include "mtpdppanic.h" #include "cmtpobjectmgr.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpcopyobjectTraces.h" +#endif -__FLOG_STMT( _LIT8( KComponent,"PrxyCopyObj" ); ) + const TUint KInvalidDpId = 0xFF; /** @@ -57,15 +61,14 @@ */ CMTPCopyObject::~CMTPCopyObject() { + OstTraceFunctionEntry0( CMTPCOPYOBJECT_CMTPCOPYOBJECT_DES_ENTRY ); iSingletons.Close(); iTargetDps.Close(); iNewHandleParentStack.Close(); iHandleDepths.Close(); iHandles.Close(); delete iObjBrowser; - - __FLOG( _L8("+/-Dtor") ); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPCOPYOBJECT_CMTPCOPYOBJECT_DES_EXIT ); } /** @@ -74,8 +77,7 @@ CMTPCopyObject::CMTPCopyObject(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection) : CMTPRequestProcessor(aFramework, aConnection, sizeof(KMTPCopyObjectPolicy)/sizeof(TMTPRequestElementInfo), KMTPCopyObjectPolicy) { - __FLOG_OPEN( KMTPSubsystem, KComponent ); - __FLOG( _L8("+/-Ctor") ); + } /** @@ -83,10 +85,10 @@ */ void CMTPCopyObject::ConstructL() { - __FLOG( _L8("+ConstructL") ); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); iOwnerDp = KInvalidDpId; - __FLOG( _L8("-ConstructL") ); + OstTraceFunctionExit0( CMTPCOPYOBJECT_CONSTRUCTL_EXIT ); } /** @@ -94,7 +96,7 @@ */ void CMTPCopyObject::ServiceL() { - __FLOG( _L8("+ServiceL") ); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_SERVICEL_ENTRY ); iTargetDps.Reset(); CMTPParserRouter& router(iSingletons.Router()); CMTPParserRouter::TRoutingParameters params(Request(), iConnection); @@ -102,8 +104,8 @@ router.RouteOperationRequestL(params, iTargetDps); BrowseHandlesL(); - - __FLOG( _L8("-ServiceL") ); + + OstTraceFunctionExit0( CMTPCOPYOBJECT_SERVICEL_EXIT ); } void CMTPCopyObject::ProxyReceiveDataL(MMTPType& /*aData*/, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& /*aStatus*/) @@ -122,7 +124,7 @@ void CMTPCopyObject::ProxySendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& aStatus) #endif { - __FLOG( _L8("+ProxySendResponseL") ); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_PROXYSENDRESPONSEL_ENTRY ); __ASSERT_DEBUG(((&iCurrentRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy)); if ( aStatus == KErrNone ) @@ -140,7 +142,7 @@ MMTPType::CopyL(aResponse, iResponse); TRequestStatus* status = &aStatus; User::RequestComplete(status, KErrNone); - __FLOG( _L8("-ProxySendResponseL") ); + OstTraceFunctionExit0( CMTPCOPYOBJECT_PROXYSENDRESPONSEL_EXIT ); } #ifdef _DEBUG @@ -149,7 +151,7 @@ void CMTPCopyObject::ProxyTransactionCompleteL(const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/) #endif { - __FLOG( _L8("+ProxyTransactionCompleteL") ); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_PROXYTRANSACTIONCOMPLETEL_ENTRY ); __ASSERT_DEBUG(((&iCurrentRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy)); TInt err((iResponse.Uint16(TMTPTypeResponse::EResponseCode) == EMTPRespCodeOK) ? KErrNone : KErrGeneral); if (err == KErrNone) @@ -161,15 +163,14 @@ { SendResponseL( iResponse.Uint16( TMTPTypeResponse::EResponseCode ) ); } - __FLOG( _L8("-ProxyTransactionCompleteL") ); + OstTraceFunctionExit0( CMTPCOPYOBJECT_PROXYTRANSACTIONCOMPLETEL_EXIT ); } void CMTPCopyObject::RunL() { - __FLOG( _L8("+RunL") ); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_RUNL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPCOPYOBJECT_RUNL, "iStatus == %d", iStatus.Int() ); - __FLOG_1( _L8("iStatus == %d"), iStatus.Int() ); - if ( iStatus == KErrNone ) { NextObjectHandleL(); @@ -183,7 +184,7 @@ { SendResponseL( iResponse.Uint16( TMTPTypeResponse::EResponseCode ) ); } - __FLOG( _L8("-RunL") ); + OstTraceFunctionExit0( CMTPCOPYOBJECT_RUNL_EXIT ); } TInt CMTPCopyObject::RunError(TInt /*aError*/) @@ -219,7 +220,7 @@ void CMTPCopyObject::BrowseHandlesL() { - __FLOG( _L8("+BrowseHandlesL") ); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_BROWSEHANDLESL_ENTRY ); delete iObjBrowser; iObjBrowser = NULL; @@ -238,7 +239,8 @@ TUint32 newHandleParent = Request().Uint32( TMTPTypeRequest::ERequestParameter3 ); iNewHandleParentStack.AppendL( newHandleParent ); iObjBrowser->GoL( KMTPFormatsAll, handle, KMaxTUint32, callback ); - __FLOG_1( _L8("iHandles.Count() = %d"), iHandles.Count() ); + OstTrace1( TRACE_NORMAL, CMTPCOPYOBJECT_BROWSEHANDLESL, "iHandles.Count() = %d", iHandles.Count() ); + if ( iHandles.Count() > 0 ) { @@ -250,24 +252,24 @@ SendResponseL( EMTPRespCodeInvalidObjectHandle ); } - __FLOG( _L8("-BrowseHandlesL") ); + OstTraceFunctionExit0( CMTPCOPYOBJECT_BROWSEHANDLESL_EXIT ); } void CMTPCopyObject::NextObjectHandleL() { - __FLOG( _L8("+NextObjectHandleL") ); + OstTraceFunctionEntry0( CMTPCOPYOBJECT_NEXTOBJECTHANDLEL_ENTRY ); __ASSERT_DEBUG( ( iNewHandleParentStack.Count() > 0 ), User::Invariant() ); iOwnerDp = KInvalidDpId; if ( iCurrentHandle >=0 ) { - __FLOG_1( _L8("iCurrentHandle = %d"), iCurrentHandle ); + OstTrace1( TRACE_NORMAL, CMTPCOPYOBJECT_NEXTOBJECTHANDLEL, "iCurrentHandle = %d", iCurrentHandle ); TUint32 handle = iHandles[iCurrentHandle]; TUint32 depth = iHandleDepths[iCurrentHandle]; - __FLOG_1( _L8("depth = %d"), depth ); + OstTrace1( TRACE_NORMAL, DUP1_CMTPCOPYOBJECT_NEXTOBJECTHANDLEL, "depth = %d", depth ); if ( iCurrentHandle != ( iHandles.Count() - 1 ) ) { TUint32 previousDepth = iHandleDepths[iCurrentHandle+1]; - __FLOG_1( _L8("previousDepth = %d"), previousDepth ); + OstTrace1( TRACE_NORMAL, DUP2_CMTPCOPYOBJECT_NEXTOBJECTHANDLEL, "previousDepth = %d", previousDepth ); if ( depth < previousDepth ) { // Completed copying folder and all its sub-folder and files, pop all copied folders' handle which are not shallower than the current one. @@ -313,16 +315,18 @@ SendResponseL( iResponse.Uint16( TMTPTypeResponse::EResponseCode ) ); } - __FLOG( _L8("-NextObjectHandleL") ); + OstTraceFunctionExit0( CMTPCOPYOBJECT_NEXTOBJECTHANDLEL_EXIT ); } void CMTPCopyObject::OnBrowseObjectL( TAny* aSelf, TUint aHandle, TUint32 aCurDepth ) { + OstTraceFunctionEntry0( CMTPCOPYOBJECT_ONBROWSEOBJECTL_ENTRY ); CMTPCopyObject* self = reinterpret_cast< CMTPCopyObject* >( aSelf ); if ( self->iTargetDps.Find(self->iSingletons.ObjectMgr().ObjectOwnerId(aHandle)) != KErrNotFound ) { self->iHandles.AppendL( aHandle ); self->iHandleDepths.AppendL( aCurDepth ); } + OstTraceFunctionExit0( CMTPCOPYOBJECT_ONBROWSEOBJECTL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/src/cmtpdeleteobject.cpp --- a/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpdeleteobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpdeleteobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -31,8 +31,12 @@ #include "rmtpframework.h" #include "cmtpobjectbrowser.h" #include "mtpdppanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdeleteobjectTraces.h" +#endif -__FLOG_STMT( _LIT8( KComponent,"PrxyDelObj" ); ) + const TUint KInvalidDpId = 0xFF; /** @@ -63,13 +67,12 @@ */ CMTPDeleteObject::~CMTPDeleteObject() { + OstTraceFunctionEntry0( CMTPDELETEOBJECT_CMTPDELETEOBJECT_DES_ENTRY ); iSingletons.Close(); iTargetDps.Close(); iHandles.Close(); delete iObjBrowser; - - __FLOG( _L8("+/-Dtor") ); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPDELETEOBJECT_CMTPDELETEOBJECT_DES_EXIT ); } /** @@ -79,8 +82,7 @@ CMTPRequestProcessor(aFramework, aConnection, sizeof(KMTPDeleteObjectPolicy)/sizeof(TMTPRequestElementInfo), KMTPDeleteObjectPolicy), iDeletedObjectsNumber(0) { - __FLOG_OPEN( KMTPSubsystem, KComponent ); - __FLOG( _L8("+/-Ctor") ); + } /** @@ -88,19 +90,19 @@ */ void CMTPDeleteObject::ConstructL() { - __FLOG( _L8("+ConstructL") ); - + OstTraceFunctionEntry0( CMTPDELETEOBJECT_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); iOwnerDp = KInvalidDpId; - __FLOG( _L8("-ConstructL") ); + OstTraceFunctionExit0( CMTPDELETEOBJECT_CONSTRUCTL_EXIT ); } TMTPResponseCode CMTPDeleteObject::CheckRequestL() { - __FLOG(_L8("CheckRequestL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECT_CHECKREQUESTL_ENTRY ); TMTPResponseCode responseCode = CMTPRequestProcessor::CheckRequestL(); - - __FLOG_VA((_L8("CheckRequestL - Exit with responseCode = 0x%04X"), responseCode)); + + OstTrace1( TRACE_NORMAL, CMTPDELETEOBJECT_CHECKREQUESTL, "responseCode = 0x%04X", responseCode ); + OstTraceFunctionExit0( CMTPDELETEOBJECT_CHECKREQUESTL_EXIT ); return responseCode; } @@ -109,7 +111,7 @@ */ void CMTPDeleteObject::ServiceL() { - __FLOG( _L8("+ServiceL") ); + OstTraceFunctionEntry0( CMTPDELETEOBJECT_SERVICEL_ENTRY ); iTargetDps.Reset(); CMTPParserRouter& router(iSingletons.Router()); CMTPParserRouter::TRoutingParameters params(Request(), iConnection); @@ -132,14 +134,14 @@ if(hasBaseFileSystemDp) { SendResponseL(EMTPRespCodeDeviceBusy); - __FLOG( _L8("-ServiceL with Device_Busy") ); + OstTraceFunctionExit0( CMTPDELETEOBJECT_SERVICEL_EXIT ); return; } } BrowseHandlesL(); - - __FLOG( _L8("-ServiceL") ); + + OstTraceFunctionExit0( DUP1_CMTPDELETEOBJECT_SERVICEL_EXIT ); } void CMTPDeleteObject::ProxyReceiveDataL(MMTPType& /*aData*/, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& /*aStatus*/) @@ -193,14 +195,14 @@ void CMTPDeleteObject::RunL() { - __FLOG( _L8("+RunL") ); + OstTraceFunctionEntry0( CMTPDELETEOBJECT_RUNL_ENTRY ); if ( iStatus == KErrNone ) { //First check if the operation has been cancelled or not if(iCancelled) { - __FLOG(_L8("Initiator cancell delete, send response with cancelled code ")); + OstTrace0( TRACE_NORMAL, CMTPDELETEOBJECT_RUNL, "Initiator cancell delete, send response with cancelled code " ); SendResponseL(EMTPRespCodeTransactionCancelled); iCancelled = EFalse; } @@ -218,8 +220,8 @@ { SendResponseL( iResponse.Uint16( TMTPTypeResponse::EResponseCode ) ); } - - __FLOG( _L8("-RunL") ); + + OstTraceFunctionExit0( CMTPDELETEOBJECT_RUNL_EXIT ); } /** @@ -249,7 +251,7 @@ void CMTPDeleteObject::BrowseHandlesL() { - __FLOG( _L8("+BrowseHandlesL") ); + OstTraceFunctionEntry0( CMTPDELETEOBJECT_BROWSEHANDLESL_ENTRY ); delete iObjBrowser; iObjBrowser = NULL; @@ -279,12 +281,12 @@ Schedule( KErrNone ); } - __FLOG( _L8("-BrowseHandlesL") ); + OstTraceFunctionExit0( CMTPDELETEOBJECT_BROWSEHANDLESL_EXIT ); } void CMTPDeleteObject::NextObjectHandleL() { - __FLOG( _L8("+NextObjectHandleL") ); + OstTraceFunctionEntry0( CMTPDELETEOBJECT_NEXTOBJECTHANDLEL_ENTRY ); iOwnerDp = KInvalidDpId; if ( iCurrentHandle < iHandles.Count() ) @@ -316,7 +318,7 @@ } } - __FLOG( _L8("-NextObjectHandleL") ); + OstTraceFunctionExit0( CMTPDELETEOBJECT_NEXTOBJECTHANDLEL_EXIT ); } void CMTPDeleteObject::OnBrowseObjectL( TAny* aSelf, TUint aHandle, TUint32 /*aCurDepth*/ ) diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/src/cmtpdeleteobjectproplist.cpp --- a/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpdeleteobjectproplist.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpdeleteobjectproplist.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -24,10 +24,14 @@ #include "cmtpdataprovidercontroller.h" #include "cmtpobjectmgr.h" #include "cmtpdataprovider.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdeleteobjectproplistTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"DeleteObjectPropList");) /** @@ -58,15 +62,14 @@ */ CMTPDeleteObjectPropList::~CMTPDeleteObjectPropList() { - __FLOG(_L8("~CMTPDeleteObjectPropList - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_CMTPDELETEOBJECTPROPLIST_DES_ENTRY ); delete iDeleteObjectPropList; iSingletons.Close(); iTargetDps.Close(); iSubDatasets.ResetAndDestroy(); - - __FLOG(_L8("~CMTPDeleteObjectPropList - Exit")); - __FLOG_CLOSE; + + OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_CMTPDELETEOBJECTPROPLIST_DES_EXIT ); } CMTPDeleteObjectPropList::CMTPDeleteObjectPropList(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection): @@ -77,17 +80,16 @@ void CMTPDeleteObjectPropList::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_CONSTRUCTL_EXIT ); } void CMTPDeleteObjectPropList::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_SERVICEL_ENTRY ); delete iDeleteObjectPropList; iTargetDps.Reset(); @@ -97,12 +99,12 @@ iDeleteObjectPropList = CMTPTypeDeleteObjectPropList::NewL(); ReceiveDataL(*iDeleteObjectPropList); - __FLOG(_L8("ServiceL - Exit")); + OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_SERVICEL_EXIT ); } TBool CMTPDeleteObjectPropList::DoHandleResponsePhaseL() { - __FLOG(_L8("DoHandleResponsePhaseL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY ); //if the ObjectHandle is 0x00000000, //discard the received data and return Invalid_ObjectHandle error code @@ -125,15 +127,14 @@ Schedule(KErrNone); } } - - __FLOG(_L8("DoHandleResponsePhaseL - Exit")); - + + OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_EXIT ); return EFalse; } void CMTPDeleteObjectPropList::BuildSubRequestsL() { - __FLOG(_L8("BuildSubRequests - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_BUILDSUBREQUESTSL_ENTRY ); TInt count(iDeleteObjectPropList->NumberOfElements()); TInt dpid(0); @@ -164,18 +165,12 @@ CleanupStack::Pop(element); } - - __FLOG(_L8("BuildSubRequests - Exit")); + + OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_BUILDSUBREQUESTSL_EXIT ); } TBool CMTPDeleteObjectPropList::HasDataphase() const { - __FLOG(_L8("HasDataphase - Entry")); - - - - __FLOG(_L8("HasDataphase - Exit")); - return ETrue; } @@ -196,11 +191,11 @@ void CMTPDeleteObjectPropList::ProxySendDataL(const MMTPType& /*aData*/, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /* aConnection */, TRequestStatus& /*aStatus*/) { - __FLOG(_L8("ProxySendDataL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_PROXYSENDDATAL_ENTRY ); Panic(EMTPWrongRequestPhase); - - __FLOG(_L8("ProxySendDataL - Exit")); + + OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_PROXYSENDDATAL_EXIT ); } /** @@ -218,14 +213,14 @@ void CMTPDeleteObjectPropList::ProxySendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& aStatus) #endif { - __FLOG(_L8("ProxySendResponseL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_PROXYSENDRESPONSEL_ENTRY ); __ASSERT_DEBUG(((iRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy)); MMTPType::CopyL(aResponse, iResponse); TRequestStatus* status = &aStatus; User::RequestComplete(status, KErrNone); - - __FLOG(_L8("ProxySendResponseL - Exit")); + + OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_PROXYSENDRESPONSEL_EXIT ); } @@ -241,7 +236,7 @@ void CMTPDeleteObjectPropList::ProxyTransactionCompleteL(const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/) #endif { - __FLOG(_L8("ProxyTransactionCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_PROXYTRANSACTIONCOMPLETEL_ENTRY ); __ASSERT_DEBUG(((iRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy)); const TUint16 KResponseCode(iResponse.Uint16(TMTPTypeResponse::EResponseCode)); @@ -267,28 +262,28 @@ } Schedule(err); - - __FLOG(_L8("ProxyTransactionCompleteL - Exit")); + + OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_PROXYTRANSACTIONCOMPLETEL_EXIT ); } void CMTPDeleteObjectPropList::SendResponseL(TUint16 aCode) { - __FLOG(_L8("SendResponseL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_SENDRESPONSEL_ENTRY ); const TMTPTypeRequest& req(Request()); iResponse.SetUint16(TMTPTypeResponse::EResponseCode, aCode); iResponse.SetUint32(TMTPTypeResponse::EResponseSessionID, req.Uint32(TMTPTypeRequest::ERequestSessionID)); iResponse.SetUint32(TMTPTypeResponse::EResponseTransactionID, req.Uint32(TMTPTypeRequest::ERequestTransactionID)); iFramework.SendResponseL(iResponse, req, Connection()); - - __FLOG(_L8("SendResponseL - Exit")); + + OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_SENDRESPONSEL_EXIT ); } void CMTPDeleteObjectPropList::RunL() { - __FLOG(_L8("RunL - Entry")); + OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_RUNL_ENTRY ); if ( (iStatus == KErrNone) && (iCurrentTarget < iTargetDps.Count()) ) { @@ -314,17 +309,17 @@ //Any error will stop the process, and send the corresponding response. SendResponseL(iResponse.Uint16(TMTPTypeResponse::EResponseCode)); } - - __FLOG(_L8("RunL - Exit")); + + OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_RUNL_EXIT ); } TInt CMTPDeleteObjectPropList::RunError(TInt /*aError*/) { - __FLOG(_L8("RunError - Entry")); - + OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_RUNERROR_ENTRY ); + TRAP_IGNORE(SendResponseL(EMTPRespCodeGeneralError)); - - __FLOG(_L8("RunError - Exit")); + + OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_RUNERROR_EXIT ); return KErrNone; } @@ -335,13 +330,13 @@ */ void CMTPDeleteObjectPropList::Schedule(TInt aError) { - __FLOG(_L8("Schedule - Entry")); - + OstTraceFunctionEntry0( CMTPDELETEOBJECTPROPLIST_SCHEDULE_ENTRY ); + TRequestStatus* status = &iStatus; User::RequestComplete(status, aError); SetActive(); - - __FLOG(_L8("Schedule - Exit")); + + OstTraceFunctionExit0( CMTPDELETEOBJECTPROPLIST_SCHEDULE_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/src/cmtpgetformatcapabilities.cpp --- a/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpgetformatcapabilities.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpgetformatcapabilities.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,10 +23,14 @@ #include "cmtpobjectmgr.h" #include "cmtpdataprovider.h" #include "cmtpparserrouter.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetformatcapabilitiesTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"GetFormatCapabilityList");) /** @@ -49,14 +53,13 @@ */ CMTPGetFormatCapabilities::~CMTPGetFormatCapabilities() { - __FLOG(_L8("~CMTPGetFormatCapabilities - Entry")); + OstTraceFunctionEntry0( CMTPGETFORMATCAPABILITIES_CMTPGETFORMATCAPABILITIES_DES_ENTRY ); iSingletons.Close(); delete iCapabilityList; iTargetDps.Close(); - - __FLOG(_L8("~CMTPGetFormatCapabilities - Exit")); - __FLOG_CLOSE; + + OstTraceFunctionExit0( CMTPGETFORMATCAPABILITIES_CMTPGETFORMATCAPABILITIES_DES_EXIT ); } CMTPGetFormatCapabilities::CMTPGetFormatCapabilities(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection): @@ -67,18 +70,17 @@ void CMTPGetFormatCapabilities::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPGETFORMATCAPABILITIES_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); - - __FLOG(_L8("ConstructL - Exit")); + + OstTraceFunctionExit0( CMTPGETFORMATCAPABILITIES_CONSTRUCTL_EXIT ); } void CMTPGetFormatCapabilities::ServiceL() { - __FLOG(_L8("ServiceL - Entry")); + OstTraceFunctionEntry0( CMTPGETFORMATCAPABILITIES_SERVICEL_ENTRY ); delete iCapabilityList; iCapabilityList = CMTPTypeFormatCapabilityList::NewL(); @@ -90,17 +92,17 @@ router.RouteOperationRequestL(params, iTargetDps); iCurrentTarget = 0; Schedule(KErrNone); - - __FLOG(_L8("ServiceL - Exit")); + + OstTraceFunctionExit0( CMTPGETFORMATCAPABILITIES_SERVICEL_EXIT ); } void CMTPGetFormatCapabilities::ProxyReceiveDataL(MMTPType& /*aData*/, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& /*aStatus*/) { - __FLOG(_L8("ProxyReceiveDataL - Entry")); - + OstTraceFunctionEntry0( CMTPGETFORMATCAPABILITIES_PROXYRECEIVEDATAL_ENTRY ); + Panic(EMTPWrongRequestPhase); - - __FLOG(_L8("ProxyReceiveDataL - Exit")); + + OstTraceFunctionExit0( CMTPGETFORMATCAPABILITIES_PROXYRECEIVEDATAL_EXIT ); } @@ -110,8 +112,8 @@ void CMTPGetFormatCapabilities::ProxySendDataL(const MMTPType& aData, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& aStatus) #endif { - __FLOG(_L8("ProxySendDataL - Entry")); - + OstTraceFunctionEntry0( CMTPGETFORMATCAPABILITIES_PROXYSENDDATAL_ENTRY ); + __ASSERT_DEBUG(((iRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy)); __ASSERT_DEBUG(aData.Type() == EMTPTypeFormatCapabilityListDataset, Panic(EMTPInvalidDataType)); @@ -130,7 +132,7 @@ TRequestStatus* status = &aStatus; User::RequestComplete(status, KErrNone); - __FLOG(_L8("ProxySendDataL - Exit")); + OstTraceFunctionExit0( CMTPGETFORMATCAPABILITIES_PROXYSENDDATAL_EXIT ); } /** @@ -148,14 +150,14 @@ void CMTPGetFormatCapabilities::ProxySendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& aStatus) #endif { - __FLOG(_L8("ProxySendResponseL - Entry")); + OstTraceFunctionEntry0( CMTPGETFORMATCAPABILITIES_PROXYSENDRESPONSEL_ENTRY ); __ASSERT_DEBUG(((iRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy)); MMTPType::CopyL(aResponse, iResponse); TRequestStatus* status(&aStatus); User::RequestComplete(status, KErrNone); - __FLOG(_L8("ProxySendResponseL - Exit")); + OstTraceFunctionExit0( CMTPGETFORMATCAPABILITIES_PROXYSENDRESPONSEL_EXIT ); } @@ -171,8 +173,8 @@ void CMTPGetFormatCapabilities::ProxyTransactionCompleteL(const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/) #endif { - __FLOG(_L8("ProxyTransactionCompleteL - Entry")); - + OstTraceFunctionEntry0( CMTPGETFORMATCAPABILITIES_PROXYTRANSACTIONCOMPLETEL_ENTRY ); + __ASSERT_DEBUG(((iRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy)); TInt err((iResponse.Uint16(TMTPTypeResponse::EResponseCode) == EMTPRespCodeOK) ? KErrNone : KErrGeneral); if (err == KErrNone) @@ -181,27 +183,27 @@ } Schedule(err); - __FLOG(_L8("ProxyTransactionCompleteL - Exit")); + OstTraceFunctionExit0( CMTPGETFORMATCAPABILITIES_PROXYTRANSACTIONCOMPLETEL_EXIT ); } void CMTPGetFormatCapabilities::SendResponseL(TUint16 aCode) { - __FLOG(_L8("SendResponseL - Entry")); + OstTraceFunctionEntry0( CMTPGETFORMATCAPABILITIES_SENDRESPONSEL_ENTRY ); const TMTPTypeRequest& req(Request()); iResponse.SetUint16(TMTPTypeResponse::EResponseCode, aCode); iResponse.SetUint32(TMTPTypeResponse::EResponseSessionID, req.Uint32(TMTPTypeRequest::ERequestSessionID)); iResponse.SetUint32(TMTPTypeResponse::EResponseTransactionID, req.Uint32(TMTPTypeRequest::ERequestTransactionID)); iFramework.SendResponseL(iResponse, req, Connection()); - - __FLOG(_L8("SendResponseL - Exit")); + + OstTraceFunctionExit0( CMTPGETFORMATCAPABILITIES_SENDRESPONSEL_EXIT ); } void CMTPGetFormatCapabilities::RunL() { - __FLOG(_L8("RunL - Entry")); - + OstTraceFunctionEntry0( CMTPGETFORMATCAPABILITIES_RUNL_ENTRY ); + if (iStatus == KErrNone) { if (iCurrentTarget < iTargetDps.Count()) @@ -219,17 +221,17 @@ { SendResponseL(iResponse.Uint16(TMTPTypeResponse::EResponseCode)); } - - __FLOG(_L8("RunL - Exit")); + + OstTraceFunctionExit0( CMTPGETFORMATCAPABILITIES_RUNL_EXIT ); } TInt CMTPGetFormatCapabilities::RunError(TInt /*aError*/) { - __FLOG(_L8("RunError - Entry")); - + OstTraceFunctionEntry0( CMTPGETFORMATCAPABILITIES_RUNERROR_ENTRY ); + TRAP_IGNORE(SendResponseL(EMTPRespCodeGeneralError)); - - __FLOG(_L8("RunError - Exit")); + + OstTraceFunctionExit0( CMTPGETFORMATCAPABILITIES_RUNERROR_EXIT ); return KErrNone; } @@ -240,12 +242,12 @@ */ void CMTPGetFormatCapabilities::Schedule(TInt aError) { - __FLOG(_L8("Schedule - Entry")); - + OstTraceFunctionEntry0( CMTPGETFORMATCAPABILITIES_SCHEDULE_ENTRY ); + TRequestStatus* status = &iStatus; User::RequestComplete(status, aError); SetActive(); - - __FLOG(_L8("Schedule - Exit")); + + OstTraceFunctionExit0( CMTPGETFORMATCAPABILITIES_SCHEDULE_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/src/cmtpgetobjectproplist.cpp --- a/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpgetobjectproplist.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpgetobjectproplist.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -30,8 +30,12 @@ #include "cmtpobjectbrowser.h" #include "mtpdppanic.h" #include "cmtpobjectmgr.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetobjectproplistTraces.h" +#endif -__FLOG_STMT( _LIT8( KComponent,"PrxyGetObjPrpLst" ); ) + const TUint KInvalidDpId = 0xFF; /** @@ -62,13 +66,13 @@ */ CMTPGetObjectPropList::~CMTPGetObjectPropList() { + OstTraceFunctionEntry0( CMTPGETOBJECTPROPLIST_CMTPGETOBJECTPROPLIST_ENTRY ); delete iObjectPropList; iSingletons.Close(); iTargetDps.Close(); iHandles.Close(); delete iObjBrowser; - __FLOG( _L8("+/-Dtor") ); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPGETOBJECTPROPLIST_CMTPGETOBJECTPROPLIST_EXIT ); } /** @@ -127,14 +131,14 @@ void CMTPGetObjectPropList::ProxySendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& aStatus) #endif { - __FLOG( _L8("+ProxySendResponseL") ); + OstTraceFunctionEntry0( CMTPGETOBJECTPROPLIST_PROXYSENDRESPONSEL_ENTRY ); __ASSERT_DEBUG((( (iRequest == &aRequest) || ( &iCurrentRequest == &aRequest ) ) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy)); MMTPType::CopyL(aResponse, iResponse); TRequestStatus* status(&aStatus); User::RequestComplete(status, KErrNone); - - __FLOG( _L8("-ProxySendResponseL") ); + + OstTraceFunctionExit0( CMTPGETOBJECTPROPLIST_PROXYSENDRESPONSEL_EXIT ); } #ifdef _DEBUG @@ -143,8 +147,9 @@ void CMTPGetObjectPropList::ProxyTransactionCompleteL(const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/) #endif { - __FLOG( _L8("+ProxyTransactionCompleteL") ); - __FLOG_1( _L8("Response code is 0x%08X,"), iResponse.Uint16(TMTPTypeResponse::EResponseCode) ); + OstTraceFunctionEntry0( CMTPGETOBJECTPROPLIST_PROXYTRANSACTIONCOMPLETEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPGETOBJECTPROPLIST_PROXYTRANSACTIONCOMPLETEL, + "Response code is 0x%08X", iResponse.Uint16(TMTPTypeResponse::EResponseCode)); __ASSERT_DEBUG((( (iRequest == &aRequest) || ( &iCurrentRequest == &aRequest ) ) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy)); TUint16 response = iResponse.Uint16(TMTPTypeResponse::EResponseCode); @@ -166,7 +171,7 @@ } - __FLOG( _L8("-ProxyTransactionCompleteL") ); + OstTraceFunctionExit0( CMTPGETOBJECTPROPLIST_PROXYTRANSACTIONCOMPLETEL_EXIT ); } /** @@ -175,7 +180,7 @@ */ void CMTPGetObjectPropList::RunL() { - __FLOG( _L8("+RunL") ); + OstTraceFunctionEntry0( CMTPGETOBJECTPROPLIST_RUNL_ENTRY ); // We cannot use assertion here, because it might be completed with KErrGeneral. See ProxyTransactionCompleteL() @@ -192,8 +197,8 @@ { SendResponseL( iResponse.Uint16( TMTPTypeResponse::EResponseCode ) ); } - - __FLOG( _L8("-RunL") ); + + OstTraceFunctionExit0( CMTPGETOBJECTPROPLIST_RUNL_EXIT ); } /** @@ -202,8 +207,8 @@ CMTPGetObjectPropList::CMTPGetObjectPropList(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection) : CMTPRequestProcessor(aFramework, aConnection, sizeof(KMTPGetObjectPropListPolicy)/sizeof(TMTPRequestElementInfo), KMTPGetObjectPropListPolicy) { - __FLOG_OPEN( KMTPSubsystem, KComponent ); - __FLOG( _L8("+/-Ctor") ); + OstTraceFunctionEntry0( DUP1_CMTPGETOBJECTPROPLIST_CMTPGETOBJECTPROPLIST_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPGETOBJECTPROPLIST_CMTPGETOBJECTPROPLIST_EXIT ); } /** @@ -211,10 +216,10 @@ */ void CMTPGetObjectPropList::ConstructL() { - __FLOG( _L8("+ConstructL") ); + OstTraceFunctionEntry0( CMTPGETOBJECTPROPLIST_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); iOwnerDp = KInvalidDpId; - __FLOG( _L8("-ConstructL") ); + OstTraceFunctionExit0( CMTPGETOBJECTPROPLIST_CONSTRUCTL_EXIT ); } /** @@ -244,7 +249,7 @@ void CMTPGetObjectPropList::GetObjectHandlesL() { - __FLOG( _L8("+GetObjectHandlesL") ); + OstTraceFunctionEntry0( CMTPGETOBJECTPROPLIST_GETOBJECTHANDLESL_ENTRY ); delete iObjBrowser; iObjBrowser = NULL; @@ -266,8 +271,9 @@ TUint32 fmtCode = Request().Uint32( TMTPTypeRequest::ERequestParameter2 ); TUint32 depth = Request().Uint32( TMTPTypeRequest::ERequestParameter5 ); iObjBrowser->GoL( fmtCode, handle, depth, callback ); - __FLOG_1( _L8("The total of object handles is %d"), iHandles.Count() ); - + OstTrace1( TRACE_NORMAL, CMTPGETOBJECTPROPLIST_GETOBJECTHANDLESL, + "The total of object handles is %d", iHandles.Count() ); + if ( 0 == iHandles.Count() ) { SendDataL( *iObjectPropList ); @@ -276,13 +282,13 @@ { Schedule( KErrNone ); } - - __FLOG( _L8("-GetObjectHandlesL") ); + + OstTraceFunctionExit0( CMTPGETOBJECTPROPLIST_GETOBJECTHANDLESL_EXIT ); } void CMTPGetObjectPropList::GetNextObjectPropL() { - __FLOG( _L8("+GetNextObjectPropL") ); + OstTraceFunctionEntry0( CMTPGETOBJECTPROPLIST_GETNEXTOBJECTPROPL_ENTRY ); iOwnerDp = KInvalidDpId; if ( iCurrentHandle < iHandles.Count() ) @@ -302,8 +308,8 @@ { SendDataL( *iObjectPropList ); } - - __FLOG( _L8("-GetNextObjectPropL") ); + + OstTraceFunctionExit0( CMTPGETOBJECTPROPLIST_GETNEXTOBJECTPROPL_EXIT ); } void CMTPGetObjectPropList::OnBrowseObjectL( TAny* aSelf, TUint aHandle, TUint32 /*aCurDepth*/ ) diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/src/cmtpgetobjectpropssupported.cpp --- a/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpgetobjectpropssupported.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpgetobjectpropssupported.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -25,6 +25,11 @@ #include "cmtpdataprovider.h" #include "cmtpgetobjectpropssupported.h" #include "mtpproxydppanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpgetobjectpropssupportedTraces.h" +#endif + /** Factory method. @@ -90,6 +95,7 @@ if ((KErr != KErrNone) && (KErr != KErrAlreadyExists)) { + OstTrace1( TRACE_ERROR, CMTPGETOBJECTPROPSSUPPORTED_PROXYSENDDATAL, "add property to support property list error! error code:%d", KErr ); User::Leave(KErr); } } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/src/cmtpmoveobject.cpp --- a/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpmoveobject.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpmoveobject.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -26,8 +26,13 @@ #include "mtpproxydppanic.h" #include "cmtpobjectbrowser.h" #include "mtpdppanic.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpmoveobjectTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"PrxyMoveObj");) + const TUint KInvalidDpId = 0xFF; /** Verification data for the MoveObject request @@ -59,6 +64,7 @@ */ CMTPMoveObject::~CMTPMoveObject() { + OstTraceFunctionEntry0( CMTPMOVEOBJECT_CMTPMOVEOBJECT_ENTRY ); iSingletons.Close(); iNewParent.Close(); delete iPathToCreate; @@ -71,8 +77,7 @@ iHandles.Close(); delete iObjBrowser; iTargetDps.Close(); - __FLOG(_L8("+/-Dtor")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPMOVEOBJECT_CMTPMOVEOBJECT_EXIT ); } /** @@ -81,8 +86,6 @@ CMTPMoveObject::CMTPMoveObject(MMTPDataProviderFramework& aFramework, MMTPConnection& aConnection) : CMTPRequestProcessor(aFramework, aConnection, sizeof(KMTPMoveObjectPolicy)/sizeof(TMTPRequestElementInfo), KMTPMoveObjectPolicy) { - __FLOG_OPEN( KMTPSubsystem, KComponent ); - __FLOG( _L8("+/-Ctor") ); } /** @@ -90,12 +93,12 @@ */ void CMTPMoveObject::ConstructL() { - __FLOG( _L8("+ConstructL") ); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_CONSTRUCTL_ENTRY ); iNewParent.CreateL(KMaxFileName); iSingletons.OpenL(); iFolderToRemove.CreateL( KMaxFileName ); iOwnerDp = KInvalidDpId; - __FLOG( _L8("-ConstructL") ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_CONSTRUCTL_EXIT ); } /** @@ -103,7 +106,7 @@ */ void CMTPMoveObject::ServiceL() { - __FLOG( _L8("+ServiceL") ); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_SERVICEL_ENTRY ); iTargetDps.Reset(); CMTPParserRouter& router(iSingletons.Router()); CMTPParserRouter::TRoutingParameters params(Request(), iConnection); @@ -111,7 +114,7 @@ router.RouteOperationRequestL(params, iTargetDps); BrowseHandlesL(); - __FLOG( _L8("-ServiceL") ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_SERVICEL_EXIT ); } void CMTPMoveObject::ProxyReceiveDataL(MMTPType& /*aData*/, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& /*aStatus*/) @@ -130,12 +133,12 @@ void CMTPMoveObject::ProxySendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/, TRequestStatus& aStatus) #endif { - __FLOG( _L8("+ProxySendResponseL") ); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_PROXYSENDRESPONSEL_ENTRY ); __ASSERT_DEBUG(((&iCurrentRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy)); MMTPType::CopyL(aResponse, iResponse); TRequestStatus* status = &aStatus; User::RequestComplete(status, KErrNone); - __FLOG( _L8("-ProxySendResponseL") ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_PROXYSENDRESPONSEL_EXIT ); } #ifdef _DEBUG @@ -144,7 +147,7 @@ void CMTPMoveObject::ProxyTransactionCompleteL(const TMTPTypeRequest& /*aRequest*/, MMTPConnection& /*aConnection*/) #endif { - __FLOG( _L8("+ProxyTransactionCompleteL") ); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_PROXYTRANSACTIONCOMPLETEL_ENTRY ); __ASSERT_DEBUG(((&iCurrentRequest == &aRequest) && (&iConnection == &aConnection)), Panic(EMTPNotSameRequestProxy)); TInt err((iResponse.Uint16(TMTPTypeResponse::EResponseCode) == EMTPRespCodeOK) ? KErrNone : KErrGeneral); if (err == KErrNone) @@ -157,7 +160,7 @@ SendResponseL( iResponse.Uint16( TMTPTypeResponse::EResponseCode ) ); } - __FLOG( _L8("-ProxyTransactionCompleteL") ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_PROXYTRANSACTIONCOMPLETEL_EXIT ); } /** @@ -165,7 +168,7 @@ */ void CMTPMoveObject::GetParametersL() { - __FLOG( _L8("+GetParametersL") ); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_GETPARAMETERSL_ENTRY ); TUint32 objectHandle = iCurrentRequest.Uint32( TMTPTypeRequest::ERequestParameter1 ); TUint32 newParentHandle = iCurrentRequest.Uint32( TMTPTypeRequest::ERequestParameter3 ); @@ -181,7 +184,7 @@ } iFramework.ObjectMgr().ObjectL( TMTPTypeUint32( objectHandle ), *iObjInfoCache ); - __FLOG( _L8("-GetParametersL") ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_GETPARAMETERSL_EXIT ); } /** @@ -189,11 +192,11 @@ */ void CMTPMoveObject::GetDefaultParentObjectL( TDes& aObjectName ) { - __FLOG( _L8("+GetDefaultParentObjectL") ); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_GETDEFAULTPARENTOBJECTL_ENTRY ); const CMTPStorageMetaData& storageMetaData( iFramework.StorageMgr().StorageL(iStorageId) ); aObjectName = storageMetaData.DesC(CMTPStorageMetaData::EStorageSuid); - __FLOG( _L8("-GetDefaultParentObjectL") ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_GETDEFAULTPARENTOBJECTL_EXIT ); } /** @@ -201,21 +204,27 @@ */ TMTPResponseCode CMTPMoveObject::CanMoveObjectL(const TDesC& aOldName, const TDesC& aNewName) const { - __FLOG(_L8("+CanMoveObjectL")); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_CANMOVEOBJECTL_ENTRY ); TMTPResponseCode result = EMTPRespCodeOK; TEntry fileEntry; - User::LeaveIfError(iFramework.Fs().Entry(aOldName, fileEntry)); + LEAVEIFERROR(iFramework.Fs().Entry(aOldName, fileEntry), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPMOVEOBJECT_CANMOVEOBJECTL, "get entry for %S error!", aOldName)); + TInt drive(iFramework.StorageMgr().DriveNumber(iStorageId)); - User::LeaveIfError(drive); + LEAVEIFERROR(drive, + OstTrace1( TRACE_ERROR, DUP2_CMTPMOVEOBJECT_CANMOVEOBJECTL, "can't identify drive number for storageId %d", iStorageId )); TVolumeInfo volumeInfo; - User::LeaveIfError(iFramework.Fs().Volume(volumeInfo, drive)); + LEAVEIFERROR(iFramework.Fs().Volume(volumeInfo, drive), + OstTrace1( TRACE_ERROR, DUP3_CMTPMOVEOBJECT_CANMOVEOBJECTL, "can't get volume info for drive %d", drive)); if (BaflUtils::FileExists(iFramework.Fs(), aNewName)) { result = EMTPRespCodeInvalidParentObject; } - __FLOG_VA((_L8("-CanMoveObjectL (Exit with response code 0x%04X)"), result)); + OstTrace1( TRACE_NORMAL, CMTPMOVEOBJECT_CANMOVEOBJECTL, "Exit with response code 0x%04X", result ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_CANMOVEOBJECTL_EXIT ); + return result; } @@ -230,7 +239,7 @@ void CMTPMoveObject::RunL() { - __FLOG( _L8("+RunL") ); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_RUNL_ENTRY ); if ( iStatus==KErrNone ) { switch ( iState ) @@ -253,7 +262,7 @@ SendResponseL( iResponse.Uint16( TMTPTypeResponse::EResponseCode ) ); } - __FLOG( _L8("-RunL") ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_RUNL_EXIT ); } TInt CMTPMoveObject::RunError(TInt /*aError*/) @@ -289,11 +298,12 @@ TMTPResponseCode CMTPMoveObject::CreateFolderL() { - __FLOG( _L8("+CreateFolderL") ); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_CREATEFOLDERL_ENTRY ); TMTPResponseCode ret = EMTPRespCodeOK; GetParametersL(); - __FLOG_1( _L("New folder parent: %S"), &iNewParent ); + OstTraceExt1( TRACE_NORMAL, CMTPMOVEOBJECT_CREATEFOLDERL, "New folder parent: %S", iNewParent ); + const TDesC& oldPath = iObjInfoCache->DesC( CMTPObjectMetaData::ESuid ); if ( iFolderToRemove.Length() == 0 ) { @@ -301,8 +311,10 @@ } TFileName fileNamePart; - User::LeaveIfError( BaflUtils::MostSignificantPartOfFullName( oldPath, fileNamePart ) ); - __FLOG_1( _L("Folder name: %S"), &fileNamePart ); + LEAVEIFERROR( BaflUtils::MostSignificantPartOfFullName( oldPath, fileNamePart ), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPMOVEOBJECT_CREATEFOLDERL, "can't get Folder or file name for %S", oldPath)); + + OstTraceExt1( TRACE_NORMAL, DUP2_CMTPMOVEOBJECT_CREATEFOLDERL, "Folder name: %S", fileNamePart ); if ( ( iNewParent.Length() + fileNamePart.Length() + 1 ) <= iNewParent.MaxLength() ) { @@ -315,34 +327,38 @@ } if ( EMTPRespCodeOK == ret ) { - __FLOG_VA( ( _L("Try to move %S to %S"), &oldPath, &iNewParent ) ); + OstTraceExt2( TRACE_NORMAL, DUP3_CMTPMOVEOBJECT_CREATEFOLDERL, + "Try to move %S to %S", oldPath, iNewParent ); ret = CanMoveObjectL( oldPath, iNewParent ); if ( EMTPRespCodeOK == ret ) { TInt err = iFramework.Fs().MkDir( iNewParent ); - User::LeaveIfError( err ); + LEAVEIFERROR( err, + OstTraceExt2( TRACE_ERROR, DUP4_CMTPMOVEOBJECT_CREATEFOLDERL, "make directory %S error! error code %d", iNewParent, err)); iNewHandleParentStack.AppendL( iObjInfoCache->Uint( CMTPObjectMetaData::EHandle ) ); } } - __FLOG( _L8("-CreateFolderL") ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_CREATEFOLDERL_EXIT ); return ret; } void CMTPMoveObject::RemoveSourceFolderTreeL() { - __FLOG( _L8("+RemoveSourceFolderTreeL") ); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_REMOVESOURCEFOLDERTREEL_ENTRY ); if ( iFolderToRemove.Length() > 0 ) { - __FLOG_1( _L("Removing %S"), &iFolderToRemove ); + OstTraceExt1(TRACE_NORMAL, CMTPMOVEOBJECT_REMOVESOURCEFOLDERTREEL, "Removing %S", iFolderToRemove); delete iFileMan; iFileMan = NULL; iFileMan = CFileMan::NewL( iFramework.Fs() ); iState = ERemoveSourceFolderTree; - User::LeaveIfError( iFileMan->RmDir( iFolderToRemove, iStatus ) ); + LEAVEIFERROR( iFileMan->RmDir( iFolderToRemove, iStatus ), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPMOVEOBJECT_REMOVESOURCEFOLDERTREEL, "delete directory %S error", iFolderToRemove)); + SetActive(); } else @@ -350,12 +366,12 @@ SendResponseL( iResponse.Uint16( TMTPTypeResponse::EResponseCode ) ); } - __FLOG( _L8("-RemoveSourceFolderTreeL") ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_REMOVESOURCEFOLDERTREEL_EXIT ); } void CMTPMoveObject::BrowseHandlesL() { - __FLOG( _L8("+BrowseHandlesL") ); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_BROWSEHANDLESL_ENTRY ); iFolderToRemove.SetLength( 0 ); iState = EInit; @@ -381,7 +397,8 @@ TUint32 newHandleParent = Request().Uint32( TMTPTypeRequest::ERequestParameter3 ); iNewHandleParentStack.AppendL( newHandleParent ); iObjBrowser->GoL( KMTPFormatsAll, handle, KMaxTUint32, callback ); - __FLOG_1( _L8("iHandles.Count() = %d"), iHandles.Count() ); + OstTrace1( TRACE_NORMAL, CMTPMOVEOBJECT_BROWSEHANDLESL, "iHandles.Count() = %d", iHandles.Count()); + if ( iHandles.Count() > 0 ) { @@ -393,24 +410,25 @@ SendResponseL( EMTPRespCodeInvalidObjectHandle ); } - __FLOG( _L8("-BrowseHandlesL") ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_BROWSEHANDLESL_EXIT ); } void CMTPMoveObject::NextObjectHandleL() { - __FLOG( _L8("+NextObjectHandleL") ); + OstTraceFunctionEntry0( CMTPMOVEOBJECT_NEXTOBJECTHANDLEL_ENTRY ); __ASSERT_DEBUG( ( iNewHandleParentStack.Count() > 0 ), User::Invariant() ); iOwnerDp = KInvalidDpId; if ( iCurrentHandle >=0 ) { - __FLOG_1( _L8("iCurrentHandle = %d"), iCurrentHandle ); + OstTrace1( TRACE_NORMAL, CMTPMOVEOBJECT_NEXTOBJECTHANDLEL, "iCurrentHandle = %d", iCurrentHandle ); + TUint32 handle = iHandles[iCurrentHandle]; TUint32 depth = iHandleDepths[iCurrentHandle]; - __FLOG_1( _L8("depth = %d"), depth ); + OstTrace1( TRACE_NORMAL, DUP1_CMTPMOVEOBJECT_NEXTOBJECTHANDLEL, "depth = %d", depth ); if ( iCurrentHandle != ( iHandles.Count() - 1 ) ) { TUint32 previousDepth = iHandleDepths[iCurrentHandle + 1]; - __FLOG_1( _L8("previousDepth = %d"), previousDepth ); + OstTrace1( TRACE_NORMAL, DUP2_CMTPMOVEOBJECT_NEXTOBJECTHANDLEL, "previousDepth = %d", previousDepth ); if ( depth < previousDepth ) { // Completed copying folder and all its sub-folder and files, pop all copied folders' handle which are not shallower than the current one. @@ -460,7 +478,7 @@ RemoveSourceFolderTreeL(); } - __FLOG( _L8("-NextObjectHandleL") ); + OstTraceFunctionExit0( CMTPMOVEOBJECT_NEXTOBJECTHANDLEL_EXIT ); } void CMTPMoveObject::OnBrowseObjectL( TAny* aSelf, TUint aHandle, TUint32 aCurDepth ) diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/src/cmtpobjectbrowser.cpp --- a/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpobjectbrowser.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpobjectbrowser.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,8 +23,11 @@ #include "cmtprequestchecker.h" #include "mtpdppanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpobjectbrowserTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"ObjectBrowser");) CMTPObjectBrowser* CMTPObjectBrowser::NewL( MMTPDataProviderFramework& aDpFw ) @@ -43,14 +46,16 @@ CMTPObjectBrowser::~CMTPObjectBrowser() { + OstTraceFunctionEntry0( CMTPOBJECTBROWSER_CMTPOBJECTBROWSER_ENTRY ); delete iObjMetaCache; - __FLOG( _L8("+/-Dtor") ); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPOBJECTBROWSER_CMTPOBJECTBROWSER_EXIT ); } void CMTPObjectBrowser::GoL( TUint32 aFormatCode, TUint32 aHandle, TUint32 aDepth, const TBrowseCallback& aBrowseCallback ) const { - __FLOG_VA( ( _L8("+GoL( 0x%08X, 0x%08X, %d )"), aFormatCode, aHandle, aDepth ) ); + OstTraceFunctionEntry0( CMTPOBJECTBROWSER_GOL_ENTRY ); + OstTraceExt3(TRACE_NORMAL, CMTPOBJECTBROWSER_GOL, "0x%08X, 0x%08X, %d", + aFormatCode, aHandle, aDepth); switch ( aHandle ) { @@ -66,26 +71,28 @@ break; } - __FLOG( _L8("-GoL") ); + OstTraceFunctionExit0( CMTPOBJECTBROWSER_GOL_EXIT ); } CMTPObjectBrowser::CMTPObjectBrowser( MMTPDataProviderFramework& aDpFw ): iDpFw( aDpFw ) { - __FLOG_OPEN( KMTPSubsystem, KComponent ); - __FLOG( _L8("+/-Ctor") ); + OstTraceFunctionEntry0( DUP1_CMTPOBJECTBROWSER_CMTPOBJECTBROWSER_ENTRY ); + OstTraceFunctionExit0( DUP1_CMTPOBJECTBROWSER_CMTPOBJECTBROWSER_EXIT ); } void CMTPObjectBrowser::ConstructL() { - __FLOG( _L8("+ConstructL") ); + OstTraceFunctionEntry0( CMTPOBJECTBROWSER_CONSTRUCTL_ENTRY ); iObjMetaCache = CMTPObjectMetaData::NewL(); - __FLOG( _L8("-ConstructL") ); + OstTraceFunctionExit0( CMTPOBJECTBROWSER_CONSTRUCTL_EXIT ); } void CMTPObjectBrowser::GetObjectHandlesL( TUint32 aCurDepth, TUint32 aStorageId, TUint32 aFormatCode, TUint32 aDepth, TUint32 aParentHandle, const TBrowseCallback& aBrowseCallback ) const { - __FLOG_VA( ( _L8("+GetObjectHandlesL( %d, 0x%08X, 0x%08X, %d, 0x%08X )"), aCurDepth, aStorageId, aFormatCode, aDepth, aParentHandle ) ); + OstTraceFunctionEntry0( CMTPOBJECTBROWSER_GETOBJECTHANDLESL_ENTRY ); + OstTraceExt5(TRACE_NORMAL, CMTPOBJECTBROWSER_GETOBJECTHANDLESL, "%d, 0x%08X, 0x%08X, %d, 0x%08X", + aCurDepth, aStorageId, aFormatCode, aDepth, aParentHandle); RMTPObjectMgrQueryContext context; RArray< TUint > handles; @@ -131,13 +138,15 @@ CleanupStack::PopAndDestroy( &handles ); CleanupStack::PopAndDestroy( &context ); - - __FLOG( _L8("-GetObjectHandlesL") ); + + OstTraceFunctionExit0( CMTPOBJECTBROWSER_GETOBJECTHANDLESL_EXIT ); } void CMTPObjectBrowser::GetFolderObjectHandlesL( TUint32 aCurDepth, TUint32 aFormatCode, TUint32 aDepth, TUint32 aParentHandle, const TBrowseCallback& aBrowseCallback ) const { - __FLOG_VA( ( _L8("+GetFolderObjectHandlesL( %d, 0x%08X, %d, 0x%08X )"), aCurDepth, aFormatCode, aDepth, aParentHandle ) ); + OstTraceFunctionEntry0( CMTPOBJECTBROWSER_GETFOLDEROBJECTHANDLESL_ENTRY ); + OstTraceExt4(TRACE_NORMAL, CMTPOBJECTBROWSER_GETFOLDEROBJECTHANDLESL, + "%d, 0x%08X, %d, 0x%08X", aCurDepth, aFormatCode, aDepth, aParentHandle); if ( aDepth > 0) { @@ -150,13 +159,15 @@ { aBrowseCallback.iCallback( aBrowseCallback.iContext, aParentHandle, aCurDepth ); } - - __FLOG( _L8("-GetFolderObjectHandlesL") ); + + OstTraceFunctionExit0( CMTPOBJECTBROWSER_GETFOLDEROBJECTHANDLESL_EXIT ); } void CMTPObjectBrowser::GetRootObjectHandlesL( TUint32 aCurDepth, TUint32 aFormatCode, TUint32 aDepth, const TBrowseCallback& aBrowseCallback ) const { - __FLOG_VA( ( _L8("+GetRootObjectHandlesL( %d, 0x%08X, %d )"), aCurDepth, aFormatCode, aDepth ) ); + OstTraceFunctionEntry0( CMTPOBJECTBROWSER_GETROOTOBJECTHANDLESL_ENTRY ); + OstTraceExt3(TRACE_NORMAL, CMTPOBJECTBROWSER_GETROOTOBJECTHANDLESL, + "%d, 0x%08X, %d", aCurDepth, aFormatCode, aDepth); if( aDepth > 0) { @@ -165,18 +176,20 @@ } // if aDepth == 0, no handles should be returned. - - __FLOG( _L8("-GetRootObjectHandlesL") ); + + OstTraceFunctionExit0( CMTPOBJECTBROWSER_GETROOTOBJECTHANDLESL_EXIT ); } void CMTPObjectBrowser::GetObjectHandlesTreeL( TUint32 aCurDepth, TUint32 aFormatCode, TUint32 aDepth, TUint32 aParentHandle, const TBrowseCallback& aBrowseCallback ) const { - __FLOG_VA( ( _L8("+GetObjectHandlesTreeL( %d, 0x%08X, %d, 0x%08X )"), aCurDepth, aFormatCode, aDepth, aParentHandle ) ); - + OstTraceFunctionEntry0( CMTPOBJECTBROWSER_GETOBJECTHANDLESTREEL_ENTRY ); + OstTraceExt4(TRACE_NORMAL, CMTPOBJECTBROWSER_GETOBJECTHANDLESTREEL, + "%d, 0x%08X, %d, 0x%08X", aCurDepth, aFormatCode, aDepth, aParentHandle); + iDpFw.ObjectMgr().ObjectL( aParentHandle, *iObjMetaCache ); -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE RBuf suid; - suid.Create( iObjMetaCache->DesC( CMTPObjectMetaData::ESuid ) ); + suid.CreateL( iObjMetaCache->DesC( CMTPObjectMetaData::ESuid ) ); #endif if ( IsFolderFormat( iObjMetaCache->Uint( CMTPObjectMetaData::EFormatCode ), iObjMetaCache->Uint( CMTPObjectMetaData::EFormatSubCode ) ) ) { @@ -190,12 +203,12 @@ { // format doesn't match, do nothing } -#ifdef __FLOG_ACTIVE - __FLOG_1( _L8("recursion_depth: %d"), aCurDepth ); - __FLOG_1( _L("recursion_suid: %S"), &suid ); +#ifdef OST_TRACE_COMPILER_IN_USE + OstTrace1( TRACE_NORMAL, DUP1_CMTPOBJECTBROWSER_GETOBJECTHANDLESTREEL, "recursion_depth: %d", aCurDepth ); + OstTraceExt1( TRACE_NORMAL, DUP2_CMTPOBJECTBROWSER_GETOBJECTHANDLESTREEL, "recursion_suid: %S", suid ); suid.Close(); #endif - __FLOG( _L8("-GetObjectHandlesTreeL") ); + OstTraceFunctionExit0( CMTPOBJECTBROWSER_GETOBJECTHANDLESTREEL_EXIT ); } /** @@ -208,7 +221,7 @@ void CMTPObjectBrowser::GetAllObjectHandlesL(TUint32 aFormatCode,const TBrowseCallback& aBrowseCallback ) const { - __FLOG( _L8("CMTPObjectBrowser::GetAllObjectHandles-----entry") ); + OstTraceFunctionEntry0( CMTPOBJECTBROWSER_GETALLOBJECTHANDLESL_ENTRY ); RMTPObjectMgrQueryContext context; RArray< TUint > handles; @@ -237,6 +250,6 @@ CleanupStack::PopAndDestroy( &handles ); CleanupStack::PopAndDestroy( &context ); - __FLOG( _L8("CMTPObjectBrowser::GetAllObjectHandles------exit") ); + OstTraceFunctionExit0( CMTPOBJECTBROWSER_GETALLOBJECTHANDLESL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/src/cmtpproxydp.cpp --- a/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpproxydp.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpproxydp.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,12 +21,15 @@ #include "cmtpproxydp.h" #include "cmtprequestprocessor.h" #include "mtpproxydppanic.h" -#include "mtpproxydpprocessor.h" +#include "mtpproxydpprocessor.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpproxydpTraces.h" +#endif + static const TInt KMTPProxyDpSessionGranularity = 3; -__FLOG_STMT(_LIT8(KComponent,"CMTPProxyDataProvider");) - /** Standard NewL method @param aParams The pointer to MMTPDataProviderFramework @@ -43,11 +46,10 @@ void CMTPProxyDataProvider::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPPROXYDATAPROVIDER_CONSTRUCTL_ENTRY ); iDpSingletons.OpenL(Framework()); iSingletons.OpenL(Framework()); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPPROXYDATAPROVIDER_CONSTRUCTL_EXIT ); } /** @@ -55,6 +57,7 @@ */ CMTPProxyDataProvider::~CMTPProxyDataProvider() { + OstTraceFunctionEntry0( CMTPPROXYDATAPROVIDER_CMTPPROXYDATAPROVIDER_DES_ENTRY ); TInt count = iActiveProcessors.Count(); while(count--) { @@ -63,7 +66,7 @@ iActiveProcessors.Close(); iDpSingletons.Close(); iSingletons.Close(); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPROXYDATAPROVIDER_CMTPPROXYDATAPROVIDER_DES_EXIT ); } void CMTPProxyDataProvider::Cancel() @@ -150,8 +153,7 @@ */ void CMTPProxyDataProvider::Supported(TMTPSupportCategory aCategory, RArray& /*aArray*/) const { - - __FLOG(_L8("Supported - Entry")); + OstTraceFunctionEntry0( CMTPPROXYDATAPROVIDER_SUPPORTED_ENTRY ); switch (aCategory) { case EEvents: @@ -176,27 +178,18 @@ // Unrecognised category, leave aArray unmodified. break; } - __FLOG(_L8("Supported - Exit")); + OstTraceFunctionExit0( CMTPPROXYDATAPROVIDER_SUPPORTED_EXIT ); } void CMTPProxyDataProvider::SupportedL(TMTPSupportCategory /*aCategory*/, CDesCArray& /*aStrings*/) const { - __FLOG(_L8("SupportedL - Entry")); - __FLOG(_L8("SupportedL - Exit")); + OstTraceFunctionEntry0( CMTPPROXYDATAPROVIDER_SUPPORTEDL_ENTRY ); + OstTraceFunctionExit0( CMTPPROXYDATAPROVIDER_SUPPORTEDL_EXIT ); } -/** -Get the pointer to the extended interface -@param aInterfaceUid The uid of the extended interface -@return the pointer to the extended interface -*/ -TAny* CMTPProxyDataProvider::GetExtendedInterface(TUid /*aInterfaceUid*/) - { - return NULL; - } /** Standard c++ constructor @@ -262,6 +255,7 @@ void CMTPProxyDataProvider::SessionClosedL(const TMTPNotificationParamsSessionChange& aSession) { + OstTraceFunctionEntry0( CMTPPROXYDATAPROVIDER_SESSIONCLOSEDL_ENTRY ); TInt count = iActiveProcessors.Count(); while(count--) { @@ -280,19 +274,20 @@ } } } + OstTraceFunctionExit0( CMTPPROXYDATAPROVIDER_SESSIONCLOSEDL_EXIT ); } /** Prepares for a newly-opened session. @param aSession notification parameter block */ -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE void CMTPProxyDataProvider::SessionOpenedL(const TMTPNotificationParamsSessionChange& /*aSession*/) #else void CMTPProxyDataProvider::SessionOpenedL(const TMTPNotificationParamsSessionChange& /*aSession*/) #endif { - __FLOG(_L8("SessionOpenedL - Entry")); - __FLOG(_L8("SessionOpenedL - Exit")); + OstTraceFunctionEntry0( CMTPPROXYDATAPROVIDER_SESSIONOPENEDL_ENTRY ); + OstTraceFunctionExit0( CMTPPROXYDATAPROVIDER_SESSIONOPENEDL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/src/cmtpproxydpconfigmgr.cpp --- a/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpproxydpconfigmgr.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpproxydpconfigmgr.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,7 +21,11 @@ #include #include #include -__FLOG_STMT(_LIT8(KComponent1,"ProxyDPConfigmanager");) +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpproxydpconfigmgrTraces.h" +#endif + CMTPProxyDpConfigMgr* CMTPProxyDpConfigMgr::NewL(MMTPDataProviderFramework& aFramework) { @@ -39,7 +43,7 @@ void CMTPProxyDpConfigMgr::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent1); + OstTraceFunctionEntry0( CMTPPROXYDPCONFIGMGR_CONSTRUCTL_ENTRY ); TUint32 resourceId = iFramework.DataProviderConfig().UintValue(MMTPDataProviderConfig::EOpaqueResource); // Reading from resource file mtpproxydp_config.rss RResourceFile resourceFile; @@ -59,10 +63,12 @@ CleanupStack::PopAndDestroy(2, &resourceFile); + OstTraceFunctionExit0( CMTPPROXYDPCONFIGMGR_CONSTRUCTL_EXIT ); } CMTPProxyDpConfigMgr::~CMTPProxyDpConfigMgr() { + OstTraceFunctionEntry0( CMTPPROXYDPCONFIGMGR_CMTPPROXYDPCONFIGMGR_DES_ENTRY ); TInt count = iMappingStruct.Count(); for(TInt i=0 ; iFind(aFileName,aIndex); if(err == KErrNone) { aIndex=i; - __FLOG_1( _L8("aIndex = %d"), aIndex ); - __FLOG(_L8("GetFileName - Exit")); + OstTrace1( TRACE_NORMAL, DUP2_CMTPPROXYDPCONFIGMGR_GETFILENAME, "aIndex = %d", aIndex ); + OstTraceFunctionExit0( CMTPPROXYDPCONFIGMGR_GETFILENAME_EXIT ); return ETrue; } } - __FLOG(_L8("GetFileName - Exit")); + OstTraceFunctionExit0( DUP1_CMTPPROXYDPCONFIGMGR_GETFILENAME_EXIT ); return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/src/cmtpsendobjectinfo.cpp --- a/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpsendobjectinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/dataproviders/proxydp/src/cmtpsendobjectinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -26,8 +26,11 @@ #include "mtpproxydppanic.h" #include "cmtpproxydpconfigmgr.h" #include "cmtpstoragemgr.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsendobjectinfoTraces.h" +#endif -__FLOG_STMT( _LIT8( KComponent,"PrxySendObjectInfo" ); ) /** Verification data for the SendObjectInfo request @@ -58,14 +61,13 @@ */ CMTPSendObjectInfo::~CMTPSendObjectInfo() { - __FLOG(_L8("~CMTPSendObjectInfo - Entry")); - + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_CMTPSENDOBJECTINFO_DES_ENTRY ); + delete iObjectInfo; iSingletons.Close(); iProxyDpSingletons.Close(); - __FLOG(_L8("~CMTPSendObjectInfo - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_CMTPSENDOBJECTINFO_DES_EXIT ); } /** @@ -82,12 +84,11 @@ */ void CMTPSendObjectInfo::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); - - __FLOG(_L8("ConstructL - Exit")); + + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_CONSTRUCTL_EXIT ); } /** @@ -124,8 +125,8 @@ */ void CMTPSendObjectInfo::DoHandleSendObjectInfoCompleteL() { - __FLOG(_L8("DoHandleSendObjectInfoCompleteL - Entry")); - + OstTraceFunctionEntry0( CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_ENTRY ); + CMTPParserRouter::TRoutingParameters params(*iRequest, iConnection); iSingletons.Router().ParseOperationRequestL(params); TBool fileFlag=EFalse; @@ -136,7 +137,7 @@ iProxyDpSingletons.OpenL(iFramework); TInt index(KErrNotFound); const TUint16 formatCode=iObjectInfo->Uint16L(CMTPTypeObjectInfo::EObjectFormat); - __FLOG_1( _L8("formatCode = %d"), formatCode ); + OstTrace1(TRACE_NORMAL, CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL, "formatCode = %d", formatCode); switch(formatCode) { case EMTPFormatCodeAssociation: @@ -145,13 +146,13 @@ case EMTPFormatCodeScript: { - __FLOG_1( _L8("formatCode = %d"), EMTPFormatCodeScript ); const TDesC& filename = iObjectInfo->StringCharsL(CMTPTypeObjectInfo::EFilename); HBufC* lowFileName = HBufC::NewLC(filename.Length()); TPtr16 prt(lowFileName->Des()); prt.Append(filename); prt.LowerCase(); - __FLOG_1( _L8("lowFileName = %s"), &prt ); + OstTraceExt1(TRACE_NORMAL, DUP1_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL, + "lowFileName = %S", prt); if (iProxyDpSingletons.FrameworkConfig().GetFileName(prt,index) ) { fileFlag=ETrue; @@ -166,7 +167,8 @@ break; } - __FLOG_1( _L8("fileFlag = %d"), fileFlag ); + OstTrace1( TRACE_NORMAL, DUP2_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL, "fileFlag = %d", fileFlag); + if(fileFlag) { TInt syncdpid = iSingletons.DpController().DpId(iProxyDpSingletons.FrameworkConfig().GetDPId(index)); @@ -177,8 +179,10 @@ iSingletons.Router().RouteOperationRequestL(params, targets); CMTPStorageMgr& storages(iSingletons.StorageMgr()); const TUint KStorageId = Request().Uint32(TMTPTypeResponse::EResponseParameter1); - __FLOG_1( _L8("KStorageId = %d"), KStorageId ); - __FLOG_1( _L8("targets.Count() = %d"), targets.Count() ); + OstTrace1(TRACE_NORMAL, DUP3_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL, + "KStorageId = %d", KStorageId); + OstTrace1(TRACE_NORMAL, DUP4_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL, + "targets.Count() = %d", targets.Count()); if( KMTPNotSpecified32 == KStorageId) { iSingletons.DpController().DataProviderL(targets[0]).ExecuteProxyRequestL(Request(), Connection(), *this); @@ -187,7 +191,8 @@ { if(targets.Count() == 1) { - __FLOG_1( _L8("targets[0] = %d"), targets[0] ); + OstTrace1(TRACE_NORMAL, DUP5_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL, + "targets[0] = %d", targets[0]); iSingletons.DpController().DataProviderL(targets[0]).ExecuteProxyRequestL(Request(), Connection(), *this); } else @@ -201,10 +206,12 @@ { dpID = storages.PhysicalStorageOwner(KStorageId); } - __FLOG_1( _L8("dpID = %d"), dpID ); + OstTrace1(TRACE_NORMAL, DUP6_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL, + "dpID = %d", dpID); if( targets.Find( dpID ) == KErrNotFound ) { - __FLOG(_L8("No target dp is found, so send one GeneralError response.")); + OstTrace0( TRACE_NORMAL, DUP7_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL, + "No target dp is found, so send one GeneralError response." ); SendResponseL( EMTPRespCodeGeneralError ); } else @@ -215,13 +222,13 @@ } else { - __FLOG(_L8("StorageID is invalid.")); + OstTrace0( TRACE_NORMAL, DUP8_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL,"StorageID is invalid." ); SendResponseL( EMTPRespCodeInvalidStorageID ); } } CleanupStack::PopAndDestroy(&targets); - - __FLOG(_L8("DoHandleSendObjectInfoCompleteL - Exit")); + + OstTraceFunctionExit0( CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_EXIT ); } #ifdef _DEBUG diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpfws/mtpfw/dataproviders/proxydp/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/dataproviders/proxydp/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpfws/mtpfw/dataproviders/proxydp/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,229 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_NORMAL=0x86 +[TRACE]TRACE_ERROR[0x82]_CMTPGETOBJECTPROPSSUPPORTED_PROXYSENDDATAL=0x1 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPMOVEOBJECT_CANMOVEOBJECTL=0x2 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPMOVEOBJECT_CREATEFOLDERL=0x5 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPMOVEOBJECT_REMOVESOURCEFOLDERTREEL=0x7 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPMOVEOBJECT_CANMOVEOBJECTL=0x3 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPMOVEOBJECT_CANMOVEOBJECTL=0x4 +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPMOVEOBJECT_CREATEFOLDERL=0x6 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_BROWSEHANDLESL_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_BROWSEHANDLESL_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_CMTPCOPYOBJECT_DES_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_CMTPCOPYOBJECT_DES_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_CONSTRUCTL_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_CONSTRUCTL_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_NEXTOBJECTHANDLEL_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_NEXTOBJECTHANDLEL_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_ONBROWSEOBJECTL_ENTRY=0x11 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_ONBROWSEOBJECTL_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_PROXYSENDRESPONSEL_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_PROXYSENDRESPONSEL_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_PROXYTRANSACTIONCOMPLETEL_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_PROXYTRANSACTIONCOMPLETEL_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_RUNL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_RUNL_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_SERVICEL_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CMTPCOPYOBJECT_SERVICEL_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_BUILDSUBREQUESTSL_ENTRY=0x2a +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_BUILDSUBREQUESTSL_EXIT=0x2b +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_CMTPDELETEOBJECTPROPLIST_DES_ENTRY=0x22 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_CMTPDELETEOBJECTPROPLIST_DES_EXIT=0x23 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_CONSTRUCTL_ENTRY=0x24 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_CONSTRUCTL_EXIT=0x25 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_ENTRY=0x28 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_DOHANDLERESPONSEPHASEL_EXIT=0x29 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_PROXYSENDDATAL_ENTRY=0x2c +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_PROXYSENDDATAL_EXIT=0x2d +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_PROXYSENDRESPONSEL_ENTRY=0x2e +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_PROXYSENDRESPONSEL_EXIT=0x2f +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_PROXYTRANSACTIONCOMPLETEL_ENTRY=0x30 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_PROXYTRANSACTIONCOMPLETEL_EXIT=0x31 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_RUNERROR_ENTRY=0x36 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_RUNERROR_EXIT=0x37 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_RUNL_ENTRY=0x34 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_RUNL_EXIT=0x35 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_SCHEDULE_ENTRY=0x38 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_SCHEDULE_EXIT=0x39 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_SENDRESPONSEL_ENTRY=0x32 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_SENDRESPONSEL_EXIT=0x33 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_SERVICEL_ENTRY=0x26 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECTPROPLIST_SERVICEL_EXIT=0x27 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_BROWSEHANDLESL_ENTRY=0x1e +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_BROWSEHANDLESL_EXIT=0x1f +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_CHECKREQUESTL_ENTRY=0x17 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_CHECKREQUESTL_EXIT=0x18 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_CMTPDELETEOBJECT_DES_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_CMTPDELETEOBJECT_DES_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_CONSTRUCTL_ENTRY=0x15 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_CONSTRUCTL_EXIT=0x16 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_NEXTOBJECTHANDLEL_ENTRY=0x20 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_NEXTOBJECTHANDLEL_EXIT=0x21 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_RUNL_ENTRY=0x1c +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_RUNL_EXIT=0x1d +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_SERVICEL_ENTRY=0x19 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELETEOBJECT_SERVICEL_EXIT=0x1a +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_CMTPGETFORMATCAPABILITIES_DES_ENTRY=0x3a +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_CMTPGETFORMATCAPABILITIES_DES_EXIT=0x3b +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_CONSTRUCTL_ENTRY=0x3c +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_CONSTRUCTL_EXIT=0x3d +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_PROXYRECEIVEDATAL_ENTRY=0x40 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_PROXYRECEIVEDATAL_EXIT=0x41 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_PROXYSENDDATAL_ENTRY=0x42 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_PROXYSENDDATAL_EXIT=0x43 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_PROXYSENDRESPONSEL_ENTRY=0x44 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_PROXYSENDRESPONSEL_EXIT=0x45 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_PROXYTRANSACTIONCOMPLETEL_ENTRY=0x46 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_PROXYTRANSACTIONCOMPLETEL_EXIT=0x47 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_RUNERROR_ENTRY=0x4c +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_RUNERROR_EXIT=0x4d +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_RUNL_ENTRY=0x4a +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_RUNL_EXIT=0x4b +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_SCHEDULE_ENTRY=0x4e +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_SCHEDULE_EXIT=0x4f +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_SENDRESPONSEL_ENTRY=0x48 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_SENDRESPONSEL_EXIT=0x49 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_SERVICEL_ENTRY=0x3e +[TRACE]TRACE_FLOW[0x8A]_CMTPGETFORMATCAPABILITIES_SERVICEL_EXIT=0x3f +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_CMTPGETOBJECTPROPLIST_ENTRY=0x50 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_CMTPGETOBJECTPROPLIST_EXIT=0x51 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_CONSTRUCTL_ENTRY=0x5a +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_CONSTRUCTL_EXIT=0x5b +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_GETNEXTOBJECTPROPL_ENTRY=0x5e +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_GETNEXTOBJECTPROPL_EXIT=0x5f +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_GETOBJECTHANDLESL_ENTRY=0x5c +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_GETOBJECTHANDLESL_EXIT=0x5d +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_PROXYSENDRESPONSEL_ENTRY=0x52 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_PROXYSENDRESPONSEL_EXIT=0x53 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_PROXYTRANSACTIONCOMPLETEL_ENTRY=0x54 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_PROXYTRANSACTIONCOMPLETEL_EXIT=0x55 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_RUNL_ENTRY=0x56 +[TRACE]TRACE_FLOW[0x8A]_CMTPGETOBJECTPROPLIST_RUNL_EXIT=0x57 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_BROWSEHANDLESL_ENTRY=0x76 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_BROWSEHANDLESL_EXIT=0x77 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CANMOVEOBJECTL_ENTRY=0x6e +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CANMOVEOBJECTL_EXIT=0x6f +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CMTPMOVEOBJECT_ENTRY=0x60 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CMTPMOVEOBJECT_EXIT=0x61 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CONSTRUCTL_ENTRY=0x62 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CONSTRUCTL_EXIT=0x63 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CREATEFOLDERL_ENTRY=0x72 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_CREATEFOLDERL_EXIT=0x73 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_GETDEFAULTPARENTOBJECTL_ENTRY=0x6c +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_GETDEFAULTPARENTOBJECTL_EXIT=0x6d +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_GETPARAMETERSL_ENTRY=0x6a +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_GETPARAMETERSL_EXIT=0x6b +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_NEXTOBJECTHANDLEL_ENTRY=0x78 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_NEXTOBJECTHANDLEL_EXIT=0x79 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_PROXYSENDRESPONSEL_ENTRY=0x66 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_PROXYSENDRESPONSEL_EXIT=0x67 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_PROXYTRANSACTIONCOMPLETEL_ENTRY=0x68 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_PROXYTRANSACTIONCOMPLETEL_EXIT=0x69 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_REMOVESOURCEFOLDERTREEL_ENTRY=0x74 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_REMOVESOURCEFOLDERTREEL_EXIT=0x75 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_RUNL_ENTRY=0x70 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_RUNL_EXIT=0x71 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_SERVICEL_ENTRY=0x64 +[TRACE]TRACE_FLOW[0x8A]_CMTPMOVEOBJECT_SERVICEL_EXIT=0x65 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_CMTPOBJECTBROWSER_ENTRY=0x7a +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_CMTPOBJECTBROWSER_EXIT=0x7b +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_CONSTRUCTL_ENTRY=0x80 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_CONSTRUCTL_EXIT=0x81 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_GETALLOBJECTHANDLESL_ENTRY=0x8a +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_GETALLOBJECTHANDLESL_EXIT=0x8b +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_GETFOLDEROBJECTHANDLESL_ENTRY=0x84 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_GETFOLDEROBJECTHANDLESL_EXIT=0x85 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_GETOBJECTHANDLESL_ENTRY=0x82 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_GETOBJECTHANDLESL_EXIT=0x83 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_GETOBJECTHANDLESTREEL_ENTRY=0x88 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_GETOBJECTHANDLESTREEL_EXIT=0x89 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_GETROOTOBJECTHANDLESL_ENTRY=0x86 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_GETROOTOBJECTHANDLESL_EXIT=0x87 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_GOL_ENTRY=0x7c +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTBROWSER_GOL_EXIT=0x7d +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDATAPROVIDER_CMTPPROXYDATAPROVIDER_DES_ENTRY=0x8e +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDATAPROVIDER_CMTPPROXYDATAPROVIDER_DES_EXIT=0x8f +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDATAPROVIDER_CONSTRUCTL_ENTRY=0x8c +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDATAPROVIDER_CONSTRUCTL_EXIT=0x8d +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDATAPROVIDER_SESSIONCLOSEDL_ENTRY=0x94 +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDATAPROVIDER_SESSIONCLOSEDL_EXIT=0x95 +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDATAPROVIDER_SESSIONOPENEDL_ENTRY=0x96 +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDATAPROVIDER_SESSIONOPENEDL_EXIT=0x97 +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDATAPROVIDER_SUPPORTEDL_ENTRY=0x92 +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDATAPROVIDER_SUPPORTEDL_EXIT=0x93 +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDATAPROVIDER_SUPPORTED_ENTRY=0x90 +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDATAPROVIDER_SUPPORTED_EXIT=0x91 +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDPCONFIGMGR_CMTPPROXYDPCONFIGMGR_DES_ENTRY=0x9a +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDPCONFIGMGR_CMTPPROXYDPCONFIGMGR_DES_EXIT=0x9b +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDPCONFIGMGR_CONSTRUCTL_ENTRY=0x98 +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDPCONFIGMGR_CONSTRUCTL_EXIT=0x99 +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDPCONFIGMGR_GETFILENAME_ENTRY=0x9c +[TRACE]TRACE_FLOW[0x8A]_CMTPPROXYDPCONFIGMGR_GETFILENAME_EXIT=0x9d +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CMTPSENDOBJECTINFO_DES_ENTRY=0x9f +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CMTPSENDOBJECTINFO_DES_EXIT=0xa0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CONSTRUCTL_ENTRY=0xa1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_CONSTRUCTL_EXIT=0xa2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_ENTRY=0xa3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL_EXIT=0xa4 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDELETEOBJECT_SERVICEL_EXIT=0x1b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPGETOBJECTPROPLIST_CMTPGETOBJECTPROPLIST_ENTRY=0x58 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPGETOBJECTPROPLIST_CMTPGETOBJECTPROPLIST_EXIT=0x59 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPOBJECTBROWSER_CMTPOBJECTBROWSER_ENTRY=0x7e +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPOBJECTBROWSER_CMTPOBJECTBROWSER_EXIT=0x7f +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPROXYDPCONFIGMGR_GETFILENAME_EXIT=0x9e +[TRACE]TRACE_NORMAL[0x86]_CMTPCOPYOBJECT_BROWSEHANDLESL=0x2 +[TRACE]TRACE_NORMAL[0x86]_CMTPCOPYOBJECT_NEXTOBJECTHANDLEL=0x3 +[TRACE]TRACE_NORMAL[0x86]_CMTPCOPYOBJECT_RUNL=0x1 +[TRACE]TRACE_NORMAL[0x86]_CMTPDELETEOBJECT_CHECKREQUESTL=0x6 +[TRACE]TRACE_NORMAL[0x86]_CMTPDELETEOBJECT_RUNL=0x7 +[TRACE]TRACE_NORMAL[0x86]_CMTPGETOBJECTPROPLIST_GETOBJECTHANDLESL=0x9 +[TRACE]TRACE_NORMAL[0x86]_CMTPGETOBJECTPROPLIST_PROXYTRANSACTIONCOMPLETEL=0x8 +[TRACE]TRACE_NORMAL[0x86]_CMTPMOVEOBJECT_BROWSEHANDLESL=0xf +[TRACE]TRACE_NORMAL[0x86]_CMTPMOVEOBJECT_CANMOVEOBJECTL=0xa +[TRACE]TRACE_NORMAL[0x86]_CMTPMOVEOBJECT_CREATEFOLDERL=0xb +[TRACE]TRACE_NORMAL[0x86]_CMTPMOVEOBJECT_NEXTOBJECTHANDLEL=0x10 +[TRACE]TRACE_NORMAL[0x86]_CMTPMOVEOBJECT_REMOVESOURCEFOLDERTREEL=0xe +[TRACE]TRACE_NORMAL[0x86]_CMTPOBJECTBROWSER_GETFOLDEROBJECTHANDLESL=0x15 +[TRACE]TRACE_NORMAL[0x86]_CMTPOBJECTBROWSER_GETOBJECTHANDLESL=0x14 +[TRACE]TRACE_NORMAL[0x86]_CMTPOBJECTBROWSER_GETOBJECTHANDLESTREEL=0x17 +[TRACE]TRACE_NORMAL[0x86]_CMTPOBJECTBROWSER_GETROOTOBJECTHANDLESL=0x16 +[TRACE]TRACE_NORMAL[0x86]_CMTPOBJECTBROWSER_GOL=0x13 +[TRACE]TRACE_NORMAL[0x86]_CMTPPROXYDPCONFIGMGR_GETFILENAME=0x1a +[TRACE]TRACE_NORMAL[0x86]_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x1d +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPCOPYOBJECT_NEXTOBJECTHANDLEL=0x4 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPMOVEOBJECT_NEXTOBJECTHANDLEL=0x11 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPOBJECTBROWSER_GETOBJECTHANDLESTREEL=0x18 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPROXYDPCONFIGMGR_GETFILENAME=0x1b +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x1e +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPCOPYOBJECT_NEXTOBJECTHANDLEL=0x5 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPMOVEOBJECT_CREATEFOLDERL=0xc +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPMOVEOBJECT_NEXTOBJECTHANDLEL=0x12 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPOBJECTBROWSER_GETOBJECTHANDLESTREEL=0x19 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPPROXYDPCONFIGMGR_GETFILENAME=0x1c +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x1f +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPMOVEOBJECT_CREATEFOLDERL=0xd +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x20 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x21 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x22 +[TRACE]TRACE_NORMAL[0x86]_DUP6_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x23 +[TRACE]TRACE_NORMAL[0x86]_DUP7_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x24 +[TRACE]TRACE_NORMAL[0x86]_DUP8_CMTPSENDOBJECTINFO_DOHANDLESENDOBJECTINFOCOMPLETEL=0x25 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/datatypes/interface/mtpprotocolconstants.h --- a/mtpfws/mtpfw/datatypes/interface/mtpprotocolconstants.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/datatypes/interface/mtpprotocolconstants.h Fri Sep 17 08:34:51 2010 +0300 @@ -800,6 +800,12 @@ EMTPProtectionNonTransferable = 0x8003 }; +enum TMTPHiddenStatus + { + EMTPVisible = 0x0000, + EMTPHidden = 0x0001 + }; + /** The MTP consumable status datacodes. For a description of these datacodes, please refer to the "Media Transfer Protocol Enhanced" specification. diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/datatypes/src/cmtptypetrivialdata.cpp --- a/mtpfws/mtpfw/datatypes/src/cmtptypetrivialdata.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/datatypes/src/cmtptypetrivialdata.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -75,7 +75,11 @@ { if (iBuffer.MaxSize() == 0) { - iBuffer.Create(KMaxSizeOfWriteBuffer); + TInt err = iBuffer.Create(KMaxSizeOfWriteBuffer); + if(KErrNone != err) + { + return err; + } } aChunk.Set( const_cast(iBuffer.Ptr()), 0, KMaxSizeOfWriteBuffer); return KErrNone; @@ -98,7 +102,11 @@ if (iBuffer.MaxSize() == 0) { - iBuffer.Create(len); + ret = iBuffer.Create(len); + if(KErrNone != ret) + { + return ret; + } } aChunk.Set( const_cast(iBuffer.Ptr()), 0, len); diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/group/mtpframework.mmp --- a/mtpfws/mtpfw/group/mtpframework.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/group/mtpframework.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -19,7 +19,6 @@ @file */ -#include #include "../common/inc/mtpbuildoptions.hrh" TARGET mtpframework.dll @@ -33,7 +32,8 @@ USERINCLUDE ../inc/ USERINCLUDE ../common/inc -USERINCLUDE ../transports/transportapi/inc +USERINCLUDE ../transports/transportapi/inc +USERINCLUDE ../traces SOURCEPATH ../src/ SOURCE cmtpconnection.cpp diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpconnection.h --- a/mtpfws/mtpfw/inc/cmtpconnection.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpconnection.h Fri Sep 17 08:34:51 2010 +0300 @@ -183,10 +183,6 @@ TSglQue iEventQ; TInt iPendingEventCount; TInt iDataReceiveResult; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; private: // Not owned diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpconnectionmgr.h --- a/mtpfws/mtpfw/inc/cmtpconnectionmgr.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpconnectionmgr.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,6 @@ #include #include #include "mmtpconnectionmgr.h" -#include "mtpdebug.h" #include "mtp/rmtpclient.h" class CMTPConnection; @@ -114,9 +113,6 @@ * Set ETrue when Resumetransport need to be called. */ TBool iResumeCalled; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; + }; #endif // CMTPCONNECTIONMGR_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpdatacodegenerator.h --- a/mtpfws/mtpfw/inc/cmtpdatacodegenerator.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpdatacodegenerator.h Fri Sep 17 08:34:51 2010 +0300 @@ -23,12 +23,7 @@ #include #include - - - -#include "mtpdebug.h" - -class RMTPFramework; +#include "rmtpframework.h" class CMTPDataCodeGenerator : @@ -56,11 +51,6 @@ private: /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - - /** The framework singletons. */ RMTPFramework iSingletons; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpdataprovider.h --- a/mtpfws/mtpfw/inc/cmtpdataprovider.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpdataprovider.h Fri Sep 17 08:34:51 2010 +0300 @@ -31,8 +31,6 @@ #include #include -#include "mtpdebug.h" - class CMTPConnection; class CMTPDataProviderPlugin; class CMTPDataProviderConfig; @@ -167,11 +165,6 @@ }; private: // Owned - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; /** The data provider configurability parameter data. diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpdataprovidercontroller.h --- a/mtpfws/mtpfw/inc/cmtpdataprovidercontroller.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpdataprovidercontroller.h Fri Sep 17 08:34:51 2010 +0300 @@ -26,7 +26,6 @@ #include #include "rmtpframework.h" -#include "mtpdebug.h" #include #include #include @@ -151,15 +150,9 @@ void ConstructL(); private: - __FLOG_DECLARATION_MEMBER_MUTABLE; CMTPDataProviderController* iDPController; }; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; /** The active data provider set container, ordered bit implementation diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpdeltadatamgr.h --- a/mtpfws/mtpfw/inc/cmtpdeltadatamgr.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpdeltadatamgr.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,8 +25,6 @@ #ifndef CMTPDELTADATAMGR_H #define CMTPDELTADATAMGR_H -#include "mtpdebug.h" - #include #include #include "dbutility.h" @@ -88,10 +86,6 @@ TInt iTotalRows; RDbTable iDeltaTableBatched; RDbTable iAnchorTableBatched; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // CMTPDELTADATAMGR_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpobjectmgr.h --- a/mtpfws/mtpfw/inc/cmtpobjectmgr.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpobjectmgr.h Fri Sep 17 08:34:51 2010 +0300 @@ -24,8 +24,6 @@ #include #include -#include "mtpdebug.h" - #include "cmtpobjectstore.h" class CMTPObjectStore; @@ -95,11 +93,6 @@ private: // Owned /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - - /** The object meta data store. */ CMTPObjectStore* iObjectStore; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpobjectstore.h --- a/mtpfws/mtpfw/inc/cmtpobjectstore.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpobjectstore.h Fri Sep 17 08:34:51 2010 +0300 @@ -26,7 +26,6 @@ #include "mtpframeworkconst.h" #include "rmtpframework.h" -#include "mtpdebug.h" #include "cmtpreferencemgr.h" class CFileStore; class CMTPHandleAllocator; @@ -172,7 +171,8 @@ void RunL(); TInt RunErr(); void ActiveSelf(); - + ~CSnapshotWorker(); + private: CSnapshotWorker(CMTPObjectStore* aObjectStore, TBool aOnlyRoot); void ConstructL(); @@ -368,10 +368,6 @@ CSnapshotWorker* iSnapshotWorker; mutable TFileName iSuidBuf; TBool iCleanUndefined; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; #endif // CMTPOBJECTSTORE_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpparserrouter.h --- a/mtpfws/mtpfw/inc/cmtpparserrouter.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpparserrouter.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,8 +25,8 @@ #include #include "cmtpdataprovidercontroller.h" -#include "mtpdebug.h" #include "rmtpframework.h" +#include "../traces/OstTraceDefinitions.h" class CMTPConnection; class CMTPDataProvider; @@ -555,9 +555,9 @@ void GetToL(const RArray& aFrom, RArray& aTo) const; TUint SubType() const; -#ifdef __FLOG_ACTIVE - void FLOGMapL(RArray& aFrom) const; - void FLOGMapEntryL(const RArray& aFrom, TUint aTo) const; +#ifdef OST_TRACE_COMPILER_IN_USE + void OSTMapL(RArray& aFrom) const; + void OSTMapEntryL(const RArray& aFrom, TUint aTo) const; #endif private: @@ -589,11 +589,6 @@ static TInt NodeOrderFromToDescending(const TMap& aL, const TMap& aR); private: - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; /** The routing parameter. @@ -655,16 +650,11 @@ static TUint ParamsCount(TUint aSubType); static TUint SubType(TUint aIndex, TUint aFlags, TUint aParamsCount); -#ifdef __FLOG_ACTIVE - void FLOGMapsL() const; +#ifdef OST_TRACE_COMPILER_IN_USE + void OSTMapsL() const; #endif private: // Owned - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; /** The operation parameter routing sub-type map tables. diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpreferencemgr.h --- a/mtpfws/mtpfw/inc/cmtpreferencemgr.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpreferencemgr.h Fri Sep 17 08:34:51 2010 +0300 @@ -22,6 +22,7 @@ #define CMTPREFERENCEMGR_H #include +#include #include #include "mtpframeworkconst.h" diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpserviceconfig.h --- a/mtpfws/mtpfw/inc/cmtpserviceconfig.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpserviceconfig.h Fri Sep 17 08:34:51 2010 +0300 @@ -31,8 +31,6 @@ #include #include "cmtpserviceinfo.h" -#include "mtpdebug.h" - class TResourceReader; @@ -83,12 +81,6 @@ TMTPTypeGuid ReadGUID( TResourceReader& aReader ); private: - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - RFs& iRFs; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpserviceinfo.h --- a/mtpfws/mtpfw/inc/cmtpserviceinfo.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpserviceinfo.h Fri Sep 17 08:34:51 2010 +0300 @@ -30,9 +30,6 @@ #include #include -#include "mtpdebug.h" - - /** Implements the MTP service configure interface. @internalComponent @@ -218,10 +215,6 @@ RPointerArray iServiceMethods; RPointerArray iServiceEvents; RArray iDataBlock; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpservicemgr.h --- a/mtpfws/mtpfw/inc/cmtpservicemgr.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpservicemgr.h Fri Sep 17 08:34:51 2010 +0300 @@ -28,7 +28,6 @@ #include "cmtpserviceinfo.h" #include "rmtpframework.h" -#include "mtpdebug.h" class CMTPServiceConfig; @@ -98,11 +97,6 @@ */ CMTPServiceConfig* iServiceCfg; - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - }; #endif /*CMTPSERVICEMGR_H_*/ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpsession.h --- a/mtpfws/mtpfw/inc/cmtpsession.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpsession.h Fri Sep 17 08:34:51 2010 +0300 @@ -26,8 +26,6 @@ #include #include -#include "mtpdebug.h" - /** Implements the session level portion of the MTP communication model. It also implements the data provider layer MTP session interface (@see MMTPSession). @@ -78,11 +76,6 @@ private: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - TUint32 iExpectedTransactionId; TUint32 iIdMTP; TUint iIdUnique; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/cmtpstoragemgr.h --- a/mtpfws/mtpfw/inc/cmtpstoragemgr.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/cmtpstoragemgr.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,6 @@ #include #include -#include "mtpdebug.h" #include "rmtpframework.h" /** @@ -100,11 +99,6 @@ private: // Owned /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - - /** The default MTP storage ID. */ TUint32 iDefaultStorageId; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/inc/rmtpframework.h --- a/mtpfws/mtpfw/inc/rmtpframework.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/inc/rmtpframework.h Fri Sep 17 08:34:51 2010 +0300 @@ -23,8 +23,6 @@ #include #include -#include "mtpdebug.h" - class CMTPConnectionMgr; class CMTPDataProviderController; class CMTPFrameworkConfig; @@ -81,11 +79,6 @@ public: // Owned /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - - /** The construction in-progress flag, which is used to manage nested (recursive) opens. */ @@ -139,12 +132,6 @@ }; private: // Owned - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - /** The nested flag which indicates if the singletons manager reference was recursively opened. diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpconnection.cpp --- a/mtpfws/mtpfw/src/cmtpconnection.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpconnection.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -35,9 +35,13 @@ #include "cmtprequestlogger.h" #endif -#define UNUSED_VAR(a) (a) = (a) +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpconnectionTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"MTPConnection");) +#define UNUSED_VAR(a) (a) = (a) /** CMTPConnection panics @@ -79,7 +83,7 @@ */ CMTPConnection::~CMTPConnection() { - __FLOG(_L8("~CMTPConnection - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_CMTPCONNECTION_DES_ENTRY ); CloseAllSessions(); //remove all events @@ -97,8 +101,7 @@ // delete the ‘name?property RProcess process; RProperty::Delete(process.SecureId(), EMTPConnStateKey); - __FLOG(_L8("~CMTPConnection - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPCONNECTION_CMTPCONNECTION_DES_EXIT ); } /** @@ -116,7 +119,8 @@ */ void CMTPConnection::ReceiveDataL(MMTPType& aData, const TMTPTypeRequest& aRequest, TRequestStatus& aStatus) { - __FLOG(_L8("ReceiveDataL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_RECEIVEDATAL_ENTRY ); + iDataReceiveResult = KErrNone; const TUint KValidPhases(ERequestPhase); CMTPSession& session(SessionL(aRequest, TMTPTypeRequest::ERequestSessionID)); @@ -132,7 +136,7 @@ iTransportConnection->ReceiveDataL(aData, aRequest); } - __FLOG(_L8("ReceiveDataL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_RECEIVEDATAL_EXIT ); } /** @@ -150,7 +154,7 @@ */ void CMTPConnection::SendDataL(const MMTPType& aData, const TMTPTypeRequest& aRequest, TRequestStatus& aStatus) { - __FLOG(_L8("SendDataL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_SENDDATAL_ENTRY ); #ifdef MTP_CAPTURE_TEST_DATA iRequestLogger->WriteDataPhaseL(aData, EDataRToIPhase); #endif @@ -170,7 +174,7 @@ } iTransportConnection->SendDataL(aData, aRequest); } - __FLOG(_L8("SendDataL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_SENDDATAL_EXIT ); } /** @@ -180,7 +184,7 @@ */ void CMTPConnection::SendEventL(const TMTPTypeEvent& aEvent) { - __FLOG(_L8("SendEventL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_SENDEVENTL_ENTRY ); const TUint KValidPhases(EIdlePhase | ERequestPhase | EDataIToRPhase| EDataRToIPhase | EResponsePhase | ECompletingPhase); if (ValidFrameworkRequest(NULL, KValidPhases, NULL)) { @@ -188,7 +192,9 @@ TUint32 sessionId(aEvent.Uint32(TMTPTypeEvent::EEventSessionID)); if (sessionId != KMTPSessionAll) { - User::LeaveIfError(iSessions.FindInOrder(sessionId, SessionOrder)); + TInt ret = iSessions.FindInOrder(sessionId, SessionOrder); + LEAVEIFERROR(ret, + OstTrace1(TRACE_ERROR, CMTPCONNECTION_SENDEVENTL, "can't find according to session_id %d", sessionId)); } @@ -199,7 +205,7 @@ iTransportConnection->SendEventL(iEventQ.First()->iEvent); } } - __FLOG(_L8("SendEventL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_SENDEVENTL_EXIT ); } /** @@ -219,7 +225,7 @@ */ void CMTPConnection::SendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& aRequest, TRequestStatus& aStatus) { - __FLOG(_L8("SendResponseL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_SENDRESPONSEL_ENTRY ); #ifdef MTP_CAPTURE_TEST_DATA // Running under debug capture mode save this request off to disk. iRequestLogger->LogResponseL(aResponse); @@ -239,7 +245,8 @@ transaction irrecoverably hanging. */ UnrecoverableMTPError(); - User::Leave(KErrArgument); + OstTrace0(TRACE_ERROR, CMTPCONNECTION_SENDRESPONSEL, "Request/Response mismatch"); + User::Leave(KErrArgument); } if (session.TransactionPhase() == ERequestPhase) @@ -252,7 +259,7 @@ iTransportConnection->SendResponseL(aResponse, aRequest); } - __FLOG(_L8("SendResponseL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_SENDRESPONSEL_EXIT ); } /** @@ -267,7 +274,7 @@ */ EXPORT_C void CMTPConnection::SessionClosedL(TUint32 aMTPId) { - __FLOG(_L8("SessionClosedL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_SESSIONCLOSEDL_ENTRY ); if(0x0FFFFFFF != aMTPId) { TInt idx(iSessions.FindInOrder(aMTPId, SessionOrder)); @@ -288,7 +295,7 @@ session = NULL; } } - __FLOG(_L8("SessionClosedL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_SESSIONCLOSEDL_EXIT ); } /** @@ -311,11 +318,12 @@ */ EXPORT_C void CMTPConnection::SessionOpenedL(TUint32 aMTPId) { - __FLOG(_L8("SessionOpenedL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_SESSIONOPENEDL_ENTRY ); // Validate the SessionID if (SessionWithMTPIdExists(aMTPId)) { - User::Leave(KErrAlreadyExists); + OstTrace1(TRACE_ERROR, CMTPCONNECTION_SESSIONOPENEDL, "session %d alreay exist", aMTPId); + User::Leave(KErrAlreadyExists); } // Create a new session object @@ -332,7 +340,7 @@ TMTPNotificationParamsSessionChange params = {aMTPId, *this}; iSingletons.DpController().NotifyDataProvidersL(EMTPSessionOpened, ¶ms); } - __FLOG(_L8("SessionOpenedL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_SESSIONOPENEDL_EXIT ); } /* @@ -344,7 +352,7 @@ */ TBool CMTPConnection::ConnectionSuspended() { - __FLOG(_L8("ConnectionSuspended - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_CONNECTIONSUSPENDED_ENTRY ); TBool ret = EFalse; TUint currentState = State(); @@ -360,13 +368,13 @@ PublishConnState(EDisconnectedFromHost); } - __FLOG(_L8("ConnectionSuspended - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_CONNECTIONSUSPENDED_EXIT ); return ret; } void CMTPConnection::CompleteCloseConnection() { - __FLOG(_L8("CompleteCloseConnection - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_COMPLETECLOSECONNECTION_ENTRY ); CloseAllSessions(); iSessions.Reset(); @@ -375,7 +383,7 @@ iSingletons.ConnectionMgr().ConnectionCloseComplete(iConnectionId); iSingletons.Close(); - __FLOG(_L8("CompleteCloseConnection - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_COMPLETECLOSECONNECTION_EXIT ); } /* @@ -386,7 +394,7 @@ */ void CMTPConnection::ConnectionResumedL(MMTPTransportConnection& aTransportConnection) { - __FLOG(_L8("ConnectionResumed - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_CONNECTIONRESUMEDL_ENTRY ); TUint currentState = State(); if (currentState != EStateOpen && currentState != EStateErrorRecovery) @@ -409,7 +417,7 @@ } - __FLOG(_L8("ConnectionResumed - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_CONNECTIONRESUMEDL_EXIT ); } /** @@ -422,7 +430,8 @@ */ void CMTPConnection::TransactionCompleteL(const TMTPTypeRequest& aRequest) { - __FLOG(_L8("TransactionCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_TRANSACTIONCOMPLETEL_ENTRY ); + const TUint KValidPhases(ECompletingPhase); CMTPSession& session(SessionL(aRequest, TMTPTypeRequest::ERequestSessionID)); @@ -440,7 +449,8 @@ CompleteCloseConnection(); } } - __FLOG(_L8("TransactionCompleteL - Exit")); + + OstTraceFunctionExit0( CMTPCONNECTION_TRANSACTIONCOMPLETEL_EXIT ); } TUint CMTPConnection::ConnectionId() const @@ -461,7 +471,8 @@ MMTPSession& CMTPConnection::SessionWithMTPIdL(TUint32 aMTPId) const { TInt idx(iSessions.FindInOrder(aMTPId, SessionOrder)); - User::LeaveIfError(idx); + LEAVEIFERROR(idx, + OstTrace1(TRACE_ERROR, CMTPCONNECTION_SESSIONWITHMTPIDL, "can't find according to session_id %d", aMTPId)); return *iSessions[idx]; } @@ -477,7 +488,8 @@ void CMTPConnection::ReceivedEventL(const TMTPTypeEvent& aEvent) { - __FLOG(_L8("ReceivedEventL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_RECEIVEDEVENTL_ENTRY ); + TInt idx(KErrNotFound); // Validate the SessionID. @@ -485,7 +497,8 @@ if (sessionId != KMTPSessionAll) { idx = iSessions.FindInOrder(sessionId, SessionOrder); - User::LeaveIfError(idx); + LEAVEIFERROR(idx, + OstTrace1(TRACE_ERROR, CMTPCONNECTION_RECEIVEDEVENTL, "can't find according to session_id %d", sessionId)); } // Check that this event is valid. @@ -501,15 +514,14 @@ } else { - if (request.Uint32(TMTPTypeRequest::ERequestTransactionID) > - aEvent.Uint32(TMTPTypeEvent::EEventTransactionID) ) + TUint32 requestTransactionId = request.Uint32(TMTPTypeRequest::ERequestTransactionID); + TUint32 eventTransactionId = aEvent.Uint32(TMTPTypeEvent::EEventTransactionID); + if (eventTransactionId > requestTransactionId) { // Event to be queued for future use, we can only queue one event at a time session.StorePendingEventL(aEvent); } - - if (request.Uint32(TMTPTypeRequest::ERequestTransactionID) == - aEvent.Uint32(TMTPTypeEvent::EEventTransactionID) ) + else if (eventTransactionId == requestTransactionId) { // Event is valid // Perform transport layer processing. @@ -529,16 +541,21 @@ } } - // Forward the event to the DP framework layer. + // Forward the event to the DP framework layer. iSingletons.Router().ProcessEventL(aEvent, *this); } + + //discard the event if the event transaction id < requestion transaction id + } - __FLOG(_L8("ReceivedEventL - Exit")); + + OstTraceFunctionExit0( CMTPCONNECTION_RECEIVEDEVENTL_EXIT ); } void CMTPConnection::ReceivedRequestL(const TMTPTypeRequest& aRequest) { - __FLOG(_L8("ReceivedRequestL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_RECEIVEDREQUESTL_ENTRY ); + #ifdef MTP_CAPTURE_TEST_DATA // Running under debug capture mode save this request off to disk. iRequestLogger->LogRequestL(aRequest); @@ -574,11 +591,12 @@ if(err!=KErrNone) { session.SetTransactionPhase(EIdlePhase); + OstTrace1(TRACE_ERROR, CMTPCONNECTION_RECEIVEDREQUESTL, "router process request error! error code %d", err); User::Leave(err); } } } - __FLOG(_L8("ReceivedRequestL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_RECEIVEDREQUESTL_EXIT ); } #ifdef MTP_CAPTURE_TEST_DATA @@ -587,7 +605,8 @@ void CMTPConnection::ReceiveDataCompleteL(TInt aErr, const MMTPType& aData, const TMTPTypeRequest& aRequest) #endif { - __FLOG(_L8("ReceiveDataCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_RECEIVEDATACOMPLETEL_ENTRY ); + CMTPSession& session(SessionL(aRequest, TMTPTypeRequest::ERequestSessionID)); __ASSERT_DEBUG((session.TransactionPhase() == EDataIToRPhase), Panic(EMTPPanicInvalidState)); @@ -604,13 +623,12 @@ session.SetTransactionPhase(EResponsePhase); iDataReceiveResult = aErr; session.CompletePendingRequest(aErr); - - __FLOG(_L8("ReceiveDataCompleteL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_RECEIVEDATACOMPLETEL_EXIT ); } void CMTPConnection::SendDataCompleteL(TInt aErr, const MMTPType& aData, const TMTPTypeRequest& aRequest) { - __FLOG(_L8("SendDataCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_SENDDATACOMPLETEL_ENTRY ); CMTPSession& session(SessionL(aRequest, TMTPTypeRequest::ERequestSessionID)); __ASSERT_DEBUG((session.TransactionPhase() == EDataRToIPhase), Panic(EMTPPanicInvalidState)); @@ -625,12 +643,12 @@ session.CompletePendingRequest(aErr); - __FLOG(_L8("SendDataCompleteL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_SENDDATACOMPLETEL_EXIT ); } void CMTPConnection::SendEventCompleteL(TInt aErr, const TMTPTypeEvent& aEvent) { - __FLOG(_L8("SendEventCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_SENDEVENTCOMPLETEL_ENTRY ); if (aErr != KErrNone) @@ -662,7 +680,7 @@ if (NULL != iTransportConnection) { // Forward the event to the transport connection layer. - __FLOG(_L8("Sending queued event")); + OstTrace0( TRACE_NORMAL, CMTPCONNECTION_SENDEVENTCOMPLETEL, "Sending queued event"); iTransportConnection->SendEventL(iEventQ.First()->iEvent); } else @@ -671,12 +689,13 @@ } } - __FLOG(_L8("SendEventCompleteL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_SENDEVENTCOMPLETEL_EXIT ); } void CMTPConnection::SendResponseCompleteL(TInt aErr, const TMTPTypeResponse& /*aResponse*/, const TMTPTypeRequest& aRequest) { - __FLOG(_L8("SendResponseCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_SENDRESPONSECOMPLETEL_ENTRY ); + if(iState == EStateErrorRecovery) { MTPErrorRecoveryComplete(); @@ -688,7 +707,7 @@ session.SetTransactionPhase(ECompletingPhase); session.CompletePendingRequest(aErr); } - __FLOG(_L8("SendResponseCompleteL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_SENDRESPONSECOMPLETEL_EXIT ); } void CMTPConnection::Unbind(MMTPTransportConnection& /*aConnection*/) @@ -700,7 +719,8 @@ TMTPTransactionPhase CMTPConnection::TransactionPhaseL(TUint32 aMTPId) const { TInt idx(iSessions.FindInOrder(aMTPId, SessionOrder)); - User::LeaveIfError(idx); + LEAVEIFERROR(idx, + OstTrace1(TRACE_ERROR, CMTPCONNECTION_TRANSACTIONPHASEL, "can't find according to session_id %d", aMTPId)); return iSessions[idx]->TransactionPhase(); } @@ -721,8 +741,7 @@ */ void CMTPConnection::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_CONSTRUCTL_ENTRY ); //define the property for publishing connection state. DefineConnStatePropertyL(); PublishConnState(EDisconnectedFromHost); @@ -730,7 +749,7 @@ // Running under debug capture mode save this request off to disk. iRequestLogger = CMTPRequestLogger::NewL(); #endif - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_CONSTRUCTL_EXIT ); } /** @@ -750,7 +769,7 @@ */ void CMTPConnection::InitiateMTPErrorRecoveryL(const TMTPTypeRequest& aRequest, TUint16 aResponseCode) { - __FLOG(_L8("InitiateMTPErrorRecoveryL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_INITIATEMTPERRORRECOVERYL_ENTRY ); // Populate error response. iResponse.Reset(); iResponse.SetUint16(TMTPTypeResponse::EResponseCode, aResponseCode); @@ -760,7 +779,7 @@ // Set the connection state pending completion, and send the response. SetState(EStateErrorRecovery); iTransportConnection->SendResponseL(iResponse, aRequest); - __FLOG(_L8("InitiateMTPErrorRecoveryL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_INITIATEMTPERRORRECOVERYL_EXIT ); } /** @@ -769,10 +788,10 @@ */ void CMTPConnection::MTPErrorRecoveryComplete() { - __FLOG(_L8("MTPErrorRecoveryComplete - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_MTPERRORRECOVERYCOMPLETE_ENTRY ); SetState(EStateOpen); PublishConnState(EConnectedToHost); - __FLOG(_L8("MTPErrorRecoveryComplete - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_MTPERRORRECOVERYCOMPLETE_EXIT ); } /** @@ -783,11 +802,11 @@ */ void CMTPConnection::UnrecoverableMTPError() { - __FLOG(_L8("UnrecoverableMTPError - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_UNRECOVERABLEMTPERROR_ENTRY ); SetState(EStateErrorShutdown); PublishConnState(EDisconnectedFromHost); iTransportConnection->CloseConnection(); - __FLOG(_L8("UnrecoverableMTPError - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_UNRECOVERABLEMTPERROR_EXIT ); } /** @@ -798,7 +817,7 @@ */ void CMTPConnection::InitiateTransactionCancelL(TInt aIdx) { - __FLOG(_L8("InitiateTransactionCancelL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_INITIATETRANSACTIONCANCELL_ENTRY ); // Initiate transport connection level termination of the active data phase. CMTPSession& session(*iSessions[aIdx]); @@ -818,7 +837,7 @@ iTransportConnection->SendDataCancelL(session.ActiveRequestL()); break; } - __FLOG(_L8("InitiateTransactionCancelL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_INITIATETRANSACTIONCANCELL_EXIT ); } /** @@ -826,7 +845,7 @@ */ TUint CMTPConnection::ActiveSessions() const { - __FLOG(_L8("ActiveSessions - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_ACTIVESESSIONS_ENTRY ); TUint active(0); const TUint count(iSessions.Count()); for (TUint i(0); (i < count); i++) @@ -836,8 +855,8 @@ active++; } } - __FLOG_VA((_L8("Active sessions = %d"), active)); - __FLOG(_L8("ActiveSessions - Exit")); + OstTrace1( TRACE_NORMAL, CMTPCONNECTION_ACTIVESESSIONS, "Active sessions = %d", active ); + OstTraceFunctionExit0( CMTPCONNECTION_ACTIVESESSIONS_EXIT ); return active; } @@ -846,16 +865,16 @@ */ void CMTPConnection::CloseAllSessions() { - __FLOG(_L8("CloseAllSessions - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_CLOSEALLSESSIONS_ENTRY ); TInt count = iSessions.Count(); - __FLOG_VA((_L8("Sessions number to be closed = %d"), count)); + OstTrace1( TRACE_NORMAL, CMTPCONNECTION_CLOSEALLSESSIONS, "Sessions number to be closed = %d", count ); for (TInt i(count - 1); i>=0; i--) { CloseSession(i); } - __FLOG(_L8("CloseAllSessions - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_CLOSEALLSESSIONS_EXIT ); } /** @@ -864,9 +883,9 @@ */ void CMTPConnection::CloseSession(TUint aIdx) { - __FLOG(_L8("CloseSession - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_CLOSESESSION_ENTRY ); - __FLOG_VA((_L8("Session index to be closed = %d"), aIdx)); + OstTrace1(TRACE_NORMAL, CMTPCONNECTION_CLOSESESSION, "Session index to be closed = %d", aIdx); CMTPSession* session(iSessions[aIdx]); TUint id(session->SessionMTPId()); @@ -885,7 +904,7 @@ iSessions.Remove(aIdx); delete session; - __FLOG(_L8("CloseSession - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_CLOSESESSION_EXIT ); } /** @@ -938,9 +957,9 @@ */ EXPORT_C TInt CMTPConnection::GetDataReceiveResult() const { - __FLOG(_L8("GetDataReceiveResult - Entry")); - __FLOG_VA((_L8("Data receive result = %d"), iDataReceiveResult)); - __FLOG(_L8("GetDataReceiveResult - Exit")); + OstTraceFunctionEntry0( CMTPCONNECTION_GETDATARECEIVERESULT_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPCONNECTION_GETDATARECEIVERESULT, "Data receive result = %d", iDataReceiveResult); + OstTraceFunctionExit0( CMTPCONNECTION_GETDATARECEIVERESULT_EXIT ); return iDataReceiveResult; } @@ -950,10 +969,10 @@ */ void CMTPConnection::SetState(TUint aState) { - __FLOG(_L8("SetState - Entry")); - __FLOG_VA((_L8("Setting state = %d"), aState)); + OstTraceFunctionEntry0( CMTPCONNECTION_SETSTATE_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPCONNECTION_SETSTATE, "CMTPConnection::SetState;aState=%d", aState ); iState = aState; - __FLOG(_L8("SetState - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_SETSTATE_EXIT ); } @@ -963,9 +982,9 @@ */ TUint CMTPConnection::State() const { - __FLOG(_L8("State - Entry")); - __FLOG_VA((_L8("State = %d"), iState)); - __FLOG(_L8("State - Exit")); + OstTraceFunctionEntry0( CMTPCONNECTION_STATE_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPCONNECTION_STATE, "State = %d", iState); + OstTraceFunctionExit0( CMTPCONNECTION_STATE_EXIT ); return iState; } @@ -986,7 +1005,7 @@ */ TBool CMTPConnection::ValidFrameworkRequest(CMTPSession* aSession, TUint aValidPhases, TRequestStatus* aStatus) { - __FLOG(_L8("ValidFrameworkRequest - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_VALIDFRAMEWORKREQUEST_ENTRY ); __ASSERT_ALWAYS((!aSession || (aSession->TransactionPhase() & aValidPhases)), Panic(EMTPPanicInvalidState)); __ASSERT_ALWAYS((!aStatus || (!aSession->RequestPending())), Panic(EMTPPanicBusy)); @@ -1022,13 +1041,13 @@ break; } - __FLOG(_L8("ValidFrameworkRequest - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_VALIDFRAMEWORKREQUEST_EXIT ); return ret; } void CMTPConnection::RemoveEventsForSession(TUint32 aMTPId) { - __FLOG(_L8("RemoveEventsForSession - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_REMOVEEVENTSFORSESSION_ENTRY ); TSglQueIter iter(iEventQ); iter.SetToFirst(); @@ -1042,7 +1061,7 @@ } } - __FLOG(_L8("RemoveEventsForSession - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_REMOVEEVENTSFORSESSION_EXIT ); } void CMTPConnection::DequeueAllEvents() @@ -1082,8 +1101,7 @@ */ void CMTPConnection::DefineConnStatePropertyL() { - - __FLOG(_L8("DefineConnStatePropertyL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTION_DEFINECONNSTATEPROPERTYL_ENTRY ); RProcess process; TUid tSid = process.SecureId(); //Property can read by anyone who subscribe for it. @@ -1093,22 +1111,25 @@ TInt error = RProperty::Define(tSid, EMTPConnStateKey, RProperty::EInt, KAllowReadAll, KAllowReadAll); if (KErrAlreadyExists != error) { - User::LeaveIfError(error); + LEAVEIFERROR(error, OstTrace1(TRACE_ERROR, CMTPCONNECTION_DEFINECONNSTATEPROPERTYL, "property define error! error code %d", error)); } - User::LeaveIfError(iProperty.Attach(tSid, EMTPConnStateKey, EOwnerThread)); - __FLOG(_L8("DefineConnStatePropertyL - Exit")); + LEAVEIFERROR(iProperty.Attach(tSid, EMTPConnStateKey, EOwnerThread), + OstTrace0(TRACE_ERROR, DUP1_CMTPCONNECTION_DEFINECONNSTATEPROPERTYL, "property attach error")); + OstTraceFunctionExit0( CMTPCONNECTION_DEFINECONNSTATEPROPERTYL_EXIT ); } /** * This method is to publish various connection state. */ void CMTPConnection::PublishConnState(TMTPConnStateType aConnState) - { - __FLOG_VA((_L8("PublishConnState - Entry \n publishing state = %d"), (TInt)aConnState)); + { + OstTraceFunctionEntry0( CMTPCONNECTION_PUBLISHCONNSTATE_ENTRY); + OstTrace1( TRACE_NORMAL, CMTPCONNECTION_PUBLISHCONNSTATE, "publishing state = %d", (TInt)aConnState ); + RProcess process; TInt error = iProperty.Set(process.SecureId(), EMTPConnStateKey, (TInt)aConnState); __ASSERT_DEBUG((error == KErrNone), Panic(EMTPPanicPublishEvent));; - __FLOG(_L8("PublishConnState - Exit")); + OstTraceFunctionExit0( CMTPCONNECTION_PUBLISHCONNSTATE_EXIT); } /** @@ -1117,8 +1138,9 @@ */ void CMTPConnection::ValidateAndPublishConnState(CMTPSession& aSession, TInt aState) { - __FLOG_VA((_L8("ValidateAndPublishConnState - Entry \n publishing state = %d"), aState)); - + OstTraceFunctionEntry0(CMTPCONNECTION_VALIDATEANDPUBLISHCONNSTATE_ENTRY); + OstTrace1( TRACE_NORMAL, CMTPCONNECTION_VALIDATEANDPUBLISHCONNSTATE, "publishing state = %d", aState ); + TMTPConnStateType conState = EConnectedToHost; switch((TStates)aState) { @@ -1158,7 +1180,7 @@ break; } PublishConnState(conState); - __FLOG(_L8("ValidateAndPublishConnStateL - Exit")); + OstTraceFunctionExit0(CMTPCONNECTION_VALIDATEANDPUBLISHCONNSTATE_EXIT); } void CMTPConnection::DisconnectionNotifyL() diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpconnectionmgr.cpp --- a/mtpfws/mtpfw/src/cmtpconnectionmgr.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpconnectionmgr.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -18,9 +18,14 @@ #include "cmtpconnection.h" #include "cmtptransportplugin.h" #include "mmtptransportconnection.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpconnectionmgrTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"ConnectionMgr");) const TUint KMTPUsbTransportUid = 0x102827B2; const TUint KMTPBTTransportUid = 0x10286FCB; @@ -44,7 +49,6 @@ iConnections.ResetAndDestroy(); iSuspendedTransports.Close(); delete iTransportTrigger; - __FLOG_CLOSE; } /** @@ -56,14 +60,15 @@ */ EXPORT_C CMTPConnection& CMTPConnectionMgr::ConnectionL(TUint aConnectionId) const { - __FLOG(_L8("ConnectionL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTIONMGR_CONNECTIONL_ENTRY ); + TInt idx(ConnectionFind(aConnectionId)); - __FLOG_VA((_L8("idx is %d "), idx)); + OstTrace1( TRACE_NORMAL, CMTPCONNECTIONMGR_CONNECTIONL, "idx is %d", idx ); __ASSERT_ALWAYS((idx != KErrNotFound), User::Invariant()); - __FLOG(_L8("ConnectionL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTIONMGR_CONNECTIONL_EXIT ); return *iConnections[idx]; } @@ -97,7 +102,8 @@ void CMTPConnectionMgr::ConnectionCloseComplete(const TUint& /*aConnUid*/) { - __FLOG(_L8("ConnectionCloseComplete - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTIONMGR_CONNECTIONCLOSECOMPLETE_ENTRY ); + if (iTransportUid.iUid != KMTPUsbTransportUid ) { ResumeSuspendedTransport(); @@ -107,17 +113,17 @@ iResumeCalled = ETrue; } - __FLOG(_L8("ConnectionCloseComplete - exit")); + OstTraceFunctionExit0( CMTPCONNECTIONMGR_CONNECTIONCLOSECOMPLETE_EXIT ); } EXPORT_C void CMTPConnectionMgr::StartTransportL(TUid aTransport) { - __FLOG(_L8("StartTransportL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_ENTRY ); //When USB plug out, BT will start Master mode to reconnect remote device. Else BT will start slave mode to listen connection. if(aTransport.iUid == KMTPBTTransportUid && iRemoteDevice.iDeviceAddr != 0 && aTransport != iTransportUid) { - __FLOG(_L8("StartTransportL with parameter!")); + OstTrace0( TRACE_NORMAL, CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT, "StartTransportL with parameter!" ); TMTPBTRemoteDeviceBuf tmpdata(iRemoteDevice); StartTransportL( aTransport, &tmpdata ); iRemoteDevice.iDeviceAddr = 0; @@ -125,10 +131,10 @@ } else { - __FLOG(_L8("StartTransportL without parameter!")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT, "StartTransportL without parameter!" ); StartTransportL( aTransport, NULL ); } - __FLOG(_L8("StartTransportL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_EXIT ); } /** @@ -143,20 +149,22 @@ */ EXPORT_C void CMTPConnectionMgr::StartTransportL(TUid aTransport, const TAny* aParameter) { - __FLOG(_L8("StartTransportL - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER_ENTRY ); if (iTransport) { - __FLOG(_L8("The transport is not none.")); + OstTrace0( TRACE_NORMAL, CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER, "The transport is not none." ); + + if (aTransport != iTransportUid) { // Multiple transports not currently supported. - __FLOG(_L8("Multiple transports are not supported now!")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER, "Multiple transports are not supported now!" ); User::Leave(KErrNotSupported); } else { - __FLOG_1(_L8("Relaunch the transport 0x%X"), iTransportUid.iUid); + OstTrace1( TRACE_NORMAL, DUP2_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER, "Relaunch the transport 0x%X", iTransportUid.iUid); if(aTransport.iUid == KMTPBTTransportUid) { iTransport->Stop(*this); @@ -167,7 +175,8 @@ TRAPD(err, iTransport->StartL(*this)); if (err != KErrNone) { - __FLOG_VA( ( _L8("StartTransportL error, error code = %d"), err) ); + OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, DUP3_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER, + "StartTransportL error, error code = %d", err); delete iTransport; iTransport = NULL; @@ -182,13 +191,13 @@ } else { - __FLOG(_L8("begin start transport.")); + OstTrace0( TRACE_NORMAL, DUP4_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER, "begin start transport." ); iTransport = CMTPTransportPlugin::NewL(aTransport, aParameter); TRAPD(err, iTransport->StartL(*this)); if (err != KErrNone) { - __FLOG_VA( ( _L8("StartTransportL error, error code = %d"), err) ); + OstTrace1( TRACE_NORMAL, DUP5_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER, "StartTransportL error, error code = %d", err); delete iTransport; iTransport = NULL; User::Leave(err); @@ -207,8 +216,8 @@ SuspendTransportL( iTransportUid); } } - - __FLOG(_L8("StartTransportL - Exit")); + + OstTraceFunctionExit0( CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER_EXIT ); } /** @@ -219,10 +228,12 @@ */ EXPORT_C void CMTPConnectionMgr::QueueTransportL( TUid aTransport, const TAny* /*aParameter*/ ) { - __FLOG_VA( ( _L8("+QueueTransportL( 0x%08X )"), aTransport.iUid ) ); + OstTraceFunctionEntry0(CMTPCONNECTIONMGR_QUEUETRANSPORTL_ENTRY); + OstTrace1( TRACE_NORMAL, CMTPCONNECTIONMGR_QUEUETRANSPORTL, "QueueTransportL( 0x%08X )", aTransport.iUid); + __ASSERT_DEBUG( ( KErrNotFound == iSuspendedTransports.Find( aTransport ) ), User::Invariant() ); iSuspendedTransports.InsertL( aTransport, 0 ); - __FLOG( _L8("-QueueTransportL") ); + OstTraceFunctionExit0(CMTPCONNECTIONMGR_QUEUETRANSPORTL_EXIT); } EXPORT_C void CMTPConnectionMgr::SetClientSId(TUid aSecureId) @@ -248,12 +259,9 @@ */ EXPORT_C void CMTPConnectionMgr::StopTransport( TUid aTransport, TBool aByBearer ) { - __FLOG(_L8("StopTransport - Entry")); - + OstTraceFunctionEntry0( CMTPCONNECTIONMGR_STOPTRANSPORT_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPCONNECTIONMGR_STOPTRANSPORT, "aTransport is 0x%X", aTransport.iUid); - __FLOG_1(_L8("aTransport is 0x%X"), aTransport.iUid); - __FLOG_1(_L8("iTransportUid is 0x%X"), iTransportUid.iUid); - TInt transportId = iTransportUid.iUid; if ( aByBearer ) @@ -281,7 +289,7 @@ } - __FLOG(_L8("StopTransport - Exit")); + OstTraceFunctionExit0( CMTPCONNECTIONMGR_STOPTRANSPORT_EXIT ); } /** @@ -328,22 +336,22 @@ TBool CMTPConnectionMgr::ConnectionClosed(MMTPTransportConnection& aTransportConnection) { - __FLOG(_L8("ConnectionClosed - Entry")); + OstTraceFunctionEntry0( CMTPCONNECTIONMGR_CONNECTIONCLOSED_ENTRY ); TInt idx(ConnectionFind(aTransportConnection.BoundProtocolLayer().ConnectionId())); - __FLOG_VA((_L8("idx is %d "), idx)); + OstTrace1( TRACE_NORMAL, CMTPCONNECTIONMGR_CONNECTIONCLOSED, "idx is %d", idx ); __ASSERT_DEBUG((idx != KErrNotFound), User::Invariant()); CMTPConnection* connection(iConnections[idx]); - __FLOG(_L8("ConnectionClosed - Exit")); + OstTraceFunctionExit0( CMTPCONNECTIONMGR_CONNECTIONCLOSED_EXIT); return connection->ConnectionSuspended(); } void CMTPConnectionMgr::ConnectionOpenedL(MMTPTransportConnection& aTransportConnection) { - __FLOG(_L8("ConnectionOpenedL - Entry")); - + OstTraceFunctionEntry0( CMTPCONNECTIONMGR_CONNECTIONOPENEDL_ENTRY ); + TUint impUid = aTransportConnection.GetImplementationUid(); TInt idx = ConnectionFind(impUid); CMTPConnection* connection = NULL; @@ -361,7 +369,7 @@ } connection->ConnectionResumedL(aTransportConnection); - __FLOG(_L8("ConnectionOpenedL - Exit")); + OstTraceFunctionExit0( CMTPCONNECTIONMGR_CONNECTIONOPENEDL_EXIT ); } EXPORT_C TUid CMTPConnectionMgr::ClientSId() @@ -376,7 +384,6 @@ iShutdownConnectionIdx(KErrNotFound), iTransportUid(KNullUid) { - __FLOG_OPEN(KMTPSubsystem, KComponent); iRemoteDevice.iDeviceAddr = 0; iRemoteDevice.iDeviceServicePort = 0; iResumeCalled = EFalse; @@ -391,7 +398,9 @@ */ TInt CMTPConnectionMgr::ConnectionFind(TUint aConnectionId) const { - __FLOG_VA((_L8("ConnectionFind - Entry with connectionId %d "), aConnectionId)); + OstTraceFunctionEntry0( CMTPCONNECTIONMGR_CONNECTIONFIND_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPCONNECTIONMGR_CONNECTIONFIND, "connectionId %d", aConnectionId); + TInt ret(KErrNotFound); const TUint noConnections = iConnections.Count(); @@ -404,7 +413,7 @@ break; } } - __FLOG(_L8("ConnectionFind - Exit")); + OstTraceFunctionExit0( CMTPCONNECTIONMGR_CONNECTIONFIND_EXIT ); return ret; } @@ -427,12 +436,15 @@ */ void CMTPConnectionMgr::SuspendTransportL( TUid aTransport ) { - __FLOG_1( _L8("+SuspendTransportL( 0x%08X )"), aTransport ); + OstTraceFunctionEntry0( CMTPCONNECTIONMGR_SUSPENDTRANSPORTL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPCONNECTIONMGR_SUSPENDTRANSPORTL, "SuspendTransportL( 0x%08X )", aTransport.iUid ); + + if ( KErrNotFound == iSuspendedTransports.Find( aTransport ) ) { iSuspendedTransports.AppendL( aTransport ); } - __FLOG( _L8("-SuspendTransportL") ); + OstTraceFunctionExit0( CMTPCONNECTIONMGR_SUSPENDTRANSPORTL_EXIT ); } /** @@ -441,14 +453,17 @@ */ void CMTPConnectionMgr::UnsuspendTransport( TUid aTransport ) { - __FLOG_1( _L8("+UnsuspendTransport( 0x%08X )"), aTransport.iUid ); + OstTraceFunctionEntry0( CMTPCONNECTIONMGR_UNSUSPENDTRANSPORT_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPCONNECTIONMGR_UNSUSPENDTRANSPORT, "Transport uid is 0x%08X;", aTransport.iUid ); + + TInt idx = iSuspendedTransports.Find( aTransport ); if ( KErrNotFound != idx ) { - __FLOG_1( _L8("Remove the number %d suspended transport"), idx ); + OstTrace1( TRACE_NORMAL, DUP1_CMTPCONNECTIONMGR_UNSUSPENDTRANSPORT, "Remove the number %d suspended transport", idx ); iSuspendedTransports.Remove( idx ); } - __FLOG( _L8("-UnsuspendTransport") ); + OstTraceFunctionExit0( CMTPCONNECTIONMGR_UNSUSPENDTRANSPORT_EXIT ); } /** @@ -456,16 +471,16 @@ */ void CMTPConnectionMgr::ResumeSuspendedTransport() { - __FLOG( _L8("+ResumeSuspendedTransport") ); + OstTraceFunctionEntry0( CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT_ENTRY ); const TInt count = iSuspendedTransports.Count(); - __FLOG_1(_L8("The count number is %d"), count); - __FLOG_1(_L8("The transportport id is 0x%X"), iTransportUid.iUid); + OstTrace1(TRACE_NORMAL, CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT, "The count number is %d", count); + OstTrace1(TRACE_NORMAL, DUP1_CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT, "The transportport id is 0x%X", iTransportUid.iUid); if ( ( count > 0 ) // If the transport was just switched and suspended, it shouldn't be resumed. && (( iTransportUid != iSuspendedTransports[count-1] ) || iTransportUid.iUid == KMTPBTTransportUid)) { - __FLOG( _L8("Found suspended transport(s).") ); + OstTrace0(TRACE_NORMAL, DUP2_CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT, "Found suspended transport(s)."); if ( !iTransportTrigger ) { iTransportTrigger = new( ELeave ) CAsyncCallBack( CActive::EPriorityStandard ); @@ -473,18 +488,18 @@ if ( !iTransportTrigger->IsActive()) { - __FLOG( _L8("Set call back function!") ); + OstTrace0(TRACE_NORMAL, DUP3_CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT, "Set call back function!"); TCallBack callback( CMTPConnectionMgr::DoResumeSuspendedTransport, this ); iTransportTrigger->Set( callback ); iTransportTrigger->CallBack(); } else { - __FLOG( _L8("Call back has been set!") ); + OstTrace0(TRACE_NORMAL, DUP4_CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT, "Call back has been set!"); } } - __FLOG( _L8("-ResumeSuspendedTransport") ); + OstTraceFunctionExit0( DUP1_CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT_EXIT ); } /** diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpdatacodegenerator.cpp --- a/mtpfws/mtpfw/src/cmtpdatacodegenerator.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpdatacodegenerator.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,11 +23,13 @@ #include "rmtpframework.h" #include "cmtpdatacodegenerator.h" #include "cmtpservicemgr.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdatacodegeneratorTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"DataCodeGenerator");) const TUint16 KUndenfinedStartCode = EMTPCodeUndefined1Start + 1; const TUint16 KUndenfinedEndCode = EMTPCodeUndefined1End; @@ -44,23 +46,20 @@ CMTPDataCodeGenerator::~CMTPDataCodeGenerator() { - __FLOG(_L8("CMTPDataCodeGenerator::~CMTPDataCodeGenerator - Entry")); + OstTraceFunctionEntry0( CMTPDATACODEGENERATOR_CMTPDATACODEGENERATOR_DES_ENTRY ); iSingletons.Close(); - __FLOG(_L8("CMTPDataCodeGenerator::~CMTPDataCodeGenerator - Exit")); - - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPDATACODEGENERATOR_CMTPDATACODEGENERATOR_DES_EXIT ); } void CMTPDataCodeGenerator::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPDataCodeGenerator::ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPDATACODEGENERATOR_CONSTRUCTL_ENTRY ); iSingletons.OpenL (); - __FLOG(_L8("CMTPDataCodeGenerator::ConstructL - Exit")); + OstTraceFunctionExit0( CMTPDATACODEGENERATOR_CONSTRUCTL_EXIT ); } CMTPDataCodeGenerator::CMTPDataCodeGenerator() : @@ -72,7 +71,8 @@ TInt CMTPDataCodeGenerator::IncServiceIDResource( const TUint aServiceType, TUint& aServiceID ) { - __FLOG(_L8("CMTPDataCodeGenerator::IncServiceIDResource - Entry")); + OstTraceFunctionEntry0( CMTPDATACODEGENERATOR_INCSERVICEIDRESOURCE_ENTRY); + if ( iUndefinedNextCode >= KUndenfinedEndCode ) return KErrOverflow; @@ -91,18 +91,19 @@ break; default: { - __FLOG(_L8("CMTPDataCodeGenerator::IncServiceIDResource - Service Type not supported")); + OstTrace0( TRACE_NORMAL, CMTPDATACODEGENERATOR_INCSERVICEIDRESOURCE, "CMTPDataCodeGenerator::IncServiceIDResource - Service Type not supported" ); } } - __FLOG(_L8("CMTPDataCodeGenerator::IncServiceIDResource - Exit")); + + OstTraceFunctionExit0( CMTPDATACODEGENERATOR_INCSERVICEIDRESOURCE_EXIT); return KErrNone; } void CMTPDataCodeGenerator::DecServiceIDResource() { - __FLOG(_L8("CMTPDataCodeGenerator::DecServiceIDResource - Entry")); + OstTraceFunctionEntry0( CMTPDATACODEGENERATOR_DECSERVICEIDRESOURCE_ENTRY ); iUndefinedNextCode--; - __FLOG(_L8("CMTPDataCodeGenerator::DecServiceIDResource - Exit")); + OstTraceFunctionExit0( CMTPDATACODEGENERATOR_DECSERVICEIDRESOURCE_EXIT ); } TBool CMTPDataCodeGenerator::IsValidServiceType( const TUint aServiceType ) const @@ -112,28 +113,38 @@ TInt CMTPDataCodeGenerator::AllocateServiceID(const TMTPTypeGuid& aPGUID, const TUint aServiceType, TUint& aServiceID ) { - __FLOG(_L8("CMTPDataCodeGenerator::AllocateServiceID - Entry")); + OstTraceFunctionEntry0( CMTPDATACODEGENERATOR_ALLOCATESERVICEID_ENTRY ); if( !IsValidServiceType(aServiceType) ) + { + OstTraceFunctionExit0( CMTPDATACODEGENERATOR_ALLOCATESERVICEID_EXIT ); return KErrArgument; - + } + TInt err(KErrNone); TUint retID (KInvliadServiceID); if( iSingletons.ServiceMgr().IsSupportedService(aPGUID) ) { if( iSingletons.ServiceMgr().ServiceTypeOfSupportedService(aPGUID) != aServiceType ) + { + OstTraceFunctionExit0( DUP1_CMTPDATACODEGENERATOR_ALLOCATESERVICEID_EXIT ); return KErrArgument; - + } + err = iSingletons.ServiceMgr().GetServiceId(aPGUID , retID); if( KErrNone != err ) { if((err = IncServiceIDResource( aServiceType, retID )) != KErrNone) + { + OstTraceFunctionExit0( DUP2_CMTPDATACODEGENERATOR_ALLOCATESERVICEID_EXIT ); return err; - + } + err = iSingletons.ServiceMgr().EnableService( aPGUID, retID ); if( KErrNone != err ) { DecServiceIDResource(); + OstTraceFunctionExit0( DUP3_CMTPDATACODEGENERATOR_ALLOCATESERVICEID_EXIT ); return err; } } @@ -142,31 +153,40 @@ else { if((err = IncServiceIDResource( aServiceType, retID )) != KErrNone) + { + OstTraceFunctionExit0( DUP4_CMTPDATACODEGENERATOR_ALLOCATESERVICEID_EXIT ); return err; + } } aServiceID = retID; iSingletons.ServiceMgr().InsertServiceId( retID ); - __FLOG(_L8("CMTPDataCodeGenerator::AllocateServiceID - Exit")); + OstTraceFunctionExit0( DUP5_CMTPDATACODEGENERATOR_ALLOCATESERVICEID_EXIT ); return KErrNone; } TInt CMTPDataCodeGenerator::AllocateServicePropertyCode( const TMTPTypeGuid& aServicePGUID, const TMTPTypeGuid& aPKNamespace, const TUint aPKID, TUint16& aServicePropertyCode ) { - __FLOG(_L8("CMTPDataCodeGenerator::AllocateServicePropertyCode - Entry")); + OstTraceFunctionEntry0( CMTPDATACODEGENERATOR_ALLOCATESERVICEPROPERTYCODE_ENTRY ); TUint retID = KInvliadU16DataCode; if( iSingletons.ServiceMgr().IsSupportedService(aServicePGUID) ) { TInt err = iSingletons.ServiceMgr().GetServicePropertyCode( aServicePGUID, aPKNamespace, aPKID, retID ); if( KErrNone != err ) + { + OstTraceFunctionExit0( CMTPDATACODEGENERATOR_ALLOCATESERVICEPROPERTYCODE_EXIT ); return err; - + } + if(retID == KInvliadU16DataCode) { if ( iUndefinedNextCode >= KUndenfinedEndCode ) + { + OstTraceFunctionExit0( DUP1_CMTPDATACODEGENERATOR_ALLOCATESERVICEPROPERTYCODE_EXIT ); return KErrOverflow; + } retID = ++iUndefinedNextCode; iSingletons.ServiceMgr().SetServicePropertyCode( aServicePGUID, aPKNamespace, aPKID, retID); @@ -175,32 +195,42 @@ else { if ( iUndefinedNextCode >= KUndenfinedEndCode ) + { + OstTraceFunctionExit0( DUP2_CMTPDATACODEGENERATOR_ALLOCATESERVICEPROPERTYCODE_EXIT ); return KErrOverflow; + } + retID = ++iUndefinedNextCode; } aServicePropertyCode = retID; - __FLOG(_L8("CMTPDataCodeGenerator::AllocateServicePropertyCode - Exit")); + OstTraceFunctionExit0( DUP3_CMTPDATACODEGENERATOR_ALLOCATESERVICEPROPERTYCODE_EXIT ); return KErrNone; } TInt CMTPDataCodeGenerator::AllocateServiceFormatCode( const TMTPTypeGuid& aServicePGUID, const TMTPTypeGuid& aGUID, TUint16& aServiceFormatCode ) { - __FLOG(_L8("CMTPServiceConfig::AllocateServiceFormatCode - Entry")); + OstTraceFunctionEntry0( CMTPDATACODEGENERATOR_ALLOCATESERVICEFORMATCODE_ENTRY ); TUint retID = KInvliadU16DataCode; if( iSingletons.ServiceMgr().IsSupportedService(aServicePGUID) ) { TInt err = iSingletons.ServiceMgr().GetServiceFormatCode( aServicePGUID, aGUID, retID ); if( KErrNone != err ) + { + OstTraceFunctionExit0( CMTPDATACODEGENERATOR_ALLOCATESERVICEFORMATCODE_EXIT ); return err; - + } + if(retID == KInvliadU16DataCode) { if ( iVendorExtFormatCode > EMTPFormatCodeVendorExtDynamicEnd ) + { + OstTraceFunctionExit0( DUP1_CMTPDATACODEGENERATOR_ALLOCATESERVICEFORMATCODE_EXIT ); return KErrOverflow; + } retID = ++iVendorExtFormatCode; iSingletons.ServiceMgr().SetServiceFormatCode( aServicePGUID, aGUID, retID); @@ -209,32 +239,42 @@ else { if ( iVendorExtFormatCode > EMTPFormatCodeVendorExtDynamicEnd ) + { + OstTraceFunctionExit0( DUP2_CMTPDATACODEGENERATOR_ALLOCATESERVICEFORMATCODE_EXIT ); return KErrOverflow; - + } + retID = ++iVendorExtFormatCode; } aServiceFormatCode = retID; - __FLOG(_L8("CMTPServiceConfig::AllocateServiceFormatCode - Exit")); + + OstTraceFunctionExit0( DUP3_CMTPDATACODEGENERATOR_ALLOCATESERVICEFORMATCODE_EXIT ); return KErrNone; } TInt CMTPDataCodeGenerator::AllocateServiceMethodFormatCode( const TMTPTypeGuid& aServicePGUID, const TMTPTypeGuid& aGUID, TUint16& aMethodFormatCode ) { - __FLOG(_L8("CMTPDataCodeGenerator::AllocateServiceMethodFormatCode - Entry")); + OstTraceFunctionEntry0( CMTPDATACODEGENERATOR_ALLOCATESERVICEMETHODFORMATCODE_ENTRY ); TUint retID = KInvliadU16DataCode; if( iSingletons.ServiceMgr().IsSupportedService(aServicePGUID) ) { TInt err = iSingletons.ServiceMgr().GetServiceMethodCode( aServicePGUID, aGUID, retID ); if( KErrNone != err ) + { + OstTraceFunctionExit0( CMTPDATACODEGENERATOR_ALLOCATESERVICEMETHODFORMATCODE_EXIT ); return err; - + } + if(retID == KInvliadU16DataCode) { if ( iUndefinedNextCode > KUndenfinedEndCode ) + { + OstTraceFunctionExit0( DUP1_CMTPDATACODEGENERATOR_ALLOCATESERVICEMETHODFORMATCODE_EXIT ); return KErrOverflow; + } retID = ++iUndefinedNextCode; iSingletons.ServiceMgr().SetServiceMethodCode( aServicePGUID, aGUID, retID); @@ -243,14 +283,17 @@ else { if ( iUndefinedNextCode > KUndenfinedEndCode ) + { + OstTraceFunctionExit0( DUP2_CMTPDATACODEGENERATOR_ALLOCATESERVICEMETHODFORMATCODE_EXIT ); return KErrOverflow; - + } + retID = ++iUndefinedNextCode; } aMethodFormatCode = retID; - __FLOG(_L8("CMTPDataCodeGenerator::AllocateServiceMethodFormatCode - Exit")); + OstTraceFunctionExit0( DUP3_CMTPDATACODEGENERATOR_ALLOCATESERVICEMETHODFORMATCODE_EXIT ); return KErrNone; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpdataprovider.cpp --- a/mtpfws/mtpfw/src/cmtpdataprovider.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpdataprovider.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -32,9 +32,13 @@ #include "rmtpframework.h" #include "cdummydp.h" #include "cmtpdatacodegenerator.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdataproviderTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"DataProvider");) + const TInt KWaitForEnumeration = 1000000 * 3; @@ -78,7 +82,10 @@ */ CMTPDataProvider::~CMTPDataProvider() { - __FLOG_VA((_L8("~CMTPDataProvider - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_CMTPDATAPROVIDER_DES_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_CMTPDATAPROVIDER_DES, + "data provider %d ", iId); + Cancel(); iSupported.ResetAndDestroy(); delete iImplementation; @@ -91,13 +98,16 @@ } iTimer.Close(); - __FLOG_VA((_L8("~CMTPDataProvider - Exit, data provider %d "), iId)); - __FLOG_CLOSE; + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_CMTPDATAPROVIDER_DES, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_CMTPDATAPROVIDER_EXIT ); } void CMTPDataProvider::ExecuteEventL(const TMTPTypeEvent& aEvent, MMTPConnection& aConnection) { - __FLOG_VA((_L8("ExecuteEventL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_EXECUTEEVENTL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_EXECUTEEVENTL, + "data provider %d ", iId); __ASSERT_DEBUG(iImplementation, User::Invariant()); if (iTimerActive && aEvent.Uint16(TMTPTypeEvent::EEventCode) == EMTPEventCodeCancelTransaction) @@ -108,12 +118,16 @@ // Pass this event notification directly to the plugin... // In reality we will only ever see one event canceltransaction. iImplementation->ProcessEventL(aEvent, aConnection); - __FLOG_VA((_L8("ExecuteEventL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_EXECUTEEVENTL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_EXECUTEEVENTL_EXIT ); } void CMTPDataProvider::ExecuteRequestL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG_VA((_L8("ExecuteRequestL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_EXECUTEREQUESTL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_EXECUTEREQUESTL, + "data provider %d ", iId); __ASSERT_DEBUG(iImplementation, User::Invariant()); iCurrentRequest = &aRequest; @@ -121,47 +135,61 @@ // Schedule data provider to process this request. Schedule(); - __FLOG_VA((_L8("ExecuteRequestL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_EXECUTEREQUESTL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_EXECUTEREQUESTL_EXIT ); } EXPORT_C void CMTPDataProvider::ExecuteProxyRequestL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection, MMTPTransactionProxy& aProxy) { - __FLOG_VA((_L8("ExecuteProxyRequestL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_EXECUTEPROXYREQUESTL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_EXECUTEPROXYREQUESTL, + "data provider %d ", iId); iProxy = &aProxy; iCurrentRequest = &aRequest; iCurrentConnection = static_cast(&aConnection); Schedule(); - __FLOG_VA((_L8("ExecuteProxyRequestL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_EXECUTEPROXYREQUESTL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_EXECUTEPROXYREQUESTL_EXIT ); } void CMTPDataProvider::ExecutePendingRequestL() { - __FLOG_VA((_L8("SchedulePendingRequestL - Entry"))); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_EXECUTEPENDINGREQUESTL_ENTRY ); if (iCurrentRequest != NULL && !IsActive()) { Schedule(); } - __FLOG_VA((_L8("SchedulePendingRequestL - Exit"))); + OstTraceFunctionExit0( CMTPDATAPROVIDER_EXECUTEPENDINGREQUESTL_EXIT ); } void CMTPDataProvider::EnumerateObjectsL(TUint32 aStorageId) { - __FLOG_VA((_L8("EnumerateObjectsL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_ENUMERATEOBJECTSL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_ENUMERATEOBJECTSL, + "data provider %d ", iId); iEnumerationState = ((iEnumerationState & ~EObjectsEnumerationState) | EObjectsEnumerating); TBool abnormaldown = EFalse; iSingletons.FrameworkConfig().GetValueL(CMTPFrameworkConfig::EAbnormalDown, abnormaldown); iImplementation->StartObjectEnumerationL(aStorageId, abnormaldown); - __FLOG_VA((_L8("EnumerateObjectsL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_ENUMERATEOBJECTSL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_ENUMERATEOBJECTSL_EXIT ); } void CMTPDataProvider::EnumerateStoragesL() { - __FLOG_VA((_L8("EnumerateStoragesL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_ENUMERATESTORAGESL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_ENUMERATESTORAGESL, + "data provider %d ", iId); iEnumerationState = ((iEnumerationState & ~EStoragesEnumerationState) | EStoragesEnumerating); iImplementation->StartStorageEnumerationL(); - __FLOG_VA((_L8("EnumerateStoragesL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_ENUMERATESTORAGESL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_ENUMERATESTORAGESL_EXIT ); } /** @@ -207,9 +235,13 @@ */ void CMTPDataProvider::SetDataProviderId(TUint aId) { - __FLOG_VA((_L8("~CMTPDataProvider - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_SETDATAPROVIDERID_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_SETDATAPROVIDERID, + "data provider %d ", iId); iId = aId; - __FLOG_VA((_L8("~CMTPDataProvider - Entry, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_SETDATAPROVIDERID, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_SETDATAPROVIDERID_EXIT ); } /** @@ -296,7 +328,9 @@ void CMTPDataProvider::ReceiveDataL(MMTPType& aData, const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG_VA((_L8("ReceiveDataL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_RECEIVEDATAL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_RECEIVEDATAL, + "data provider %d ", iId); __ASSERT_DEBUG(iImplementation, User::Invariant()); __ASSERT_DEBUG(!IsActive(), User::Invariant()); @@ -317,12 +351,16 @@ SetActive(); // Async call so wait for object to be activated... } - __FLOG_VA((_L8("ReceiveDataL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_RECEIVEDATAL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_RECEIVEDATAL_EXIT ); } void CMTPDataProvider::SendDataL(const MMTPType& aData, const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG_VA((_L8("SendDataL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_SENDDATAL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_SENDDATAL, + "data provider %d ", iId); __ASSERT_DEBUG(iImplementation, User::Invariant()); __ASSERT_DEBUG(!IsActive(), User::Invariant()); @@ -343,24 +381,33 @@ SetActive(); // Async call so wait for object to be activated... } - __FLOG_VA((_L8("SendDataL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_SENDDATAL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_SENDDATAL_EXIT ); } void CMTPDataProvider::SendEventL(const TMTPTypeEvent& aEvent, MMTPConnection& aConnection) { - __FLOG_VA((_L8("SendEventL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT_MMTPCONNECTION_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT_MMTPCONNECTION, + "data provider %d ", iId); __ASSERT_DEBUG(iImplementation, User::Invariant()); CMTPConnection& connection(iSingletons.ConnectionMgr().ConnectionL(aConnection.ConnectionId())); connection.SendEventL(aEvent); - __FLOG_VA((_L8("SendEventL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT_MMTPCONNECTION, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT_MMTPCONNECTION_EXIT ); } void CMTPDataProvider::SendEventL(const TMTPTypeEvent& aEvent) { - __FLOG_VA((_L8("SendEventL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT, + "data provider %d ", iId); if (aEvent.Uint32(TMTPTypeEvent::EEventSessionID) != KMTPSessionAll) { + OstTrace0( TRACE_ERROR, CMTPDATAPROVIDER_SENDEVENTL, "event session id not KMTPSessionALL!" ); User::Leave(KErrArgument); } @@ -370,12 +417,16 @@ { iSingletons.ConnectionMgr()[i].SendEventL(aEvent); } - __FLOG_VA((_L8("SendEventL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT_EXIT ); } void CMTPDataProvider::SendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG_VA((_L8("SendResponseL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_SENDRESPONSEL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_SENDRESPONSEL, + "data provider %d ", iId); __ASSERT_DEBUG(iImplementation, User::Invariant()); __ASSERT_DEBUG(!IsActive(), User::Invariant()); @@ -394,12 +445,16 @@ connection.SendResponseL(aResponse, aRequest, iStatus); SetActive(); } - __FLOG_VA((_L8("SendResponseL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_SENDRESPONSEL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_SENDRESPONSEL_EXIT ); } void CMTPDataProvider::TransactionCompleteL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG_VA((_L8("TransactionCompleteL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_TRANSACTIONCOMPLETEL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_TRANSACTIONCOMPLETEL, + "data provider %d ", iId); __ASSERT_DEBUG(iImplementation, User::Invariant()); if (iProxy) @@ -420,42 +475,58 @@ iCurrentRequest = NULL; iCurrentConnection = NULL; - __FLOG_VA((_L8("TransactionCompleteL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_TRANSACTIONCOMPLETEL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_TRANSACTIONCOMPLETEL_EXIT ); } void CMTPDataProvider::RouteRequestRegisterL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG_VA((_L8("RouteRequestRegisterL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_ROUTEREQUESTREGISTERL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_ROUTEREQUESTREGISTERL, + "data provider %d ", iId); iSingletons.Router().RouteRequestRegisterL(aRequest, aConnection, iId); - __FLOG_VA((_L8("RouteRequestRegisterL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_ROUTEREQUESTREGISTERL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_ROUTEREQUESTREGISTERL_EXIT ); } void CMTPDataProvider::RouteRequestUnregisterL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG_VA((_L8("RouteRequestUnregister - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_ROUTEREQUESTUNREGISTERL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_ROUTEREQUESTUNREGISTERL, + "data provider %d ", iId); iSingletons.Router().RouteRequestUnregisterL(aRequest, aConnection); - __FLOG_VA((_L8("RouteRequestUnregister - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_ROUTEREQUESTUNREGISTERL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_ROUTEREQUESTUNREGISTERL_EXIT ); } -#ifdef __FLOG_ACTIVE + void CMTPDataProvider::ObjectEnumerationCompleteL(TUint32 aStorageId) -#else -void CMTPDataProvider::ObjectEnumerationCompleteL(TUint32 /*aStorageId*/) -#endif // __FLOG_ACTIVE { - __FLOG_VA((_L8("ObjectEnumerationCompleteL - Entry, data provider %d "), iId)); - __FLOG_VA((_L8("StorageId = 0x%08X "), aStorageId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_OBJECTENUMERATIONCOMPLETEL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_OBJECTENUMERATIONCOMPLETEL, + "data provider %d ", iId); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_OBJECTENUMERATIONCOMPLETEL, + "StorageId = 0x%08X ", aStorageId); iEnumerationState = ((iEnumerationState & ~EObjectsEnumerationState) | EObjectsEnumerated); iSingletons.DpController().EnumerationStateChangedL(*this); - __FLOG_VA((_L8("ObjectEnumerationCompleteL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP2_CMTPDATAPROVIDER_OBJECTENUMERATIONCOMPLETEL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_OBJECTENUMERATIONCOMPLETEL_EXIT ); } void CMTPDataProvider::StorageEnumerationCompleteL() { - __FLOG_VA((_L8("StorageEnumerationCompleteL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_STORAGEENUMERATIONCOMPLETEL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_STORAGEENUMERATIONCOMPLETEL, + "data provider %d ", iId); iEnumerationState = ((iEnumerationState & ~EStoragesEnumerationState) | EStoragesEnumerated); iSingletons.DpController().EnumerationStateChangedL(*this); - __FLOG_VA((_L8("StorageEnumerationCompleteL - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_STORAGEENUMERATIONCOMPLETEL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_STORAGEENUMERATIONCOMPLETEL_EXIT ); } const MMTPDataProviderConfig& CMTPDataProvider::DataProviderConfig() const @@ -495,7 +566,7 @@ void CMTPDataProvider::NotifyFrameworkL( TMTPNotificationToFramework aNotification, const TAny* aParams ) { - __FLOG(_L8("NotifyFrameworkL - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_NOTIFYFRAMEWORKL_ENTRY ); __ASSERT_DEBUG( aParams, User::Invariant()); @@ -508,26 +579,27 @@ } break; default: - __FLOG(_L8("Ignore other notification")); + OstTrace0(TRACE_NORMAL, CMTPDATAPROVIDER_NOTIFYFRAMEWORKL, "Ignore other notification"); break; } - __FLOG(_L8("NotifyFrameworkL - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDER_NOTIFYFRAMEWORKL_EXIT ); } void CMTPDataProvider::RegisterPendingRequest(TUint aTimeOut) { - __FLOG(_L8("RegisterPendingRequestL - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_REGISTERPENDINGREQUEST_ENTRY ); iSingletons.DpController().RegisterPendingRequestDP(iImplementationUid.iUid, aTimeOut); - __FLOG(_L8("RegisterPendingRequestL - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDER_REGISTERPENDINGREQUEST_EXIT ); } void CMTPDataProvider::DoCancel() { - __FLOG_VA((_L8("DoCancel - Entry, data provider %d "), iId)); - __FLOG_VA((_L8("DoCancel - Exit, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_DOCANCEL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_DOCANCEL, + "data provider %d ", iId); if (iTimerActive) { @@ -539,12 +611,19 @@ TRequestStatus* status = &iStatus; User::RequestComplete(status, KErrCancel); } + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_DOCANCEL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_DOCANCEL_EXIT ); } void CMTPDataProvider::RunL() { - __FLOG_VA((_L8("RunL - Entry, data provider %d "), iId)); - __MTP_HEAP_FLOG + OstTraceFunctionEntry0( CMTPDATAPROVIDER_RUNL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_RUNL, + "data provider %d ", iId); +#ifdef OST_TRACE_COMPILER_IN_USE + __MTP_HEAP_OSTTRACE(OstTraceExt4(TRACE_NORMAL,DUP6_CMTPDATAPROVIDER_RUNL,"Heap: Size = %d, Allocated = %d, Available = %d, Largest block = %d", size, allocated, available, largest)); +#endif __ASSERT_DEBUG(iCurrentConnection, User::Invariant()); @@ -561,7 +640,7 @@ iCurrentTransactionPhase = iCurrentConnection->TransactionPhaseL(iCurrentRequest->Uint32(TMTPTypeRequest::ERequestSessionID)); } } - __FLOG_VA((_L8("Current transaction phase = 0x%08X"), iCurrentTransactionPhase)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_RUNL, "Current transaction phase = 0x%08X", iCurrentTransactionPhase); TInt status(iStatus.Int()); if ((status != KErrNone) && @@ -591,7 +670,7 @@ if (iErrorRecovery != KErrNone) { - __FLOG(_L8("Error recovery in progress")); + OstTrace0(TRACE_NORMAL, DUP2_CMTPDATAPROVIDER_RUNL, "Error recovery in progress"); switch (iCurrentTransactionPhase) { case ERequestPhase: @@ -603,9 +682,12 @@ case ECompletingPhase: TRAPD(err, iImplementation->ProcessRequestPhaseL(iCurrentTransactionPhase, *iCurrentRequest, *iCurrentConnection)); - __FLOG_VA((_L8("iImplementation->ProcessRequestPhaseL error %d"), err)); + OstTrace1(TRACE_NORMAL, DUP3_CMTPDATAPROVIDER_RUNL, + "iImplementation->ProcessRequestPhaseL error %d", err); if (err != KErrNone) { + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, DUP8_CMTPDATAPROVIDER_RUNL, + "iImplementation->ProcessRequestPhaseL error %d", err ); TransactionCompleteL(*iCurrentRequest, *iCurrentConnection); } iErrorRecovery = KErrNone; @@ -618,7 +700,7 @@ else if (iSingletons.DpController().EnumerateState() < CMTPDataProviderController::EEnumeratingPhaseOneDone) { - __FLOG(_L8("DP Enumeration is not complete")); + OstTrace0(TRACE_NORMAL, DUP4_CMTPDATAPROVIDER_RUNL, "DP Enumeration is not complete"); if (iCurrentRequest != NULL) { TUint16 opCode = iCurrentRequest->Uint16(TMTPTypeRequest::ERequestOperationCode); @@ -700,14 +782,20 @@ } - __MTP_HEAP_FLOG - __FLOG_VA((_L8("RunL - Exit, data provider %d "), iId)); +#ifdef OST_TRACE_COMPILER_IN_USE + __MTP_HEAP_OSTTRACE(OstTraceExt4(TRACE_NORMAL,DUP7_CMTPSERVER_E32MAIN_HEAP,"Heap: Size = %d, Allocated = %d, Available = %d, Largest block = %d", size, allocated, available, largest)); +#endif + OstTrace1(TRACE_NORMAL, DUP5_CMTPDATAPROVIDER_RUNL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_RUNL_EXIT ); } TInt CMTPDataProvider::RunError(TInt aError) { - __FLOG_VA((_L8("RunError - Entry, data provider %d "), iId)); - __FLOG_VA((_L8("Error = %d"), aError)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_RUNERROR_ENTRY ); + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CMTPDATAPROVIDER_RUNERROR, + "data provider %d ", iId); + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, DUP1_CMTPDATAPROVIDER_RUNERROR, "Error = %d", aError); /* CMTPDataProvider or iImplementation error, save the error state and @@ -716,7 +804,9 @@ iErrorRecovery = aError; Schedule(); - __FLOG_VA((_L8("RunError - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP2_CMTPDATAPROVIDER_RUNERROR, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_RUNERROR_EXIT ); return KErrNone; } @@ -743,8 +833,9 @@ */ void CMTPDataProvider::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG_VA((_L8("ConstructL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_CONSTRUCTL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_CONSTRUCTL, + "data provider %d ", iId); iSingletons.OpenL(); TUint tDPType = iConfig->UintValue(MMTPDataProviderConfig::EDataProviderType); @@ -760,6 +851,7 @@ if((i >= KExcludeCategoryStart) && (i <= KExcludeCategoryEnd) && (codes->Codes().Count() >0)) { + OstTrace1( TRACE_ERROR, DUP3_CMTPDATAPROVIDER_CONSTRUCTL, "Dp MTP feature(%d) contained in exclude category!", i ); User::Leave(KErrNotSupported); } @@ -778,21 +870,26 @@ if((i >= KExcludeCategoryStart) && (i <= KExcludeCategoryEnd) && (codes->Codes().Count() >0)) { + OstTrace1( TRACE_ERROR, DUP4_CMTPDATAPROVIDER_CONSTRUCTL, "Dp MTP feature(%d) contained in exclude category!", i ); User::Leave(KErrNotSupported); } iSupported.AppendL(codes); CleanupStack::Pop(codes); } - User::LeaveIfError(iTimer.CreateLocal()); - + LEAVEIFERROR(iTimer.CreateLocal(), + OstTrace0( TRACE_ERROR, DUP5_CMTPDATAPROVIDER_CONSTRUCTL, "thread-relative timer create error!" )); + // Only assume ownership of passed objects on successful construction. iConstructed = ETrue; - __FLOG_VA((_L8("Data provider %d iImplementationUid 0x08%X "), iId, iImplementationUid)); - __FLOG_VA((_L8("ConstructL - Exit, data provider %d "), iId)); + OstTraceExt2(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_CONSTRUCTL, + "Data provider %d iImplementationUid 0x%X ", iId, iImplementationUid.iUid); } + OstTrace1(TRACE_NORMAL, DUP2_CMTPDATAPROVIDER_CONSTRUCTL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_CONSTRUCTL_EXIT ); } /** @@ -800,12 +897,16 @@ */ void CMTPDataProvider::Schedule() { - __FLOG_VA((_L8("Schedule - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_SCHEDULE_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_SCHEDULE, + "data provider %d ", iId); iStatus = KRequestPending; TRequestStatus* status = &iStatus; SetActive(); User::RequestComplete(status, KErrNone); - __FLOG_VA((_L8("Schedule - Exit, data provider %d "), iId)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_SCHEDULE, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_SCHEDULE_EXIT ); } /** @@ -815,7 +916,10 @@ */ void CMTPDataProvider::SendErrorResponseL(TInt aError) { - __FLOG_VA((_L8("SendResponseL - Entry, data provider %d "), iId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDER_SENDERRORRESPONSEL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDER_SENDERRORRESPONSEL, + "data provider %d ", iId); + __ASSERT_DEBUG(iCurrentRequest != NULL, User::Invariant()); TMTPResponseCode code; @@ -833,13 +937,16 @@ break; } - __FLOG_VA((_L8("Sending response code 0x%04X"), code)); + OstTrace1(TRACE_NORMAL, DUP2_CMTPDATAPROVIDER_SENDERRORRESPONSEL, + "Sending response code 0x%04X", code); iResponse.SetUint16(TMTPTypeResponse::EResponseCode, code); iResponse.SetUint32(TMTPTypeResponse::EResponseSessionID, iCurrentRequest->Uint32(TMTPTypeResponse::EResponseSessionID)); iResponse.SetUint32(TMTPTypeResponse::EResponseTransactionID, iCurrentRequest->Uint32(TMTPTypeResponse::EResponseTransactionID)); SendResponseL(iResponse, *iCurrentRequest, *iCurrentConnection); - - __FLOG_VA((_L8("SendResponseL - Exit, data provider %d "), iId)); + + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDER_SENDERRORRESPONSEL, + "data provider %d ", iId); + OstTraceFunctionExit0( CMTPDATAPROVIDER_SENDERRORRESPONSEL_EXIT ); } CMTPDataProvider::CSupportedCodes* CMTPDataProvider::CSupportedCodes::NewLC(TMTPSupportCategory aCategory, MMTPDataProvider& aDp) diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpdataproviderconfig.cpp --- a/mtpfws/mtpfw/src/cmtpdataproviderconfig.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpdataproviderconfig.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -15,6 +15,11 @@ #include #include "cmtpdataproviderconfig.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdataproviderconfigTraces.h" +#endif + /** CMTPDataProviderConfig factory method. @@ -175,6 +180,7 @@ iType = static_cast(aReader.ReadUint16()); if(KMTPDataProviderTypeECOM != iType) { + OstTrace1( TRACE_ERROR, CMTPDATAPROVIDERCONFIG_CONSTRUCTL, "type %d not MTP Dp ecom plugin", iType); User::Leave(KErrCorrupt); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpdataprovidercontroller.cpp --- a/mtpfws/mtpfw/src/cmtpdataprovidercontroller.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpdataprovidercontroller.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,15 +27,18 @@ #include "mtpframeworkconst.h" #include "cmtpframeworkconfig.h" #include "cmtpstoragemgr.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdataprovidercontrollerTraces.h" +#endif + // Class constants. _LIT(KMTPDpResourceDirectory, "z:\\resource\\mtp\\"); _LIT(KMTPDpDummyResourcefile, "z:\\resource\\mtp\\dummydp.rsc"); -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"DataProviderController");) - static const TUint KOpaqueDataLength(64); /** @@ -75,7 +78,8 @@ */ CMTPDataProviderController::~CMTPDataProviderController() { - __FLOG(_L8("~CMTPDataProviderController - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_CMTPDATAPROVIDERCONTROLLER_DES_ENTRY ); + Cancel(); UnloadDataProviders(); iDataProviderIds.Close(); @@ -85,8 +89,8 @@ CloseRegistrySessionAndEntryL(); delete iOpenSessionWaiter; delete iPendingRequestTimer; - __FLOG(_L8("~CMTPDataProviderController - Exit")); - __FLOG_CLOSE; + + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_CMTPDATAPROVIDERCONTROLLER_DES_EXIT ); } /** @@ -96,7 +100,8 @@ */ EXPORT_C void CMTPDataProviderController::LoadDataProvidersL() { - __FLOG(_L8("LoadDataProvidersL - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL_ENTRY ); + // Retrieve the ECOM data provider implementations list RImplInfoPtrArray implementations; TCleanupItem cleanup(ImplementationsCleanup, reinterpret_cast(&implementations)); @@ -106,7 +111,9 @@ // Retrieve the data provider registration resource file list. CDir* registrations; - User::LeaveIfError(iSingletons.Fs().GetDir(KMTPDpResourceDirectory, KEntryAttNormal, ESortByName, registrations)); + LEAVEIFERROR(iSingletons.Fs().GetDir(KMTPDpResourceDirectory, KEntryAttNormal, ESortByName, registrations), + OstTrace0( TRACE_ERROR, DUP5_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL, "get MTP Dp resource directory error!" )); + CleanupStack::PushL(registrations); CreateRegistrySessionAndEntryL(); @@ -119,7 +126,8 @@ TUint uid = 0; if(Uid((*registrations)[i].iName, uid) != KErrNone) { - __FLOG_1(_L8("LoadDataProvidersL - Fail to get UID = %s"),&((*registrations)[i].iName) ); + OstTraceExt1( TRACE_WARNING, CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL, + "LoadDataProvidersL - Fail to get UID = %S", (*registrations)[i].iName); continue; } index = implementations.FindInOrder(TUid::Uid(uid), ImplementationsLinearOrderUid); @@ -165,7 +173,8 @@ TRAPD(err, LoadInstalledDataProvidersL(implementations[index])); if (KErrNone != err) { - __FLOG_VA((_L8("Load installed data provider[0x%x] failed."),implementations[index]->ImplementationUid().iUid)); + OstTrace1(TRACE_ERROR, DUP1_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL, + "Load installed data provider[0x%x] failed.", implementations[index]->ImplementationUid().iUid); } } @@ -173,10 +182,13 @@ CleanupStack::PopAndDestroy(&implementations); // Verify that the framework data providers are loaded. - User::LeaveIfError(DpId(KMTPImplementationUidDeviceDp)); - User::LeaveIfError(DpId(KMTPImplementationUidProxyDp)); - User::LeaveIfError(DpId(KMTPImplementationUidFileDp)); - + LEAVEIFERROR(DpId(KMTPImplementationUidDeviceDp), + OstTrace0( TRACE_ERROR, DUP2_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL, "Device Dp not loaded!" )); + LEAVEIFERROR(DpId(KMTPImplementationUidProxyDp), + OstTrace0( TRACE_ERROR, DUP3_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL, "Proxy Dp not loaded!" )); + LEAVEIFERROR(DpId(KMTPImplementationUidFileDp), + OstTrace0( TRACE_ERROR, DUP4_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL, "file Dp not loaded!" )); + // Sort the data provider set on enumeration phase order. iDataProviders.Sort(TLinearOrder(CMTPDataProvider::LinearOrderEnumerationPhase)); // Add the DP IDs into DP ID array, except for device DP, File DP and proxy DP @@ -196,7 +208,7 @@ iEnumeratingStorages.AppendL(KMTPStorageAll); iEnumerationState = EEnumerationStarting; Schedule(); - __FLOG(_L8("LoadDataProvidersL - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL_EXIT ); } /** @@ -205,11 +217,11 @@ */ EXPORT_C void CMTPDataProviderController::UnloadDataProviders() { - __FLOG(_L8("UnloadDataProviders - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_UNLOADDATAPROVIDERS_ENTRY ); TRAP_IGNORE(iSingletons.ObjectMgr().ObjectStore().CleanL()); iDataProviders.ResetAndDestroy(); iDataProviderIds.Reset(); - __FLOG(_L8("UnloadDataProviders - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_UNLOADDATAPROVIDERS_EXIT ); } /** @@ -226,7 +238,7 @@ EXPORT_C void CMTPDataProviderController::NotifyDataProvidersL(TUint aDPId, TMTPNotification aNotification, const TAny* aParams) { - __FLOG(_L8("NotifyDataProvidersL - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_NOTIFYDATAPROVIDERSL_ENTRY); // Schedule any long running operations. switch (aNotification) { @@ -260,7 +272,8 @@ if(storageId==iEnumeratingStorages[i]) { iEnumeratingStorages.Remove(i); - __FLOG_VA((_L8("Unhandle memory card add event removed, storageId: %d"), storageId)); + OstTrace1(TRACE_ERROR, CMTPDATAPROVIDERCONTROLLER_NOTIFYDATAPROVIDERSL, + "Unhandle memory card add event removed, storageId: %d", storageId); } } } @@ -304,7 +317,7 @@ } } } - __FLOG(_L8("NotifyDataProvidersL - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_NOTIFYDATAPROVIDERSL_EXIT); } /** @@ -424,8 +437,9 @@ */ void CMTPDataProviderController::EnumerationStateChangedL(const CMTPDataProvider& aDp) { - __FLOG(_L8("EnumerationStateChangedL - Entry")); - __FLOG_VA((_L8("Entry iEnumerationState: 0x%x DpId: %d"), iEnumerationState, aDp.DataProviderId())); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_ENUMERATIONSTATECHANGEDL_ENTRY); + OstTraceDefExt2(OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CMTPDATAPROVIDERCONTROLLER_ENUMERATIONSTATECHANGEDL, + "iEnumerationState: 0x%x DpId: %d", iEnumerationState, aDp.DataProviderId()); switch (iEnumerationState) { case EEnumeratingFrameworkStorages: @@ -480,7 +494,8 @@ case EEnumeratingSubDirFiles: if(KMTPImplementationUidFileDp == aDp.ImplementationUid().iUid && NeedEnumeratingPhase2()) { - __FLOG(_L8("File DP first level enum complete")); + OstTrace0(TRACE_NORMAL, DUP1_CMTPDATAPROVIDERCONTROLLER_ENUMERATIONSTATECHANGEDL, + "File DP first level enum complete"); Cancel(); //clean the root level snapshot @@ -523,14 +538,15 @@ break; } - __FLOG_VA((_L8("Exit iEnumerationState: 0x%x, DpId: %d, UID=0x%x"), iEnumerationState, aDp.DataProviderId(), aDp.ImplementationUid().iUid)); - __FLOG(_L8("EnumerationStateChangedL - Exit")); + OstTraceExt3(TRACE_NORMAL, DUP2_CMTPDATAPROVIDERCONTROLLER_ENUMERATIONSTATECHANGEDL, + "iEnumerationState: 0x%x, DpId: %d, UID=0x%x", iEnumerationState, aDp.DataProviderId(), (TUint)aDp.ImplementationUid().iUid); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_ENUMERATIONSTATECHANGEDL_EXIT); } void CMTPDataProviderController::DoCancel() { - __FLOG(_L8("DoCancel - Entry")); - __FLOG(_L8("DoCancel - Exit")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_DOCANCEL_ENTRY); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_DOCANCEL_EXIT); } @@ -553,7 +569,8 @@ const TUint KCountLogicalIds(logicalIds.Count()); for (TUint i(0); (i < KCountLogicalIds); i++) { - __FLOG_VA((_L8("Establish snapshot for storage: 0x%x"), logicalIds[i])); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDERCONTROLLER_ESTABLISHDBSNAPSHOTL, + "Establish snapshot for storage: 0x%x", logicalIds[i]); iSingletons.ObjectMgr().ObjectStore().EstablishDBSnapshotL(logicalIds[i]); } } @@ -563,8 +580,9 @@ void CMTPDataProviderController::RunL() { - __FLOG(_L8("RunL - Entry")); - __FLOG_VA((_L8("iEnumerationState: 0x%x iNextDpId: %d"), iEnumerationState, iNextDpId)); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_RUNL_ENTRY ); + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CMTPDATAPROVIDERCONTROLLER_RUNL, + "iEnumerationState: 0x%x", iEnumerationState); switch (iEnumerationState) { case EEnumerationStarting: @@ -651,12 +669,14 @@ && (iEnumerationPhase == DataProviderL(iDataProviderIds[iDpIdArrayIndex]).DataProviderConfig().UintValue(MMTPDataProviderConfig::EEnumerationPhase))) { currentDp = iDataProviderIds[iDpIdArrayIndex++]; - __FLOG_VA((_L8("Enumerating dpid %d"), currentDp)); + OstTrace1(TRACE_NORMAL, DUP1_CMTPDATAPROVIDERCONTROLLER_RUNL, + "Enumerating dpid %d", currentDp); iEnumeratingDps.InsertInOrderL(currentDp); EnumerateDataProviderObjectsL(currentDp); } - __FLOG_VA((_L8("iDpIdArrayIndex = %d, KLoadedDps = %d"), iDpIdArrayIndex, KLoadedDps)); + OstTraceExt2(TRACE_NORMAL, DUP2_CMTPDATAPROVIDERCONTROLLER_RUNL, + "iDpIdArrayIndex = %d, KLoadedDps = %d", iDpIdArrayIndex, KLoadedDps); } break; @@ -690,17 +710,14 @@ __DEBUG_ONLY(User::Invariant()); break; } - __FLOG(_L8("RunL - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_RUNL_EXIT ); } -#ifdef __FLOG_ACTIVE + TInt CMTPDataProviderController::RunError(TInt aError) -#else -TInt CMTPDataProviderController::RunError(TInt /*aError*/) -#endif { - __FLOG(_L8("RunError - Entry")); - __FLOG_VA((_L8("Error = %d"), aError)); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_RUNERROR_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDERCONTROLLER_RUNERROR, "Error = %d", aError); // If a RunL error happens, there's no point in trying to continue. switch (iEnumerationState) @@ -730,7 +747,7 @@ } // This code is never reached - __FLOG(_L8("RunError - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_RUNERROR_EXIT ); return KErrNone; } @@ -749,8 +766,7 @@ */ void CMTPDataProviderController::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); TInt tMTPMode; TInt err = RProperty::Get(KUidSystemCategory, KUidMTPModeKeyValue, tMTPMode); @@ -772,7 +788,7 @@ iPendingRequestTimer = CMTPPendingReqestTimer::NewL(this); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_CONSTRUCTL_EXIT ); } /** @@ -785,7 +801,8 @@ */ CMTPDataProviderConfig* CMTPDataProviderController::CreateConfigLC(const TDesC& aResourceFilename) { - __FLOG(_L8("CreateConfigLC - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_CREATECONFIGLC_ENTRY ); + // Open the configuration data resource file RResourceFile file; CleanupClosePushL(file); @@ -802,7 +819,7 @@ CleanupStack::PopAndDestroy(buffer); CleanupStack::PopAndDestroy(&file); CleanupStack::PushL(config); - __FLOG(_L8("CreateConfigLC - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_CREATECONFIGLC_EXIT ); return config; } @@ -812,7 +829,7 @@ */ TBool CMTPDataProviderController::IsObjectsEnumerationNeededL(CMTPDataProvider& dp) { - __FLOG(_L8("CheckEnumerateDPObjectsL - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_ISOBJECTSENUMERATIONNEEDEDL_ENTRY ); CMTPStorageMgr& storages = iSingletons.StorageMgr(); TUint32 aStorageId = iEnumeratingStorages[0]; @@ -834,7 +851,7 @@ doEnumeration = false; } } - __FLOG(_L8("CheckEnumerateDPObjectsL - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_ISOBJECTSENUMERATIONNEEDEDL_EXIT ); return doEnumeration; } @@ -844,7 +861,9 @@ */ void CMTPDataProviderController::EnumerateDataProviderObjectsL(TUint aId) { - __FLOG(_L8("EnumerateDataProviderObjectsL - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_ENUMERATEDATAPROVIDEROBJECTSL_ENTRY ); + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CMTPDATAPROVIDERCONTROLLER_ENUMERATEDATAPROVIDEROBJECTSL, + "Data provider with DpId %d to enumerate its objects", aId ); CMTPDataProvider& dp(DataProviderL(aId)); if (IsObjectsEnumerationNeededL(dp)) @@ -878,7 +897,7 @@ EnumerationStateChangedL(dp); } - __FLOG(_L8("EnumerateDataProviderObjectsL - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_ENUMERATEDATAPROVIDEROBJECTSL_EXIT ); } /** @@ -892,10 +911,12 @@ */ TBool CMTPDataProviderController::LoadROMDataProvidersL(const TDesC& aResourceFilename, const RImplInfoPtrArray& aImplementations) { - __FLOG(_L8("LoadROMDataProvidersL - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_LOADROMDATAPROVIDERSL_ENTRY ); // Retrieve the implementation UID TUint uid(0); - User::LeaveIfError(Uid(aResourceFilename, uid)); + LEAVEIFERROR(Uid(aResourceFilename, uid), + OstTraceExt1( TRACE_ERROR, CMTPDATAPROVIDERCONTROLLER_LOADROMDATAPROVIDERSL, "can't get uid from resource file %S", aResourceFilename)); + TBool success(EFalse); // Check for a corresponding plug-in implementation. @@ -931,7 +952,7 @@ success = LoadDataProviderL(filename); CleanupStack::PopAndDestroy(&filename); } - __FLOG(_L8("LoadROMDataProvidersL - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_LOADROMDATAPROVIDERSL_EXIT ); return success; } @@ -944,7 +965,7 @@ */ void CMTPDataProviderController::LoadInstalledDataProvidersL(const CImplementationInformation* aImplementations) { - __FLOG(_L8("LoadInstalledDataProvidersL - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_LOADINSTALLEDDATAPROVIDERSL_ENTRY ); TUint uid = aImplementations->ImplementationUid().iUid; TBool tFlag(EFalse); iNextDpId = iSingletons.ObjectMgr().DPIDL(uid, tFlag); @@ -968,11 +989,14 @@ } if (0 == pkgIDstr.Length()) { + OstTrace0( TRACE_ERROR, CMTPDATAPROVIDERCONTROLLER_LOADINSTALLEDDATAPROVIDERSL, "pkgIdstr is empty!" ); User::Leave(KErrArgument); } TUint aUid(0); - User::LeaveIfError(Uid(pkgIDstr, aUid)); + LEAVEIFERROR(Uid(pkgIDstr, aUid), + OstTraceExt1( TRACE_ERROR, DUP1_CMTPDATAPROVIDERCONTROLLER_LOADINSTALLEDDATAPROVIDERSL, "can't get uid from string %S",pkgIDstr )); + iSingletons.ObjectMgr().InsertPkgIDObjectL(iNextDpId, aUid); TDriveName drive = aImplementations->Drive().Name(); @@ -995,7 +1019,7 @@ LoadDataProviderL(resourcefilename); CleanupStack::PopAndDestroy(&resourcefilename); - __FLOG(_L8("LoadInstalledDataProvidersL - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_LOADINSTALLEDDATAPROVIDERSL_EXIT ); } /** @@ -1007,7 +1031,7 @@ */ TBool CMTPDataProviderController::LoadDataProviderL(const TDesC& aResourceFilename) { - __FLOG(_L8("LoadDataProviderL - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERL_ENTRY ); // Load the configurability parameter data. CMTPDataProviderConfig* config(CreateConfigLC(aResourceFilename)); @@ -1017,6 +1041,7 @@ TUint aUid(0); if ( Uid(aResourceFilename,aUid) != KErrNone ) { + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERL_EXIT ); return success; } TUint uid(aUid); @@ -1104,7 +1129,7 @@ // No data provider was created. CleanupStack::PopAndDestroy(config); } - __FLOG(_L8("LoadDataProviderL - Exit")); + OstTraceFunctionExit0( DUP1_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERL_EXIT ); return success; } @@ -1117,12 +1142,12 @@ */ TInt CMTPDataProviderController::Uid(const TDesC& aResourceFilename, TUint& aUid) { - __FLOG(_L8("Uid - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_UID_ENTRY ); // Extract the implemetation UID from the filename. TParsePtrC parser(aResourceFilename); TLex lex(parser.Name()); TInt err = lex.Val(aUid, EHex); - __FLOG(_L8("Uid - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_UID_EXIT ); return err; } @@ -1131,7 +1156,7 @@ */ void CMTPDataProviderController::Schedule() { - __FLOG(_L8("Schedule - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_SCHEDULE_ENTRY ); if (!IsActive()) { TRequestStatus* status(&iStatus); @@ -1139,7 +1164,7 @@ SetActive(); User::RequestComplete(status, KErrNone); } - __FLOG(_L8("Schedule - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_SCHEDULE_EXIT ); } /** Get the mtpkey mode. @@ -1198,7 +1223,8 @@ return; } - User::LeaveIfError(iSisSession.Connect()); + LEAVEIFERROR(iSisSession.Connect(), + OstTrace0( TRACE_ERROR, CMTPDATAPROVIDERCONTROLLER_CREATEREGISTRYSESSIONANDENTRYL, "can't connect to iSisSession " )); CleanupClosePushL(iSisSession); TInt err = KErrNone; TUint stubuid; @@ -1222,12 +1248,12 @@ EXPORT_C void CMTPDataProviderController::SetNeedEnumeratingPhase2(TBool aNeed) { - __FLOG(_L8("SetNeedEnumeratingPhase2 - Entry")); - __FLOG_VA((_L8("Need = %d"), aNeed)); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_SETNEEDENUMERATINGPHASE2_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPDATAPROVIDERCONTROLLER_SETNEEDENUMERATINGPHASE2, "Need = %d", aNeed); iNeedEnumeratingPhase2 = aNeed; - __FLOG(_L8("SetNeedEnumeratingPhase2 - Exit")); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_SETNEEDENUMERATINGPHASE2_EXIT ); } EXPORT_C TBool CMTPDataProviderController::NeedEnumeratingPhase2() const @@ -1238,7 +1264,7 @@ EXPORT_C void CMTPDataProviderController::RegisterPendingRequestDP(TUint aDpUid, TUint aTimeOut) { - __FLOG(_L8("CMTPDataProviderController::RegisterPendingRequestDP - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_REGISTERPENDINGREQUESTDP_ENTRY ); __ASSERT_DEBUG((iPendingRequestDpUid == 0), User::Invariant()); iPendingRequestDpUid = aDpUid; @@ -1246,18 +1272,19 @@ { iPendingRequestTimer->Start(aTimeOut); } - - __FLOG(_L8("CMTPDataProviderController::RegisterPendingRequestDP - Exit")); + + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_REGISTERPENDINGREQUESTDP_EXIT ); } EXPORT_C void CMTPDataProviderController::ExecutePendingRequestL() { - __FLOG(_L8("CMTPDataProviderController::ExecutePendingRequestL - Entry")); + OstTraceFunctionEntry0( CMTPDATAPROVIDERCONTROLLER_EXECUTEPENDINGREQUESTL_ENTRY ); if (iPendingRequestDpUid == 0) { iPendingRequestTimer->Cancel(); + OstTraceFunctionExit0( CMTPDATAPROVIDERCONTROLLER_EXECUTEPENDINGREQUESTL_EXIT ); return; } @@ -1273,8 +1300,8 @@ } } - iPendingRequestTimer->Cancel(); - __FLOG(_L8("CMTPDataProviderController::ExecutePendingRequestL - Exit")); + iPendingRequestTimer->Cancel(); + OstTraceFunctionExit0( DUP1_CMTPDATAPROVIDERCONTROLLER_EXECUTEPENDINGREQUESTL_EXIT ); } EXPORT_C TUint CMTPDataProviderController::StorageEnumerateState(TUint aStorageId) @@ -1320,35 +1347,33 @@ CMTPDataProviderController::CMTPPendingReqestTimer::~CMTPPendingReqestTimer() { - __FLOG(_L8("~CMTPPendingReqestTimer - Entry")); + OstTraceFunctionEntry0( CMTPPENDINGREQESTTIMER_CMTPPENDINGREQESTTIMER_ENTRY ); Cancel(); - __FLOG(_L8("~CMTPPendingReqestTimer - Exit")); - __FLOG_CLOSE; - + OstTraceFunctionExit0( CMTPPENDINGREQESTTIMER_CMTPPENDINGREQESTTIMER_EXIT ); } void CMTPDataProviderController::CMTPPendingReqestTimer::Start(TUint aTimeOut) { - __FLOG(_L8("CMTPPendingReqestTimer::Start - Entry")); + OstTraceFunctionEntry0( CMTPPENDINGREQESTTIMER_START_ENTRY ); if (aTimeOut > 0) { const TUint KMTPPendingRequestDelay = (1000000 * aTimeOut); After(KMTPPendingRequestDelay); } - - __FLOG(_L8("CMTPPendingReqestTimer::Start - Exit")); + + OstTraceFunctionExit0( CMTPPENDINGREQESTTIMER_START_EXIT ); } void CMTPDataProviderController::CMTPPendingReqestTimer::RunL() { - __FLOG(_L8("CMTPPendingReqestTimer::RunL - Entry")); + OstTraceFunctionEntry0( CMTPPENDINGREQESTTIMER_RUNL_ENTRY ); iDPController->ExecutePendingRequestL(); - __FLOG(_L8("CMTPPendingReqestTimer::RunL - Exit")); + OstTraceFunctionExit0( CMTPPENDINGREQESTTIMER_RUNL_EXIT ); } CMTPDataProviderController::CMTPPendingReqestTimer::CMTPPendingReqestTimer(CMTPDataProviderController* aDPController) : @@ -1359,12 +1384,11 @@ void CMTPDataProviderController::CMTPPendingReqestTimer::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPPendingReqestTimer::ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPPENDINGREQESTTIMER_CONSTRUCTL_ENTRY ); CTimer::ConstructL(); CActiveScheduler::Add(this); - - __FLOG(_L8("CMTPPendingReqestTimer::ConstructL - Exit")); + + OstTraceFunctionExit0( CMTPPENDINGREQESTTIMER_CONSTRUCTL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpdeltadatamgr.cpp --- a/mtpfws/mtpfw/src/cmtpdeltadatamgr.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpdeltadatamgr.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,11 +20,16 @@ #include "cmtpdeltadatamgr.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdeltadatamgrTraces.h" +#endif + //! Size of a PUID in bytes static const TInt KMTPPuidSize = 16; -__FLOG_STMT(_LIT8(KComponent,"MTPDeltaDataMgr:");) _LIT(KMTPDeltaDataTable, "MTPDeltaDataTable"); _LIT(KSQLPuidIndexName, "PuidIndex"); @@ -46,9 +51,8 @@ */ void CMtpDeltaDataMgr::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPDELTADATAMGR_CONSTRUCTL_EXIT ); } @@ -76,7 +80,6 @@ iAnchorTableBatched.Close(); iView.Close(); iSuidIdArray.Close(); - __FLOG_CLOSE; } /** Create the MTP Delta Data Table @@ -84,23 +87,26 @@ */ EXPORT_C void CMtpDeltaDataMgr::CreateDeltaDataTableL() { - __FLOG(_L8("CreateDeltaDataTableL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_CREATEDELTADATATABLEL_ENTRY ); + iDeltaTableBatched.Close(); if(!DBUtility::IsTableExistsL(iDatabase, KMTPDeltaDataTable)) { _LIT(KSQLCreateMTPDeltaDataTableText,"CREATE TABLE MTPDeltaDataTable (SuidId BIGINT , OpCode TINYINT )"); - User::LeaveIfError(iDatabase.Execute(KSQLCreateMTPDeltaDataTableText)); - + LEAVEIFERROR(iDatabase.Execute(KSQLCreateMTPDeltaDataTableText), + OstTrace0( TRACE_ERROR, CMTPDELTADATAMGR_CREATEDELTADATATABLEL, "MTPDeltaDataTable create error!" )); + if(!DBUtility::IsIndexExistsL(iDatabase, KMTPDeltaDataTable, KSQLPuidIndexName)) { _LIT(KSQLCreateReferenceIndexText,"CREATE UNIQUE INDEX PuidIndex on MTPDeltaDataTable (SuidId)"); - User::LeaveIfError(iDatabase.Execute(KSQLCreateReferenceIndexText)); + LEAVEIFERROR(iDatabase.Execute(KSQLCreateReferenceIndexText), + OstTrace0( TRACE_ERROR, DUP1_CMTPDELTADATAMGR_CREATEDELTADATATABLEL, "PuidIndex on MTPDeltaDataTable create error!" )); } } iDeltaTableBatched.Open(iDatabase, KMTPDeltaDataTable, RDbRowSet::EUpdatable); - __FLOG(_L8("CreateDeltaDataTableL - Exit")); + OstTraceFunctionExit0( CMTPDELTADATAMGR_CREATEDELTADATATABLEL_EXIT ); } /** @@ -109,22 +115,26 @@ */ EXPORT_C void CMtpDeltaDataMgr::CreateAnchorIdTableL() { - __FLOG(_L8("CreateAnchorIdTableL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_CREATEANCHORIDTABLEL_ENTRY ); + iAnchorTableBatched.Close(); if(!DBUtility::IsTableExistsL(iDatabase, KAnchorIdTable)) { _LIT(KSQLCreateAnchorIdTableText,"CREATE TABLE AnchorIdTable (anchorid INTEGER, curindex INTEGER, identifier INTEGER)"); - User::LeaveIfError(iDatabase.Execute(KSQLCreateAnchorIdTableText)); + LEAVEIFERROR(iDatabase.Execute(KSQLCreateAnchorIdTableText), + OstTrace0( TRACE_ERROR, CMTPDELTADATAMGR_CREATEANCHORIDTABLEL, "TABLE AnchorIdTable create error!" )); + if(!DBUtility::IsIndexExistsL(iDatabase, KAnchorIdTable, KSQLIdentifierIndexName)) { _LIT(KSQLCreateRefIndexText,"CREATE UNIQUE INDEX IdentifierIndex on AnchorIdTable (identifier)"); - User::LeaveIfError(iDatabase.Execute(KSQLCreateRefIndexText)); + LEAVEIFERROR(iDatabase.Execute(KSQLCreateRefIndexText), + OstTrace0( TRACE_ERROR, DUP1_CMTPDELTADATAMGR_CREATEANCHORIDTABLEL, "INDEX IdentifierIndex on AnchorIdTable create error!" )); } } iAnchorTableBatched.Open(iDatabase, KAnchorIdTable, RDbRowSet::EUpdatable); - __FLOG(_L8("CreateAnchorIdTableL - Exit")); + OstTraceFunctionExit0( CMTPDELTADATAMGR_CREATEANCHORIDTABLEL_EXIT ); } /** @@ -135,7 +145,8 @@ */ EXPORT_C void CMtpDeltaDataMgr::InsertAnchorIdL(TInt aAnchorId, TInt aIdentifier) { - __FLOG(_L8("InsertAnchorIdL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_INSERTANCHORIDL_ENTRY ); + iAnchorTableBatched.SetIndex(KSQLIdentifierIndexName); if(!(iAnchorTableBatched.SeekL(aIdentifier))) { @@ -145,7 +156,7 @@ iAnchorTableBatched.SetColL(3, aIdentifier); iAnchorTableBatched.PutL(); } - __FLOG(_L8("InsertAnchorIdL - Exit")); + OstTraceFunctionExit0( CMTPDELTADATAMGR_INSERTANCHORIDL_EXIT ); } /** @@ -156,7 +167,8 @@ */ EXPORT_C void CMtpDeltaDataMgr::UpdateAnchorIdL(TInt aAnchorId, TInt aIdentifier) { - __FLOG(_L8("UpdateAnchorIdL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_UPDATEANCHORIDL_ENTRY ); + iAnchorTableBatched.SetIndex(KSQLIdentifierIndexName); if(iAnchorTableBatched.SeekL(aIdentifier)) { @@ -164,7 +176,7 @@ iAnchorTableBatched.SetColL(1, aAnchorId); iAnchorTableBatched.PutL(); } - __FLOG(_L8("UpdateAnchorIdL - Exit")); + OstTraceFunctionExit0( CMTPDELTADATAMGR_UPDATEANCHORIDL_EXIT ); } /** @@ -174,7 +186,8 @@ */ EXPORT_C TInt CMtpDeltaDataMgr::GetAnchorIdL(TInt aIdentifier) { - __FLOG(_L8("GetAnchorIdL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_GETANCHORIDL_ENTRY ); + TInt anchorId = 0; iAnchorTableBatched.SetIndex(KSQLIdentifierIndexName); if(iAnchorTableBatched.SeekL(aIdentifier)) @@ -182,7 +195,7 @@ iAnchorTableBatched.GetL(); anchorId = iAnchorTableBatched.ColInt32(1); } - __FLOG(_L8("GetAnchorIdL - Exit")); + OstTraceFunctionExit0( CMTPDELTADATAMGR_GETANCHORIDL_EXIT ); return anchorId; } @@ -192,7 +205,8 @@ */ EXPORT_C void CMtpDeltaDataMgr::UpdatePersistentIndexL(TInt aCurindex, TInt aIdentifier) { - __FLOG(_L8("UpdatePersistentIndexL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_UPDATEPERSISTENTINDEXL_ENTRY ); + iAnchorTableBatched.SetIndex(KSQLIdentifierIndexName); if(iAnchorTableBatched.SeekL(aIdentifier)) { @@ -200,7 +214,7 @@ iAnchorTableBatched.SetColL(2, aCurindex); iAnchorTableBatched.PutL(); } - __FLOG(_L8("UpdatePersistentIndexL - Exit")); + OstTraceFunctionExit0( CMTPDELTADATAMGR_UPDATEPERSISTENTINDEXL_EXIT ); } /** @@ -209,7 +223,8 @@ */ EXPORT_C TInt CMtpDeltaDataMgr::GetPersistentIndexL(TInt aIdentifier) { - __FLOG(_L8("GetPersistentIndexL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_GETPERSISTENTINDEXL_ENTRY ); + TInt currIndex = 0; iAnchorTableBatched.SetIndex(KSQLIdentifierIndexName); @@ -217,8 +232,8 @@ { iAnchorTableBatched.GetL(); currIndex = iAnchorTableBatched.ColInt32(2); - } - __FLOG(_L8("GetPersistentIndexL - Exit")); + } + OstTraceFunctionExit0( CMTPDELTADATAMGR_GETPERSISTENTINDEXL_EXIT ); return currIndex; } @@ -230,7 +245,8 @@ */ void CMtpDeltaDataMgr::UpdateDeltaDataTableL(TInt64 aSuidId, TOpCode aOpCode) { - __FLOG(_L8("UpdateDeltaDataTableL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_UPDATEDELTADATATABLEL_ENTRY ); + if(!DBUtility::IsTableExistsL(iDatabase, KMTPDeltaDataTable)) return; @@ -247,7 +263,7 @@ iDeltaTableBatched.SetColL(2, aOpCode); } iDeltaTableBatched.PutL(); - __FLOG(_L8("UpdateDeltaDataTableL - Exit")); + OstTraceFunctionExit0( CMTPDELTADATAMGR_UPDATEDELTADATATABLEL_EXIT ); } /** @@ -259,14 +275,17 @@ */ EXPORT_C TInt CMtpDeltaDataMgr::GetChangedPuidsL(TInt aMaxArraySize, TInt& aPosition, CMTPTypeArray& aModifiedPuidIdArray, CMTPTypeArray& aDeletedPuidArray) { - __FLOG(_L8("GetChangedPuidsL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_GETCHANGEDPUIDSL_ENTRY ); + if(!iNeedToSendMore) { _LIT(KSQLGetAll, "SELECT * FROM MTPDeltaDataTable"); - User::LeaveIfError(iView.Prepare(iDatabase, TDbQuery(KSQLGetAll))); - User::LeaveIfError(iView.EvaluateAll()); + LEAVEIFERROR(iView.Prepare(iDatabase, TDbQuery(KSQLGetAll)), + OstTrace0( TRACE_ERROR, CMTPDELTADATAMGR_GETCHANGEDPUIDSL, "view for MTPDeltaDataTable prepare failure!" )); + LEAVEIFERROR(iView.EvaluateAll(), + OstTrace0( TRACE_ERROR, DUP1_CMTPDELTADATAMGR_GETCHANGEDPUIDSL, "view evaluate failed!" )); iNeedToSendMore = ETrue; iView.FirstL(); iTotalRows = iView.CountL(); @@ -284,6 +303,7 @@ { iNeedToSendMore = EFalse; iView.Close(); + OstTraceFunctionExit0( CMTPDELTADATAMGR_GETCHANGEDPUIDSL_EXIT ); return 0; } @@ -324,7 +344,7 @@ } } - __FLOG(_L8("GetChangedPuidsL - Exit")); + OstTraceFunctionExit0( DUP1_CMTPDELTADATAMGR_GETCHANGEDPUIDSL_EXIT ); return (iTotalRows - aPosition); } @@ -336,7 +356,7 @@ */ EXPORT_C TInt CMtpDeltaDataMgr::GetAddedPuidsL(TInt aMaxArraySize, TInt &aPosition, CMTPTypeArray& aAddedPuidIdArray) { - __FLOG(_L8("GetAddedPuidsL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_GETADDEDPUIDSL_ENTRY ); if(!iNeedToSendMore) { @@ -344,8 +364,10 @@ _LIT(KSQLSelectAdded, "SELECT * FROM MTPDeltaDataTable WHERE OpCode = %d"); iSqlStatement.Format(KSQLSelectAdded, opcode); - User::LeaveIfError(iView.Prepare(iDatabase, TDbQuery(iSqlStatement))); - User::LeaveIfError(iView.EvaluateAll()); + LEAVEIFERROR(iView.Prepare(iDatabase, TDbQuery(iSqlStatement)), + OstTrace0( TRACE_ERROR, CMTPDELTADATAMGR_GETADDEDPUIDSL, "view for MTPDeltaDataTable prepare failed!" )); + LEAVEIFERROR(iView.EvaluateAll(), + OstTrace0( TRACE_ERROR, DUP1_CMTPDELTADATAMGR_GETADDEDPUIDSL, "view evaluate failed!" )); iNeedToSendMore = ETrue; iView.FirstL(); iTotalRows = iView.CountL(); @@ -363,6 +385,7 @@ { iNeedToSendMore = EFalse; iView.Close(); + OstTraceFunctionExit0( CMTPDELTADATAMGR_GETADDEDPUIDSL_EXIT ); return 0; } @@ -396,7 +419,7 @@ } } - __FLOG(_L8("GetAddedPuidsL - Exit")); + OstTraceFunctionExit0( DUP1_CMTPDELTADATAMGR_GETADDEDPUIDSL_EXIT ); return (iTotalRows - aPosition); } @@ -408,7 +431,7 @@ */ EXPORT_C TInt CMtpDeltaDataMgr::GetDeletedPuidsL(TInt aMaxArraySize, TInt &aPosition, CMTPTypeArray& aDeletedPuidIdArray) { - __FLOG(_L8("GetDeletedPuidsL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_GETDELETEDPUIDSL_ENTRY ); if(!iNeedToSendMore) { @@ -416,8 +439,11 @@ _LIT(KSQLSelectDeleted, "SELECT * FROM MTPDeltaDataTable WHERE OpCode = %d"); iSqlStatement.Format(KSQLSelectDeleted, opcode); - User::LeaveIfError(iView.Prepare(iDatabase, TDbQuery(iSqlStatement))); - User::LeaveIfError(iView.EvaluateAll()); + LEAVEIFERROR(iView.Prepare(iDatabase, TDbQuery(iSqlStatement)), + OstTrace0( TRACE_ERROR, CMTPDELTADATAMGR_GETDELETEDPUIDSL, "view for MTPDeltaDataTable prepare failed!" )); + LEAVEIFERROR(iView.EvaluateAll(), + OstTrace0( TRACE_ERROR, DUP1_CMTPDELTADATAMGR_GETDELETEDPUIDSL, "view evaluated failed!" )); + iNeedToSendMore = ETrue; iView.FirstL(); iTotalRows = iView.CountL(); @@ -435,6 +461,7 @@ { iNeedToSendMore = EFalse; iView.Close(); + OstTraceFunctionExit0( CMTPDELTADATAMGR_GETDELETEDPUIDSL_EXIT ); return 0; } @@ -468,7 +495,7 @@ } } - __FLOG(_L8("GetDeletedPuidsL - Exit")); + OstTraceFunctionExit0( DUP1_CMTPDELTADATAMGR_GETDELETEDPUIDSL_EXIT ); return (iTotalRows - aPosition); } @@ -480,7 +507,7 @@ */ EXPORT_C TInt CMtpDeltaDataMgr::GetModifiedPuidsL(TInt aMaxArraySize, TInt &aPosition, CMTPTypeArray& aModifiedPuidIdArray) { - __FLOG(_L8("GetDeletedPuidsL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_GETMODIFIEDPUIDSL_ENTRY ); if(!iNeedToSendMore) { @@ -488,8 +515,10 @@ _LIT(KSQLSelectModified, "SELECT * FROM MTPDeltaDataTable WHERE OpCode = %d"); iSqlStatement.Format(KSQLSelectModified, opcode); - User::LeaveIfError(iView.Prepare(iDatabase, TDbQuery(iSqlStatement))); - User::LeaveIfError(iView.EvaluateAll()); + LEAVEIFERROR(iView.Prepare(iDatabase, TDbQuery(iSqlStatement)), + OstTrace0( TRACE_ERROR, CMTPDELTADATAMGR_GETMODIFIEDPUIDSL, "view for MTPDeltaDataTable prepare failed!" )); + LEAVEIFERROR(iView.EvaluateAll(), + OstTrace0( TRACE_ERROR, DUP1_CMTPDELTADATAMGR_GETMODIFIEDPUIDSL, "view evaluate failed!" )); iNeedToSendMore = ETrue; iView.FirstL(); iTotalRows = iView.CountL(); @@ -507,6 +536,7 @@ { iNeedToSendMore = EFalse; iView.Close(); + OstTraceFunctionExit0( CMTPDELTADATAMGR_GETMODIFIEDPUIDSL_EXIT ); return 0; } @@ -540,7 +570,7 @@ } } - __FLOG(_L8("GetDeletedPuidsL - Exit")); + OstTraceFunctionExit0( DUP1_CMTPDELTADATAMGR_GETMODIFIEDPUIDSL_EXIT ); return (iTotalRows - aPosition); } @@ -549,11 +579,12 @@ */ EXPORT_C void CMtpDeltaDataMgr::ResetMTPDeltaDataTableL() { - __FLOG(_L8("ResetMTPDeltaDataTableL - Entry")); + OstTraceFunctionEntry0( CMTPDELTADATAMGR_RESETMTPDELTADATATABLEL_ENTRY ); iView.Close(); iNeedToSendMore = EFalse; - User::LeaveIfError(iDatabase.Execute(KDeleteDeltaTable)); + LEAVEIFERROR(iDatabase.Execute(KDeleteDeltaTable), + OstTrace0( TRACE_ERROR, CMTPDELTADATAMGR_RESETMTPDELTADATATABLEL, "DELETE FROM MTPDeltaDataTable failed!" )); - __FLOG(_L8("ResetMTPDeltaDataTableL - Exit")); + OstTraceFunctionExit0( CMTPDELTADATAMGR_RESETMTPDELTADATATABLEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpdpidstore.cpp --- a/mtpfws/mtpfw/src/cmtpdpidstore.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpdpidstore.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -17,6 +17,12 @@ #include "cmtpdpidstore.h" #include "dbutility.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpdpidstoreTraces.h" +#endif + _LIT(KSQLDPIDTableName, "DPIDStore"); @@ -63,13 +69,16 @@ { if (!DBUtility::IsTableExistsL(iDatabase, KSQLDPIDTableName)) { - User::LeaveIfError(iDatabase.Execute(KSQLCreateDPIDTableText)); + LEAVEIFERROR(iDatabase.Execute(KSQLCreateDPIDTableText), + OstTrace0( TRACE_ERROR, CMTPDPIDSTORE_CREATEDPIDSTOTETABLEL, "TABLE DPIDStore create failed!" )); } iSqlStatement.Format(KSQLGetDPIDUID); RDbView view; CleanupClosePushL(view); - User::LeaveIfError(view.Prepare(iDatabase, TDbQuery(iSqlStatement))); - User::LeaveIfError(view.Evaluate()); + LEAVEIFERROR(view.Prepare(iDatabase, TDbQuery(iSqlStatement)), + OstTrace0( TRACE_ERROR, DUP1_CMTPDPIDSTORE_CREATEDPIDSTOTETABLEL, "view for DPIDStore prepare failed!" )); + LEAVEIFERROR(view.Evaluate(), + OstTrace0( TRACE_ERROR, DUP2_CMTPDPIDSTORE_CREATEDPIDSTOTETABLEL, "view evaluate failed!" )); while (view.NextL()) { view.GetL(); diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpframeworkconfig.cpp --- a/mtpfws/mtpfw/src/cmtpframeworkconfig.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpframeworkconfig.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -16,6 +16,12 @@ #include #include "cmtpframeworkconfig.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpframeworkconfigTraces.h" +#endif + /** CMTPFrameworkConfig factory method. @@ -52,6 +58,7 @@ } else if (KErrNone != err) { + OstTraceExt2( TRACE_ERROR, CMTPFRAMEWORKCONFIG_GETVALUEL_TPARAMETER_TDES, "can't get parameter(%d) value from iRepository, error code %d", aParam, err ); User::Leave(err); } } @@ -76,11 +83,13 @@ // Get the value ptr.Set(buf->Des()); - User::LeaveIfError(iRepository->Get(aParam, ptr)); + LEAVEIFERROR(iRepository->Get(aParam, ptr), + OstTrace1( TRACE_ERROR, CMTPFRAMEWORKCONFIG_VALUEL, "get parameter(%d) value from iRespository error!", aParam)); } } else if (KErrNotFound != err) { + OstTraceExt2( TRACE_ERROR, DUP1_CMTPFRAMEWORKCONFIG_VALUEL, "can't get parameter(%d) value from iRepository, error code %d", aParam, err ); User::Leave(err); } CleanupStack::Pop(buf); @@ -95,6 +104,8 @@ if ((KErrNone != err ) && (KErrNotFound != err)) { + OstTraceExt2( TRACE_ERROR, CMTPFRAMEWORKCONFIG_GETVALUEL_TPARAMETER_TUINT, + "can't get parameter(%d)value from iRepository, error code %d",aParam, err); User::Leave(err); } aValue = static_cast(value); @@ -113,6 +124,7 @@ if ((KErrNone != err ) && (KErrNotFound != err)) { + OstTraceExt2( TRACE_ERROR, CMTPFRAMEWORKCONFIG_GETVALUEL_TPARAMETER_TBOOL, "can't get parameter(%d)value from iRepository, error code %d", aParam, err ); User::Leave(err); }; } @@ -124,6 +136,7 @@ aArray.Reset(); if (CMTPFrameworkConfig::EExcludedStorageDrives != aParam) { + OstTrace1( TRACE_ERROR, CMTPFRAMEWORKCONFIG_GETVALUEL_TPARAMETER_RARRAY, "parameter %d not EExcludedStorageDrives", aParam); User::Leave(KErrArgument); } @@ -143,12 +156,15 @@ for (TInt index = 0; index < count; index++) { TInt value; - User::LeaveIfError(iRepository->Get(keys[index], value)); + LEAVEIFERROR(iRepository->Get(keys[index], value), + OstTrace1( TRACE_ERROR, DUP1_CMTPFRAMEWORKCONFIG_GETVALUEL_TPARAMETER_RARRAY, "can't get value from iRepository for key %d", keys[index])); aArray.AppendL(static_cast(value)); } } else if (KErrNotFound != err) { + OstTraceExt2(TRACE_ERROR, DUP2_CMTPFRAMEWORKCONFIG_GETVALUEL_TPARAMETER_RARRAY, + "can't get parameter(%d) value from iRepository, error code %d", aParam, err ); User::Leave(err); } @@ -176,6 +192,8 @@ TInt err(iRepository->Get(EAbnormalDown, iAbnormalDownValue)); if ((KErrNone != err ) && (KErrNotFound != err)) { + OstTrace1(TRACE_ERROR, CMTPFRAMEWORKCONFIG_CONSTRUCTL, + "can't get parameter(EAbnormalDown) value from iRepository, error code %d",err ); User::Leave(err); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtphandleallocator.cpp --- a/mtpfws/mtpfw/src/cmtphandleallocator.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtphandleallocator.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -19,6 +19,12 @@ #include "tmtptypeobjecthandle.h" #include "dbutility.h" #include "cmtpobjectstore.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtphandleallocatorTraces.h" +#endif + static const TUint KMTPMinimumId = 0x00000000; static const TUint KMTPMaximumId = 0x00FFFFFE; @@ -135,7 +141,8 @@ TInt increase = aDataProviderId - iNextIds.Count() + KMTPMaxDataProviderGranularity; while (increase--) { - User::LeaveIfError(iNextIds.Append(KMTPMinimumId)); + LEAVEIFERROR(iNextIds.Append(KMTPMinimumId), + OstTrace0( TRACE_ERROR, CMTPHANDLEALLOCATOR_EXTENDARRAYL, "add KMTPMinimumId to iNextIds error!" )); } } @@ -182,6 +189,7 @@ index = iNextIDPool.FindInOrder( aDataProviderId, CDPHandleCache::HanldeCacheOrderFromKeyAscending ); if( index == KErrNotFound ) { + OstTrace1( TRACE_ERROR, CMTPHANDLEALLOCATOR_NEXTIDFROMPOOLL, "can't find DpId %d in iNextIDPool", aDataProviderId); User::Leave(KErrOverflow); } } @@ -194,6 +202,8 @@ if(ret > KMTPMaximumId ) { + OstTrace1( TRACE_ERROR, DUP1_CMTPHANDLEALLOCATOR_NEXTIDFROMPOOLL, + "next HandleID %d in NextIDPool exceeds KMTPMaximuId!", ret ); User::Leave(KErrOverflow); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpobjectmgr.cpp --- a/mtpfws/mtpfw/src/cmtpobjectmgr.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpobjectmgr.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,6 +23,11 @@ #include "cmtpobjectstore.h" #include "tmtptypeobjecthandle.h" #include "cmtppkgidstore.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpobjectmgrTraces.h" +#endif + /** MTP object manager information record factory method. This method creates an empty object information record. @@ -156,6 +161,7 @@ TMTPTypeUint128 CMTPObjectMgr::PuidL(TInt64 /*aObjectUid*/) const { + OstTrace0( TRACE_ERROR, CMTPOBJECTMGR_PUIDL, "PuidL doesn't support TInt64 type parameter" ); User::Leave(KErrNotSupported); return TMTPTypeUint128(0); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpobjectstore.cpp --- a/mtpfws/mtpfw/src/cmtpobjectstore.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpobjectstore.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -33,6 +33,12 @@ #include "cmtpdeltadatamgr.h" #include #include "cmtpstoragemgr.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpobjectstoreTraces.h" +#endif + _LIT(KMTPDbDriveLocation, "c:"); _LIT(KMTPBackSlash, "\\"); @@ -47,7 +53,6 @@ _LIT(KSQLParentHandle, "ParentHandleIndex"); _LIT(KSQLCreateParentHandleText,"CREATE INDEX ParentHandleIndex on HandleStore (ParentHandle)"); _LIT(KMTPFormat, "MTP"); -__FLOG_STMT(_LIT8(KComponent,"MTPObjectStore");) const TInt KMaxLimitCommitInEnumeration = 1024; const TInt KMaxLimitCommitAfterEnumeration = 256; const TInt KMaxLimitCompactInEnumeration = 2048; @@ -70,6 +75,10 @@ } +CMTPObjectStore::CSnapshotWorker::~CSnapshotWorker() + { + Cancel(); + } void CMTPObjectStore::CSnapshotWorker::RunL() { iObjectStore->CleanDBSnapshotL(iOnlyRoot); @@ -139,7 +148,6 @@ iSingletons.Close(); iNonPersistentDPList.Close(); iEnumeratingCacheObjList.ResetAndDestroy(); - __FLOG_CLOSE; } /** @@ -192,20 +200,23 @@ TInt result = iNonPersistentDPList.InsertInOrder(aDataProviderId); if(result != KErrAlreadyExists) { - User::LeaveIfError(result); + LEAVEIFERROR(result, + OstTrace1( TRACE_ERROR, CMTPOBJECTSTORE_MARKNONPERSISTENTOBJECTSL, "insert DpId %d into iNonPersistentDPList error!", aDataProviderId )); } } void CMTPObjectStore::MarkDPLoadedL(TUint aDataProviderId, TBool aFlag) { - __FLOG(_L8("MarkDPFlafFalseL - Entry")); + OstTraceFunctionEntry0( CMTPOBJECTSTORE_MARKDPLOADEDL_ENTRY ); if (!aFlag) { _LIT(KSQLMarkfalgDPFalse, "UPDATE HandleStore SET DPFlag = %u WHERE DataProviderId = %u"); iSqlStatement.Format(KSQLMarkfalgDPFalse, aFlag, aDataProviderId); - User::LeaveIfError(iDatabase.Execute(iSqlStatement)); + LEAVEIFERROR(iDatabase.Execute(iSqlStatement), + OstTrace0( TRACE_ERROR, CMTPOBJECTSTORE_MARKDPLOADEDL, "UPDATE HandleStore SET DPFlag error!" )); + } - __FLOG(_L8("MarkNonPersistentObjectsL - Exit")); + OstTraceFunctionExit0( CMTPOBJECTSTORE_MARKDPLOADEDL_EXIT ); } TBool CMTPObjectStore::FilterObject(const RDbTable& aCurrRow,const TUint32 aStorageID,const TUint32 aFormatCode,const TUint32 aDpID) const @@ -337,7 +348,8 @@ TUint32 handle = HandleL(suid); if (handle != KMTPHandleNone) { - __FLOG(_L8("CommitReserverd leave for duplicate suid.")); + OstTrace0(TRACE_ERROR, CMTPOBJECTSTORE_COMMITRESERVEDOBJECTHANDLEL, + "CommitReserverd leave for duplicate suid."); User::Leave(KErrAlreadyExists); } TUint32 suidHash = DefaultHash::Des16(suid); @@ -435,7 +447,8 @@ void CMTPObjectStore::InsertObjectL(CMTPObjectMetaData& aObject) { - __FLOG(_L8("InsertObjectL - Entry")); + OstTraceFunctionEntry0( CMTPOBJECTSTORE_INSERTOBJECTL_ENTRY ); + iCachedHandle = 0; iCachedSuidHash = 0; TBool needToInsert = EFalse; @@ -445,6 +458,7 @@ if ((aObject.DesC(CMTPObjectMetaData::ESuid)).Length() > KMaxFileName) { // The length of object uid should not excceeds KMaxFileName + OstTrace0( TRACE_ERROR, DUP4_CMTPOBJECTSTORE_INSERTOBJECTL, "The length of object uid excceeds KMaxFileName" ); User::Leave( KErrBadName ); } @@ -492,7 +506,7 @@ delete iEnumeratingCacheObjList[found]; iEnumeratingCacheObjList.Remove(found); } - __FLOG_VA(_L8("Found in Snapshot")); + OstTrace0(TRACE_NORMAL, CMTPOBJECTSTORE_INSERTOBJECTL, "Found in Snapshot"); } else {//This is a totally new object. insert it after check the db to prevent user wrong operation @@ -514,9 +528,10 @@ } CleanupStack::PopAndDestroy(object); } - __FLOG_VA(_L8("Not Found in Snapshot")); + OstTrace0(TRACE_NORMAL, DUP1_CMTPOBJECTSTORE_INSERTOBJECTL, "Not Found in Snapshot"); } - __FLOG_VA((_L8("InsertObjectL Under enmueration, needUpdateOwner %d needToInsert %d"), needUpdateOwner, needToInsert)); + OstTraceExt2(TRACE_NORMAL, DUP2_CMTPOBJECTSTORE_INSERTOBJECTL, + "InsertObjectL Under enmueration, needUpdateOwner %d needToInsert %d", needUpdateOwner, needToInsert); } else { @@ -524,11 +539,13 @@ if (handle != KMTPHandleNone) { //Leaves if id already exists in suid map table + OstTrace1( TRACE_ERROR, DUP5_CMTPOBJECTSTORE_INSERTOBJECTL, "id %d already exists in suid map table", handle ); User::Leave(KErrAlreadyExists); } // dp is not enumerating, do a plain insert needToInsert = ETrue; - __FLOG_VA((_L8("InsertObjectL After enmueration, needUpdateOwner %d needToInsert %d"), needUpdateOwner, needToInsert)); + OstTraceExt2(TRACE_NORMAL, DUP3_CMTPOBJECTSTORE_INSERTOBJECTL, + "InsertObjectL After enmueration, needUpdateOwner %d needToInsert %d", needUpdateOwner, needToInsert); } if (needToInsert)//needToInsert and needUpdateOwner can't be true at same time @@ -584,7 +601,7 @@ } } - __FLOG(_L8("InsertObjectL - Exit")); + OstTraceFunctionExit0( CMTPOBJECTSTORE_INSERTOBJECTL_EXIT ); } void CMTPObjectStore::IncTranOpsNumL() @@ -595,7 +612,8 @@ CommitTransactionL(); if (iTransactionOps % iMaxCompactLimit == 0) { - User::LeaveIfError(iDatabase.Compact()); + LEAVEIFERROR(iDatabase.Compact(), + OstTrace0( TRACE_ERROR, CMTPOBJECTSTORE_INCTRANOPSNUML, "database compact error!" )); } BeginTransactionL(); } @@ -605,18 +623,21 @@ { if (!iDatabase.InTransaction()) { - User::LeaveIfError(iDatabase.Begin()); + LEAVEIFERROR(iDatabase.Begin(), + OstTrace0( TRACE_ERROR, CMTPOBJECTSTORE_BEGINTRANSACTIONL, "database begin error!" )); } } void CMTPObjectStore::CommitTransactionL() { - __FLOG(_L8("CommitTransactionL Entry")); + OstTraceFunctionEntry0( CMTPOBJECTSTORE_COMMITTRANSACTIONL_ENTRY ); if (iDatabase.InTransaction()) { - User::LeaveIfError(iDatabase.Commit()); + LEAVEIFERROR(iDatabase.Commit(), + OstTrace0( TRACE_ERROR, CMTPOBJECTSTORE_COMMITTRANSACTIONL, "database commit error!" )); + } - __FLOG(_L8("CommitTransactionL Exit")); + OstTraceFunctionExit0( CMTPOBJECTSTORE_COMMITTRANSACTIONL_EXIT ); } void CMTPObjectStore::InsertObjectsL(RPointerArray& aObjects) @@ -641,7 +662,7 @@ TUint32 handle2 = HandleL(suid); if (handle2 != KMTPHandleNone && handle2 != handle) { - __FLOG(_L8("ModifyObjectL leave for duplicate suid.")); + OstTrace0(TRACE_ERROR, CMTPOBJECTSTORE_MODIFYOBJECTL, "ModifyObjectL leave for duplicate suid."); User::Leave(KErrAlreadyExists); } @@ -684,6 +705,7 @@ } else { + OstTrace1( TRACE_ERROR, DUP1_CMTPOBJECTSTORE_MODIFYOBJECTL, "LocateByHandleL failed for handle %d", handle ); User::Leave(KErrNotFound); } } @@ -735,6 +757,7 @@ //iBatched owns the memory of Suid ? if (!LocateByHandleL(aHandle)) { + OstTrace1( TRACE_ERROR, CMTPOBJECTSTORE_OBJECTSUIDL, "LocateByHandleL failed for handle %d", aHandle ); User::Leave(KErrNotFound); } DbColReadStreamL(iBatched, EObjectStoreSUID, iSuidBuf); @@ -745,6 +768,7 @@ { if (!LocateByHandleL(aHandle)) { + OstTrace1( TRACE_ERROR, CMTPOBJECTSTORE_PUIDL_TUINT32, "LocateByHandleL failed for handle %d", aHandle ); User::Leave(KErrNotFound); } TUint64 highHalfPOUID = static_cast (iBatched.ColInt64(EObjectStorePOUID)); @@ -760,6 +784,7 @@ { if (!LocateBySuidL(aSuid)) { + OstTraceExt1( TRACE_ERROR, CMTPOBJECTSTORE_PUIDL_TDESC, "LocateByHandleL failed for suid %S", aSuid ); User::Leave(KErrNotFound); } TUint64 highHalfPOUID = static_cast (iBatched_SuidHashID.ColInt64(EObjectStorePOUID)); @@ -773,7 +798,9 @@ void CMTPObjectStore::RemoveObjectL(const TMTPTypeUint32& aHandle) { - __FLOG_VA((_L8("RemoveObjectL Entry Handle = 0x%x"), aHandle.Value())); + OstTraceFunctionEntry0( CMTPOBJECTSTORE_REMOVEOBJECTL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPOBJECTSTORE_REMOVEOBJECTL, + "Handle = 0x%x", aHandle.Value()); if (LocateByHandleL(aHandle.Value())) { if (iSingletons.DpController().EnumerateState() != CMTPDataProviderController::EEnumeratedFulllyCompleted && @@ -786,10 +813,10 @@ iCachedHandle = 0; iReferenceMgr->RemoveReferencesL(aHandle.Value()); iBatched.DeleteL(); - __FLOG(_L8("RemoveObjectL From iBacthed")); + OstTrace0(TRACE_NORMAL, DUP1_CMTPOBJECTSTORE_REMOVEOBJECTL, "RemoveObjectL From iBacthed"); IncTranOpsNumL(); } - __FLOG(_L8("RemoveObjectL Exit")); + OstTraceFunctionExit0( CMTPOBJECTSTORE_REMOVEOBJECTL_EXIT ); } void CMTPObjectStore::RemoveObjectL(const TDesC& aSuid) @@ -854,11 +881,12 @@ */ void CMTPObjectStore::CleanL() { - __FLOG(_L8("CleanL - Entry")); + OstTraceFunctionEntry0( CMTPOBJECTSTORE_CLEANL_ENTRY ); RemoveUndefinedObjectsL(); Swi::RSisRegistrySession sisSession; - User::LeaveIfError(sisSession.Connect()); + LEAVEIFERROR(sisSession.Connect(), + OstTrace0( TRACE_ERROR, DUP1_CMTPOBJECTSTORE_CLEANL, "can't connect to sisSession!" )); CleanupClosePushL(sisSession); const RArray& loadedDPIDs = iPkgIDStore->DPIDL(); @@ -871,7 +899,7 @@ { //DP is uninstalled, remove DP related data from database. TUint thisID = loadedDPIDs[idx]; - __FLOG_1(_L("Data provider[%d] is removed from device!"),thisID); + OstTrace1(TRACE_NORMAL, CMTPOBJECTSTORE_CLEANL, "Data provider[%d] is removed from device!", thisID); unInstalledDpIDs.AppendL(thisID); } } @@ -882,7 +910,7 @@ } CleanupStack::PopAndDestroy(&unInstalledDpIDs); CleanupStack::PopAndDestroy(&sisSession); - __FLOG(_L8("CleanL - Exit")); + OstTraceFunctionExit0( CMTPOBJECTSTORE_CLEANL_EXIT ); } TUint CMTPObjectStore::ObjectOwnerId(const TMTPTypeUint32& aHandle) const @@ -905,7 +933,6 @@ */ void CMTPObjectStore::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); iMaxCommitLimit = KMaxLimitCommitInEnumeration; iMaxCompactLimit = KMaxLimitCompactInEnumeration; iSingletons.OpenL(); @@ -915,10 +942,15 @@ iReferenceMgr = CMTPReferenceMgr::NewL(*this); iDPIDStore = CMTPDPIDStore::NewL(iDatabase); iPkgIDStore = CMTPPkgIDStore::NewL(iDatabase); - User::LeaveIfError(iBatched.Open(iDatabase, KSQLHandleTableName, RDbRowSet::EUpdatable)); - User::LeaveIfError(iBatched.SetIndex(KSQLHandleId)); - User::LeaveIfError(iBatched_SuidHashID.Open(iDatabase, KSQLHandleTableName, RDbRowSet::EUpdatable)); - User::LeaveIfError(iBatched_SuidHashID.SetIndex(KSQLSuidHash)); + LEAVEIFERROR(iBatched.Open(iDatabase, KSQLHandleTableName, RDbRowSet::EUpdatable), + OstTrace0( TRACE_ERROR, CMTPOBJECTSTORE_CONSTRUCTL, "iBatched open error!" )); + LEAVEIFERROR(iBatched.SetIndex(KSQLHandleId), + OstTrace0( TRACE_ERROR, DUP1_CMTPOBJECTSTORE_CONSTRUCTL, "set index for iBatched error!" )); + LEAVEIFERROR(iBatched_SuidHashID.Open(iDatabase, KSQLHandleTableName, RDbRowSet::EUpdatable), + OstTrace0( TRACE_ERROR, DUP2_CMTPOBJECTSTORE_CONSTRUCTL, "iBatched_SuidHashID open error!" )); + LEAVEIFERROR(iBatched_SuidHashID.SetIndex(KSQLSuidHash), + OstTrace0( TRACE_ERROR, DUP3_CMTPOBJECTSTORE_CONSTRUCTL, "set index for iBatched_SuidHashID error!")); + iHandleAllocator = CMTPHandleAllocator::NewL(*this); iSentinal = CEnumertingCacheItem::NewL(0, 0, 0, 0, 0, 0); BeginTransactionL(); @@ -972,7 +1004,9 @@ { BaflUtils::EnsurePathExistsL(iSingletons.Fs(), aFileName); - User::LeaveIfError(iDatabase.Replace(iSingletons.Fs(), aFileName, KMTPFormat)); + LEAVEIFERROR(iDatabase.Replace(iSingletons.Fs(), aFileName, KMTPFormat), + OstTrace0( TRACE_ERROR, CMTPOBJECTSTORE_CREATEDBL, " a new non-secure database create error!" )); + // Create table and index CreateHandleTableL(); CreateHandleIndexL(); @@ -1012,7 +1046,8 @@ { if (!DBUtility::IsTableExistsL(iDatabase, KSQLHandleTableName)) { - User::LeaveIfError(iDatabase.Execute(KSQLCreateHandleTableText)); + LEAVEIFERROR(iDatabase.Execute(KSQLCreateHandleTableText), + OstTrace0( TRACE_ERROR, CMTPOBJECTSTORE_CREATEHANDLETABLEL, "TABLE HandleStore create failed!" )); } } @@ -1025,21 +1060,25 @@ { if (!DBUtility::IsIndexExistsL(iDatabase, KSQLHandleTableName, KSQLHandleId)) { - User::LeaveIfError(iDatabase.Execute(KSQLCreateHandleIndexText)); + LEAVEIFERROR(iDatabase.Execute(KSQLCreateHandleIndexText), + OstTrace0( TRACE_ERROR, CMTPOBJECTSTORE_CREATEHANDLEINDEXL, "INDEX HandleIndex on HandleStore create failed!" )); } if (!DBUtility::IsIndexExistsL(iDatabase, KSQLHandleTableName, KSQLSuidHash)) { - User::LeaveIfError(iDatabase.Execute(KSQLCreateSuidIndexText)); + LEAVEIFERROR(iDatabase.Execute(KSQLCreateSuidIndexText), + OstTrace0( TRACE_ERROR, DUP1_CMTPOBJECTSTORE_CREATEHANDLEINDEXL, "INDEX SuidIndex on HandleStore create failed!" )); } if (!DBUtility::IsIndexExistsL(iDatabase, KSQLHandleTableName, KSQLParentHandle)) { - User::LeaveIfError(iDatabase.Execute(KSQLCreateParentHandleText)); + LEAVEIFERROR(iDatabase.Execute(KSQLCreateParentHandleText), + OstTrace0( TRACE_ERROR, DUP2_CMTPOBJECTSTORE_CREATEHANDLEINDEXL, "INDEX ParentHandleIndex on HandleStore create failed!" )); } } else { + OstTrace0( TRACE_ERROR, DUP3_CMTPOBJECTSTORE_CREATEHANDLEINDEXL, "HandleStore table doesn't exist" ); User::Leave(KErrNotFound); } } @@ -1068,17 +1107,18 @@ TBool CMTPObjectStore::LocateByHandleL(const TUint aHandle, const TBool aReadTable /*default = ETrue*/) const { - __FLOG_VA((_L8("LocateByHandleL - Entry aHandle 0x%x"), aHandle)); + OstTraceFunctionEntry1( CMTPOBJECTSTORE_LOCATEBYHANDLEL_ENTRY, this ); + OstTrace1(TRACE_NORMAL, CMTPOBJECTSTORE_LOCATEBYHANDLEL, "aHandle 0x%x", aHandle); TBool result = EFalse; if(IsInvalidHandle(aHandle)) { - __FLOG_VA((_L8("LocateByHandleL - Exit result 0x%x"), result)); + OstTraceFunctionExitExt( CMTPOBJECTSTORE_LOCATEBYHANDLEL_EXIT, this, result ); return result; } if (iCachedHandle == aHandle) { - __FLOG(_L8("CacheHit")); + OstTrace0(TRACE_NORMAL, DUP1_CMTPOBJECTSTORE_LOCATEBYHANDLEL, "CacheHit"); result = ETrue; } else @@ -1097,7 +1137,7 @@ { iBatched.GetL(); } - __FLOG_VA((_L8("LocateByHandleL - Exit result 0x%x"), result)); + OstTraceFunctionExitExt( DUP1_CMTPOBJECTSTORE_LOCATEBYHANDLEL_EXIT, this, result ); return result; } @@ -1271,10 +1311,12 @@ //2. FileDP will san the whole file system, and will try to enumerate all of the objects(might on behalf of another DP) if the objects is still not // in the object store after all other DP finish its enumeration. //3. Then notify the related DP about the newly added objects by notification API; - __FLOG(_L8("EstablishDBSnapshotL - Entry")); + OstTraceFunctionEntry0( CMTPOBJECTSTORE_ESTABLISHDBSNAPSHOTL_ENTRY ); + RDbTable temp; CleanupClosePushL(temp); - User::LeaveIfError(temp.Open(iDatabase, KSQLHandleTableName, RDbRowSet::EUpdatable)); + LEAVEIFERROR(temp.Open(iDatabase, KSQLHandleTableName, RDbRowSet::EUpdatable), + OstTrace0( TRACE_ERROR, DUP1_CMTPOBJECTSTORE_ESTABLISHDBSNAPSHOTL, "HandleStore table open failed!" )); if(!iCacheExist) { TInt32 count = temp.CountL(RDbRowSet::EQuick); @@ -1321,7 +1363,8 @@ if(result != KErrAlreadyExists) { - User::LeaveIfError(result); + LEAVEIFERROR(result, + OstTrace1( TRACE_ERROR, DUP2_CMTPOBJECTSTORE_ESTABLISHDBSNAPSHOTL, "insert into iEnumeratingCacheObjList failed, error code %d", result)); CleanupStack::Pop(item); } else @@ -1335,7 +1378,9 @@ CleanupStack::PopAndDestroy(&temp); iCacheExist = ETrue; - __FLOG_VA((_L8("EstablishDBSnapshotL - Exit build %d items"), iEnumeratingCacheObjList.Count())); + OstTrace1(TRACE_NORMAL, CMTPOBJECTSTORE_ESTABLISHDBSNAPSHOTL, + "EstablishDBSnapshotL - Exit build %d items", iEnumeratingCacheObjList.Count()); + OstTraceFunctionExit0( CMTPOBJECTSTORE_ESTABLISHDBSNAPSHOTL_EXIT ); } /* * All Objects enumeration complete @@ -1352,7 +1397,8 @@ iMaxCommitLimit = KMaxLimitCommitAfterEnumeration; iMaxCompactLimit = KMaxLimitCompactAfterEnumeration; CommitTransactionL(); - User::LeaveIfError(iDatabase.Compact()); + LEAVEIFERROR(iDatabase.Compact(), + OstTrace0( TRACE_ERROR, CMTPOBJECTSTORE_OBJECTSENUMCOMPLETE, "database compact failed!" )); BeginTransactionL(); } @@ -1364,7 +1410,7 @@ //and then close the iEnumeratingCacheObjList to release the memory. //_LIT(KInsert, "CMTPObjectStore::CleanDBSnapshot"); //volatile TTimer t(KInsert); - __FLOG(_L8("CleanDBSnapshotL Entry")); + OstTraceFunctionEntry0( CMTPOBJECTSTORE_CLEANDBSNAPSHOTL_ENTRY ); if (iSnapshotWorker == NULL) { iSnapshotCleanPos = iEnumeratingCacheObjList.Count() - 1; @@ -1380,7 +1426,8 @@ TInt rc = iNonPersistentDPList.FindInOrder(iEnumeratingCacheObjList[iSnapshotCleanPos]->iDpID); if (rc != KErrNotFound) {//This is a non persistent DP. - __FLOG_VA((_L8("Remove Object 0x%x"), iEnumeratingCacheObjList[iSnapshotCleanPos]->iObjHandleId)); + OstTrace1(TRACE_NORMAL, CMTPOBJECTSTORE_CLEANDBSNAPSHOTL, + "Remove Object 0x%x", iEnumeratingCacheObjList[iSnapshotCleanPos]->iObjHandleId); RemoveObjectL(iEnumeratingCacheObjList[iSnapshotCleanPos]->iObjHandleId); } } @@ -1400,25 +1447,28 @@ iSnapshotWorker = NULL; } - __FLOG(_L8("CleanDBSnapshotL Exit")); + OstTraceFunctionExit0( CMTPOBJECTSTORE_CLEANDBSNAPSHOTL_EXIT ); } void CMTPObjectStore::RemoveUndefinedObjectsL() { - __FLOG(_L8("CompactDBSnapshotL Entry")); + OstTraceFunctionEntry0( CMTPOBJECTSTORE_REMOVEUNDEFINEDOBJECTSL_ENTRY ); if (iCleanUndefined) { + OstTraceFunctionExit0( CMTPOBJECTSTORE_REMOVEUNDEFINEDOBJECTSL_EXIT ); return; } TInt32 count = 0; RDbTable temp; CleanupClosePushL(temp); - User::LeaveIfError(temp.Open(iDatabase, KSQLHandleTableName, RDbRowSet::EUpdatable)); + LEAVEIFERROR(temp.Open(iDatabase, KSQLHandleTableName, RDbRowSet::EUpdatable), + OstTrace0( TRACE_ERROR, DUP1_CMTPOBJECTSTORE_REMOVEUNDEFINEDOBJECTSL, "HandleStore Table open error!" )); count = temp.CountL(RDbRowSet::EQuick); - __FLOG_VA((_L8("Count before deletion %d "), count)); + OstTrace1(TRACE_NORMAL, CMTPOBJECTSTORE_REMOVEUNDEFINEDOBJECTSL, + "Count before deletion %d ", count); CleanupStack::PopAndDestroy(&temp); if (count > KMaxLimitSnapshotSize) @@ -1426,13 +1476,14 @@ // Delete all object with undefined format _LIT(KSQLDeleteObjectText, "DELETE FROM HandleStore WHERE FormatCode = %u"); iSqlStatement.Format(KSQLDeleteObjectText, EMTPFormatCodeUndefined); - User::LeaveIfError(iDatabase.Execute(iSqlStatement)); + LEAVEIFERROR(iDatabase.Execute(iSqlStatement), + OstTrace0( TRACE_ERROR, DUP2_CMTPOBJECTSTORE_REMOVEUNDEFINEDOBJECTSL, "DELETE FROM HandleStore failed!")); } iCleanUndefined = ETrue; - __FLOG(_L8("CompactDBSnapshotL Exit")); + OstTraceFunctionExit0( DUP1_CMTPOBJECTSTORE_REMOVEUNDEFINEDOBJECTSL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpparserrouter.cpp --- a/mtpfws/mtpfw/src/cmtpparserrouter.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpparserrouter.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -26,9 +26,13 @@ #include "cmtpstoragemgr.h" #include "tmtptypeobjecthandle.h" #include "cmtpservicemgr.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpparserrouterTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"ParserRouter");) + /** Provides the byte size of the specified array. @@ -144,11 +148,10 @@ */ CMTPParserRouter::~CMTPParserRouter() { - __FLOG(_L8("~CMTPParserRouter, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_CMTPPARSERROUTER_DES_ENTRY ); iMaps.ResetAndDestroy(); iSingletons.Close(); - __FLOG(_L8("~CMTPParserRouter, Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPPARSERROUTER_CMTPPARSERROUTER_DES_EXIT ); } /** @@ -159,7 +162,7 @@ */ EXPORT_C void CMTPParserRouter::ConfigureL() { - __FLOG(_L8("ConfigureL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_CONFIGUREL_ENTRY ); const TUint KMapIds[] = { ESubTypeDevicePropCode, @@ -215,8 +218,11 @@ CleanupStack::PopAndDestroy(&p1Codes); } - __FLOG_STMT(FLOGMapsL()); - __FLOG(_L8("ConfigureL, Exit")); +#ifdef OST_TRACE_COMPILER_IN_USE + OSTMapsL(); +#endif + + OstTraceFunctionExit0( CMTPPARSERROUTER_CONFIGUREL_EXIT ); } /** @@ -227,7 +233,7 @@ */ EXPORT_C TBool CMTPParserRouter::OperationSupportedL(TUint16 aOperation) const { - __FLOG(_L8("OperationSupported, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_OPERATIONSUPPORTEDL_ENTRY ); RArray from; RArray to; CleanupClosePushL(from); @@ -239,7 +245,7 @@ CleanupStack::PopAndDestroy(&to); CleanupStack::PopAndDestroy(&from); - __FLOG(_L8("OperationSupported, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_OPERATIONSUPPORTEDL_EXIT ); return (ret); } @@ -266,9 +272,9 @@ */ EXPORT_C void CMTPParserRouter::ParseOperationRequestL(TRoutingParameters& aParams) const { - __FLOG(_L8("ParseOperationRequestL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_PARSEOPERATIONREQUESTL_ENTRY ); const TUint16 KOpCode(aParams.Request().Uint16(TMTPTypeRequest::ERequestOperationCode)); - __FLOG_VA((_L8("Operation Code = 0x%04X"), KOpCode)); + OstTrace1(TRACE_NORMAL, CMTPPARSERROUTER_PARSEOPERATIONREQUESTL, "Operation Code = 0x%04X", KOpCode); switch (KOpCode) { case EMTPOpCodeGetStorageInfo: @@ -379,7 +385,7 @@ default: break; } - __FLOG(_L8("ParseOperationRequestL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_PARSEOPERATIONREQUESTL_EXIT ); } /** @@ -392,7 +398,7 @@ */ EXPORT_C void CMTPParserRouter::RouteOperationRequestL(const TRoutingParameters& aParams, RArray& aTargets) const { - __FLOG(_L8("RouteOperationRequestL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_ROUTEOPERATIONREQUESTL_ENTRY ); aTargets.Reset(); // By default ETypeOperationParameter routing is always enabled. @@ -458,7 +464,7 @@ CleanupStack::PopAndDestroy(¶ms); CleanupStack::PopAndDestroy(&validation); CleanupStack::PopAndDestroy(&routing); - __FLOG(_L8("RouteOperationRequestL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_ROUTEOPERATIONREQUESTL_EXIT ); } /** @@ -474,7 +480,7 @@ */ EXPORT_C TBool CMTPParserRouter::RouteRequestRegisteredL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) const { - __FLOG(_L8("RouteRequestRegistered, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_ROUTEREQUESTREGISTEREDL_ENTRY ); TBool ret(EFalse); const TUint32 KSessionId(aRequest.Uint32(TMTPTypeRequest::ERequestSessionID)); if ((KSessionId != KMTPSessionAll) && (aConnection.SessionWithMTPIdExists(KSessionId))) @@ -482,7 +488,7 @@ CMTPSession& session(static_cast(aConnection.SessionWithMTPIdL(KSessionId))); ret = session.RouteRequestRegistered(aRequest.Uint16(TMTPTypeRequest::ERequestOperationCode)); } - __FLOG(_L8("RouteRequestRegistered, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_ROUTEREQUESTREGISTEREDL_EXIT ); return ret; } @@ -498,7 +504,7 @@ */ void CMTPParserRouter::ProcessEventL(const TMTPTypeEvent& aEvent, CMTPConnection& aConnection) const { - __FLOG(_L8("ProcessEventL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_PROCESSEVENTL_ENTRY ); if ((aEvent.Uint16(TMTPTypeEvent::EEventCode) == EMTPEventCodeCancelTransaction) && (aConnection.SessionWithMTPIdExists(aEvent.Uint32(TMTPTypeEvent::EEventSessionID)))) { @@ -508,7 +514,7 @@ iSingletons.DpController().DataProviderL(RoutingTargetL(session.ActiveRequestL(), aConnection)).ExecuteEventL(aEvent, aConnection); } } - __FLOG(_L8("ProcessEventL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_PROCESSEVENTL_EXIT ); } /** @@ -519,9 +525,9 @@ */ void CMTPParserRouter::ProcessRequestL(const TMTPTypeRequest& aRequest, CMTPConnection& aConnection) const { - __FLOG(_L8("ProcessRequestL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_PROCESSREQUESTL_ENTRY ); iSingletons.DpController().DataProviderL(RoutingTargetL(aRequest, aConnection)).ExecuteRequestL(aRequest, aConnection); - __FLOG(_L8("ProcessRequestL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_PROCESSREQUESTL_EXIT ); } /** @@ -536,7 +542,7 @@ */ void CMTPParserRouter::RouteRequestRegisterL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection, TInt aId) { - __FLOG(_L8("RouteRequestRegisterL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_ROUTEREQUESTREGISTERL_ENTRY ); const TUint32 KSessionId(aRequest.Uint32(TMTPTypeRequest::ERequestSessionID)); if (KSessionId == KMTPSessionAll) { @@ -564,7 +570,7 @@ CMTPSession& session(static_cast(aConnection.SessionWithMTPIdL(KSessionId))); session.RouteRequestRegisterL(aRequest, aId); } - __FLOG(_L8("RouteRequestRegisterL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_ROUTEREQUESTREGISTERL_EXIT ); } /** @@ -578,10 +584,10 @@ */ void CMTPParserRouter::RouteRequestUnregisterL(const TMTPTypeRequest& aRequest, MMTPConnection& aConnection) { - __FLOG(_L8("RouteRequestUnregisterL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_ROUTEREQUESTUNREGISTERL_ENTRY ); CMTPSession& session(static_cast(aConnection.SessionWithMTPIdL(aRequest.Uint32(TMTPTypeRequest::ERequestSessionID)))); session.RouteRequestUnregister(aRequest); - __FLOG(_L8("RouteRequestUnregisterL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_ROUTEREQUESTUNREGISTERL_EXIT ); } /** @@ -634,7 +640,6 @@ { iToBranches.ResetAndDestroy(); } - __FLOG_CLOSE; } /** @@ -677,7 +682,9 @@ if (Params(iSubType) == ESubTypeParams1) { // Node. - __FLOG_STMT(FLOGMapEntryL(aFrom, aTo)); +#ifdef OST_TRACE_COMPILER_IN_USE + OSTMapEntryL(aFrom, aTo); +#endif const TUint KSubType(CMTPParserRouter::SubType(Index(iSubType), Flags(iSubType), (ParamsCount(iSubType) - 1))); const TMap KNode(KFrom, aTo, KSubType); NodeInsertL(KNode); @@ -704,7 +711,7 @@ */ void CMTPParserRouter::CMap::GetToL(const RArray& aFrom, RArray& aTo) const { - __FLOG(_L8("CMap::GetToL - entry")); + OstTraceFunctionEntry0( CMAP_GETTOL_ENTRY ); const TUint KFrom(Param(aFrom)); if (KFrom == KMTPNotSpecified32) { @@ -720,8 +727,8 @@ { // Select 0 .. 1 matching targets. SelectTargetSingleL(aFrom, aTo); - } - __FLOG(_L8("CMap::GetToL - Exit")); + } + OstTraceFunctionExit0( CMAP_GETTOL_EXIT ); } /** @@ -733,7 +740,7 @@ return iSubType; } -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE /** Logs the map table entries (source and target) which match the specified source parameters. @@ -741,7 +748,7 @@ @leave One of the system wide error codes, if a general processing error occurs. */ -void CMTPParserRouter::CMap::FLOGMapL(RArray& aFrom) const +void CMTPParserRouter::CMap::OSTMapL(RArray& aFrom) const { if (Params(iSubType) == ESubTypeParams1) { @@ -750,7 +757,7 @@ for (TUint i(0); (i < KCount); i++) { aFrom[ParamIdx(aFrom)] = iToNodes[i].iFrom; - FLOGMapEntryL(aFrom, iToNodes[i].iTo); + OSTMapEntryL(aFrom, iToNodes[i].iTo); } } else @@ -761,7 +768,7 @@ { const CMap& KBranch(*iToBranches[i]); aFrom[ParamIdx(aFrom)] = KBranch.iFrom; - KBranch.FLOGMapL(aFrom); + KBranch.OSTMapL(aFrom); } } } @@ -773,7 +780,7 @@ @leave One of the system wide error codes, if a general processing error occurs. */ -void CMTPParserRouter::CMap::FLOGMapEntryL(const RArray& aFrom, TUint aTo) const +void CMTPParserRouter::CMap::OSTMapEntryL(const RArray& aFrom, TUint aTo) const { __ASSERT_DEBUG((aFrom.Count() >= ParamsCount(iSubType)), User::Invariant()); RBuf log; @@ -791,7 +798,7 @@ } log.Append(_L("-> 0x")); log.AppendNumFixedWidthUC(aTo, EHex, KWidthTo); - __FLOG(log); + OstTraceExt1(TRACE_NORMAL, CMTPPARSERROUTER_CMAP_OSTMAPENTRYL, "%S", log); CleanupStack::PopAndDestroy(&log); } #endif @@ -828,7 +835,6 @@ */ void CMTPParserRouter::CMap::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); } /** @@ -910,7 +916,8 @@ } else { - User::LeaveIfError(err); + LEAVEIFERROR(err, + OstTrace1( TRACE_ERROR, CMAP_NODEINSERTL, "Inserts the specified map node into the map node table failed, error code %d", err )); } } const TInt KIdx(NodeFind(aMap)); @@ -978,7 +985,7 @@ */ void CMTPParserRouter::CMap::SelectTargetMatchingL(const RArray& aFrom, RArray& aTo) const { - __FLOG(_L8("CMap::SelectTargetMatchingL - entry")); + OstTraceFunctionEntry0( CMAP_SELECTTARGETMATCHINGL_ENTRY ); const TUint KFrom(Param(aFrom)); TInt idx(KErrNotFound); if (Params(iSubType) == ESubTypeParams1) @@ -1003,8 +1010,8 @@ { iToBranches[idx++]->GetToL(aFrom, aTo); } - } - __FLOG(_L8("CMap::SelectTargetMatchingL - exit")); + } + OstTraceFunctionExit0( CMAP_SELECTTARGETMATCHINGL_EXIT ); } /** @@ -1207,10 +1214,9 @@ */ void CMTPParserRouter::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); - __FLOG(_L8("ConstructL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_CONSTRUCTL_EXIT ); } /** @@ -1301,14 +1307,14 @@ */ void CMTPParserRouter::SelectTargetL(TUint aTarget, RArray& aTargets) { - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("SelectTargetL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_SELECTTARGETL_ENTRY ); TInt idx(aTargets.Find(aTarget)); if (idx != KErrNotFound) { aTargets.Remove(idx); } aTargets.AppendL(aTarget); - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("SelectTargetL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_SELECTTARGETL_EXIT ); } /** @@ -1333,9 +1339,10 @@ for (TUint d(0); (d < KCount); d++) { CMTPDataProvider& dp(iSingletons.DpController().DataProviderByIndexL(d)); - __FLOG(_L8("")); - __FLOG_VA((_L8("Creating DP %02d Table 0x%08X Entries"), dp.DataProviderId(), aSubType)); - __FLOG(_L8("---------------------------------------")); + OstTrace0(TRACE_NORMAL, CMTPPARSERROUTER_CONFIGURE1PARAMETERMAPL,""); + OstTraceExt2(TRACE_NORMAL, DUP1_CMTPPARSERROUTER_CONFIGURE1PARAMETERMAPL, + "Creating DP %d Table 0x%X Entries", dp.DataProviderId(), aSubType); + OstTrace0(TRACE_NORMAL, DUP2_CMTPPARSERROUTER_CONFIGURE1PARAMETERMAPL,"----------------"); RArray p1s; CleanupClosePushL(p1s); @@ -1348,7 +1355,7 @@ map.InsertL(from, dp.DataProviderId()); } CleanupStack::PopAndDestroy(&p1s); - __FLOG(_L8("")); + OstTrace0(TRACE_NORMAL, DUP3_CMTPPARSERROUTER_CONFIGURE1PARAMETERMAPL,""); } CleanupStack::PopAndDestroy(&from); } @@ -1377,9 +1384,10 @@ for (TUint d(0); (d < KCountDps); d++) { CMTPDataProvider& dp(iSingletons.DpController().DataProviderByIndexL(d)); - __FLOG(_L8("")); - __FLOG_VA((_L8("Creating DP %02d Table 0x%08X Entries"), dp.DataProviderId(), aSubType)); - __FLOG(_L8("---------------------------------------")); + OstTrace0(TRACE_NORMAL, CMTPPARSERROUTER_CONFIGURE2PARAMETERMAPL,""); + OstTraceExt2(TRACE_NORMAL, DUP1_CMTPPARSERROUTER_CONFIGURE2PARAMETERMAPL, + "Creating DP %d Table 0x%X Entries", dp.DataProviderId(), aSubType); + OstTrace0(TRACE_NORMAL, DUP2_CMTPPARSERROUTER_CONFIGURE2PARAMETERMAPL,"----------------"); RArray p1s; CleanupClosePushL(p1s); @@ -1411,7 +1419,7 @@ } } CleanupStack::PopAndDestroy(&p1s); - __FLOG(_L8("")); + OstTrace0(TRACE_NORMAL, DUP3_CMTPPARSERROUTER_CONFIGURE2PARAMETERMAPL,""); } CleanupStack::PopAndDestroy(&from); } @@ -1442,9 +1450,10 @@ for (TUint d(0); (d < KCount); d++) { CMTPDataProvider& dp(iSingletons.DpController().DataProviderByIndexL(d)); - __FLOG(_L8("")); - __FLOG_VA((_L8("Creating DP %02d Table 0x%08X Entries"), dp.DataProviderId(), aSubType)); - __FLOG(_L8("---------------------------------------")); + OstTrace0(TRACE_NORMAL, CMTPPARSERROUTER_CONFIGURE3PARAMETERMAPL,""); + OstTraceExt2(TRACE_NORMAL, DUP1_CMTPPARSERROUTER_CONFIGURE3PARAMETERMAPL, + "Creating DP %d Table 0x%X Entries", dp.DataProviderId(), aSubType); + OstTrace0(TRACE_NORMAL, DUP2_CMTPPARSERROUTER_CONFIGURE3PARAMETERMAPL,"----------------"); RArray p1s; CleanupClosePushL(p1s); @@ -1493,7 +1502,7 @@ CleanupStack::PopAndDestroy(&p3s); } CleanupStack::PopAndDestroy(&p1s); - __FLOG(_L8("")); + OstTrace0(TRACE_NORMAL, DUP3_CMTPPARSERROUTER_CONFIGURE3PARAMETERMAPL,""); } CleanupStack::PopAndDestroy(&from); } @@ -1520,12 +1529,14 @@ { if(( EServiceIDs == aCodes[c] )&&( iSingletons.ServiceMgr().IsSupportedService( KParams[p] )) ) { - __FLOG_1(_L8("GetConfigParametersL, abstract service id = %d"), KParams[p]); + OstTrace1( TRACE_NORMAL, CMTPPARSERROUTER_GETCONFIGPARAMETERSL, + "GetConfigParametersL, abstract service id = %d",KParams[p] ); continue; } TInt err(aParams.InsertInOrder(KParams[p])); if ((err != KErrNone) && (err != KErrAlreadyExists)) { + OstTrace1( TRACE_ERROR, DUP1_CMTPPARSERROUTER_GETCONFIGPARAMETERSL, "insert into aParams error! error code %d", err ); User::Leave(err); } } @@ -1543,7 +1554,7 @@ */ void CMTPParserRouter::GetRoutingSubTypesL(RArray& aParams, RArray& aRoutingSubTypes, RArray& aValidationSubTypes) const { - __FLOG(_L8("GetRoutingSubTypesL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_GETROUTINGSUBTYPESL_ENTRY ); __ASSERT_DEBUG((aParams.Count() > 0), User::Invariant()); aRoutingSubTypes.Reset(); aValidationSubTypes.Reset(); @@ -1743,7 +1754,7 @@ break; } } - __FLOG(_L8("GetRoutingSubTypesL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_GETROUTINGSUBTYPESL_EXIT ); } /** @@ -1758,7 +1769,7 @@ */ void CMTPParserRouter::GetRoutingSubTypesDeleteRequestL(RArray& aParams, RArray& aRoutingSubTypes, RArray& aValidationSubTypes) const { - __FLOG(_L8("GetRoutingSubTypesDeleteRequestL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_GETROUTINGSUBTYPESDELETEREQUESTL_ENTRY ); TRoutingParameters& params1(aParams[0]); __ASSERT_DEBUG((params1.Request().Uint16(TMTPTypeRequest::ERequestOperationCode) == EMTPOpCodeDeleteObject), User::Invariant()); @@ -1793,7 +1804,7 @@ } SelectSubTypeRoutingL(ESubTypeOwnerObject, aRoutingSubTypes, aValidationSubTypes, aParams); } - __FLOG(_L8("GetRoutingSubTypesDeleteRequestL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_GETROUTINGSUBTYPESDELETEREQUESTL_EXIT ); } /** @@ -1808,7 +1819,7 @@ */ void CMTPParserRouter::GetRoutingSubTypesCopyMoveRequestL(RArray& aParams, RArray& aRoutingSubTypes, RArray& aValidationSubTypes) const { - __FLOG(_L8("GetRoutingSubTypesCopyMoveRequestL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_GETROUTINGSUBTYPESCOPYMOVEREQUESTL_ENTRY ); const TUint KObjectFormatCode(aParams[0].Param(TRoutingParameters::EParamFormatCode)); if (KObjectFormatCode == EMTPFormatCodeAssociation) { @@ -1818,7 +1829,7 @@ { SelectSubTypeRoutingL(ESubTypeOwnerObject, aRoutingSubTypes, aValidationSubTypes, aParams); } - __FLOG(_L8("GetRoutingSubTypesCopyMoveRequestL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_GETROUTINGSUBTYPESCOPYMOVEREQUESTL_EXIT ); } /** Provides the set of operation parameter routing and validation sub-types to be @@ -1832,7 +1843,7 @@ */ void CMTPParserRouter::GetRoutingSubTypesGetObjectPropListRequestL(RArray& aParams, RArray& aRoutingSubTypes, RArray& aValidationSubTypes) const { - __FLOG(_L8("GetRoutingSubTypesGetObjectPropListRequestL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_GETROUTINGSUBTYPESGETOBJECTPROPLISTREQUESTL_ENTRY ); TRoutingParameters& params1(aParams[0]); __ASSERT_DEBUG((params1.Request().Uint16(TMTPTypeRequest::ERequestOperationCode) == EMTPOpCodeGetObjectPropList), User::Invariant()); if (params1.Param(TRoutingParameters::EFlagRoutingTypes) & ETypeOperationParameter) @@ -1875,7 +1886,7 @@ } } - __FLOG(_L8("GetRoutingSubTypesGetObjectPropListRequestL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_GETROUTINGSUBTYPESGETOBJECTPROPLISTREQUESTL_EXIT ); } /** @@ -1890,7 +1901,7 @@ */ void CMTPParserRouter::GetRoutingSubTypesSendObjectPropListRequestL(RArray& aParams, RArray& aRoutingSubTypes, RArray& aValidationSubTypes) const { - __FLOG(_L8("GetRoutingSubTypesSendObjectPropListRequestL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_GETROUTINGSUBTYPESSENDOBJECTPROPLISTREQUESTL_ENTRY ); TRoutingParameters& params1(aParams[0]); __ASSERT_DEBUG((params1.Request().Uint16(TMTPTypeRequest::ERequestOperationCode) == EMTPOpCodeSendObjectPropList), User::Invariant()); const TUint KRoutingTypes(params1.Param(TRoutingParameters::EFlagRoutingTypes)); @@ -1903,12 +1914,12 @@ { SelectSubTypeRoutingL(ESubTypeFormatCodeFormatSubcodeStorageType, aRoutingSubTypes, aValidationSubTypes, aParams); } - __FLOG(_L8("GetRoutingSubTypesSendObjectPropListRequestL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_GETROUTINGSUBTYPESSENDOBJECTPROPLISTREQUESTL_EXIT ); } void CMTPParserRouter::GetRoutingSubTypesDeleteObjectPropListL(RArray& aParams, RArray& aRoutingSubTypes, RArray& aValidationSubTypes) const { - __FLOG(_L8("GetRoutingSubTypesDeleteObjectPropListL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_GETROUTINGSUBTYPESDELETEOBJECTPROPLISTL_ENTRY ); TRoutingParameters& params1(aParams[0]); __ASSERT_DEBUG((params1.Request().Uint16(TMTPTypeRequest::ERequestOperationCode) == EMTPOpCodeDeleteObjectPropList), User::Invariant()); @@ -1923,12 +1934,12 @@ SelectSubTypeRoutingL(ESubTypeOwnerObject, aRoutingSubTypes, aValidationSubTypes, aParams); } - __FLOG(_L8("GetRoutingSubTypesDeleteObjectPropListL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_GETROUTINGSUBTYPESDELETEOBJECTPROPLISTL_EXIT ); } void CMTPParserRouter::GetRoutingSubTypesGetFormatCapabilitiesL(RArray& aParams, RArray& aRoutingSubTypes, RArray& aValidationSubTypes) const { - __FLOG(_L8("GetRoutingSubTypesGetFormatCapabilities, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_GETROUTINGSUBTYPESGETFORMATCAPABILITIESL_ENTRY ); TRoutingParameters& params1(aParams[0]); __ASSERT_DEBUG((params1.Request().Uint16(TMTPTypeRequest::ERequestOperationCode) == EMTPOpCodeGetFormatCapabilities), User::Invariant()); @@ -1942,7 +1953,7 @@ SelectSubTypeRoutingL(ESubTypeFormatCodeOperationCode, aRoutingSubTypes, aValidationSubTypes, aParams); } - __FLOG(_L8("GetRoutingSubTypesGetFormatCapabilities, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_GETROUTINGSUBTYPESGETFORMATCAPABILITIESL_EXIT ); } /** @@ -1958,9 +1969,10 @@ */ void CMTPParserRouter::ParseOperationRequestParameterL(TMTPTypeRequest::TElements aParam, TRoutingParameters::TParameterType aType, TRoutingParameters& aParams) const { - __FLOG(_L8("ParseOperationRequestParameterL, Entry")); - const TUint32 KParam(aParams.Request().Uint32(aParam)); - __FLOG_VA((_L8("Parameter %d = 0x%08X"), (aParam - TMTPTypeRequest::ERequestParameter1 + 1), KParam)); + OstTraceFunctionEntry0( CMTPPARSERROUTER_PARSEOPERATIONREQUESTPARAMETERL_ENTRY ); + const TUint32 KParam(aParams.Request().Uint32(aParam)); + OstTraceExt2(TRACE_NORMAL, CMTPPARSERROUTER_PARSEOPERATIONREQUESTPARAMETERL, + "Parameter %d = 0x%X", (aParam - TMTPTypeRequest::ERequestParameter1 + 1), (int)KParam); // Parse out the parameter value if a non-null value is present. if (KParam != KMTPNotSpecified32) @@ -2015,7 +2027,7 @@ default: break; } - __FLOG(_L8("ParseOperationRequestParameterL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_PARSEOPERATIONREQUESTPARAMETERL_EXIT ); } /** @@ -2029,8 +2041,9 @@ */ void CMTPParserRouter::RouteOperationRequestNParametersL(TUint aRoutingSubType, const TRoutingParameters& aParams, RArray& aTargets) const { - __FLOG(_L8("RouteOperationRequestNParametersL, Entry")); - __FLOG_VA((_L8("Routing Sub-type = 0x%08X"), aRoutingSubType)); + OstTraceFunctionEntry0( CMTPPARSERROUTER_ROUTEOPERATIONREQUESTNPARAMETERSL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPPARSERROUTER_ROUTEOPERATIONREQUESTNPARAMETERSL, + "Routing Sub-type = 0x%X", aRoutingSubType); // Build the set of map source parameter values. RArray from; @@ -2087,7 +2100,7 @@ // Resolve the map target parameter set. iMaps[Index(aRoutingSubType)]->GetToL(from, aTargets); CleanupStack::PopAndDestroy(&from); - __FLOG(_L8("RouteOperationRequestNParametersL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_ROUTEOPERATIONREQUESTNPARAMETERSL_EXIT ); } /** @@ -2101,8 +2114,9 @@ */ void CMTPParserRouter::RouteOperationRequest0ParametersL(TUint aRoutingSubType, const TRoutingParameters& aParams, RArray& aTargets) const { - __FLOG(_L8("RouteOperationRequest0ParametersL, Entry")); - __FLOG_VA((_L8("Routing Sub-type = 0x%08X"), aRoutingSubType)); + OstTraceFunctionEntry0( CMTPPARSERROUTER_ROUTEOPERATIONREQUEST0PARAMETERSL_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPPARSERROUTER_ROUTEOPERATIONREQUEST0PARAMETERSL, + "Routing Sub-type = 0x%X", aRoutingSubType); TInt id(KErrNotFound); switch (aRoutingSubType) { @@ -2156,7 +2170,7 @@ { SelectTargetL(id, aTargets); } - __FLOG(_L8("RouteOperationRequest0ParametersL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_ROUTEOPERATIONREQUEST0PARAMETERSL_EXIT ); } /** @@ -2177,7 +2191,7 @@ */ TUint CMTPParserRouter::RoutingTargetL(const TMTPTypeRequest& aRequest, CMTPConnection& aConnection) const { - __FLOG(_L8("RoutingTargetL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_ROUTINGTARGETL_ENTRY ); // Parse the operation request dataset. TRoutingParameters params(aRequest, static_cast(aConnection)); ParseOperationRequestL(params); @@ -2200,7 +2214,7 @@ target = targets[0]; } CleanupStack::PopAndDestroy(&targets); - __FLOG(_L8("RoutingTargetL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_ROUTINGTARGETL_EXIT ); return target; } @@ -2217,7 +2231,7 @@ */ void CMTPParserRouter::SelectSubTypeRoutingL(TRoutingSubType aSubType, RArray& aRoutingSubTypes, RArray& aValidationSubTypes, RArray& aParams) const { - __FLOG(_L8("SelectSubTypeRoutingL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_SELECTSUBTYPEROUTINGL_ENTRY ); __ASSERT_DEBUG((aRoutingSubTypes.Find(aSubType) == KErrNotFound), User::Invariant()); aRoutingSubTypes.AppendL(aSubType); switch (aSubType) @@ -2245,7 +2259,7 @@ default: break; } - __FLOG(_L8("SelectSubTypeRoutingL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_SELECTSUBTYPEROUTINGL_EXIT ); } /** @@ -2258,14 +2272,15 @@ */ void CMTPParserRouter::SelectSubTypeValidationL(TRoutingSubType aSubType, RArray& aValidationSubTypes) const { - __FLOG(_L8("SelectSubTypeValidationL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_SELECTSUBTYPEVALIDATIONL_ENTRY ); TInt err(aValidationSubTypes.InsertInOrder(aSubType)); if ((err != KErrNone) && (err != KErrAlreadyExists)) { + OstTrace1( TRACE_ERROR, CMTPPARSERROUTER_SELECTSUBTYPEVALIDATIONL, "insert into validation sub-type array failed! error code %d", err); User::Leave(err); } - __FLOG(_L8("SelectSubTypeValidationL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_SELECTSUBTYPEVALIDATIONL_EXIT ); } /** @@ -2277,7 +2292,7 @@ */ void CMTPParserRouter::ValidateTargetsL(const TRoutingParameters& aParams, const RArray& aValidationSubTypes, RArray& aTargets) const { - __FLOG(_L8("ValidateTargetsL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_VALIDATETARGETSL_ENTRY ); const TUint KValidationsCount(aValidationSubTypes.Count()); for (TUint v(0); (v < KValidationsCount); v++) { @@ -2295,20 +2310,21 @@ } CleanupStack::PopAndDestroy(&valid); } - __FLOG(_L8("ValidateTargetsL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_VALIDATETARGETSL_EXIT ); } void CMTPParserRouter::ValidateOperationRequestParametersL(TRoutingParameters& aParams) const { - __FLOG(_L8("ValidateOperationRequestParametersL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_VALIDATEOPERATIONREQUESTPARAMETERSL_ENTRY ); if(aParams.Param(TRoutingParameters::EFlagInvalid)) { - __FLOG(_L8("ValidateOperationRequestParametersL, Invalid is true,Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_VALIDATEOPERATIONREQUESTPARAMETERSL_EXIT ); return; } const TUint16 KOpCode(aParams.Request().Uint16(TMTPTypeRequest::ERequestOperationCode)); - __FLOG_VA((_L8("Operation Code = 0x%04X"), KOpCode)); + OstTrace1(TRACE_NORMAL, CMTPPARSERROUTER_VALIDATEOPERATIONREQUESTPARAMETERSL, + "Operation Code = 0x%X", KOpCode); switch (KOpCode) { case EMTPOpCodeSetObjectPropValue: @@ -2382,7 +2398,7 @@ default: break; } - __FLOG(_L8("ValidateOperationRequestParametersL, Exit")); + OstTraceFunctionExit0( DUP1_CMTPPARSERROUTER_VALIDATEOPERATIONREQUESTPARAMETERSL_EXIT ); } /** @@ -2438,29 +2454,29 @@ return ((aParamsCount << 24) | aFlags | aIndex); } -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE /** Logs the map table entries of all map tables. @leave One of the system wide error codes, if a general processing error occurs. */ -void CMTPParserRouter::FLOGMapsL() const +void CMTPParserRouter::OSTMapsL() const { - __FLOG(_L8("FLOGMapsL, Entry")); + OstTraceFunctionEntry0( CMTPPARSERROUTER_OSTMAPSL_ENTRY ); const TUint KCount(iMaps.Count()); for (TUint i(0); (i < KCount); i++) { const CMap& KMap (*iMaps[i]); - __FLOG(_L8("")); - __FLOG_VA((_L8("Table 0x%08X"), KMap.SubType())); - __FLOG(_L8("----------------")); + OstTrace0(TRACE_NORMAL, CMTPPARSERROUTER_OSTMAPSL,""); + OstTrace1(TRACE_NORMAL, DUP1_CMTPPARSERROUTER_OSTMAPSL,"Table 0x%08X", KMap.SubType()); + OstTrace0(TRACE_NORMAL, DUP2_CMTPPARSERROUTER_OSTMAPSL,"----------------"); RArray from; CleanupClosePushL(from); KMap.InitParamsL(from); - KMap.FLOGMapL(from); + KMap.OSTMapL(from); CleanupStack::PopAndDestroy(&from); - __FLOG(_L8("")); + OstTrace0(TRACE_NORMAL, DUP3_CMTPPARSERROUTER_OSTMAPSL,""); } - __FLOG(_L8("FLOGMapsL, Exit")); + OstTraceFunctionExit0( CMTPPARSERROUTER_OSTMAPSL_EXIT ); } #endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtppkgidstore.cpp --- a/mtpfws/mtpfw/src/cmtppkgidstore.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtppkgidstore.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -15,6 +15,12 @@ #include "cmtppkgidstore.h" #include "dbutility.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtppkgidstoreTraces.h" +#endif + /** Two-phase construction @@ -58,14 +64,17 @@ { _LIT(KSQLCreatePkgIDTableText, "CREATE TABLE PkgIDStore (DataProviderId UNSIGNED INTEGER, PkgId UNSIGNED INTEGER)"); - User::LeaveIfError(iDatabase.Execute(KSQLCreatePkgIDTableText)); + LEAVEIFERROR(iDatabase.Execute(KSQLCreatePkgIDTableText), + OstTrace0( TRACE_ERROR, CMTPPKGIDSTORE_CREATEPKGIDSTORETABLEL, "TABLE PkgIDStore create failed!")); } _LIT(KSQLGetPKGID, "SELECT * FROM PkgIDStore"); iSqlStatement.Format(KSQLGetPKGID); RDbView view; CleanupClosePushL(view); - User::LeaveIfError(view.Prepare(iDatabase, TDbQuery(iSqlStatement))); - User::LeaveIfError(view.Evaluate()); + LEAVEIFERROR(view.Prepare(iDatabase, TDbQuery(iSqlStatement)), + OstTrace0( TRACE_ERROR, DUP1_CMTPPKGIDSTORE_CREATEPKGIDSTORETABLEL, "view for PkgIDStore prepare failed!" )); + LEAVEIFERROR(view.Evaluate(), + OstTrace0( TRACE_ERROR, DUP2_CMTPPKGIDSTORE_CREATEPKGIDSTORETABLEL, "view evaluate failed!")); while (view.NextL()) { view.GetL(); @@ -93,7 +102,8 @@ { _LIT(KSQLInsertPkgIDObjectText, "INSERT INTO PkgIDStore (DataProviderId, PkgId) VALUES (%u, %u)"); iSqlStatement.Format(KSQLInsertPkgIDObjectText, aDPId, aPkgId); - User::LeaveIfError(iDatabase.Execute(iSqlStatement)); + LEAVEIFERROR(iDatabase.Execute(iSqlStatement), + OstTrace0( TRACE_ERROR, CMTPPKGIDSTORE_INSERTPKGIDL, "INSERT INTO PkgIDStore failed!" )); iDPIDs.AppendL(aDPId); iPkgIDs.AppendL(aPkgId); } @@ -103,7 +113,8 @@ { _LIT(KSQLSetPkgIDObjectText, "UPDATE PkgIDStore SET PkgId = %u WHERE DataProviderId = %u"); iSqlStatement.Format(KSQLSetPkgIDObjectText, aPkgId,aDPId); - User::LeaveIfError(iDatabase.Execute(iSqlStatement)); + LEAVEIFERROR(iDatabase.Execute(iSqlStatement), + OstTrace0( TRACE_ERROR, DUP1_CMTPPKGIDSTORE_INSERTPKGIDL, "UPDATE PkgIDStore SET PkgId failed!" )); iPkgIDs[index] = aPkgId; } } @@ -130,7 +141,8 @@ iPkgIDs.Remove(index); _LIT(KSQLDeleteObjectText, "DELETE FROM PkgIDStore WHERE DataProviderId = %u"); iSqlStatement.Format(KSQLDeleteObjectText, aDpId); - User::LeaveIfError(iDatabase.Execute(iSqlStatement)); + LEAVEIFERROR(iDatabase.Execute(iSqlStatement), + OstTrace0( TRACE_ERROR, CMTPPKGIDSTORE_REMOVEL, "DELETE FROM PkgIDStore failed!" )); } return index; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpreferencemgr.cpp --- a/mtpfws/mtpfw/src/cmtpreferencemgr.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpreferencemgr.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,6 +21,12 @@ #include "cmtpobjectstore.h" #include "cmtpreferencemgr.h" #include "dbutility.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpreferencemgrTraces.h" +#endif + _LIT(KSQLReferenceTableName, "ReferenceStore"); @@ -180,7 +186,8 @@ */ void CMTPReferenceMgr::CreateTableL() { - User::LeaveIfError(iDatabase->Execute(KSQLCreateReferenceTableText)); + LEAVEIFERROR(iDatabase->Execute(KSQLCreateReferenceTableText), + OstTrace0( TRACE_ERROR, CMTPREFERENCEMGR_CREATETABLEL, "TABLE ReferenceStore create failed!" )); } /** @@ -189,7 +196,8 @@ */ void CMTPReferenceMgr::CreateIndexL() { - User::LeaveIfError(iDatabase->Execute(KSQLCreateReferenceIndexText)); + LEAVEIFERROR(iDatabase->Execute(KSQLCreateReferenceIndexText), + OstTrace0( TRACE_ERROR, CMTPREFERENCEMGR_CREATEINDEXL, "INDEX ReferenceIndex on ReferenceStore create failed!" )); } /** diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpserviceconfig.cpp --- a/mtpfws/mtpfw/src/cmtpserviceconfig.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpserviceconfig.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,10 +20,14 @@ #include "mtpservicecommon.h" #include "cmtpserviceconfig.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpserviceconfigTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"ServiceConfigMgr");) _LIT(KMTPServiceCofigfile, "z:\\resource\\mtp\\services.rsc"); @@ -54,12 +58,11 @@ */ CMTPServiceConfig::~CMTPServiceConfig() { - __FLOG(_L8("CMTPServiceConfig::~CMTPServiceConfig() - Entry")); + OstTraceFunctionEntry0( CMTPSERVICECONFIG_CMTPSERVICECONFIG_DES_ENTRY ); iSupportedServices.Close(); iServiceInfos.ResetAndDestroy(); - __FLOG(_L8("CMTPServiceConfig::~CMTPServiceConfig() - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSERVICECONFIG_CMTPSERVICECONFIG_DES_EXIT ); } TInt CMTPServiceConfig::SupportedServiceOrderFromAscending( const TSupportedService& aL, const TSupportedService& aR) @@ -80,10 +83,8 @@ void CMTPServiceConfig::ConstructL( const TDesC& aResourceFilename ) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CMTPServiceConfig::ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICECONFIG_CONSTRUCTL_ENTRY ); - RResourceFile file; file.OpenL( iRFs, aResourceFilename ); @@ -101,13 +102,13 @@ CleanupStack::PopAndDestroy(buffer); CleanupStack::PopAndDestroy(&file); - __FLOG(_L8("CMTPServiceConfig::ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSERVICECONFIG_CONSTRUCTL_EXIT ); } void CMTPServiceConfig::InitializeL( TResourceReader& aReader ) { - __FLOG(_L8("CMTPServiceConfig::InitializeL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICECONFIG_INITIALIZEL_ENTRY ); //read the supported services TUint serviceCount = aReader.ReadInt16(); @@ -122,18 +123,20 @@ iSupportedServices.InsertInOrderL( TSupportedService( svcGUID, type, resID ), TLinearOrder(SupportedServiceOrderFromAscending) ); } - - __FLOG(_L8("CMTPServiceConfig::InitializeL - Exit")); + + OstTraceFunctionExit0( CMTPSERVICECONFIG_INITIALIZEL_EXIT ); } TBool CMTPServiceConfig::IsSupportedService( const TMTPTypeGuid& aServiceGUID ) const { + OstTraceFunctionEntry0( CMTPSERVICECONFIG_ISSUPPORTEDSERVICE_ENTRY ); + OstTraceFunctionExit0( CMTPSERVICECONFIG_ISSUPPORTEDSERVICE_EXIT ); return !( KErrNotFound == iSupportedServices.FindInOrder( aServiceGUID, SupportedServiceOrderFromKeyAscending ) ); } void CMTPServiceConfig::LoadServiceDataL( const TMTPTypeGuid& aServiceGUID ) { - __FLOG(_L8("CMTPServiceConfig::LoadServiceDataL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICECONFIG_LOADSERVICEDATAL_ENTRY ); RResourceFile file; file.OpenL( iRFs, KMTPServiceCofigfile ); @@ -199,13 +202,13 @@ CleanupStack::Pop(serviceInfo); CleanupStack::PopAndDestroy(buffer); CleanupStack::PopAndDestroy(&file); - - __FLOG(_L8("CMTPServiceConfig::LoadServiceDataL - Exit")); + + OstTraceFunctionExit0( CMTPSERVICECONFIG_LOADSERVICEDATAL_EXIT ); } void CMTPServiceConfig::StartReadUseServicesL( RResourceFile& aResFile, const TUint aResID, CMTPServiceInfo& aServiceInfo ) { - __FLOG(_L8("CMTPServiceConfig::StartReadUseServices - Entry")); + OstTraceFunctionEntry0( CMTPSERVICECONFIG_STARTREADUSESERVICESL_ENTRY ); // Create the resource reader. HBufC8* buffer(aResFile.AllocReadLC( aResID )); @@ -220,13 +223,13 @@ } CleanupStack::PopAndDestroy(buffer); - - __FLOG(_L8("CMTPServiceConfig::StartReadUseServices - Exit")); + + OstTraceFunctionExit0( CMTPSERVICECONFIG_STARTREADUSESERVICESL_EXIT ); } void CMTPServiceConfig::StartReadServicePropertyNamespacesL( RResourceFile& aResFile, const TUint aResID, RArray& aNamespaces ) { - __FLOG(_L8("CMTPServiceConfig::StartReadServicePropertyNamespacesL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICECONFIG_STARTREADSERVICEPROPERTYNAMESPACESL_ENTRY ); // Create the resource reader. HBufC8* buffer(aResFile.AllocReadLC( aResID )); @@ -241,12 +244,12 @@ } CleanupStack::PopAndDestroy(buffer); - __FLOG(_L8("CMTPServiceConfig::StartReadServicePropertyNamespacesL - Exit")); + OstTraceFunctionExit0( CMTPSERVICECONFIG_STARTREADSERVICEPROPERTYNAMESPACESL_EXIT ); } void CMTPServiceConfig::StartReadServicePropertiesL( RResourceFile& aResFile, const TUint aNamespaceResID, const TUint aPropertiesResID, CMTPServiceInfo& aServiceInfo ) { - __FLOG(_L8("CMTPServiceConfig::StartReadServicePropertyL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICECONFIG_STARTREADSERVICEPROPERTIESL_ENTRY ); //read namespaces RArray namespaces; @@ -284,12 +287,12 @@ CleanupStack::PopAndDestroy(buffer); CleanupStack::PopAndDestroy(&namespaces); - __FLOG(_L8("CMTPServiceConfig::StartReadServicePropertyL - Exit")); + OstTraceFunctionExit0( CMTPSERVICECONFIG_STARTREADSERVICEPROPERTIESL_EXIT ); } void CMTPServiceConfig::StartReadServiceFormatsL( RResourceFile& aResFile, const TUint aResID, CMTPServiceInfo& aServiceInfo ) { - __FLOG(_L8("CMTPServiceConfig::StartReadServiceFormatL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICECONFIG_STARTREADSERVICEFORMATSL_ENTRY ); // Create the resource reader. HBufC8* buffer(aResFile.AllocReadLC( aResID )); @@ -325,13 +328,13 @@ CleanupStack::PopAndDestroy(buffer); - __FLOG(_L8("CMTPServiceConfig::StartReadServiceFormatL - Exit")); + OstTraceFunctionExit0( CMTPSERVICECONFIG_STARTREADSERVICEFORMATSL_EXIT ); } void CMTPServiceConfig::StartReadServiceMethodsL( RResourceFile& aResFile, const TUint aResID, CMTPServiceInfo& aServiceInfo ) { - __FLOG(_L8("CMTPServiceConfig::StartReadServiceMethodL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICECONFIG_STARTREADSERVICEMETHODSL_ENTRY ); // Create the resource reader. HBufC8* buffer(aResFile.AllocReadLC( aResID )); @@ -353,12 +356,12 @@ CleanupStack::PopAndDestroy(buffer); - __FLOG(_L8("CMTPServiceConfig::StartReadServiceMethodL - Exit")); + OstTraceFunctionExit0( CMTPSERVICECONFIG_STARTREADSERVICEMETHODSL_EXIT ); } void CMTPServiceConfig::StartReadServiceEventsL( RResourceFile& aResFile, const TUint aResID, CMTPServiceInfo& aServiceInfo ) { - __FLOG(_L8("CMTPServiceConfig::StartReadServiceEventsL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICECONFIG_STARTREADSERVICEEVENTSL_ENTRY ); // Create the resource reader. HBufC8* buffer(aResFile.AllocReadLC( aResID )); @@ -379,13 +382,13 @@ } CleanupStack::PopAndDestroy(buffer); - - __FLOG(_L8("CMTPServiceConfig::StartReadServiceEventsL - Exit")); + + OstTraceFunctionExit0( CMTPSERVICECONFIG_STARTREADSERVICEEVENTSL_EXIT ); } void CMTPServiceConfig::StartReadServiceDataBlockL( RResourceFile& aResFile, const TUint aResID, CMTPServiceInfo& aServiceInfo ) { - __FLOG(_L8("CMTPServiceConfig::StartReadServiceDataBlockL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICECONFIG_STARTREADSERVICEDATABLOCKL_ENTRY ); // Create the resource reader. HBufC8* buffer(aResFile.AllocReadLC( aResID )); @@ -401,7 +404,7 @@ } CleanupStack::PopAndDestroy(buffer); - __FLOG(_L8("CMTPServiceConfig::StartReadServiceDataBlockL - Exit")); + OstTraceFunctionExit0( CMTPSERVICECONFIG_STARTREADSERVICEDATABLOCKL_EXIT ); } CMTPServiceInfo* CMTPServiceConfig::ServiceInfo(const TMTPTypeGuid& aServiceGUID ) const @@ -418,7 +421,7 @@ CMTPServiceInfo* CMTPServiceConfig::ServiceInfo(const TUint aServiceID) const { - __FLOG(_L8("CMTPServiceConfig::ServiceInfo - Entry")); + OstTraceFunctionEntry0( CMTPSERVICECONFIG_SERVICEINFO_ENTRY ); TInt count = iServiceInfos.Count(); for(TInt i(0); i < count; i++ ) @@ -427,7 +430,7 @@ return iServiceInfos[i] ; } - __FLOG(_L8("CMTPServiceConfig::ServiceInfo - Exit")); + OstTraceFunctionExit0( CMTPSERVICECONFIG_SERVICEINFO_EXIT ); return NULL; } @@ -445,7 +448,10 @@ { TInt index = iSupportedServices.FindInOrder( aServiceGUID, SupportedServiceOrderFromKeyAscending ) ; if( KErrNotFound == index) + { + OstTrace0( TRACE_ERROR, CMTPSERVICECONFIG_SERVICERESOURCEIDL, "serviceGUID not supported" ); User::Leave( KErrNotFound ); + } return iSupportedServices[index].iResourceID; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpserviceinfo.cpp --- a/mtpfws/mtpfw/src/cmtpserviceinfo.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpserviceinfo.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,12 +20,15 @@ #include "mtpservicecommon.h" #include "cmtpserviceinfo.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpserviceinfoTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"ServiceInfo");) - TPKeyPair::TPKeyPair( const TMTPTypeGuid& aNamespace, const TUint aID ): iNamespace( aNamespace ), @@ -204,7 +207,7 @@ CMTPServiceInfo::~CMTPServiceInfo() { - __FLOG(_L8("CServiceInfo::~CserviceInfo() - Entry")); + OstTraceFunctionEntry0( CMTPSERVICEINFO_CMTPSERVICEINFO_DES_ENTRY ); delete iServiceName; @@ -214,9 +217,8 @@ iServiceMethods.ResetAndDestroy(); iServiceEvents.ResetAndDestroy(); iDataBlock.Close(); - - __FLOG(_L8("CServiceInfo::~CserviceInfo() - Exit")); - __FLOG_CLOSE; + + OstTraceFunctionExit0( CMTPSERVICEINFO_CMTPSERVICEINFO_DES_EXIT ); } @@ -225,12 +227,8 @@ } void CMTPServiceInfo::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CServiceInfo::ConstructL() - Entry")); - - - - __FLOG(_L8("CServiceInfo::ConstructL() - Exit")); + OstTraceFunctionEntry0( CMTPSERVICEINFO_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPSERVICEINFO_CONSTRUCTL_EXIT ); } @@ -339,56 +337,56 @@ void CMTPServiceInfo::AppendUserServiceL( const TMTPTypeGuid& aServiceGUID ) { - __FLOG(_L8("CServiceInfo::AppendUserServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICEINFO_APPENDUSERSERVICEL_ENTRY ); iUsedServiceGUIDs.AppendL( aServiceGUID ); - __FLOG(_L8("CServiceInfo::AppendUserServiceL - Exit")); + OstTraceFunctionExit0( CMTPSERVICEINFO_APPENDUSERSERVICEL_EXIT ); } void CMTPServiceInfo::InsertPropertyL( const CServiceProperty* aProperty ) { - __FLOG(_L8("CServiceInfo::InsertPropertyL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICEINFO_INSERTPROPERTYL_ENTRY ); iServiceProperties.InsertInOrderL( aProperty, TLinearOrder(ServicePropertyOrderFromAscending) ); - - __FLOG(_L8("CServiceInfo::InsertPropertyL - Exit")); + + OstTraceFunctionExit0( CMTPSERVICEINFO_INSERTPROPERTYL_EXIT ); } void CMTPServiceInfo::InsertFormatL( const CServiceFormat* aFormat ) { - __FLOG(_L8("CServiceInfo::InsertFormatL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICEINFO_INSERTFORMATL_ENTRY ); iServiceFormats.InsertInOrderL( aFormat, TLinearOrder(ServiceFormatOrderFromAscending) ); - - __FLOG(_L8("CServiceInfo::InsertFormatL - Exit")); + + OstTraceFunctionExit0( CMTPSERVICEINFO_INSERTFORMATL_EXIT ); } void CMTPServiceInfo::InsertMethodL( const CServiceMethod* aMethod ) { - __FLOG(_L8("CServiceInfo::InsertMethodL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICEINFO_INSERTMETHODL_ENTRY ); iServiceMethods.InsertInOrderL( aMethod , TLinearOrder(ServiceMethodOrderFromAscending) ); - - __FLOG(_L8("CServiceInfo::InsertMethodL - Exit")); + + OstTraceFunctionExit0( CMTPSERVICEINFO_INSERTMETHODL_EXIT ); } void CMTPServiceInfo::InsertEventL( const CServiceEvent* aEvent ) { - __FLOG(_L8("CServiceInfo::InsertMethodL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICEINFO_INSERTEVENTL_ENTRY ); iServiceEvents.InsertInOrderL( aEvent , TLinearOrder(ServiceEventOrderFromAscending) ); - - __FLOG(_L8("CServiceInfo::InsertMethodL - Exit")); + + OstTraceFunctionExit0( CMTPSERVICEINFO_INSERTEVENTL_EXIT ); } void CMTPServiceInfo::AppendDataGUIDL( const TMTPTypeGuid& aGUID ) { - __FLOG(_L8("CServiceInfo::AppendDataGUIDL - Entry")); - + OstTraceFunctionEntry0( CMTPSERVICEINFO_APPENDDATAGUIDL_ENTRY ); + iDataBlock.AppendL( aGUID ); - - __FLOG(_L8("CServiceInfo::AppendDataGUIDL - Exit")); + + OstTraceFunctionExit0( CMTPSERVICEINFO_APPENDDATAGUIDL_EXIT ); } EXPORT_C TUint CMTPServiceInfo::ServiceID() const diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpservicemgr.cpp --- a/mtpfws/mtpfw/src/cmtpservicemgr.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpservicemgr.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,8 +23,11 @@ #include "cmtpserviceconfig.h" #include "cmtpservicemgr.h" #include +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpservicemgrTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"ServiceMgr");) /** @@ -46,29 +49,27 @@ void CMTPServiceMgr::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICEMGR_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); iServiceCfg = CMTPServiceConfig::NewL( iSingletons.Fs() ); - - __FLOG(_L8("ConstructL - Exit")); + + OstTraceFunctionExit0( CMTPSERVICEMGR_CONSTRUCTL_EXIT ); } /** Destructor */ CMTPServiceMgr::~CMTPServiceMgr() { - __FLOG(_L8("~CMTPServiceMgr - Entry")); + OstTraceFunctionEntry0( CMTPSERVICEMGR_CMTPSERVICEMGR_DES_ENTRY ); delete iServiceCfg; iSingletons.Close(); iServiceIDs.Close(); - - __FLOG(_L8("~CMTPServiceMgr - Exit")); - __FLOG_CLOSE; + + OstTraceFunctionExit0( CMTPSERVICEMGR_CMTPSERVICEMGR_DES_EXIT ); } EXPORT_C TBool CMTPServiceMgr::IsSupportedService( const TUint aServiceID ) const @@ -83,7 +84,7 @@ TInt CMTPServiceMgr::EnableService(const TMTPTypeGuid& aPGUID, const TUint aServiceID ) { - __FLOG(_L8("CMTPServiceMgr::EnableService : ")); + OstTraceFunctionEntry0( CMTPSERVICEMGR_ENABLESERVICE_ENTRY ); if( NULL == iServiceCfg->ServiceInfo(aPGUID) ) { @@ -92,13 +93,15 @@ { iServiceCfg->ServiceInfo(aPGUID)->SetServiceID( aServiceID ); } - - __FLOG_1(_L8("CMTPServiceMgr::EnableService - Fail to Load service! error = %d "), err ); + else + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, CMTPSERVICEMGR_ENABLESERVICE, + "CMTPServiceMgr::EnableService - Fail to Load service! error = %d", err); + OstTraceFunctionExit0( CMTPSERVICEMGR_ENABLESERVICE_EXIT ); return err; } - __FLOG(_L8("CMTPServiceMgr::EnableService - Has been loaded!")); - + OstTrace0(TRACE_NORMAL, DUP1_CMTPSERVICEMGR_ENABLESERVICE, "CMTPServiceMgr::EnableService - Has been loaded!"); + OstTraceFunctionExit0( DUP1_CMTPSERVICEMGR_ENABLESERVICE_EXIT ); return KErrNone; } @@ -134,17 +137,17 @@ void CMTPServiceMgr::LoadServiceL( const TMTPTypeGuid& aPGUID ) { - __FLOG(_L8("CMTPServiceMgr::LoadServiceL - Entry")); + OstTraceFunctionEntry0( CMTPSERVICEMGR_LOADSERVICEL_ENTRY ); iServiceCfg->LoadServiceDataL(aPGUID); - - __FLOG(_L8("CMTPServiceMgr::LoadServiceL - Exit")); + + OstTraceFunctionExit0( CMTPSERVICEMGR_LOADSERVICEL_EXIT ); } TInt CMTPServiceMgr::GetServiceProperty( const TMTPTypeGuid& aServicePGUID, const TMTPTypeGuid& aPKNamespace, const TUint aPKID, CServiceProperty** aServicePropertye) const { - __FLOG(_L8("CMTPServiceMgr::GetServiceProperty :")); - + OstTraceFunctionEntry0( CMTPSERVICEMGR_GETSERVICEPROPERTY_ENTRY ); + CMTPServiceInfo* svcinfo = iServiceCfg->ServiceInfo( aServicePGUID ); if( NULL == svcinfo ) return KErrNotSupported; @@ -154,15 +157,15 @@ return KErrNotSupported; *aServicePropertye = prop; - - __FLOG(_L8("CMTPServiceMgr::GetServiceProperty Exit")); + + OstTraceFunctionExit0( CMTPSERVICEMGR_GETSERVICEPROPERTY_EXIT ); return KErrNone; } TInt CMTPServiceMgr::GetServiceFormat( const TMTPTypeGuid& aServicePGUID, const TMTPTypeGuid& aGUID, CServiceFormat** aServiceFormat ) const { - __FLOG(_L8("CMTPServiceMgr::GetServiceFormat :")); - + OstTraceFunctionEntry0( CMTPSERVICEMGR_GETSERVICEFORMAT_ENTRY ); + CMTPServiceInfo* svcinfo = iServiceCfg->ServiceInfo( aServicePGUID ); if( NULL == svcinfo ) return KErrNotSupported; @@ -172,14 +175,14 @@ return KErrNotSupported; *aServiceFormat = format; - - __FLOG(_L8("CMTPServiceMgr::GetServiceFormat Exit")); + + OstTraceFunctionExit0( CMTPSERVICEMGR_GETSERVICEFORMAT_EXIT ); return KErrNone; } TInt CMTPServiceMgr::GetServiceMethod( const TMTPTypeGuid& aServicePGUID, const TMTPTypeGuid& aGUID, CServiceMethod** aServiceMethod ) const { - __FLOG(_L8("CMTPServiceMgr::GetServiceMethod :")); + OstTraceFunctionEntry0( CMTPSERVICEMGR_GETSERVICEMETHOD_ENTRY ); CMTPServiceInfo* svcinfo = iServiceCfg->ServiceInfo( aServicePGUID ); if( NULL == svcinfo ) @@ -191,35 +194,36 @@ *aServiceMethod = method ; - __FLOG(_L8("CMTPServiceMgr::GetServiceMethod - Exit")); + OstTraceFunctionExit0( CMTPSERVICEMGR_GETSERVICEMETHOD_EXIT ); return KErrNone; } TInt CMTPServiceMgr::GetServiceId( const TMTPTypeGuid& aServiceGUID, TUint& aServiceID) const { - __FLOG(_L8("CMTPServiceMgr::FindServiceId :")); + OstTraceFunctionEntry0( CMTPSERVICEMGR_GETSERVICEID_ENTRY ); CMTPServiceInfo* svcinfo = ServiceInfo( aServiceGUID ); if( NULL == svcinfo ) { - __FLOG(_L8("CMTPServiceMgr::GetServiceId - Invalid serviceID")); - + OstTrace0(TRACE_ERROR, CMTPSERVICEMGR_GETSERVICEID, "CMTPServiceMgr::GetServiceId - Invalid serviceID"); + OstTraceFunctionExit0( CMTPSERVICEMGR_GETSERVICEID_EXIT ); return KErrNotFound; } else { aServiceID = svcinfo->ServiceID(); - __FLOG_1(_L8("CMTPServiceMgr::GetServiceId = %d"),aServiceID ); - + OstTrace1(TRACE_NORMAL, DUP1_CMTPSERVICEMGR_GETSERVICEID, + "CMTPServiceMgr::GetServiceId = %d", aServiceID); + OstTraceFunctionExit0( DUP1_CMTPSERVICEMGR_GETSERVICEID_EXIT ); return KErrNone; } } TInt CMTPServiceMgr::GetServicePropertyCode( const TMTPTypeGuid& aServicePGUID, const TMTPTypeGuid& aPKNamespace, const TUint aPKID, TUint& aServicePropertyCode ) const { - __FLOG(_L8("CMTPServiceMgr::GetServicePropertyCode :")); + OstTraceFunctionEntry0( CMTPSERVICEMGR_GETSERVICEPROPERTYCODE_ENTRY ); CServiceProperty* prop = NULL; TInt err = GetServiceProperty( aServicePGUID, aPKNamespace, aPKID, &prop ); @@ -227,14 +231,14 @@ return err; aServicePropertyCode = prop->Code(); - - __FLOG(_L8("CMTPServiceMgr::GetServicePropertyCode - Exit")); + + OstTraceFunctionExit0( CMTPSERVICEMGR_GETSERVICEPROPERTYCODE_EXIT ); return KErrNone; } TInt CMTPServiceMgr::SetServicePropertyCode( const TMTPTypeGuid& aServicePGUID, const TMTPTypeGuid& aPKNamespace, const TUint aPKID, const TUint aCurrPropertyCode ) { - __FLOG(_L8("CMTPServiceMgr::SetServicePropertyCode :")); + OstTraceFunctionEntry0( CMTPSERVICEMGR_SETSERVICEPROPERTYCODE_ENTRY ); CServiceProperty* prop = NULL; TInt err = GetServiceProperty( aServicePGUID, aPKNamespace, aPKID, &prop ); @@ -243,58 +247,58 @@ prop->SetCode( aCurrPropertyCode ); - __FLOG(_L8("CMTPServiceMgr::SetServicePropertyCode - Exit")); + OstTraceFunctionExit0( CMTPSERVICEMGR_SETSERVICEPROPERTYCODE_EXIT ); return KErrNone; } TInt CMTPServiceMgr::GetServiceFormatCode( const TMTPTypeGuid& aServicePGUID, const TMTPTypeGuid& aGUID, TUint& aServiceFormatCode ) const { - __FLOG(_L8("CMTPServiceMgr::GetServiceFormatCode :")); - + OstTraceFunctionEntry0( CMTPSERVICEMGR_GETSERVICEFORMATCODE_ENTRY ); + CServiceFormat* format = NULL; TInt err = GetServiceFormat( aServicePGUID, aGUID, &format ); if( KErrNone != err ) return err; aServiceFormatCode = format->Code(); - - __FLOG(_L8("CMTPServiceMgr::GetServiceFormatCode - Exit")); + + OstTraceFunctionExit0( CMTPSERVICEMGR_GETSERVICEFORMATCODE_EXIT ); return KErrNone; } TInt CMTPServiceMgr::SetServiceFormatCode( const TMTPTypeGuid& aServicePGUID, const TMTPTypeGuid& aGUID, const TUint aCurrFormatCode ) { - __FLOG(_L8("CMTPServiceMgr::SetServiceFormatCode :")); - + OstTraceFunctionEntry0( CMTPSERVICEMGR_SETSERVICEFORMATCODE_ENTRY ); + CServiceFormat* format = NULL; TInt err = GetServiceFormat( aServicePGUID, aGUID, &format ); if( KErrNone != err ) return err; format->SetCode( aCurrFormatCode ); - - __FLOG(_L8("CMTPServiceMgr::SetServiceFormatCode - Exit")); + + OstTraceFunctionExit0( CMTPSERVICEMGR_SETSERVICEFORMATCODE_EXIT ); return KErrNone; } TInt CMTPServiceMgr::GetServiceMethodCode( const TMTPTypeGuid& aServicePGUID, const TMTPTypeGuid& aGUID, TUint& aServiceMethodCode ) const { - __FLOG(_L8("CMTPServiceMgr::GetServiceMethodCode :")); - + OstTraceFunctionEntry0( CMTPSERVICEMGR_GETSERVICEMETHODCODE_ENTRY ); + CServiceMethod* method = NULL; TInt err = GetServiceMethod( aServicePGUID, aGUID, &method ); if ( KErrNone != err ) return err; aServiceMethodCode = method->Code(); - - __FLOG(_L8("CMTPServiceMgr::GetServiceMethodCode - Exit")); + + OstTraceFunctionExit0( CMTPSERVICEMGR_GETSERVICEMETHODCODE_EXIT ); return KErrNone; } TInt CMTPServiceMgr::SetServiceMethodCode( const TMTPTypeGuid& aServicePGUID, const TMTPTypeGuid& aGUID, const TUint aCurrMethodCode ) { - __FLOG(_L8("CMTPServiceMgr::SetServiceMethodCode :")); + OstTraceFunctionEntry0( CMTPSERVICEMGR_SETSERVICEMETHODCODE_ENTRY ); CServiceMethod* method = NULL; TInt err = GetServiceMethod( aServicePGUID, aGUID, &method ); @@ -303,7 +307,7 @@ method->SetCode( aCurrMethodCode ); - __FLOG(_L8("CMTPServiceMgr::SetServiceMethodCode - Exit")); + OstTraceFunctionExit0( CMTPSERVICEMGR_SETSERVICEMETHODCODE_EXIT ); return KErrNone; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpsession.cpp --- a/mtpfws/mtpfw/src/cmtpsession.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpsession.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,9 +21,14 @@ #include #include "cmtpsession.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpsessionTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"Session");) #ifdef _DEBUG @@ -67,10 +72,9 @@ */ CMTPSession::~CMTPSession() { - __FLOG(_L8("~CMTPSession - Entry")); + OstTraceFunctionEntry0( CMTPSESSION_CMTPSESSION_DES_ENTRY ); iRoutingRegistrations.Close(); - __FLOG(_L8("~CMTPSession - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSESSION_CMTPSESSION_DES_EXIT ); } /** @@ -81,9 +85,10 @@ */ TUint32 CMTPSession::ExpectedTransactionId() const { - __FLOG(_L8("ExpectedTransactionId - Entry")); - __FLOG_VA((_L8("iExpectedTransactionId = 0x%08X"), iExpectedTransactionId)); - __FLOG(_L8("ExpectedTransactionId - Exit")); + OstTraceFunctionEntry0( CMTPSESSION_EXPECTEDTRANSACTIONID_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPSESSION_EXPECTEDTRANSACTIONID, + "iExpectedTransactionId = 0x%08X", iExpectedTransactionId); + OstTraceFunctionExit0( CMTPSESSION_EXPECTEDTRANSACTIONID_EXIT ); return iExpectedTransactionId; } @@ -94,13 +99,14 @@ */ void CMTPSession::IncrementExpectedTransactionId() { - __FLOG(_L8("IncrementExpectedTransactionId - Entry")); + OstTraceFunctionEntry0( CMTPSESSION_INCREMENTEXPECTEDTRANSACTIONID_ENTRY ); if (++iExpectedTransactionId == KMTPTransactionIdLast) { iExpectedTransactionId = KMTPTransactionIdFirst; } - __FLOG_VA((_L8("iExpectedTransactionId = 0x%08X"), iExpectedTransactionId)); - __FLOG(_L8("IncrementExpectedTransactionId - Exit")); + OstTrace1(TRACE_NORMAL, CMTPSESSION_INCREMENTEXPECTEDTRANSACTIONID, + "iExpectedTransactionId = 0x%08X", iExpectedTransactionId); + OstTraceFunctionExit0( CMTPSESSION_INCREMENTEXPECTEDTRANSACTIONID_EXIT ); } /** @@ -111,9 +117,9 @@ */ void CMTPSession::SetActiveRequestL(const TMTPTypeRequest& aRequest) { - __FLOG(_L8("SetActiveRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSESSION_SETACTIVEREQUESTL_ENTRY ); MMTPType::CopyL(aRequest, iActiveRequest); - __FLOG(_L8("SetActiveRequestL - Exit")); + OstTraceFunctionExit0( CMTPSESSION_SETACTIVEREQUESTL_EXIT ); } /** @@ -122,10 +128,11 @@ */ void CMTPSession::SetTransactionPhase(TMTPTransactionPhase aPhase) { - __FLOG(_L8("SetTransactionPhase - Entry")); + OstTraceFunctionEntry0( CMTPSESSION_SETTRANSACTIONPHASE_ENTRY ); iTransactionPhase = aPhase; - __FLOG_VA((_L8("iTransactionPhase = 0x%08X"), iTransactionPhase)); - __FLOG(_L8("SetTransactionPhase - Exit")); + OstTrace1(TRACE_NORMAL, CMTPSESSION_SETTRANSACTIONPHASE, + "iTransactionPhase = 0x%08X", iTransactionPhase); + OstTraceFunctionExit0( CMTPSESSION_SETTRANSACTIONPHASE_EXIT ); } @@ -135,15 +142,16 @@ */ TMTPTransactionPhase CMTPSession::TransactionPhase() const { - __FLOG(_L8("TransactionPhase - Entry")); - __FLOG_VA((_L8("iTransactionPhase = 0x%08X"), iTransactionPhase)); - __FLOG(_L8("TransactionPhase - Exit")); + OstTraceFunctionEntry0( CMTPSESSION_TRANSACTIONPHASE_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPSESSION_TRANSACTIONPHASE, + "iTransactionPhase = 0x%08X", iTransactionPhase); + OstTraceFunctionExit0( CMTPSESSION_TRANSACTIONPHASE_EXIT ); return iTransactionPhase; } TInt CMTPSession::RouteRequest(const TMTPTypeRequest& aRequest) { - __FLOG(_L8("RouteRequest - Entry")); + OstTraceFunctionEntry0( CMTPSESSION_ROUTEREQUEST_ENTRY ); TInt ret(KErrNotFound); // Attempt to match the request to existing registrations. @@ -168,25 +176,28 @@ if ((op == EMTPOpCodeSendObject) || (op == EMTPOpCodeTerminateOpenCapture)) { - __FLOG_VA((_L8("Unregistering follow-on request 0x%08X"), op)); + OstTrace1(TRACE_NORMAL, CMTPSESSION_ROUTEREQUEST, + "Unregistering follow-on request 0x%08X", op); iRoutingRegistrations.Remove(idx); } } - __FLOG_VA((_L8("DP ID = %d"), ret)); - __FLOG(_L8("RouteRequest - Exit")); + OstTrace1(TRACE_NORMAL, DUP1_CMTPSESSION_ROUTEREQUEST, + "DP ID = %d", ret); + OstTraceFunctionExit0( CMTPSESSION_ROUTEREQUEST_EXIT ); return ret; } void CMTPSession::RouteRequestRegisterL(const TMTPTypeRequest& aRequest, TInt aDpId) { - __FLOG(_L8("RouteRequestRegisterL - Entry")); + OstTraceFunctionEntry0( CMTPSESSION_ROUTEREQUESTREGISTERL_ENTRY ); // Locate any pre-existing registration (which if found, will be overwritten). TInt idx(iRoutingRegistrations.FindInOrder(aRequest, CMTPSession::RouteRequestOrder)); if (idx == KErrNotFound) { iRoutingRegistrations.InsertInOrderL(aRequest, CMTPSession::RouteRequestOrder); - User::LeaveIfError(idx = iRoutingRegistrations.FindInOrder(aRequest, CMTPSession::RouteRequestOrder)); + LEAVEIFERROR(idx = iRoutingRegistrations.FindInOrder(aRequest, CMTPSession::RouteRequestOrder), + OstTrace1( TRACE_ERROR, CMTPSESSION_ROUTEREQUESTREGISTERL, "can't find in routing registrations for request, dpId %d", aDpId)); } /* @@ -194,7 +205,7 @@ TransactionID element (which is unused for routing). */ iRoutingRegistrations[idx].SetUint32(TMTPTypeRequest::ERequestTransactionID, aDpId); - __FLOG(_L8("RouteRequestRegisterL - Exit")); + OstTraceFunctionExit0( CMTPSESSION_ROUTEREQUESTREGISTERL_EXIT ); } /** @@ -206,20 +217,20 @@ */ TBool CMTPSession::RouteRequestRegistered(TUint16 aOpCode) const { - __FLOG(_L8("RouteRequestPending - Entry")); - __FLOG(_L8("RouteRequestPending - Entry")); + OstTraceFunctionEntry0( CMTPSESSION_ROUTEREQUESTREGISTERED_ENTRY ); + OstTraceFunctionExit0( CMTPSESSION_ROUTEREQUESTREGISTERED_EXIT ); return (iRoutingRegistrations.Find(aOpCode, CMTPSession::RouteRequestMatchOpCode) != KErrNotFound); } void CMTPSession::RouteRequestUnregister(const TMTPTypeRequest& aRequest) { - __FLOG(_L8("RouteRequestUnregister - Entry")); + OstTraceFunctionEntry0( CMTPSESSION_ROUTEREQUESTUNREGISTER_ENTRY ); TInt idx(iRoutingRegistrations.FindInOrder(aRequest, CMTPSession::RouteRequestOrder)); if (idx != KErrNotFound) { iRoutingRegistrations.Remove(idx); } - __FLOG(_L8("RouteRequestUnregister - Exit")); + OstTraceFunctionExit0( CMTPSESSION_ROUTEREQUESTUNREGISTER_EXIT ); } void CMTPSession::StorePendingEventL(const TMTPTypeEvent& aEvent) @@ -253,15 +264,15 @@ */ void CMTPSession::CompletePendingRequest(TInt aErr) { - __FLOG(_L8("CompletePendingRequest - Entry")); + OstTraceFunctionEntry0( CMTPSESSION_COMPLETEPENDINGREQUEST_ENTRY ); if (iRequestStatus != NULL) { __ASSERT_DEBUG(*iRequestStatus == KRequestPending, Panic(EMTPPanicStraySignal)); User::RequestComplete(iRequestStatus, aErr); } - - __FLOG(_L8("CompletePendingRequest - Exit")); + + OstTraceFunctionExit0( CMTPSESSION_COMPLETEPENDINGREQUEST_EXIT ); } @@ -281,45 +292,46 @@ */ void CMTPSession::SetRequestPending(TRequestStatus& aStatus) { - __FLOG(_L8("SetRequestPending - Entry")); + OstTraceFunctionEntry0( CMTPSESSION_SETREQUESTPENDING_ENTRY ); __ASSERT_DEBUG(!iRequestStatus, Panic(EMTPPanicBusy)); iRequestStatus = &aStatus; *iRequestStatus = KRequestPending; - __FLOG(_L8("SetRequestPending - Exit")); + OstTraceFunctionExit0( CMTPSESSION_SETREQUESTPENDING_EXIT ); } const TMTPTypeRequest& CMTPSession::ActiveRequestL() const { - __FLOG(_L8("ActiveRequestL - Entry")); + OstTraceFunctionEntry0( CMTPSESSION_ACTIVEREQUESTL_ENTRY ); if (iTransactionPhase == EIdlePhase) { + OstTrace0( TRACE_ERROR, CMTPSESSION_ACTIVEREQUESTL, "transaction in EIdlePhase!" ); User::Leave(KErrNotFound); } - __FLOG(_L8("ActiveRequestL - Exit")); + OstTraceFunctionExit0( CMTPSESSION_ACTIVEREQUESTL_EXIT ); return iActiveRequest; } TUint32 CMTPSession::SessionMTPId() const { - __FLOG(_L8("SessionMTPId - Entry")); - __FLOG_VA( (_L8("Session MTP ID = %d"), iIdMTP) ); - __FLOG(_L8("SessionMTPId - Exit")); + OstTraceFunctionEntry0( CMTPSESSION_SESSIONMTPID_ENTRY ); + OstTrace1(TRACE_NORMAL, CMTPSESSION_SESSIONMTPID, "Session MTP ID = %d", iIdMTP); + OstTraceFunctionExit0( CMTPSESSION_SESSIONMTPID_EXIT ); return iIdMTP; } TUint CMTPSession::SessionUniqueId() const { - __FLOG(_L8("SessionUniqueId - Entry")); - __FLOG(_L8("SessionUniqueId - Exit")); + OstTraceFunctionEntry0( CMTPSESSION_SESSIONUNIQUEID_ENTRY ); + OstTraceFunctionExit0( CMTPSESSION_SESSIONUNIQUEID_EXIT ); return iIdUnique; } TAny* CMTPSession::GetExtendedInterface(TUid /*aInterfaceUid*/) { - __FLOG(_L8("GetExtendedInterface - Entry")); - __FLOG(_L8("GetExtendedInterface - Exit")); + OstTraceFunctionEntry0( CMTPSESSION_GETEXTENDEDINTERFACE_ENTRY ); + OstTraceFunctionExit0( CMTPSESSION_GETEXTENDEDINTERFACE_EXIT ); return NULL; } @@ -337,9 +349,8 @@ void CMTPSession::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPSESSION_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPSESSION_CONSTRUCTL_EXIT ); } TBool CMTPSession::RouteRequestMatchOpCode(const TUint16* aOpCode, const TMTPTypeRequest& aRequest) diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/cmtpstoragemgr.cpp --- a/mtpfws/mtpfw/src/cmtpstoragemgr.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/cmtpstoragemgr.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,9 +20,14 @@ #include "cmtpdataprovidercontroller.h" #include "cmtpstoragemgr.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpstoragemgrTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"StorageMgr");) // StorageID bit manipulation patterns. static const TUint32 KLogicalIdMask(0x0000FFFF); @@ -54,12 +59,11 @@ */ EXPORT_C CMTPStorageMgr::~CMTPStorageMgr() { - __FLOG(_L8("~CMTPStorageMgr - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_CMTPSTORAGEMGR_DES_ENTRY ); iPhysicalStorageNumbers.Reset(); iStorages.ResetAndDestroy(); iSingletons.Close(); - __FLOG(_L8("~CMTPStorageMgr - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPSTORAGEMGR_CMTPSTORAGEMGR_DES_EXIT ); } /** @@ -70,6 +74,8 @@ */ EXPORT_C TUint CMTPStorageMgr::LogicalStorageNumber(TUint32 aStorageId) { + OstTraceFunctionEntry0( CMTPSTORAGEMGR_LOGICALSTORAGENUMBER_ENTRY ); + OstTraceFunctionExit0( CMTPSTORAGEMGR_LOGICALSTORAGENUMBER_EXIT ); return (aStorageId & KLogicalNumberMask); } @@ -81,6 +87,7 @@ */ EXPORT_C TUint CMTPStorageMgr::LogicalStorageOwner(TUint32 aStorageId) { + OstTraceFunctionEntry0( CMTPSTORAGEMGR_LOGICALSTORAGEOWNER_ENTRY ); return ((aStorageId & KLogicalIdMask) >> KLogicalOwnerShift); } @@ -92,6 +99,7 @@ */ EXPORT_C TUint CMTPStorageMgr::PhysicalStorageNumber(TUint32 aStorageId) { + OstTraceFunctionEntry0( CMTPSTORAGEMGR_PHYSICALSTORAGENUMBER_ENTRY ); return ((aStorageId & KPhysicalIdMask) >> KPhysicalNumberShift); } @@ -103,6 +111,7 @@ */ EXPORT_C TUint CMTPStorageMgr::PhysicalStorageOwner(TUint32 aStorageId) { + OstTraceFunctionEntry0( CMTPSTORAGEMGR_PHYSICALSTORAGEOWNER_ENTRY ); return ((aStorageId & KPhysicalIdMask) >> KPhysicalOwnerShift); } @@ -115,10 +124,11 @@ */ EXPORT_C void CMTPStorageMgr::SetDefaultStorageId(TUint32 aStorageId) { - __FLOG(_L8("SetDefaultStorageId - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_SETDEFAULTSTORAGEID_ENTRY ); iDefaultStorageId = aStorageId; - __FLOG_VA((_L8("Default StorageId = 0x%08X"), aStorageId)); - __FLOG(_L8("SetDefaultStorageId - Exit")); + OstTrace1(TRACE_NORMAL, CMTPSTORAGEMGR_SETDEFAULTSTORAGEID, + "Default StorageId = 0x%08X", aStorageId); + OstTraceFunctionExit0( CMTPSTORAGEMGR_SETDEFAULTSTORAGEID_EXIT ); } /** @@ -130,10 +140,11 @@ */ EXPORT_C void CMTPStorageMgr::SetDriveMappingL(TDriveNumber aDriveNumber, TUint32 aStorageId) { - __FLOG(_L8("DefineDriveNumberMapping - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_SETDRIVEMAPPINGL_ENTRY ); iMapDriveToStorage[aDriveNumber] = aStorageId; - __FLOG_VA((_L8("Drive number %d = StorageID 0x%08X"), aDriveNumber, aStorageId)); - __FLOG(_L8("DefineDriveNumberMapping - Exit")); + OstTraceExt2(TRACE_NORMAL, CMTPSTORAGEMGR_SETDRIVEMAPPINGL, + "Drive number %d = StorageID 0x%08X", (int)aDriveNumber, (int)aStorageId); + OstTraceFunctionExit0( CMTPSTORAGEMGR_SETDRIVEMAPPINGL_EXIT ); } /** @@ -145,24 +156,25 @@ */ EXPORT_C void CMTPStorageMgr::SetFrameworkId(TUint aDataProviderId) { - __FLOG(_L8("SetFrameworkStoragesOwner - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_SETFRAMEWORKID_ENTRY ); __ASSERT_DEBUG((iFrameworkId == KErrNotFound), User::Invariant()); iFrameworkId = aDataProviderId; - __FLOG_VA((_L8("System storages owner DP Id = %d"), aDataProviderId)); - __FLOG(_L8("SetFrameworkStoragesOwner - Exit")); + OstTrace1(TRACE_NORMAL, CMTPSTORAGEMGR_SETFRAMEWORKID, + "System storages owner DP Id = %d", aDataProviderId); + OstTraceFunctionExit0( CMTPSTORAGEMGR_SETFRAMEWORKID_EXIT ); } EXPORT_C TUint32 CMTPStorageMgr::AllocateLogicalStorageIdL(TUint aDataProviderId, TDriveNumber aDriveNumber, const CMTPStorageMetaData& aStorage) { - __FLOG(_L8("AllocateLogicalStorageIdL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL_TDRIVERNUMBER_ENTRY ); TUint id(AllocateLogicalStorageIdL(aDataProviderId, PhysicalStorageId(aDriveNumber), aStorage)); - __FLOG(_L8("AllocateLogicalStorageIdL - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL_EXIT ); return id; } EXPORT_C TUint32 CMTPStorageMgr::AllocateLogicalStorageIdL(TUint aDataProviderId, TUint32 aPhysicalStorageId, const CMTPStorageMetaData& aStorage) { - __FLOG(_L8("AllocateLogicalStorageIdL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL_TUINT32_ENTRY ); //if support uninstall DP, comment the below assert. //__ASSERT_DEBUG((aDataProviderId < iSingletons.DpController().Count()), User::Invariant()); @@ -172,11 +184,13 @@ if (iStorages.Find(aStorage.DesC(CMTPStorageMetaData::EStorageSuid), StorageKeyMatchSuid) != KErrNotFound) { // SUID is not unique. + OstTrace0( TRACE_ERROR, CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL, "SUID is not unique" ); User::Leave(KErrAlreadyExists); } else if (aStorage.Uint(CMTPStorageMetaData::EStorageSystemType) != physical.Uint(CMTPStorageMetaData::EStorageSystemType)) { // Physical/logical storage type mis-match. + OstTrace0( TRACE_ERROR, DUP2_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL, "Physical/logical storage type mis-match" ); User::Leave(KErrArgument); } else if (aStorage.Uint(CMTPStorageMetaData::EStorageSystemType) == CMTPStorageMetaData::ESystemTypeDefaultFileSystem) @@ -184,26 +198,34 @@ // Validate that the SUID path exists. if (!BaflUtils::PathExists(iSingletons.Fs(), aStorage.DesC(CMTPStorageMetaData::EStorageSuid))) { + OstTrace0( TRACE_ERROR, DUP3_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL, "the SUID path doesn't exist" ); User::Leave(KErrPathNotFound); } // Validate that the SUID path corresponds to the physical storage drive. TInt storageDrive(DriveNumber(aPhysicalStorageId)); TParse p; - User::LeaveIfError(p.Set(aStorage.DesC(CMTPStorageMetaData::EStorageSuid), NULL, NULL)); + LEAVEIFERROR(p.Set(aStorage.DesC(CMTPStorageMetaData::EStorageSuid), NULL, NULL), + OstTrace0( TRACE_ERROR, DUP4_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL, "storage can't be parsed!")); TInt suidDrive(0); - User::LeaveIfError(iSingletons.Fs().CharToDrive(TChar(p.Drive()[0]), suidDrive)); + LEAVEIFERROR(iSingletons.Fs().CharToDrive(TChar(p.Drive()[0]), suidDrive), + OstTrace0( TRACE_ERROR, DUP5_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL, "CharToDrive failed!" )); + if (suidDrive != storageDrive) { // SUID path/physical storage drive mis-match. + OstTraceExt2( TRACE_ERROR, DUP6_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL, + "SUID path %d /physical storage drive %d mis-match", suidDrive, storageDrive); User::Leave(KErrArgument); } } // Allocate a logical StorageId. TInt32 id(AllocateLogicalStorageId(aDataProviderId, aPhysicalStorageId)); - User::LeaveIfError(id); - + LEAVEIFERROR(id, + OstTraceExt2( TRACE_ERROR, DUP7_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL, + "allocate logical storageId for Dp %d, Physical StorageId %d failed!", aDataProviderId, aPhysicalStorageId)); + // Create the logical storage meta-data. CMTPStorageMetaData* logical(CMTPStorageMetaData::NewLC(aStorage)); logical->SetUint(CMTPStorageMetaData::EStorageId, id); @@ -220,30 +242,34 @@ physical.SetUintArrayL(CMTPStorageMetaData::EStorageLogicalIds, logicals); CleanupStack::PopAndDestroy(&logicals); -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE HBufC8* buf(HBufC8::NewLC(aStorage.DesC(CMTPStorageMetaData::EStorageSuid).Length())); buf->Des().Copy(aStorage.DesC(CMTPStorageMetaData::EStorageSuid)); - __FLOG_VA((_L8("Allocated logical StorageID 0x%08X for storage SUID %S"), id, buf)); + OstTraceExt2(TRACE_NORMAL, DUP8_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL_TUINT32, + "Allocated logical StorageID 0x%08X for storage SUID %s", (TUint)id, *buf); CleanupStack::PopAndDestroy(buf); -#endif // __FLOG_ACTIVE - __FLOG(_L8("AllocateLogicalStorageIdL - Exit")); +#endif // OST_TRACE_COMPILER_IN_USE + OstTraceFunctionExit0( CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL_TUINT32_EXIT ); return id; } EXPORT_C TUint32 CMTPStorageMgr::AllocatePhysicalStorageIdL(TUint aDataProviderId, const CMTPStorageMetaData& aStorage) { - __FLOG(_L8("AllocatePhysicalStorageIdL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEIDL_ENTRY ); // Validate the SUID. if (iStorages.Find(aStorage.DesC(CMTPStorageMetaData::EStorageSuid), StorageKeyMatchSuid) != KErrNotFound) { // SUID is not unique. + OstTrace0( TRACE_ERROR, DUP1_CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEIDL, "SUID is not unique" ); User::Leave(KErrAlreadyExists); } // Allocate a physical StorageId. TInt32 id(AllocatePhysicalStorageId(aDataProviderId)); - User::LeaveIfError(id); + LEAVEIFERROR(id, + OstTrace1( TRACE_ERROR, DUP2_CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEIDL, "Allocate Physical StorageId for Dp %d failed", aDataProviderId)); + // Create the physical storage meta-data. CMTPStorageMetaData* physical(CMTPStorageMetaData::NewLC(aStorage)); @@ -255,14 +281,15 @@ iStorages.InsertInOrderL(physical, StorageOrder); CleanupStack::Pop(physical); - __FLOG_VA((_L8("Allocated physical StorageID 0x%08X"), id)); - __FLOG(_L8("AllocatePhysicalStorageIdL - Exit")); + OstTrace1(TRACE_NORMAL, CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEIDL, + "Allocated physical StorageID 0x%08X", id); + OstTraceFunctionExit0( CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEIDL_EXIT ); return id; } EXPORT_C TInt CMTPStorageMgr::DeallocateLogicalStorageId(TUint aDataProviderId, TUint32 aLogicalStorageId) { - __FLOG(_L8("DeallocateLogicalStorageId - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_DEALLOCATELOGICALSTORAGEID_ENTRY ); TInt ret(KErrArgument); // Validate the StorageID. @@ -283,13 +310,13 @@ } } } - __FLOG(_L8("DeallocateLogicalStorageId - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_DEALLOCATELOGICALSTORAGEID_EXIT ); return ret; } EXPORT_C void CMTPStorageMgr::DeallocateLogicalStorageIds(TUint aDataProviderId, TUint32 aPhysicalStorageId) { - __FLOG(_L8("DeallocateLogicalStorageIds - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_DEALLOCATELOGICALSTORAGEIDS_ENTRY ); TInt ret(iStorages.FindInOrder(aPhysicalStorageId, StorageOrder)); if (ret != KErrNotFound) { @@ -305,12 +332,12 @@ count--; } } - __FLOG(_L8("DeallocateLogicalStorageIds - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_DEALLOCATELOGICALSTORAGEIDS_EXIT ); } EXPORT_C TInt CMTPStorageMgr::DeallocatePhysicalStorageId(TUint aDataProviderId, TUint32 aPhysicalStorageId) { - __FLOG(_L8("DeallocatePhysicalStorageId - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_DEALLOCATEPHYSICALSTORAGEID_ENTRY ); TInt ret(KErrArgument); // Validate the StorageID. @@ -341,20 +368,20 @@ } } } - __FLOG(_L8("DeallocatePhysicalStorageId - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_DEALLOCATEPHYSICALSTORAGEID_EXIT ); return ret; } EXPORT_C TUint32 CMTPStorageMgr::DefaultStorageId() const { - __FLOG(_L8("DefaultStorageId - Entry")); - __FLOG(_L8("DefaultStorageId - Exit")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_DEFAULTSTORAGEID_ENTRY ); + OstTraceFunctionExit0( CMTPSTORAGEMGR_DEFAULTSTORAGEID_EXIT ); return iDefaultStorageId; } EXPORT_C TInt CMTPStorageMgr::DriveNumber(TUint32 aStorageId) const { - __FLOG(_L8("DriveNumber - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_DRIVENUMBER_ENTRY ); TInt drive(KErrNotFound); if (PhysicalStorageOwner(aStorageId) == iFrameworkId) { @@ -368,26 +395,26 @@ } } } - __FLOG(_L8("DriveNumber - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_DRIVENUMBER_EXIT ); return drive; } EXPORT_C TInt32 CMTPStorageMgr::FrameworkStorageId(TDriveNumber aDriveNumber) const { - __FLOG(_L8("FrameworkStorageId - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_FRAMEWORKSTORAGEID_ENTRY ); TInt32 ret(KErrNotFound); TInt32 id(iMapDriveToStorage[aDriveNumber]); if ((id != KErrNotFound) && (LogicalStorageId(id))) { ret = id; } - __FLOG(_L8("FrameworkStorageId - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_FRAMEWORKSTORAGEID_EXIT ); return ret; } EXPORT_C void CMTPStorageMgr::GetAvailableDrivesL(RArray& aDrives) const { - __FLOG(_L8("GetAvailableDrivesL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_GETAVAILABLEDRIVESL_ENTRY ); aDrives.Reset(); for (TUint i(0); (i < iMapDriveToStorage.Count()); i++) { @@ -396,12 +423,12 @@ aDrives.AppendL(static_cast(i)); } } - __FLOG(_L8("GetAvailableDrivesL - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_GETAVAILABLEDRIVESL_EXIT ); } EXPORT_C void CMTPStorageMgr::GetLogicalStoragesL(const TMTPStorageMgrQueryParams& aParams, RPointerArray& aStorages) const { - __FLOG(_L8("GetLogicalStoragesL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_GETLOGICALSTORAGESL_ENTRY ); aStorages.Reset(); const TBool KAllStorages(aParams.StorageSuid() == KNullDesC); const TBool KAllStorageSystemTypes(aParams.StorageSystemType() == CMTPStorageMetaData::ESystemTypeUndefined); @@ -416,12 +443,12 @@ aStorages.AppendL(iStorages[i]); } } - __FLOG(_L8("GetLogicalStoragesL - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_GETLOGICALSTORAGESL_EXIT ); } EXPORT_C void CMTPStorageMgr::GetPhysicalStoragesL(const TMTPStorageMgrQueryParams& aParams, RPointerArray& aStorages) const { - __FLOG(_L8("GetPhysicalStoragesL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_GETPHYSICALSTORAGESL_ENTRY ); aStorages.Reset(); const TBool KAllStorages(aParams.StorageSuid() == KNullDesC); const TBool KAllStorageSystemTypes(aParams.StorageSystemType() == CMTPStorageMetaData::ESystemTypeUndefined); @@ -436,19 +463,19 @@ aStorages.AppendL(iStorages[i]); } } - __FLOG(_L8("GetPhysicalStoragesL - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_GETPHYSICALSTORAGESL_EXIT ); } EXPORT_C TUint32 CMTPStorageMgr::LogicalStorageId(TUint32 aStorageId) const { - __FLOG(_L8("LogicalStorageId - Entry")); - __FLOG(_L8("LogicalStorageId - Exit")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_LOGICALSTORAGEID_TUINT32_ENTRY ); + OstTraceFunctionExit0( CMTPSTORAGEMGR_LOGICALSTORAGEID_TUINT32_EXIT ); return (aStorageId & KLogicalIdMask); } EXPORT_C TInt32 CMTPStorageMgr::LogicalStorageId(const TDesC& aStorageSuid) const { - __FLOG(_L8("LogicalStorageId - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_LOGICALSTORAGEID_TDESC_ENTRY ); TInt32 id(KErrNotFound); TInt idx(iStorages.Find(aStorageSuid, StorageKeyMatchSuid)); if (idx != KErrNotFound) @@ -459,52 +486,53 @@ id = KErrNotFound; } } - __FLOG(_L8("LogicalStorageId - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_LOGICALSTORAGEID_TDESC_EXIT ); return id; } EXPORT_C TInt32 CMTPStorageMgr::PhysicalStorageId(TDriveNumber aDriveNumber) const { - __FLOG(_L8("PhysicalStorageId - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_PHYSICALSTORAGEID_TDRIVENUMBER_ENTRY ); TInt32 storageId(iMapDriveToStorage[aDriveNumber]); if (storageId != KErrNotFound) { storageId = PhysicalStorageId(storageId); } - __FLOG(_L8("PhysicalStorageId - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_PHYSICALSTORAGEID_TDRIVENUMBER_EXIT ); return storageId; } EXPORT_C TUint32 CMTPStorageMgr::PhysicalStorageId(TUint32 aStorageId) const { - __FLOG(_L8("PhysicalStorageId - Entry")); - __FLOG(_L8("PhysicalStorageId - Exit")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_PHYSICALSTORAGEID_TUINT32_ENTRY ); + OstTraceFunctionExit0( CMTPSTORAGEMGR_PHYSICALSTORAGEID_TUINT32_EXIT ); return (aStorageId & KPhysicalIdMask); } EXPORT_C const CMTPStorageMetaData& CMTPStorageMgr::StorageL(TUint32 aStorageId) const { - __FLOG(_L8("StorageL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_STORAGEL_ENTRY ); TInt idx(iStorages.FindInOrder(aStorageId, StorageOrder)); - User::LeaveIfError(idx); - __FLOG(_L8("StorageL - Exit")); + LEAVEIFERROR(idx, + OstTrace1( TRACE_ERROR, CMTPSTORAGEMGR_STORAGEL, "can't find storage with StorageId %d", idx )); + OstTraceFunctionExit0( CMTPSTORAGEMGR_STORAGEL_EXIT ); return *iStorages[idx]; } EXPORT_C TUint32 CMTPStorageMgr::StorageId(TUint32 aPhysicalStorageId, TUint32 aLogicalStorageId) const { - __FLOG(_L8("StorageId - Entry")); - __FLOG(_L8("StorageId - Exit")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_STORAGEID_ENTRY ); + OstTraceFunctionExit0( CMTPSTORAGEMGR_STORAGEID_EXIT ); return (aPhysicalStorageId | aLogicalStorageId); } EXPORT_C TBool CMTPStorageMgr::ValidStorageId(TUint32 aStorageId) const { - __FLOG(_L8("ValidStorageId - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_VALIDSTORAGEID_ENTRY ); TInt idx(iStorages.FindInOrder(aStorageId, StorageOrder)); if(KErrNotFound == idx) { - __FLOG(_L8("ValidStorageId - False Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_VALIDSTORAGEID_EXIT ); return EFalse; } @@ -530,24 +558,25 @@ ret = BaflUtils::PathExists(iSingletons.Fs(), buf); } } - - __FLOG(_L8("ValidStorageId - Exit")); + OstTraceFunctionExit0( DUP1_CMTPSTORAGEMGR_VALIDSTORAGEID_EXIT ); return ret; } EXPORT_C CMTPTypeString* CMTPStorageMgr::VolumeIdL(TUint aDataProviderId, TUint32 aStorageId, const TDesC& aVolumeIdSuffix) const { - __FLOG(_L8("VolumeIdL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_VOLUMEIDL_ENTRY ); // Validate the StorageId. TUint owner(LogicalStorageId(aStorageId) ? LogicalStorageOwner(aStorageId) : PhysicalStorageOwner(aStorageId)); if (!ValidStorageId(aStorageId)) { + OstTrace1( TRACE_ERROR, CMTPSTORAGEMGR_VOLUMEIDL, "invalid storage id %d", aStorageId); User::Leave(KErrNotFound); } else if (aDataProviderId != owner) { + OstTrace1( TRACE_ERROR, DUP1_CMTPSTORAGEMGR_VOLUMEIDL, "Dp %d not owner", aDataProviderId); User::Leave(KErrAccessDenied); } @@ -566,7 +595,7 @@ CMTPTypeString* volumeId = CMTPTypeString::NewL(buffer); CleanupStack::PopAndDestroy(&buffer); - __FLOG(_L8("VolumeIdL - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_VOLUMEIDL_EXIT ); return volumeId; } @@ -576,7 +605,6 @@ CMTPStorageMgr::CMTPStorageMgr() : iFrameworkId(KErrNotFound) { - } /** @@ -585,14 +613,13 @@ */ void CMTPStorageMgr::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_CONSTRUCTL_ENTRY ); iSingletons.OpenL(); for (TUint i(0); (i < KMaxDrives); i++) { iMapDriveToStorage[i] = KErrNotFound; } - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_CONSTRUCTL_EXIT ); } /** @@ -606,7 +633,7 @@ */ TInt32 CMTPStorageMgr::AllocateLogicalStorageId(TUint aDataProviderId, TUint32 aPhysicalStorageId) { - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("AllocateLogicalStorageId - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEID_ENTRY ); TInt ret(iStorages.FindInOrder(aPhysicalStorageId, StorageOrder)); if (ret != KErrNotFound) { @@ -625,7 +652,7 @@ ret = KErrOverflow; } } - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("AllocateLogicalStorageId - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEID_EXIT ); return ret; } @@ -638,7 +665,7 @@ */ TInt32 CMTPStorageMgr::AllocatePhysicalStorageId(TUint aDataProviderId) { - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("AllocatePhysicalStorageId - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEID_ENTRY ); TInt32 ret(KErrNone); while ((iPhysicalStorageNumbers.Count() < (aDataProviderId + 1)) && (ret == KErrNone)) { @@ -656,7 +683,7 @@ ret = KErrOverflow; } } - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("AllocatePhysicalStorageId - Exit")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEID_EXIT ); return ret; } @@ -736,7 +763,7 @@ */ void CMTPStorageMgr::RemoveLogicalStorageL(TUint aIdx) { - __FLOG(_L8("RemoveLogicalStorageL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_REMOVELOGICALSTORAGEL_ENTRY ); TUint32 id(iStorages[aIdx]->Uint(CMTPStorageMetaData::EStorageId)); // Disassociate the logical and physical storages. @@ -751,7 +778,7 @@ // Delete the storage. delete iStorages[aIdx]; iStorages.Remove(aIdx); - __FLOG(_L8("RemoveLogicalStorageL - Entry")); + OstTraceFunctionExit0( CMTPSTORAGEMGR_REMOVELOGICALSTORAGEL_EXIT ); } /** @@ -763,10 +790,11 @@ */ CMTPStorageMetaData& CMTPStorageMgr::StorageMetaDataL(TUint32 aStorageId) { - __FLOG(_L8("StorageMetaDataL - Entry")); + OstTraceFunctionEntry0( CMTPSTORAGEMGR_STORAGEMETADATAL_ENTRY ); TInt idx(iStorages.FindInOrder(aStorageId, StorageOrder)); - User::LeaveIfError(idx); - __FLOG(_L8("StorageMetaDataL - Exit")); + LEAVEIFERROR(idx, + OstTrace1( TRACE_ERROR, CMTPSTORAGEMGR_STORAGEMETADATAL, "can't find storage with storageId %d", idx )); + OstTraceFunctionExit0( CMTPSTORAGEMGR_STORAGEMETADATAL_EXIT ); return *iStorages[idx]; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/src/rmtpframework.cpp --- a/mtpfws/mtpfw/src/rmtpframework.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtpfws/mtpfw/src/rmtpframework.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,9 +23,13 @@ #include "rmtpframework.h" #include "cmtpdatacodegenerator.h" #include "cmtpservicemgr.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "rmtpframeworkTraces.h" +#endif + // Class constants. -__FLOG_STMT(_LIT8(KComponent,"Framework");) /** Constructor. @@ -41,11 +45,10 @@ */ EXPORT_C void RMTPFramework::OpenL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("OpenL - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_OPENL_ENTRY ); iSingletons = &CSingletons::OpenL(); iNested = iSingletons->iConstructing; - __FLOG(_L8("OpenL - Exit")); + OstTraceFunctionExit0( RMTPFRAMEWORK_OPENL_EXIT ); } /** @@ -54,11 +57,10 @@ */ EXPORT_C void RMTPFramework::OpenLC() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("OpenLC - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_OPENLC_ENTRY ); ::CleanupClosePushL(*this); OpenL(); - __FLOG(_L8("OpenLC - Exit")); + OstTraceFunctionExit0( RMTPFRAMEWORK_OPENLC_EXIT ); } /** @@ -66,108 +68,107 @@ */ EXPORT_C void RMTPFramework::Close() { - __FLOG(_L8("Close - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_CLOSE_ENTRY ); if ((iSingletons) && (!iNested)) { iSingletons->Close(); iSingletons = NULL; } - __FLOG(_L8("Close - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( RMTPFRAMEWORK_CLOSE_EXIT ); } EXPORT_C CMTPConnectionMgr& RMTPFramework::ConnectionMgr() const { - __FLOG(_L8("ConnectionMgr - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_CONNECTIONMGR_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); __ASSERT_DEBUG(iSingletons->iSingletonConnectionMgr, User::Invariant()); - __FLOG(_L8("ConnectionMgr - Exit")); + OstTraceFunctionExit0( RMTPFRAMEWORK_CONNECTIONMGR_EXIT ); return *(iSingletons->iSingletonConnectionMgr); } EXPORT_C CMTPDataProviderController& RMTPFramework::DpController() const { - __FLOG(_L8("DpController - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_DPCONTROLLER_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); __ASSERT_DEBUG(iSingletons->iSingletonDpController, User::Invariant()); - __FLOG(_L8("DpController - Exit")); + OstTraceFunctionExit0( RMTPFRAMEWORK_DPCONTROLLER_EXIT ); return *(iSingletons->iSingletonDpController); } EXPORT_C CMTPFrameworkConfig& RMTPFramework::FrameworkConfig() const { - __FLOG(_L8("FrameworkConfig - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_FRAMEWORKCONFIG_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); __ASSERT_DEBUG(iSingletons->iSingletonFrameworkConfig, User::Invariant()); - __FLOG(_L8("FrameworkConfig - Exit")); + OstTraceFunctionExit0( RMTPFRAMEWORK_FRAMEWORKCONFIG_EXIT ); return *(iSingletons->iSingletonFrameworkConfig); } EXPORT_C RFs& RMTPFramework::Fs() const { - __FLOG(_L8("Fs - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_FS_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); - __FLOG(_L8("Fs - Exit")); + OstTraceFunctionExit0( RMTPFRAMEWORK_FS_EXIT ); return iSingletons->iSingletonFs; } EXPORT_C CMTPObjectMgr& RMTPFramework::ObjectMgr() const { - __FLOG(_L8("ObjectMgr - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_OBJECTMGR_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); __ASSERT_DEBUG(iSingletons->iSingletonObjectMgr, User::Invariant()); - __FLOG(_L8("ObjectMgr - Exit")); + OstTraceFunctionExit0( RMTPFRAMEWORK_OBJECTMGR_EXIT ); return *(iSingletons->iSingletonObjectMgr); } EXPORT_C CMTPReferenceMgr& RMTPFramework::ReferenceMgr() const { - __FLOG(_L8("ReferenceMgr - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_REFERENCEMGR_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); __ASSERT_DEBUG(iSingletons->iSingletonRouter, User::Invariant()); - __FLOG(_L8("ReferenceMgr - Exit")); + OstTraceFunctionExit0( RMTPFRAMEWORK_REFERENCEMGR_EXIT ); return (iSingletons->iSingletonObjectMgr->ObjectStore().ReferenceMgr()); } EXPORT_C CMTPParserRouter& RMTPFramework::Router() const { - __FLOG(_L8("Router - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_ROUTER_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); __ASSERT_DEBUG(iSingletons->iSingletonRouter, User::Invariant()); - __FLOG(_L8("Router - Exit")); + OstTraceFunctionExit0( RMTPFRAMEWORK_ROUTER_EXIT ); return *(iSingletons->iSingletonRouter); } EXPORT_C CMTPStorageMgr& RMTPFramework::StorageMgr() const { - __FLOG(_L8("StorageMgr - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_STORAGEMGR_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); __ASSERT_DEBUG(iSingletons->iSingletonStorageMgr, User::Invariant()); - __FLOG(_L8("StorageMgr - Exit")); + OstTraceFunctionExit0( RMTPFRAMEWORK_STORAGEMGR_EXIT ); return *(iSingletons->iSingletonStorageMgr); } EXPORT_C CMTPDataCodeGenerator& RMTPFramework::DataCodeGenerator() const { - __FLOG(_L8("DataCodeGenerator - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_DATACODEGENERATOR_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); __ASSERT_DEBUG(iSingletons->iSingleDataCodeGenerator, User::Invariant()); - __FLOG(_L8("DataCodeGenerator - Exit")); + OstTraceFunctionExit0( RMTPFRAMEWORK_DATACODEGENERATOR_EXIT ); return *(iSingletons->iSingleDataCodeGenerator); } EXPORT_C CMTPServiceMgr& RMTPFramework::ServiceMgr() const { - __FLOG(_L8("ServiceMgr - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_SERVICEMGR_ENTRY ); __ASSERT_DEBUG(iSingletons, User::Invariant()); __ASSERT_DEBUG(iSingletons->iSingleServiceMgr, User::Invariant()); - __FLOG(_L8("ServiceMgr - Exit")); + OstTraceFunctionExit0( RMTPFRAMEWORK_SERVICEMGR_EXIT ); return *(iSingletons->iSingleServiceMgr); } RMTPFramework::CSingletons& RMTPFramework::CSingletons::OpenL() { - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("CSingletons::OpenL - Entry")); + OstTraceFunctionEntry0( CSINGLETONS_OPENL_ENTRY ); CSingletons* self(reinterpret_cast(Dll::Tls())); if (!self) { @@ -179,33 +180,33 @@ { self->Inc(); } - __FLOG_STATIC(KMTPSubsystem, KComponent, _L8("CSingletons::OpenL - Exit")); + OstTraceFunctionExit0( CSINGLETONS_OPENL_EXIT ); return *self; } void RMTPFramework::CSingletons::Close() - { + { CSingletons* self(reinterpret_cast(Dll::Tls())); if (self) { - __FLOG(_L8("CSingletons::Close - Entry")); + OstTraceFunctionEntry0( CSINGLETONS_CLOSE_ENTRY ); self->Dec(); if (self->AccessCount() == 0) { - __FLOG(_L8("CSingletons::Close - Exit")); + OstTraceFunctionExit0( CSINGLETONS_CLOSE_EXIT ); delete self; Dll::SetTls(NULL); } else { - __FLOG(_L8("CSingletons::Close - Exit")); + OstTraceFunctionExit0( DUP1_CSINGLETONS_CLOSE_EXIT ); } } } RMTPFramework::CSingletons::~CSingletons() { - __FLOG(_L8("CSingletons::~CSingletons - Entry")); + OstTraceFunctionEntry0( RMTPFRAMEWORK_CSINGLETONS_CSINGLETONS_DES_ENTRY ); delete iSingletonStorageMgr; delete iSingletonRouter; delete iSingletonDpController; @@ -216,14 +217,12 @@ delete iSingleServiceMgr; iSingletonFs.Close(); - __FLOG(_L8("CSingletons::~CSingletons - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( RMTPFRAMEWORK_CSINGLETONS_CSINGLETONS_DES_EXIT ); } void RMTPFramework::CSingletons::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("CSingletons::ConstructL - Entry")); + OstTraceFunctionEntry0( CSINGLETONS_CONSTRUCTL_ENTRY ); iConstructing = ETrue; User::LeaveIfError(iSingletonFs.Connect()); @@ -237,5 +236,5 @@ iSingleServiceMgr = CMTPServiceMgr::NewL(); iConstructing = EFalse; - __FLOG(_L8("CSingletons::ConstructL - Exit")); + OstTraceFunctionExit0( CSINGLETONS_CONSTRUCTL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpfws/mtpfw/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtpfws/mtpfw/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtpfws/mtpfw/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,823 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_IMPORTANT=0x85 +[GROUP]TRACE_NORMAL=0x86 +[GROUP]TRACE_WARNING=0x83 +[TRACE]TRACE_ERROR[0x82]_CMAP_NODEINSERTL=0x53 +[TRACE]TRACE_ERROR[0x82]_CMTPCONNECTION_DEFINECONNSTATEPROPERTYL=0x8 +[TRACE]TRACE_ERROR[0x82]_CMTPCONNECTION_RECEIVEDEVENTL=0x5 +[TRACE]TRACE_ERROR[0x82]_CMTPCONNECTION_RECEIVEDREQUESTL=0x6 +[TRACE]TRACE_ERROR[0x82]_CMTPCONNECTION_SENDEVENTL=0x1 +[TRACE]TRACE_ERROR[0x82]_CMTPCONNECTION_SENDRESPONSEL=0x2 +[TRACE]TRACE_ERROR[0x82]_CMTPCONNECTION_SESSIONOPENEDL=0x3 +[TRACE]TRACE_ERROR[0x82]_CMTPCONNECTION_SESSIONWITHMTPIDL=0x4 +[TRACE]TRACE_ERROR[0x82]_CMTPCONNECTION_TRANSACTIONPHASEL=0x7 +[TRACE]TRACE_ERROR[0x82]_CMTPDATAPROVIDERCONFIG_CONSTRUCTL=0xe +[TRACE]TRACE_ERROR[0x82]_CMTPDATAPROVIDERCONTROLLER_CREATEREGISTRYSESSIONANDENTRYL=0x18 +[TRACE]TRACE_ERROR[0x82]_CMTPDATAPROVIDERCONTROLLER_LOADINSTALLEDDATAPROVIDERSL=0x16 +[TRACE]TRACE_ERROR[0x82]_CMTPDATAPROVIDERCONTROLLER_LOADROMDATAPROVIDERSL=0x15 +[TRACE]TRACE_ERROR[0x82]_CMTPDATAPROVIDERCONTROLLER_NOTIFYDATAPROVIDERSL=0x14 +[TRACE]TRACE_ERROR[0x82]_CMTPDATAPROVIDER_SENDEVENTL=0xa +[TRACE]TRACE_ERROR[0x82]_CMTPDELTADATAMGR_CREATEANCHORIDTABLEL=0x1b +[TRACE]TRACE_ERROR[0x82]_CMTPDELTADATAMGR_CREATEDELTADATATABLEL=0x19 +[TRACE]TRACE_ERROR[0x82]_CMTPDELTADATAMGR_GETADDEDPUIDSL=0x1f +[TRACE]TRACE_ERROR[0x82]_CMTPDELTADATAMGR_GETCHANGEDPUIDSL=0x1d +[TRACE]TRACE_ERROR[0x82]_CMTPDELTADATAMGR_GETDELETEDPUIDSL=0x21 +[TRACE]TRACE_ERROR[0x82]_CMTPDELTADATAMGR_GETMODIFIEDPUIDSL=0x23 +[TRACE]TRACE_ERROR[0x82]_CMTPDELTADATAMGR_RESETMTPDELTADATATABLEL=0x25 +[TRACE]TRACE_ERROR[0x82]_CMTPDPIDSTORE_CREATEDPIDSTOTETABLEL=0x26 +[TRACE]TRACE_ERROR[0x82]_CMTPFRAMEWORKCONFIG_CONSTRUCTL=0x31 +[TRACE]TRACE_ERROR[0x82]_CMTPFRAMEWORKCONFIG_GETVALUEL_TPARAMETER_RARRAY=0x2e +[TRACE]TRACE_ERROR[0x82]_CMTPFRAMEWORKCONFIG_GETVALUEL_TPARAMETER_TBOOL=0x2d +[TRACE]TRACE_ERROR[0x82]_CMTPFRAMEWORKCONFIG_GETVALUEL_TPARAMETER_TDES=0x29 +[TRACE]TRACE_ERROR[0x82]_CMTPFRAMEWORKCONFIG_GETVALUEL_TPARAMETER_TUINT=0x2c +[TRACE]TRACE_ERROR[0x82]_CMTPFRAMEWORKCONFIG_VALUEL=0x2a +[TRACE]TRACE_ERROR[0x82]_CMTPHANDLEALLOCATOR_EXTENDARRAYL=0x32 +[TRACE]TRACE_ERROR[0x82]_CMTPHANDLEALLOCATOR_NEXTIDFROMPOOLL=0x33 +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTMGR_PUIDL=0x35 +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_BEGINTRANSACTIONL=0x3c +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_COMMITRESERVEDOBJECTHANDLEL=0x38 +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_COMMITTRANSACTIONL=0x3d +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_CONSTRUCTL=0x44 +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_CREATEDBL=0x48 +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_CREATEHANDLEINDEXL=0x4a +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_CREATEHANDLETABLEL=0x49 +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_INCTRANOPSNUML=0x3b +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_MARKDPLOADEDL=0x37 +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_MARKNONPERSISTENTOBJECTSL=0x36 +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_MODIFYOBJECTL=0x3e +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_OBJECTSENUMCOMPLETE=0x50 +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_OBJECTSUIDL=0x40 +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_PUIDL_TDESC=0x42 +[TRACE]TRACE_ERROR[0x82]_CMTPOBJECTSTORE_PUIDL_TUINT32=0x41 +[TRACE]TRACE_ERROR[0x82]_CMTPPARSERROUTER_SELECTSUBTYPEVALIDATIONL=0x55 +[TRACE]TRACE_ERROR[0x82]_CMTPPKGIDSTORE_CREATEPKGIDSTORETABLEL=0x56 +[TRACE]TRACE_ERROR[0x82]_CMTPPKGIDSTORE_INSERTPKGIDL=0x59 +[TRACE]TRACE_ERROR[0x82]_CMTPPKGIDSTORE_REMOVEL=0x5b +[TRACE]TRACE_ERROR[0x82]_CMTPREFERENCEMGR_CREATEINDEXL=0x5d +[TRACE]TRACE_ERROR[0x82]_CMTPREFERENCEMGR_CREATETABLEL=0x5c +[TRACE]TRACE_ERROR[0x82]_CMTPSERVICECONFIG_SERVICERESOURCEIDL=0x5e +[TRACE]TRACE_ERROR[0x82]_CMTPSERVICEMGR_GETSERVICEID=0x5f +[TRACE]TRACE_ERROR[0x82]_CMTPSESSION_ACTIVEREQUESTL=0x61 +[TRACE]TRACE_ERROR[0x82]_CMTPSESSION_ROUTEREQUESTREGISTERL=0x60 +[TRACE]TRACE_ERROR[0x82]_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL=0x62 +[TRACE]TRACE_ERROR[0x82]_CMTPSTORAGEMGR_STORAGEL=0x6b +[TRACE]TRACE_ERROR[0x82]_CMTPSTORAGEMGR_STORAGEMETADATAL=0x6e +[TRACE]TRACE_ERROR[0x82]_CMTPSTORAGEMGR_VOLUMEIDL=0x6c +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPCONNECTION_DEFINECONNSTATEPROPERTYL=0x9 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL=0x10 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPDATAPROVIDERCONTROLLER_LOADINSTALLEDDATAPROVIDERSL=0x17 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPDELTADATAMGR_CREATEANCHORIDTABLEL=0x1c +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPDELTADATAMGR_CREATEDELTADATATABLEL=0x1a +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPDELTADATAMGR_GETADDEDPUIDSL=0x20 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPDELTADATAMGR_GETCHANGEDPUIDSL=0x1e +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPDELTADATAMGR_GETDELETEDPUIDSL=0x22 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPDELTADATAMGR_GETMODIFIEDPUIDSL=0x24 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPDPIDSTORE_CREATEDPIDSTOTETABLEL=0x27 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPFRAMEWORKCONFIG_GETVALUEL_TPARAMETER_RARRAY=0x2f +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPFRAMEWORKCONFIG_VALUEL=0x2b +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPHANDLEALLOCATOR_NEXTIDFROMPOOLL=0x34 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPOBJECTSTORE_CLEANL=0x43 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPOBJECTSTORE_CONSTRUCTL=0x45 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPOBJECTSTORE_CREATEHANDLEINDEXL=0x4b +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPOBJECTSTORE_ESTABLISHDBSNAPSHOTL=0x4e +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPOBJECTSTORE_MODIFYOBJECTL=0x3f +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPOBJECTSTORE_REMOVEUNDEFINEDOBJECTSL=0x51 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPARSERROUTER_GETCONFIGPARAMETERSL=0x54 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPKGIDSTORE_CREATEPKGIDSTORETABLEL=0x57 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPPKGIDSTORE_INSERTPKGIDL=0x5a +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEIDL=0x69 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPSTORAGEMGR_VOLUMEIDL=0x6d +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL=0x11 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPDPIDSTORE_CREATEDPIDSTOTETABLEL=0x28 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPFRAMEWORKCONFIG_GETVALUEL_TPARAMETER_RARRAY=0x30 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPOBJECTSTORE_CONSTRUCTL=0x46 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPOBJECTSTORE_CREATEHANDLEINDEXL=0x4c +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPOBJECTSTORE_ESTABLISHDBSNAPSHOTL=0x4f +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPOBJECTSTORE_REMOVEUNDEFINEDOBJECTSL=0x52 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPPKGIDSTORE_CREATEPKGIDSTORETABLEL=0x58 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL=0x63 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEIDL=0x6a +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL=0x12 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPDATAPROVIDER_CONSTRUCTL=0xb +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPOBJECTSTORE_CONSTRUCTL=0x47 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPOBJECTSTORE_CREATEHANDLEINDEXL=0x4d +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL=0x64 +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL=0x13 +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPDATAPROVIDER_CONSTRUCTL=0xc +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPOBJECTSTORE_INSERTOBJECTL=0x39 +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL=0x65 +[TRACE]TRACE_ERROR[0x82]_DUP5_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL=0xf +[TRACE]TRACE_ERROR[0x82]_DUP5_CMTPDATAPROVIDER_CONSTRUCTL=0xd +[TRACE]TRACE_ERROR[0x82]_DUP5_CMTPOBJECTSTORE_INSERTOBJECTL=0x3a +[TRACE]TRACE_ERROR[0x82]_DUP5_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL=0x66 +[TRACE]TRACE_ERROR[0x82]_DUP6_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL=0x67 +[TRACE]TRACE_ERROR[0x82]_DUP7_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL=0x68 +[TRACE]TRACE_FLOW[0x8A]_CMAP_GETTOL_ENTRY=0x127 +[TRACE]TRACE_FLOW[0x8A]_CMAP_GETTOL_EXIT=0x128 +[TRACE]TRACE_FLOW[0x8A]_CMAP_SELECTTARGETMATCHINGL_ENTRY=0x129 +[TRACE]TRACE_FLOW[0x8A]_CMAP_SELECTTARGETMATCHINGL_EXIT=0x12a +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_CONNECTIONCLOSECOMPLETE_ENTRY=0x45 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_CONNECTIONCLOSECOMPLETE_EXIT=0x46 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_CONNECTIONCLOSED_ENTRY=0x4f +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_CONNECTIONCLOSED_EXIT=0x50 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_CONNECTIONFIND_ENTRY=0x53 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_CONNECTIONFIND_EXIT=0x54 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_CONNECTIONL_ENTRY=0x43 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_CONNECTIONL_EXIT=0x44 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_CONNECTIONOPENEDL_ENTRY=0x51 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_CONNECTIONOPENEDL_EXIT=0x52 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_QUEUETRANSPORTL_ENTRY=0x4b +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_QUEUETRANSPORTL_EXIT=0x4c +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT_ENTRY=0x59 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_ENTRY=0x47 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_EXIT=0x48 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER_ENTRY=0x49 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER_EXIT=0x4a +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_STOPTRANSPORT_ENTRY=0x4d +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_STOPTRANSPORT_EXIT=0x4e +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_SUSPENDTRANSPORTL_ENTRY=0x55 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_SUSPENDTRANSPORTL_EXIT=0x56 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_UNSUSPENDTRANSPORT_ENTRY=0x57 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTIONMGR_UNSUSPENDTRANSPORT_EXIT=0x58 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_ACTIVESESSIONS_ENTRY=0x2d +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_ACTIVESESSIONS_EXIT=0x2e +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_CLOSEALLSESSIONS_ENTRY=0x2f +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_CLOSEALLSESSIONS_EXIT=0x30 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_CLOSESESSION_ENTRY=0x31 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_CLOSESESSION_EXIT=0x32 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_CMTPCONNECTION_DES_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_CMTPCONNECTION_DES_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_COMPLETECLOSECONNECTION_ENTRY=0x11 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_COMPLETECLOSECONNECTION_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_CONNECTIONRESUMEDL_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_CONNECTIONRESUMEDL_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_CONNECTIONSUSPENDED_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_CONNECTIONSUSPENDED_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_CONSTRUCTL_ENTRY=0x23 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_CONSTRUCTL_EXIT=0x24 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_DEFINECONNSTATEPROPERTYL_ENTRY=0x3d +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_DEFINECONNSTATEPROPERTYL_EXIT=0x3e +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_GETDATARECEIVERESULT_ENTRY=0x33 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_GETDATARECEIVERESULT_EXIT=0x34 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_INITIATEMTPERRORRECOVERYL_ENTRY=0x25 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_INITIATEMTPERRORRECOVERYL_EXIT=0x26 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_INITIATETRANSACTIONCANCELL_ENTRY=0x2b +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_INITIATETRANSACTIONCANCELL_EXIT=0x2c +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_MTPERRORRECOVERYCOMPLETE_ENTRY=0x27 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_MTPERRORRECOVERYCOMPLETE_EXIT=0x28 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_PUBLISHCONNSTATE_ENTRY=0x3f +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_PUBLISHCONNSTATE_EXIT=0x40 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_RECEIVEDATACOMPLETEL_ENTRY=0x1b +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_RECEIVEDATACOMPLETEL_EXIT=0x1c +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_RECEIVEDATAL_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_RECEIVEDATAL_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_RECEIVEDEVENTL_ENTRY=0x17 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_RECEIVEDEVENTL_EXIT=0x18 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_RECEIVEDREQUESTL_ENTRY=0x19 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_RECEIVEDREQUESTL_EXIT=0x1a +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_REMOVEEVENTSFORSESSION_ENTRY=0x3b +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_REMOVEEVENTSFORSESSION_EXIT=0x3c +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SENDDATACOMPLETEL_ENTRY=0x1d +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SENDDATACOMPLETEL_EXIT=0x1e +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SENDDATAL_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SENDDATAL_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SENDEVENTCOMPLETEL_ENTRY=0x1f +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SENDEVENTCOMPLETEL_EXIT=0x20 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SENDEVENTL_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SENDEVENTL_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SENDRESPONSECOMPLETEL_ENTRY=0x21 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SENDRESPONSECOMPLETEL_EXIT=0x22 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SENDRESPONSEL_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SENDRESPONSEL_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SESSIONCLOSEDL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SESSIONCLOSEDL_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SESSIONOPENEDL_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SESSIONOPENEDL_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SETSTATE_ENTRY=0x35 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_SETSTATE_EXIT=0x36 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_STATE_ENTRY=0x37 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_STATE_EXIT=0x38 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_TRANSACTIONCOMPLETEL_ENTRY=0x15 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_TRANSACTIONCOMPLETEL_EXIT=0x16 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_UNRECOVERABLEMTPERROR_ENTRY=0x29 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_UNRECOVERABLEMTPERROR_EXIT=0x2a +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_VALIDATEANDPUBLISHCONNSTATE_ENTRY=0x41 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_VALIDATEANDPUBLISHCONNSTATE_EXIT=0x42 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_VALIDFRAMEWORKREQUEST_ENTRY=0x39 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONNECTION_VALIDFRAMEWORKREQUEST_EXIT=0x3a +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_ALLOCATESERVICEFORMATCODE_ENTRY=0x6f +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_ALLOCATESERVICEFORMATCODE_EXIT=0x70 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_ALLOCATESERVICEID_ENTRY=0x63 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_ALLOCATESERVICEID_EXIT=0x64 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_ALLOCATESERVICEMETHODFORMATCODE_ENTRY=0x74 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_ALLOCATESERVICEMETHODFORMATCODE_EXIT=0x75 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_ALLOCATESERVICEPROPERTYCODE_ENTRY=0x6a +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_ALLOCATESERVICEPROPERTYCODE_EXIT=0x6b +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_CMTPDATACODEGENERATOR_DES_ENTRY=0x5b +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_CMTPDATACODEGENERATOR_DES_EXIT=0x5c +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_CONSTRUCTL_ENTRY=0x5d +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_CONSTRUCTL_EXIT=0x5e +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_DECSERVICEIDRESOURCE_ENTRY=0x61 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_DECSERVICEIDRESOURCE_EXIT=0x62 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_INCSERVICEIDRESOURCE_ENTRY=0x5f +[TRACE]TRACE_FLOW[0x8A]_CMTPDATACODEGENERATOR_INCSERVICEIDRESOURCE_EXIT=0x60 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_CMTPDATAPROVIDERCONTROLLER_DES_ENTRY=0xad +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_CMTPDATAPROVIDERCONTROLLER_DES_EXIT=0xae +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_CONSTRUCTL_ENTRY=0xbd +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_CONSTRUCTL_EXIT=0xbe +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_CREATECONFIGLC_ENTRY=0xbf +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_CREATECONFIGLC_EXIT=0xc0 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_DOCANCEL_ENTRY=0xb7 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_DOCANCEL_EXIT=0xb8 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_ENUMERATEDATAPROVIDEROBJECTSL_ENTRY=0xc3 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_ENUMERATEDATAPROVIDEROBJECTSL_EXIT=0xc4 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_ENUMERATIONSTATECHANGEDL_ENTRY=0xb5 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_ENUMERATIONSTATECHANGEDL_EXIT=0xb6 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_EXECUTEPENDINGREQUESTL_ENTRY=0xd4 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_EXECUTEPENDINGREQUESTL_EXIT=0xd5 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_ISOBJECTSENUMERATIONNEEDEDL_ENTRY=0xc1 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_ISOBJECTSENUMERATIONNEEDEDL_EXIT=0xc2 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERL_ENTRY=0xc9 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERL_EXIT=0xca +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL_ENTRY=0xaf +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL_EXIT=0xb0 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_LOADINSTALLEDDATAPROVIDERSL_ENTRY=0xc7 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_LOADINSTALLEDDATAPROVIDERSL_EXIT=0xc8 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_LOADROMDATAPROVIDERSL_ENTRY=0xc5 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_LOADROMDATAPROVIDERSL_EXIT=0xc6 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_NOTIFYDATAPROVIDERSL_ENTRY=0xb3 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_NOTIFYDATAPROVIDERSL_EXIT=0xb4 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_REGISTERPENDINGREQUESTDP_ENTRY=0xd2 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_REGISTERPENDINGREQUESTDP_EXIT=0xd3 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_RUNERROR_ENTRY=0xbb +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_RUNERROR_EXIT=0xbc +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_RUNL_ENTRY=0xb9 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_RUNL_EXIT=0xba +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_SCHEDULE_ENTRY=0xce +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_SCHEDULE_EXIT=0xcf +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_SETNEEDENUMERATINGPHASE2_ENTRY=0xd0 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_SETNEEDENUMERATINGPHASE2_EXIT=0xd1 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_UID_ENTRY=0xcc +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_UID_EXIT=0xcd +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_UNLOADDATAPROVIDERS_ENTRY=0xb1 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDERCONTROLLER_UNLOADDATAPROVIDERS_EXIT=0xb2 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_CMTPDATAPROVIDER_DES_ENTRY=0x79 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_CMTPDATAPROVIDER_EXIT=0x7a +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_CONSTRUCTL_ENTRY=0xa7 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_CONSTRUCTL_EXIT=0xa8 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_DOCANCEL_ENTRY=0xa1 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_DOCANCEL_EXIT=0xa2 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_ENUMERATEOBJECTSL_ENTRY=0x83 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_ENUMERATEOBJECTSL_EXIT=0x84 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_ENUMERATESTORAGESL_ENTRY=0x85 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_ENUMERATESTORAGESL_EXIT=0x86 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_EXECUTEEVENTL_ENTRY=0x7b +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_EXECUTEEVENTL_EXIT=0x7c +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_EXECUTEPENDINGREQUESTL_ENTRY=0x81 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_EXECUTEPENDINGREQUESTL_EXIT=0x82 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_EXECUTEPROXYREQUESTL_ENTRY=0x7f +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_EXECUTEPROXYREQUESTL_EXIT=0x80 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_EXECUTEREQUESTL_ENTRY=0x7d +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_EXECUTEREQUESTL_EXIT=0x7e +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_NOTIFYFRAMEWORKL_ENTRY=0x9d +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_NOTIFYFRAMEWORKL_EXIT=0x9e +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_OBJECTENUMERATIONCOMPLETEL_ENTRY=0x99 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_OBJECTENUMERATIONCOMPLETEL_EXIT=0x9a +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_RECEIVEDATAL_ENTRY=0x89 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_RECEIVEDATAL_EXIT=0x8a +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_REGISTERPENDINGREQUEST_ENTRY=0x9f +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_REGISTERPENDINGREQUEST_EXIT=0xa0 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_ROUTEREQUESTREGISTERL_ENTRY=0x95 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_ROUTEREQUESTREGISTERL_EXIT=0x96 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_ROUTEREQUESTUNREGISTERL_ENTRY=0x97 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_ROUTEREQUESTUNREGISTERL_EXIT=0x98 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_RUNERROR_ENTRY=0xa5 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_RUNERROR_EXIT=0xa6 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_RUNL_ENTRY=0xa3 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_RUNL_EXIT=0xa4 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SCHEDULE_ENTRY=0xa9 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SCHEDULE_EXIT=0xaa +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SENDDATAL_ENTRY=0x8b +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SENDDATAL_EXIT=0x8c +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SENDERRORRESPONSEL_ENTRY=0xab +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SENDERRORRESPONSEL_EXIT=0xac +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT_ENTRY=0x8f +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT_EXIT=0x90 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT_MMTPCONNECTION_ENTRY=0x8d +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT_MMTPCONNECTION_EXIT=0x8e +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SENDRESPONSEL_ENTRY=0x91 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SENDRESPONSEL_EXIT=0x92 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SETDATAPROVIDERID_ENTRY=0x87 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_SETDATAPROVIDERID_EXIT=0x88 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_STORAGEENUMERATIONCOMPLETEL_ENTRY=0x9b +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_STORAGEENUMERATIONCOMPLETEL_EXIT=0x9c +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_TRANSACTIONCOMPLETEL_ENTRY=0x93 +[TRACE]TRACE_FLOW[0x8A]_CMTPDATAPROVIDER_TRANSACTIONCOMPLETEL_EXIT=0x94 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_CONSTRUCTL_ENTRY=0xdf +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_CONSTRUCTL_EXIT=0xe0 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_CREATEANCHORIDTABLEL_ENTRY=0xe3 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_CREATEANCHORIDTABLEL_EXIT=0xe4 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_CREATEDELTADATATABLEL_ENTRY=0xe1 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_CREATEDELTADATATABLEL_EXIT=0xe2 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_GETADDEDPUIDSL_ENTRY=0xf4 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_GETADDEDPUIDSL_EXIT=0xf5 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_GETANCHORIDL_ENTRY=0xe9 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_GETANCHORIDL_EXIT=0xea +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_GETCHANGEDPUIDSL_ENTRY=0xf1 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_GETCHANGEDPUIDSL_EXIT=0xf2 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_GETDELETEDPUIDSL_ENTRY=0xf7 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_GETDELETEDPUIDSL_EXIT=0xf8 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_GETMODIFIEDPUIDSL_ENTRY=0xfa +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_GETMODIFIEDPUIDSL_EXIT=0xfb +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_GETPERSISTENTINDEXL_ENTRY=0xed +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_GETPERSISTENTINDEXL_EXIT=0xee +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_INSERTANCHORIDL_ENTRY=0xe5 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_INSERTANCHORIDL_EXIT=0xe6 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_RESETMTPDELTADATATABLEL_ENTRY=0xfd +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_RESETMTPDELTADATATABLEL_EXIT=0xfe +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_UPDATEANCHORIDL_ENTRY=0xe7 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_UPDATEANCHORIDL_EXIT=0xe8 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_UPDATEDELTADATATABLEL_ENTRY=0xef +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_UPDATEDELTADATATABLEL_EXIT=0xf0 +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_UPDATEPERSISTENTINDEXL_ENTRY=0xeb +[TRACE]TRACE_FLOW[0x8A]_CMTPDELTADATAMGR_UPDATEPERSISTENTINDEXL_EXIT=0xec +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_CLEANDBSNAPSHOTL_ENTRY=0x10e +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_CLEANDBSNAPSHOTL_EXIT=0x10f +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_CLEANL_ENTRY=0x107 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_CLEANL_EXIT=0x108 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_COMMITTRANSACTIONL_ENTRY=0x103 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_COMMITTRANSACTIONL_EXIT=0x104 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_ESTABLISHDBSNAPSHOTL_ENTRY=0x10c +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_ESTABLISHDBSNAPSHOTL_EXIT=0x10d +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_INSERTOBJECTL_ENTRY=0x101 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_INSERTOBJECTL_EXIT=0x102 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_LOCATEBYHANDLEL_ENTRY=0x109 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_LOCATEBYHANDLEL_EXIT=0x10a +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_MARKDPLOADEDL_ENTRY=0xff +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_MARKDPLOADEDL_EXIT=0x100 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_REMOVEOBJECTL_ENTRY=0x105 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_REMOVEOBJECTL_EXIT=0x106 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_REMOVEUNDEFINEDOBJECTSL_ENTRY=0x110 +[TRACE]TRACE_FLOW[0x8A]_CMTPOBJECTSTORE_REMOVEUNDEFINEDOBJECTSL_EXIT=0x111 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_CMTPPARSERROUTER_DES_ENTRY=0x113 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_CMTPPARSERROUTER_DES_EXIT=0x114 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_CONFIGUREL_ENTRY=0x115 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_CONFIGUREL_EXIT=0x116 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_CONSTRUCTL_ENTRY=0x12b +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_CONSTRUCTL_EXIT=0x12c +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESCOPYMOVEREQUESTL_ENTRY=0x133 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESCOPYMOVEREQUESTL_EXIT=0x134 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESDELETEOBJECTPROPLISTL_ENTRY=0x139 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESDELETEOBJECTPROPLISTL_EXIT=0x13a +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESDELETEREQUESTL_ENTRY=0x131 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESDELETEREQUESTL_EXIT=0x132 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESGETFORMATCAPABILITIESL_ENTRY=0x13b +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESGETFORMATCAPABILITIESL_EXIT=0x13c +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESGETOBJECTPROPLISTREQUESTL_ENTRY=0x135 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESGETOBJECTPROPLISTREQUESTL_EXIT=0x136 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESL_ENTRY=0x12f +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESL_EXIT=0x130 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESSENDOBJECTPROPLISTREQUESTL_ENTRY=0x137 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_GETROUTINGSUBTYPESSENDOBJECTPROPLISTREQUESTL_EXIT=0x138 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_OPERATIONSUPPORTEDL_ENTRY=0x117 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_OPERATIONSUPPORTEDL_EXIT=0x118 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_OSTMAPSL_ENTRY=0x14e +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_OSTMAPSL_EXIT=0x14f +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_PARSEOPERATIONREQUESTL_ENTRY=0x119 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_PARSEOPERATIONREQUESTL_EXIT=0x11a +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_PARSEOPERATIONREQUESTPARAMETERL_ENTRY=0x13d +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_PARSEOPERATIONREQUESTPARAMETERL_EXIT=0x13e +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_PROCESSEVENTL_ENTRY=0x11f +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_PROCESSEVENTL_EXIT=0x120 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_PROCESSREQUESTL_ENTRY=0x121 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_PROCESSREQUESTL_EXIT=0x122 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTEOPERATIONREQUEST0PARAMETERSL_ENTRY=0x141 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTEOPERATIONREQUEST0PARAMETERSL_EXIT=0x142 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTEOPERATIONREQUESTL_ENTRY=0x11b +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTEOPERATIONREQUESTL_EXIT=0x11c +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTEOPERATIONREQUESTNPARAMETERSL_ENTRY=0x13f +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTEOPERATIONREQUESTNPARAMETERSL_EXIT=0x140 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTEREQUESTREGISTEREDL_ENTRY=0x11d +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTEREQUESTREGISTEREDL_EXIT=0x11e +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTEREQUESTREGISTERL_ENTRY=0x123 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTEREQUESTREGISTERL_EXIT=0x124 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTEREQUESTUNREGISTERL_ENTRY=0x125 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTEREQUESTUNREGISTERL_EXIT=0x126 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTINGTARGETL_ENTRY=0x143 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_ROUTINGTARGETL_EXIT=0x144 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_SELECTSUBTYPEROUTINGL_ENTRY=0x145 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_SELECTSUBTYPEROUTINGL_EXIT=0x146 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_SELECTSUBTYPEVALIDATIONL_ENTRY=0x147 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_SELECTSUBTYPEVALIDATIONL_EXIT=0x148 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_SELECTTARGETL_ENTRY=0x12d +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_SELECTTARGETL_EXIT=0x12e +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_VALIDATEOPERATIONREQUESTPARAMETERSL_ENTRY=0x14b +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_VALIDATEOPERATIONREQUESTPARAMETERSL_EXIT=0x14c +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_VALIDATETARGETSL_ENTRY=0x149 +[TRACE]TRACE_FLOW[0x8A]_CMTPPARSERROUTER_VALIDATETARGETSL_EXIT=0x14a +[TRACE]TRACE_FLOW[0x8A]_CMTPPENDINGREQESTTIMER_CMTPPENDINGREQESTTIMER_ENTRY=0xd7 +[TRACE]TRACE_FLOW[0x8A]_CMTPPENDINGREQESTTIMER_CMTPPENDINGREQESTTIMER_EXIT=0xd8 +[TRACE]TRACE_FLOW[0x8A]_CMTPPENDINGREQESTTIMER_CONSTRUCTL_ENTRY=0xdd +[TRACE]TRACE_FLOW[0x8A]_CMTPPENDINGREQESTTIMER_CONSTRUCTL_EXIT=0xde +[TRACE]TRACE_FLOW[0x8A]_CMTPPENDINGREQESTTIMER_RUNL_ENTRY=0xdb +[TRACE]TRACE_FLOW[0x8A]_CMTPPENDINGREQESTTIMER_RUNL_EXIT=0xdc +[TRACE]TRACE_FLOW[0x8A]_CMTPPENDINGREQESTTIMER_START_ENTRY=0xd9 +[TRACE]TRACE_FLOW[0x8A]_CMTPPENDINGREQESTTIMER_START_EXIT=0xda +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_CMTPSERVICECONFIG_DES_ENTRY=0x150 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_CMTPSERVICECONFIG_DES_EXIT=0x151 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_CONSTRUCTL_ENTRY=0x152 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_CONSTRUCTL_EXIT=0x153 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_INITIALIZEL_ENTRY=0x154 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_INITIALIZEL_EXIT=0x155 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_ISSUPPORTEDSERVICE_ENTRY=0x156 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_ISSUPPORTEDSERVICE_EXIT=0x157 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_LOADSERVICEDATAL_ENTRY=0x158 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_LOADSERVICEDATAL_EXIT=0x159 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_SERVICEINFO_ENTRY=0x168 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_SERVICEINFO_EXIT=0x169 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADSERVICEDATABLOCKL_ENTRY=0x166 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADSERVICEDATABLOCKL_EXIT=0x167 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADSERVICEEVENTSL_ENTRY=0x164 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADSERVICEEVENTSL_EXIT=0x165 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADSERVICEFORMATSL_ENTRY=0x160 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADSERVICEFORMATSL_EXIT=0x161 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADSERVICEMETHODSL_ENTRY=0x162 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADSERVICEMETHODSL_EXIT=0x163 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADSERVICEPROPERTIESL_ENTRY=0x15e +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADSERVICEPROPERTIESL_EXIT=0x15f +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADSERVICEPROPERTYNAMESPACESL_ENTRY=0x15c +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADSERVICEPROPERTYNAMESPACESL_EXIT=0x15d +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADUSESERVICESL_ENTRY=0x15a +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICECONFIG_STARTREADUSESERVICESL_EXIT=0x15b +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_APPENDDATAGUIDL_ENTRY=0x178 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_APPENDDATAGUIDL_EXIT=0x179 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_APPENDUSERSERVICEL_ENTRY=0x16e +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_APPENDUSERSERVICEL_EXIT=0x16f +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_CMTPSERVICEINFO_DES_ENTRY=0x16a +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_CMTPSERVICEINFO_DES_EXIT=0x16b +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_CONSTRUCTL_ENTRY=0x16c +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_CONSTRUCTL_EXIT=0x16d +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_INSERTEVENTL_ENTRY=0x176 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_INSERTEVENTL_EXIT=0x177 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_INSERTFORMATL_ENTRY=0x172 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_INSERTFORMATL_EXIT=0x173 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_INSERTMETHODL_ENTRY=0x174 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_INSERTMETHODL_EXIT=0x175 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_INSERTPROPERTYL_ENTRY=0x170 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEINFO_INSERTPROPERTYL_EXIT=0x171 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_CMTPSERVICEMGR_DES_ENTRY=0x17c +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_CMTPSERVICEMGR_DES_EXIT=0x17d +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_CONSTRUCTL_ENTRY=0x17a +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_CONSTRUCTL_EXIT=0x17b +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_ENABLESERVICE_ENTRY=0x17e +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_ENABLESERVICE_EXIT=0x17f +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEFORMATCODE_ENTRY=0x190 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEFORMATCODE_EXIT=0x191 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEFORMAT_ENTRY=0x185 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEFORMAT_EXIT=0x186 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEID_ENTRY=0x189 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEID_EXIT=0x18a +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEMETHODCODE_ENTRY=0x194 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEMETHODCODE_EXIT=0x195 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEMETHOD_ENTRY=0x187 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEMETHOD_EXIT=0x188 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEPROPERTYCODE_ENTRY=0x18c +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEPROPERTYCODE_EXIT=0x18d +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEPROPERTY_ENTRY=0x183 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_GETSERVICEPROPERTY_EXIT=0x184 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_LOADSERVICEL_ENTRY=0x181 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_LOADSERVICEL_EXIT=0x182 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_SETSERVICEFORMATCODE_ENTRY=0x192 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_SETSERVICEFORMATCODE_EXIT=0x193 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_SETSERVICEMETHODCODE_ENTRY=0x196 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_SETSERVICEMETHODCODE_EXIT=0x197 +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_SETSERVICEPROPERTYCODE_ENTRY=0x18e +[TRACE]TRACE_FLOW[0x8A]_CMTPSERVICEMGR_SETSERVICEPROPERTYCODE_EXIT=0x18f +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_ACTIVEREQUESTL_ENTRY=0x1b0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_ACTIVEREQUESTL_EXIT=0x1b1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_CMTPSESSION_DES_ENTRY=0x198 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_CMTPSESSION_DES_EXIT=0x199 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_COMPLETEPENDINGREQUEST_ENTRY=0x1ac +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_COMPLETEPENDINGREQUEST_EXIT=0x1ad +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_CONSTRUCTL_ENTRY=0x1b8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_CONSTRUCTL_EXIT=0x1b9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_EXPECTEDTRANSACTIONID_ENTRY=0x19a +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_EXPECTEDTRANSACTIONID_EXIT=0x19b +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_GETEXTENDEDINTERFACE_ENTRY=0x1b6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_GETEXTENDEDINTERFACE_EXIT=0x1b7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_INCREMENTEXPECTEDTRANSACTIONID_ENTRY=0x19c +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_INCREMENTEXPECTEDTRANSACTIONID_EXIT=0x19d +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_ROUTEREQUESTREGISTERED_ENTRY=0x1a8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_ROUTEREQUESTREGISTERED_EXIT=0x1a9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_ROUTEREQUESTREGISTERL_ENTRY=0x1a6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_ROUTEREQUESTREGISTERL_EXIT=0x1a7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_ROUTEREQUESTUNREGISTER_ENTRY=0x1aa +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_ROUTEREQUESTUNREGISTER_EXIT=0x1ab +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_ROUTEREQUEST_ENTRY=0x1a4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_ROUTEREQUEST_EXIT=0x1a5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_SESSIONMTPID_ENTRY=0x1b2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_SESSIONMTPID_EXIT=0x1b3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_SESSIONUNIQUEID_ENTRY=0x1b4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_SESSIONUNIQUEID_EXIT=0x1b5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_SETACTIVEREQUESTL_ENTRY=0x19e +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_SETACTIVEREQUESTL_EXIT=0x19f +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_SETREQUESTPENDING_ENTRY=0x1ae +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_SETREQUESTPENDING_EXIT=0x1af +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_SETTRANSACTIONPHASE_ENTRY=0x1a0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_SETTRANSACTIONPHASE_EXIT=0x1a1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_TRANSACTIONPHASE_ENTRY=0x1a2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSESSION_TRANSACTIONPHASE_EXIT=0x1a3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL_EXIT=0x1c8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL_TDRIVERNUMBER_ENTRY=0x1c7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL_TUINT32_ENTRY=0x1c9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL_TUINT32_EXIT=0x1ca +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEID_ENTRY=0x1f2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEID_EXIT=0x1f3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEIDL_ENTRY=0x1cb +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEIDL_EXIT=0x1cc +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEID_ENTRY=0x1f4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEID_EXIT=0x1f5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_CMTPSTORAGEMGR_DES_ENTRY=0x1ba +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_CMTPSTORAGEMGR_DES_EXIT=0x1bb +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_CONSTRUCTL_ENTRY=0x1f0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_CONSTRUCTL_EXIT=0x1f1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_DEALLOCATELOGICALSTORAGEIDS_ENTRY=0x1cf +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_DEALLOCATELOGICALSTORAGEIDS_EXIT=0x1d0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_DEALLOCATELOGICALSTORAGEID_ENTRY=0x1cd +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_DEALLOCATELOGICALSTORAGEID_EXIT=0x1ce +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_DEALLOCATEPHYSICALSTORAGEID_ENTRY=0x1d1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_DEALLOCATEPHYSICALSTORAGEID_EXIT=0x1d2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_DEFAULTSTORAGEID_ENTRY=0x1d3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_DEFAULTSTORAGEID_EXIT=0x1d4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_DRIVENUMBER_ENTRY=0x1d5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_DRIVENUMBER_EXIT=0x1d6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_FRAMEWORKSTORAGEID_ENTRY=0x1d7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_FRAMEWORKSTORAGEID_EXIT=0x1d8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_GETAVAILABLEDRIVESL_ENTRY=0x1d9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_GETAVAILABLEDRIVESL_EXIT=0x1da +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_GETLOGICALSTORAGESL_ENTRY=0x1db +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_GETLOGICALSTORAGESL_EXIT=0x1dc +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_GETPHYSICALSTORAGESL_ENTRY=0x1dd +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_GETPHYSICALSTORAGESL_EXIT=0x1de +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_LOGICALSTORAGEID_TDESC_ENTRY=0x1e1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_LOGICALSTORAGEID_TDESC_EXIT=0x1e2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_LOGICALSTORAGEID_TUINT32_ENTRY=0x1df +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_LOGICALSTORAGEID_TUINT32_EXIT=0x1e0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_LOGICALSTORAGENUMBER_ENTRY=0x1bc +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_LOGICALSTORAGENUMBER_EXIT=0x1bd +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_LOGICALSTORAGEOWNER_ENTRY=0x1be +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_PHYSICALSTORAGEID_TDRIVENUMBER_ENTRY=0x1e3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_PHYSICALSTORAGEID_TDRIVENUMBER_EXIT=0x1e4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_PHYSICALSTORAGEID_TUINT32_ENTRY=0x1e5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_PHYSICALSTORAGEID_TUINT32_EXIT=0x1e6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_PHYSICALSTORAGENUMBER_ENTRY=0x1bf +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_PHYSICALSTORAGEOWNER_ENTRY=0x1c0 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_REMOVELOGICALSTORAGEL_ENTRY=0x1f6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_REMOVELOGICALSTORAGEL_EXIT=0x1f7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_SETDEFAULTSTORAGEID_ENTRY=0x1c1 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_SETDEFAULTSTORAGEID_EXIT=0x1c2 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_SETDRIVEMAPPINGL_ENTRY=0x1c3 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_SETDRIVEMAPPINGL_EXIT=0x1c4 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_SETFRAMEWORKID_ENTRY=0x1c5 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_SETFRAMEWORKID_EXIT=0x1c6 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_STORAGEID_ENTRY=0x1e9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_STORAGEID_EXIT=0x1ea +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_STORAGEL_ENTRY=0x1e7 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_STORAGEL_EXIT=0x1e8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_STORAGEMETADATAL_ENTRY=0x1f8 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_STORAGEMETADATAL_EXIT=0x1f9 +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_VALIDSTORAGEID_ENTRY=0x1eb +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_VALIDSTORAGEID_EXIT=0x1ec +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_VOLUMEIDL_ENTRY=0x1ee +[TRACE]TRACE_FLOW[0x8A]_CMTPSTORAGEMGR_VOLUMEIDL_EXIT=0x1ef +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CLOSE_ENTRY=0x216 +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CLOSE_EXIT=0x217 +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CONSTRUCTL_ENTRY=0x21b +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_CONSTRUCTL_EXIT=0x21c +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_OPENL_ENTRY=0x214 +[TRACE]TRACE_FLOW[0x8A]_CSINGLETONS_OPENL_EXIT=0x215 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT_EXIT=0x5a +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDATACODEGENERATOR_ALLOCATESERVICEFORMATCODE_EXIT=0x71 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDATACODEGENERATOR_ALLOCATESERVICEID_EXIT=0x65 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDATACODEGENERATOR_ALLOCATESERVICEMETHODFORMATCODE_EXIT=0x76 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDATACODEGENERATOR_ALLOCATESERVICEPROPERTYCODE_EXIT=0x6c +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDATAPROVIDERCONTROLLER_EXECUTEPENDINGREQUESTL_EXIT=0xd6 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERL_EXIT=0xcb +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDELTADATAMGR_GETADDEDPUIDSL_EXIT=0xf6 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDELTADATAMGR_GETCHANGEDPUIDSL_EXIT=0xf3 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDELTADATAMGR_GETDELETEDPUIDSL_EXIT=0xf9 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPDELTADATAMGR_GETMODIFIEDPUIDSL_EXIT=0xfc +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPOBJECTSTORE_LOCATEBYHANDLEL_EXIT=0x10b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPOBJECTSTORE_REMOVEUNDEFINEDOBJECTSL_EXIT=0x112 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPPARSERROUTER_VALIDATEOPERATIONREQUESTPARAMETERSL_EXIT=0x14d +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPSERVICEMGR_ENABLESERVICE_EXIT=0x180 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPSERVICEMGR_GETSERVICEID_EXIT=0x18b +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPSTORAGEMGR_VALIDSTORAGEID_EXIT=0x1ed +[TRACE]TRACE_FLOW[0x8A]_DUP1_CSINGLETONS_CLOSE_EXIT=0x218 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPDATACODEGENERATOR_ALLOCATESERVICEFORMATCODE_EXIT=0x72 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPDATACODEGENERATOR_ALLOCATESERVICEID_EXIT=0x66 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPDATACODEGENERATOR_ALLOCATESERVICEMETHODFORMATCODE_EXIT=0x77 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPDATACODEGENERATOR_ALLOCATESERVICEPROPERTYCODE_EXIT=0x6d +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPDATACODEGENERATOR_ALLOCATESERVICEFORMATCODE_EXIT=0x73 +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPDATACODEGENERATOR_ALLOCATESERVICEID_EXIT=0x67 +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPDATACODEGENERATOR_ALLOCATESERVICEMETHODFORMATCODE_EXIT=0x78 +[TRACE]TRACE_FLOW[0x8A]_DUP3_CMTPDATACODEGENERATOR_ALLOCATESERVICEPROPERTYCODE_EXIT=0x6e +[TRACE]TRACE_FLOW[0x8A]_DUP4_CMTPDATACODEGENERATOR_ALLOCATESERVICEID_EXIT=0x68 +[TRACE]TRACE_FLOW[0x8A]_DUP5_CMTPDATACODEGENERATOR_ALLOCATESERVICEID_EXIT=0x69 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_CLOSE_ENTRY=0x1fe +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_CLOSE_EXIT=0x1ff +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_CONNECTIONMGR_ENTRY=0x200 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_CONNECTIONMGR_EXIT=0x201 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_CSINGLETONS_CSINGLETONS_DES_ENTRY=0x219 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_CSINGLETONS_CSINGLETONS_DES_EXIT=0x21a +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_DATACODEGENERATOR_ENTRY=0x210 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_DATACODEGENERATOR_EXIT=0x211 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_DPCONTROLLER_ENTRY=0x202 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_DPCONTROLLER_EXIT=0x203 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_FRAMEWORKCONFIG_ENTRY=0x204 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_FRAMEWORKCONFIG_EXIT=0x205 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_FS_ENTRY=0x206 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_FS_EXIT=0x207 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_OBJECTMGR_ENTRY=0x208 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_OBJECTMGR_EXIT=0x209 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_OPENLC_ENTRY=0x1fc +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_OPENLC_EXIT=0x1fd +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_OPENL_ENTRY=0x1fa +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_OPENL_EXIT=0x1fb +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_REFERENCEMGR_ENTRY=0x20a +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_REFERENCEMGR_EXIT=0x20b +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_ROUTER_ENTRY=0x20c +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_ROUTER_EXIT=0x20d +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_SERVICEMGR_ENTRY=0x212 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_SERVICEMGR_EXIT=0x213 +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_STORAGEMGR_ENTRY=0x20e +[TRACE]TRACE_FLOW[0x8A]_RMTPFRAMEWORK_STORAGEMGR_EXIT=0x20f +[TRACE]TRACE_IMPORTANT[0x85]_CMTPDATAPROVIDERCONTROLLER_ENUMERATEDATAPROVIDEROBJECTSL=0x7 +[TRACE]TRACE_IMPORTANT[0x85]_CMTPDATAPROVIDERCONTROLLER_ENUMERATIONSTATECHANGEDL=0x5 +[TRACE]TRACE_IMPORTANT[0x85]_CMTPDATAPROVIDERCONTROLLER_RUNL=0x6 +[TRACE]TRACE_IMPORTANT[0x85]_CMTPDATAPROVIDER_RUNERROR=0x3 +[TRACE]TRACE_IMPORTANT[0x85]_CMTPSERVICEMGR_ENABLESERVICE=0x8 +[TRACE]TRACE_IMPORTANT[0x85]_DUP1_CMTPDATAPROVIDER_RUNERROR=0x4 +[TRACE]TRACE_IMPORTANT[0x85]_DUP3_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER=0x1 +[TRACE]TRACE_IMPORTANT[0x85]_DUP8_CMTPDATAPROVIDER_RUNL=0x2 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTIONMGR_CONNECTIONCLOSED=0x14 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTIONMGR_CONNECTIONFIND=0x15 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTIONMGR_CONNECTIONL=0xa +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTIONMGR_QUEUETRANSPORTL=0x12 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT=0x19 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT=0xb +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER=0xd +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTIONMGR_STOPTRANSPORT=0x13 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTIONMGR_SUSPENDTRANSPORTL=0x16 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTIONMGR_UNSUSPENDTRANSPORT=0x17 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTION_ACTIVESESSIONS=0x2 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTION_CLOSEALLSESSIONS=0x3 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTION_CLOSESESSION=0x4 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTION_GETDATARECEIVERESULT=0x5 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTION_PUBLISHCONNSTATE=0x8 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTION_SENDEVENTCOMPLETEL=0x1 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTION_SETSTATE=0x6 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTION_STATE=0x7 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONNECTION_VALIDATEANDPUBLISHCONNSTATE=0x9 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATACODEGENERATOR_INCSERVICEIDRESOURCE=0x1e +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDERCONTROLLER_ESTABLISHDBSNAPSHOTL=0x58 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDERCONTROLLER_RUNERROR=0x5b +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDERCONTROLLER_SETNEEDENUMERATINGPHASE2=0x5c +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_CMTPDATAPROVIDER_DES=0x1f +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_CONSTRUCTL=0x4e +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_DOCANCEL=0x43 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_ENUMERATEOBJECTSL=0x27 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_ENUMERATESTORAGESL=0x29 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_EXECUTEEVENTL=0x21 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_EXECUTEPROXYREQUESTL=0x25 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_EXECUTEREQUESTL=0x23 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_NOTIFYFRAMEWORKL=0x42 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_OBJECTENUMERATIONCOMPLETEL=0x3d +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_RECEIVEDATAL=0x2d +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_ROUTEREQUESTREGISTERL=0x39 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_ROUTEREQUESTUNREGISTERL=0x3b +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_RUNL=0x45 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_SCHEDULE=0x51 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_SENDDATAL=0x2f +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_SENDERRORRESPONSEL=0x53 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT=0x33 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT_MMTPCONNECTION=0x31 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_SENDRESPONSEL=0x35 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_SETDATAPROVIDERID=0x2b +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_STORAGEENUMERATIONCOMPLETEL=0x40 +[TRACE]TRACE_NORMAL[0x86]_CMTPDATAPROVIDER_TRANSACTIONCOMPLETEL=0x37 +[TRACE]TRACE_NORMAL[0x86]_CMTPOBJECTSTORE_CLEANDBSNAPSHOTL=0x67 +[TRACE]TRACE_NORMAL[0x86]_CMTPOBJECTSTORE_CLEANL=0x63 +[TRACE]TRACE_NORMAL[0x86]_CMTPOBJECTSTORE_ESTABLISHDBSNAPSHOTL=0x66 +[TRACE]TRACE_NORMAL[0x86]_CMTPOBJECTSTORE_INSERTOBJECTL=0x5d +[TRACE]TRACE_NORMAL[0x86]_CMTPOBJECTSTORE_LOCATEBYHANDLEL=0x64 +[TRACE]TRACE_NORMAL[0x86]_CMTPOBJECTSTORE_REMOVEOBJECTL=0x61 +[TRACE]TRACE_NORMAL[0x86]_CMTPOBJECTSTORE_REMOVEUNDEFINEDOBJECTSL=0x68 +[TRACE]TRACE_NORMAL[0x86]_CMTPPARSERROUTER_CMAP_OSTMAPENTRYL=0x6a +[TRACE]TRACE_NORMAL[0x86]_CMTPPARSERROUTER_CONFIGURE1PARAMETERMAPL=0x6b +[TRACE]TRACE_NORMAL[0x86]_CMTPPARSERROUTER_CONFIGURE2PARAMETERMAPL=0x6f +[TRACE]TRACE_NORMAL[0x86]_CMTPPARSERROUTER_CONFIGURE3PARAMETERMAPL=0x73 +[TRACE]TRACE_NORMAL[0x86]_CMTPPARSERROUTER_GETCONFIGPARAMETERSL=0x77 +[TRACE]TRACE_NORMAL[0x86]_CMTPPARSERROUTER_OSTMAPSL=0x7c +[TRACE]TRACE_NORMAL[0x86]_CMTPPARSERROUTER_PARSEOPERATIONREQUESTL=0x69 +[TRACE]TRACE_NORMAL[0x86]_CMTPPARSERROUTER_PARSEOPERATIONREQUESTPARAMETERL=0x78 +[TRACE]TRACE_NORMAL[0x86]_CMTPPARSERROUTER_ROUTEOPERATIONREQUEST0PARAMETERSL=0x7a +[TRACE]TRACE_NORMAL[0x86]_CMTPPARSERROUTER_ROUTEOPERATIONREQUESTNPARAMETERSL=0x79 +[TRACE]TRACE_NORMAL[0x86]_CMTPPARSERROUTER_VALIDATEOPERATIONREQUESTPARAMETERSL=0x7b +[TRACE]TRACE_NORMAL[0x86]_CMTPSESSION_EXPECTEDTRANSACTIONID=0x82 +[TRACE]TRACE_NORMAL[0x86]_CMTPSESSION_INCREMENTEXPECTEDTRANSACTIONID=0x83 +[TRACE]TRACE_NORMAL[0x86]_CMTPSESSION_ROUTEREQUEST=0x86 +[TRACE]TRACE_NORMAL[0x86]_CMTPSESSION_SESSIONMTPID=0x88 +[TRACE]TRACE_NORMAL[0x86]_CMTPSESSION_SETTRANSACTIONPHASE=0x84 +[TRACE]TRACE_NORMAL[0x86]_CMTPSESSION_TRANSACTIONPHASE=0x85 +[TRACE]TRACE_NORMAL[0x86]_CMTPSTORAGEMGR_ALLOCATEPHYSICALSTORAGEIDL=0x8d +[TRACE]TRACE_NORMAL[0x86]_CMTPSTORAGEMGR_SETDEFAULTSTORAGEID=0x89 +[TRACE]TRACE_NORMAL[0x86]_CMTPSTORAGEMGR_SETDRIVEMAPPINGL=0x8a +[TRACE]TRACE_NORMAL[0x86]_CMTPSTORAGEMGR_SETFRAMEWORKID=0x8b +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT=0x1a +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT=0xc +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER=0xe +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPCONNECTIONMGR_UNSUSPENDTRANSPORT=0x18 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDERCONTROLLER_ENUMERATIONSTATECHANGEDL=0x56 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDERCONTROLLER_RUNL=0x59 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_CMTPDATAPROVIDER_DES=0x20 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_CONSTRUCTL=0x4f +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_DOCANCEL=0x44 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_ENUMERATEOBJECTSL=0x28 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_ENUMERATESTORAGESL=0x2a +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_EXECUTEEVENTL=0x22 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_EXECUTEPROXYREQUESTL=0x26 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_EXECUTEREQUESTL=0x24 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_OBJECTENUMERATIONCOMPLETEL=0x3e +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_RECEIVEDATAL=0x2e +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_ROUTEREQUESTREGISTERL=0x3a +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_ROUTEREQUESTUNREGISTERL=0x3c +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_RUNL=0x47 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_SCHEDULE=0x52 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_SENDDATAL=0x30 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_SENDERRORRESPONSEL=0x55 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT=0x34 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_SENDEVENTL_TMTPTYPEVENT_MMTPCONNECTION=0x32 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_SENDRESPONSEL=0x36 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_SETDATAPROVIDERID=0x2c +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_STORAGEENUMERATIONCOMPLETEL=0x41 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPDATAPROVIDER_TRANSACTIONCOMPLETEL=0x38 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPOBJECTSTORE_INSERTOBJECTL=0x5e +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPOBJECTSTORE_LOCATEBYHANDLEL=0x65 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPOBJECTSTORE_REMOVEOBJECTL=0x62 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPARSERROUTER_CONFIGURE1PARAMETERMAPL=0x6c +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPARSERROUTER_CONFIGURE2PARAMETERMAPL=0x70 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPARSERROUTER_CONFIGURE3PARAMETERMAPL=0x74 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPPARSERROUTER_OSTMAPSL=0x7d +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSERVICEMGR_ENABLESERVICE=0x80 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSERVICEMGR_GETSERVICEID=0x81 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPSESSION_ROUTEREQUEST=0x87 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT=0x1b +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER=0xf +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDATAPROVIDERCONTROLLER_ENUMERATIONSTATECHANGEDL=0x57 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDATAPROVIDERCONTROLLER_RUNL=0x5a +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDATAPROVIDER_CONSTRUCTL=0x50 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDATAPROVIDER_OBJECTENUMERATIONCOMPLETEL=0x3f +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDATAPROVIDER_RUNERROR=0x4d +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDATAPROVIDER_RUNL=0x48 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPDATAPROVIDER_SENDERRORRESPONSEL=0x54 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPOBJECTSTORE_INSERTOBJECTL=0x5f +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPPARSERROUTER_CONFIGURE1PARAMETERMAPL=0x6d +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPPARSERROUTER_CONFIGURE2PARAMETERMAPL=0x71 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPPARSERROUTER_CONFIGURE3PARAMETERMAPL=0x75 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPPARSERROUTER_OSTMAPSL=0x7e +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT=0x1c +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPDATAPROVIDER_RUNL=0x49 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPOBJECTSTORE_INSERTOBJECTL=0x60 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPPARSERROUTER_CONFIGURE1PARAMETERMAPL=0x6e +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPPARSERROUTER_CONFIGURE2PARAMETERMAPL=0x72 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPPARSERROUTER_CONFIGURE3PARAMETERMAPL=0x76 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPPARSERROUTER_OSTMAPSL=0x7f +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPCONNECTIONMGR_RESUMESUSPENDEDTRANSPORT=0x1d +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER=0x10 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPDATAPROVIDER_RUNL=0x4a +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPCONNECTIONMGR_STARTTRANSPORTL_TUINT_TANYPOINTER=0x11 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPDATAPROVIDER_RUNL=0x4c +[TRACE]TRACE_NORMAL[0x86]_DUP6_CMTPDATAPROVIDER_RUNL=0x46 +[TRACE]TRACE_NORMAL[0x86]_DUP7_CMTPSERVER_E32MAIN_HEAP=0x4b +[TRACE]TRACE_NORMAL[0x86]_DUP8_CMTPSTORAGEMGR_ALLOCATELOGICALSTORAGEIDL_TUINT32=0x8c +[TRACE]TRACE_WARNING[0x83]_CMTPDATAPROVIDERCONTROLLER_LOADDATAPROVIDERSL=0x1 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpcontroller/group/mtpcontroller.mmp --- a/mtptransports/mtpcontroller/group/mtpcontroller.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpcontroller/group/mtpcontroller.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -21,7 +21,6 @@ @file */ #include -#include TARGETTYPE PLUGIN TARGET mtpcontroller.dll @@ -35,7 +34,8 @@ MW_LAYER_SYSTEMINCLUDE_SYMBIAN USERINCLUDE ../inc -USERINCLUDE ../../../mtpfws/mtpfw/common/inc +USERINCLUDE ../../../mtpfws/mtpfw/common/inc +USERINCLUDE ../traces SOURCEPATH ../src SOURCE cmtpbearermonitor.cpp diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpcontroller/inc/cmtpbearermonitor.h --- a/mtptransports/mtpcontroller/inc/cmtpbearermonitor.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpcontroller/inc/cmtpbearermonitor.h Fri Sep 17 08:34:51 2010 +0300 @@ -24,7 +24,6 @@ #define CMTPBEARERMONITOR_H #include "locodserviceplugin.h" -#include "mtpdebug.h" class CMTPControllerBase; @@ -46,10 +45,6 @@ void ConstructL(); private: - /** - * FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; RPointerArray< CMTPControllerBase > iMTPControllers; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpcontroller/inc/cmtpbluetoothcontroller.h --- a/mtptransports/mtpcontroller/inc/cmtpbluetoothcontroller.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpcontroller/inc/cmtpbluetoothcontroller.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,6 @@ #include "cmtpcontrollerbase.h" #include "cmtpoperator.h" -#include "mtpdebug.h" NONSHARABLE_CLASS( CMTPBluetoothController ) : public CMTPControllerBase, public MMTPOperatorNotifier { @@ -44,10 +43,6 @@ CMTPBluetoothController( CMTPBearerMonitor& aMon ); private: - /** - * FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; TBool iStat; CMTPOperator* iMTPOperator; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpcontroller/inc/cmtpcontrollertimer.h --- a/mtptransports/mtpcontroller/inc/cmtpcontrollertimer.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpcontroller/inc/cmtpcontrollertimer.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,6 @@ #include #include -#include "mtpdebug.h" class CMTPOperator; @@ -48,7 +47,6 @@ void RunL(); private: - __FLOG_DECLARATION_MEMBER_MUTABLE; RMTPClient& iMTPClient; CMTPOperator * iMTPOperator; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpcontroller/inc/cmtpoperator.h --- a/mtptransports/mtpcontroller/inc/cmtpoperator.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpcontroller/inc/cmtpoperator.h Fri Sep 17 08:34:51 2010 +0300 @@ -28,9 +28,6 @@ #include "mmtpoperatornotifier.h" #include "cmtpcontrollertimer.h" -#include "mtpdebug.h" - - NONSHARABLE_CLASS( CMTPOperator ) : public CActive { @@ -71,10 +68,6 @@ void HandleOperationL( const TOperation& aOperation ); private: - /** - * FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; MMTPOperatorNotifier& iNotifier; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpcontroller/src/cmtpbearermonitor.cpp --- a/mtptransports/mtpcontroller/src/cmtpbearermonitor.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpcontroller/src/cmtpbearermonitor.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -24,8 +24,11 @@ #include #include "cmtpbluetoothcontroller.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpbearermonitorTraces.h" +#endif -__FLOG_STMT( _LIT8( KComponent, "mtpbearermonitor" ); ) CMTPBearerMonitor* CMTPBearerMonitor::NewL( TLocodServicePluginParams& aParams ) { @@ -38,20 +41,24 @@ CMTPBearerMonitor::~CMTPBearerMonitor() { + OstTraceFunctionEntry0( CMTPBEARERMONITOR_DES_ENTRY ); iMTPControllers.ResetAndDestroy(); iMTPControllers.Close(); - __FLOG( _L8("+/-Dtor") ); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPBEARERMONITOR_DES_EXIT ); } void CMTPBearerMonitor::ManageServiceCompleted( TLocodBearer aBearer, TBool aStatus, TInt aError ) { + OstTraceFunctionEntry0( CMTPBEARERMONITOR_MANAGESERVICECOMPLETED_ENTRY ); Observer().ManageServiceCompleted( aBearer, aStatus, ImplementationUid(), aError ); + OstTraceFunctionExit0( CMTPBEARERMONITOR_MANAGESERVICECOMPLETED_EXIT ); } void CMTPBearerMonitor::ManageService( TLocodBearer aBearer, TBool aStatus ) { - __FLOG_2( _L8("+/-ManageService( 0x%08X, %d )"), aBearer, aStatus ); + OstTraceFunctionEntry0( CMTPBEARERMONITOR_MANAGESERVICE_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPBEARERMONITOR_MANAGESERVICE, "The bear is 0x%08X, The status is %d", aBearer, aStatus ); + TInt count = iMTPControllers.Count(); TBool foundController = EFalse; for ( TInt i = 0; i < count; ++i ) @@ -66,24 +73,23 @@ { ManageServiceCompleted( aBearer, aStatus, KErrNone ); } + OstTraceFunctionExit0( CMTPBEARERMONITOR_MANAGESERVICE_EXIT ); } CMTPBearerMonitor::CMTPBearerMonitor( TLocodServicePluginParams& aParams ): CLocodServicePlugin( aParams ) { - __FLOG_OPEN( KMTPSubsystem, KComponent ); - __FLOG( _L8("+/-Ctor") ); + OstTraceFunctionEntry0( CMTPBEARERMONITOR_CONS_ENTRY ); + OstTraceFunctionExit0( CMTPBEARERMONITOR_CONS_EXIT ); } void CMTPBearerMonitor::ConstructL() { - __FLOG( _L8("+ConstructL") ); - + OstTraceFunctionEntry0( CMTPBEARERMONITOR_CONSTRUCTL_ENTRY ); CMTPBluetoothController* btController = CMTPBluetoothController::NewL( *this ); - CleanupStack::PushL(btController); + CleanupStack::PushL(btController); iMTPControllers.AppendL( btController ); - CleanupStack::Pop(btController); - - __FLOG( _L8("-ConstructL") ); + CleanupStack::Pop(btController); + OstTraceFunctionExit0( CMTPBEARERMONITOR_CONSTRUCTL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpcontroller/src/cmtpbluetoothcontroller.cpp --- a/mtptransports/mtpcontroller/src/cmtpbluetoothcontroller.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpcontroller/src/cmtpbluetoothcontroller.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,8 +21,11 @@ */ #include "cmtpbluetoothcontroller.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpbluetoothcontrollerTraces.h" +#endif -__FLOG_STMT( _LIT8( KComponent, "mtpbtcontroller" ); ) LOCAL_D const TUid KMTPBtTransportUid = { 0x10286FCB }; CMTPBluetoothController* CMTPBluetoothController::NewL( CMTPBearerMonitor& aMon ) @@ -33,14 +36,15 @@ CMTPBluetoothController::~CMTPBluetoothController() { + OstTraceFunctionEntry0( CMTPBLUETOOTHCONTROLLER_DES_ENTRY ); delete iMTPOperator; - __FLOG( _L8("+/-Dtor") ); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPBLUETOOTHCONTROLLER_DES_EXIT ); } void CMTPBluetoothController::ManageService( TBool aStatus ) { - __FLOG_1( _L8("+/-ManageService( %d )"), aStatus ); + OstTraceFunctionEntry0( CMTPBLUETOOTHCONTROLLER_MANAGESERVICE_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPBLUETOOTHCONTROLLER_MANAGESERVICE, "The status is %d", aStatus ); iStat = aStatus; TInt err = KErrNone; if ( !iMTPOperator ) @@ -50,6 +54,7 @@ if ( KErrNone != err ) { Monitor().ManageServiceCompleted( Bearer(), iStat, err ); + OstTraceFunctionExit0( CMTPBLUETOOTHCONTROLLER_MANAGESERVICE_EXIT ); return; } @@ -61,11 +66,13 @@ { iMTPOperator->StopTransport( KMTPBtTransportUid ); } + OstTraceFunctionExit0( DUP1_CMTPBLUETOOTHCONTROLLER_MANAGESERVICE_EXIT ); } void CMTPBluetoothController::HandleStartTrasnportCompleteL( TInt aError ) { - __FLOG_1( _L8("+HandleStartTrasnportCompleteL( %d )"), aError ); + OstTraceFunctionEntry0( CMTPBLUETOOTHCONTROLLER_HANDLESTARTTRASNPORTCOMPLETEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPBLUETOOTHCONTROLLER_HANDLESTARTTRASNPORTCOMPLETEL, "The error is %d", aError ); switch( aError ) { case KErrServerBusy:// Another transport is running, keep observing the status of the transport bearer @@ -75,21 +82,22 @@ break; } Monitor().ManageServiceCompleted( Bearer(), iStat, aError ); - __FLOG( _L8("-HandleStartTrasnportCompleteL") ); + OstTraceFunctionExit0( CMTPBLUETOOTHCONTROLLER_HANDLESTARTTRASNPORTCOMPLETEL_EXIT ); } void CMTPBluetoothController::HandleStopTrasnportCompleteL( TInt aError ) { - __FLOG_1( _L8("+HandleStopTrasnportCompleteL( %d )"), aError ); + OstTraceFunctionEntry0( CMTPBLUETOOTHCONTROLLER_HANDLESTOPTRASNPORTCOMPLETEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPBLUETOOTHCONTROLLER_HANDLESTOPTRASNPORTCOMPLETEL, "The error is %d", aError ); Monitor().ManageServiceCompleted( Bearer(), iStat, aError ); - __FLOG( _L8("-HandleStopTrasnportCompleteL") ); + OstTraceFunctionExit0( CMTPBLUETOOTHCONTROLLER_HANDLESTOPTRASNPORTCOMPLETEL_EXIT ); } CMTPBluetoothController::CMTPBluetoothController( CMTPBearerMonitor& aMon ): CMTPControllerBase( aMon, ELocodBearerBT ), iStat( EFalse ) { - __FLOG_OPEN( KMTPSubsystem, KComponent ); - __FLOG( _L8("+/-Ctor") ); + OstTraceFunctionEntry0( CMTPBLUETOOTHCONTROLLER_CONS_ENTRY ); + OstTraceFunctionExit0( CMTPBLUETOOTHCONTROLLER_CONS_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpcontroller/src/cmtpcontrollertimer.cpp --- a/mtptransports/mtpcontroller/src/cmtpcontrollertimer.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpcontroller/src/cmtpcontrollertimer.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,8 +22,12 @@ #include "cmtpcontrollertimer.h" #include "cmtpoperator.h" +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpcontrollertimerTraces.h" +#endif -__FLOG_STMT( _LIT8( KComponent, "mtpConTimer" ); ) const TUid KMTPBtTransportUid = { 0x10286FCB }; const TInt KStartMTPSeconds = 7; @@ -55,43 +59,46 @@ CMTPControllerTimer::~CMTPControllerTimer() { - __FLOG( _L8("CMPTControllerTimer destruction") ); - __FLOG_CLOSE; + OstTraceFunctionEntry0( CMTPCONTROLLERTIMER_DES_ENTRY ); + OstTraceFunctionExit0( CMTPCONTROLLERTIMER_DES_EXIT ); } CMTPControllerTimer::CMTPControllerTimer( RMTPClient& aMTPClient, CMTPOperator& aMTPOperator ): CTimer( CActive::EPriorityStandard ), iMTPClient(aMTPClient) { - __FLOG_OPEN( KMTPSubsystem, KComponent ); iMTPOperator = &aMTPOperator; } void CMTPControllerTimer::ConstructL() { + OstTraceFunctionEntry0( CMTPCONTROLLERTIMER_CONSTRUCTL_ENTRY ); CTimer::ConstructL(); CActiveScheduler::Add( this ); iStopTransport = EFalse; - __FLOG( _L8("CMPTControllerTimer construction") ); + OstTraceFunctionExit0( CMTPCONTROLLERTIMER_CONSTRUCTL_EXIT ); } void CMTPControllerTimer::RunL() { + OstTraceFunctionEntry0( CMTPCONTROLLERTIMER_RUNL_ENTRY ); if (KErrNone == iMTPClient.IsProcessRunning() && !iStopTransport) { - __FLOG( _L8("Stop transport to shut down mtp server") ); + OstTrace0( TRACE_NORMAL, CMTPCONTROLLERTIMER_RUNL, "Stop transport to shut down mtp server" ); TInt error = iMTPClient.StopTransport(KMTPBtTransportUid); iMTPClient.Close(); iStopTransport = ETrue; - __FLOG_1( _L8("The return value of stop transport is: %d"), error ); + OstTrace1( TRACE_NORMAL, DUP1_CMTPCONTROLLERTIMER_RUNL, "The return value of stop transport is: %d", error ); iMTPOperator->StartTimer(KStartMTPSeconds); } else { - __FLOG( _L8("Start transport to launch mtp server") ); + OstTrace0( TRACE_NORMAL, DUP2_CMTPCONTROLLERTIMER_RUNL, "Start transport to launch mtp server" ); - User::LeaveIfError(iMTPClient.Connect()); + LEAVEIFERROR(iMTPClient.Connect(), + OstTrace1( TRACE_NORMAL, DUP3_CMTPCONTROLLERTIMER_RUNL, "connect to mtp server failed! error code %d", munged_err )); iMTPClient.StartTransport(KMTPBtTransportUid); iStopTransport = EFalse; iMTPOperator->SubscribeConnState(); } + OstTraceFunctionExit0( CMTPCONTROLLERTIMER_RUNL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpcontroller/src/cmtpoperator.cpp --- a/mtptransports/mtpcontroller/src/cmtpoperator.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpcontroller/src/cmtpoperator.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,9 +21,11 @@ */ #include "cmtpoperator.h" - -__FLOG_STMT( _LIT8( KComponent, "mtpoperator" ); ) - +#include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpoperatorTraces.h" +#endif CMTPOperator* CMTPOperator::NewL( MMTPOperatorNotifier& aNotifier ) { @@ -34,53 +36,58 @@ CMTPOperator::~CMTPOperator() { + OstTraceFunctionEntry0( CMTPOPERATOR_DES_ENTRY ); Cancel(); iPendingOperations.Reset(); iPendingOperations.Close(); iMTPClient.Close(); iProperty.Close(); delete iTimer; - __FLOG( _L8("+/-Dtor") ); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPOPERATOR_DES_EXIT ); } void CMTPOperator::StartTransport( TUid aTransport ) { - __FLOG_1( _L8("+/-StartTransport( 0x%08X )"), aTransport.iUid ); - + OstTraceFunctionEntry0( CMTPOPERATOR_STARTTRANSPORT_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPOPERATOR_STARTTRANSPORT, "The transport uid is 0x%08X", aTransport.iUid ); TInt err = AppendOperation( EStartTransport, aTransport ); if ( KErrNone != err ) { iNotifier.HandleStartTrasnportCompleteL( err ); } + OstTraceFunctionExit0( CMTPOPERATOR_STARTTRANSPORT_EXIT ); } void CMTPOperator::StopTransport( TUid aTransport ) { - __FLOG_1( _L8("+/-StopTransport( 0x%08X )"), aTransport.iUid ); + OstTraceFunctionEntry0( CMTPOPERATOR_STOPTRANSPORT_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPOPERATOR_STOPTRANSPORT, "The transport uid is 0x%08X", aTransport.iUid ); TInt err = AppendOperation( EStopTransport, aTransport ); if ( KErrNone != err ) { iNotifier.HandleStartTrasnportCompleteL( err ); } + OstTraceFunctionExit0( CMTPOPERATOR_STOPTRANSPORT_EXIT ); } void CMTPOperator::StartTimer(TInt aSecond) { - __FLOG(_L8("StartTimer in cmtpoperator!")); + OstTraceFunctionEntry0( CMTPOPERATOR_STARTTIMER_ENTRY ); iTimer->Start(aSecond); + OstTraceFunctionExit0( CMTPOPERATOR_STARTTIMER_EXIT ); } void CMTPOperator::DoCancel() { - __FLOG( _L8("+/-DoCancel") ); + OstTraceFunctionEntry0( CMTPOPERATOR_DOCANCEL_ENTRY ); iProperty.Cancel(); iConSubscribed = EFalse; + OstTraceFunctionExit0( CMTPOPERATOR_DOCANCEL_EXIT ); } void CMTPOperator::RunL() { - __FLOG( _L8("+RunL") ); + OstTraceFunctionEntry0( CMTPOPERATOR_RUNL_ENTRY ); iConSubscribed = EFalse; TInt count = iPendingOperations.Count(); @@ -100,17 +107,17 @@ TInt error = iProperty.Get(KMTPPublishConnStateCat, EMTPConnStateKey, connState); - __FLOG_2(_L8("Before, the iConnState is %d and connState is %d"), iConnState, connState); + OstTraceExt2( TRACE_NORMAL, CMTPOPERATOR_RUNL, "Before, the iConnState is %d and connState is %d", iConnState, connState ); if ( KErrNotFound == error ) { iConnState = KInitialValue; - __FLOG( _L8("The key is deleted and mtp server shut down!") ); + OstTrace0( TRACE_NORMAL, DUP1_CMTPOPERATOR_RUNL, "The key is deleted and mtp server shut down!" ); } else { if (iTimer->IsActive() && !iTimer->GetStopTransportStatus()) { - __FLOG( _L8("Timer is cancelled!") ); + OstTrace0( TRACE_NORMAL, DUP2_CMTPOPERATOR_RUNL, "Timer is cancelled!" ); iTimer->Cancel(); } //if the disconnect is not set, set the disconnect @@ -118,7 +125,7 @@ if ( KInitialValue == iConnState ) { iConnState = connState; - __FLOG( _L8("the first time to launch mtp") ); + OstTrace0( TRACE_NORMAL, DUP3_CMTPOPERATOR_RUNL, "the first time to launch mtp" ); } else { @@ -129,7 +136,7 @@ { iTimer->Start(KStopMTPSeconds); } - __FLOG( _L8("Timer is launched.") ); + OstTrace0( TRACE_NORMAL, DUP4_CMTPOPERATOR_RUNL, "Timer is launched." ); } else { @@ -138,23 +145,22 @@ } } } - __FLOG_2(_L8("After, the iConnState is %d and connState is %d"), iConnState, connState); + OstTraceExt2( TRACE_NORMAL, DUP5_CMTPOPERATOR_RUNL, "After, the iConnState is %d and connState is %d", iConnState, connState ); } - - __FLOG( _L8("-RunL") ); + OstTraceFunctionExit0( CMTPOPERATOR_RUNL_EXIT ); } CMTPOperator::CMTPOperator( MMTPOperatorNotifier& aNotifier ): CActive( EPriorityStandard ), iNotifier( aNotifier ) { - __FLOG_OPEN( KMTPSubsystem, KComponent ); - __FLOG( _L8("+/-Ctor") ); + OstTraceFunctionEntry0( CMTPOPERATOR_CONS_ENTRY ); + OstTraceFunctionExit0( CMTPOPERATOR_CONS_EXIT ); } void CMTPOperator::ConstructL() { - __FLOG( _L8("+ConstructL") ); + OstTraceFunctionEntry0( CMTPOPERATOR_CONSTRUCTL_ENTRY ); CActiveScheduler::Add( this ); //if the server is running, the first disconnction shows the conection is down! if(KErrNone == iMTPClient.IsProcessRunning()) @@ -165,20 +171,25 @@ { iConnState = KInitialValue; } - __FLOG_1( _L8("The connstate is set to %d"), iConnState ); - User::LeaveIfError( iMTPClient.Connect() ); - User::LeaveIfError(iProperty.Attach(KMTPPublishConnStateCat, EMTPConnStateKey)); + OstTrace1( TRACE_NORMAL, CMTPOPERATOR_CONSTRUCTL, "The connstate is set to %d", iConnState ); + + LEAVEIFERROR( iMTPClient.Connect(), + OstTrace0( TRACE_ERROR, DUP1_CMTPOPERATOR_CONSTRUCTL, "Leave when the client connects to mtp server" )); + + LEAVEIFERROR(iProperty.Attach(KMTPPublishConnStateCat, EMTPConnStateKey), + OstTrace0( TRACE_ERROR, DUP2_CMTPOPERATOR_CONSTRUCTL, "iProperty attached failed." )); iTimer = CMTPControllerTimer::NewL(iMTPClient, *this); iConSubscribed = EFalse; - __FLOG( _L8("-ConstructL") ); + OstTraceFunctionExit0( CMTPOPERATOR_CONSTRUCTL_EXIT ); } TInt CMTPOperator::AppendOperation( TOperationType aType, TUid aTransport ) { + OstTraceFunctionEntry0( CMTPOPERATOR_APPENDOPERATION_ENTRY ); TOperation operation = { aType, aTransport }; TInt err = iPendingOperations.Append( operation ); - __FLOG_1( _L8("+AppendOperation returns %d"), err ); + OstTrace1( TRACE_NORMAL, CMTPOPERATOR_APPENDOPERATION, "The return value is %d", err ); if ( ( KErrNone == err ) && !IsActive() ) { Schedule( KErrNone ); @@ -194,13 +205,15 @@ } } } - __FLOG( _L8("-AppendOperation") ); + + OstTraceFunctionExit0( CMTPOPERATOR_APPENDOPERATION_EXIT ); return err; } void CMTPOperator::Schedule( TInt aError ) { - __FLOG_1( _L8("+/-Schedule( %d )"), aError ); + OstTraceFunctionEntry0( CMTPOPERATOR_SCHEDULE_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPOPERATOR_SCHEDULE, "The error value is %d", aError ); if(iTimer->IsActive()) { iTimer->Cancel(); @@ -208,11 +221,13 @@ TRequestStatus* status = &iStatus; User::RequestComplete( status, aError ); SetActive(); + OstTraceFunctionExit0( CMTPOPERATOR_SCHEDULE_EXIT ); } void CMTPOperator::HandleOperationL( const TOperation& aOperation ) { - __FLOG_2( _L8("+HandleOperationL( 0x%08X, 0x%08X )"), aOperation.iTransport.iUid, aOperation.iType ); + OstTraceFunctionEntry0( CMTPOPERATOR_HANDLEOPERATIONL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPOPERATOR_HANDLEOPERATIONL, "The transport id is 0x%08X and the operation is 0x%08X", (TInt)aOperation.iTransport.iUid, aOperation.iType ); TInt err = KErrNone; switch ( aOperation.iType ) { @@ -231,19 +246,20 @@ iNotifier.HandleStopTrasnportCompleteL( err ); break; } - __FLOG( _L8("-HandleOperationL") ); + OstTraceFunctionExit0( CMTPOPERATOR_HANDLEOPERATIONL_EXIT ); } void CMTPOperator::SubscribeConnState() { + OstTraceFunctionEntry0( CMTPOPERATOR_SUBSCRIBECONNSTATE_ENTRY ); if(!IsActive()) { - __FLOG( _L8("Subscribe connection state changed)") ); iProperty.Subscribe(iStatus); iConSubscribed = ETrue; SetActive(); } + OstTraceFunctionExit0( CMTPOPERATOR_SUBSCRIBECONNSTATE_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpcontroller/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpcontroller/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpcontroller/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpcontroller/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,94 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_NORMAL=0x86 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPOPERATOR_CONSTRUCTL=0x1 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPOPERATOR_CONSTRUCTL=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPBEARERMONITOR_CONSTRUCTL_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CMTPBEARERMONITOR_CONSTRUCTL_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CMTPBEARERMONITOR_CONS_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CMTPBEARERMONITOR_CONS_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CMTPBEARERMONITOR_DES_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPBEARERMONITOR_DES_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPBEARERMONITOR_MANAGESERVICECOMPLETED_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CMTPBEARERMONITOR_MANAGESERVICECOMPLETED_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CMTPBEARERMONITOR_MANAGESERVICE_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CMTPBEARERMONITOR_MANAGESERVICE_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CMTPBLUETOOTHCONTROLLER_CONS_ENTRY=0x14 +[TRACE]TRACE_FLOW[0x8A]_CMTPBLUETOOTHCONTROLLER_CONS_EXIT=0x15 +[TRACE]TRACE_FLOW[0x8A]_CMTPBLUETOOTHCONTROLLER_DES_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CMTPBLUETOOTHCONTROLLER_DES_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CMTPBLUETOOTHCONTROLLER_HANDLESTARTTRASNPORTCOMPLETEL_ENTRY=0x10 +[TRACE]TRACE_FLOW[0x8A]_CMTPBLUETOOTHCONTROLLER_HANDLESTARTTRASNPORTCOMPLETEL_EXIT=0x11 +[TRACE]TRACE_FLOW[0x8A]_CMTPBLUETOOTHCONTROLLER_HANDLESTOPTRASNPORTCOMPLETEL_ENTRY=0x12 +[TRACE]TRACE_FLOW[0x8A]_CMTPBLUETOOTHCONTROLLER_HANDLESTOPTRASNPORTCOMPLETEL_EXIT=0x13 +[TRACE]TRACE_FLOW[0x8A]_CMTPBLUETOOTHCONTROLLER_MANAGESERVICE_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]_CMTPBLUETOOTHCONTROLLER_MANAGESERVICE_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_CMTPCONTROLLERTIMER_CONSTRUCTL_ENTRY=0x18 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONTROLLERTIMER_CONSTRUCTL_EXIT=0x19 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONTROLLERTIMER_DES_ENTRY=0x16 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONTROLLERTIMER_DES_EXIT=0x17 +[TRACE]TRACE_FLOW[0x8A]_CMTPCONTROLLERTIMER_RUNL_ENTRY=0x1a +[TRACE]TRACE_FLOW[0x8A]_CMTPCONTROLLERTIMER_RUNL_EXIT=0x1b +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_APPENDOPERATION_ENTRY=0x2c +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_APPENDOPERATION_EXIT=0x2d +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_CONSTRUCTL_ENTRY=0x2a +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_CONSTRUCTL_EXIT=0x2b +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_CONS_ENTRY=0x28 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_CONS_EXIT=0x29 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_DES_ENTRY=0x1c +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_DES_EXIT=0x1d +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_DOCANCEL_ENTRY=0x24 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_DOCANCEL_EXIT=0x25 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_HANDLEOPERATIONL_ENTRY=0x30 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_HANDLEOPERATIONL_EXIT=0x31 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_RUNL_ENTRY=0x26 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_RUNL_EXIT=0x27 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_SCHEDULE_ENTRY=0x2e +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_SCHEDULE_EXIT=0x2f +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_STARTTIMER_ENTRY=0x22 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_STARTTIMER_EXIT=0x23 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_STARTTRANSPORT_ENTRY=0x1e +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_STARTTRANSPORT_EXIT=0x1f +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_STOPTRANSPORT_ENTRY=0x20 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_STOPTRANSPORT_EXIT=0x21 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_SUBSCRIBECONNSTATE_ENTRY=0x32 +[TRACE]TRACE_FLOW[0x8A]_CMTPOPERATOR_SUBSCRIBECONNSTATE_EXIT=0x33 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPBLUETOOTHCONTROLLER_MANAGESERVICE_EXIT=0xf +[TRACE]TRACE_NORMAL[0x86]_CMTPBEARERMONITOR_MANAGESERVICE=0x1 +[TRACE]TRACE_NORMAL[0x86]_CMTPBLUETOOTHCONTROLLER_HANDLESTARTTRASNPORTCOMPLETEL=0x3 +[TRACE]TRACE_NORMAL[0x86]_CMTPBLUETOOTHCONTROLLER_HANDLESTOPTRASNPORTCOMPLETEL=0x4 +[TRACE]TRACE_NORMAL[0x86]_CMTPBLUETOOTHCONTROLLER_MANAGESERVICE=0x2 +[TRACE]TRACE_NORMAL[0x86]_CMTPCONTROLLERTIMER_RUNL=0x5 +[TRACE]TRACE_NORMAL[0x86]_CMTPOPERATOR_APPENDOPERATION=0x12 +[TRACE]TRACE_NORMAL[0x86]_CMTPOPERATOR_CONSTRUCTL=0x11 +[TRACE]TRACE_NORMAL[0x86]_CMTPOPERATOR_HANDLEOPERATIONL=0x14 +[TRACE]TRACE_NORMAL[0x86]_CMTPOPERATOR_RUNL=0xb +[TRACE]TRACE_NORMAL[0x86]_CMTPOPERATOR_SCHEDULE=0x13 +[TRACE]TRACE_NORMAL[0x86]_CMTPOPERATOR_STARTTRANSPORT=0x9 +[TRACE]TRACE_NORMAL[0x86]_CMTPOPERATOR_STOPTRANSPORT=0xa +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPCONTROLLERTIMER_RUNL=0x6 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPOPERATOR_RUNL=0xc +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPCONTROLLERTIMER_RUNL=0x7 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPOPERATOR_RUNL=0xd +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPCONTROLLERTIMER_RUNL=0x8 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPOPERATOR_RUNL=0xe +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPOPERATOR_RUNL=0xf +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPOPERATOR_RUNL=0x10 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/filterapi/group/ptpipfilterapi.mmp --- a/mtptransports/mtpptpiptransport/filterapi/group/ptpipfilterapi.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/filterapi/group/ptpipfilterapi.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -30,6 +30,7 @@ USERINCLUDE ../interface +USERINCLUDE ../traces MW_LAYER_SYSTEMINCLUDE_SYMBIAN diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/filterapi/src/cptpiphostfilterinterface.cpp --- a/mtptransports/mtpptpiptransport/filterapi/src/cptpiphostfilterinterface.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/filterapi/src/cptpiphostfilterinterface.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -15,12 +15,18 @@ // #include "cptpiphostfilterinterface.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpiphostfilterinterfaceTraces.h" +#endif + /* Creates an implementation of an ECOM plugin with the specified UID */ EXPORT_C CPTPIPHostFilterInterface* CPTPIPHostFilterInterface::NewL() { + OstTraceFunctionEntry0( CPTPIPHOSTFILTERINTERFACE_NEWL_ENTRY ); const TUid KFilterImplUid ={0xA0004A5F}; TAny* defaultFilter=NULL; @@ -32,6 +38,7 @@ } else { + OstTraceFunctionExit0( CPTPIPHOSTFILTERINTERFACE_NEWL_EXIT ); return NULL; } } @@ -42,6 +49,7 @@ */ EXPORT_C void CPTPIPHostFilterInterface::ListImplementations(RImplInfoPtrArray& aImplInfoArray) { + OstTraceFunctionEntry0( CPTPIPHOSTFILTERINTERFACE_LISTIMPLEMENTATIONS_ENTRY ); const TUid KFilterInterfaceUid ={0xA0004A5E}; TRAPD(ret, REComSession::ListImplementationsL(KFilterInterfaceUid,aImplInfoArray)); if(ret != KErrNone) @@ -49,6 +57,7 @@ RDebug::Print(_L("CPTPIPController::ListImplementations ERROR = %d\n") ,ret); } + OstTraceFunctionExit0( CPTPIPHOSTFILTERINTERFACE_LISTIMPLEMENTATIONS_EXIT ); } @@ -57,7 +66,8 @@ */ EXPORT_C CPTPIPHostFilterInterface::~CPTPIPHostFilterInterface() { - +OstTraceFunctionEntry0( CPTPIPHOSTFILTERINTERFACE_CPTPIPHOSTFILTERINTERFACE_ENTRY ); +OstTraceFunctionExit0( CPTPIPHOSTFILTERINTERFACE_CPTPIPHOSTFILTERINTERFACE_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/filterapi/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpptpiptransport/filterapi/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/filterapi/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpptpiptransport/filterapi/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,25 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_FLOW=0x8a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPHOSTFILTERINTERFACE_CPTPIPHOSTFILTERINTERFACE_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPHOSTFILTERINTERFACE_CPTPIPHOSTFILTERINTERFACE_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPHOSTFILTERINTERFACE_LISTIMPLEMENTATIONS_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPHOSTFILTERINTERFACE_LISTIMPLEMENTATIONS_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPHOSTFILTERINTERFACE_NEWL_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPHOSTFILTERINTERFACE_NEWL_EXIT=0x2 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipcontroller/group/ptpipcontroller.mmp --- a/mtptransports/mtpptpiptransport/ptpipcontroller/group/ptpipcontroller.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipcontroller/group/ptpipcontroller.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -32,6 +32,7 @@ USERINCLUDE ../inc/ USERINCLUDE ../interface/ +USERINCLUDE ../traces/ USERINCLUDE ../../common/inc/ USERINCLUDE ../../ptpipdatatypes/inc/ USERINCLUDE ../../../../mtpfws/mtpfw/common/inc diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipcontroller/inc/cptpipcontroller.h --- a/mtptransports/mtpptpiptransport/ptpipcontroller/inc/cptpipcontroller.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipcontroller/inc/cptpipcontroller.h Fri Sep 17 08:34:51 2010 +0300 @@ -37,7 +37,6 @@ #include "tptpipinitfailed.h" #include #include "cptpiptimer.h" -#include "mtpdebug.h" enum TInitFailReason @@ -179,13 +178,7 @@ RSocket iDummySocket; TInt iCounter; CPTPIPTimer* iTimer; - TUid iTransportId; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER; - + TUid iTransportId; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipcontroller/src/cptpipcontroller.cpp --- a/mtptransports/mtpptpiptransport/ptpipcontroller/src/cptpipcontroller.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipcontroller/src/cptpipcontroller.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -14,18 +14,22 @@ // #include "cptpipcontroller.h" // Cptpipcontroller +#include "mtpdebug.h" #include #include "ptpipsocketpublish.h" #include #include "ptpipprotocolconstants.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpipcontrollerTraces.h" +#endif + _LIT_SECURITY_POLICY_PASS(KAllowReadAll); _LIT_SECURITY_POLICY_C1(KProcPolicy,ECapability_None); -__FLOG_STMT(_LIT8(KComponent,"PTPIPController");) - #define PTPIP_INIT_COMMAND_REQUEST 1 #define PTPIP_INIT_COMMAND_ACK 2 @@ -43,9 +47,11 @@ EXPORT_C CPTPIPController* CPTPIPController::NewLC() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_NEWLC_ENTRY ); CPTPIPController* self = new (ELeave) CPTPIPController; CleanupStack::PushL(self); self->ConstructL(); + OstTraceFunctionExit0( CPTPIPCONTROLLER_NEWLC_EXIT ); return self; } @@ -54,8 +60,10 @@ */ EXPORT_C CPTPIPController* CPTPIPController::NewL() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_NEWL_ENTRY ); CPTPIPController* self = CPTPIPController::NewLC(); CleanupStack::Pop(1); + OstTraceFunctionExit0( CPTPIPCONTROLLER_NEWL_EXIT ); return self; } @@ -63,10 +71,12 @@ CPTPIPController::CPTPIPController(): CActive(EPriorityStandard),iDeviceGUID() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_CPTPIPCONTROLLER_ENTRY ); iCtrlState=EIdle; iTransportId=TUid::Uid(KMTPPTPIPTransportImplementationUid); iCounter=0; CActiveScheduler::Add(this); + OstTraceFunctionExit0( CPTPIPCONTROLLER_CPTPIPCONTROLLER_EXIT ); } /* @@ -75,7 +85,7 @@ */ void CPTPIPController::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); + OstTraceFunctionEntry0( CPTPIPCONTROLLER_CONSTRUCTL_ENTRY ); iCmdHandler = CPTPIPSocketHandler::NewL(); iEvtHandler = CPTPIPSocketHandler::NewL(); iFilter=CPTPIPHostFilterInterface::NewL(); @@ -92,6 +102,7 @@ iDeviceFriendlyName = HBufC16::NewL(100); TPtr16 name = iDeviceFriendlyName->Des(); TInt result=iRepository->Get(param,name); + OstTraceFunctionExit0( CPTPIPCONTROLLER_CONSTRUCTL_EXIT ); } /* @@ -99,6 +110,7 @@ */ EXPORT_C CPTPIPController::~CPTPIPController() { + OstTraceFunctionEntry0( DUP1_CPTPIPCONTROLLER_CPTPIPCONTROLLER_ENTRY ); delete iCmdHandler; delete iEvtHandler; delete iFilter; @@ -111,13 +123,14 @@ iIsConnectedToMTP = EFalse; iProperty.Close(); iConnectionState.Close(); - __FLOG_CLOSE; + OstTraceFunctionExit0( DUP1_CPTPIPCONTROLLER_CPTPIPCONTROLLER_EXIT ); } EXPORT_C RSocket& CPTPIPController::NewSocketL() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_NEWSOCKETL_ENTRY ); iCounter++; if(iCounter==1) return iCmdHandler->Socket(); @@ -131,6 +144,7 @@ } TInt CPTPIPController::CheckMTPConnection() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_CHECKMTPCONNECTION_ENTRY ); TInt error = KErrNone; if(iIsConnectedToMTP == EFalse) { @@ -141,6 +155,7 @@ iIsConnectedToMTP = ETrue; error = iMTP.IsAvailable(iTransportId); } + OstTraceFunctionExit0( CPTPIPCONTROLLER_CHECKMTPCONNECTION_EXIT ); return error; } /* @@ -148,9 +163,10 @@ @return ETrue on succes EFalse on failure*/ TBool CPTPIPController::Validate() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_VALIDATE_ENTRY ); if(iCtrlState==EIdle || iCtrlState==EInitEvtAwaited) return ETrue; - else + else return EFalse; } @@ -162,12 +178,14 @@ */ EXPORT_C void CPTPIPController::SocketAccepted(TRequestStatus& aStatus) { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_SOCKETACCEPTED_ENTRY ); iCallerStatus=&aStatus; aStatus=KRequestPending; TBool result=Validate(); if(result==EFalse) { User::RequestComplete(iCallerStatus,KErrServerBusy); + OstTraceFunctionExit0( CPTPIPCONTROLLER_SOCKETACCEPTED_EXIT ); return; } @@ -177,6 +195,7 @@ if(CompareHost(iEvtHandler->Socket())==EFalse) { User::RequestComplete(iCallerStatus,KErrServerBusy); + OstTraceFunctionExit0( DUP1_CPTPIPCONTROLLER_SOCKETACCEPTED_EXIT ); return; } } @@ -202,6 +221,7 @@ } Schedule(); + OstTraceFunctionExit0( DUP2_CPTPIPCONTROLLER_SOCKETACCEPTED_EXIT ); } @@ -211,6 +231,7 @@ */ TBool CPTPIPController::CompareHost(RSocket& aSocket) { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_COMPAREHOST_ENTRY ); TInetAddr thisaddr, newAddr; @@ -218,10 +239,12 @@ aSocket.RemoteName(newAddr); if(newAddr.Address() == thisaddr.Address()) { + OstTraceFunctionExit0( CPTPIPCONTROLLER_COMPAREHOST_EXIT ); return ETrue; } else { + OstTraceFunctionExit0( DUP1_CPTPIPCONTROLLER_COMPAREHOST_EXIT ); return EFalse; } @@ -232,10 +255,12 @@ */ void CPTPIPController::Schedule() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_SCHEDULE_ENTRY ); iStatus = KRequestPending; TRequestStatus* status(&iStatus); SetActive(); User::RequestComplete(status, KErrNone); + OstTraceFunctionExit0( CPTPIPCONTROLLER_SCHEDULE_EXIT ); } /* @@ -244,6 +269,7 @@ */ TInt CPTPIPController::PublishSocketNamePair() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_PUBLISHSOCKETNAMEPAIR_ENTRY ); TName iCommandSocketSysName,iEventSocketSysName; iCmdHandler->Socket().Name(iCommandSocketSysName); iEvtHandler->Socket().Name(iEventSocketSysName); @@ -269,6 +295,7 @@ error=RProperty::Set(KPropertyUid,EEventSocketName,iEventSocketSysName); + OstTraceFunctionExit0( CPTPIPCONTROLLER_PUBLISHSOCKETNAMEPAIR_EXIT ); return error; } @@ -278,6 +305,7 @@ */ TInt CPTPIPController::EnableSocketTransfer() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_ENABLESOCKETTRANSFER_ENTRY ); TInt err; err = iCmdHandler->Socket().SetOpt(KSOEnableTransfer, KSOLSocket,KProcPolicy().Package()); @@ -285,6 +313,7 @@ err = iEvtHandler->Socket().SetOpt(KSOEnableTransfer, KSOLSocket,KProcPolicy().Package()); + OstTraceFunctionExit0( CPTPIPCONTROLLER_ENABLESOCKETTRANSFER_EXIT ); return err; } @@ -295,10 +324,12 @@ */ EXPORT_C TInt CPTPIPController::SetDeviceGUID(TDesC8& aDeviceGUID) { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_SETDEVICEGUID_ENTRY ); TInt size = aDeviceGUID.Size(); if (size != 16) return KErrArgument; TMTPTypeUint128 guid(aDeviceGUID); iDeviceGUID = guid; + OstTraceFunctionExit0( CPTPIPCONTROLLER_SETDEVICEGUID_EXIT ); return KErrNone; } @@ -308,20 +339,23 @@ */ EXPORT_C void CPTPIPController::SetDeviceFriendlyName(TDesC16* aDeviceFreindlyName) { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_SETDEVICEFRIENDLYNAME_ENTRY ); delete iDeviceFriendlyName; TRAPD(err, iDeviceFriendlyName=aDeviceFreindlyName->AllocL()); if(err != KErrNone) { - __FLOG_VA((_L8("CPTPIPController::SetDeviceFriendlyName ERROR = %d\n"), err)); + OstTrace1( TRACE_NORMAL, CPTPIPCONTROLLER_SETDEVICEFRIENDLYNAME, "CPTPIPController::SetDeviceFriendlyName ERROR = %d\n", err ); } + OstTraceFunctionExit0( CPTPIPCONTROLLER_SETDEVICEFRIENDLYNAME_EXIT ); } void CPTPIPController::Reset() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_RESET_ENTRY ); iCmdHandler->Socket().Close(); iEvtHandler->Socket().Close(); if(iIsConnectedToMTP) @@ -329,7 +363,8 @@ TInt stopStatus=iMTP.StopTransport(iTransportId); if (KErrNone != stopStatus) { - __FLOG_VA((_L8("CPTPIPController::Reset ERROR = %d\n"), stopStatus)); + OstTrace1( TRACE_NORMAL, CPTPIPCONTROLLER_RESET, "CPTPIPController::Reset ERROR = %d\n", stopStatus ); + } } @@ -342,27 +377,34 @@ iCtrlState = EIdle; iCmdHandler->State()=EReadState; iEvtHandler->State()=EReadState; + OstTraceFunctionExit0( CPTPIPCONTROLLER_RESET_EXIT ); } EXPORT_C void CPTPIPController::StopTransport() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_STOPTRANSPORT_ENTRY ); Reset(); + OstTraceFunctionExit0( CPTPIPCONTROLLER_STOPTRANSPORT_EXIT ); } void CPTPIPController:: CheckAndHandleErrorL(TInt aError) { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_CHECKANDHANDLEERRORL_ENTRY ); if(aError != KErrNone) { Reset(); - __FLOG_VA((_L8("PTPIP Controller CheckAndHandleErrorL, Error = %d"), aError)); - User::Leave(aError); + OstTrace1( TRACE_NORMAL, CPTPIPCONTROLLER_CHECKANDHANDLEERRORL, "PTPIP Controller CheckAndHandleErrorL, Error = %d", aError ); + LEAVEIFERROR( aError, + OstTrace1( TRACE_ERROR, DUP1_CPTPIPCONTROLLER_CHECKANDHANDLEERRORL, "error code is %d", aError )); } + OstTraceFunctionExit0( CPTPIPCONTROLLER_CHECKANDHANDLEERRORL_EXIT ); } void CPTPIPController:: CheckInitFailL(TInt aError) { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_CHECKINITFAILL_ENTRY ); TInitFailReason reason = EInitFailUnSpecified; @@ -381,9 +423,10 @@ else iEvtHandler->WriteToSocket(iInitFailed,iStatus); StartTimer(30); - __FLOG_VA((_L8("PTPIP Controller Error, Error = %d"), aError)); - User::Leave(aError); + LEAVEIFERROR( aError, + OstTrace1( TRACE_NORMAL, CPTPIPCONTROLLER_CHECKINITFAILL, "PTPIP Controller Error, Error = %d", aError )); } + OstTraceFunctionExit0( CPTPIPCONTROLLER_CHECKINITFAILL_EXIT ); } /* @@ -391,19 +434,24 @@ */ EXPORT_C void CPTPIPController::OnTimeOut() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_ONTIMEOUT_ENTRY ); TRequestStatus* status(&iStatus); User::RequestComplete(status,KErrTimedOut); + OstTraceFunctionExit0( CPTPIPCONTROLLER_ONTIMEOUT_EXIT ); } void CPTPIPController::StartTimer(TInt aSecond) { - iTimer->IssueRequest(aSecond); - iStatus = KRequestPending; - SetActive(); + OstTraceFunctionEntry0( CPTPIPCONTROLLER_STARTTIMER_ENTRY ); + iTimer->IssueRequest(aSecond); + iStatus = KRequestPending; + SetActive(); + OstTraceFunctionExit0( CPTPIPCONTROLLER_STARTTIMER_EXIT ); } void CPTPIPController::RunL() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_RUNL_ENTRY ); TInt StatusError=iStatus.Int(); @@ -544,6 +592,7 @@ } + OstTraceFunctionExit0( CPTPIPCONTROLLER_RUNL_EXIT ); } /* @@ -551,6 +600,7 @@ */ TInt CPTPIPController::RunError(TInt aErr) { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_RUNERROR_ENTRY ); if(iCtrlState != EWaitForInitFail) { User::RequestComplete(iCallerStatus,aErr); @@ -562,6 +612,7 @@ iIsConnectedToMTP = EFalse; } //Return KErrNone back to RunL() + OstTraceFunctionExit0( CPTPIPCONTROLLER_RUNERROR_EXIT ); return KErrNone; } @@ -570,15 +621,19 @@ void CPTPIPController::DoCancel() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_DOCANCEL_ENTRY ); + OstTraceFunctionExit0( CPTPIPCONTROLLER_DOCANCEL_EXIT ); } TInt CPTPIPController::ParseInitPacketL() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_PARSEINITPACKETL_ENTRY ); TUint32 length(iInitCmdReq->Uint32L(CPTPIPInitCmdRequest::ELength)); TUint32 type(iInitCmdReq->Uint32L(CPTPIPInitCmdRequest::EPktType)); if(type != PTPIP_INIT_COMMAND_REQUEST) { + OstTraceFunctionExit0( CPTPIPCONTROLLER_PARSEINITPACKETL_EXIT ); return KErrBadHandle; } @@ -588,11 +643,13 @@ TDesC& name = iInitCmdReq->HostFriendlyName(); iHostFriendlyName = &name; TUint32 version(iInitCmdReq->Uint32L(CPTPIPInitCmdRequest::EVersion)); + OstTraceFunctionExit0( DUP1_CPTPIPCONTROLLER_PARSEINITPACKETL_EXIT ); return KErrNone; } TInt CPTPIPController::ParseEvtPacket() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_PARSEEVTPACKET_ENTRY ); TUint32 length(iInitEvtReq.Uint32(TPTPIPInitEvtRequest::ELength)); TUint32 type(iInitEvtReq.Uint32(TPTPIPInitEvtRequest::EType)); if(type != PTPIP_INIT_EVENT_REQUEST) return KErrBadHandle; @@ -600,13 +657,16 @@ if(conNumber !=PTPIP_FIXED_CONNECTION_ID) { // We are supporting only one connection,So connection Id is fixed. + OstTraceFunctionExit0( CPTPIPCONTROLLER_PARSEEVTPACKET_EXIT ); return KErrBadHandle; } + OstTraceFunctionExit0( DUP1_CPTPIPCONTROLLER_PARSEEVTPACKET_EXIT ); return KErrNone; } void CPTPIPController::BuildInitAckL() { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_BUILDINITACKL_ENTRY ); iInitCmdAck->SetUint32L(CPTPIPInitCmdAck::EPktType,PTPIP_INIT_COMMAND_ACK); // We are supporting only one connection,So connection Id is fixed iInitCmdAck->SetUint32L(CPTPIPInitCmdAck::EConNumber,PTPIP_FIXED_CONNECTION_ID); @@ -617,17 +677,22 @@ iInitCmdAck->SetUint32L(CPTPIPInitCmdAck::EVersion,PTPIP_PRPTOCOL_VERSION); TUint64 size = iInitCmdAck->Size(); iInitCmdAck->SetUint32L(CPTPIPInitCmdAck::ELength,(TUint32)size); + OstTraceFunctionExit0( CPTPIPCONTROLLER_BUILDINITACKL_EXIT ); } void CPTPIPController::BuildInitFailL(TInitFailReason aReason) { + OstTraceFunctionEntry0( CPTPIPCONTROLLER_BUILDINITFAILL_ENTRY ); iInitFailed.SetUint32(TPTPIPInitFailed::ELength,iInitFailed.Size()); iInitFailed.SetUint32(TPTPIPInitFailed::EType,PTPIP_INIT_FAIL); iInitFailed.SetUint32(TPTPIPInitFailed::EReason,aReason); + OstTraceFunctionExit0( CPTPIPCONTROLLER_BUILDINITFAILL_EXIT ); } TBool E32Dll() { + OstTraceFunctionEntry0( _E32DLL_ENTRY ); + OstTraceFunctionExit0( _E32DLL_EXIT ); return ETrue; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipcontroller/src/cptpipsockethandler.cpp --- a/mtptransports/mtpptpiptransport/ptpipcontroller/src/cptpipsockethandler.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipcontroller/src/cptpipsockethandler.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -13,16 +13,24 @@ // Description: // +#include "mtpdebug.h" -#include "cptpipsockethandler.h" //CPTPIPSockethandler +#include "cptpipsockethandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpipsockethandlerTraces.h" +#endif + //CPTPIPSockethandler CPTPIPSocketHandler* CPTPIPSocketHandler::NewLC() { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLER_NEWLC_ENTRY ); CPTPIPSocketHandler* self = new (ELeave) CPTPIPSocketHandler; CleanupStack::PushL(self); self->ConstructL(); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLER_NEWLC_EXIT ); return self; } @@ -31,8 +39,10 @@ */ CPTPIPSocketHandler* CPTPIPSocketHandler::NewL() { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLER_NEWL_ENTRY ); CPTPIPSocketHandler* self = CPTPIPSocketHandler::NewLC(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLER_NEWL_EXIT ); return self; } @@ -40,24 +50,32 @@ CPTPIPSocketHandler::CPTPIPSocketHandler(): CActive(EPriorityStandard),iReceiveChunk(NULL,0),iWriteChunk(NULL,0) { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLER_CPTPIPSOCKETHANDLER_ENTRY ); CActiveScheduler::Add(this); iState=EReadState; + OstTraceFunctionExit0( CPTPIPSOCKETHANDLER_CPTPIPSOCKETHANDLER_EXIT ); } void CPTPIPSocketHandler::ConstructL() { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLER_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLER_CONSTRUCTL_EXIT ); } RSocket& CPTPIPSocketHandler::Socket() { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLER_SOCKET_ENTRY ); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLER_SOCKET_EXIT ); return iSocket; } TSocketHandlerState& CPTPIPSocketHandler::State() { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLER_STATE_ENTRY ); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLER_STATE_EXIT ); return iState; } @@ -65,7 +83,9 @@ CPTPIPSocketHandler::~CPTPIPSocketHandler() { + OstTraceFunctionEntry0( DUP1_CPTPIPSOCKETHANDLER_CPTPIPSOCKETHANDLER_ENTRY ); Socket().Close(); + OstTraceFunctionExit0( DUP1_CPTPIPSOCKETHANDLER_CPTPIPSOCKETHANDLER_EXIT ); } /* @@ -74,6 +94,7 @@ */ void CPTPIPSocketHandler::ReadFromSocket(MMTPType& aData,TRequestStatus& aCallerStatus) { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLER_READFROMSOCKET_ENTRY ); iReadData = &aData; iChunkStatus = aData.FirstWriteChunk(iReceiveChunk); //ToDo check this works or not @@ -85,6 +106,7 @@ //start timer SetActive(); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLER_READFROMSOCKET_EXIT ); } /*Writes to the current socket @@ -92,6 +114,7 @@ */ void CPTPIPSocketHandler::WriteToSocket(MMTPType& aData,TRequestStatus& aCallerStatus) { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLER_WRITETOSOCKET_ENTRY ); iWriteData=&aData; iChunkStatus = aData.FirstReadChunk(iWriteChunk); @@ -99,14 +122,17 @@ Socket().Write(iWriteChunk,iStatus); SetActive(); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLER_WRITETOSOCKET_EXIT ); } void CPTPIPSocketHandler::RunL() { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLER_RUNL_ENTRY ); TInt err = iStatus.Int(); - User::LeaveIfError(err); + LEAVEIFERROR( err, + OstTrace1( TRACE_ERROR, CPTPIPSOCKETHANDLER_RUNL, "error code is %d", err )); switch(iState) { @@ -149,11 +175,14 @@ } break; } +OstTraceFunctionExit0( CPTPIPSOCKETHANDLER_RUNL_EXIT ); } TInt CPTPIPSocketHandler::RunError(TInt aErr) { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLER_RUNERROR_ENTRY ); User ::RequestComplete(iCallerStatus,aErr); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLER_RUNERROR_EXIT ); return KErrNone; } @@ -161,10 +190,12 @@ void CPTPIPSocketHandler::DoCancel() { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLER_DOCANCEL_ENTRY ); if(iState==EReadState) Socket().CancelRecv(); else if(iState==EWriteState) Socket().CancelWrite(); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLER_DOCANCEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipcontroller/src/cptpiptimer.cpp --- a/mtptransports/mtpptpiptransport/ptpipcontroller/src/cptpiptimer.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipcontroller/src/cptpiptimer.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,39 +21,56 @@ #include "cptpiptimer.h" #include "cptpipcontroller.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpiptimerTraces.h" +#endif + CPTPIPTimer::CPTPIPTimer(CPTPIPController& aController) : CTimer(CActive::EPriorityStandard) { + OstTraceFunctionEntry0( CPTPIPTIMER_CPTPIPTIMER_ENTRY ); iController=&aController; + OstTraceFunctionExit0( CPTPIPTIMER_CPTPIPTIMER_EXIT ); } CPTPIPTimer* CPTPIPTimer::NewLC(CPTPIPController& aController) { + OstTraceFunctionEntry0( CPTPIPTIMER_NEWLC_ENTRY ); CPTPIPTimer* self=new (ELeave) CPTPIPTimer(aController); CleanupStack::PushL(self); self->ConstructL(); + OstTraceFunctionExit0( CPTPIPTIMER_NEWLC_EXIT ); return self; } CPTPIPTimer* CPTPIPTimer::NewL(CPTPIPController& aController) { + OstTraceFunctionEntry0( CPTPIPTIMER_NEWL_ENTRY ); CPTPIPTimer* self = NewLC(aController); CleanupStack::Pop(self); + OstTraceFunctionExit0( CPTPIPTIMER_NEWL_EXIT ); return self; } void CPTPIPTimer::ConstructL() { + OstTraceFunctionEntry0( CPTPIPTIMER_CONSTRUCTL_ENTRY ); CTimer::ConstructL(); CActiveScheduler::Add(this); + OstTraceFunctionExit0( CPTPIPTIMER_CONSTRUCTL_EXIT ); } void CPTPIPTimer::IssueRequest(TInt aTimerValue) { + OstTraceFunctionEntry0( CPTPIPTIMER_ISSUEREQUEST_ENTRY ); CTimer::After(aTimerValue * KTimerMultiplier); + OstTraceFunctionExit0( CPTPIPTIMER_ISSUEREQUEST_EXIT ); } void CPTPIPTimer::RunL() { + OstTraceFunctionEntry0( CPTPIPTIMER_RUNL_ENTRY ); iController->OnTimeOut(); + OstTraceFunctionExit0( CPTPIPTIMER_RUNL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipcontroller/src/rptpipframework.cpp --- a/mtptransports/mtpptpiptransport/ptpipcontroller/src/rptpipframework.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipcontroller/src/rptpipframework.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -15,27 +15,40 @@ #include #include "cptpipcontroller.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "rptpipframeworkTraces.h" +#endif + EXPORT_C RPTPIPFramework::RPTPIPFramework() { + OstTraceFunctionEntry0( RPTPIPFRAMEWORK_RPTPIPFRAMEWORK_ENTRY ); + OstTraceFunctionExit0( RPTPIPFRAMEWORK_RPTPIPFRAMEWORK_EXIT ); } EXPORT_C void RPTPIPFramework::OpenL() { + OstTraceFunctionEntry0( RPTPIPFRAMEWORK_OPENL_ENTRY ); iCtrl=CPTPIPController::NewL(); + OstTraceFunctionExit0( RPTPIPFRAMEWORK_OPENL_EXIT ); } EXPORT_C MPTPIPController& RPTPIPFramework::Controller() { + OstTraceFunctionEntry0( RPTPIPFRAMEWORK_CONTROLLER_ENTRY ); + OstTraceFunctionExit0( RPTPIPFRAMEWORK_CONTROLLER_EXIT ); return (MPTPIPController&)*iCtrl; } EXPORT_C void RPTPIPFramework::Close() { + OstTraceFunctionEntry0( RPTPIPFRAMEWORK_CLOSE_ENTRY ); delete iCtrl; iCtrl=NULL; + OstTraceFunctionExit0( RPTPIPFRAMEWORK_CLOSE_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipcontroller/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpptpiptransport/ptpipcontroller/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipcontroller/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpptpiptransport/ptpipcontroller/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,132 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_NORMAL=0x86 +[TRACE]TRACE_ERROR[0x82]_CPTPIPSOCKETHANDLER_RUNL=0x2 +[TRACE]TRACE_ERROR[0x82]_DUP1_CPTPIPCONTROLLER_CHECKANDHANDLEERRORL=0x1 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_BUILDINITACKL_ENTRY=0x38 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_BUILDINITACKL_EXIT=0x39 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_BUILDINITFAILL_ENTRY=0x3a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_BUILDINITFAILL_EXIT=0x3b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_CHECKANDHANDLEERRORL_ENTRY=0x24 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_CHECKANDHANDLEERRORL_EXIT=0x25 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_CHECKINITFAILL_ENTRY=0x26 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_CHECKINITFAILL_EXIT=0x27 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_CHECKMTPCONNECTION_ENTRY=0xc +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_CHECKMTPCONNECTION_EXIT=0xd +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_COMPAREHOST_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_COMPAREHOST_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_CONSTRUCTL_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_CONSTRUCTL_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_CPTPIPCONTROLLER_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_CPTPIPCONTROLLER_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_DOCANCEL_ENTRY=0x30 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_DOCANCEL_EXIT=0x31 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_ENABLESOCKETTRANSFER_ENTRY=0x1a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_ENABLESOCKETTRANSFER_EXIT=0x1b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_NEWLC_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_NEWLC_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_NEWL_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_NEWL_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_NEWSOCKETL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_ONTIMEOUT_ENTRY=0x28 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_ONTIMEOUT_EXIT=0x29 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_PARSEEVTPACKET_ENTRY=0x35 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_PARSEEVTPACKET_EXIT=0x36 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_PARSEINITPACKETL_ENTRY=0x32 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_PARSEINITPACKETL_EXIT=0x33 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_PUBLISHSOCKETNAMEPAIR_ENTRY=0x18 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_PUBLISHSOCKETNAMEPAIR_EXIT=0x19 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_RESET_ENTRY=0x20 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_RESET_EXIT=0x21 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_RUNERROR_ENTRY=0x2e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_RUNERROR_EXIT=0x2f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_RUNL_ENTRY=0x2c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_RUNL_EXIT=0x2d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_SCHEDULE_ENTRY=0x16 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_SCHEDULE_EXIT=0x17 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_SETDEVICEFRIENDLYNAME_ENTRY=0x1e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_SETDEVICEFRIENDLYNAME_EXIT=0x1f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_SETDEVICEGUID_ENTRY=0x1c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_SETDEVICEGUID_EXIT=0x1d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_SOCKETACCEPTED_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_SOCKETACCEPTED_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_STARTTIMER_ENTRY=0x2a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_STARTTIMER_EXIT=0x2b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_STOPTRANSPORT_ENTRY=0x22 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_STOPTRANSPORT_EXIT=0x23 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONTROLLER_VALIDATE_ENTRY=0xe +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_CONSTRUCTL_ENTRY=0x44 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_CONSTRUCTL_EXIT=0x45 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_CPTPIPSOCKETHANDLER_ENTRY=0x42 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_CPTPIPSOCKETHANDLER_EXIT=0x43 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_DOCANCEL_ENTRY=0x54 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_DOCANCEL_EXIT=0x55 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_NEWLC_ENTRY=0x3e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_NEWLC_EXIT=0x3f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_NEWL_ENTRY=0x40 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_NEWL_EXIT=0x41 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_READFROMSOCKET_ENTRY=0x4c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_READFROMSOCKET_EXIT=0x4d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_RUNERROR_ENTRY=0x52 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_RUNERROR_EXIT=0x53 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_RUNL_ENTRY=0x50 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_RUNL_EXIT=0x51 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_SOCKET_ENTRY=0x46 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_SOCKET_EXIT=0x47 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_STATE_ENTRY=0x48 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_STATE_EXIT=0x49 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_WRITETOSOCKET_ENTRY=0x4e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLER_WRITETOSOCKET_EXIT=0x4f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTIMER_CONSTRUCTL_ENTRY=0x5c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTIMER_CONSTRUCTL_EXIT=0x5d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTIMER_CPTPIPTIMER_ENTRY=0x56 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTIMER_CPTPIPTIMER_EXIT=0x57 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTIMER_ISSUEREQUEST_ENTRY=0x5e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTIMER_ISSUEREQUEST_EXIT=0x5f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTIMER_NEWLC_ENTRY=0x58 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTIMER_NEWLC_EXIT=0x59 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTIMER_NEWL_ENTRY=0x5a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTIMER_NEWL_EXIT=0x5b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTIMER_RUNL_ENTRY=0x60 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTIMER_RUNL_EXIT=0x61 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPCONTROLLER_COMPAREHOST_EXIT=0x15 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPCONTROLLER_CPTPIPCONTROLLER_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPCONTROLLER_CPTPIPCONTROLLER_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPCONTROLLER_PARSEEVTPACKET_EXIT=0x37 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPCONTROLLER_PARSEINITPACKETL_EXIT=0x34 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPCONTROLLER_SOCKETACCEPTED_EXIT=0x11 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPSOCKETHANDLER_CPTPIPSOCKETHANDLER_ENTRY=0x4a +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPSOCKETHANDLER_CPTPIPSOCKETHANDLER_EXIT=0x4b +[TRACE]TRACE_FLOW[0x8A]_DUP2_CPTPIPCONTROLLER_SOCKETACCEPTED_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_RPTPIPFRAMEWORK_CLOSE_ENTRY=0x68 +[TRACE]TRACE_FLOW[0x8A]_RPTPIPFRAMEWORK_CLOSE_EXIT=0x69 +[TRACE]TRACE_FLOW[0x8A]_RPTPIPFRAMEWORK_CONTROLLER_ENTRY=0x66 +[TRACE]TRACE_FLOW[0x8A]_RPTPIPFRAMEWORK_CONTROLLER_EXIT=0x67 +[TRACE]TRACE_FLOW[0x8A]_RPTPIPFRAMEWORK_OPENL_ENTRY=0x64 +[TRACE]TRACE_FLOW[0x8A]_RPTPIPFRAMEWORK_OPENL_EXIT=0x65 +[TRACE]TRACE_FLOW[0x8A]_RPTPIPFRAMEWORK_RPTPIPFRAMEWORK_ENTRY=0x62 +[TRACE]TRACE_FLOW[0x8A]_RPTPIPFRAMEWORK_RPTPIPFRAMEWORK_EXIT=0x63 +[TRACE]TRACE_FLOW[0x8A]__E32DLL_ENTRY=0x3c +[TRACE]TRACE_FLOW[0x8A]__E32DLL_EXIT=0x3d +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONTROLLER_CHECKANDHANDLEERRORL=0x3 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONTROLLER_CHECKINITFAILL=0x4 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONTROLLER_RESET=0x2 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONTROLLER_SETDEVICEFRIENDLYNAME=0x1 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/group/ptpipdatatypes.mmp --- a/mtptransports/mtpptpiptransport/ptpipdatatypes/group/ptpipdatatypes.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/group/ptpipdatatypes.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -31,7 +31,8 @@ CAPABILITY All -Tcb MW_LAYER_SYSTEMINCLUDE_SYMBIAN -USERINCLUDE ../inc/ +USERINCLUDE ../inc/ +USERINCLUDE ../traces/ SOURCEPATH ../src/ SOURCE cptpipgenericcontainer.cpp diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/src/cptpipdatacontainer.cpp --- a/mtptransports/mtpptpiptransport/ptpipdatatypes/src/cptpipdatacontainer.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/src/cptpipdatacontainer.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -19,6 +19,11 @@ #include "ptpipdatatypes.h" #include "cptpipdatacontainer.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpipdatacontainerTraces.h" +#endif + // Dataset constants const TUint CPTPIPDataContainer::KFlatChunkSize(12); @@ -40,10 +45,12 @@ */ EXPORT_C CPTPIPDataContainer* CPTPIPDataContainer::NewL() { + OstTraceFunctionEntry0( CPTPIPDATACONTAINER_NEWL_ENTRY ); CPTPIPDataContainer* self = new (ELeave) CPTPIPDataContainer(); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CPTPIPDATACONTAINER_NEWL_EXIT ); return self; } @@ -52,7 +59,9 @@ */ EXPORT_C CPTPIPDataContainer::~CPTPIPDataContainer() { + OstTraceFunctionEntry0( CPTPIPDATACONTAINER_CPTPIPDATACONTAINER_ENTRY ); iChunkHeader.Close(); + OstTraceFunctionExit0( CPTPIPDATACONTAINER_CPTPIPDATACONTAINER_EXIT ); } /** @@ -63,7 +72,9 @@ KFlatChunkSize, *this), iElementInfo(iElementMetaData, ENumElements),iIsNextHeader(EFalse) { + OstTraceFunctionEntry0( DUP1_CPTPIPDATACONTAINER_CPTPIPDATACONTAINER_ENTRY ); + OstTraceFunctionExit0( DUP1_CPTPIPDATACONTAINER_CPTPIPDATACONTAINER_EXIT ); } /** @@ -71,8 +82,10 @@ */ void CPTPIPDataContainer::ConstructL( ) { + OstTraceFunctionEntry0( CPTPIPDATACONTAINER_CONSTRUCTL_ENTRY ); iChunkHeader.OpenL ( ); ChunkAppendL (iChunkHeader ); + OstTraceFunctionExit0( CPTPIPDATACONTAINER_CONSTRUCTL_EXIT ); } /** @@ -81,6 +94,8 @@ */ EXPORT_C MMTPType* CPTPIPDataContainer::Payload() const { + OstTraceFunctionEntry0( CPTPIPDATACONTAINER_PAYLOAD_ENTRY ); + OstTraceFunctionExit0( CPTPIPDATACONTAINER_PAYLOAD_EXIT ); return iPayload; } @@ -90,6 +105,7 @@ */ EXPORT_C void CPTPIPDataContainer::SetPayloadL(MMTPType* aPayload) { + OstTraceFunctionEntry0( CPTPIPDATACONTAINER_SETPAYLOADL_ENTRY ); if (iPayload) { // Remove the existing payload from the super class. @@ -103,17 +119,22 @@ } iPayload = aPayload; iIsNextHeader = EFalse; + OstTraceFunctionExit0( CPTPIPDATACONTAINER_SETPAYLOADL_EXIT ); } EXPORT_C TUint CPTPIPDataContainer::Type() const { + OstTraceFunctionEntry0( CPTPIPDATACONTAINER_TYPE_ENTRY ); + OstTraceFunctionExit0( CPTPIPDATACONTAINER_TYPE_EXIT ); return EPTPIPTypeDataContainer; } const CMTPTypeCompoundBase::TElementInfo& CPTPIPDataContainer::ElementInfo( TInt aElementId ) const { + OstTraceFunctionEntry0( CPTPIPDATACONTAINER_ELEMENTINFO_ENTRY ); __ASSERT_DEBUG((aElementId < ENumElements), User::Invariant()); + OstTraceFunctionExit0( CPTPIPDATACONTAINER_ELEMENTINFO_EXIT ); return iElementInfo[aElementId]; } @@ -125,6 +146,7 @@ **/ EXPORT_C TInt CPTPIPDataContainer::FirstWriteChunk(TPtr8& aChunk) { + OstTraceFunctionEntry0( CPTPIPDATACONTAINER_FIRSTWRITECHUNK_ENTRY ); TInt err(KErrNone); aChunk.Set(NULL, 0, 0); @@ -168,6 +190,7 @@ iIsNextHeader = ETrue; + OstTraceFunctionExit0( CPTPIPDATACONTAINER_FIRSTWRITECHUNK_EXIT ); return err; } @@ -178,6 +201,7 @@ **/ EXPORT_C MMTPType* CPTPIPDataContainer::CommitChunkL(TPtr8& aChunk) { + OstTraceFunctionEntry0( CPTPIPDATACONTAINER_COMMITCHUNKL_ENTRY ); MMTPType *chunk(iChunks[iWriteChunk]); MMTPType* res = NULL; if (chunk->CommitRequired()) @@ -191,6 +215,7 @@ iWriteChunk++; } + OstTraceFunctionExit0( CPTPIPDATACONTAINER_COMMITCHUNKL_EXIT ); return res; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/src/cptpipgenericcontainer.cpp --- a/mtptransports/mtpptpiptransport/ptpipdatatypes/src/cptpipgenericcontainer.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/src/cptpipgenericcontainer.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -19,6 +19,11 @@ #include "ptpipdatatypes.h" #include "cptpipgenericcontainer.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpipgenericcontainerTraces.h" +#endif + // Dataset constants const TUint CPTPIPGenericContainer::KFlatChunkSize(8); @@ -39,10 +44,12 @@ */ EXPORT_C CPTPIPGenericContainer* CPTPIPGenericContainer::NewL() { + OstTraceFunctionEntry0( CPTPIPGENERICCONTAINER_NEWL_ENTRY ); CPTPIPGenericContainer* self = new (ELeave) CPTPIPGenericContainer(); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CPTPIPGENERICCONTAINER_NEWL_EXIT ); return self; } @@ -51,7 +58,9 @@ */ EXPORT_C CPTPIPGenericContainer::~CPTPIPGenericContainer() { + OstTraceFunctionEntry0( CPTPIPGENERICCONTAINER_CPTPIPGENERICCONTAINER_ENTRY ); iChunkHeader.Close(); + OstTraceFunctionExit0( CPTPIPGENERICCONTAINER_CPTPIPGENERICCONTAINER_EXIT ); } /** @@ -62,7 +71,9 @@ KFlatChunkSize, *this), iElementInfo(iElementMetaData, ENumElements) { +OstTraceFunctionEntry0( DUP1_CPTPIPGENERICCONTAINER_CPTPIPGENERICCONTAINER_ENTRY ); + OstTraceFunctionExit0( DUP1_CPTPIPGENERICCONTAINER_CPTPIPGENERICCONTAINER_EXIT ); } /** @@ -70,8 +81,10 @@ */ void CPTPIPGenericContainer::ConstructL( ) { + OstTraceFunctionEntry0( CPTPIPGENERICCONTAINER_CONSTRUCTL_ENTRY ); iChunkHeader.OpenL ( ); ChunkAppendL (iChunkHeader ); + OstTraceFunctionExit0( CPTPIPGENERICCONTAINER_CONSTRUCTL_EXIT ); } /** Provides the container payload. @@ -79,6 +92,8 @@ */ EXPORT_C MMTPType* CPTPIPGenericContainer::Payload() const { + OstTraceFunctionEntry0( CPTPIPGENERICCONTAINER_PAYLOAD_ENTRY ); + OstTraceFunctionExit0( CPTPIPGENERICCONTAINER_PAYLOAD_EXIT ); return iPayload; } @@ -88,6 +103,7 @@ */ EXPORT_C void CPTPIPGenericContainer::SetPayloadL(MMTPType* aPayload) { + OstTraceFunctionEntry0( CPTPIPGENERICCONTAINER_SETPAYLOADL_ENTRY ); if (iPayload) { // Remove the existing payload from the super class. @@ -100,17 +116,22 @@ ChunkAppendL(*aPayload); } iPayload = aPayload; + OstTraceFunctionExit0( CPTPIPGENERICCONTAINER_SETPAYLOADL_EXIT ); } EXPORT_C TUint CPTPIPGenericContainer::Type() const { + OstTraceFunctionEntry0( CPTPIPGENERICCONTAINER_TYPE_ENTRY ); + OstTraceFunctionExit0( CPTPIPGENERICCONTAINER_TYPE_EXIT ); return EPTPIPTypeGenericContainer; } const CMTPTypeCompoundBase::TElementInfo& CPTPIPGenericContainer::ElementInfo( TInt aElementId ) const { + OstTraceFunctionEntry0( CPTPIPGENERICCONTAINER_ELEMENTINFO_ENTRY ); __ASSERT_DEBUG((aElementId < ENumElements), User::Invariant()); + OstTraceFunctionExit0( CPTPIPGENERICCONTAINER_ELEMENTINFO_EXIT ); return iElementInfo[aElementId]; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/src/cptpipinitcmdack.cpp --- a/mtptransports/mtpptpiptransport/ptpipdatatypes/src/cptpipinitcmdack.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/src/cptpipinitcmdack.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -18,7 +18,12 @@ */ #include "cptpipinitcmdack.h" -#include "ptpipdatatypes.h" +#include "ptpipdatatypes.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpipinitcmdackTraces.h" +#endif + // Dataset constants const TUint CPTPIPInitCmdAck::KFlatChunkSize(28); const CMTPTypeCompoundBase::TElementInfo CPTPIPInitCmdAck::iElementMetaData[CPTPIPInitCmdAck::ENumElements] = @@ -34,10 +39,12 @@ EXPORT_C CPTPIPInitCmdAck* CPTPIPInitCmdAck::NewL() { + OstTraceFunctionEntry0( CPTPIPINITCMDACK_NEWL_ENTRY ); CPTPIPInitCmdAck* self = new (ELeave) CPTPIPInitCmdAck(); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CPTPIPINITCMDACK_NEWL_EXIT ); return self; } /** @@ -48,7 +55,9 @@ iChunkHeader(KFlatChunkSize, *this), iElementInfo(iElementMetaData, ENumElements) { + OstTraceFunctionEntry0( CPTPIPINITCMDACK_CPTPIPINITCMDACK_ENTRY ); + OstTraceFunctionExit0( CPTPIPINITCMDACK_CPTPIPINITCMDACK_EXIT ); } /** @@ -56,39 +65,50 @@ */ EXPORT_C CPTPIPInitCmdAck::~CPTPIPInitCmdAck() { + OstTraceFunctionEntry0( DUP1_CPTPIPINITCMDACK_CPTPIPINITCMDACK_ENTRY ); iChunkHeader.Close(); iBuffer.Close(); + OstTraceFunctionExit0( DUP1_CPTPIPINITCMDACK_CPTPIPINITCMDACK_EXIT ); } /** Second phase constructor. */ void CPTPIPInitCmdAck::ConstructL() { + OstTraceFunctionEntry0( CPTPIPINITCMDACK_CONSTRUCTL_ENTRY ); iChunkHeader.OpenL(); ChunkAppendL(iChunkHeader); ChunkAppendL(iVersion); iChunkCount = EIdNumChunks; + OstTraceFunctionExit0( CPTPIPINITCMDACK_CONSTRUCTL_EXIT ); } EXPORT_C TUint CPTPIPInitCmdAck::Type() const { + OstTraceFunctionEntry0( CPTPIPINITCMDACK_TYPE_ENTRY ); + OstTraceFunctionExit0( CPTPIPINITCMDACK_TYPE_EXIT ); return EPTPIPTypeInitCmdAck; } const CMTPTypeCompoundBase::TElementInfo& CPTPIPInitCmdAck::ElementInfo(TInt aElementId) const { + OstTraceFunctionEntry0( CPTPIPINITCMDACK_ELEMENTINFO_ENTRY ); __ASSERT_DEBUG((aElementId < ENumElements), User::Invariant()); + OstTraceFunctionExit0( CPTPIPINITCMDACK_ELEMENTINFO_EXIT ); return iElementInfo[aElementId]; } EXPORT_C TInt CPTPIPInitCmdAck::FirstReadChunk(TPtrC8& aChunk) const { + OstTraceFunctionEntry0( CPTPIPINITCMDACK_FIRSTREADCHUNK_ENTRY ); iChunkCount = EIdFlatChunk; + OstTraceFunctionExit0( CPTPIPINITCMDACK_FIRSTREADCHUNK_EXIT ); return CMTPTypeCompoundBase::FirstReadChunk(aChunk); } EXPORT_C TInt CPTPIPInitCmdAck::NextReadChunk(TPtrC8& aChunk) const { + OstTraceFunctionEntry0( CPTPIPINITCMDACK_NEXTREADCHUNK_ENTRY ); TInt ret = KErrNone; if(iChunkCount == EIdFlatChunk) { @@ -99,6 +119,7 @@ ret = CMTPTypeCompoundBase::NextReadChunk(aChunk); } iChunkCount++; + OstTraceFunctionExit0( CPTPIPINITCMDACK_NEXTREADCHUNK_EXIT ); return ret; } @@ -106,14 +127,19 @@ EXPORT_C void CPTPIPInitCmdAck::SetDeviceFriendlyName(TDesC16& aName) { - iBuffer.Create(aName,aName.Length()+KMTPNullCharLen); - iBuffer.Append(KMTPNullChar); + OstTraceFunctionEntry0( CPTPIPINITCMDACK_SETDEVICEFRIENDLYNAME_ENTRY ); + if(KErrNone == iBuffer.Create(aName,aName.Length()+KMTPNullCharLen)) + { + iBuffer.Append(KMTPNullChar); + } } EXPORT_C TUint64 CPTPIPInitCmdAck::Size() const { + OstTraceFunctionEntry0( CPTPIPINITCMDACK_SIZE_ENTRY ); TUint64 size = CMTPTypeCompoundBase::Size(); size += iBuffer.Size(); + OstTraceFunctionExit0( CPTPIPINITCMDACK_SIZE_EXIT ); return size; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/src/cptpipinitcmdreq.cpp --- a/mtptransports/mtpptpiptransport/ptpipdatatypes/src/cptpipinitcmdreq.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/src/cptpipinitcmdreq.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -19,7 +19,12 @@ #include "cptpipinitcmdreq.h" -#include "ptpipdatatypes.h" +#include "ptpipdatatypes.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpipinitcmdreqTraces.h" +#endif + @@ -38,10 +43,12 @@ EXPORT_C CPTPIPInitCmdRequest* CPTPIPInitCmdRequest::NewL() { + OstTraceFunctionEntry0( CPTPIPINITCMDREQUEST_NEWL_ENTRY ); CPTPIPInitCmdRequest* self = new (ELeave) CPTPIPInitCmdRequest(); CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CPTPIPINITCMDREQUEST_NEWL_EXIT ); return self; } /** @@ -52,7 +59,9 @@ iChunkHeader(KFlatChunkSize, *this), iElementInfo(iElementMetaData, ENumElements),iBuffer() { + OstTraceFunctionEntry0( CPTPIPINITCMDREQUEST_CPTPIPINITCMDREQUEST_ENTRY ); + OstTraceFunctionExit0( CPTPIPINITCMDREQUEST_CPTPIPINITCMDREQUEST_EXIT ); } /** @@ -60,39 +69,50 @@ */ EXPORT_C CPTPIPInitCmdRequest::~CPTPIPInitCmdRequest() { + OstTraceFunctionEntry0( DUP1_CPTPIPINITCMDREQUEST_CPTPIPINITCMDREQUEST_ENTRY ); iChunkHeader.Close(); iBuffer.Close(); + OstTraceFunctionExit0( DUP1_CPTPIPINITCMDREQUEST_CPTPIPINITCMDREQUEST_EXIT ); } /** Second phase constructor. */ void CPTPIPInitCmdRequest::ConstructL() { + OstTraceFunctionEntry0( CPTPIPINITCMDREQUEST_CONSTRUCTL_ENTRY ); iChunkHeader.OpenL(); ChunkAppendL(iChunkHeader); ChunkAppendL(iVersion); iChunkCount = EIdNumChunks; + OstTraceFunctionExit0( CPTPIPINITCMDREQUEST_CONSTRUCTL_EXIT ); } EXPORT_C TUint CPTPIPInitCmdRequest::Type() const { + OstTraceFunctionEntry0( CPTPIPINITCMDREQUEST_TYPE_ENTRY ); + OstTraceFunctionExit0( CPTPIPINITCMDREQUEST_TYPE_EXIT ); return EPTPIPTypeInitCmdRequest; } const CMTPTypeCompoundBase::TElementInfo& CPTPIPInitCmdRequest::ElementInfo(TInt aElementId) const { + OstTraceFunctionEntry0( CPTPIPINITCMDREQUEST_ELEMENTINFO_ENTRY ); __ASSERT_DEBUG((aElementId < ENumElements), User::Invariant()); + OstTraceFunctionExit0( CPTPIPINITCMDREQUEST_ELEMENTINFO_EXIT ); return iElementInfo[aElementId]; } EXPORT_C TInt CPTPIPInitCmdRequest::FirstWriteChunk(TPtr8& aChunk) { + OstTraceFunctionEntry0( CPTPIPINITCMDREQUEST_FIRSTWRITECHUNK_ENTRY ); iChunkCount = EIdFlatChunk; + OstTraceFunctionExit0( CPTPIPINITCMDREQUEST_FIRSTWRITECHUNK_EXIT ); return CMTPTypeCompoundBase::FirstWriteChunk(aChunk); } EXPORT_C TInt CPTPIPInitCmdRequest::NextWriteChunk(TPtr8& aChunk) { + OstTraceFunctionEntry0( CPTPIPINITCMDREQUEST_NEXTWRITECHUNK_ENTRY ); TInt ret = KErrNone; if(iChunkCount == EIdFlatChunk) { @@ -111,22 +131,27 @@ ret = CMTPTypeCompoundBase::NextWriteChunk(aChunk); } iChunkCount++; + OstTraceFunctionExit0( CPTPIPINITCMDREQUEST_NEXTWRITECHUNK_EXIT ); return ret; } EXPORT_C MMTPType* CPTPIPInitCmdRequest::CommitChunkL(TPtr8& aChunk) { + OstTraceFunctionEntry0( CPTPIPINITCMDREQUEST_COMMITCHUNKL_ENTRY ); if(iChunkCount != EIdVersionChunk) { return CMTPTypeCompoundBase::CommitChunkL(aChunk); } + OstTraceFunctionExit0( CPTPIPINITCMDREQUEST_COMMITCHUNKL_EXIT ); return NULL; } EXPORT_C TDes16& CPTPIPInitCmdRequest::HostFriendlyName() { +OstTraceFunctionEntry0( CPTPIPINITCMDREQUEST_HOSTFRIENDLYNAME_ENTRY ); +OstTraceFunctionExit0( CPTPIPINITCMDREQUEST_HOSTFRIENDLYNAME_EXIT ); return iBuffer; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipinitevtack.cpp --- a/mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipinitevtack.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipinitevtack.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -19,6 +19,11 @@ #include "tptpipinitevtack.h" #include "ptpipdatatypes.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "tptpipinitevtackTraces.h" +#endif + // Dataset element metadata. const TPTPIPInitEvtAck::TElementInfo TPTPIPInitEvtAck::iElementMetaData[ENumElements] = @@ -34,16 +39,22 @@ iElementInfo(iElementMetaData, ENumElements), iBuffer(KSize) { + OstTraceFunctionEntry0( TPTPIPINITEVTACK_TPTPIPINITEVTACK_ENTRY ); SetBuffer(iBuffer); + OstTraceFunctionExit0( TPTPIPINITEVTACK_TPTPIPINITEVTACK_EXIT ); } EXPORT_C TUint TPTPIPInitEvtAck::Type() const { + OstTraceFunctionEntry0( TPTPIPINITEVTACK_TYPE_ENTRY ); + OstTraceFunctionExit0( TPTPIPINITEVTACK_TYPE_EXIT ); return EPTPIPTypeInitEvtAck ; } EXPORT_C const TMTPTypeFlatBase::TElementInfo& TPTPIPInitEvtAck::ElementInfo(TInt aElementId) const { + OstTraceFunctionEntry0( TPTPIPINITEVTACK_ELEMENTINFO_ENTRY ); __ASSERT_DEBUG((aElementId < ENumElements), User::Invariant()); + OstTraceFunctionExit0( TPTPIPINITEVTACK_ELEMENTINFO_EXIT ); return iElementInfo[aElementId]; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipinitevtreq.cpp --- a/mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipinitevtreq.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipinitevtreq.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,7 +21,12 @@ #include "tptpipinitevtreq.h" -#include "ptpipdatatypes.h" +#include "ptpipdatatypes.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "tptpipinitevtreqTraces.h" +#endif + // Dataset element metadata. const TPTPIPInitEvtRequest::TElementInfo TPTPIPInitEvtRequest::iElementMetaData[ENumElements] = { @@ -37,17 +42,23 @@ iElementInfo(iElementMetaData, ENumElements), iBuffer(KSize) { + OstTraceFunctionEntry0( TPTPIPINITEVTREQUEST_TPTPIPINITEVTREQUEST_ENTRY ); SetBuffer(iBuffer); + OstTraceFunctionExit0( TPTPIPINITEVTREQUEST_TPTPIPINITEVTREQUEST_EXIT ); } EXPORT_C TUint TPTPIPInitEvtRequest::Type() const { + OstTraceFunctionEntry0( TPTPIPINITEVTREQUEST_TYPE_ENTRY ); + OstTraceFunctionExit0( TPTPIPINITEVTREQUEST_TYPE_EXIT ); return EPTPIPTypeInitEvtRequest; } EXPORT_C const TMTPTypeFlatBase::TElementInfo& TPTPIPInitEvtRequest::ElementInfo(TInt aElementId) const { + OstTraceFunctionEntry0( TPTPIPINITEVTREQUEST_ELEMENTINFO_ENTRY ); __ASSERT_DEBUG((aElementId < ENumElements), User::Invariant()); + OstTraceFunctionExit0( TPTPIPINITEVTREQUEST_ELEMENTINFO_EXIT ); return iElementInfo[aElementId]; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipinitfailed.cpp --- a/mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipinitfailed.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipinitfailed.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -19,7 +19,12 @@ #include "tptpipinitfailed.h" -#include "ptpipdatatypes.h" +#include "ptpipdatatypes.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "tptpipinitfailedTraces.h" +#endif + // Dataset element metadata. const TPTPIPInitFailed::TElementInfo TPTPIPInitFailed::iElementMetaData[ENumElements] = { @@ -35,17 +40,23 @@ iElementInfo(iElementMetaData, ENumElements), iBuffer(KSize) { + OstTraceFunctionEntry0( TPTPIPINITFAILED_TPTPIPINITFAILED_ENTRY ); SetBuffer(iBuffer); + OstTraceFunctionExit0( TPTPIPINITFAILED_TPTPIPINITFAILED_EXIT ); } EXPORT_C TUint TPTPIPInitFailed::Type() const { + OstTraceFunctionEntry0( TPTPIPINITFAILED_TYPE_ENTRY ); + OstTraceFunctionExit0( TPTPIPINITFAILED_TYPE_EXIT ); return EPTPIPTypeInitFail; } EXPORT_C const TMTPTypeFlatBase::TElementInfo& TPTPIPInitFailed::ElementInfo(TInt aElementId) const { + OstTraceFunctionEntry0( TPTPIPINITFAILED_ELEMENTINFO_ENTRY ); __ASSERT_DEBUG((aElementId < ENumElements), User::Invariant()); + OstTraceFunctionExit0( TPTPIPINITFAILED_ELEMENTINFO_EXIT ); return iElementInfo[aElementId]; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpiprequestpayload.cpp --- a/mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpiprequestpayload.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpiprequestpayload.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,6 +20,11 @@ #include #include "ptpipdatatypes.h" #include "tptpiprequestpayload.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "tptpiprequestpayloadTraces.h" +#endif + // Dataset element metadata. const TPTPIPTypeRequestPayload::TElementInfo @@ -44,7 +49,9 @@ //iNumParameters(0) iMaxSetParam(0) { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_TPTPIPTYPEREQUESTPAYLOAD_ENTRY ); SetBuffer (iBuffer ); + OstTraceFunctionExit0( TPTPIPTYPEREQUESTPAYLOAD_TPTPIPTYPEREQUESTPAYLOAD_EXIT ); } /** @@ -53,6 +60,7 @@ */ EXPORT_C TUint TPTPIPTypeRequestPayload::NumParameters() const { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_NUMPARAMETERS_ENTRY ); //return iNumParameters; //return (iMaxSetParam - EParameter1 + 1); return (iMaxSetParam > 0 )? (iMaxSetParam - EParameter1 + 1) : 0; @@ -75,6 +83,7 @@ TBool aIsNullParamValid, TUint aNumOfNullParam ) { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_COPYIN_ENTRY ); __ASSERT_DEBUG((aParamEndOffset >= aParamStartOffset && (aParamEndOffset - aParamStartOffset + 1) <= ENumElements), User::Invariant()); TUint32 parameter = 0; TUint numberOfNullParam = 0; @@ -93,6 +102,7 @@ } } + OstTraceFunctionExit0( TPTPIPTYPEREQUESTPAYLOAD_COPYIN_EXIT ); } /** @@ -109,11 +119,13 @@ EXPORT_C void TPTPIPTypeRequestPayload::CopyOut( TMTPTypeFlatBase& aTo, TUint aParamStartOffset, TUint aParamEndOffset ) { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_COPYOUT_ENTRY ); __ASSERT_DEBUG((aParamEndOffset >= aParamStartOffset && (aParamEndOffset - aParamStartOffset + 1) <= ENumElements), User::Invariant()); for (TUint s(EParameter1), t(aParamStartOffset); (s <= iMaxSetParam && t <= aParamEndOffset); s++, t++) { aTo.SetUint32((t), Uint32(s)); } + OstTraceFunctionExit0( TPTPIPTYPEREQUESTPAYLOAD_COPYOUT_EXIT ); } /** @@ -121,8 +133,10 @@ */ EXPORT_C void TPTPIPTypeRequestPayload::Reset( ) { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_RESET_ENTRY ); TMTPTypeFlatBase::Reset(); iMaxSetParam = 0; + OstTraceFunctionExit0( TPTPIPTYPEREQUESTPAYLOAD_RESET_EXIT ); } /** @@ -130,8 +144,10 @@ */ EXPORT_C void TPTPIPTypeRequestPayload::SetUint16(TInt aElementId, TUint16 aData) { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_SETUINT16_ENTRY ); __ASSERT_DEBUG((aElementId == EOpCode), User::Invariant()); TMTPTypeFlatBase::SetUint16(aElementId, aData); + OstTraceFunctionExit0( TPTPIPTYPEREQUESTPAYLOAD_SETUINT16_EXIT ); } /** @@ -139,6 +155,7 @@ */ EXPORT_C TUint16 TPTPIPTypeRequestPayload::Uint16(TInt aElementId) const { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_UINT16_ENTRY ); __ASSERT_DEBUG((aElementId == EOpCode), User::Invariant()); return TMTPTypeFlatBase::Uint16(aElementId); } @@ -148,6 +165,7 @@ */ EXPORT_C void TPTPIPTypeRequestPayload::SetUint32(TInt aElementId, TUint32 aData ) { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_SETUINT32_ENTRY ); __ASSERT_DEBUG((aElementId != EOpCode), User::Invariant()); if (aElementId >= EParameter1) { @@ -166,6 +184,7 @@ // Set the element value. TMTPTypeFlatBase::SetUint32(aElementId, aData); + OstTraceFunctionExit0( TPTPIPTYPEREQUESTPAYLOAD_SETUINT32_EXIT ); } /** @@ -173,6 +192,7 @@ */ EXPORT_C TUint32 TPTPIPTypeRequestPayload::Uint32(TInt aElementId) const { +OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_UINT32_ENTRY ); // __ASSERT_DEBUG((aElementId < iMaxSetParam ), User::Invariant()); // __ASSERT_DEBUG((aElementId != EOpCode), User::Invariant()); return TMTPTypeFlatBase::Uint32(aElementId); @@ -183,6 +203,7 @@ */ EXPORT_C TInt TPTPIPTypeRequestPayload::FirstReadChunk(TPtrC8& aChunk) const { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_FIRSTREADCHUNK_ENTRY ); TInt ret(TMTPTypeFlatBase::FirstReadChunk(aChunk)); TUint64 size(Size()); @@ -192,21 +213,27 @@ aChunk.Set(aChunk.Left(size)); } + OstTraceFunctionExit0( TPTPIPTYPEREQUESTPAYLOAD_FIRSTREADCHUNK_EXIT ); return ret; } EXPORT_C TUint64 TPTPIPTypeRequestPayload::Size() const { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_SIZE_ENTRY ); return (NumParameters() * KMTPTypeUINT32Size + KHeaderElementsSize); } EXPORT_C TUint TPTPIPTypeRequestPayload::Type() const { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_TYPE_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPEREQUESTPAYLOAD_TYPE_EXIT ); return EPTPIPTypeRequestPayload; } EXPORT_C TBool TPTPIPTypeRequestPayload::CommitRequired() const { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_COMMITREQUIRED_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPEREQUESTPAYLOAD_COMMITREQUIRED_EXIT ); return ETrue; } @@ -215,6 +242,7 @@ */ EXPORT_C MMTPType* TPTPIPTypeRequestPayload::CommitChunkL(TPtr8& /*aChunk*/) { +OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_COMMITCHUNKL_ENTRY ); // iNumParameters = 0; // Recalculate iNumParameters. @@ -226,11 +254,14 @@ iMaxSetParam = i; } } + OstTraceFunctionExit0( TPTPIPTYPEREQUESTPAYLOAD_COMMITCHUNKL_EXIT ); return NULL; } EXPORT_C const TMTPTypeFlatBase::TElementInfo& TPTPIPTypeRequestPayload::ElementInfo(TInt aElementId) const { + OstTraceFunctionEntry0( TPTPIPTYPEREQUESTPAYLOAD_ELEMENTINFO_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPEREQUESTPAYLOAD_ELEMENTINFO_EXIT ); return iElementInfo[aElementId]; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipresponsepayload.cpp --- a/mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipresponsepayload.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipresponsepayload.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -20,6 +20,11 @@ #include #include "ptpipdatatypes.h" #include "tptpipresponsepayload.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "tptpipresponsepayloadTraces.h" +#endif + // Dataset element metadata. @@ -43,7 +48,9 @@ //iNumParameters(0) iMaxSetParam(0) { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_TPTPIPTYPERESPONSEPAYLOAD_ENTRY ); SetBuffer(iBuffer); + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_TPTPIPTYPERESPONSEPAYLOAD_EXIT ); } /** @@ -52,6 +59,8 @@ */ EXPORT_C TUint TPTPIPTypeResponsePayload::NumParameters() const { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_NUMPARAMETERS_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_NUMPARAMETERS_EXIT ); return (iMaxSetParam > 0 )? (iMaxSetParam - EParameter1 + 1) : 0; //return iMaxSetParam - EParameter1 + 1; } @@ -73,6 +82,7 @@ TBool aIsNullParamValid, TUint aNumOfNullParam) { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_COPYIN_ENTRY ); __ASSERT_DEBUG((aParamEndOffset >= aParamStartOffset && (aParamEndOffset - aParamStartOffset + 1) <= ENumElements), User::Invariant()); TUint32 parameter = KMTPNotSpecified32; TUint numberOfNullParam = 0; @@ -90,6 +100,7 @@ numberOfNullParam++; } } + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_COPYIN_EXIT ); } /** @@ -106,12 +117,14 @@ EXPORT_C void TPTPIPTypeResponsePayload::CopyOut( TMTPTypeFlatBase& aTo, TUint aParamStartOffset, TUint aParamEndOffset) { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_COPYOUT_ENTRY ); __ASSERT_DEBUG((aParamEndOffset >= aParamStartOffset && (aParamEndOffset - aParamStartOffset + 1) <= ENumElements), User::Invariant()); // TUint loopCount = aParamEndOffset - aParamStartOffset; for (TUint s(EParameter1), t(aParamStartOffset); (s <= iMaxSetParam && t <= aParamEndOffset); s++, t++) { aTo.SetUint32((t), Uint32(s)); } + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_COPYOUT_EXIT ); } /** @@ -119,9 +132,11 @@ */ EXPORT_C void TPTPIPTypeResponsePayload::Reset() { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_RESET_ENTRY ); TMTPTypeFlatBase::Reset(); //iNumParameters = 0; iMaxSetParam = 0; + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_RESET_EXIT ); } /** @@ -129,8 +144,10 @@ */ EXPORT_C void TPTPIPTypeResponsePayload::SetUint16(TInt aElementId, TUint16 aData) { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_SETUINT16_ENTRY ); __ASSERT_DEBUG((aElementId == EResponseCode), User::Invariant()); TMTPTypeFlatBase::SetUint16(aElementId, aData); + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_SETUINT16_EXIT ); } /** @@ -138,7 +155,9 @@ */ EXPORT_C TUint16 TPTPIPTypeResponsePayload::Uint16(TInt aElementId) const { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_UINT16_ENTRY ); __ASSERT_DEBUG((aElementId == EResponseCode), User::Invariant()); + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_UINT16_EXIT ); return TMTPTypeFlatBase::Uint16(aElementId); } @@ -147,6 +166,7 @@ */ EXPORT_C void TPTPIPTypeResponsePayload::SetUint32(TInt aElementId, TUint32 aData) { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_SETUINT32_ENTRY ); __ASSERT_DEBUG((aElementId != EResponseCode), User::Invariant()); if (aElementId >= EParameter1) { @@ -166,6 +186,7 @@ // Set the element value. TMTPTypeFlatBase::SetUint32(aElementId, aData); + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_SETUINT32_EXIT ); } /** @@ -173,14 +194,18 @@ */ EXPORT_C TUint32 TPTPIPTypeResponsePayload::Uint32(TInt aElementId) const { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_UINT32_ENTRY ); + // __ASSERT_DEBUG((aElementId < iMaxSetParam ), User::Invariant()); // __ASSERT_DEBUG((aElementId != EResponseCode), User::Invariant()); + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_UINT32_EXIT ); return TMTPTypeFlatBase::Uint32(aElementId); } EXPORT_C TInt TPTPIPTypeResponsePayload::FirstReadChunk(TPtrC8& aChunk) const { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_FIRSTREADCHUNK_ENTRY ); TInt ret(TMTPTypeFlatBase::FirstReadChunk(aChunk)); TUint64 size(Size()); @@ -190,21 +215,28 @@ aChunk.Set(aChunk.Left(size)); } + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_FIRSTREADCHUNK_EXIT ); return ret; } EXPORT_C TUint64 TPTPIPTypeResponsePayload::Size() const { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_SIZE_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_SIZE_EXIT ); return (NumParameters() * KMTPTypeUINT32Size + KHeaderElementsSize); } EXPORT_C TUint TPTPIPTypeResponsePayload::Type() const { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_TYPE_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_TYPE_EXIT ); return EPTPIPTypeResponsePayload; } EXPORT_C TBool TPTPIPTypeResponsePayload::CommitRequired() const { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_COMMITREQUIRED_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_COMMITREQUIRED_EXIT ); return ETrue; } @@ -213,6 +245,7 @@ */ EXPORT_C MMTPType* TPTPIPTypeResponsePayload::CommitChunkL(TPtr8& /*aChunk*/) { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_COMMITCHUNKL_ENTRY ); //iNumParameters = 0; // Recalculate iNumParameters. @@ -224,11 +257,14 @@ iMaxSetParam = i; } } + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_COMMITCHUNKL_EXIT ); return NULL; } EXPORT_C const TMTPTypeFlatBase::TElementInfo& TPTPIPTypeResponsePayload::ElementInfo(TInt aElementId) const { + OstTraceFunctionEntry0( TPTPIPTYPERESPONSEPAYLOAD_ELEMENTINFO_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPERESPONSEPAYLOAD_ELEMENTINFO_EXIT ); return iElementInfo[aElementId]; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipstartdatapayload.cpp --- a/mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipstartdatapayload.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/src/tptpipstartdatapayload.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -19,6 +19,11 @@ #include "ptpipdatatypes.h" #include "tptpipstartdatapayload.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "tptpipstartdatapayloadTraces.h" +#endif + // Dataset element metadata. @@ -35,7 +40,9 @@ iElementInfo(iElementMetaData, ENumElements), iBuffer(KSize) { + OstTraceFunctionEntry0( TPTPIPTYPESTARTDATAPAYLOAD_TPTPIPTYPESTARTDATAPAYLOAD_ENTRY ); SetBuffer(iBuffer); + OstTraceFunctionExit0( TPTPIPTYPESTARTDATAPAYLOAD_TPTPIPTYPESTARTDATAPAYLOAD_EXIT ); } /** @@ -43,7 +50,9 @@ */ EXPORT_C void TPTPIPTypeStartDataPayload::Reset() { + OstTraceFunctionEntry0( TPTPIPTYPESTARTDATAPAYLOAD_RESET_ENTRY ); TMTPTypeFlatBase::Reset(); + OstTraceFunctionExit0( TPTPIPTYPESTARTDATAPAYLOAD_RESET_EXIT ); } /** @@ -51,8 +60,10 @@ */ EXPORT_C void TPTPIPTypeStartDataPayload::SetUint32(TInt aElementId, TUint32 aData) { + OstTraceFunctionEntry0( TPTPIPTYPESTARTDATAPAYLOAD_SETUINT32_ENTRY ); __ASSERT_DEBUG((aElementId == ETransactionId), User::Invariant()); TMTPTypeFlatBase::SetUint32(aElementId, aData); + OstTraceFunctionExit0( TPTPIPTYPESTARTDATAPAYLOAD_SETUINT32_EXIT ); } /** @@ -60,7 +71,9 @@ */ EXPORT_C TUint32 TPTPIPTypeStartDataPayload::Uint32(TInt aElementId) const { + OstTraceFunctionEntry0( TPTPIPTYPESTARTDATAPAYLOAD_UINT32_ENTRY ); __ASSERT_DEBUG((aElementId == ETransactionId), User::Invariant()); + OstTraceFunctionExit0( TPTPIPTYPESTARTDATAPAYLOAD_UINT32_EXIT ); return TMTPTypeFlatBase::Uint32(aElementId); } @@ -69,8 +82,10 @@ */ EXPORT_C void TPTPIPTypeStartDataPayload::SetUint64(TInt aElementId, TUint64 aData) { + OstTraceFunctionEntry0( TPTPIPTYPESTARTDATAPAYLOAD_SETUINT64_ENTRY ); __ASSERT_DEBUG((aElementId == ETotalSize), User::Invariant()); TMTPTypeFlatBase::SetUint64(aElementId, aData); + OstTraceFunctionExit0( TPTPIPTYPESTARTDATAPAYLOAD_SETUINT64_EXIT ); } /** @@ -78,7 +93,9 @@ */ EXPORT_C TUint64 TPTPIPTypeStartDataPayload::Uint64(TInt aElementId) const { + OstTraceFunctionEntry0( TPTPIPTYPESTARTDATAPAYLOAD_UINT64_ENTRY ); __ASSERT_DEBUG((aElementId == ETotalSize), User::Invariant()); + OstTraceFunctionExit0( TPTPIPTYPESTARTDATAPAYLOAD_UINT64_EXIT ); return TMTPTypeFlatBase::Uint64(aElementId); } @@ -87,22 +104,30 @@ */ EXPORT_C TInt TPTPIPTypeStartDataPayload::FirstReadChunk(TPtrC8& aChunk) const { + OstTraceFunctionEntry0( TPTPIPTYPESTARTDATAPAYLOAD_FIRSTREADCHUNK_ENTRY ); TInt ret(TMTPTypeFlatBase::FirstReadChunk(aChunk)); + OstTraceFunctionExit0( TPTPIPTYPESTARTDATAPAYLOAD_FIRSTREADCHUNK_EXIT ); return ret; } EXPORT_C TUint64 TPTPIPTypeStartDataPayload::Size() const { + OstTraceFunctionEntry0( TPTPIPTYPESTARTDATAPAYLOAD_SIZE_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPESTARTDATAPAYLOAD_SIZE_EXIT ); return KSize; } EXPORT_C TUint TPTPIPTypeStartDataPayload::Type() const { + OstTraceFunctionEntry0( TPTPIPTYPESTARTDATAPAYLOAD_TYPE_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPESTARTDATAPAYLOAD_TYPE_EXIT ); return EPTPIPTypeStartDataPayload; } EXPORT_C TBool TPTPIPTypeStartDataPayload::CommitRequired() const { + OstTraceFunctionEntry0( TPTPIPTYPESTARTDATAPAYLOAD_COMMITREQUIRED_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPESTARTDATAPAYLOAD_COMMITREQUIRED_EXIT ); return ETrue; } @@ -111,11 +136,15 @@ */ EXPORT_C MMTPType* TPTPIPTypeStartDataPayload::CommitChunkL(TPtr8& /*aChunk*/) { + OstTraceFunctionEntry0( TPTPIPTYPESTARTDATAPAYLOAD_COMMITCHUNKL_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPESTARTDATAPAYLOAD_COMMITCHUNKL_EXIT ); return NULL; } EXPORT_C const TMTPTypeFlatBase::TElementInfo& TPTPIPTypeStartDataPayload::ElementInfo(TInt aElementId) const { + OstTraceFunctionEntry0( TPTPIPTYPESTARTDATAPAYLOAD_ELEMENTINFO_ENTRY ); + OstTraceFunctionExit0( TPTPIPTYPESTARTDATAPAYLOAD_ELEMENTINFO_EXIT ); return iElementInfo[aElementId]; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipdatatypes/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpptpiptransport/ptpipdatatypes/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,193 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_FLOW=0x8a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_COMMITCHUNKL_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_COMMITCHUNKL_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_CONSTRUCTL_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_CONSTRUCTL_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_CPTPIPDATACONTAINER_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_CPTPIPDATACONTAINER_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_ELEMENTINFO_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_ELEMENTINFO_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_FIRSTWRITECHUNK_ENTRY=0x11 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_FIRSTWRITECHUNK_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_NEWL_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_NEWL_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_PAYLOAD_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_PAYLOAD_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_SETPAYLOADL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_SETPAYLOADL_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_TYPE_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]_CPTPIPDATACONTAINER_TYPE_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_CONSTRUCTL_ENTRY=0x1b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_CONSTRUCTL_EXIT=0x1c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_CPTPIPGENERICCONTAINER_ENTRY=0x17 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_CPTPIPGENERICCONTAINER_EXIT=0x18 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_ELEMENTINFO_ENTRY=0x23 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_ELEMENTINFO_EXIT=0x24 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_NEWL_ENTRY=0x15 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_NEWL_EXIT=0x16 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_PAYLOAD_ENTRY=0x1d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_PAYLOAD_EXIT=0x1e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_SETPAYLOADL_ENTRY=0x1f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_SETPAYLOADL_EXIT=0x20 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_TYPE_ENTRY=0x21 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPGENERICCONTAINER_TYPE_EXIT=0x22 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_CONSTRUCTL_ENTRY=0x2b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_CONSTRUCTL_EXIT=0x2c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_CPTPIPINITCMDACK_ENTRY=0x27 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_CPTPIPINITCMDACK_EXIT=0x28 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_ELEMENTINFO_ENTRY=0x2f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_ELEMENTINFO_EXIT=0x30 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_FIRSTREADCHUNK_ENTRY=0x31 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_FIRSTREADCHUNK_EXIT=0x32 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_NEWL_ENTRY=0x25 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_NEWL_EXIT=0x26 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_NEXTREADCHUNK_ENTRY=0x33 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_NEXTREADCHUNK_EXIT=0x34 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_SETDEVICEFRIENDLYNAME_ENTRY=0x35 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_SETDEVICEFRIENDLYNAME_EXIT=0x36 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_SIZE_ENTRY=0x37 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_SIZE_EXIT=0x38 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_TYPE_ENTRY=0x2d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDACK_TYPE_EXIT=0x2e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_COMMITCHUNKL_ENTRY=0x49 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_COMMITCHUNKL_EXIT=0x4a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_CONSTRUCTL_ENTRY=0x3f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_CONSTRUCTL_EXIT=0x40 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_CPTPIPINITCMDREQUEST_ENTRY=0x3b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_CPTPIPINITCMDREQUEST_EXIT=0x3c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_ELEMENTINFO_ENTRY=0x43 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_ELEMENTINFO_EXIT=0x44 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_FIRSTWRITECHUNK_ENTRY=0x45 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_FIRSTWRITECHUNK_EXIT=0x46 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_HOSTFRIENDLYNAME_ENTRY=0x4b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_HOSTFRIENDLYNAME_EXIT=0x4c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_NEWL_ENTRY=0x39 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_NEWL_EXIT=0x3a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_NEXTWRITECHUNK_ENTRY=0x47 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_NEXTWRITECHUNK_EXIT=0x48 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_TYPE_ENTRY=0x41 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPINITCMDREQUEST_TYPE_EXIT=0x42 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPDATACONTAINER_CPTPIPDATACONTAINER_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPDATACONTAINER_CPTPIPDATACONTAINER_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPGENERICCONTAINER_CPTPIPGENERICCONTAINER_ENTRY=0x19 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPGENERICCONTAINER_CPTPIPGENERICCONTAINER_EXIT=0x1a +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPINITCMDACK_CPTPIPINITCMDACK_ENTRY=0x29 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPINITCMDACK_CPTPIPINITCMDACK_EXIT=0x2a +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPINITCMDREQUEST_CPTPIPINITCMDREQUEST_ENTRY=0x3d +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPINITCMDREQUEST_CPTPIPINITCMDREQUEST_EXIT=0x3e +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITEVTACK_ELEMENTINFO_ENTRY=0x51 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITEVTACK_ELEMENTINFO_EXIT=0x52 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITEVTACK_TPTPIPINITEVTACK_ENTRY=0x4d +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITEVTACK_TPTPIPINITEVTACK_EXIT=0x4e +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITEVTACK_TYPE_ENTRY=0x4f +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITEVTACK_TYPE_EXIT=0x50 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITEVTREQUEST_ELEMENTINFO_ENTRY=0x57 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITEVTREQUEST_ELEMENTINFO_EXIT=0x58 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITEVTREQUEST_TPTPIPINITEVTREQUEST_ENTRY=0x53 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITEVTREQUEST_TPTPIPINITEVTREQUEST_EXIT=0x54 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITEVTREQUEST_TYPE_ENTRY=0x55 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITEVTREQUEST_TYPE_EXIT=0x56 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITFAILED_ELEMENTINFO_ENTRY=0x5d +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITFAILED_ELEMENTINFO_EXIT=0x5e +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITFAILED_TPTPIPINITFAILED_ENTRY=0x59 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITFAILED_TPTPIPINITFAILED_EXIT=0x5a +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITFAILED_TYPE_ENTRY=0x5b +[TRACE]TRACE_FLOW[0x8A]_TPTPIPINITFAILED_TYPE_EXIT=0x5c +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_COMMITCHUNKL_ENTRY=0x75 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_COMMITCHUNKL_EXIT=0x76 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_COMMITREQUIRED_ENTRY=0x73 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_COMMITREQUIRED_EXIT=0x74 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_COPYIN_ENTRY=0x62 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_COPYIN_EXIT=0x63 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_COPYOUT_ENTRY=0x64 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_COPYOUT_EXIT=0x65 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_ELEMENTINFO_ENTRY=0x77 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_ELEMENTINFO_EXIT=0x78 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_FIRSTREADCHUNK_ENTRY=0x6e +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_FIRSTREADCHUNK_EXIT=0x6f +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_NUMPARAMETERS_ENTRY=0x61 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_RESET_ENTRY=0x66 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_RESET_EXIT=0x67 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_SETUINT16_ENTRY=0x68 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_SETUINT16_EXIT=0x69 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_SETUINT32_ENTRY=0x6b +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_SETUINT32_EXIT=0x6c +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_SIZE_ENTRY=0x70 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_TPTPIPTYPEREQUESTPAYLOAD_ENTRY=0x5f +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_TPTPIPTYPEREQUESTPAYLOAD_EXIT=0x60 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_TYPE_ENTRY=0x71 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_TYPE_EXIT=0x72 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_UINT16_ENTRY=0x6a +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPEREQUESTPAYLOAD_UINT32_ENTRY=0x6d +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_COMMITCHUNKL_ENTRY=0x93 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_COMMITCHUNKL_EXIT=0x94 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_COMMITREQUIRED_ENTRY=0x91 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_COMMITREQUIRED_EXIT=0x92 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_COPYIN_ENTRY=0x7d +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_COPYIN_EXIT=0x7e +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_COPYOUT_ENTRY=0x7f +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_COPYOUT_EXIT=0x80 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_ELEMENTINFO_ENTRY=0x95 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_ELEMENTINFO_EXIT=0x96 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_FIRSTREADCHUNK_ENTRY=0x8b +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_FIRSTREADCHUNK_EXIT=0x8c +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_NUMPARAMETERS_ENTRY=0x7b +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_NUMPARAMETERS_EXIT=0x7c +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_RESET_ENTRY=0x81 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_RESET_EXIT=0x82 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_SETUINT16_ENTRY=0x83 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_SETUINT16_EXIT=0x84 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_SETUINT32_ENTRY=0x87 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_SETUINT32_EXIT=0x88 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_SIZE_ENTRY=0x8d +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_SIZE_EXIT=0x8e +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_TPTPIPTYPERESPONSEPAYLOAD_ENTRY=0x79 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_TPTPIPTYPERESPONSEPAYLOAD_EXIT=0x7a +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_TYPE_ENTRY=0x8f +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_TYPE_EXIT=0x90 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_UINT16_ENTRY=0x85 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_UINT16_EXIT=0x86 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_UINT32_ENTRY=0x89 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPERESPONSEPAYLOAD_UINT32_EXIT=0x8a +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_COMMITCHUNKL_ENTRY=0xab +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_COMMITCHUNKL_EXIT=0xac +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_COMMITREQUIRED_ENTRY=0xa9 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_COMMITREQUIRED_EXIT=0xaa +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_ELEMENTINFO_ENTRY=0xad +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_ELEMENTINFO_EXIT=0xae +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_FIRSTREADCHUNK_ENTRY=0xa3 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_FIRSTREADCHUNK_EXIT=0xa4 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_RESET_ENTRY=0x99 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_RESET_EXIT=0x9a +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_SETUINT32_ENTRY=0x9b +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_SETUINT32_EXIT=0x9c +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_SETUINT64_ENTRY=0x9f +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_SETUINT64_EXIT=0xa0 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_SIZE_ENTRY=0xa5 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_SIZE_EXIT=0xa6 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_TPTPIPTYPESTARTDATAPAYLOAD_ENTRY=0x97 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_TPTPIPTYPESTARTDATAPAYLOAD_EXIT=0x98 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_TYPE_ENTRY=0xa7 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_TYPE_EXIT=0xa8 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_UINT32_ENTRY=0x9d +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_UINT32_EXIT=0x9e +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_UINT64_ENTRY=0xa1 +[TRACE]TRACE_FLOW[0x8A]_TPTPIPTYPESTARTDATAPAYLOAD_UINT64_EXIT=0xa2 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/group/ptpipplugin.mmp --- a/mtptransports/mtpptpiptransport/ptpipplugin/group/ptpipplugin.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/group/ptpipplugin.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -32,11 +32,12 @@ MW_LAYER_SYSTEMINCLUDE_SYMBIAN -USERINCLUDE ../inc/ +USERINCLUDE ../inc/ +USERINCLUDE ../traces/ USERINCLUDE ../../ptpipdatatypes/inc USERINCLUDE ../../common/inc/ USERINCLUDE ../../../../mtpfws/mtpfw/transports/transportapi/inc -USERINCLUDE ../../../../mtpfws/mtpfw/common/inc +USERINCLUDE ../../../../mtpfws/mtpfw/common/inc ../traces SOURCEPATH ../src/ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpipcommandhandler.h --- a/mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpipcommandhandler.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpipcommandhandler.h Fri Sep 17 08:34:51 2010 +0300 @@ -52,12 +52,6 @@ void SendDataCompleteL(TInt aError, const MMTPType& aSource); void ReceiveDataCompleteL(TInt aError, MMTPType& aSink); - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER; - }; #endif /*CCOMMANDHANDLER_H_*/ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpipconnection.h --- a/mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpipconnection.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpipconnection.h Fri Sep 17 08:34:51 2010 +0300 @@ -40,7 +40,6 @@ #include "tptpipstartdatapayload.h" #include "tptpipinitevtack.h" -#include "mtpdebug.h" #include "ptpipprotocolconstants.h" @@ -331,12 +330,7 @@ /** Buffer for reading discarded data into. */ - RBuf8 iNullBuffer; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER; + RBuf8 iNullBuffer; private: // Not Owned diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpipeventhandler.h --- a/mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpipeventhandler.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpipeventhandler.h Fri Sep 17 08:34:51 2010 +0300 @@ -52,12 +52,6 @@ TInt ParsePTPIPHeaderL(); TBool HandleInitAck(); - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER; - }; #endif /*CEVENTHANDLER_H_*/ diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpipsockhandlerbase.h --- a/mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpipsockhandlerbase.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpipsockhandlerbase.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,7 +25,6 @@ #include "e32base.h" #include "cptpipconnection.h" -#include "mtpdebug.h" #include "ptpipprotocolconstants.h" @@ -113,11 +112,7 @@ protected: CPTPIPSocketHandlerBase(CPTPIPConnection& aConnection, TPriority priority ); -#ifdef __FLOG_ACTIVE - virtual void ConstructL(const TDesC8& aComponentName); -#else virtual void ConstructL(); -#endif virtual TInt ParsePTPIPHeaderL() = 0; virtual TBool HandleInitAck() = 0; @@ -179,11 +174,6 @@ Keeps track of whether socket is sending, receiving, idle etc. */ TSocketState iState; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; private : /** diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpiptransport.h --- a/mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpiptransport.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/inc/cptpiptransport.h Fri Sep 17 08:34:51 2010 +0300 @@ -21,7 +21,6 @@ #define CPTPIPTRANSPORT_H_ #include "cmtptransportplugin.h" -#include "mtpdebug.h" class CPTPIPConnection; @@ -65,11 +64,6 @@ The PTPIP device class connection */ CPTPIPConnection* iConnection; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER; }; diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/src/cptpipcommandhandler.cpp --- a/mtptransports/mtpptpiptransport/ptpipplugin/src/cptpipcommandhandler.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/src/cptpipcommandhandler.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -18,26 +18,27 @@ */ #include "cptpipcommandhandler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpipcommandhandlerTraces.h" +#endif + const TUint32 KPTPIPHeaderSize = 8; const TUint32 KPTPIPDataHeaderSize = 12; -__FLOG_STMT(_LIT8(KComponent,"CCommandHandler");) - /** Creates the channel for commands. The base class constructl is called. */ CPTPIPCommandHandler* CPTPIPCommandHandler::NewL(CPTPIPConnection& aConnection) { + OstTraceFunctionEntry0( CPTPIPCOMMANDHANDLER_NEWL_ENTRY ); CPTPIPCommandHandler* self = new(ELeave) CPTPIPCommandHandler(aConnection); CleanupStack::PushL(self); -#ifdef __FLOG_ACTIVE - self->ConstructL(KComponent); -#else self->ConstructL(); -#endif CleanupStack::Pop(); + OstTraceFunctionExit0( CPTPIPCOMMANDHANDLER_NEWL_EXIT ); return self; } @@ -46,8 +47,8 @@ */ CPTPIPCommandHandler::~CPTPIPCommandHandler() { - __FLOG(_L8("Destructor - Entry")); - __FLOG(_L8("Destructor - Exit")); + OstTraceFunctionEntry0( CPTPIPCOMMANDHANDLER_CPTPIPCOMMANDHANDLER_ENTRY ); + OstTraceFunctionExit0( CPTPIPCOMMANDHANDLER_CPTPIPCOMMANDHANDLER_EXIT ); } /** @@ -57,6 +58,8 @@ CPTPIPSocketHandlerBase(aConnection, CActive::EPriorityStandard) { + OstTraceFunctionEntry0( DUP1_CPTPIPCOMMANDHANDLER_CPTPIPCOMMANDHANDLER_ENTRY ); + OstTraceFunctionExit0( DUP1_CPTPIPCOMMANDHANDLER_CPTPIPCOMMANDHANDLER_EXIT ); } /** @@ -68,9 +71,9 @@ */ void CPTPIPCommandHandler::SendCommandDataL(const MMTPType& aRtoIData, TUint32 aTransactionId) { - __FLOG(_L8("SendCommandDataL - Entry")); + OstTraceFunctionEntry0( CPTPIPCOMMANDHANDLER_SENDCOMMANDDATAL_ENTRY ); SendDataL(aRtoIData, aTransactionId); - __FLOG(_L8("SendCommandDataL - Exit")); + OstTraceFunctionExit0( CPTPIPCOMMANDHANDLER_SENDCOMMANDDATAL_EXIT ); } /** @@ -82,9 +85,9 @@ */ void CPTPIPCommandHandler::SendCommandL(const MMTPType& aResponse) { - __FLOG(_L8("SendCommandDataL - Entry")); + OstTraceFunctionEntry0( CPTPIPCOMMANDHANDLER_SENDCOMMANDL_ENTRY ); SendDataL(aResponse, 0); - __FLOG(_L8("SendCommandDataL - Exit")); + OstTraceFunctionExit0( CPTPIPCOMMANDHANDLER_SENDCOMMANDL_EXIT ); } /** @@ -96,9 +99,9 @@ */ void CPTPIPCommandHandler::SendDataCompleteL(TInt aError, const MMTPType& aSource) { - __FLOG(_L8("SendDataCompleteL - Entry")); + OstTraceFunctionEntry0( CPTPIPCOMMANDHANDLER_SENDDATACOMPLETEL_ENTRY ); Connection().SendCommandChannelCompleteL(aError, aSource); - __FLOG(_L8("SendDataCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPCOMMANDHANDLER_SENDDATACOMPLETEL_EXIT ); } @@ -110,9 +113,9 @@ */ void CPTPIPCommandHandler::ReceiveCommandRequestL(MMTPType& aRequest) { - __FLOG(_L8("ReceiveCommandDataL - Entry")); + OstTraceFunctionEntry0( CPTPIPCOMMANDHANDLER_RECEIVECOMMANDREQUESTL_ENTRY ); ReceiveDataL(aRequest); - __FLOG(_L8("ReceiveCommandDataL - Exit")); + OstTraceFunctionExit0( CPTPIPCOMMANDHANDLER_RECEIVECOMMANDREQUESTL_EXIT ); } /** @@ -123,9 +126,9 @@ */ void CPTPIPCommandHandler::ReceiveCommandDataL(MMTPType& aItoRData) { - __FLOG(_L8("ReceiveCommandDataL - Entry")); + OstTraceFunctionEntry0( CPTPIPCOMMANDHANDLER_RECEIVECOMMANDDATAL_ENTRY ); ReceiveDataL(aItoRData); - __FLOG(_L8("ReceiveCommandDataL - Exit")); + OstTraceFunctionExit0( CPTPIPCOMMANDHANDLER_RECEIVECOMMANDDATAL_EXIT ); } @@ -137,10 +140,9 @@ */ void CPTPIPCommandHandler::ReceiveDataCompleteL(TInt aError, MMTPType& aSink) { - __FLOG(_L8("ReceiveDataCompleteL - Entry")); - + OstTraceFunctionEntry0( CPTPIPCOMMANDHANDLER_RECEIVEDATACOMPLETEL_ENTRY ); Connection().ReceiveCommandChannelCompleteL(aError, aSink); - __FLOG(_L8("ReceiveDataCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPCOMMANDHANDLER_RECEIVEDATACOMPLETEL_EXIT ); } /** @@ -154,7 +156,7 @@ */ TInt CPTPIPCommandHandler::ParsePTPIPHeaderL() { - __FLOG(_L8("ValidateAndSetPayload - Entry")); + OstTraceFunctionEntry0( CPTPIPCOMMANDHANDLER_PARSEPTPIPHEADERL_ENTRY ); TUint32 type = 0; // If this is a request or event, then the first chunk will have 8 bytes @@ -168,8 +170,8 @@ { iPTPPacketLength = Connection().DataContainer()->Uint32L(CPTPIPDataContainer::EPacketLength); type = Connection().ValidateDataPacketL(); - } - __FLOG(_L8("ValidateAndSetPayload - Exit")); + } + OstTraceFunctionExit0( CPTPIPCOMMANDHANDLER_PARSEPTPIPHEADERL_EXIT ); return type; } @@ -180,5 +182,7 @@ */ TBool CPTPIPCommandHandler::HandleInitAck() { + OstTraceFunctionEntry0( CPTPIPCOMMANDHANDLER_HANDLEINITACK_ENTRY ); + OstTraceFunctionExit0( CPTPIPCOMMANDHANDLER_HANDLEINITACK_EXIT ); return EFalse; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/src/cptpipconnection.cpp --- a/mtptransports/mtpptpiptransport/ptpipplugin/src/cptpipconnection.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/src/cptpipconnection.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -27,15 +27,20 @@ #include // Plugin includes +#include "mtpdebug.h" #include "cptpipcommandhandler.h" #include "cptpipeventhandler.h" #include "cptpipconnection.h" -#include "ptpipsocketpublish.h" +#include "ptpipsocketpublish.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpipconnectionTraces.h" +#endif + // File type constants. const TInt KMTPNullChunkSize(0x00020000); // 100KB const TUint32 KPTPIPDataHeaderSize = 12; // Size of len, type and tran id. -__FLOG_STMT(_LIT8(KComponent,"PTPIPConnection");) #define UNUSED_VAR(a) (a) = (a) /** @@ -46,10 +51,12 @@ */ CPTPIPConnection* CPTPIPConnection::NewL(MMTPConnectionMgr& aConnectionMgr ) { + OstTraceFunctionEntry0( CPTPIPCONNECTION_NEWL_ENTRY ); CPTPIPConnection* self = new(ELeave) CPTPIPConnection(aConnectionMgr); CleanupStack::PushL (self ); self->ConstructL ( ); CleanupStack::Pop (self ); + OstTraceFunctionExit0( CPTPIPCONNECTION_NEWL_EXIT ); return self; } @@ -58,7 +65,7 @@ */ CPTPIPConnection::~CPTPIPConnection( ) { - __FLOG(_L8("Destructor - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_CPTPIPCONNECTION_ENTRY ); StopConnection ( ); // Delete all the handlers which will close the sockets. @@ -75,9 +82,7 @@ } iNullBuffer.Close(); - - __FLOG(_L8("Destructor - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CPTPIPCONNECTION_CPTPIPCONNECTION_EXIT ); } /** @@ -86,8 +91,7 @@ */ void CPTPIPConnection::ConstructL( ) { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_CONSTRUCTL_ENTRY ); // Construct the Command and event handlers iCommandHandler = CPTPIPCommandHandler::NewL (*this ); @@ -103,7 +107,7 @@ SetConnectionState (EInitialising ); CompleteSelf (KErrNone ); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_CONSTRUCTL_EXIT ); } /** @@ -113,7 +117,9 @@ CActive(EPriorityStandard), iConnectionMgr(&aConnectionMgr) { + OstTraceFunctionEntry0( DUP1_CPTPIPCONNECTION_CPTPIPCONNECTION_ENTRY ); CActiveScheduler::Add (this ); + OstTraceFunctionExit0( DUP1_CPTPIPCONNECTION_CPTPIPCONNECTION_EXIT ); } // @@ -127,9 +133,9 @@ */ void CPTPIPConnection::BindL(MMTPConnectionProtocol& aProtocol ) { - __FLOG(_L8("BindL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_BINDL_ENTRY ); iProtocolLayer = &aProtocol; - __FLOG(_L8("BindL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_BINDL_EXIT ); } /** @@ -138,9 +144,9 @@ */ MMTPConnectionProtocol& CPTPIPConnection::BoundProtocolLayer( ) { - __FLOG(_L8("BoundProtocolLayer - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_BOUNDPROTOCOLLAYER_ENTRY ); __ASSERT_ALWAYS(iProtocolLayer, Panic(EPTPIPBadState)); - __FLOG(_L8("BoundProtocolLayer - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_BOUNDPROTOCOLLAYER_EXIT ); return *iProtocolLayer; } @@ -150,9 +156,9 @@ */ void CPTPIPConnection::CloseConnection( ) { - __FLOG(_L8("CloseConnection - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_CLOSECONNECTION_ENTRY ); StopConnection ( ); - __FLOG(_L8("CloseConnection - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_CLOSECONNECTION_EXIT ); } /** @@ -161,8 +167,9 @@ */ void CPTPIPConnection::TransactionCompleteL(const TMTPTypeRequest& /*aRequest*/) { - __FLOG(_L8("TransactionCompleteL - Entry")); - __FLOG(_L8("******** Transaction Complete **************")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_TRANSACTIONCOMPLETEL_ENTRY ); + OstTrace0( TRACE_NORMAL, CPTPIPCONNECTION_TRANSACTIONCOMPLETEL, "******** Transaction Complete **************" ); + SetTransactionPhase (EIdlePhase ); // Clear the cancel flag. @@ -172,7 +179,7 @@ // Again start listening for the command request. InitiateCommandRequestPhaseL( ); - __FLOG(_L8("TransactionCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_TRANSACTIONCOMPLETEL_EXIT ); } /** @@ -181,11 +188,11 @@ */ void CPTPIPConnection::Unbind(MMTPConnectionProtocol& /*aProtocol*/) { - __FLOG(_L8("Unbind - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_UNBIND_ENTRY ); __ASSERT_DEBUG(iProtocolLayer, Panic(EPTPIPBadState)); // Protocol will no longer be bound to the transport iProtocolLayer = NULL; - __FLOG(_L8("Unbind - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_UNBIND_EXIT ); } /** @@ -193,6 +200,8 @@ */ TAny* CPTPIPConnection::GetExtendedInterface(TUid /*aInterfaceUid*/) { + OstTraceFunctionEntry0( CPTPIPCONNECTION_GETEXTENDEDINTERFACE_ENTRY ); + OstTraceFunctionExit0( CPTPIPCONNECTION_GETEXTENDEDINTERFACE_EXIT ); return NULL; } @@ -201,6 +210,8 @@ */ TUint CPTPIPConnection::GetImplementationUid() { + OstTraceFunctionEntry0( CPTPIPCONNECTION_GETIMPLEMENTATIONUID_ENTRY ); + OstTraceFunctionExit0( CPTPIPCONNECTION_GETIMPLEMENTATIONUID_EXIT ); return KMTPPTPIPTransportImplementationUid; } @@ -213,14 +224,14 @@ */ void CPTPIPConnection::DoCancel( ) { - __FLOG(_L8("DoCancel - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_DOCANCEL_ENTRY ); iCommandHandler->Cancel( ); iEventHandler->Cancel( ); SetConnectionState(ECancelled ); - __FLOG(_L8("DoCancel - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_DOCANCEL_EXIT ); } /** @@ -232,8 +243,9 @@ */ void CPTPIPConnection::RunL( ) { - __FLOG(_L8("RunL - Entry")); - __FLOG_VA((_L8("Current State is %d, and status is %d"), iState, iStatus.Int())); + OstTraceFunctionEntry0( CPTPIPCONNECTION_RUNL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CPTPIPCONNECTION_RUNL, "Current State is %d, and status is %d", iState, iStatus.Int() ); + if(iStatus != KErrNone ) { @@ -263,26 +275,25 @@ break; default: - __FLOG(_L8("PTPIP ERROR: Invalid connection state")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_RUNL, "PTPIP ERROR: Invalid connection state" ); + Panic(EPTPIPBadState ); break; } } - __FLOG(_L8("RunL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_RUNL_EXIT ); } /** Called when an error occurs in the RunL */ -#ifdef __FLOG_ACTIVE TInt CPTPIPConnection::RunError(TInt aError ) -#else -TInt CPTPIPConnection::RunError(TInt /*aError*/ ) -#endif { - __FLOG(_L8("RunError - Entry")); - __FLOG_VA((_L8("PTPIP ERROR: Error received is %d"), aError)); + OstTraceFunctionEntry0( CPTPIPCONNECTION_RUNERROR_ENTRY ); + + OstTrace1( TRACE_NORMAL, CPTPIPCONNECTION_RUNERROR, "PTPIP ERROR: Error received is %d", aError ); + // Cancel all the outstanding requests. Cancel( ); @@ -290,7 +301,7 @@ // Stop the connection, if necessary. StopConnection( ); - __FLOG(_L8("RunError - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_RUNERROR_EXIT ); return KErrNone; } @@ -305,8 +316,9 @@ */ void CPTPIPConnection::InitiateCommandRequestPhaseL( ) { - __FLOG(_L8("InitiateCommandRequestPhaseL - Entry")); - __FLOG(_L8("******** Phase 1 - Request **************")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_INITIATECOMMANDREQUESTPHASEL_ENTRY ); + OstTrace0( TRACE_NORMAL, CPTPIPCONNECTION_INITIATECOMMANDREQUESTPHASEL, "******** Phase 1 - Request **************" ); + // Set current state to request phase SetTransactionPhase(ERequestPhase ); @@ -318,7 +330,7 @@ // Call the CommandHandler to get the request in the container iCommandHandler->ReceiveCommandRequestL(*iPTPIPCommandContainer ); - __FLOG(_L8("InitiateCommandRequestPhaseL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_INITIATECOMMANDREQUESTPHASEL_EXIT ); } /** @@ -329,11 +341,12 @@ */ void CPTPIPConnection::ReceiveCommandCompleteL(TInt aError ) { - __FLOG(_L8("ReceiveCommandCompleteL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL_ENTRY ); if(KErrNone != aError ) { - __FLOG_VA((_L8("PTPIP Error: Received error=%d in request phase, closing connection"), aError)); + OstTrace1( TRACE_NORMAL, CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL, "PTPIP Error: Received error=%d in request phase, closing connection", aError ); + CloseConnection( ); } else if(ValidateTransactionPhase(ERequestPhase ) ) @@ -344,8 +357,8 @@ TUint16 op(pRequest->Uint16(TPTPIPTypeRequestPayload::EOpCode )); TUint32 tran(pRequest->Uint32(TPTPIPTypeRequestPayload::ETransactionId )); TUint32 sessionId = KMTPSessionNone; - __FLOG_VA((_L8("Command block received with op = 0x%04X ,transId = %d"), op, tran)); - + OstTraceExt2( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL, "Command block received with op = 0x%04X ,transId = %d", static_cast(op), tran ); + // Reset the iMTPRequest. iMTPRequest.Reset( ); @@ -356,11 +369,13 @@ // Set SessionID. if(op == EMTPOpCodeOpenSession ) { - __FLOG(_L8("Processing OpenSession request")); + OstTrace0( TRACE_NORMAL, DUP2_CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL, "Processing OpenSession request" ); + } else if(op == EMTPOpCodeCloseSession || op == EMTPOpCodeResetDevice ) { - __FLOG(_L8("Processing CloseSession or the ResetDevice request")); + OstTrace0( TRACE_NORMAL, DUP3_CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL, "Processing CloseSession or the ResetDevice request" ); + // Force CloseSession requests to be processed outside an active session. // ResetDevice currently behaves the same way as CloseSession. iMTPRequest.SetUint32(TMTPTypeRequest::ERequestParameter1, @@ -369,7 +384,8 @@ else { sessionId = iMTPSessionId; - __FLOG_VA((_L8("Processing general request on session %d"), sessionId)); + OstTrace1( TRACE_NORMAL, DUP4_CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL, "Processing general request on session %d", sessionId ); + } iMTPRequest.SetUint32(TMTPTypeRequest::ERequestSessionID,sessionId ); @@ -383,7 +399,7 @@ BoundProtocolLayer().ReceivedRequestL(iMTPRequest ); } - __FLOG(_L8("ReceiveCommandCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL_EXIT ); } /** @@ -392,7 +408,7 @@ */ void CPTPIPConnection::ReceiveCommandDataL(MMTPType& aData ) { - __FLOG(_L8("ReceiveCommandDataL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_RECEIVECOMMANDDATAL_ENTRY ); iRecvData = 0; iTotalRecvData = 0; @@ -405,7 +421,7 @@ iPTPIPDataContainer->SetPayloadL(&aData ); iCommandHandler->ReceiveCommandDataL(*iPTPIPCommandContainer ); - __FLOG(_L8("ReceiveCommandDataL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_RECEIVECOMMANDDATAL_EXIT ); } /** @@ -414,14 +430,14 @@ */ void CPTPIPConnection::ReceiveCommandDataCompleteL(TInt aError ) { - __FLOG(_L8("ReceiveCommandDataCompleteL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_RECEIVECOMMANDDATACOMPLETEL_ENTRY ); if(ValidateTransactionPhase(EDataIToRPhase ) ) { // Data block received, notify the protocol layer. iPTPIPDataContainer->SetUint32L(CPTPIPDataContainer::EPacketType, 0 ); BoundProtocolLayer().ReceiveDataCompleteL(aError, *iPTPIPDataContainer->Payload(), iMTPRequest ); } - __FLOG(_L8("ReceiveCommandDataCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_RECEIVECOMMANDDATACOMPLETEL_EXIT ); } /** @@ -431,12 +447,14 @@ void CPTPIPConnection::ReceiveCommandChannelCompleteL(TInt aError, MMTPType& /*aSource*/) { - __FLOG(_L8("ReceiveCommandChannelCompleteL - Entry")); - __FLOG(_L8("******** Receiving 1 ptpip packet on command/data channel complete **************")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL_ENTRY ); + OstTrace0( TRACE_NORMAL, CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL, "******** Receiving 1 ptpip packet on command/data channel complete **************" ); + HandleTCPError(aError ); TUint32 typeCommand = iPTPIPCommandContainer->Uint32L(CPTPIPGenericContainer::EPacketType ); TUint32 typeData = iPTPIPDataContainer->Uint32L(CPTPIPGenericContainer::EPacketType ); - __FLOG_VA((_L8("type on the command buffer is %d and type on the data buffer is %d"), typeCommand, typeData ) ); + OstTraceExt2( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL, "type on the command buffer is %d and type on the data buffer is %d", typeCommand, typeData ); + switch (typeCommand) @@ -454,7 +472,8 @@ { // Save the total data expected. iTotalRecvData =(static_cast(iPTPIPCommandContainer->Payload()))->Uint64(TPTPIPTypeStartDataPayload::ETotalSize ); - __FLOG_VA((_L8("Total data to receive in data phase is %ld"), iTotalRecvData)); + OstTrace1( TRACE_NORMAL, DUP2_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL, "Total data to receive in data phase is %ld", iTotalRecvData ); + //reset the command container iPTPIPCommandContainer->SetUint32L(CPTPIPGenericContainer::EPacketType, 0 ); @@ -489,15 +508,21 @@ } + OstTrace1( TRACE_NORMAL, DUP3_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL, "Data received so far in data phase is %ld", iRecvData ); - __FLOG_VA((_L8("Data received so far in data phase is %ld"), iRecvData)); if(iRecvData <= iTotalRecvData ) { iCommandHandler->ReceiveCommandDataL(*iPTPIPDataContainer ); } else { - __FLOG_VA((_L8("PTPIP ERROR: The data received so far= %ld is more than expected data = %ld "), iRecvData, iTotalRecvData)); + TBuf<8> recvData; + recvData.Num( iRecvData, EDecimal ); + TBuf<8> totalRecvData; + totalRecvData.Num( iTotalRecvData, EDecimal ); + OstTraceExt2( TRACE_NORMAL, DUP5_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL, "PTPIP ERROR: The data received so far= %S is more than expected data = %S", + recvData, totalRecvData ); + CloseConnection( ); } break; @@ -508,14 +533,20 @@ iCommandHandler->iUseOffset = EFalse; - __FLOG_VA((_L8("Data received so far in data phase is %ld"), iRecvData)); + OstTrace1( TRACE_NORMAL, DUP6_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL, "Data received so far in data phase is %ld", iRecvData ); + if(iTotalRecvData == iRecvData ) { ReceiveCommandDataCompleteL(aError ); } else { - __FLOG_VA((_L8("PTPIP ERROR: The data received so far= %ld is not equal to expected data = %ld "), iRecvData, iTotalRecvData)); + TBuf<8> recvData; + recvData.Num( iRecvData, EDecimal ); + TBuf<8> totalRecvData; + totalRecvData.Num( iTotalRecvData, EDecimal ); + OstTraceExt2( TRACE_NORMAL, DUP4_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL, "PTPIP ERROR: The data received so far= %S is not equal to expected data = %S", recvData, totalRecvData ); + CloseConnection( ); } break; @@ -530,13 +561,13 @@ break; default: - __FLOG_VA((_L8("PTPIP ERROR: Unexpected type received, data container = %d, command container =%d "), typeData, typeCommand)); + OstTraceExt2( TRACE_NORMAL, DUP7_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL, "PTPIP ERROR: Unexpected type received, data container = %d, command container =%d ", typeData, typeCommand ); CloseConnection( ); break; } // switch data } // switch command - __FLOG(_L8("ReceiveCommandChannelCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL_EXIT ); } /** @@ -544,11 +575,12 @@ */ void CPTPIPConnection::ReceiveDataL(MMTPType& aData, const TMTPTypeRequest& /*aRequest*/) { - __FLOG(_L8("ReceiveDataL - Entry")); - __FLOG(_L8("******** Phase 2 - Data I to R **************")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_RECEIVEDATAL_ENTRY ); + OstTrace0( TRACE_NORMAL, CPTPIPCONNECTION_RECEIVEDATAL, "******** Phase 2 - Data I to R **************" ); + SetTransactionPhase(EDataIToRPhase ); ReceiveCommandDataL(aData ); - __FLOG(_L8("ReceiveDataL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_RECEIVEDATAL_EXIT ); } /** @@ -556,10 +588,10 @@ */ void CPTPIPConnection::ReceiveDataCancelL(const TMTPTypeRequest& /*aRequest*/) { - __FLOG(_L8("ReceiveDataCancelL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_RECEIVEDATACANCELL_ENTRY ); iCommandHandler->CancelReceiveL(KErrCancel ); - __FLOG(_L8("ReceiveDataCancelL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_RECEIVEDATACANCELL_EXIT ); } /** @@ -568,7 +600,7 @@ */ void CPTPIPConnection::InitiateEventRequestPhaseL( ) { - __FLOG(_L8("InitiateEventRequestPhaseL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_INITIATEEVENTREQUESTPHASEL_ENTRY ); // Initialise the PTP buffers to get the data. iPTPIPEventPayload.Reset( ); @@ -578,7 +610,7 @@ // Call the EventHandler iEventHandler->ReceiveEventL(*iPTPIPEventContainer ); - __FLOG(_L8("InitiateEventRequestPhaseL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_INITIATEEVENTREQUESTPHASEL_EXIT ); } /** @@ -586,14 +618,16 @@ */ void CPTPIPConnection::ReceiveEventCompleteL(TInt aError, MMTPType& /*aSource*/) { - __FLOG(_L8("ReceiveEventCompleteL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL_ENTRY ); TUint32 type = iPTPIPEventContainer->Uint32L(CPTPIPGenericContainer::EPacketType ); - __FLOG_VA((_L8("Error value is %d and type is %d"), aError, type)); + OstTraceExt2( TRACE_NORMAL, CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL, "Error value is %d and type is %d", static_cast(aError), static_cast(type)); + if(KErrNone != aError ) { - __FLOG_VA((_L8("PTPIP Error: Received error=%d in request phase, closing connection"), aError)); + OstTrace1( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL, "PTPIP Error: Received error=%d in request phase, closing connection", aError ); + CloseConnection( ); } else @@ -601,7 +635,8 @@ // For a probe request, we just send a probe response and don't notify the MTP f/w. if( type == EPTPIPPacketTypeProbeRequest ) { - __FLOG(_L8("Received a probe request, sending back a probe response")); + OstTrace0( TRACE_NORMAL, DUP2_CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL, "Received a probe request, sending back a probe response" ); + // Send the response, iPTPIPEventContainer->SetPayloadL(NULL ); iPTPIPEventContainer->SetUint32L(CPTPIPGenericContainer::EPacketLength, iPTPIPEventContainer->Size( ) ); @@ -620,7 +655,9 @@ // Request block received. TPTPIPTypeResponsePayload* pEvent = static_cast(iPTPIPEventContainer->Payload()); TUint16 op(pEvent->Uint16(TPTPIPTypeResponsePayload::EResponseCode )); - __FLOG_VA((_L8("Event block 0x%04X received"), op)); + OstTrace1( TRACE_NORMAL, DUP3_CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL, "Event block 0x%04X received", op ); + + // Reset the iMTPRequest. iMTPEvent.Reset( ); @@ -640,11 +677,12 @@ // If unexpected data is received , its ignored in the release mode. else { - __FLOG(_L8("PTPIP ERROR : Unknown event type received, ignoring it.")); + OstTrace0( TRACE_NORMAL, DUP4_CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL, "PTPIP ERROR : Unknown event type received, ignoring it." ); + __ASSERT_DEBUG(type, Panic(EPTPIPBadState)); } } - __FLOG(_L8("ReceiveEventCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL_EXIT ); } // @@ -656,15 +694,16 @@ */ void CPTPIPConnection::SendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& aRequest ) { - __FLOG(_L8("SendResponseL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDRESPONSEL_ENTRY ); // Update the transaction state. SetTransactionPhase(EResponsePhase ); - __FLOG(_L8("******** Phase 3 - Response **************")); + OstTrace0( TRACE_NORMAL, CPTPIPCONNECTION_SENDRESPONSEL, "******** Phase 3 - Response **************" ); + if(iCancelOnCommandState ) { - __FLOG(_L8("Cancel has been received from initiator, so send own response")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_SENDRESPONSEL, "Cancel has been received from initiator, so send own response" ); SendCancelResponseL(aRequest.Uint32(TMTPTypeRequest::ERequestTransactionID )); } @@ -672,19 +711,22 @@ { TUint16 opCode(aRequest.Uint16(TMTPTypeRequest::ERequestOperationCode )); TUint16 rspCode(aResponse.Uint16(TMTPTypeResponse::EResponseCode )); - __FLOG_VA((_L8("ResponseCode = 0x%04X, Operation Code = 0x%04X"), rspCode, opCode)); + OstTraceExt2( TRACE_NORMAL, DUP2_CPTPIPCONNECTION_SENDRESPONSEL, "ResponseCode = 0x%04X, Operation Code = 0x%04X", rspCode, opCode ); + if((opCode == EMTPOpCodeOpenSession) &&(rspCode == EMTPRespCodeOK) ) { // An session has been opened. Record the active SessionID. iMTPSessionId = aRequest.Uint32(TMTPTypeRequest::ERequestParameter1 ); - __FLOG_VA((_L8("Processing OpenSession response, SessionID = %d"), iMTPSessionId)); + OstTrace1( TRACE_NORMAL, DUP3_CPTPIPCONNECTION_SENDRESPONSEL, "Processing OpenSession response, SessionID = %d", iMTPSessionId ); + } else if(((opCode == EMTPOpCodeCloseSession) || (opCode == EMTPOpCodeResetDevice))&&(rspCode == EMTPRespCodeOK) ) { // An session has been closed. Clear the active SessionID. - __FLOG_VA((_L8("Processing CloseSession or ResetDevice response, SessionID = %d"), iMTPSessionId)); + OstTrace1( TRACE_NORMAL, DUP4_CPTPIPCONNECTION_SENDRESPONSEL, "Processing CloseSession or ResetDevice response, SessionID = %d", iMTPSessionId ); + iMTPSessionId = KMTPSessionNone; } @@ -707,13 +749,14 @@ iPTPIPCommandContainer->SetUint32L( CPTPIPGenericContainer::EPacketType, EPTPIPPacketTypeOperationResponse ); // Initiate the command send sequence. - __FLOG_VA((_L8("Sending response 0x%04X(%d bytes)"), - iPTPIPResponsePayload.Uint16(TPTPIPTypeResponsePayload::EResponseCode), - iPTPIPCommandContainer->Uint32L(CPTPIPGenericContainer::EPacketLength))); + OstTraceExt2( TRACE_NORMAL, DUP5_CPTPIPCONNECTION_SENDRESPONSEL, "Sending response 0x%04X(%d bytes)", + static_cast(iPTPIPResponsePayload.Uint16(TPTPIPTypeResponsePayload::EResponseCode)), + iPTPIPCommandContainer->Uint32L(CPTPIPGenericContainer::EPacketLength)); + iCommandHandler->SendCommandL(*iPTPIPCommandContainer ); } - __FLOG(_L8("SendResponseL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDRESPONSEL_EXIT ); } /** @@ -721,8 +764,8 @@ */ void CPTPIPConnection::SendCommandCompleteL(TInt aError ) { + OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDCOMMANDCOMPLETEL_ENTRY ); - __FLOG(_L8("SendCommandCompleteL - Entry")); if(ValidateTransactionPhase(EResponsePhase ) ) { @@ -730,7 +773,7 @@ *static_cast(iPTPIPCommandContainer->Payload()), iMTPRequest ); } - __FLOG(_L8("SendCommandCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDCOMMANDCOMPLETEL_EXIT ); } /** @@ -738,7 +781,7 @@ */ void CPTPIPConnection::SendCommandDataCompleteL(TInt aError ) { - __FLOG(_L8("SendCommandDataCompleteL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDCOMMANDDATACOMPLETEL_ENTRY ); if(ValidateTransactionPhase(EDataRToIPhase ) ) { @@ -747,7 +790,7 @@ SetConnectionState(EDataSendFinished); iPTPIPDataContainer->SetPayloadL(NULL ); - __FLOG(_L8("SendCommandDataCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDCOMMANDDATACOMPLETEL_EXIT ); } /** @@ -756,12 +799,13 @@ */ void CPTPIPConnection::SendCommandChannelCompleteL(TInt aError, const MMTPType& /*aSource*/) { - __FLOG(_L8("SendCommandChannelCompleteL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDCOMMANDCHANNELCOMPLETEL_ENTRY ); // Now see whether we have completed getting data or commands, and call the appropriate function. TUint typeCommand = iPTPIPCommandContainer->Uint32L(CPTPIPGenericContainer::EPacketType ); TUint typeData = iPTPIPDataContainer->Uint32L(CPTPIPGenericContainer::EPacketType ); - __FLOG_VA((_L8("type on the command buffer is %d and type on the data buffer is %d"), typeCommand, typeData ) ); + OstTraceExt2( TRACE_NORMAL, CPTPIPCONNECTION_SENDCOMMANDCHANNELCOMPLETEL, "type on the command buffer is %d and type on the data buffer is %d", typeCommand, typeData ); + // if we have received a cancel on the event channel then terminate the current sending @@ -806,11 +850,12 @@ // Any other type indicates a programming error, and a panic is raised. else { - __FLOG_VA((_L8("PTPIP ERROR: Unexpected type in sent data, type = = %d, command =%d "), typeData, typeCommand)); + OstTraceExt2( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_SENDCOMMANDCHANNELCOMPLETEL, "PTPIP ERROR: Unexpected type in sent data, type = = %d, command =%d", typeData, typeCommand ); + Panic(EPTPIPBadState ); } - __FLOG(_L8("SendCommandChannelCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDCOMMANDCHANNELCOMPLETEL_EXIT ); } /** @@ -818,9 +863,10 @@ */ void CPTPIPConnection::SendDataL(const MMTPType& aData, const TMTPTypeRequest& aRequest ) { - __FLOG(_L8("SendDataL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDDATAL_ENTRY ); - __FLOG(_L8("******** Phase 2 - Data R to I **************")); + OstTrace0( TRACE_NORMAL, CPTPIPCONNECTION_SENDDATAL, "******** Phase 2 - Data R to I **************" ); + SetTransactionPhase(EDataRToIPhase ); SetConnectionState(EDataSendInProgress ); @@ -845,7 +891,7 @@ // actual data in the next packet, which has been saved in the dataContainer. SendStartDataPacketL( ); - __FLOG(_L8("SendDataL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDDATAL_EXIT ); } /** @@ -855,11 +901,11 @@ */ void CPTPIPConnection::SendStartDataPacketL( ) { - __FLOG(_L8("SendStartDataPacketL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDSTARTDATAPACKETL_ENTRY ); SetConnectionState(EDataSendInProgress ); iCommandHandler->SendCommandL(*iPTPIPCommandContainer ); - __FLOG(_L8("SendStartDataPacketL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDSTARTDATAPACKETL_EXIT ); } /** @@ -867,7 +913,7 @@ */ void CPTPIPConnection::SendDataPacketL( ) { - __FLOG(_L8("SendDataPacketL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDDATAPACKETL_ENTRY ); MMTPType* payLoad = iPTPIPDataContainer->Payload(); @@ -896,7 +942,7 @@ iCommandHandler->SendCommandDataL(*iPTPIPDataContainer, iPTPIPDataContainer->Uint32L(TMTPTypeRequest::ERequestTransactionID ) ); } - __FLOG(_L8("SendDataPacketL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDDATAPACKETL_EXIT ); } /** @@ -904,9 +950,9 @@ */ void CPTPIPConnection::SendDataCancelL(const TMTPTypeRequest& /*aRequest*/) { - __FLOG(_L8("SendDataCancelL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDDATACANCELL_ENTRY ); iCommandHandler->CancelSendL(KErrCancel ); - __FLOG(_L8("SendDataCancelL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDDATACANCELL_EXIT ); } /** @@ -914,7 +960,7 @@ */ void CPTPIPConnection::SendEventL(const TMTPTypeEvent& aEvent ) { - __FLOG(_L8("SendEventL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDEVENTL_ENTRY ); // Reset the event. iMTPEvent.Reset(); @@ -922,7 +968,8 @@ TUint16 opCode(aEvent.Uint16(TMTPTypeEvent::EEventCode )); TUint32 tran(aEvent.Uint32(TMTPTypeEvent::EEventTransactionID )); - __FLOG_VA((_L8(" Sending event with Operation Code = 0x%04X and tran id = %d"), opCode, tran )); + OstTraceExt2( TRACE_NORMAL, CPTPIPCONNECTION_SENDEVENTL, "Sending event with Operation Code = 0x%04X and tran id = %d", static_cast(opCode), tran ); + TBool isNullParamValid = EFalse; TUint numberOfNullParam = 0; @@ -941,12 +988,13 @@ iPTPIPEventContainer->SetUint32L(CPTPIPGenericContainer::EPacketType, EPTPIPPacketTypeEvent ); // Initiate the event send sequence. - __FLOG_VA((_L8("Sending response 0x%04X(%d bytes)"), - iPTPIPEventPayload.Uint16(TPTPIPTypeResponsePayload::EResponseCode), - iPTPIPEventContainer->Uint32L(CPTPIPGenericContainer::EPacketLength))); + OstTraceExt2( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_SENDEVENTL, "Sending response 0x%04X(%d bytes)", + static_cast(iPTPIPEventPayload.Uint16(TPTPIPTypeResponsePayload::EResponseCode)), + iPTPIPEventContainer->Uint32L(CPTPIPGenericContainer::EPacketLength)); + iEventHandler->SendEventL(*iPTPIPEventContainer ); - __FLOG(_L8("SendEventL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDEVENTL_EXIT ); } /** @@ -954,7 +1002,7 @@ */ void CPTPIPConnection::SendEventCompleteL(TInt aError, const MMTPType& /*aSource*/) { - __FLOG(_L8("SendEventCompleteL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDEVENTCOMPLETEL_ENTRY ); TUint type = iPTPIPEventContainer->Uint32L(CPTPIPGenericContainer::EPacketType ); // Notify the fw that event was sent. @@ -969,19 +1017,20 @@ else if(type == EPTPIPPacketTypeProbeResponse ) { - __FLOG(_L8("Probe response was sent successfully")); + OstTrace0( TRACE_NORMAL, CPTPIPCONNECTION_SENDEVENTCOMPLETEL, "Probe response was sent successfully" ); } else { // If unexpected data was sent , it is ignored in the release mode. - __FLOG(_L8("PTPIP ERROR: An invalid send event completion signalled")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_SENDEVENTCOMPLETEL, "PTPIP ERROR: An invalid send event completion signalled" ); + __ASSERT_DEBUG(type, Panic(EPTPIPBadState)); } #endif // Restart listening for events InitiateEventRequestPhaseL( ); - __FLOG(_L8("SendEventCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDEVENTCOMPLETEL_EXIT ); } // @@ -995,8 +1044,9 @@ */ void CPTPIPConnection::HandleEventCancelL( ) { - __FLOG(_L8("HandleEventCancelL - Entry")); - __FLOG_VA((_L8("iCancelOnCommandState = 0x%04X, and iCancelOnEventState = 0x%04X"), iCancelOnCommandState, iCancelOnEventState)); + OstTraceFunctionEntry0( CPTPIPCONNECTION_HANDLEEVENTCANCELL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CPTPIPCONNECTION_HANDLEEVENTCANCELL, "iCancelOnCommandState = 0x%04X, and iCancelOnEventState = 0x%04X", iCancelOnCommandState, iCancelOnEventState ); + // Check whether the cancel has already been received on the command channel. // If so then we can simply ignore this on the event channel. @@ -1041,7 +1091,8 @@ case EResponsePhase: case ERequestPhase: default: - __FLOG(_L8(" Cancel received on event channel during a non data phase, ignoring, as this will be handled when its received on command channel.")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_HANDLEEVENTCANCELL, "Cancel received on event channel during a non data phase, ignoring, as this will be handled when its received on command channel." ); + iCancelOnEventState = ECancelEvtHandled; break; }// end of switch for transaction phase. @@ -1050,7 +1101,7 @@ default: break; } - __FLOG(_L8("HandleEventCancelL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_HANDLEEVENTCANCELL_EXIT ); } /** @@ -1060,17 +1111,18 @@ */ void CPTPIPConnection::HandleCommandCancelL(TUint32 aTransId ) { - __FLOG(_L8("HandleCommandCancelL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_HANDLECOMMANDCANCELL_ENTRY ); switch(iTransactionState ) { case ERequestPhase: - __FLOG(_L8(" Cancel received during the request phase before the request packet, ignoring.")); + OstTrace0( TRACE_NORMAL, CPTPIPCONNECTION_HANDLECOMMANDCANCELL, "Cancel received during the request phase before the request packet, ignoring." ); + iCancelOnCommandState = ECancelCmdHandled; if (iCancelOnEventState == ECancelNotReceived) { // Wait for it to be received on event - __FLOG(_L8("Awaiting cancel on the event channel.")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_HANDLECOMMANDCANCELL, "Awaiting cancel on the event channel." ); } else { @@ -1096,7 +1148,7 @@ if (iCancelOnEventState == ECancelNotReceived) { // Wait for it to be received on event - __FLOG(_L8("Awaiting cancel on the event channel.")); + OstTrace0( TRACE_NORMAL, DUP2_CPTPIPCONNECTION_HANDLECOMMANDCANCELL, "Awaiting cancel on the event channel." ); } else { @@ -1106,13 +1158,13 @@ break; }// switch - __FLOG(_L8("HandleCommandCancelL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_HANDLECOMMANDCANCELL_EXIT ); } void CPTPIPConnection::HandleCancelDuringSendL() { - __FLOG(_L8("HandleCancelDuringSendL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_HANDLECANCELDURINGSENDL_ENTRY ); iCommandHandler->Cancel( ); // Now start listening for the cancel on command channel. iPTPIPDataContainer->SetUint32L(CPTPIPDataContainer::EPacketType, 0 ); @@ -1120,7 +1172,7 @@ iPTPIPCommandCancelPayload.Set(0 ); iPTPIPCommandContainer->SetPayloadL(&iPTPIPCommandCancelPayload ); iCommandHandler->ReceiveCommandRequestL(*iPTPIPCommandContainer ); - __FLOG(_L8("HandleCancelDuringSendL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_HANDLECANCELDURINGSENDL_EXIT ); } /** @@ -1128,12 +1180,13 @@ */ void CPTPIPConnection::HandleCommandCancelCompleteL( ) { - __FLOG(_L8("HandleCommandCancelCompleteL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_HANDLECOMMANDCANCELCOMPLETEL_ENTRY ); //now cancel handling is complete. if((ECancelCmdHandled == iCancelOnCommandState) &&(ECancelEvtHandled == iCancelOnEventState) ) { - __FLOG(_L8("Completed handling cancel on both channels. ")); + OstTrace0( TRACE_NORMAL, CPTPIPCONNECTION_HANDLECOMMANDCANCELCOMPLETEL, "Completed handling cancel on both channels." ); + // Cancel has already been received and handled on the command channel // ignore the cancel on event channel and reset the state to none, // and start listening for the next transaction. @@ -1145,9 +1198,10 @@ // if the cancel has not been received yet on event, we wait for it. else if(ECancelEvtHandled != iCancelOnEventState ) { - __FLOG(_L8("Waiting for the cancel on the event channel. ")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_HANDLECOMMANDCANCELCOMPLETEL, "Waiting for the cancel on the event channel. " ); + } - __FLOG(_L8("HandleCommandCancelCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_HANDLECOMMANDCANCELCOMPLETEL_EXIT ); } /** @@ -1155,7 +1209,7 @@ */ void CPTPIPConnection::SendCancelToFrameworkL(TUint32 aTransId ) { - __FLOG(_L8("SendCancelToFramework - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDCANCELTOFRAMEWORKL_ENTRY ); // Setup the MTP request dataset buffer. Set Operation Code and TransactionID iMTPEvent.Reset( ); @@ -1164,7 +1218,7 @@ iMTPEvent.SetUint32(TMTPTypeEvent::EEventTransactionID, aTransId ); BoundProtocolLayer().ReceivedEventL(iMTPEvent ); - __FLOG(_L8("SendCancelToFramework - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDCANCELTOFRAMEWORKL_EXIT ); } /** @@ -1172,7 +1226,7 @@ */ void CPTPIPConnection::SendCancelResponseL(TUint32 aTransId ) { - __FLOG(_L8("SendCancelResponse - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDCANCELRESPONSEL_ENTRY ); iPTPIPResponsePayload.Reset( ); iPTPIPResponsePayload.SetUint16(TPTPIPTypeResponsePayload::EResponseCode, EMTPRespCodeTransactionCancelled ); iPTPIPResponsePayload.SetUint32(TPTPIPTypeResponsePayload::ETransactionId, aTransId ); @@ -1183,11 +1237,12 @@ iPTPIPCommandContainer->SetUint32L(CPTPIPGenericContainer::EPacketType, EPTPIPPacketTypeOperationResponse ); // Initiate the command send sequence. - __FLOG_VA((_L8("Sending response 0x%04X(%d bytes)"), - iPTPIPResponsePayload.Uint16(TPTPIPTypeResponsePayload::EResponseCode), - iPTPIPCommandContainer->Uint32L(CPTPIPGenericContainer::EPacketLength))); + OstTraceExt2( TRACE_NORMAL, CPTPIPCONNECTION_SENDCANCELRESPONSEL, "Sending response 0x%04X(%d bytes)", + static_cast(iPTPIPResponsePayload.Uint16(TPTPIPTypeResponsePayload::EResponseCode)), + iPTPIPCommandContainer->Uint32L(CPTPIPGenericContainer::EPacketLength)); + iCommandHandler->SendCommandL(*iPTPIPCommandContainer ); - __FLOG(_L8("SendCancelResponse - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDCANCELRESPONSEL_EXIT ); } /** @@ -1197,14 +1252,14 @@ */ void CPTPIPConnection::SetNULLPacketL() { - __FLOG(_L8("SetNULLPacketL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SETNULLPACKETL_ENTRY ); // Setup the bulk container and initiate the bulk data receive sequence. iNullBuffer.Close(); iNullBuffer.CreateL(KMTPNullChunkSize); iNullBuffer.SetLength(KMTPNullChunkSize); iNull.SetBuffer(iNullBuffer); iPTPIPDataContainer->SetPayloadL(&iNull); - __FLOG(_L8("SetNULLPacketL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SETNULLPACKETL_EXIT ); } // @@ -1220,31 +1275,44 @@ */ void CPTPIPConnection::TransferSocketsL( ) { +OstTraceFunctionEntry0( CPTPIPCONNECTION_TRANSFERSOCKETSL_ENTRY ); - __FLOG(_L8("TransferSocketsL - Entry")); TName evtsockname, cmdsockname; TUid propertyUid=iConnectionMgr->ClientSId(); - User::LeaveIfError(RProperty::Get(propertyUid, ECommandSocketName, cmdsockname )); - User::LeaveIfError(RProperty::Get(propertyUid, EEventSocketName, evtsockname )); + TInt err = RProperty::Get(propertyUid, ECommandSocketName, cmdsockname ); + LEAVEIFERROR(err, + OstTrace1( TRACE_ERROR, DUP1_CPTPIPCONNECTION_TRANSFERSOCKETSL, "error code is %d", err )); + + err = RProperty::Get(propertyUid, EEventSocketName, evtsockname ); + LEAVEIFERROR(err, + OstTrace1( TRACE_ERROR, DUP2_CPTPIPCONNECTION_TRANSFERSOCKETSL, "error code is %d", err )); RSocketServ serversocket; - TInt err=serversocket.Connect( ); - __FLOG_VA((_L8("Connected to socketServer with %d code"), err) ); + err=serversocket.Connect( ); + OstTrace1( TRACE_NORMAL, CPTPIPCONNECTION_TRANSFERSOCKETSL, "Connected to socketServer with %d code", err ); + if (KErrNone == err) { - User::LeaveIfError(iCommandHandler->Socket().Open(serversocket )); - User::LeaveIfError(iEventHandler->Socket().Open(serversocket )); - - User::LeaveIfError(err=iCommandHandler->Socket().Transfer(serversocket, cmdsockname )); - User::LeaveIfError(err=iEventHandler->Socket().Transfer(serversocket, evtsockname )); + err = iCommandHandler->Socket().Open(serversocket ); + LEAVEIFERROR(err, + OstTrace1( TRACE_ERROR, DUP3_CPTPIPCONNECTION_TRANSFERSOCKETSL, "error code is %d", err )); + err = iEventHandler->Socket().Open(serversocket ); + LEAVEIFERROR(err, + OstTrace1( TRACE_ERROR, DUP4_CPTPIPCONNECTION_TRANSFERSOCKETSL, "error code is %d", err )); + err=iCommandHandler->Socket().Transfer(serversocket, cmdsockname ); + LEAVEIFERROR(err, + OstTrace1( TRACE_ERROR, DUP5_CPTPIPCONNECTION_TRANSFERSOCKETSL, "error code is %d", err )); + err=iEventHandler->Socket().Transfer(serversocket, evtsockname ); + LEAVEIFERROR(err, + OstTrace1( TRACE_ERROR, DUP6_CPTPIPCONNECTION_TRANSFERSOCKETSL, "error code is %d", err )); } iCommandHandler->SetSocketOptions(); iEventHandler->SetSocketOptions(); - __FLOG(_L8("TransferSocketsL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_TRANSFERSOCKETSL_EXIT ); } @@ -1263,8 +1331,7 @@ */ void CPTPIPConnection::SendInitAckL( ) { - - __FLOG(_L8("SendInitAckL - Entry")); +OstTraceFunctionEntry0( CPTPIPCONNECTION_SENDINITACKL_ENTRY ); iPTPIPEventContainer->SetPayloadL(NULL ); iPTPIPEventContainer->SetUint32L(TPTPIPInitEvtAck::ELength, iPTPIPEventContainer->Size( ) ); @@ -1273,7 +1340,7 @@ // Send the packet iEventHandler->SendInitAck(iPTPIPEventContainer ); - __FLOG(_L8("SendInitAckL - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_SENDINITACKL_EXIT ); } /** @@ -1287,47 +1354,48 @@ */ void CPTPIPConnection::StopConnection( ) { - __FLOG(_L8("StopConnection - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_STOPCONNECTION_ENTRY ); if(ConnectionOpen( ) ) { - __FLOG(_L8("Stopping socket handlers")); + OstTrace0( TRACE_NORMAL, CPTPIPCONNECTION_STOPCONNECTION, "Stopping socket handlers" ); + iEventHandler->Cancel( ); iCommandHandler->Cancel( ); if(iTransactionState == EDataIToRPhase ) { - __FLOG(_L8("Aborting active I to R data phase")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_STOPCONNECTION, "Aborting active I to R data phase" ); + TRAPD(err, BoundProtocolLayer().ReceiveDataCompleteL(KErrAbort, *iPTPIPDataContainer->Payload(), iMTPRequest)); UNUSED_VAR(err); } else if(iTransactionState == EDataRToIPhase ) { - __FLOG(_L8("Aborting active R to I data phase")); + OstTrace0( TRACE_NORMAL, DUP2_CPTPIPCONNECTION_STOPCONNECTION, "Aborting active R to I data phase" ); + TRAPD(err, BoundProtocolLayer().SendDataCompleteL(KErrAbort, *iPTPIPDataContainer->Payload(), iMTPRequest)) ; UNUSED_VAR(err); } - - __FLOG(_L8("Notifying protocol layer connection closed")); + OstTrace0( TRACE_NORMAL, DUP3_CPTPIPCONNECTION_STOPCONNECTION, "Notifying protocol layer connection closed" ); + iConnectionMgr->ConnectionClosed(*this ); SetTransactionPhase(EUndefined ); SetConnectionState(EIdle ); } - - __FLOG(_L8("StopConnection - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_STOPCONNECTION_EXIT ); } /** * Invoked by the SocketHandler when there is an error. */ -#ifdef __FLOG_ACTIVE void CPTPIPConnection::HandleError(TInt aError) -#else -void CPTPIPConnection::HandleError(TInt /*aError*/) -#endif { - __FLOG_VA((_L8("SocketHandler received an error=%d, stopping connection.)"),aError)); + OstTraceFunctionEntry0( CPTPIPCONNECTION_HANDLEERROR_ENTRY ); + OstTrace1( TRACE_NORMAL, CPTPIPCONNECTION_HANDLEERROR, "SocketHandler received an error=%d, stopping connection.", aError ); + StopConnection(); + OstTraceFunctionExit0( CPTPIPCONNECTION_HANDLEERROR_EXIT ); } /** @@ -1337,12 +1405,14 @@ */ void CPTPIPConnection::CompleteSelf(TInt aCompletionCode ) { + OstTraceFunctionEntry0( CPTPIPCONNECTION_COMPLETESELF_ENTRY ); // Setting ourselves active to wait to be done by ASP. SetActive( ); // Simulating a fake ASP which completes us. TRequestStatus* stat = &iStatus; User::RequestComplete(stat, aCompletionCode ); + OstTraceFunctionExit0( CPTPIPCONNECTION_COMPLETESELF_EXIT ); } /** @@ -1350,10 +1420,11 @@ */ void CPTPIPConnection::SetTransactionPhase(TMTPTransactionPhase aPhase ) { - __FLOG(_L8("SetTransactionPhase - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SETTRANSACTIONPHASE_ENTRY ); iTransactionState = aPhase; - __FLOG_VA((_L8("Transaction Phase set to 0x%08X"), iTransactionState)); - __FLOG(_L8("SetTransactionPhase - Exit")); + OstTrace1( TRACE_NORMAL, CPTPIPCONNECTION_SETTRANSACTIONPHASE, "Transaction Phase set to 0x%08X", iTransactionState ); + + OstTraceFunctionExit0( CPTPIPCONNECTION_SETTRANSACTIONPHASE_EXIT ); } /** @@ -1361,10 +1432,11 @@ */ void CPTPIPConnection::SetConnectionState(TConnectionState aState ) { - __FLOG(_L8("SetConnectionState - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_SETCONNECTIONSTATE_ENTRY ); iState = aState; - __FLOG_VA((_L8("Connection state set to 0x%08X"), iState)); - __FLOG(_L8("SetConnectionState - Exit")); + OstTrace1( TRACE_NORMAL, CPTPIPCONNECTION_SETCONNECTIONSTATE, "Connection state set to 0x%08X", iState ); + + OstTraceFunctionExit0( CPTPIPCONNECTION_SETCONNECTIONSTATE_EXIT ); } /** @@ -1372,6 +1444,8 @@ */ TBool CPTPIPConnection::ConnectionOpen( ) const { + OstTraceFunctionEntry0( CPTPIPCONNECTION_CONNECTIONOPEN_ENTRY ); + OstTraceFunctionExit0( CPTPIPCONNECTION_CONNECTIONOPEN_EXIT ); return((iState >= EInitialising) && (iState <= EDataSendFinished)); } @@ -1380,6 +1454,8 @@ */ CPTPIPGenericContainer* CPTPIPConnection::CommandContainer( ) { + OstTraceFunctionEntry0( CPTPIPCONNECTION_COMMANDCONTAINER_ENTRY ); + OstTraceFunctionExit0( CPTPIPCONNECTION_COMMANDCONTAINER_EXIT ); return iPTPIPCommandContainer; } @@ -1388,6 +1464,8 @@ */ CPTPIPGenericContainer* CPTPIPConnection::EventContainer( ) { + OstTraceFunctionEntry0( CPTPIPCONNECTION_EVENTCONTAINER_ENTRY ); + OstTraceFunctionExit0( CPTPIPCONNECTION_EVENTCONTAINER_EXIT ); return iPTPIPEventContainer; } @@ -1396,6 +1474,8 @@ */ CPTPIPDataContainer* CPTPIPConnection::DataContainer( ) { + OstTraceFunctionEntry0( CPTPIPCONNECTION_DATACONTAINER_ENTRY ); + OstTraceFunctionExit0( CPTPIPCONNECTION_DATACONTAINER_EXIT ); return iPTPIPDataContainer; } @@ -1404,6 +1484,8 @@ */ TMTPTransactionPhase CPTPIPConnection::TransactionPhase( ) const { + OstTraceFunctionEntry0( CPTPIPCONNECTION_TRANSACTIONPHASE_ENTRY ); + OstTraceFunctionExit0( CPTPIPCONNECTION_TRANSACTIONPHASE_EXIT ); return iTransactionState; } @@ -1417,18 +1499,20 @@ */ TUint32 CPTPIPConnection::ValidateAndSetCommandPayloadL( ) { - __FLOG(_L8("ValidateAndSetCommandPayload - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL_ENTRY ); TUint32 containerType = CommandContainer()->Uint32L(CPTPIPGenericContainer::EPacketType ); - __FLOG_VA((_L8("PTP packet type = %d, adjust payload accordingly"), containerType)); + OstTrace1( TRACE_NORMAL, CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL, "PTP packet type = %d, adjust payload accordingly", containerType ); + switch(containerType ) { case EPTPIPPacketTypeOperationRequest: if (!ValidateTransactionPhase(ERequestPhase )) { - __FLOG(_L8("PTPIP ERROR: Request data unexpected in this phase, setting type to undefined")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL, "PTPIP ERROR: Request data unexpected in this phase, setting type to undefined" ); + containerType = EPTPIPPacketTypeUndefined; } // Nothing to do , the payload is already set. In case this is unexpected, @@ -1438,7 +1522,8 @@ case EPTPIPPacketTypeStartData: if (!ValidateTransactionPhase(EDataIToRPhase )) { - __FLOG(_L8("PTPIP ERROR: Start data unexpected in this phase, setting type to undefined")); + OstTrace0( TRACE_NORMAL, DUP2_CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL, "PTPIP ERROR: Start data unexpected in this phase, setting type to undefined" ); + containerType = EPTPIPPacketTypeUndefined; } // Nothing to do , the payload is already set. In case this is unexpected, @@ -1460,7 +1545,8 @@ break; case EPTPIPPacketTypeOperationResponse: - __FLOG(_L8("PTPIP ERROR: Response not expected from the initiator, setting type to undefined")); + OstTrace0( TRACE_NORMAL, DUP3_CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL, "PTPIP ERROR: Response not expected from the initiator, setting type to undefined" ); + containerType = EPTPIPPacketTypeUndefined; // As per the protocol, the initiator cannot send a response, // only the responder( here device) will create a response, @@ -1469,12 +1555,13 @@ default: - __FLOG_VA((_L8("PTPIP ERROR: Invalid packet type received %d )"), containerType)); + OstTrace1( TRACE_NORMAL, DUP4_CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL, "PTPIP ERROR: Invalid packet type received %d", containerType ); + containerType = EPTPIPPacketTypeUndefined; break; } - __FLOG(_L8("ValidateAndSetCommandPayload - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL_EXIT ); return containerType; } @@ -1488,10 +1575,11 @@ */ TUint32 CPTPIPConnection::ValidateDataPacketL( ) { - __FLOG(_L8("ValidateDataPacketL - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_VALIDATEDATAPACKETL_ENTRY ); TUint32 containerType = DataContainer()->Uint32L(CPTPIPDataContainer::EPacketType ); - __FLOG_VA((_L8("PTP data packet type = %d, "), containerType)); + OstTrace1( TRACE_NORMAL, CPTPIPCONNECTION_VALIDATEDATAPACKETL, "PTP data packet type = %d", containerType ); + switch(containerType ) { @@ -1499,18 +1587,20 @@ case EPTPIPPacketTypeEndData: if (!ValidateTransactionPhase(EDataIToRPhase )) { - __FLOG(_L8("PTPIP ERROR: Receiving data unexpected in this phase, setting type to undefined")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_VALIDATEDATAPACKETL, "PTPIP ERROR: Receiving data unexpected in this phase, setting type to undefined" ); + containerType = EPTPIPPacketTypeUndefined; } break; default: - __FLOG_VA((_L8("PTPIP ERROR: Unexpected or Invalid packet type received while expecting data packet%d )"), containerType)); + OstTrace1( TRACE_NORMAL, DUP2_CPTPIPCONNECTION_VALIDATEDATAPACKETL, "PTPIP ERROR: Unexpected or Invalid packet type received while expecting data packet%d ", containerType ); + containerType = EPTPIPPacketTypeUndefined; break; } - __FLOG(_L8("ValidateDataPacket - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_VALIDATEDATAPACKETL_EXIT ); return containerType; } @@ -1524,10 +1614,11 @@ */ TUint32 CPTPIPConnection::ValidateAndSetEventPayloadL( ) { - __FLOG(_L8("ValidateAndSetEventPayload - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_VALIDATEANDSETEVENTPAYLOADL_ENTRY ); TUint32 containerType = EventContainer()->Uint32L(CPTPIPGenericContainer::EPacketType ); - __FLOG_VA((_L8("PTP event packet type = %d, adjust payload accordingly"), containerType)); + OstTrace1( TRACE_NORMAL, CPTPIPCONNECTION_VALIDATEANDSETEVENTPAYLOADL, "PTP event packet type = %d, adjust payload accordingly", containerType ); + switch(containerType ) { @@ -1544,12 +1635,13 @@ break; default: - __FLOG_VA((_L8("PTPIP ERROR: Invalid packet type received %d )"), containerType)); + OstTrace1( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_VALIDATEANDSETEVENTPAYLOADL, "PTPIP ERROR: Invalid packet type received %d", containerType ); + containerType = EPTPIPPacketTypeUndefined; break; } - __FLOG(_L8("ValidateAndSetEventPayload - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_VALIDATEANDSETEVENTPAYLOADL_EXIT ); return containerType; } @@ -1562,16 +1654,18 @@ TBool CPTPIPConnection::ValidateTransactionPhase( TMTPTransactionPhase aExpectedTransactionState ) { - __FLOG(_L8("ValidateTransactionPhase - Entry")); - __FLOG_VA((_L8("transaction state = %d"), iTransactionState)); + OstTraceFunctionEntry0( CPTPIPCONNECTION_VALIDATETRANSACTIONPHASE_ENTRY ); + OstTrace1( TRACE_NORMAL, CPTPIPCONNECTION_VALIDATETRANSACTIONPHASE, "transaction state = %d", iTransactionState ); + TBool valid(iTransactionState == aExpectedTransactionState); if(!valid ) { // Invalid transaction state, close the connection. - __FLOG_VA((_L8("PTPIP ERROR: invalid transaction state, current = %d, expected = %d"), iTransactionState, aExpectedTransactionState)); + OstTraceExt2( TRACE_NORMAL, DUP1_CPTPIPCONNECTION_VALIDATETRANSACTIONPHASE, "PTPIP ERROR: invalid transaction state, current = %d, expected = %d", iTransactionState, aExpectedTransactionState ); + CloseConnection( ); } - __FLOG(_L8("ValidateTransactionPhase - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_VALIDATETRANSACTIONPHASE_EXIT ); return valid; } @@ -1581,7 +1675,7 @@ */ TBool CPTPIPConnection::HandleTCPError(TInt& aError ) { - __FLOG(_L8("TCPErrorHandled - Entry")); + OstTraceFunctionEntry0( CPTPIPCONNECTION_HANDLETCPERROR_ENTRY ); TInt ret(EFalse); if(aError == KErrDisconnected || aError == KErrEof) { @@ -1589,13 +1683,15 @@ CloseConnection( ); ret = ETrue; } - __FLOG(_L8("TCPErrorHandled - Exit")); + OstTraceFunctionExit0( CPTPIPCONNECTION_HANDLETCPERROR_EXIT ); return ret; } void CPTPIPConnection::SetDataTypeInDataContainerL(TPTPIPPacketTypeCode aType ) { + OstTraceFunctionEntry0( CPTPIPCONNECTION_SETDATATYPEINDATACONTAINERL_ENTRY ); iPTPIPDataContainer->SetUint32L(CPTPIPDataContainer::EPacketType, aType ); + OstTraceFunctionExit0( CPTPIPCONNECTION_SETDATATYPEINDATACONTAINERL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/src/cptpipeventhandler.cpp --- a/mtptransports/mtpptpiptransport/ptpipplugin/src/cptpipeventhandler.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/src/cptpipeventhandler.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,23 +22,24 @@ #include "cptpipeventhandler.h" #include "tptpipinitevtack.h" #include "ptpippanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpipeventhandlerTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"CEventHandler");) /** Creates the channel for commands. The base class constructl is called. */ CPTPIPEventHandler* CPTPIPEventHandler::NewL(CPTPIPConnection& aConnection) { + OstTraceFunctionEntry0( CPTPIPEVENTHANDLER_NEWL_ENTRY ); CPTPIPEventHandler* self = new(ELeave) CPTPIPEventHandler(aConnection); CleanupStack::PushL(self); -#ifdef __FLOG_ACTIVE - self->ConstructL(KComponent); -#else self->ConstructL(); -#endif CleanupStack::Pop(); + OstTraceFunctionExit0( CPTPIPEVENTHANDLER_NEWL_EXIT ); return self; } @@ -47,8 +48,8 @@ */ CPTPIPEventHandler::~CPTPIPEventHandler() { - __FLOG(_L8("Destructor - Entry")); - __FLOG(_L8("Destructor - Exit")); + OstTraceFunctionEntry0( CPTPIPEVENTHANDLER_CPTPIPEVENTHANDLER_ENTRY ); + OstTraceFunctionExit0( CPTPIPEVENTHANDLER_CPTPIPEVENTHANDLER_EXIT ); } /** @@ -57,6 +58,8 @@ CPTPIPEventHandler::CPTPIPEventHandler(CPTPIPConnection& aConnection): CPTPIPSocketHandlerBase(aConnection, CActive::EPriorityUserInput ) { + OstTraceFunctionEntry0( DUP1_CPTPIPEVENTHANDLER_CPTPIPEVENTHANDLER_ENTRY ); + OstTraceFunctionExit0( DUP1_CPTPIPEVENTHANDLER_CPTPIPEVENTHANDLER_EXIT ); } /** @@ -65,13 +68,13 @@ */ void CPTPIPEventHandler::SendInitAck(CPTPIPGenericContainer* aEvtAck) { - __FLOG(_L8("SendInitAck - Entry")); + OstTraceFunctionEntry0( CPTPIPEVENTHANDLER_SENDINITACK_ENTRY ); iChunkStatus = aEvtAck->FirstReadChunk(iSendChunkData); iSendData.Set(iSendChunkData); iSocket.Send(iSendData,0,iStatus); SetState(EInitSendInProgress); SetActive(); - __FLOG(_L8("SendInitAck - Exit")); + OstTraceFunctionExit0( CPTPIPEVENTHANDLER_SENDINITACK_EXIT ); } /** @@ -81,13 +84,13 @@ */ void CPTPIPEventHandler::SendEventL(const MMTPType& aEvent) { - __FLOG(_L8("SendEventL - Entry")); + OstTraceFunctionEntry0( CPTPIPEVENTHANDLER_SENDEVENTL_ENTRY ); // We need to stop listening, and send the event. Cancel(); SendDataL(aEvent, 0); - __FLOG(_L8("SendEventL - Exit")); + OstTraceFunctionExit0( CPTPIPEVENTHANDLER_SENDEVENTL_EXIT ); } /** @@ -99,9 +102,9 @@ */ void CPTPIPEventHandler::SendDataCompleteL(TInt aError, const MMTPType& aSource) { - __FLOG(_L8("SendDataCompleteL - Entry")); + OstTraceFunctionEntry0( CPTPIPEVENTHANDLER_SENDDATACOMPLETEL_ENTRY ); Connection().SendEventCompleteL(aError, aSource); - __FLOG(_L8("SendDataCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPEVENTHANDLER_SENDDATACOMPLETEL_EXIT ); } /** @@ -110,9 +113,9 @@ */ void CPTPIPEventHandler::ReceiveEventL(MMTPType& aEvent) { - __FLOG(_L8("ReceiveEventL - Entry")); + OstTraceFunctionEntry0( CPTPIPEVENTHANDLER_RECEIVEEVENTL_ENTRY ); ReceiveDataL(aEvent); - __FLOG(_L8("ReceiveEventL - Exit")); + OstTraceFunctionExit0( CPTPIPEVENTHANDLER_RECEIVEEVENTL_EXIT ); } /** @@ -124,9 +127,9 @@ */ void CPTPIPEventHandler::ReceiveDataCompleteL(TInt aError, MMTPType& aSink) { - __FLOG(_L8("ReceiveDataCompleteL - Entry")); + OstTraceFunctionEntry0( CPTPIPEVENTHANDLER_RECEIVEDATACOMPLETEL_ENTRY ); Connection().ReceiveEventCompleteL(aError, aSink); - __FLOG(_L8("ReceiveDataCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPEVENTHANDLER_RECEIVEDATACOMPLETEL_EXIT ); } /** @@ -136,12 +139,12 @@ */ TInt CPTPIPEventHandler::ParsePTPIPHeaderL() { - __FLOG(_L8("ParsePTPIPHeaderL - Entry")); + OstTraceFunctionEntry0( CPTPIPEVENTHANDLER_PARSEPTPIPHEADERL_ENTRY ); TUint32 type = Connection().ValidateAndSetEventPayloadL(); iPTPPacketLength = Connection().EventContainer()->Uint32L(CPTPIPGenericContainer::EPacketLength); - __FLOG(_L8("ParsePTPIPHeaderL - Exit")); + OstTraceFunctionExit0( CPTPIPEVENTHANDLER_PARSEPTPIPHEADERL_EXIT ); return type; } @@ -152,7 +155,7 @@ */ TBool CPTPIPEventHandler::HandleInitAck() { - __FLOG(_L8("HandleInitAck - Entry")); + OstTraceFunctionEntry0( CPTPIPEVENTHANDLER_HANDLEINITACK_ENTRY ); TBool isHandled(EFalse); if (iState == EInitSendInProgress) @@ -163,7 +166,7 @@ iState = EIdle; isHandled = ETrue; } - __FLOG(_L8("HandleInitAck - Exit")); + OstTraceFunctionExit0( CPTPIPEVENTHANDLER_HANDLEINITACK_EXIT ); return isHandled; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/src/cptpipsockhandlerbase.cpp --- a/mtptransports/mtpptpiptransport/ptpipplugin/src/cptpipsockhandlerbase.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/src/cptpipsockhandlerbase.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -19,15 +19,21 @@ @internalComponent */ +#include "mtpdebug.h" #include "cptpipsockhandlerbase.h" #include "cptpipconnection.h" #include "ptpippanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpipsockhandlerbaseTraces.h" +#endif + const TUint32 KPTPIPHeaderSize = 8; const TUint KMaxPacketSixe = 16; const TUint64 KMaxPTPIPPacketSize = 0x18FF4; // 100 KB - 12 -//#define MTP_DEBUG_FLOG_HEX_DUMP +//#define MTP_DEBUG_OST_HEX_DUMP #define UNUSED_VAR(a) (a)=(a) @@ -55,7 +61,9 @@ iSendDataSource(NULL), iCurrentChunkData(NULL,0,0) { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_CPTPIPSOCKETHANDLERBASE_ENTRY ); CActiveScheduler::Add(this); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_CPTPIPSOCKETHANDLERBASE_EXIT ); } @@ -63,18 +71,13 @@ /** Second phase constructor. */ -#ifdef __FLOG_ACTIVE -void CPTPIPSocketHandlerBase::ConstructL(const TDesC8& aComponentName) -#else void CPTPIPSocketHandlerBase::ConstructL() -#endif { - __FLOG_OPEN(KMTPSubsystem, aComponentName); - __FLOG(_L8("CSocketHandler::ConstructL - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_CONSTRUCTL_ENTRY ); iPacketSizeMax = KMaxPacketSixe; iPacketBuffer.ReAllocL(iPacketSizeMax); iPTPIPDataHeader = CPTPIPDataContainer::NewL(); - __FLOG(_L8("CSocketHandler::ConstructL - Exit")); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_CONSTRUCTL_EXIT ); } /** @@ -82,13 +85,12 @@ */ CPTPIPSocketHandlerBase::~CPTPIPSocketHandlerBase() { - __FLOG(_L8("CSocketHandler::~CSocketHandler - Entry")); + OstTraceFunctionEntry0( DUP1_CPTPIPSOCKETHANDLERBASE_CPTPIPSOCKETHANDLERBASE_ENTRY ); Cancel(); iPacketBuffer.Close(); iSocket.Close(); delete iPTPIPDataHeader; - __FLOG(_L8("CSocketHandler::~CSocketHandler - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( DUP1_CPTPIPSOCKETHANDLERBASE_CPTPIPSOCKETHANDLERBASE_EXIT ); } @@ -101,14 +103,18 @@ */ void CPTPIPSocketHandlerBase::RunL() { - __FLOG(_L8("RunL - Entry")); - __FLOG_VA((_L8("Current State is 0x%08X, and status is %d"), iState, iStatus.Int())); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_RUNL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_RUNL, "Current State is 0x%08X, and status is %d", + iState, iStatus.Int()); + switch ( DataStreamDirection() ) { case EReceivingState: - __FLOG_VA((_L8("Receive data completion status = %d"), iStatus.Int())); + OstTrace1( TRACE_NORMAL, DUP1_CPTPIPSOCKETHANDLERBASE_RUNL, "Receive data completion status = %d", + iStatus.Int()); + if (iState == EReceiveFastInProgress) { InitiateFirstChunkReceiveL(); @@ -117,7 +123,9 @@ else if (iStatus != KErrNone) { // Abnormal completion. - __FLOG_VA((_L8("PTPIP Error: Receive data completed with error = %d"), iStatus.Int())); + OstTrace1( TRACE_NORMAL, DUP2_CPTPIPSOCKETHANDLERBASE_RUNL, "PTPIP Error: Receive data completed with error = %d", + iStatus.Int()); + SetState(EReceiveComplete); } else if (iState != EReceiveComplete) @@ -148,7 +156,9 @@ TRAPD(err, ReceiveDataCompleteL(iStatus.Int(), data)); if (err != KErrNone) { - __FLOG_VA((_L8("Framework threw an error from ReceiveDataCompleteL = %d"), err)); + OstTrace1( TRACE_NORMAL, DUP3_CPTPIPSOCKETHANDLERBASE_RUNL, "Framework threw an error from ReceiveDataCompleteL = %d", + err); + ReceiveDataCompleteL(err, data); } } @@ -162,7 +172,9 @@ break; } - __FLOG_VA((_L8("Send data stream completion status = %d"), iStatus.Int())); + OstTrace1( TRACE_NORMAL, DUP4_CPTPIPSOCKETHANDLERBASE_RUNL, "Send data stream completion status = %d", + iStatus.Int()); + if (iStatus != KErrNone) { // Abnormal completion. @@ -180,7 +192,9 @@ TRAPD(err, SendDataCompleteL(iStatus.Int(), data)); if (err != KErrNone) { - __FLOG_VA((_L8("Framework threw an error from SendDataCompleteL = %d"), err)); + OstTrace1( TRACE_NORMAL, DUP5_CPTPIPSOCKETHANDLERBASE_RUNL, "Framework threw an error from SendDataCompleteL = %d", + err); + SendDataCompleteL(err, data); } } @@ -220,14 +234,17 @@ default: - __FLOG_VA((_L8("PTPIP ERROR: Invalid state of the sockethandler: RunL should not be called with 0x%08X state"), iState)); + OstTrace1( TRACE_NORMAL, DUP6_CPTPIPSOCKETHANDLERBASE_RUNL, "PTPIP ERROR: Invalid state of the sockethandler: RunL should not be called with 0x%08X state", + iState); + Panic(EPTPIPBadState); break; }// switch - - __FLOG_VA((_L8("IsActive = %d"), IsActive())); - __FLOG(_L8("RunL - Exit")); + OstTrace1( TRACE_NORMAL, DUP7_CPTPIPSOCKETHANDLERBASE_RUNL, "IsActive = %d", + IsActive()); + + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_RUNL_EXIT ); } /** @@ -235,23 +252,26 @@ */ void CPTPIPSocketHandlerBase::DoCancel() { - __FLOG(_L8("DoCancel - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_DOCANCEL_ENTRY ); switch (iState & EStateDirection) { case EReceivingState: - __FLOG(_L8("Cancelling receive on the socket")); + OstTrace0( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_DOCANCEL, "Cancelling receive on the socket" ); + iSocket.CancelRecv(); ResetReceiveDataStream(); break; case ESendingState: - __FLOG(_L8("Cancelling send on the socket")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPSOCKETHANDLERBASE_DOCANCEL, "Cancelling send on the socket" ); + iSocket.CancelSend(); ResetSendDataStream(); break; case ESendDataState: - __FLOG(_L8("Cancelling send on the socket")); + OstTrace0( TRACE_NORMAL, DUP2_CPTPIPSOCKETHANDLERBASE_DOCANCEL, "Cancelling send on the socket" ); + iSocket.CancelSend(); ResetSendDataStream(); break; @@ -259,7 +279,7 @@ default: break; } - __FLOG(_L8("DoCancel - Exit")); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_DOCANCEL_EXIT ); } /** @@ -270,8 +290,10 @@ */ TInt CPTPIPSocketHandlerBase::RunError(TInt aError) { - __FLOG(_L8("RunError - Entry")); - __FLOG_VA((_L8("Error reported is %d and state is 0x%08X, and status is %d"), aError, iState, iStatus.Int())); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_RUNERROR_ENTRY ); + OstTraceExt3( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_RUNERROR, "Error reported is %d and state is 0x%08X, and status is %d", + aError, iState, iStatus.Int()); + // Cancel any outstanding request. Cancel(); @@ -280,7 +302,8 @@ TInt32 streamDirection = DataStreamDirection(); if (streamDirection == EReceivingState) { - __FLOG(_L8("Error in EReceivingState")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPSOCKETHANDLERBASE_RUNERROR, "Error in EReceivingState" ); + // Notify the connection and reset the receive data stream. MMTPType& data(*iReceiveDataSink); ResetReceiveDataStream(); @@ -289,7 +312,8 @@ } else if (streamDirection == ESendingState || (streamDirection == ESendDataState)) { - __FLOG(_L8("Error in ESendingState")); + OstTrace0( TRACE_NORMAL, DUP2_CPTPIPSOCKETHANDLERBASE_RUNERROR, "Error in ESendingState" ); + // Notify the connection and reset the send data stream. const MMTPType& data(*iSendDataSource); ResetSendDataStream(); @@ -304,7 +328,7 @@ Connection().HandleError(aError); } - __FLOG(_L8("RunError - Exit")); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_RUNERROR_EXIT ); return KErrNone; } @@ -321,16 +345,19 @@ */ void CPTPIPSocketHandlerBase::SendDataL(const MMTPType& aData, TUint32 aTransactionId ) { - __FLOG(_L8("SendDataL - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_SENDDATAL_ENTRY ); iSendDataSource = &aData; TUint64 size = iSendDataSource->Size(); - __FLOG_VA((_L8("Size of total data to be sent = %ld bytes"), size)); + OstTrace1( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_SENDDATAL, "Size of total data to be sent = %ld bytes", + size); + // if the data is less than KMaxPTPIPPacketSize then it can be sent in a shot, // Currently the ptp ip packet has the end data packet already, so it can be sent directly. if ( size < KMaxPTPIPPacketSize) { - __FLOG(_L8("Size of data is less than KMaxPTPIPPacketSize, sending as one ptpip packet.")); + OstTrace0( TRACE_NORMAL, DUP2_CPTPIPSOCKETHANDLERBASE_SENDDATAL, "Size of data is less than KMaxPTPIPPacketSize, sending as one ptpip packet." ); + SetState(ESendInitialising); ProcessSendDataL(); } @@ -340,7 +367,8 @@ // and then one chunk will be sent as one PTPIP packet. else { - __FLOG(_L8("Size of data is more than KMaxPTPIPPacketSize, sending as multiple ptpip packets.")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPSOCKETHANDLERBASE_SENDDATAL, "Size of data is more than KMaxPTPIPPacketSize, sending as multiple ptpip packets." ); + iPTPIPDataHeader->SetUint32L(CPTPIPDataContainer::ETransactionId, aTransactionId); iPTPIPDataHeader->SetPayloadL(NULL); @@ -351,7 +379,7 @@ CreateAndSendDataPacketsL(); } - __FLOG(_L8("SendDataL - Exit")); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_SENDDATAL_EXIT ); } /** @@ -360,7 +388,7 @@ */ void CPTPIPSocketHandlerBase::ProcessSendDataL() { - __FLOG(_L8("ProcessSendDataL - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL_ENTRY ); iSendData.Set(KNullDesC8); @@ -371,13 +399,15 @@ switch (iState) { case ESendInitialising: - __FLOG(_L8("Fetching first read data chunk")); + OstTrace0( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Fetching first read data chunk" ); + iChunkStatus = iSendDataSource->FirstReadChunk(iSendChunkData); iPacketBuffer.Zero(); break; case ESendInProgress: - __FLOG(_L8("Fetching next read data chunk")); + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Fetching next read data chunk" ); + iChunkStatus = iSendDataSource->NextReadChunk(iSendChunkData); break; @@ -386,7 +416,8 @@ case EIdle: default: - __FLOG(_L8("Invalid send data stream state")); + OstTrace0( TRACE_NORMAL, DUP2_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Invalid send data stream state" ); + Panic(EPTPIPBadState); break; } @@ -426,20 +457,28 @@ } break; default: - User::Leave(iChunkStatus); + LEAVEIFERROR(iChunkStatus, + OstTrace1( TRACE_ERROR, DUP17_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "iChunkStatus is %d", iChunkStatus )); + break; } } - __FLOG_VA((_L8("Chunk status = %d"), iChunkStatus)); + OstTrace1( TRACE_NORMAL, DUP3_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Chunk status = %d", + iChunkStatus); + // Process the buffered residual and/or available chunk data. TUint bufferedLen(iPacketBuffer.Length()); TUint chunkIntegralLen((chunkAvailableLen / iPacketSizeMax) * iPacketSizeMax); TUint chunkResidualLen(chunkAvailableLen % iPacketSizeMax); - __FLOG_VA((_L8("Buffered residual data = %d bytes"), bufferedLen)); - __FLOG_VA((_L8("Chunk data available = %d bytes"), chunkAvailableLen)); - __FLOG_VA((_L8("Chunk data packet integral portion = %d bytes"), chunkIntegralLen)); - __FLOG_VA((_L8("Chunk data packet residual portion = %d bytes"), chunkResidualLen)); + OstTrace1( TRACE_NORMAL, DUP4_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Buffered residual data = %d bytes", + bufferedLen); + OstTrace1( TRACE_NORMAL, DUP5_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Chunk data available = %d bytes", + chunkAvailableLen); + OstTrace1( TRACE_NORMAL, DUP6_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Chunk data packet integral portion = %d bytes", + chunkIntegralLen); + OstTrace1( TRACE_NORMAL, DUP7_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Chunk data packet residual portion = %d bytes", + chunkResidualLen); if (bufferedLen) { @@ -459,11 +498,14 @@ { consumedLen = chunkAvailableLen; } - __FLOG_VA((_L8("Buffering %d bytes"), consumedLen)); + OstTrace1( TRACE_NORMAL, DUP8_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Buffering %d bytes", + consumedLen); + iPacketBuffer.Append(iSendChunkData.Left(consumedLen)); // Update the available chunk data to reflect only the unconsumed portion. - __FLOG_VA((_L8("Residual chunk data = %d bytes"), unconsumedLen)); + OstTrace0( TRACE_NORMAL, DUP9_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "CPTPIPSocketHandlerBase::ProcessSendDataL" ); + if (unconsumedLen) { iSendChunkData.Set(iSendChunkData.Right(unconsumedLen)); @@ -493,7 +535,10 @@ // Buffer the chunk data packet residual portion. if (chunkResidualLen) { - __FLOG_VA((_L8("Buffering %d bytes"), chunkResidualLen)); + OstTrace1( TRACE_NORMAL, DUP10_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Buffering %d bytes", + chunkResidualLen); + + iPacketBuffer.Append(iSendChunkData.Right(chunkResidualLen)); } @@ -513,13 +558,22 @@ TUint sendBytes(iSendData.Length()); if (sendBytes) { - __FLOG_VA((_L8("Send data length = %d bytes"), iSendData.Length())); -#ifdef MTP_DEBUG_FLOG_HEX_DUMP - __FLOG_HEXDUMP((iSendData, _L8("Sending data on socket "))); + OstTrace1( TRACE_NORMAL, DUP16_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Send data length = %d bytes", + iSendData.Length()); + + OstTrace1( TRACE_NORMAL, DUP11_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Send data length = %d bytes", + iSendData.Length()); + +#ifdef MTP_DEBUG_OST_HEX_DUMP + OstTrace0( TRACE_NORMAL, DUP12_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Sending data on socket " ); + OstTraceData( TRACE_DUMP, DUP13_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, + "%x", iSendData.Ptr(), iSendData.Size()); #endif + iSocket.Send(iSendData, 0, iStatus); SetActive(); - __FLOG(_L8("Request issued")); + OstTrace0( TRACE_NORMAL, DUP14_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "Request issued" ); + } else if (iState != ESendComplete) { @@ -527,8 +581,9 @@ CompleteSelf(KErrNone); } - __FLOG_VA((_L8("CSocketHandler state on exit = 0x%08X"), iState)); - __FLOG(_L8("ProcessSendDataL - Exit")); + OstTrace1( TRACE_NORMAL, DUP15_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL, "CSocketHandler state on exit = 0x%08X", iState ); + + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL_EXIT ); } @@ -542,7 +597,7 @@ void CPTPIPSocketHandlerBase::CreateAndSendDataPacketsL() { - __FLOG(_L8("CreateAndSendDataPacketsL - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL_ENTRY ); // Create the data header and prepare to send it. if (iState == ESendingDataHeader) @@ -552,7 +607,9 @@ { iState = ESendDataCancelled; CompleteSelf(KErrNone); - __FLOG(_L8("Sending the PTPIP data ")); + OstTrace0( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL, "Sending the PTPIP data " ); + + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL_EXIT ); return; } else @@ -560,7 +617,8 @@ iChunkStatus = iSendDataSource->NextReadChunk(iSendChunkData); TInt32 size = iPTPIPDataHeader->Size() + iSendChunkData.Size(); iPTPIPDataHeader->SetUint32L(CPTPIPDataContainer::EPacketLength, size); - __FLOG_VA((_L8("Size of ptpip packet data to be sent = %d bytes"), size)); + OstTrace1( TRACE_NORMAL, DUP1_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL, "Size of ptpip packet data to be sent = %d bytes", size ); + switch (iChunkStatus) { @@ -573,8 +631,11 @@ break; default: - __FLOG(_L8("PTPIP Error :chunkStatus returned an error")); - User::Leave(iChunkStatus); + OstTrace0( TRACE_NORMAL, DUP2_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL, "PTPIP Error :chunkStatus returned an error" ); + + LEAVEIFERROR(iChunkStatus, + OstTrace1( TRACE_ERROR, CINTERNETCONNECTIONHANDLER_CONSTRUCTL, "iChunkStatus is %d", iChunkStatus )); + break; } // Set the iSendData to point to the ptpip header. @@ -586,7 +647,8 @@ else if (iState == ESendingDataPacket) { iSendData.Set(iSendChunkData); - __FLOG(_L8("Sending the PTPIP data ")); + OstTrace0( TRACE_NORMAL, DUP3_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL, "Sending the PTPIP data " ); + // if this is the last packet then set state. if (iChunkStatus == KMTPChunkSequenceCompletion) SetState(ESendDataPacketCompleting); @@ -597,14 +659,20 @@ Panic(EPTPIPBadState); } - __FLOG_VA((_L8("Send data length = %d bytes"), iSendData.Length())); -#ifdef MTP_DEBUG_FLOG_HEX_DUMP - __FLOG_HEXDUMP((iSendData, _L8("Sending data on socket "))); + OstTrace1( TRACE_NORMAL, DUP4_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL, "Send data length = %d bytes", + iSendData.Length()); + +#ifdef MTP_DEBUG_OST_HEX_DUMP + OstTrace0( TRACE_NORMAL, DUP5_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL, "Sending data on socket " ); + OstTraceData( TRACE_DUMP, DUP6_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL, + "%x", iSendData.Ptr(), iSendData.Size()); #endif + iSocket.Send(iSendData, 0, iStatus); SetActive(); - __FLOG(_L8("Request issued")); - __FLOG(_L8("CreateAndSendDataPacketsL - Exit")); + OstTrace0( TRACE_NORMAL, DUP7_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL, "Request issued" ); + + OstTraceFunctionExit0( DUP1_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL_EXIT ); } @@ -618,9 +686,9 @@ */ void CPTPIPSocketHandlerBase::SendDataCompleteL(TInt /*aError*/, const MMTPType& /*aSource*/) { - __FLOG(_L8("CSocketHandler::SendDataCompleteL - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_SENDDATACOMPLETEL_ENTRY ); __DEBUG_ONLY(Panic(EPTPIPNotSupported)); - __FLOG(_L8("CSocketHandler::SendDataCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_SENDDATACOMPLETEL_EXIT ); } /** @@ -631,18 +699,19 @@ */ void CPTPIPSocketHandlerBase::CancelSendL(TInt aReason) { - __FLOG(_L8("CSocketHandler::CancelSendL - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_CANCELSENDL_ENTRY ); if ( (DataStreamDirection() == ESendingState) || (DataStreamDirection() == ESendDataState)) { - __FLOG(_L8("Cancel in ESendingState")); + OstTrace0( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_CANCELSENDL, "Cancel in ESendingState" ); + // Cancel any outstanding request. Cancel(); ResetSendDataStream(); SendDataCompleteL(aReason, *iSendDataSource); } - __FLOG(_L8("CSocketHandler::CancelSendL - Exit")); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_CANCELSENDL_EXIT ); } @@ -657,7 +726,7 @@ */ void CPTPIPSocketHandlerBase::ReceiveDataL(MMTPType& aSink) { - __FLOG(_L8("ReceiveDataL - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_RECEIVEDATAL_ENTRY ); // Set the state SetState(EReceiveInProgress); @@ -672,7 +741,7 @@ iReceiveDataCommit = iReceiveDataSink->CommitRequired(); InitiateFirstChunkReceiveL(); - __FLOG(_L8("ReceiveDataL - Exit")); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_RECEIVEDATAL_EXIT ); } /** @@ -680,7 +749,7 @@ */ void CPTPIPSocketHandlerBase::InitiateFirstChunkReceiveL() { - __FLOG(_L8("InitiateFirstChunkReceiveL - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL_ENTRY ); // sink refers to the buffer from connection. // Now the ptr iReceiveChunkData is set to it first chunk. @@ -688,8 +757,12 @@ // The first chunk is going to be read. iIsFirstChunk = ETrue; - __FLOG_VA((_L8("Receive chunk capacity = %d bytes, length = %d bytes"), iReceiveChunkData.MaxLength(), iReceiveChunkData.Length())); - __FLOG_VA((_L8("Chunk status = %d"), iChunkStatus)); + OstTraceExt2( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL, "Receive chunk capacity = %d bytes, length = %d bytes", + iReceiveChunkData.MaxLength(), iReceiveChunkData.Length()); + + OstTrace1( TRACE_NORMAL, DUP1_CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL, "Chunk status = %d", + iChunkStatus); + iReceiveData.Set(iReceiveChunkData); @@ -698,13 +771,18 @@ // Make the async request to read on the socket and set ourselves active. // once data is read on the socket, the iStatus will be changed by the comms framework. iSocket.Recv(iReceiveData, 0, iStatus); -#ifdef MTP_DEBUG_FLOG_HEX_DUMP - __FLOG_HEXDUMP((iReceiveData, _L8("Received data on socket "))); + +#ifdef MTP_DEBUG_OST_HEX_DUMP + OstTrace0( TRACE_NORMAL, DUP2_CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL, "Received data on socket" ); + OstTraceData( TRACE_DUMP, DUP3_CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL, + "%x", iReceiveData.Ptr(), iReceiveData.Size()); #endif + SetActive(); - __FLOG(_L8("Request issued")); - __FLOG(_L8("InitiateFirstChunkReceiveL - Exit")); + OstTrace0( TRACE_NORMAL, DUP4_CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL, "Request issued" ); + + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL_EXIT ); } /** @@ -714,7 +792,7 @@ */ void CPTPIPSocketHandlerBase::ProcessFirstReceivedChunkL() { - __FLOG(_L8("ProcessFirstReceivedChunkL - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_PROCESSFIRSTRECEIVEDCHUNKL_ENTRY ); iIsFirstChunk = EFalse; // Reset the data counter, This will be filled in later in the ResumeReceiveDataStreamL. iPTPPacketLengthReceived = 0; @@ -729,7 +807,8 @@ // This current RunL will if (EPTPIPPacketTypeUndefined == iType ) { - __FLOG(_L8("PTPIP ERROR: Unexpected value in the type field of PTPIP header, appears corrupt")); + OstTrace0( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_PROCESSFIRSTRECEIVEDCHUNKL, "PTPIP ERROR: Unexpected value in the type field of PTPIP header, appears corrupt" ); + SetState(EReceiveComplete); iStatus = KErrCorrupt; } @@ -741,15 +820,19 @@ } if (iState == EReceiveComplete) - { -#ifdef MTP_DEBUG_FLOG_HEX_DUMP - __FLOG_HEXDUMP((iReceiveChunkData, _L8("Received data "))); + { +#ifdef MTP_DEBUG_OST_HEX_DUMP + OstTrace0( TRACE_NORMAL, DUP1_CPTPIPSOCKETHANDLERBASE_PROCESSFIRSTRECEIVEDCHUNKL, "Received data" ); + OstTraceData( TRACE_DUMP, DUP2_CPTPIPSOCKETHANDLERBASE_PROCESSFIRSTRECEIVEDCHUNKL, + "%x", iReceiveChunkData.Ptr(), iReceiveChunkData.Size()); #endif + // Commit the received data if required. if (iReceiveDataCommit) { - __FLOG(_L8("Commiting write data chunk")); + OstTrace0( TRACE_NORMAL, DUP3_CPTPIPSOCKETHANDLERBASE_PROCESSFIRSTRECEIVEDCHUNKL, "Commiting write data chunk" ); + iReceiveDataSink->CommitChunkL(iReceiveChunkData); } } @@ -758,7 +841,7 @@ ResumeReceiveDataStreamL(); } - __FLOG(_L8("ProcessFirstReceivedChunkL - Exit")); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_PROCESSFIRSTRECEIVEDCHUNKL_EXIT ); } @@ -769,13 +852,15 @@ */ void CPTPIPSocketHandlerBase::ResumeReceiveDataStreamL() { - __FLOG(_L8("ResumeReceiveDataStreamL - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML_ENTRY ); TBool endStream(EFalse); MMTPType *needCommit = NULL; // Process the received chunk (if any). iPTPPacketLengthReceived += iReceiveData.Length(); - __FLOG_VA((_L8("Data received = iPTPPacketLengthReceived = %d bytes, Data expected = iPTPPacketLength = %d"), iPTPPacketLengthReceived, iPTPPacketLength)); + OstTraceExt2( TRACE_NORMAL, DUP1_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, "Data received = iPTPPacketLengthReceived = %d bytes, Data expected = iPTPPacketLength = %d", + iPTPPacketLengthReceived, iPTPPacketLength); + if (iPTPPacketLengthReceived == iPTPPacketLength) { @@ -787,12 +872,17 @@ endStream = EFalse; } - __FLOG_VA((_L8("Received = %d bytes, write data chunk capacity = %d bytes"), iReceiveChunkData.Length(), iReceiveChunkData.MaxLength())); -#ifdef MTP_DEBUG_FLOG_HEX_DUMP - __FLOG_HEXDUMP((iReceiveChunkData, _L8("Received data "))); + OstTraceExt2( TRACE_NORMAL, DUP2_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, "Received = %d bytes, write data chunk capacity = %d bytes", + iReceiveChunkData.Length(), iReceiveChunkData.MaxLength()); + +#ifdef MTP_DEBUG_OST_HEX_DUMP + OstTrace0( TRACE_NORMAL, DUP3_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, "Received data " ); + OstTraceData( TRACE_DUMP, DUP4_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, + "%x", iReceiveChunkData.Ptr(), iReceiveChunkData.Size()); #endif + // Commit the received data if required. if (iReceiveDataCommit) { @@ -830,28 +920,38 @@ iChunkStatus = iReceiveDataSink->NextWriteChunk(iReceiveChunkData); } - __FLOG_VA((_L8("iReceiveChunkData pointer address is %08x"), iReceiveChunkData.Ptr())); + OstTrace1( TRACE_NORMAL, DUP5_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, "iReceiveChunkData pointer address is %08x", + iReceiveChunkData.Ptr()); + break; case EReceiveComplete: - __FLOG(_L8("Write data chunk sequence complet")); + OstTrace0( TRACE_NORMAL, DUP6_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, "Write data chunk sequence complet" ); + break; case EIdle: default: - __FLOG(_L8("Invalid stream state")); + OstTrace0( TRACE_NORMAL, DUP7_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, "Invalid stream state" ); + Panic(EPTPIPBadState); break; } - __FLOG_VA((_L8("Chunk status = %d"), iChunkStatus)); + OstTrace1( TRACE_NORMAL, DUP8_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, "Chunk status = %d", + iChunkStatus); + // If necessary, process the next chunk. if (iState != EReceiveComplete) { - __FLOG_VA((_L8("Receive chunk capacity = %d bytes, length = %d bytes"), iReceiveChunkData.MaxLength(), iReceiveChunkData.Length())); - __FLOG_VA((_L8("iReceiveChunkData pointer address is %08x"), iReceiveChunkData.Ptr())); + OstTraceExt2( TRACE_NORMAL, DUP9_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, "Receive chunk capacity = %d bytes, length = %d bytes", + iReceiveChunkData.MaxLength(), iReceiveChunkData.Length()); + + OstTrace1( TRACE_NORMAL, DUP10_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, "iReceiveChunkData pointer address is %08x", + iReceiveChunkData.Ptr()); + // When we reach the end of receiving a PTPIP packet, it is possible that our PTPIP chunk @@ -873,23 +973,28 @@ } - - __FLOG_VA((_L8("Length read this time is= %d"), iReceiveData.MaxLength())); + OstTrace1( TRACE_NORMAL, DUP11_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, "Length read this time is= %d", iReceiveData.MaxLength()); + iSocket.Recv(iReceiveData, 0, iStatus); -#ifdef MTP_DEBUG_FLOG_HEX_DUMP - __FLOG_HEXDUMP((iReceiveData, _L8("Received data on socket "))); -#endif + +#ifdef MTP_DEBUG_OST_HEX_DUMP + OstTrace0( TRACE_NORMAL, DUP12_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, "Received data on socket " ); + OstTraceData( TRACE_DUMP, DUP13_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, + "%x", iReceiveData.Ptr(), iReceiveData.Size()); +#endif + SetActive(); - __FLOG(_L8("Request issued")); + OstTrace0( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML, "Request issued" ); + } if(needCommit != NULL) { TPtr8 tmp(NULL, 0, 0); needCommit->CommitChunkL(tmp); } - __FLOG(_L8("ResumeReceiveDataStreamL - Exit")); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML_EXIT ); } /** @@ -901,9 +1006,9 @@ */ void CPTPIPSocketHandlerBase::ReceiveDataCompleteL(TInt /*aError*/, MMTPType& /*aSink*/) { - __FLOG(_L8("CSocketHandler::ReceiveDataCompleteL - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_RECEIVEDATACOMPLETEL_ENTRY ); __DEBUG_ONLY(Panic(EPTPIPNotSupported)); - __FLOG(_L8("CSocketHandler::ReceiveDataCompleteL - Exit")); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_RECEIVEDATACOMPLETEL_EXIT ); } /** @@ -914,11 +1019,12 @@ */ void CPTPIPSocketHandlerBase::CancelReceiveL(TInt aReason) { - __FLOG(_L8("CSocketHandler::CancelReceiveL - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_CANCELRECEIVEL_ENTRY ); if (DataStreamDirection() == EReceivingState) { - __FLOG(_L8("Cancel in EReceivingState")); + OstTrace0( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_CANCELRECEIVEL, "Cancel in EReceivingState" ); + // Cancel any outstanding request. Cancel(); @@ -926,8 +1032,8 @@ ResetReceiveDataStream(); ReceiveDataCompleteL(aReason, *iReceiveDataSink); } - - __FLOG(_L8("CSocketHandler::CancelReceiveL - Exit")); + + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_CANCELRECEIVEL_EXIT ); } // @@ -936,51 +1042,59 @@ CPTPIPConnection& CPTPIPSocketHandlerBase::Connection() { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_CONNECTION_ENTRY ); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_CONNECTION_EXIT ); return iConnection; } RSocket& CPTPIPSocketHandlerBase::Socket() { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_SOCKET_ENTRY ); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_SOCKET_EXIT ); return iSocket; } void CPTPIPSocketHandlerBase::ResetSendDataStream() { - __FLOG(_L8("CSocketHandler::ResetSendDataStream - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_RESETSENDDATASTREAM_ENTRY ); iSendChunkData.Set(NULL, 0); iSendData.Set(NULL, 0); iSendDataSource = NULL; iCancelReceived = EFalse; SetState(EIdle); - __FLOG(_L8("CSocketHandler::ResetSendDataStream - Exit")); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_RESETSENDDATASTREAM_EXIT ); } void CPTPIPSocketHandlerBase::ResetReceiveDataStream() { - __FLOG(_L8("CSocketHandler::ResetReceiveDataStream - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_RESETRECEIVEDATASTREAM_ENTRY ); iReceiveChunkData.Set(NULL, 0, 0); iReceiveData.Set(NULL, 0, 0); iReceiveDataSink = NULL; iCancelReceived = EFalse; SetState(EIdle); - __FLOG(_L8("CSocketHandler::ResetReceiveDataStream - Exit")); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_RESETRECEIVEDATASTREAM_EXIT ); } void CPTPIPSocketHandlerBase::SetState(TSocketState aState) { - __FLOG(_L8("SetState - Entry")); + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_SETSTATE_ENTRY ); iState = aState; - __FLOG_VA((_L8(" state = 0x%08X"), iState)); - __FLOG(_L8("SetState - Exit")); + OstTrace1( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_SETSTATE, "state = 0x%08X", + iState); + + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_SETSTATE_EXIT ); } void CPTPIPSocketHandlerBase::CompleteSelf(TInt aCompletionCode) { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_COMPLETESELF_ENTRY ); SetActive(); TRequestStatus* stat = &iStatus; User::RequestComplete(stat, aCompletionCode); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_COMPLETESELF_EXIT ); } /** @@ -988,12 +1102,16 @@ */ TInt32 CPTPIPSocketHandlerBase::DataStreamDirection() const { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_DATASTREAMDIRECTION_ENTRY ); + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_DATASTREAMDIRECTION_EXIT ); return (iState & EStateDirection); } void CPTPIPSocketHandlerBase::SetSocket(RSocket& aSocket) { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_SETSOCKET_ENTRY ); iSocket = aSocket; + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_SETSOCKET_EXIT ); } /** @@ -1001,8 +1119,12 @@ */ void CPTPIPSocketHandlerBase::SetSocketOptions() { + OstTraceFunctionEntry0( CPTPIPSOCKETHANDLERBASE_SETSOCKETOPTIONS_ENTRY ); TInt error=iSocket.SetOpt(KSoTcpKeepAlive,KSolInetTcp,1); - __FLOG_VA((_L8(" setting the keep alive option returned = %d"), error)); + OstTrace1( TRACE_NORMAL, CPTPIPSOCKETHANDLERBASE_SETSOCKETOPTIONS, "setting the keep alive option returned = %d", error ); + error=iSocket.SetOpt(KSoTcpNoDelay,KSolInetTcp,1); - __FLOG_VA((_L8(" setting the no delay to disable Nagle's algo returned %d"), error)); + OstTrace1( TRACE_NORMAL, DUP1_CPTPIPSOCKETHANDLERBASE_SETSOCKETOPTIONS, "setting the no delay to disable Nagle's algo returned %d", error ); + + OstTraceFunctionExit0( CPTPIPSOCKETHANDLERBASE_SETSOCKETOPTIONS_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/src/cptpiptransport.cpp --- a/mtptransports/mtpptpiptransport/ptpipplugin/src/cptpiptransport.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/src/cptpiptransport.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -19,12 +19,16 @@ #include +#include "mtpdebug.h" #include "cptpiptransport.h" #include "cptpipconnection.h" #include "mmtpconnectionmgr.h" #include "ptpippanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cptpiptransportTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"PTPIPTransport");) /** PTPIP transport plug-in factory method. @@ -33,15 +37,18 @@ */ TAny* CPTPIPTransport::NewL(TAny* aParameter) { + OstTraceFunctionEntry0( CPTPIPTRANSPORT_NEWL_ENTRY ); if ( aParameter != NULL ) { - User::Leave(KErrArgument); + LEAVEIFERROR(KErrArgument, + OstTrace0( TRACE_ERROR, CPTPIPTRANSPORT_NEWL, "Error argument" )); } CPTPIPTransport* self = new (ELeave) CPTPIPTransport; CleanupStack::PushL(self); self->ConstructL(); CleanupStack::Pop(self); + OstTraceFunctionExit0( CPTPIPTRANSPORT_NEWL_EXIT ); return self; } @@ -52,10 +59,9 @@ */ CPTPIPTransport::~CPTPIPTransport() { - __FLOG(_L8("~Destructor - Entry")); + OstTraceFunctionEntry0( CPTPIPTRANSPORT_CPTPIPTRANSPORT_ENTRY ); delete iConnection; - __FLOG(_L8("~Destructor - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CPTPIPTRANSPORT_CPTPIPTRANSPORT_EXIT ); } /** @@ -63,10 +69,9 @@ */ void CPTPIPTransport::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); - __FLOG(_L8("PTPIP MTP Device class plug-in loaded.")); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionEntry0( CPTPIPTRANSPORT_CONSTRUCTL_ENTRY ); + OstTrace0( TRACE_NORMAL, CPTPIPTRANSPORT_CONSTRUCTL, "PTPIP MTP Device class plug-in loaded." ); + OstTraceFunctionExit0( CPTPIPTRANSPORT_CONSTRUCTL_EXIT ); } /** @@ -74,7 +79,9 @@ */ CPTPIPTransport::CPTPIPTransport() { + OstTraceFunctionEntry0( DUP1_CPTPIPTRANSPORT_CPTPIPTRANSPORT_ENTRY ); // Do nothing. + OstTraceFunctionExit0( DUP1_CPTPIPTRANSPORT_CPTPIPTRANSPORT_EXIT ); } /** @@ -82,11 +89,12 @@ */ void CPTPIPTransport::StartL(MMTPConnectionMgr& aConnectionMgr) { - __FLOG(_L8("CPTPIPTransport::StartL - Entry")); + OstTraceFunctionEntry0( CPTPIPTRANSPORT_STARTL_ENTRY ); + __ASSERT_ALWAYS(!iConnection, Panic(EPTPIPConnectionAlreadyExist)); iConnection = CPTPIPConnection::NewL(aConnectionMgr); aConnectionMgr.ConnectionOpenedL(*iConnection); - __FLOG(_L8("CPTPIPTransport::StartL - Exit")); + OstTraceFunctionExit0( CPTPIPTRANSPORT_STARTL_EXIT ); } /** @@ -94,7 +102,7 @@ */ void CPTPIPTransport::Stop(MMTPConnectionMgr& aConnectionMgr) { - __FLOG(_L8("Stop - Entry")); + OstTraceFunctionEntry0( CPTPIPTRANSPORT_STOP_ENTRY ); if(iConnection) { // Check that we did not earlier close the connection due to some @@ -107,7 +115,7 @@ iConnection = NULL; } - __FLOG(_L8("Stop - Exit")); + OstTraceFunctionExit0( CPTPIPTRANSPORT_STOP_EXIT ); } /** @@ -115,8 +123,8 @@ */ void CPTPIPTransport::ModeChanged(TMTPOperationalMode /*aMode*/) { - __FLOG(_L8("ModeChanged - Entry")); - __FLOG(_L8("ModeChanged - Exit")); + OstTraceFunctionEntry0( CPTPIPTRANSPORT_MODECHANGED_ENTRY ); + OstTraceFunctionExit0( CPTPIPTRANSPORT_MODECHANGED_EXIT ); } /** @@ -124,8 +132,8 @@ */ TAny* CPTPIPTransport::GetExtendedInterface(TUid /*aInterfaceUid*/) { - __FLOG(_L8("GetExtendedInterface - Entry")); - __FLOG(_L8("GetExtendedInterface - Exit")); + OstTraceFunctionEntry0( CPTPIPTRANSPORT_GETEXTENDEDINTERFACE_ENTRY ); + OstTraceFunctionExit0( CPTPIPTRANSPORT_GETEXTENDEDINTERFACE_EXIT ); return 0; } @@ -144,7 +152,9 @@ */ EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount) { + OstTraceFunctionEntry0( _IMPLEMENTATIONGROUPPROXY_ENTRY ); aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy); + OstTraceFunctionExit0( _IMPLEMENTATIONGROUPPROXY_EXIT ); return ImplementationTable; } @@ -153,6 +163,8 @@ */ TBool E32Dll() { + OstTraceFunctionEntry0( _E32DLL_ENTRY ); + OstTraceFunctionExit0( _E32DLL_EXIT ); return ETrue; } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpptpiptransport/ptpipplugin/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpptpiptransport/ptpipplugin/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,398 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_DUMP=0x89 +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_NORMAL=0x86 +[TRACE]TRACE_DUMP[0x89]_DUP13_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x1 +[TRACE]TRACE_DUMP[0x89]_DUP13_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x6 +[TRACE]TRACE_DUMP[0x89]_DUP2_CPTPIPSOCKETHANDLERBASE_PROCESSFIRSTRECEIVEDCHUNKL=0x4 +[TRACE]TRACE_DUMP[0x89]_DUP3_CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL=0x3 +[TRACE]TRACE_DUMP[0x89]_DUP4_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x5 +[TRACE]TRACE_DUMP[0x89]_DUP6_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL=0x2 +[TRACE]TRACE_ERROR[0x82]_CINTERNETCONNECTIONHANDLER_CONSTRUCTL=0x8 +[TRACE]TRACE_ERROR[0x82]_CPTPIPTRANSPORT_NEWL=0x9 +[TRACE]TRACE_ERROR[0x82]_DUP17_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x7 +[TRACE]TRACE_ERROR[0x82]_DUP1_CPTPIPCONNECTION_TRANSFERSOCKETSL=0x1 +[TRACE]TRACE_ERROR[0x82]_DUP2_CPTPIPCONNECTION_TRANSFERSOCKETSL=0x2 +[TRACE]TRACE_ERROR[0x82]_DUP3_CPTPIPCONNECTION_TRANSFERSOCKETSL=0x3 +[TRACE]TRACE_ERROR[0x82]_DUP4_CPTPIPCONNECTION_TRANSFERSOCKETSL=0x4 +[TRACE]TRACE_ERROR[0x82]_DUP5_CPTPIPCONNECTION_TRANSFERSOCKETSL=0x5 +[TRACE]TRACE_ERROR[0x82]_DUP6_CPTPIPCONNECTION_TRANSFERSOCKETSL=0x6 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_CPTPIPCOMMANDHANDLER_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_CPTPIPCOMMANDHANDLER_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_HANDLEINITACK_ENTRY=0x15 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_HANDLEINITACK_EXIT=0x16 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_NEWL_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_NEWL_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_PARSEPTPIPHEADERL_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_PARSEPTPIPHEADERL_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_RECEIVECOMMANDDATAL_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_RECEIVECOMMANDDATAL_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_RECEIVECOMMANDREQUESTL_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_RECEIVECOMMANDREQUESTL_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_RECEIVEDATACOMPLETEL_ENTRY=0x11 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_RECEIVEDATACOMPLETEL_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_SENDCOMMANDDATAL_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_SENDCOMMANDDATAL_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_SENDCOMMANDL_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_SENDCOMMANDL_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_SENDDATACOMPLETEL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCOMMANDHANDLER_SENDDATACOMPLETEL_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_BINDL_ENTRY=0x1f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_BINDL_EXIT=0x20 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_BOUNDPROTOCOLLAYER_ENTRY=0x21 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_BOUNDPROTOCOLLAYER_EXIT=0x22 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_CLOSECONNECTION_ENTRY=0x23 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_CLOSECONNECTION_EXIT=0x24 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_COMMANDCONTAINER_ENTRY=0x77 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_COMMANDCONTAINER_EXIT=0x78 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_COMPLETESELF_ENTRY=0x6f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_COMPLETESELF_EXIT=0x70 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_CONNECTIONOPEN_ENTRY=0x75 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_CONNECTIONOPEN_EXIT=0x76 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_CONSTRUCTL_ENTRY=0x1b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_CONSTRUCTL_EXIT=0x1c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_CPTPIPCONNECTION_ENTRY=0x19 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_CPTPIPCONNECTION_EXIT=0x1a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_DATACONTAINER_ENTRY=0x7b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_DATACONTAINER_EXIT=0x7c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_DOCANCEL_ENTRY=0x2d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_DOCANCEL_EXIT=0x2e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_EVENTCONTAINER_ENTRY=0x79 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_EVENTCONTAINER_EXIT=0x7a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_GETEXTENDEDINTERFACE_ENTRY=0x29 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_GETEXTENDEDINTERFACE_EXIT=0x2a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_GETIMPLEMENTATIONUID_ENTRY=0x2b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_GETIMPLEMENTATIONUID_EXIT=0x2c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_HANDLECANCELDURINGSENDL_ENTRY=0x5d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_HANDLECANCELDURINGSENDL_EXIT=0x5e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_HANDLECOMMANDCANCELCOMPLETEL_ENTRY=0x5f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_HANDLECOMMANDCANCELCOMPLETEL_EXIT=0x60 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_HANDLECOMMANDCANCELL_ENTRY=0x5b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_HANDLECOMMANDCANCELL_EXIT=0x5c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_HANDLEERROR_ENTRY=0x6d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_HANDLEERROR_EXIT=0x6e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_HANDLEEVENTCANCELL_ENTRY=0x59 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_HANDLEEVENTCANCELL_EXIT=0x5a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_HANDLETCPERROR_ENTRY=0x87 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_HANDLETCPERROR_EXIT=0x88 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_INITIATECOMMANDREQUESTPHASEL_ENTRY=0x33 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_INITIATECOMMANDREQUESTPHASEL_EXIT=0x34 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_INITIATEEVENTREQUESTPHASEL_ENTRY=0x41 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_INITIATEEVENTREQUESTPHASEL_EXIT=0x42 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_NEWL_ENTRY=0x17 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_NEWL_EXIT=0x18 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL_ENTRY=0x3b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL_EXIT=0x3c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL_ENTRY=0x35 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL_EXIT=0x36 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVECOMMANDDATACOMPLETEL_ENTRY=0x39 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVECOMMANDDATACOMPLETEL_EXIT=0x3a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVECOMMANDDATAL_ENTRY=0x37 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVECOMMANDDATAL_EXIT=0x38 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVEDATACANCELL_ENTRY=0x3f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVEDATACANCELL_EXIT=0x40 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVEDATAL_ENTRY=0x3d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVEDATAL_EXIT=0x3e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL_ENTRY=0x43 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL_EXIT=0x44 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RUNERROR_ENTRY=0x31 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RUNERROR_EXIT=0x32 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RUNL_ENTRY=0x2f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_RUNL_EXIT=0x30 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDCANCELRESPONSEL_ENTRY=0x63 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDCANCELRESPONSEL_EXIT=0x64 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDCANCELTOFRAMEWORKL_ENTRY=0x61 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDCANCELTOFRAMEWORKL_EXIT=0x62 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDCOMMANDCHANNELCOMPLETEL_ENTRY=0x4b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDCOMMANDCHANNELCOMPLETEL_EXIT=0x4c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDCOMMANDCOMPLETEL_ENTRY=0x47 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDCOMMANDCOMPLETEL_EXIT=0x48 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDCOMMANDDATACOMPLETEL_ENTRY=0x49 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDCOMMANDDATACOMPLETEL_EXIT=0x4a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDDATACANCELL_ENTRY=0x53 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDDATACANCELL_EXIT=0x54 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDDATAL_ENTRY=0x4d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDDATAL_EXIT=0x4e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDDATAPACKETL_ENTRY=0x51 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDDATAPACKETL_EXIT=0x52 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDEVENTCOMPLETEL_ENTRY=0x57 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDEVENTCOMPLETEL_EXIT=0x58 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDEVENTL_ENTRY=0x55 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDEVENTL_EXIT=0x56 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDINITACKL_ENTRY=0x69 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDINITACKL_EXIT=0x6a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDRESPONSEL_ENTRY=0x45 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDRESPONSEL_EXIT=0x46 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDSTARTDATAPACKETL_ENTRY=0x4f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SENDSTARTDATAPACKETL_EXIT=0x50 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SETCONNECTIONSTATE_ENTRY=0x73 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SETCONNECTIONSTATE_EXIT=0x74 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SETDATATYPEINDATACONTAINERL_ENTRY=0x89 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SETDATATYPEINDATACONTAINERL_EXIT=0x8a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SETNULLPACKETL_ENTRY=0x65 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SETNULLPACKETL_EXIT=0x66 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SETTRANSACTIONPHASE_ENTRY=0x71 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_SETTRANSACTIONPHASE_EXIT=0x72 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_STOPCONNECTION_ENTRY=0x6b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_STOPCONNECTION_EXIT=0x6c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_TRANSACTIONCOMPLETEL_ENTRY=0x25 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_TRANSACTIONCOMPLETEL_EXIT=0x26 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_TRANSACTIONPHASE_ENTRY=0x7d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_TRANSACTIONPHASE_EXIT=0x7e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_TRANSFERSOCKETSL_ENTRY=0x67 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_TRANSFERSOCKETSL_EXIT=0x68 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_UNBIND_ENTRY=0x27 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_UNBIND_EXIT=0x28 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL_ENTRY=0x7f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL_EXIT=0x80 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_VALIDATEANDSETEVENTPAYLOADL_ENTRY=0x83 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_VALIDATEANDSETEVENTPAYLOADL_EXIT=0x84 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_VALIDATEDATAPACKETL_ENTRY=0x81 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_VALIDATEDATAPACKETL_EXIT=0x82 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_VALIDATETRANSACTIONPHASE_ENTRY=0x85 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPCONNECTION_VALIDATETRANSACTIONPHASE_EXIT=0x86 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_CPTPIPEVENTHANDLER_ENTRY=0x8d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_CPTPIPEVENTHANDLER_EXIT=0x8e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_HANDLEINITACK_ENTRY=0x9d +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_HANDLEINITACK_EXIT=0x9e +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_NEWL_ENTRY=0x8b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_NEWL_EXIT=0x8c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_PARSEPTPIPHEADERL_ENTRY=0x9b +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_PARSEPTPIPHEADERL_EXIT=0x9c +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_RECEIVEDATACOMPLETEL_ENTRY=0x99 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_RECEIVEDATACOMPLETEL_EXIT=0x9a +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_RECEIVEEVENTL_ENTRY=0x97 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_RECEIVEEVENTL_EXIT=0x98 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_SENDDATACOMPLETEL_ENTRY=0x95 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_SENDDATACOMPLETEL_EXIT=0x96 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_SENDEVENTL_ENTRY=0x93 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_SENDEVENTL_EXIT=0x94 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_SENDINITACK_ENTRY=0x91 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPEVENTHANDLER_SENDINITACK_EXIT=0x92 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_CANCELRECEIVEL_ENTRY=0xc0 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_CANCELRECEIVEL_EXIT=0xc1 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_CANCELSENDL_ENTRY=0xb4 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_CANCELSENDL_EXIT=0xb5 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_COMPLETESELF_ENTRY=0xcc +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_COMPLETESELF_EXIT=0xcd +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_CONNECTION_ENTRY=0xc2 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_CONNECTION_EXIT=0xc3 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_CONSTRUCTL_ENTRY=0xa1 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_CONSTRUCTL_EXIT=0xa2 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_CPTPIPSOCKETHANDLERBASE_ENTRY=0x9f +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_CPTPIPSOCKETHANDLERBASE_EXIT=0xa0 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL_ENTRY=0xaf +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL_EXIT=0xb0 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_DATASTREAMDIRECTION_ENTRY=0xce +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_DATASTREAMDIRECTION_EXIT=0xcf +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_DOCANCEL_ENTRY=0xa7 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_DOCANCEL_EXIT=0xa8 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL_ENTRY=0xb8 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL_EXIT=0xb9 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_PROCESSFIRSTRECEIVEDCHUNKL_ENTRY=0xba +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_PROCESSFIRSTRECEIVEDCHUNKL_EXIT=0xbb +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL_ENTRY=0xad +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL_EXIT=0xae +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RECEIVEDATACOMPLETEL_ENTRY=0xbe +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RECEIVEDATACOMPLETEL_EXIT=0xbf +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RECEIVEDATAL_ENTRY=0xb6 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RECEIVEDATAL_EXIT=0xb7 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RESETRECEIVEDATASTREAM_ENTRY=0xc8 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RESETRECEIVEDATASTREAM_EXIT=0xc9 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RESETSENDDATASTREAM_ENTRY=0xc6 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RESETSENDDATASTREAM_EXIT=0xc7 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML_ENTRY=0xbc +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML_EXIT=0xbd +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RUNERROR_ENTRY=0xa9 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RUNERROR_EXIT=0xaa +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RUNL_ENTRY=0xa5 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_RUNL_EXIT=0xa6 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_SENDDATACOMPLETEL_ENTRY=0xb2 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_SENDDATACOMPLETEL_EXIT=0xb3 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_SENDDATAL_ENTRY=0xab +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_SENDDATAL_EXIT=0xac +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_SETSOCKETOPTIONS_ENTRY=0xd2 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_SETSOCKETOPTIONS_EXIT=0xd3 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_SETSOCKET_ENTRY=0xd0 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_SETSOCKET_EXIT=0xd1 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_SETSTATE_ENTRY=0xca +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_SETSTATE_EXIT=0xcb +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_SOCKET_ENTRY=0xc4 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPSOCKETHANDLERBASE_SOCKET_EXIT=0xc5 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_CONSTRUCTL_ENTRY=0xd8 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_CONSTRUCTL_EXIT=0xd9 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_CPTPIPTRANSPORT_ENTRY=0xd6 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_CPTPIPTRANSPORT_EXIT=0xd7 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_GETEXTENDEDINTERFACE_ENTRY=0xe2 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_GETEXTENDEDINTERFACE_EXIT=0xe3 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_MODECHANGED_ENTRY=0xe0 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_MODECHANGED_EXIT=0xe1 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_NEWL_ENTRY=0xd4 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_NEWL_EXIT=0xd5 +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_STARTL_ENTRY=0xdc +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_STARTL_EXIT=0xdd +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_STOP_ENTRY=0xde +[TRACE]TRACE_FLOW[0x8A]_CPTPIPTRANSPORT_STOP_EXIT=0xdf +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPCOMMANDHANDLER_CPTPIPCOMMANDHANDLER_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPCOMMANDHANDLER_CPTPIPCOMMANDHANDLER_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPCONNECTION_CPTPIPCONNECTION_ENTRY=0x1d +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPCONNECTION_CPTPIPCONNECTION_EXIT=0x1e +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPEVENTHANDLER_CPTPIPEVENTHANDLER_ENTRY=0x8f +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPEVENTHANDLER_CPTPIPEVENTHANDLER_EXIT=0x90 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPSOCKETHANDLERBASE_CPTPIPSOCKETHANDLERBASE_ENTRY=0xa3 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPSOCKETHANDLERBASE_CPTPIPSOCKETHANDLERBASE_EXIT=0xa4 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL_EXIT=0xb1 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPTRANSPORT_CPTPIPTRANSPORT_ENTRY=0xda +[TRACE]TRACE_FLOW[0x8A]_DUP1_CPTPIPTRANSPORT_CPTPIPTRANSPORT_EXIT=0xdb +[TRACE]TRACE_FLOW[0x8A]__E32DLL_ENTRY=0xe6 +[TRACE]TRACE_FLOW[0x8A]__E32DLL_EXIT=0xe7 +[TRACE]TRACE_FLOW[0x8A]__IMPLEMENTATIONGROUPPROXY_ENTRY=0xe4 +[TRACE]TRACE_FLOW[0x8A]__IMPLEMENTATIONGROUPPROXY_EXIT=0xe5 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_HANDLECOMMANDCANCELCOMPLETEL=0x2b +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_HANDLECOMMANDCANCELL=0x28 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_HANDLEERROR=0x33 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_HANDLEEVENTCANCELL=0x26 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_INITIATECOMMANDREQUESTPHASEL=0x5 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL=0xb +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL=0x6 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_RECEIVEDATAL=0x13 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL=0x14 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_RUNERROR=0x4 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_RUNL=0x2 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_SENDCANCELRESPONSEL=0x2d +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_SENDCOMMANDCHANNELCOMPLETEL=0x1f +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_SENDDATAL=0x21 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_SENDEVENTCOMPLETEL=0x24 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_SENDEVENTL=0x22 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_SENDRESPONSEL=0x19 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_SETCONNECTIONSTATE=0x35 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_SETTRANSACTIONPHASE=0x34 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_STOPCONNECTION=0x2f +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_TRANSACTIONCOMPLETEL=0x1 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_TRANSFERSOCKETSL=0x2e +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL=0x36 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_VALIDATEANDSETEVENTPAYLOADL=0x3e +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_VALIDATEDATAPACKETL=0x3b +[TRACE]TRACE_NORMAL[0x86]_CPTPIPCONNECTION_VALIDATETRANSACTIONPHASE=0x40 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_CANCELRECEIVEL=0x7e +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_CANCELSENDL=0x6a +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL=0x63 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_DOCANCEL=0x4a +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL=0x6b +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_PROCESSFIRSTRECEIVEDCHUNKL=0x6f +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x53 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x7d +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_RUNERROR=0x4d +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_RUNL=0x42 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_SENDDATAL=0x50 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_SETSOCKETOPTIONS=0x80 +[TRACE]TRACE_NORMAL[0x86]_CPTPIPSOCKETHANDLERBASE_SETSTATE=0x7f +[TRACE]TRACE_NORMAL[0x86]_CPTPIPTRANSPORT_CONSTRUCTL=0x82 +[TRACE]TRACE_NORMAL[0x86]_DUP10_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x5d +[TRACE]TRACE_NORMAL[0x86]_DUP10_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x7a +[TRACE]TRACE_NORMAL[0x86]_DUP11_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x5f +[TRACE]TRACE_NORMAL[0x86]_DUP11_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x7b +[TRACE]TRACE_NORMAL[0x86]_DUP12_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x60 +[TRACE]TRACE_NORMAL[0x86]_DUP12_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x7c +[TRACE]TRACE_NORMAL[0x86]_DUP14_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x61 +[TRACE]TRACE_NORMAL[0x86]_DUP15_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x62 +[TRACE]TRACE_NORMAL[0x86]_DUP16_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x5e +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_HANDLECOMMANDCANCELCOMPLETEL=0x2c +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_HANDLECOMMANDCANCELL=0x29 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_HANDLEEVENTCANCELL=0x27 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL=0xc +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL=0x7 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL=0x15 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_RUNL=0x3 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_SENDCOMMANDCHANNELCOMPLETEL=0x20 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_SENDEVENTCOMPLETEL=0x25 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_SENDEVENTL=0x23 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_SENDRESPONSEL=0x1a +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_STOPCONNECTION=0x30 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL=0x37 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_VALIDATEANDSETEVENTPAYLOADL=0x3f +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_VALIDATEDATAPACKETL=0x3c +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPCONNECTION_VALIDATETRANSACTIONPHASE=0x41 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL=0x64 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPSOCKETHANDLERBASE_DOCANCEL=0x4b +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL=0x6c +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPSOCKETHANDLERBASE_PROCESSFIRSTRECEIVEDCHUNKL=0x70 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x54 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x72 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPSOCKETHANDLERBASE_RUNERROR=0x4e +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPSOCKETHANDLERBASE_RUNL=0x43 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPSOCKETHANDLERBASE_SENDDATAL=0x52 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CPTPIPSOCKETHANDLERBASE_SETSOCKETOPTIONS=0x81 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPCONNECTION_HANDLECOMMANDCANCELL=0x2a +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL=0xd +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL=0x8 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL=0x16 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPCONNECTION_SENDRESPONSEL=0x1b +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPCONNECTION_STOPCONNECTION=0x31 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL=0x38 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPCONNECTION_VALIDATEDATAPACKETL=0x3d +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL=0x65 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPSOCKETHANDLERBASE_DOCANCEL=0x4c +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL=0x6d +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x55 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x73 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPSOCKETHANDLERBASE_RUNERROR=0x4f +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPSOCKETHANDLERBASE_RUNL=0x44 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CPTPIPSOCKETHANDLERBASE_SENDDATAL=0x51 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL=0xe +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL=0x9 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL=0x17 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPIPCONNECTION_SENDRESPONSEL=0x1c +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPIPCONNECTION_STOPCONNECTION=0x32 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL=0x39 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL=0x66 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPIPSOCKETHANDLERBASE_PROCESSFIRSTRECEIVEDCHUNKL=0x71 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x56 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x74 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CPTPIPSOCKETHANDLERBASE_RUNL=0x45 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL=0x11 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CPTPIPCONNECTION_RECEIVECOMMANDCOMPLETEL=0xa +[TRACE]TRACE_NORMAL[0x86]_DUP4_CPTPIPCONNECTION_RECEIVEEVENTCOMPLETEL=0x18 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CPTPIPCONNECTION_SENDRESPONSEL=0x1d +[TRACE]TRACE_NORMAL[0x86]_DUP4_CPTPIPCONNECTION_VALIDATEANDSETCOMMANDPAYLOADL=0x3a +[TRACE]TRACE_NORMAL[0x86]_DUP4_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL=0x67 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CPTPIPSOCKETHANDLERBASE_INITIATEFIRSTCHUNKRECEIVEL=0x6e +[TRACE]TRACE_NORMAL[0x86]_DUP4_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x57 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CPTPIPSOCKETHANDLERBASE_RUNL=0x46 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL=0xf +[TRACE]TRACE_NORMAL[0x86]_DUP5_CPTPIPCONNECTION_SENDRESPONSEL=0x1e +[TRACE]TRACE_NORMAL[0x86]_DUP5_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL=0x68 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x58 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x75 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CPTPIPSOCKETHANDLERBASE_RUNL=0x47 +[TRACE]TRACE_NORMAL[0x86]_DUP6_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL=0x10 +[TRACE]TRACE_NORMAL[0x86]_DUP6_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x59 +[TRACE]TRACE_NORMAL[0x86]_DUP6_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x76 +[TRACE]TRACE_NORMAL[0x86]_DUP6_CPTPIPSOCKETHANDLERBASE_RUNL=0x48 +[TRACE]TRACE_NORMAL[0x86]_DUP7_CPTPIPCONNECTION_RECEIVECOMMANDCHANNELCOMPLETEL=0x12 +[TRACE]TRACE_NORMAL[0x86]_DUP7_CPTPIPSOCKETHANDLERBASE_CREATEANDSENDDATAPACKETSL=0x69 +[TRACE]TRACE_NORMAL[0x86]_DUP7_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x5a +[TRACE]TRACE_NORMAL[0x86]_DUP7_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x77 +[TRACE]TRACE_NORMAL[0x86]_DUP7_CPTPIPSOCKETHANDLERBASE_RUNL=0x49 +[TRACE]TRACE_NORMAL[0x86]_DUP8_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x5b +[TRACE]TRACE_NORMAL[0x86]_DUP8_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x78 +[TRACE]TRACE_NORMAL[0x86]_DUP9_CPTPIPSOCKETHANDLERBASE_PROCESSSENDDATAL=0x5c +[TRACE]TRACE_NORMAL[0x86]_DUP9_CPTPIPSOCKETHANDLERBASE_RESUMERECEIVEDATASTREAML=0x79 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_cc/group/mtpusbsiccc.mmp --- a/mtptransports/mtpusbtransport/usbsic_cc/group/mtpusbsiccc.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_cc/group/mtpusbsiccc.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -18,7 +18,6 @@ /** @file */ -#include TARGET mtpusbsiccc.dll TARGETTYPE PLUGIN @@ -31,7 +30,8 @@ USERINCLUDE ../inc USERINCLUDE ../../common/inc -USERINCLUDE ../../../../mtpfws/mtpfw/common/inc +USERINCLUDE ../../../../mtpfws/mtpfw/common/inc +USERINCLUDE ../traces MW_LAYER_SYSTEMINCLUDE_SYMBIAN diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_cc/inc/cmtpusbsicclasscontroller.h --- a/mtptransports/mtpusbtransport/usbsic_cc/inc/cmtpusbsicclasscontroller.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_cc/inc/cmtpusbsicclasscontroller.h Fri Sep 17 08:34:51 2010 +0300 @@ -24,8 +24,6 @@ #include #include -#include "mtpdebug.h" - class MUsbClassControllerNotify; class TUsbDescriptor; @@ -58,13 +56,6 @@ CMTPUsbSicClassController(MUsbClassControllerNotify& aOwner); void ConstructL(); - -protected: - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; private: diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_cc/src/cmtpusbsicclasscontroller.cpp --- a/mtptransports/mtpusbtransport/usbsic_cc/src/cmtpusbsicclasscontroller.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_cc/src/cmtpusbsicclasscontroller.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -22,12 +22,14 @@ #include #include "mtpdebug.h" #include "mtpusbprotocolconstants.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpusbsicclasscontrollerTraces.h" +#endif + const TInt KSicCCStartupPriority = 3; -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"CMTPUsbSicClassController");) - /** This method returns a pointer to a newly created CMTPUsbSicClassController object. @param aOwner USB Device that owns and manages the class. @@ -47,10 +49,9 @@ */ CMTPUsbSicClassController::~CMTPUsbSicClassController() { - __FLOG(_L8("~CMTPUsbSicClassController - Entry")); + OstTraceFunctionEntry0( CMTPUSBSICCLASSCONTROLLER_CMTPUSBSICCLASSCONTROLLER_ENTRY ); Cancel(); - __FLOG(_L8("~CMTPUsbSicClassController - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPUSBSICCLASSCONTROLLER_CMTPUSBSICCLASSCONTROLLER_EXIT ); } /** @@ -68,9 +69,8 @@ */ void CMTPUsbSicClassController::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPUSBSICCLASSCONTROLLER_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPUSBSICCLASSCONTROLLER_CONSTRUCTL_EXIT ); } /** @@ -79,7 +79,7 @@ */ void CMTPUsbSicClassController::Start(TRequestStatus& aStatus) { - __FLOG(_L8("Start - Entry")); + OstTraceFunctionEntry0( CMTPUSBSICCLASSCONTROLLER_START_ENTRY ); TRequestStatus* reportStatus = &aStatus; iState = EUsbServiceStarting; @@ -89,14 +89,15 @@ if (err != KErrNone) { - __FLOG_VA((_L8("iMTPSession.Connect() failed with %d"), err)); + OstTrace1( TRACE_ERROR, CMTPUSBSICCLASSCONTROLLER_START, "iMTPSession.Connect() failed with %d", err); iState = EUsbServiceIdle; User::RequestComplete(reportStatus, err); + OstTraceFunctionExit0( CMTPUSBSICCLASSCONTROLLER_START_EXIT ); return; } // Start MTP USB Still Image class transport. err = iMTPSession.StartTransport(TUid::Uid(KMTPUsbTransportImplementationUid)); - __FLOG_VA((_L8("StartTransport returns %d"), err)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBSICCLASSCONTROLLER_START, "StartTransport returns %d", err ); if (err != KErrNone) { iState = EUsbServiceIdle; @@ -108,7 +109,7 @@ } User::RequestComplete(reportStatus, err); - __FLOG(_L8("Start - Exit")); + OstTraceFunctionExit0( DUP1_CMTPUSBSICCLASSCONTROLLER_START_EXIT ); } @@ -118,21 +119,22 @@ */ void CMTPUsbSicClassController::Stop(TRequestStatus& aStatus) { - __FLOG(_L8("Stop - Entry")); + OstTraceFunctionEntry0( CMTPUSBSICCLASSCONTROLLER_STOP_ENTRY ); TRequestStatus* reportStatus = &aStatus; TInt err = iMTPSession.StopTransport(TUid::Uid(KMTPUsbTransportImplementationUid)); - __FLOG_VA((_L8("StopTransport returns %d"), err)); + OstTrace1( TRACE_NORMAL, CMTPUSBSICCLASSCONTROLLER_STOP, "StopTransport returns %d", err ); if (err != KErrNone) { iState = EUsbServiceStarted; User::RequestComplete(reportStatus, err); + OstTraceFunctionExit0( CMTPUSBSICCLASSCONTROLLER_STOP_EXIT ); return; } iMTPSession.Close(); User::RequestComplete(reportStatus, KErrNone); - __FLOG(_L8("Stop - Exit")); + OstTraceFunctionExit0( DUP1_CMTPUSBSICCLASSCONTROLLER_STOP_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_cc/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpusbtransport/usbsic_cc/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_cc/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpusbtransport/usbsic_cc/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,34 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_NORMAL=0x86 +[TRACE]TRACE_ERROR[0x82]_CMTPUSBSICCLASSCONTROLLER_START=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBSICCLASSCONTROLLER_CMTPUSBSICCLASSCONTROLLER_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBSICCLASSCONTROLLER_CMTPUSBSICCLASSCONTROLLER_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBSICCLASSCONTROLLER_CONSTRUCTL_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBSICCLASSCONTROLLER_CONSTRUCTL_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBSICCLASSCONTROLLER_START_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBSICCLASSCONTROLLER_START_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBSICCLASSCONTROLLER_STOP_ENTRY=0x8 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBSICCLASSCONTROLLER_STOP_EXIT=0x9 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPUSBSICCLASSCONTROLLER_START_EXIT=0x7 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPUSBSICCLASSCONTROLLER_STOP_EXIT=0xa +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBSICCLASSCONTROLLER_STOP=0x2 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBSICCLASSCONTROLLER_START=0x1 diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/group/mtpusbsicimp.mmp --- a/mtptransports/mtpusbtransport/usbsic_imp/group/mtpusbsicimp.mmp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/group/mtpusbsicimp.mmp Fri Sep 17 08:34:51 2010 +0300 @@ -16,11 +16,14 @@ // /** +To log transferred MTP-USB packets, uncomment the following line +*/ +//MACRO MTP_DEBUG_OST_HEX_DUMP + +/** @file */ -#include - TARGET mtpusbsicimp.dll TARGETTYPE PLUGIN UID 0x10009D8D 0x102827AC @@ -35,6 +38,7 @@ USERINCLUDE ../../usbdatatypes/inc USERINCLUDE ../../../../mtpfws/mtpfw/transports/transportapi/inc USERINCLUDE ../../../../mtpfws/mtpfw/common/inc +USERINCLUDE ../traces SOURCEPATH ../src/ SOURCE cmtpusbconnection.cpp diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/inc/cmtpusbconnection.h --- a/mtptransports/mtpusbtransport/usbsic_imp/inc/cmtpusbconnection.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/inc/cmtpusbconnection.h Fri Sep 17 08:34:51 2010 +0300 @@ -30,7 +30,6 @@ #include "mtpusbtransportconstants.h" #include "mmtptransportconnection.h" -#include "mtpdebug.h" #include "tmtpusbcontrolrequestsetup.h" #include "tmtpusbcontrolrequestcanceldata.h" #include "tmtpusbcontrolrequestdevicestatus.h" @@ -422,11 +421,6 @@ is triggered. */ TBool iIsResetRequestSignaled; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; private: // Not owned. diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/inc/cmtpusbepbase.h --- a/mtptransports/mtpusbtransport/usbsic_imp/inc/cmtpusbepbase.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/inc/cmtpusbepbase.h Fri Sep 17 08:34:51 2010 +0300 @@ -25,8 +25,6 @@ #include #include -#include "mtpdebug.h" - class CMTPUsbConnection; /** @@ -61,11 +59,7 @@ CMTPUsbEpBase(TUint aId, TPriority aPriority, CMTPUsbConnection& aConnection); -#ifdef __FLOG_ACTIVE - virtual void ConstructL(const TDesC8& aComponentName); -#else virtual void ConstructL(); -#endif CMTPUsbConnection& Connection() const; @@ -96,14 +90,7 @@ TBool ValidateUSBHeaderL(); void InitiateFirstChunkReceiveL(); void ProcessFirstReceivedChunkL(); - -protected: // Owned - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER_MUTABLE; - private: // Owned /** diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/inc/cmtpusbepwatcher.h --- a/mtptransports/mtpusbtransport/usbsic_imp/inc/cmtpusbepwatcher.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/inc/cmtpusbepwatcher.h Fri Sep 17 08:34:51 2010 +0300 @@ -20,8 +20,6 @@ #ifndef CMTPUSBENDPOINTWATCHER_H #define CMTPUSBENDPOINTWATCHER_H -#include "mtpdebug.h" - class CMTPUsbConnection; /** @@ -54,12 +52,6 @@ void RequestIssue(); private: // Owned - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER; - /** The endpoint stall status flags. */ @@ -73,4 +65,4 @@ CMTPUsbConnection& iConnection; }; -#endif // CMTPUSBENDPOINTWATCHER_H \ No newline at end of file +#endif // CMTPUSBENDPOINTWATCHER_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/inc/cmtpusbtransport.h --- a/mtptransports/mtpusbtransport/usbsic_imp/inc/cmtpusbtransport.h Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/inc/cmtpusbtransport.h Fri Sep 17 08:34:51 2010 +0300 @@ -21,7 +21,6 @@ #define CMTPUSBTRANSPORT_H #include "cmtptransportplugin.h" -#include "mtpdebug.h" class CMTPUsbConnection; @@ -59,11 +58,6 @@ The USB MTP device class connection */ CMTPUsbConnection* iConnection; - - /** - FLOGGER debug trace member variable. - */ - __FLOG_DECLARATION_MEMBER; }; #endif // CMTPUSBTRANSPORT_H diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbconnection.cpp --- a/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbconnection.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbconnection.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -33,8 +33,9 @@ #include "mtpusbpanic.h" #include "mtpusbprotocolconstants.h" -#ifdef _DEBUG -#include +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpusbconnectionTraces.h" #endif #define UNUSED_VAR(a) (a)=(a) @@ -44,9 +45,6 @@ const TInt KMTPNullChunkSize(0x00020000); // 100KB const TUint KUSBHeaderSize = 12; -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"UsbConnection");) - // Endpoint meta data. const CMTPUsbConnection::TEpInfo CMTPUsbConnection::KEndpointMetaData[EMTPUsbEpNumEndpoints] = { @@ -77,7 +75,7 @@ */ CMTPUsbConnection::~CMTPUsbConnection() { - __FLOG(_L8("~CMTPUsbConnection - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_CMTPUSBCONNECTION_DES_ENTRY ); // Terminate all endpoint data transfer activity. StopConnection(); @@ -97,30 +95,29 @@ BoundProtocolLayer().Unbind(*this); } iProtocolLayer = NULL; - - __FLOG(_L8("~CMTPUsbConnection - Exit")); - __FLOG_CLOSE; + + OstTraceFunctionExit0( CMTPUSBCONNECTION_CMTPUSBCONNECTION_DES_EXIT ); } void CMTPUsbConnection::BindL(MMTPConnectionProtocol& aProtocol) { - __FLOG(_L8("BindL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_BINDL_ENTRY ); __ASSERT_DEBUG(!iProtocolLayer, Panic(EMTPUsbBadState)); iProtocolLayer = &aProtocol; - __FLOG(_L8("BindL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_BINDL_EXIT ); } MMTPConnectionProtocol& CMTPUsbConnection::BoundProtocolLayer() { - __FLOG(_L8("BoundProtocolLayer - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_BOUNDPROTOCOLLAYER_ENTRY ); __ASSERT_DEBUG(iProtocolLayer, Panic(EMTPUsbBadState)); - __FLOG(_L8("BoundProtocolLayer - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_BOUNDPROTOCOLLAYER_EXIT ); return *iProtocolLayer; } void CMTPUsbConnection::CloseConnection() { - __FLOG(_L8("CloseConnection - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_CLOSECONNECTION_ENTRY ); /* Terminate all endpoint data transfer activity, stall all but the control endpoints, and wait for the host to issue a Device Reset Request. @@ -128,19 +125,19 @@ StopConnection(); TRAPD(err, BulkEndpointsStallL()); UNUSED_VAR(err); - __FLOG(_L8("CloseConnection - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_CLOSECONNECTION_EXIT ); } void CMTPUsbConnection::ReceiveDataL(MMTPType& aData, const TMTPTypeRequest& /*aRequest*/) { - __FLOG(_L8("ReceiveDataL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_RECEIVEDATAL_ENTRY ); // Update the transaction state. SetBulkTransactionState(EDataIToRPhase); if (iIsCancelReceived) //cancel received { - __FLOG(_L8("Transaction has been cancelled, just flush trash data and complete")); + OstTrace0( TRACE_NORMAL, CMTPUSBCONNECTION_RECEIVEDATAL, "Transaction has been cancelled, just flush trash data and complete" ); static_cast(iEndpoints[EMTPUsbEpBulkOut])->FlushRxDataL(); BoundProtocolLayer().ReceiveDataCompleteL(KErrCancel, aData, iMTPRequest); } @@ -155,13 +152,13 @@ static_cast(iEndpoints[EMTPUsbEpBulkOut])->ReceiveBulkDataL(*iUsbBulkContainer); } - - __FLOG(_L8("ReceiveDataL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_RECEIVEDATAL_EXIT ); } void CMTPUsbConnection::ReceiveDataCancelL(const TMTPTypeRequest& /*aRequest*/) { - __FLOG(_L8("ReceiveDataCancelL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_RECEIVEDATACANCELL_ENTRY ); // Store the device status code. TUint16 deviceStatus = iDeviceStatusCode; @@ -171,19 +168,19 @@ // Restore it. SetDeviceStatus(deviceStatus); - __FLOG(_L8("ReceiveDataCancelL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_RECEIVEDATACANCELL_EXIT ); } void CMTPUsbConnection::SendDataL(const MMTPType& aData, const TMTPTypeRequest& aRequest) { - __FLOG(_L8("SendDataL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SENDDATAL_ENTRY ); ProcessBulkDataInL(aRequest, aData); - __FLOG(_L8("SendDataL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_SENDDATAL_EXIT ); } void CMTPUsbConnection::SendDataCancelL(const TMTPTypeRequest& /*aRequest*/) { - __FLOG(_L8("SendDataCancelL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SENDDATACANCELL_ENTRY ); // Store the device status code. TUint16 deviceStatus = iDeviceStatusCode; @@ -191,12 +188,12 @@ static_cast(iEndpoints[EMTPUsbEpBulkIn])->CancelSendL(KErrCancel); // Restore it. SetDeviceStatus(deviceStatus); - __FLOG(_L8("SendDataCancelL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_SENDDATACANCELL_EXIT ); } void CMTPUsbConnection::SendEventL(const TMTPTypeEvent& aEvent) { - __FLOG(_L8("SendEventL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SENDEVENTL_ENTRY ); // Reset the event. iMTPEvent.Reset(); @@ -207,7 +204,7 @@ case EIdle: case EStalled: // Drop the event. - __FLOG(_L8("Dropping the event")); + OstTrace0( TRACE_NORMAL, CMTPUSBCONNECTION_SENDEVENTL, "Dropping the event" ); BoundProtocolLayer().SendEventCompleteL(KErrNone, aEvent); break; @@ -221,7 +218,7 @@ if (!iEventPending) { // Send the event data. - __FLOG(_L8("Sending the event")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPUSBCONNECTION_SENDEVENTL, "Sending the event" ); BufferEventDataL(aEvent); SendEventDataL(); } @@ -237,13 +234,13 @@ if (iLdd.SignalRemoteWakeup() == KErrNone) { // Remote wakeup is enabled, buffer the event data. - __FLOG(_L8("Buffer event data and signal remote wakeup")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPUSBCONNECTION_SENDEVENTL, "Buffer event data and signal remote wakeup" ); BufferEventDataL(aEvent); } else { // Remote wakeup is not enabled, drop the event. - __FLOG(_L8("Dropping the event")); + OstTrace0( TRACE_NORMAL, DUP3_CMTPUSBCONNECTION_SENDEVENTL, "Dropping the event" ); BoundProtocolLayer().SendEventCompleteL(KErrNone, aEvent); } @@ -255,30 +252,31 @@ case ESuspendedEventsPending: // Drop the event. - __FLOG(_L8("Dropping the event")); + OstTrace0( TRACE_NORMAL, DUP4_CMTPUSBCONNECTION_SENDEVENTL, "Dropping the event" ); BoundProtocolLayer().SendEventCompleteL(KErrNone, aEvent); break; default: - __FLOG(_L8("Invalid suspend state")); + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_FATAL, DUP5_CMTPUSBCONNECTION_SENDEVENTL, "Invalid suspend state %d", SuspendState() ); Panic(EMTPUsbBadState); break; } break; default: - __FLOG(_L8("Invalid connection state")); + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_FATAL, DUP6_CMTPUSBCONNECTION_SENDEVENTL, "Invalid connection state %d", ConnectionState() ); Panic(EMTPUsbBadState); break; } - - __FLOG(_L8("SendEventL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_SENDEVENTL_EXIT ); } void CMTPUsbConnection::SendResponseL(const TMTPTypeResponse& aResponse, const TMTPTypeRequest& aRequest) { - __FLOG(_L8("SendResponseL - Entry")); - __FLOG_VA((_L8("DeviceState: 0x%x TransactionState: 0x%x Connection: 0x%x"), iDeviceStatusCode, iBulkTransactionState, ConnectionState())); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SENDRESPONSEL_ENTRY ); + OstTraceExt3( TRACE_NORMAL, CMTPUSBCONNECTION_SENDRESPONSEL, + "DeviceState: 0x%x TransactionState: 0x%x Connection: 0x%x", (TUint32)iDeviceStatusCode, iBulkTransactionState, ConnectionState() ); // Update the transaction state. SetBulkTransactionState(EResponsePhase); @@ -286,18 +284,21 @@ { TUint16 opCode(aRequest.Uint16(TMTPTypeRequest::ERequestOperationCode)); TUint16 rspCode(aResponse.Uint16(TMTPTypeResponse::EResponseCode)); - __FLOG_VA((_L8("ResponseCode = 0x%04X, Operation Code = 0x%04X"), rspCode, opCode)); - + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPUSBCONNECTION_SENDRESPONSEL, + "ResponseCode = 0x%04X, Operation Code = 0x%04X", rspCode, opCode ); + if ((opCode == EMTPOpCodeOpenSession) && (rspCode == EMTPRespCodeOK)) { // An session has been opened. Record the active SessionID. iMTPSessionId = aRequest.Uint32(TMTPTypeRequest::ERequestParameter1); - __FLOG_VA((_L8("Processing OpenSession response, SessionID = %d"), iMTPSessionId)); + OstTrace1( TRACE_NORMAL, DUP2_CMTPUSBCONNECTION_SENDRESPONSEL, + "Processing OpenSession response, SessionID = %d", iMTPSessionId ); } else if (((opCode == EMTPOpCodeCloseSession) || (opCode == EMTPOpCodeResetDevice))&& (rspCode == EMTPRespCodeOK)) { // An session has been closed. Clear the active SessionID. - __FLOG_VA((_L8("Processing CloseSession or ResetDevice response, SessionID = %d"), iMTPSessionId)); + OstTrace1( TRACE_NORMAL, DUP3_CMTPUSBCONNECTION_SENDRESPONSEL, + "Processing CloseSession or ResetDevice response, SessionID = %d", iMTPSessionId ); iMTPSessionId = KMTPSessionNone; } @@ -318,23 +319,24 @@ iUsbBulkContainer->SetUint32L(CMTPUsbContainer::ETransactionID, aRequest.Uint32(TMTPTypeRequest::ERequestTransactionID)); // Initiate the bulk data send sequence. - __FLOG_VA((_L8("Sending response 0x%04X (%d bytes)"), iUsbBulkContainer->Uint16L(CMTPUsbContainer::ECode), iUsbBulkContainer->Uint32L(CMTPUsbContainer::EContainerLength))); + OstTraceExt2( TRACE_NORMAL, DUP4_CMTPUSBCONNECTION_SENDRESPONSEL, + "Sending response 0x%04X (%d bytes)", (TUint32)iUsbBulkContainer->Uint16L(CMTPUsbContainer::ECode), iUsbBulkContainer->Uint32L(CMTPUsbContainer::EContainerLength)); static_cast(iEndpoints[EMTPUsbEpBulkIn])->SendBulkDataL(*iUsbBulkContainer); } else { BoundProtocolLayer().SendResponseCompleteL(KErrNone, aResponse, aRequest); } - - __FLOG(_L8("SendResponseL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_SENDRESPONSEL_EXIT ); } void CMTPUsbConnection::TransactionCompleteL(const TMTPTypeRequest& /*aRequest*/) { - __FLOG(_L8("TransactionCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_TRANSACTIONCOMPLETEL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPUSBCONNECTION_TRANSACTIONCOMPLETEL, + "DeviceState: 0x%x TransactionState: 0x%x", iDeviceStatusCode, iBulkTransactionState ); - __FLOG_VA((_L8("DeviceState: 0x%x TransactionState: 0x%x"), iDeviceStatusCode, iBulkTransactionState)); - if (iBulkTransactionState != ERequestPhase) { // Update the transaction state. @@ -355,16 +357,16 @@ StartConnectionL(); } } - - __FLOG(_L8("TransactionCompleteL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_TRANSACTIONCOMPLETEL_EXIT ); } void CMTPUsbConnection::Unbind(MMTPConnectionProtocol& /*aProtocol*/) { - __FLOG(_L8("Unbind - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_UNBIND_ENTRY ); __ASSERT_DEBUG(iProtocolLayer, Panic(EMTPUsbBadState)); iProtocolLayer = NULL; - __FLOG(_L8("Unbind - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_UNBIND_EXIT ); } TAny* CMTPUsbConnection::GetExtendedInterface(TUid /*aInterfaceUid*/) @@ -379,12 +381,13 @@ void CMTPUsbConnection::ReceiveBulkDataCompleteL(TInt aError, MMTPType& /*aData*/) { - __FLOG(_L8("ReceiveBulkDataCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_RECEIVEBULKDATACOMPLETEL_ENTRY ); if (!BulkRequestErrorHandled(aError)) { TUint type(iUsbBulkContainer->Uint16L(CMTPUsbContainer::EContainerType)); - __FLOG_VA((_L8("Received container type 0x%04X"), type)); - + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_RECEIVEBULKDATACOMPLETEL, + "Received container type 0x%04X", type ); + // The proper behaviour at this point is to stall the end points // but alas Microsoft does not honor this. // The solution is to store the error code, consume all the data @@ -397,7 +400,8 @@ && iDeviceStatusCode != EMTPUsbDeviceStatusTransactionCancelled // we haven't been cancelled by the initiator ) { - __FLOG_VA((_L8("ReceiveBulkDataCompleteL - error: %d"), aError)); + OstTrace1( TRACE_ERROR, DUP1_CMTPUSBCONNECTION_RECEIVEBULKDATACOMPLETEL, + "ReceiveBulkDataCompleteL - error: %d", aError ); iXferError = aError; // Update the transaction state. @@ -434,7 +438,8 @@ case EMTPUsbContainerTypeEventBlock: default: // Invalid container received, shutdown the bulk data pipe. - __FLOG_VA((_L8("Invalid container type = 0x%04X"), type)); + OstTrace1( TRACE_ERROR, DUP2_CMTPUSBCONNECTION_RECEIVEBULKDATACOMPLETEL, + "Invalid container type = 0x%04X", type ); CloseConnection(); } // Reset the bulk container. @@ -452,13 +457,13 @@ isCommandIgnored = false; } } - - __FLOG(_L8("ReceiveBulkDataCompleteL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_RECEIVEBULKDATACOMPLETEL_EXIT ); } void CMTPUsbConnection::ReceiveControlRequestDataCompleteL(TInt aError, MMTPType& /*aData*/) { - __FLOG(_L8("ReceiveControlRequestDataCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL_ENTRY ); if (!ControlRequestErrorHandled(aError)) { // Complete the control request sequence. @@ -467,17 +472,24 @@ if (iUsbControlRequestSetup.Uint8(TMTPUsbControlRequestSetup::EbRequest) == EMTPUsbControlRequestCancel) { // Cancel data received. - __FLOG(_L8("Cancel request data received.")); - + OstTrace0( TRACE_NORMAL, CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL, "Cancel request data received." ); + // Setup the event dataset. - __FLOG_VA((_L8("Cancellation Code = 0x%04X"), iUsbControlRequestCancelData.Uint16(TMTPUsbControlRequestCancelData::ECancellationCode))); - __FLOG_VA((_L8("Transaction ID = 0x%08X"), iUsbControlRequestCancelData.Uint32(TMTPUsbControlRequestCancelData::ETransactionID))); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL, + "Cancellation Code = 0x%04X", iUsbControlRequestCancelData.Uint16(TMTPUsbControlRequestCancelData::ECancellationCode)); + OstTrace1( TRACE_NORMAL, DUP2_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL, + "Transaction ID = 0x%08X", iUsbControlRequestCancelData.Uint32(TMTPUsbControlRequestCancelData::ETransactionID)); #ifdef _DEBUG // print log about the cacel event - RDebug::Print(_L("cancel event received!!!!!!!!!!!!!!!!!Transaction phase is %d ----------------\n"), BoundProtocolLayer().TransactionPhaseL(iMTPSessionId)); - RDebug::Print(_L("The Transaction ID want to canceled is %d -------------"), iUsbControlRequestCancelData.Uint32(TMTPUsbControlRequestCancelData::ETransactionID)); - RDebug::Print(_L("Current Transaction ID is %d ----------------"),iMTPRequest.Uint32(TMTPTypeRequest::ERequestTransactionID)); + OstTrace1( TRACE_NORMAL, DUP3_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL, + "cancel event received!!!!!!!!!!!!!!!!!Transaction phase is %d ----------------", + BoundProtocolLayer().TransactionPhaseL(iMTPSessionId)); + OstTrace1( TRACE_NORMAL, DUP4_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL, + "The Transaction ID want to canceled is %d -------------", + iUsbControlRequestCancelData.Uint32(TMTPUsbControlRequestCancelData::ETransactionID)); + OstTrace1( TRACE_NORMAL, DUP5_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL, + "Current Transaction ID is %d ----------------", iMTPRequest.Uint32(TMTPTypeRequest::ERequestTransactionID)); #endif isResponseTransactionCancelledNeeded = true; @@ -505,15 +517,17 @@ } else if (transPhase == ECompletingPhase) { - __FLOG(_L8("cancel event received at completing phase, flush rx data")); + OstTrace0( TRACE_NORMAL, DUP6_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL, + "cancel event received at completing phase, flush rx data" ); //flush rx data. iEndpoints[EMTPUsbEpBulkOut]->FlushRxDataL(); } else { - __FLOG(_L8("cancel event received at idle phase, stop data EPs, flush rx data, restart data eps")); - + OstTrace0( TRACE_NORMAL, DUP7_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL, + "cancel event received at idle phase, stop data EPs, flush rx data, restart data eps" ); + // stop data endpoint DataEndpointsStop(); @@ -530,17 +544,19 @@ // Initiate the next control request sequence. InitiateControlRequestSequenceL(); } - __FLOG(_L8("ReceiveControlRequestDataCompleteL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL_EXIT ); } void CMTPUsbConnection::ReceiveControlRequestSetupCompleteL(TInt aError, MMTPType& aData) { - __FLOG(_L8("ReceiveControlRequestSetupCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_RECEIVECONTROLREQUESTSETUPCOMPLETEL_ENTRY ); if (!ControlRequestErrorHandled(aError)) { TMTPUsbControlRequestSetup& data(static_cast (aData)); - __FLOG_VA((_L8("bRequest = 0x%X"), data.Uint8(TMTPUsbControlRequestSetup::EbRequest))); - __FLOG_VA((_L8("wLength = %d bytes"), data.Uint16(TMTPUsbControlRequestSetup::EwLength))); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_RECEIVECONTROLREQUESTSETUPCOMPLETEL, + "bRequest = 0x%X", data.Uint8(TMTPUsbControlRequestSetup::EbRequest) ); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTSETUPCOMPLETEL, + "wLength = %d bytes", data.Uint16(TMTPUsbControlRequestSetup::EwLength)); switch (data.Uint8(TMTPUsbControlRequestSetup::EbRequest)) { @@ -557,29 +573,28 @@ break; default: - __FLOG(_L8("Unrecognised class specific request received")); + OstTrace0( TRACE_ERROR, DUP2_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTSETUPCOMPLETEL, + "Unrecognised class specific request received" ); CloseConnection(); break; } } - __FLOG(_L8("ReceiveControlRequestSetupCompleteL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_RECEIVECONTROLREQUESTSETUPCOMPLETEL_EXIT ); } void CMTPUsbConnection::SendBulkDataCompleteL(TInt aError, const MMTPType& /*aData*/) { - __FLOG(_L8("SendBulkDataCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SENDBULKDATACOMPLETEL_ENTRY ); -#ifdef _DEBUG - RDebug::Print(_L("\nCMTPUsbConnection::SendBulkDataCompleteL----entry")); -#endif if (!BulkRequestErrorHandled(aError)) { TUint16 containerType(iUsbBulkContainer->Uint16L(CMTPUsbContainer::EContainerType)); #ifdef _DEBUG TUint16 transactionID(iUsbBulkContainer->Uint32L(CMTPUsbContainer::ETransactionID)); - RDebug::Print(_L("Time Stamp is :%d"), User::TickCount()); - RDebug::Print(_L("the container Type is 0x%x, the transaction ID is 0x%x\n"), containerType,transactionID); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_SENDBULKDATACOMPLETEL, "Time Stamp is :%d", User::TickCount() ); + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPUSBCONNECTION_SENDBULKDATACOMPLETEL, + "the container Type is 0x%x, the transaction ID is 0x%x", containerType,transactionID ); #endif if (containerType == EMTPUsbContainerTypeResponseBlock) @@ -600,7 +615,8 @@ } else { - __FLOG(_L8("Invalid container type")); + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_FATAL, DUP2_CMTPUSBCONNECTION_SENDBULKDATACOMPLETEL, + "Invalid container type %d", containerType ); Panic(EMTPUsbBadState); } @@ -610,12 +626,12 @@ iUsbBulkContainer->SetPayloadL(NULL); } } - __FLOG(_L8("SendBulkDataCompleteL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_SENDBULKDATACOMPLETEL_EXIT ); } void CMTPUsbConnection::SendControlRequestDataCompleteL(TInt aError, const MMTPType& /*aData*/) { - __FLOG(_L8("SendControlRequestDataCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SENDCONTROLREQUESTDATACOMPLETEL_ENTRY ); if (!ControlRequestErrorHandled(aError)) { // Complete the control request sequence. @@ -623,25 +639,25 @@ { // Cancel request processed, clear the device status. SetDeviceStatus(EMTPUsbDeviceStatusOK); - __FLOG(_L8("Cancel Request processed")); + OstTrace0( TRACE_NORMAL, CMTPUSBCONNECTION_SENDCONTROLREQUESTDATACOMPLETEL, "Cancel Request processed" ); } // Initiate the next control request sequence. InitiateControlRequestSequenceL(); } - __FLOG(_L8("SendControlRequestDataCompleteL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_SENDCONTROLREQUESTDATACOMPLETEL_EXIT ); } void CMTPUsbConnection::SendInterruptDataCompleteL(TInt aError, const MMTPType& /*aData*/) { - __FLOG(_L8("SendInterruptDataCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SENDINTERRUPTDATACOMPLETEL_ENTRY ); iEventPending = EFalse; if ( NULL != iProtocolLayer) { BoundProtocolLayer().SendEventCompleteL(aError, iMTPEvent); } - __FLOG(_L8("SendInterruptDataCompleteL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_SENDINTERRUPTDATACOMPLETEL_EXIT ); } /** @@ -672,20 +688,23 @@ */ const TUsbcEndpointCaps& CMTPUsbConnection::EndpointCapsL(TUint aId) { - __FLOG(_L8("EndpointCapsL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_ENDPOINTCAPSL_ENTRY ); // Verify the the USB device supports the minimum number of endpoints. TInt totalEndpoints = iDeviceCaps().iTotalEndpoints; - __FLOG_VA((_L8("% d endpoints available, %d required"), totalEndpoints, KMTPUsbRequiredNumEndpoints)); + OstTraceExt2( TRACE_NORMAL, CMTPUSBCONNECTION_ENDPOINTCAPSL, + "% d endpoints available, %d required", totalEndpoints, KMTPUsbRequiredNumEndpoints ); if (totalEndpoints < KMTPUsbRequiredNumEndpoints) { + OstTrace0( TRACE_ERROR, DUP1_CMTPUSBCONNECTION_ENDPOINTCAPSL, + "Count of endpoints smaller than the minimum number of endpoints required to support the USM MTP device" ); User::Leave(KErrOverflow); } TUint flags(EndpointDirectionAndType(aId)); - __FLOG_VA((_L8("Required EP%d iTypesAndDir = 0x%X"), aId, flags)); - + OstTraceExt2( TRACE_NORMAL, DUP2_CMTPUSBCONNECTION_ENDPOINTCAPSL, "Required EP%d iTypesAndDir = 0x%X", aId, flags ); + TBool found(EFalse); for (TUint i(0); ((!found) && (i < totalEndpoints)); i++) { @@ -695,19 +714,23 @@ { found = ETrue; iEndpointCaps = caps; - - __FLOG_VA((_L8("Matched EP%d iTypesAndDir = 0x%X"), i, caps.iTypesAndDir)); - __FLOG_VA((_L8("Matched EP%d MaxPacketSize = %d"), i, caps.MaxPacketSize())); - __FLOG_VA((_L8("Matched EP%d MinPacketSize = %d"), i, caps.MinPacketSize())); + + OstTraceExt2( TRACE_NORMAL, DUP3_CMTPUSBCONNECTION_ENDPOINTCAPSL, + "Matched EP%d iTypesAndDir = 0x%X", i, caps.iTypesAndDir ); + OstTraceExt2( TRACE_NORMAL, DUP4_CMTPUSBCONNECTION_ENDPOINTCAPSL, + "Matched EP%d MaxPacketSize = %d", i, caps.MaxPacketSize() ); + OstTraceExt2( TRACE_NORMAL, DUP5_CMTPUSBCONNECTION_ENDPOINTCAPSL, + "Matched EP%d MinPacketSize = %d", i, caps.MinPacketSize() ); } } if (!found) { + OstTrace1( TRACE_ERROR, DUP6_CMTPUSBCONNECTION_ENDPOINTCAPSL, "Can't find endpoint capabilities for flags %d", flags ); User::Leave(KErrHardwareNotAvailable); } - - __FLOG(_L8("EndpointCapsL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_ENDPOINTCAPSL_EXIT ); return iEndpointCaps; } @@ -752,19 +775,20 @@ void CMTPUsbConnection::DoCancel() { - __FLOG(_L8("DoCancel - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_DOCANCEL_ENTRY ); iLdd.AlternateDeviceStatusNotifyCancel(); - __FLOG(_L8("DoCancel - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_DOCANCEL_EXIT ); } -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE TInt CMTPUsbConnection::RunError(TInt aError) #else TInt CMTPUsbConnection::RunError(TInt /*aError*/) #endif { - __FLOG(_L8("RunError - Entry")); - __FLOG_VA((_L8("Error = %d"), aError)); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_RUNERROR_ENTRY ); + OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, + CMTPUSBCONNECTION_RUNERROR, "error code %d", aError); // Cancel all the outstanding requests. Cancel(); @@ -777,19 +801,20 @@ // Issue the notify request again. IssueAlternateDeviceStatusNotifyRequest(); - - __FLOG(_L8("RunError - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_RUNERROR_EXIT ); return KErrNone; } void CMTPUsbConnection::RunL() { - __FLOG(_L8("RunL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_RUNL_ENTRY ); if (!(iControllerStateCurrent & KUsbAlternateSetting)) { // Alternative interface setting has not changed. - __FLOG_VA((_L8("Alternate device state changed to %d"), iControllerStateCurrent)); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_RUNL, + "Alternate device state changed to %d", iControllerStateCurrent ); if ((SuspendState() & ESuspended) && (iControllerStateCurrent != EUsbcDeviceStateSuspended)) @@ -822,7 +847,7 @@ case EUsbcDeviceStateConfigured: { - __FLOG(_L8("Device state : EUsbcDeviceStateConfigured")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPUSBCONNECTION_RUNL, "Device state : EUsbcDeviceStateConfigured" ); if (iControllerStatePrevious == EUsbcDeviceStateSuspended) { @@ -843,13 +868,13 @@ if (iRemoteWakeup) { // Send the event data. - __FLOG(_L8("Sending buffered event data")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPUSBCONNECTION_RUNL, "Sending buffered event data" ); SendEventDataL(); } else { // Send PTP UnreportedStatus event - __FLOG(_L8("Sending PTP UnreportedStatus event")); + OstTrace0( TRACE_NORMAL, DUP3_CMTPUSBCONNECTION_RUNL, "Sending PTP UnreportedStatus event" ); SendUnreportedStatusEventL(); } } @@ -872,7 +897,8 @@ } default: - __FLOG(_L8("Invalid alternate device state")); + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_FATAL, DUP4_CMTPUSBCONNECTION_RUNL, + "Invalid alternate device state %d", iControllerStateCurrent ); Panic(EMTPUsbBadState); break; } @@ -880,15 +906,16 @@ else { // Alternate interface setting has changed. - __FLOG_VA((_L8("Alternate interface setting changed from %d to %d"), iControllerStatePrevious, iControllerStateCurrent)); + OstTraceExt2( TRACE_NORMAL, DUP5_CMTPUSBCONNECTION_RUNL, + "Alternate interface setting changed from %d to %d", iControllerStatePrevious, iControllerStateCurrent ); } // Record the controller state and issue the next notification request. iControllerStatePrevious = iControllerStateCurrent; IssueAlternateDeviceStatusNotifyRequest(); - - __FLOG(_L8("RunL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_RUNL_EXIT ); } /** @@ -911,8 +938,7 @@ */ void CMTPUsbConnection::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_CONSTRUCTL_ENTRY ); // Start the USB device. StartUsbL(); @@ -932,14 +958,16 @@ // Fetch the remote wakeup flag. TUsbDeviceCaps dCaps; - User::LeaveIfError(iLdd.DeviceCaps(dCaps)); + LEAVEIFERROR(iLdd.DeviceCaps(dCaps), + OstTrace0( TRACE_ERROR, DUP1_CMTPUSBCONNECTION_CONSTRUCTL, "Retrieves the capabilities of the USB device failed!" )); + iRemoteWakeup = dCaps().iRemoteWakeup; - __FLOG_VA((_L8("iRemote = %d"), iRemoteWakeup)); - + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_CONSTRUCTL, "iRemote = %d", iRemoteWakeup ); + // Start monitoring the USB device controller state. IssueAlternateDeviceStatusNotifyRequest(); - - __FLOG(_L8("ConstructL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_CONSTRUCTL_EXIT ); } /** @@ -948,7 +976,7 @@ */ void CMTPUsbConnection::IssueAlternateDeviceStatusNotifyRequest() { - __FLOG(_L8("IssueAlternateDeviceStatusNotifyRequest - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_ISSUEALTERNATEDEVICESTATUSNOTIFYREQUEST_ENTRY ); if (!IsActive()) { @@ -956,7 +984,7 @@ } SetActive(); - __FLOG(_L8("IssueAlternateDeviceStatusNotifyRequest - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_ISSUEALTERNATEDEVICESTATUSNOTIFYREQUEST_EXIT ); } /** @@ -965,7 +993,7 @@ */ void CMTPUsbConnection::BufferEventDataL(const TMTPTypeEvent& aEvent) { - __FLOG(_L8("BufferEventData - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_BUFFEREVENTDATAL_ENTRY ); /* Setup the parameter block payload dataset. Note that since this is a variable length dataset, it must first be reset. @@ -979,7 +1007,7 @@ iUsbEventContainer->SetUint16L(CMTPUsbContainer::EContainerType, EMTPUsbContainerTypeEventBlock); iUsbEventContainer->SetUint16L(CMTPUsbContainer::ECode, aEvent.Uint16(TMTPTypeEvent::EEventCode)); iUsbEventContainer->SetUint32L(CMTPUsbContainer::ETransactionID, aEvent.Uint32(TMTPTypeEvent::EEventTransactionID)); - __FLOG(_L8("BufferEventData - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_BUFFEREVENTDATAL_EXIT ); } /** @@ -988,11 +1016,14 @@ */ void CMTPUsbConnection::SendEventDataL() { - __FLOG(_L8("SendEventData - Entry")); - __FLOG_VA((_L8("Sending event 0x%4X (%d bytes)"), iUsbEventContainer->Uint16L(CMTPUsbContainer::ECode), iUsbEventContainer->Uint32L(CMTPUsbContainer::EContainerLength))); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SENDEVENTDATAL_ENTRY ); + OstTraceExt2( TRACE_NORMAL, CMTPUSBCONNECTION_SENDEVENTDATAL, + "Sending event 0x%4X (%d bytes)", (TUint32)iUsbEventContainer->Uint16L(CMTPUsbContainer::ECode), + iUsbEventContainer->Uint32L(CMTPUsbContainer::EContainerLength) ); + static_cast(iEndpoints[EMTPUsbEpInterrupt])->SendInterruptDataL(*iUsbEventContainer); iEventPending = ETrue; - __FLOG(_L8("SendEventData - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_SENDEVENTDATAL_EXIT ); } /** @@ -1001,7 +1032,7 @@ */ void CMTPUsbConnection::SendUnreportedStatusEventL() { - __FLOG(_L8("SendUnreportedStatusEventL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SENDUNREPORTEDSTATUSEVENTL_ENTRY ); // Construct an UnreportedStatus event TMTPTypeEvent mtpEvent; @@ -1009,8 +1040,8 @@ mtpEvent.SetUint32(TMTPTypeEvent::EEventSessionID, KMTPSessionNone); mtpEvent.SetUint32(TMTPTypeEvent::EEventTransactionID, KMTPTransactionIdNone); SendEventL(mtpEvent); - - __FLOG(_L8("SendUnreportedStatusEventL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_SENDUNREPORTEDSTATUSEVENTL_EXIT ); } /** @@ -1019,7 +1050,7 @@ */ void CMTPUsbConnection::InitiateBulkRequestSequenceL() { - __FLOG(_L8("InitiateBulkRequestSequenceL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_INITIATEBULKREQUESTSEQUENCEL_ENTRY ); CMTPUsbEpBulkOut& bulkOut(*static_cast(iEndpoints[EMTPUsbEpBulkOut])); // Update the transaction state. @@ -1031,8 +1062,8 @@ // Initiate the next request phase bulk data receive sequence. bulkOut.ReceiveBulkDataL(*iUsbBulkContainer); - - __FLOG(_L8("InitiateBulkRequestSequenceL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_INITIATEBULKREQUESTSEQUENCEL_EXIT ); } /** @@ -1041,14 +1072,14 @@ */ void CMTPUsbConnection::InitiateControlRequestSequenceL() { - __FLOG(_L8("InitiateControlRequestSequenceL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_INITIATECONTROLREQUESTSEQUENCEL_ENTRY ); CMTPUsbEpControl& ctrl(*static_cast(iEndpoints[EMTPUsbEpControl])); if (!ctrl.Stalled()) { ctrl.ReceiveControlRequestSetupL(iUsbControlRequestSetup); - } - __FLOG(_L8("InitiateControlRequestSequenceL - Exit")); + } + OstTraceFunctionExit0( CMTPUSBCONNECTION_INITIATECONTROLREQUESTSEQUENCEL_EXIT ); } /** @@ -1057,20 +1088,22 @@ @param aError The error completion status of the bulk data receive request. @leave One of the system wide error codes, if a processing failure occurs. */ -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE void CMTPUsbConnection::ProcessBulkCommandL(TInt aError) #else void CMTPUsbConnection::ProcessBulkCommandL(TInt /*aError*/) #endif { - __FLOG(_L8("ProcessBulkCommandL - Entry")); - __FLOG_VA((_L8("aError = %d"), aError)); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_PROCESSBULKCOMMANDL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_PROCESSBULKCOMMANDL, "aError = %d", aError ); + if (BulkRequestTransactionStateValid(ERequestPhase)) { // Request block received. TUint16 op(iUsbBulkContainer->Uint16L(CMTPUsbContainer::ECode)); - __FLOG_VA((_L8("Command block 0x%04X received"), op)); - + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL, + "Command block 0x%04X received", op ); + // Reset the iMTPRequest. iMTPRequest.Reset(); @@ -1081,14 +1114,14 @@ // Set SessionID. if (op == EMTPOpCodeOpenSession) { - __FLOG(_L8("Processing OpenSession request")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL, "Processing OpenSession request" ); // Force OpenSession requests to be processed outside an active session. // It is a known problem for MTP Protocol, it is a workaround here. iMTPRequest.SetUint32(TMTPTypeRequest::ERequestSessionID, KMTPSessionNone); } else if (op == EMTPOpCodeCloseSession || op == EMTPOpCodeResetDevice) { - __FLOG(_L8("Processing CloseSession or the ResetDevice request")); + OstTrace0( TRACE_NORMAL, DUP3_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL, "Processing CloseSession or the ResetDevice request" ); // Force CloseSession requests to be processed outside an active session. // ResetDevice currently behaves the same way as CloseSession. iMTPRequest.SetUint32(TMTPTypeRequest::ERequestSessionID, KMTPSessionNone); @@ -1096,14 +1129,15 @@ } else { - __FLOG_VA((_L8("Processing general request on session %d"), iMTPSessionId)); + OstTrace1( TRACE_NORMAL, DUP4_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL, "Processing general request on session %d", iMTPSessionId ); // Update the request dataset with the single active session's SessionID. iMTPRequest.SetUint32(TMTPTypeRequest::ERequestSessionID, iMTPSessionId); } #ifdef _DEBUG - RDebug::Print(_L("The time stamp is: %d"), User::TickCount()); - RDebug::Print(_L("New command comes, Operation code is 0x%x, transaction id is %d \n"), op, iUsbBulkContainer->Uint32L(CMTPUsbContainer::ETransactionID)); + OstTrace1( TRACE_NORMAL, DUP5_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL, "The time stamp is: %d", User::TickCount() ); + OstTraceExt2( TRACE_NORMAL, DUP6_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL, + "New command comes, Operation code is 0x%x, transaction id is %d", (TUint32)op, iUsbBulkContainer->Uint32L(CMTPUsbContainer::ETransactionID)); #endif TUint commandTransID(iUsbBulkContainer->Uint32L(CMTPUsbContainer::ETransactionID)); @@ -1119,7 +1153,7 @@ // Notify the protocol layer. BoundProtocolLayer().ReceivedRequestL(iMTPRequest); } - __FLOG(_L8("ProcessBulkCommandL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_PROCESSBULKCOMMANDL_EXIT ); } /** @@ -1131,7 +1165,7 @@ */ void CMTPUsbConnection::ProcessBulkDataInL(const TMTPTypeRequest& aRequest, const MMTPType& aData) { - __FLOG(_L8("ProcessBulkDataInL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_PROCESSBULKDATAINL_ENTRY ); // Update the transaction state. SetBulkTransactionState(EDataRToIPhase); @@ -1148,10 +1182,12 @@ iUsbBulkContainer->SetUint32L(CMTPUsbContainer::ETransactionID, aRequest.Uint32(TMTPTypeRequest::ERequestTransactionID)); // Initiate the bulk data send sequence. - __FLOG_VA((_L8("Sending %d data bytes"), iUsbBulkContainer->Uint32L(CMTPUsbContainer::EContainerLength))); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_PROCESSBULKDATAINL, + "Sending %d data bytes", iUsbBulkContainer->Uint32L(CMTPUsbContainer::EContainerLength) ); #ifdef _DEBUG - RDebug::Print(_L("ProcessBulkDataInL: iIsCancelReceived = %d, SuspendState() is %d \n"),iIsCancelReceived,SuspendState()); + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPUSBCONNECTION_PROCESSBULKDATAINL, + "ProcessBulkDataInL: iIsCancelReceived = %d, SuspendState() is %d", (TInt32)iIsCancelReceived,SuspendState() ); #endif // if the cancel event is received before send data. That is, the phase is before DATA R2I, @@ -1180,13 +1216,14 @@ { #ifdef _DEBUG - RDebug::Print(_L("the senddata is canceled!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPUSBCONNECTION_PROCESSBULKDATAINL, + "the senddata is canceled!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" ); #endif // by pass the calling to lower level send data SendBulkDataCompleteL(KErrNone, *iUsbBulkContainer); } - __FLOG(_L8("ProcessBulkDataInL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_PROCESSBULKDATAINL_EXIT ); } /** @@ -1197,14 +1234,15 @@ */ void CMTPUsbConnection::ProcessBulkDataOutL(TInt aError) { - __FLOG(_L8("ProcessBulkDataOutL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_PROCESSBULKDATAOUTL_ENTRY ); if ((BulkRequestTransactionStateValid(EDataIToRPhase))) { // Data block received, notify the protocol layer. - __FLOG_VA((_L8("Data block received (%d bytes)"), iUsbBulkContainer->Uint32L(CMTPUsbContainer::EContainerLength))); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_PROCESSBULKDATAOUTL, + "Data block received (%d bytes)", iUsbBulkContainer->Uint32L(CMTPUsbContainer::EContainerLength) ); BoundProtocolLayer().ReceiveDataCompleteL(aError, *iUsbBulkContainer->Payload(), iMTPRequest); } - __FLOG(_L8("ProcessBulkDataOutL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_PROCESSBULKDATAOUTL_EXIT ); } /** @@ -1214,10 +1252,10 @@ */ void CMTPUsbConnection::ProcessControlRequestCancelL(const TMTPUsbControlRequestSetup& /*aRequest*/) { - __FLOG(_L8("ProcessControlRequestCancelL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_PROCESSCONTROLREQUESTCANCELL_ENTRY ); static_cast(iEndpoints[EMTPUsbEpControl])->ReceiveControlRequestDataL(iUsbControlRequestCancelData); - __FLOG(_L8("Waiting for Cancel Request Data")); - __FLOG(_L8("ProcessControlRequestCancelL - Exit")); + OstTrace0( TRACE_NORMAL, CMTPUSBCONNECTION_PROCESSCONTROLREQUESTCANCELL, "Waiting for Cancel Request Data" ); + OstTraceFunctionExit0( CMTPUSBCONNECTION_PROCESSCONTROLREQUESTCANCELL_EXIT ); } /** @@ -1227,7 +1265,7 @@ */ void CMTPUsbConnection::ProcessControlRequestDeviceResetL(const TMTPUsbControlRequestSetup& /*aRequest*/) { - __FLOG(_L8("ProcessControlRequestDeviceResetL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_PROCESSCONTROLREQUESTDEVICERESETL_ENTRY ); // Clear stalled endpoints and re-open connection BulkEndpointsStallClearL(); @@ -1250,7 +1288,7 @@ iIsResetRequestSignaled = ETrue; } - __FLOG(_L8("ProcessControlRequestDeviceResetL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_PROCESSCONTROLREQUESTDEVICERESETL_EXIT ); } /** @@ -1260,7 +1298,7 @@ */ void CMTPUsbConnection::ProcessControlRequestDeviceStatusL(const TMTPUsbControlRequestSetup& /*aRequest*/) { - __FLOG(_L8("ProcessControlRequestDeviceStatusL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_PROCESSCONTROLREQUESTDEVICESTATUSL_ENTRY ); iUsbControlRequestDeviceStatus.Reset(); TUint offset = 0; @@ -1269,12 +1307,17 @@ if ( IsEpStalled(i) ) { TInt epSize(0); - User::LeaveIfError( iLdd.GetEndpointDescriptorSize(KMTPUsbAlternateInterface, i, epSize) ); + LEAVEIFERROR( iLdd.GetEndpointDescriptorSize(KMTPUsbAlternateInterface, i, epSize), + OstTrace1( TRACE_ERROR, CMTPUSBCONNECTION_PROCESSCONTROLREQUESTDEVICESTATUSL, + "Copies the size of the endpoint descriptor failed! error code %d", munged_err)); + RBuf8 epDesc; //endpoint descriptor, epDesc[2] is the address of endpoint. More info, pls refer to USB Sepc2.0 - 9.6.6 epDesc.CreateL(epSize); CleanupClosePushL(epDesc); - User::LeaveIfError( iLdd.GetEndpointDescriptor(KMTPUsbAlternateInterface, i, epDesc) ); + LEAVEIFERROR( iLdd.GetEndpointDescriptor(KMTPUsbAlternateInterface, i, epDesc), + OstTrace1( TRACE_ERROR, DUP1_CMTPUSBCONNECTION_PROCESSCONTROLREQUESTDEVICESTATUSL, + "Copies Copies the endpoint descriptor failed! error code %d", munged_err)); //Maybe here is a little bit confused. Although an endpoint address is a 8-bit byte in Endpoint Descriptor, //but in practice, it's requested by host with a 32-bit value, so we plus offset with 4 to reflect this. @@ -1303,8 +1346,8 @@ // restore the original device status SetDeviceStatus(originalStatus); - - __FLOG(_L8("ProcessControlRequestDeviceStatusL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_PROCESSCONTROLREQUESTDEVICESTATUSL_EXIT ); } /** @@ -1317,8 +1360,8 @@ */ TBool CMTPUsbConnection::BulkRequestErrorHandled(TInt aError) { - __FLOG(_L8("BulkRequestErrorHandled - Entry")); - __FLOG_VA((_L8("Bulk transfer request completion status = %d"), aError)); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_BULKREQUESTERRORHANDLED_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_BULKREQUESTERRORHANDLED, "Bulk transfer request completion status = %d", aError ); TBool ret(EFalse); // Only handle USB error codes @@ -1343,7 +1386,7 @@ break; } } - __FLOG(_L8("BulkRequestErrorHandled - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_BULKREQUESTERRORHANDLED_EXIT ); return ret; } @@ -1355,13 +1398,16 @@ */ TBool CMTPUsbConnection::BulkRequestTransactionStateValid(TMTPTransactionPhase aExpectedTransactionState) { - __FLOG(_L8("BulkRequestTransactionStateValid - Entry")); - __FLOG_VA((_L8("Bulk transaction state = %d"), iBulkTransactionState)); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_BULKREQUESTTRANSACTIONSTATEVALID_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_BULKREQUESTTRANSACTIONSTATEVALID, + "Bulk transaction state = %d", iBulkTransactionState); + TBool valid(iBulkTransactionState == aExpectedTransactionState); if (!valid) { // Invalid bulk transaction state, close the connection. - __FLOG_VA((_L8("Expected bulk transaction state = %d"), aExpectedTransactionState)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBCONNECTION_BULKREQUESTTRANSACTIONSTATEVALID, + "Expected bulk transaction state = %d", aExpectedTransactionState ); //if transaction is in request phase, while the container type of data we received is other transaction phase, //just ignore the data and initiate another request receiving. @@ -1374,7 +1420,7 @@ CloseConnection(); } } - __FLOG(_L8("BulkRequestTransactionStateValid - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_BULKREQUESTTRANSACTIONSTATEVALID_EXIT ); return valid; } @@ -1387,8 +1433,9 @@ */ TBool CMTPUsbConnection::ControlRequestErrorHandled(TInt aError) { - __FLOG(_L8("ControlRequestErrorHandled - Entry")); - __FLOG_VA((_L8("Control request completion status = %d"), aError)); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_CONTROLREQUESTERRORHANDLED_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_CONTROLREQUESTERRORHANDLED, + "Control request completion status = %d", aError ); TBool ret(EFalse); if (aError != KErrNone) @@ -1418,7 +1465,7 @@ ret = ETrue; } - __FLOG(_L8("ControlRequestErrorHandled - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_CONTROLREQUESTERRORHANDLED_EXIT ); return ret; } @@ -1427,7 +1474,7 @@ */ void CMTPUsbConnection::ConfigurationDescriptorClear() { - __FLOG(_L8("ConfigurationDescriptorClear - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORCLEAR_ENTRY ); const TInt KNumInterfacesOffset(4); TInt descriptorSize(0); @@ -1442,8 +1489,8 @@ iLdd.SetConfigurationDescriptor(descriptor); } } - - __FLOG(_L8("ConfigurationDescriptorClear - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORCLEAR_EXIT ); } /** @@ -1453,7 +1500,7 @@ */ void CMTPUsbConnection::ConfigurationDescriptorSetL() { - __FLOG(_L8("SetupConfigurationDescriptorL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORSETL_ENTRY ); const TInt KNumInterfacesOffset(4); TInt descriptorSize(0); @@ -1461,15 +1508,20 @@ if (static_cast(descriptorSize) != KUsbDescSize_Config) { + OstTrace0( TRACE_ERROR, CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORSETL, "Not configration descriptor!"); User::Leave(KErrCorrupt); } TBuf8 descriptor; - User::LeaveIfError(iLdd.GetConfigurationDescriptor(descriptor)); + LEAVEIFERROR(iLdd.GetConfigurationDescriptor(descriptor), + OstTrace1( TRACE_ERROR, DUP1_CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORSETL, + "Copies the current configuration descriptor failed! error code %d", munged_err)); ++descriptor[KNumInterfacesOffset]; - User::LeaveIfError(iLdd.SetConfigurationDescriptor(descriptor)); - - __FLOG(_L8("SetupConfigurationDescriptorL - Exit")); + LEAVEIFERROR(iLdd.SetConfigurationDescriptor(descriptor), + OstTrace1( TRACE_ERROR, DUP2_CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORSETL, + "Sets the current configuration descriptor failed! error code %d", munged_err)); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORSETL_EXIT ); } /** @@ -1494,9 +1546,9 @@ */ void CMTPUsbConnection::ControlEndpointStartL() { - __FLOG(_L8("StartControlEndpoint - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_CONTROLENDPOINTSTARTL_ENTRY ); InitiateControlRequestSequenceL(); - __FLOG(_L8("StartControlEndpoint - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_CONTROLENDPOINTSTARTL_EXIT ); } /** @@ -1504,9 +1556,9 @@ */ void CMTPUsbConnection::ControlEndpointStop() { - __FLOG(_L8("ControlEndpointStop - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_CONTROLENDPOINTSTOP_ENTRY ); iEndpoints[EMTPUsbEpControl]->Cancel(); - __FLOG(_L8("ControlEndpointStop - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_CONTROLENDPOINTSTOP_EXIT ); } /** @@ -1514,11 +1566,11 @@ */ void CMTPUsbConnection::BulkEndpointsStallL() { - __FLOG(_L8("BulkEndpointsStallL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_BULKENDPOINTSSTALLL_ENTRY ); EndpointStallL(EMTPUsbEpBulkIn); EndpointStallL(EMTPUsbEpBulkOut); SetDeviceStatus(EMTPUsbDeviceStatusTransactionCancelled); - __FLOG(_L8("BulkEndpointsStallL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_BULKENDPOINTSSTALLL_EXIT ); } /** @@ -1526,10 +1578,10 @@ */ void CMTPUsbConnection::BulkEndpointsStallClearL() { - __FLOG(_L8("BulkEndpointsStallClearL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_BULKENDPOINTSSTALLCLEARL_ENTRY ); EndpointStallClearL(EMTPUsbEpBulkIn); EndpointStallClearL(EMTPUsbEpBulkOut); - __FLOG(_L8("BulkEndpointsStallClearL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_BULKENDPOINTSSTALLCLEARL_EXIT ); } /** @@ -1538,9 +1590,9 @@ */ void CMTPUsbConnection::DataEndpointsStartL() { - __FLOG(_L8("DataEndpointsStartL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_DATAENDPOINTSSTARTL_ENTRY ); InitiateBulkRequestSequenceL(); - __FLOG(_L8("DataEndpointsStartL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_DATAENDPOINTSSTARTL_EXIT ); } /** @@ -1548,45 +1600,46 @@ */ void CMTPUsbConnection::DataEndpointsStop() { - __FLOG(_L8("DataEndpointsStop - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_DATAENDPOINTSSTOP_ENTRY ); if (ConnectionOpen() && (!(SuspendState() & ESuspended))&& (iControllerStatePrevious != EUsbcDeviceStateSuspended)) { - __FLOG(_L8("Stopping active endpoints")); + OstTrace0( TRACE_NORMAL, CMTPUSBCONNECTION_DATAENDPOINTSSTOP, "Stopping active endpoints" ); iEndpoints[EMTPUsbEpBulkIn]->Cancel(); iEndpoints[EMTPUsbEpBulkOut]->Cancel(); iEndpoints[EMTPUsbEpInterrupt]->Cancel(); if ((iBulkTransactionState == EDataIToRPhase) && iUsbBulkContainer->Payload()) { - __FLOG(_L8("Aborting active I to R data phase")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPUSBCONNECTION_DATAENDPOINTSSTOP, "Aborting active I to R data phase" ); TRAPD(err, BoundProtocolLayer().ReceiveDataCompleteL(KErrAbort, *iUsbBulkContainer->Payload(), iMTPRequest)); UNUSED_VAR(err); } else if ((iBulkTransactionState == EDataRToIPhase) && iUsbBulkContainer->Payload()) { - __FLOG(_L8("Aborting active R to I data phase")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPUSBCONNECTION_DATAENDPOINTSSTOP, "Aborting active R to I data phase" ); TRAPD(err, BoundProtocolLayer().SendDataCompleteL(KErrAbort, *iUsbBulkContainer->Payload(), iMTPRequest)); UNUSED_VAR(err); } else if ((iBulkTransactionState == EResponsePhase) && iUsbBulkContainer->Payload()) { - __FLOG(_L8("Aborting active response phase")); + OstTrace0( TRACE_NORMAL, DUP3_CMTPUSBCONNECTION_DATAENDPOINTSSTOP, "Aborting active response phase" ); TRAPD(err, BoundProtocolLayer().SendResponseCompleteL(KErrAbort, *static_cast(iUsbBulkContainer->Payload()), iMTPRequest)); UNUSED_VAR(err); } } -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE else { - __FLOG(_L8("Endpoints inactive, do nothing")); + OstTrace0( TRACE_NORMAL, DUP4_CMTPUSBCONNECTION_DATAENDPOINTSSTOP, "Endpoints inactive, do nothing" ); } -#endif // __FLOG_ACTIVE - __FLOG(_L8("DataEndpointsStop - Exit")); +#endif // OST_TRACE_COMPILER_IN_USE + OstTraceFunctionExit0( CMTPUSBCONNECTION_DATAENDPOINTSSTOP_EXIT ); } void CMTPUsbConnection::EndpointStallL(TMTPUsbEndpointId aId) { - __FLOG(_L8("EndpointStallL - Entry")); - __FLOG_VA((_L8("Creating stall condition on endpoint %d"), aId)); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_ENDPOINTSTALLL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_ENDPOINTSTALLL, "Creating stall condition on endpoint %d", aId ); + __ASSERT_DEBUG((aId < EMTPUsbEpNumEndpoints), Panic(EMTPUsbReserved)); // Stall the endpoint. @@ -1596,13 +1649,13 @@ // Update the connection state. SetConnectionState(EStalled); - __FLOG(_L8("EndpointStallL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_ENDPOINTSTALLL_EXIT ); } void CMTPUsbConnection::EndpointStallClearL(TMTPUsbEndpointId aId) { - __FLOG(_L8("EndpointStallClearL - Entry")); - __FLOG_VA((_L8("Clearing stall condition on endpoint %d"), aId)); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_ENDPOINTSTALLCLEARL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_ENDPOINTSTALLCLEARL, "Clearing stall condition on endpoint %d", aId ); __ASSERT_DEBUG((aId < EMTPUsbEpNumEndpoints), Panic(EMTPUsbReserved)); // Check the endoints current stall condition. @@ -1626,7 +1679,7 @@ SetConnectionState(EIdle); } } - __FLOG(_L8("EndpointStallClearL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_ENDPOINTSTALLCLEARL_EXIT ); } /** @@ -1635,14 +1688,14 @@ */ void CMTPUsbConnection::ResumeConnectionL() { - __FLOG(_L8("ResumeConnectionL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_RESUMECONNECTIONL_ENTRY ); if (ConnectionOpen()) { // Restart data transfer activity. ControlEndpointStartL(); DataEndpointsStartL(); } - __FLOG(_L8("ResumeConnectionL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_RESUMECONNECTIONL_EXIT ); } /** @@ -1651,18 +1704,18 @@ */ void CMTPUsbConnection::StartConnectionL() { - __FLOG(_L8("StartConnectionL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_STARTCONNECTIONL_ENTRY ); // Notify the connection manager and update state, if necessary. if (ConnectionClosed()) { - __FLOG(_L8("Notifying protocol layer connection opened")); + OstTrace0( TRACE_NORMAL, CMTPUSBCONNECTION_STARTCONNECTIONL, "Notifying protocol layer connection opened" ); iConnectionMgr->ConnectionOpenedL(*this); SetConnectionState(EOpen); SetDeviceStatus(EMTPUsbDeviceStatusOK); InitiateBulkRequestSequenceL(); } - __FLOG(_L8("StartConnectionL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_STARTCONNECTIONL_EXIT ); } /** @@ -1670,7 +1723,7 @@ */ TBool CMTPUsbConnection::StopConnection() { - __FLOG(_L8("StopConnection - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_STOPCONNECTION_ENTRY ); TBool ret = ETrue; // Stop all data transfer activity. @@ -1679,7 +1732,7 @@ // Notify the connection manager and update state, if necessary. if (ConnectionOpen()) { - __FLOG(_L8("Notifying protocol layer connection closed")); + OstTrace0( TRACE_NORMAL, CMTPUSBCONNECTION_STOPCONNECTION, "Notifying protocol layer connection closed" ); ret = iConnectionMgr->ConnectionClosed(*this); SetBulkTransactionState(EUndefined); SetConnectionState(EIdle); @@ -1687,8 +1740,7 @@ iMTPSessionId = KMTPSessionNone; } - __FLOG(_L8("StopConnection - Exit")); - + OstTraceFunctionExit0( CMTPUSBCONNECTION_STOPCONNECTION_EXIT ); return ret; } @@ -1698,7 +1750,7 @@ */ void CMTPUsbConnection::SuspendConnectionL() { - __FLOG(_L8("SuspendConnectionL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SUSPENDCONNECTIONL_ENTRY ); if (ConnectionOpen()) { // Stop all data transfer activity. @@ -1711,7 +1763,7 @@ // Update state. SetSuspendState(ESuspended); - __FLOG(_L8("SuspendConnectionL - Exit")); + OstTraceFunctionExit0( CMTPUSBCONNECTION_SUSPENDCONNECTIONL_EXIT ); } /** @@ -1720,16 +1772,18 @@ */ void CMTPUsbConnection::StartUsbL() { - __FLOG(_L8("StartUsbL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_STARTUSBL_ENTRY ); // Open the USB device interface. - User::LeaveIfError(iLdd.Open(KDefaultUsbClientController)); - + LEAVEIFERROR(iLdd.Open(KDefaultUsbClientController), + OstTrace1( TRACE_ERROR, CMTPUSBCONNECTION_STARTUSBL, + "Open the USB device interface failed! error code %d", munged_err)); + // Configure the class descriptors. ConfigurationDescriptorSetL(); SetInterfaceDescriptorL(); - - __FLOG(_L8("StartUsbL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_STARTUSBL_EXIT ); } /** @@ -1737,7 +1791,7 @@ */ void CMTPUsbConnection::StopUsb() { - __FLOG(_L8("StopUsb - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_STOPUSB_ENTRY ); // Stop monitoring the USB device controller state. iLdd.AlternateDeviceStatusNotifyCancel(); @@ -1750,8 +1804,8 @@ // Close the USB device interface. iLdd.ReleaseInterface(KMTPUsbAlternateInterface); iLdd.Close(); - - __FLOG(_L8("StopUsb - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_STOPUSB_EXIT ); } /** @@ -1771,7 +1825,7 @@ TInt32 CMTPUsbConnection::ConnectionState() const { TInt32 state(iState & EConnectionStateMask); - __FLOG_VA((_L8("Connection state = 0x%08X"), state)); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_CONNECTIONSTATE, "Connection state = 0x%08X", state ); return (state); } @@ -1783,8 +1837,8 @@ TInt32 CMTPUsbConnection::SuspendState() const { TInt32 state(iState & ESuspendStateMask); - __FLOG_VA((_L8("Suspend state = 0x%08X"), state)); - + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_SUSPENDSTATE, "Suspend state = 0x%08X", state ); + return (state); } @@ -1795,10 +1849,11 @@ */ void CMTPUsbConnection::SetBulkTransactionState(TMTPTransactionPhase aState) { - __FLOG(_L8("SetBulkTransactionState - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SETBULKTRANSACTIONSTATE_ENTRY ); iBulkTransactionState = aState; - __FLOG_VA((_L8("SetBulkTransactionState state set to 0x%08X"), iBulkTransactionState)); - __FLOG(_L8("SetBulkTransactionState - Exit")); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_SETBULKTRANSACTIONSTATE, + "SetBulkTransactionState state set to 0x%08X", iBulkTransactionState ); + OstTraceFunctionExit0( CMTPUSBCONNECTION_SETBULKTRANSACTIONSTATE_EXIT ); } /** @@ -1807,10 +1862,10 @@ */ void CMTPUsbConnection::SetDeviceStatus(TUint16 aCode) { - __FLOG(_L8("SetDeviceStatus - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SETDEVICESTATUS_ENTRY ); iDeviceStatusCode = aCode; - __FLOG_VA((_L8("Device status set to 0x%04X"), iDeviceStatusCode)); - __FLOG(_L8("SetDeviceStatus - Exit")); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_SETDEVICESTATUS, "Device status set to 0x%04X", iDeviceStatusCode ); + OstTraceFunctionExit0( CMTPUSBCONNECTION_SETDEVICESTATUS_EXIT ); } /** @@ -1820,15 +1875,20 @@ */ void CMTPUsbConnection::SetInterfaceDescriptorL() { - __FLOG(_L8("SetInterfaceDescriptorL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL_ENTRY ); TUsbcInterfaceInfoBuf ifc; // Get device capabilities. - User::LeaveIfError(iLdd.DeviceCaps(iDeviceCaps)); - + LEAVEIFERROR(iLdd.DeviceCaps(iDeviceCaps), + OstTrace1( TRACE_ERROR, DUP3_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL, + "Get device capabilities failed! error code %d", munged_err)); + // Fetch the endpoint capabilities set. TPtr8 capsPtr(reinterpret_cast(iEndpointCapSets), sizeof(iEndpointCapSets), sizeof(iEndpointCapSets)); - User::LeaveIfError(iLdd.EndpointCaps(capsPtr)); + LEAVEIFERROR(iLdd.EndpointCaps(capsPtr), + OstTrace1( TRACE_ERROR, DUP4_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL, + "Get end point capabilities failed! error code %d", munged_err)); + // Set the interface endpoint properties. for (TUint i(EMTPUsbEpBulkIn); (i < EMTPUsbEpNumEndpoints); i++) { @@ -1872,17 +1932,18 @@ if (err == KErrNoMemory) { - __FLOG(_L8("NoMem when setinterface, try with lower priority")); + OstTrace0( TRACE_NORMAL, CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL, "NoMem when setinterface, try with lower priority" ); // Allocate 64KB*2 buffer for OUT EndPoint, and 64KB for IN EndPoint bandwidthPriority = EUsbcBandwidthINPlus2 | EUsbcBandwidthOUTPlus2; err = iLdd.SetInterface(KMTPUsbAlternateInterface, ifc, bandwidthPriority); - __FLOG_1(_L8("setinterface return for lower priority:%d"),err); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL, "setinterface return for lower priority:%d", err); } - - __FLOG_1(_L8("setinterface error code:%d"),err); - User::LeaveIfError(err); + OstTrace1( TRACE_NORMAL, DUP2_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL, "setinterface error code:%d",err ); - __FLOG(_L8("SetInterfaceDescriptorL - Exit")); + LEAVEIFERROR(err, OstTrace1( TRACE_NORMAL, DUP5_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL, + "Set interface failed! error code %d", munged_err )); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL_EXIT ); } /** @@ -1892,10 +1953,10 @@ */ void CMTPUsbConnection::SetConnectionState(TInt32 aState) { - __FLOG(_L8("SetConnectionState - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SETCONNECTIONSTATE_ENTRY ); iState = ((~EConnectionStateMask & iState) | aState); - __FLOG_VA((_L8("Connection state set to 0x%08X"), iState)); - __FLOG(_L8("SetConnectionState - Exit")); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_SETCONNECTIONSTATE, "Connection state set to 0x%08X", iState ); + OstTraceFunctionExit0( CMTPUSBCONNECTION_SETCONNECTIONSTATE_EXIT ); } /** @@ -1905,10 +1966,10 @@ */ void CMTPUsbConnection::SetSuspendState(TInt32 aState) { - __FLOG(_L8("SetSuspendState - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SETSUSPENDSTATE_ENTRY ); iState = ((~ESuspendStateMask & iState) | aState); - __FLOG_VA((_L8("Connection state set to 0x%08X"), iState)); - __FLOG(_L8("SetSuspendState - Exit")); + OstTrace1( TRACE_NORMAL, CMTPUSBCONNECTION_SETSUSPENDSTATE, "Connection state set to 0x%08X", iState ); + OstTraceFunctionExit0( CMTPUSBCONNECTION_SETSUSPENDSTATE_EXIT ); } /** @@ -1918,24 +1979,24 @@ */ void CMTPUsbConnection::SetTransportPacketSizeL() { - __FLOG(_L8("SetTransportPacketSizeL - Entry")); + OstTraceFunctionEntry0( CMTPUSBCONNECTION_SETTRANSPORTPACKETSIZEL_ENTRY ); if(iLdd.CurrentlyUsingHighSpeed()) { - __FLOG(_L8("HS USB connection")); + OstTrace0( TRACE_NORMAL, CMTPUSBCONNECTION_SETTRANSPORTPACKETSIZEL, "HS USB connection" ); iEndpoints[EMTPUsbEpControl]->SetMaxPacketSizeL(KMaxPacketTypeControlHS); iEndpoints[EMTPUsbEpBulkIn]->SetMaxPacketSizeL(KMaxPacketTypeBulkHS); iEndpoints[EMTPUsbEpBulkOut]->SetMaxPacketSizeL(KMaxPacketTypeBulkHS); } else { - __FLOG(_L8("FS USB connection")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPUSBCONNECTION_SETTRANSPORTPACKETSIZEL, "FS USB connection" ); iEndpoints[EMTPUsbEpControl]->SetMaxPacketSizeL(KMaxPacketTypeControlFS); iEndpoints[EMTPUsbEpBulkIn]->SetMaxPacketSizeL(KMaxPacketTypeBulkFS); iEndpoints[EMTPUsbEpBulkOut]->SetMaxPacketSizeL(KMaxPacketTypeBulkFS); } iEndpoints[EMTPUsbEpInterrupt]->SetMaxPacketSizeL(KMaxPacketTypeInterrupt); - - __FLOG(_L8("SetTransportPacketSizeL - Exit")); + + OstTraceFunctionExit0( CMTPUSBCONNECTION_SETTRANSPORTPACKETSIZEL_EXIT ); } TBool CMTPUsbConnection::IsEpStalled(const TUint& aEpNumber) diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepbase.cpp --- a/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepbase.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepbase.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -25,6 +25,11 @@ #include "mtpbuildoptions.hrh" #include "mtpusbprotocolconstants.h" #include +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpusbepbaseTraces.h" +#endif + const TUint KUSBHeaderSize = 12; #define UNUSED_VAR(a) (a)=(a) @@ -34,11 +39,10 @@ */ CMTPUsbEpBase::~CMTPUsbEpBase() { - __FLOG(_L8("CMTPUsbEpBase::~CMTPUsbEpBase - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_CMTPUSBEPBASE_DES_ENTRY ); Cancel(); iPacketBuffer.Close(); - __FLOG(_L8("CMTPUsbEpBase::~CMTPUsbEpBase - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPUSBEPBASE_CMTPUSBEPBASE_DES_EXIT ); } /** @@ -82,15 +86,10 @@ /** Second phase constructor. */ -#ifdef __FLOG_ACTIVE -void CMTPUsbEpBase::ConstructL(const TDesC8& aComponentName) -#else void CMTPUsbEpBase::ConstructL() -#endif { - __FLOG_OPEN(KMTPSubsystem, aComponentName); - __FLOG(_L8("CMTPUsbEpBase::ConstructL - Entry")); - __FLOG(_L8("CMTPUsbEpBase::ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_CONSTRUCTL_ENTRY ); + OstTraceFunctionExit0( CMTPUSBEPBASE_CONSTRUCTL_EXIT ); } /** @@ -100,12 +99,12 @@ */ void CMTPUsbEpBase::SetMaxPacketSizeL(TUint aSize) { - __FLOG(_L8("CMTPUsbEpBase::SetMaxPacketSizeL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_SETMAXPACKETSIZEL_ENTRY ); iPacketSizeMax = aSize; - __FLOG_VA((_L8("Endpoint %d maximum packetsize = %u"), iId, iPacketSizeMax)); + OstTraceExt2( TRACE_NORMAL, CMTPUSBEPBASE_SETMAXPACKETSIZEL, "Endpoint %d maximum packetsize = %u", iId, iPacketSizeMax ); // Allocate the packet buffer. iPacketBuffer.ReAllocL(iPacketSizeMax); - __FLOG(_L8("CMTPUsbEpBase::SetMaxPacketSizeL - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBASE_SETMAXPACKETSIZEL_EXIT ); } /** @@ -113,21 +112,21 @@ */ void CMTPUsbEpBase::Stall() { - __FLOG(_L8("CMTPUsbEpBase::Stall - Entry")); - __FLOG_VA((_L8("CMTPUsbEpBase state on entry = 0x%08X"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPBASE_STALL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_STALL, "CMTPUsbEpBase state on entry = 0x%08X", iState ); Cancel(); RDevUsbcClient& ldd(Connection().Ldd()); const TEndpointNumber number(EndpointNumber()); TEndpointState state; ldd.EndpointStatus(number, state); - __FLOG_VA((_L8("EndpointStatus = %d"), state)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_STALL, "EndpointStatus = %d", state ); if (state != EEndpointStateStalled) { - __FLOG_VA((_L8("Halting endpoint = %d"), number)); + OstTrace1( TRACE_NORMAL, DUP2_CMTPUSBEPBASE_STALL, "Halting endpoint = %d", number ); ldd.HaltEndpoint(number); } SetStreamState(EStalled); - __FLOG(_L8("CMTPUsbEpBase::Stall - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBASE_STALL_EXIT ); } /** @@ -135,20 +134,20 @@ */ void CMTPUsbEpBase::StallClear() { - __FLOG(_L8("CMTPUsbEpBase::StallClear - Entry")); - __FLOG_VA((_L8("CMTPUsbEpBase state on entry = 0x%08X"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPBASE_STALLCLEAR_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_STALLCLEAR, "CMTPUsbEpBase state on entry = 0x%08X", iState ); RDevUsbcClient& ldd(Connection().Ldd()); const TEndpointNumber number(EndpointNumber()); TEndpointState state; ldd.EndpointStatus(number, state); - __FLOG_VA((_L8("EndpointStatus = %d"), state)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_STALLCLEAR, "EndpointStatus = %d", state ); if (state != EEndpointStateNotStalled) { - __FLOG_VA((_L8("Clearing halt on endpoint = %d"), number)); + OstTrace1( TRACE_NORMAL, DUP2_CMTPUSBEPBASE_STALLCLEAR, "Clearing halt on endpoint = %d", number ); Connection().Ldd().ClearHaltEndpoint(number); } SetStreamState(EIdle); - __FLOG(_L8("CMTPUsbEpBase::StallClear - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBASE_STALLCLEAR_EXIT ); } /** @@ -194,11 +193,11 @@ void CMTPUsbEpBase::CancelReceiveL(TInt aReason) { - __FLOG(_L8("CMTPUsbEpBase::CancelReceiveL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_CANCELRECEIVEL_ENTRY ); if (DataStreamDirection() == EReceivingState) { - __FLOG(_L8("Cancel in EReceivingState")); + OstTrace0( TRACE_NORMAL, CMTPUSBEPBASE_CANCELRECEIVEL, "Cancel in EReceivingState" ); // Cancel any outstanding request. Cancel(); @@ -209,7 +208,7 @@ FlushRxDataL(); } - __FLOG(_L8("CMTPUsbEpBase::CancelReceiveL - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBASE_CANCELRECEIVEL_EXIT ); } /** @@ -225,19 +224,19 @@ void CMTPUsbEpBase::CancelSendL(TInt aReason) { - __FLOG(_L8("CMTPUsbEpBase::CancelSendL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_CANCELSENDL_ENTRY ); if (DataStreamDirection() == ESendingState) { - __FLOG(_L8("Cancel in ESendingState")); + OstTrace0( TRACE_NORMAL, CMTPUSBEPBASE_CANCELSENDL, "Cancel in ESendingState" ); // Cancel any outstanding request. Cancel(); // Notify the connection and reset the send data stream. ResetSendDataStream(); SendDataCompleteL(aReason, *iSendDataSource); } - - __FLOG(_L8("CMTPUsbEpBase::CancelSendL - Exit")); + + OstTraceFunctionExit0( CMTPUSBEPBASE_CANCELSENDL_EXIT ); } /** @@ -247,8 +246,9 @@ */ void CMTPUsbEpBase::ReceiveDataL(MMTPType& aSink) { - __FLOG(_L8("CMTPUsbEpBase::ReceiveDataL - Entry")); - __FLOG_VA((_L8("CMTPUsbEpBase state on entry = 0x%08X"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPBASE_RECEIVEDATAL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_RECEIVEDATAL, "CMTPUsbEpBase state on entry = 0x%08X", iState ); + if(iState != EIdle) { Cancel(); @@ -260,9 +260,9 @@ iReceiveDataCommit = iReceiveDataSink->CommitRequired(); SetStreamState(EReceiveInitialising); InitiateFirstChunkReceiveL(); - - __FLOG_VA((_L8("CMTPUsbEpBase state on exit = 0x%08X"), iState)); - __FLOG(_L8("CMTPUsbEpBase::ReceiveDataL - Exit")); + + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_RECEIVEDATAL, "CMTPUsbEpBase state on exit = 0x%08X", iState ); + OstTraceFunctionExit0( CMTPUSBEPBASE_RECEIVEDATAL_EXIT ); } /** @@ -273,8 +273,9 @@ void CMTPUsbEpBase::ResumeReceiveDataL(MMTPType& aSink) { - __FLOG(_L8("CMTPUsbEpBase::ResumeReceiveDataL - Entry")); - __FLOG_VA((_L8("CMTPUsbEpBase state on entry = 0x%08X"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPBASE_RESUMERECEIVEDATAL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_RESUMERECEIVEDATAL, "CMTPUsbEpBase state on entry = 0x%08X", iState ); + __ASSERT_DEBUG(iState == EIdle, Panic(EMTPUsbBadState)); iReceiveDataSink = &aSink; @@ -283,13 +284,14 @@ iChunkStatus = iReceiveDataSink->NextWriteChunk(iReceiveChunkData); // The first chunk is going to be read. iReceiveData.Set(iReceiveChunkData); - __FLOG_VA((_L8("Issuing ReadUntilShort request on endpoint %d"), EndpointNumber())); - __FLOG_VA((_L8("Receive chunk capacity = %d bytes, length = %d bytes"), iReceiveChunkData.MaxLength(), iReceiveChunkData.Length())); - __FLOG_VA((_L8("Chunk status = %d"), iChunkStatus)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_RESUMERECEIVEDATAL, "Issuing ReadUntilShort request on endpoint %d", EndpointNumber()); + OstTraceExt2( TRACE_NORMAL, DUP2_CMTPUSBEPBASE_RESUMERECEIVEDATAL, + "Receive chunk capacity = %d bytes, length = %d bytes", iReceiveChunkData.MaxLength(), iReceiveChunkData.Length()); + OstTrace1( TRACE_NORMAL, DUP3_CMTPUSBEPBASE_RESUMERECEIVEDATAL, "Chunk status = %d", iChunkStatus ); Connection().Ldd().ReadUntilShort(iStatus, EndpointNumber(), iReceiveData); SetStreamState(EReceiveInProgress); SetActive(); - __FLOG(_L8("CMTPUsbEpBase::ResumeReceiveDataL - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBASE_RESUMERECEIVEDATAL_EXIT ); } /** @@ -301,9 +303,9 @@ */ void CMTPUsbEpBase::ReceiveDataCompleteL(TInt /*aError*/, MMTPType& /*aSink*/) { - __FLOG(_L8("CMTPUsbEpBase::ReceiveDataCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_RECEIVEDATACOMPLETEL_ENTRY ); __DEBUG_ONLY(Panic(EMTPUsbNotSupported)); - __FLOG(_L8("CMTPUsbEpBase::ReceiveDataCompleteL - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBASE_RECEIVEDATACOMPLETEL_EXIT ); } /** @@ -313,16 +315,16 @@ */ void CMTPUsbEpBase::SendDataL(const MMTPType& aSource) { - __FLOG(_L8("CMTPUsbEpBase::SendDataL - Entry")); - __FLOG_VA((_L8("CMTPUsbEpBase state on entry = 0x%08X"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPBASE_SENDDATAL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_SENDDATAL, "CMTPUsbEpBase state on entry = 0x%08X", iState ); __ASSERT_DEBUG(iState == EIdle, Panic(EMTPUsbBadState)); iSendDataSource = &aSource; SetStreamState(ESendInitialising); ProcessSendDataStreamL(); - - __FLOG_VA((_L8("CMTPUsbEpBase state on exit = 0x%08X"), iState)); - __FLOG(_L8("CMTPUsbEpBase::SendDataL - Exit")); + + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_SENDDATAL, "CMTPUsbEpBase state on exit = 0x%08X", iState ); + OstTraceFunctionExit0( CMTPUSBEPBASE_SENDDATAL_EXIT ); } /** @@ -334,25 +336,26 @@ */ void CMTPUsbEpBase::SendDataCompleteL(TInt /*aError*/, const MMTPType& /*aSource*/) { - __FLOG(_L8("CMTPUsbEpBase::SendDataCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_SENDDATACOMPLETEL_ENTRY ); __DEBUG_ONLY(Panic(EMTPUsbNotSupported)); - __FLOG(_L8("CMTPUsbEpBase::SendDataCompleteL - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBASE_SENDDATACOMPLETEL_EXIT ); } void CMTPUsbEpBase::DoCancel() { - __FLOG(_L8("CMTPUsbEpBase::DoCancel - Entry")); - __FLOG_VA((_L8("CMTPUsbEpBase state on entry = 0x%08X"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPBASE_DOCANCEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_DOCANCEL, "CMTPUsbEpBase state on entry = 0x%08X", iState ); + switch (iState & EStateDirection) { case EReceivingState: - __FLOG_VA((_L8("Issuing ReadCancel on endpoint %d"), EndpointNumber())); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_DOCANCEL, "Issuing ReadCancel on endpoint %d", EndpointNumber() ); Connection().Ldd().ReadCancel(EndpointNumber()); ResetReceiveDataStream(); break; case ESendingState: - __FLOG_VA((_L8("Issuing WriteCancel on endpoint %d"), EndpointNumber())); + OstTrace1( TRACE_NORMAL, DUP2_CMTPUSBEPBASE_DOCANCEL, "Issuing WriteCancel on endpoint %d", EndpointNumber()); Connection().Ldd().WriteCancel(EndpointNumber()); ResetSendDataStream(); break; @@ -360,13 +363,14 @@ default: break; } - __FLOG(_L8("CMTPUsbEpBase::DoCancel - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBASE_DOCANCEL_EXIT ); } TInt CMTPUsbEpBase::RunError(TInt aError) { - __FLOG(_L8("CMTPUsbEpBase::RunError - Entry")); - __FLOG_VA((_L8("Error = %d"), aError)); + OstTraceFunctionEntry0( CMTPUSBEPBASE_RUNERROR_ENTRY ); + OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, TRACE_IMPORTANT, + CMTPUSBEPBASE_RUNERROR, "error code %d", aError); // Cancel any outstanding request. Cancel(); @@ -375,7 +379,7 @@ TInt32 streamDirection = DataStreamDirection(); if (streamDirection == EReceivingState) { - __FLOG(_L8("Error in EReceivingState")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_RUNERROR, "Error in EReceivingState" ); // Notify the connection and reset the receive data stream. MMTPType& data(*iReceiveDataSink); ResetReceiveDataStream(); @@ -384,28 +388,29 @@ } else if (streamDirection == ESendingState) { - __FLOG(_L8("Error in ESendingState")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPUSBEPBASE_RUNERROR, "Error in ESendingState" ); // Notify the connection and reset the send data stream. const MMTPType& data(*iSendDataSource); ResetSendDataStream(); TRAPD(err, SendDataCompleteL(aError, data)); UNUSED_VAR(err); } - - __FLOG(_L8("CMTPUsbEpBase::RunError - Exit")); + + OstTraceFunctionExit0( CMTPUSBEPBASE_RUNERROR_EXIT ); return KErrNone; } void CMTPUsbEpBase::RunL() { - __FLOG(_L8("CMTPUsbEpBase::RunL - Entry")); - __FLOG_VA((_L8("Current endpoint is %d"), EndpointNumber())); - __FLOG_VA((_L8("CMTPUsbEpBase state on entry = 0x%08X"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPBASE_RUNL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_RUNL, "Current endpoint is %d", EndpointNumber()); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_RUNL, "CMTPUsbEpBase state on entry = 0x%08X", iState ); switch (DataStreamDirection()) { case EReceivingState: - __FLOG_VA((_L8("Receive data completion status = %d"), iStatus.Int())); + OstTrace1( TRACE_NORMAL, DUP2_CMTPUSBEPBASE_RUNL, "Receive data completion status = %d", iStatus.Int() ); + if (iStatus != KErrNone) { // Abnormal completion. @@ -419,6 +424,7 @@ { Connection().Ldd().ReadUntilShort(iStatus, EndpointNumber(), iReceiveData); SetActive(); + OstTraceFunctionExit0( CMTPUSBEPBASE_RUNL_EXIT ); return; } // Update the chunk data length. @@ -444,7 +450,8 @@ break; case ESendingState: - __FLOG_VA((_L8("Send data stream completion status = %d"), iStatus.Int())); + OstTrace1( TRACE_NORMAL, DUP3_CMTPUSBEPBASE_RUNL, "Send data stream completion status = %d", iStatus.Int() ); + if (iStatus != KErrNone) { // Abnormal completion. @@ -465,13 +472,13 @@ break; default: - __FLOG_VA((_L8("Invalid data stream state, status = %d"), iStatus.Int())); + OstTraceDef1(OST_TRACE_CATEGORY_PRODUCTION, TRACE_FATAL, DUP4_CMTPUSBEPBASE_RUNL, "Invalid data stream state, status = %d", iStatus.Int()); Panic(EMTPUsbBadState); break; } - - __FLOG_VA((_L8("IsActive = %d"), IsActive())); - __FLOG(_L8("CMTPUsbEpBase::RunL - Exit")); + + OstTrace1( TRACE_NORMAL, DUP5_CMTPUSBEPBASE_RUNL, "IsActive = %d", IsActive() ); + OstTraceFunctionExit0( DUP1_CMTPUSBEPBASE_RUNL_EXIT ); } /** @@ -491,12 +498,12 @@ */ void CMTPUsbEpBase::ResetReceiveDataStream() { - __FLOG(_L8("CMTPUsbEpBase::ResetReceiveDataStream - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_RESETRECEIVEDATASTREAM_ENTRY ); iReceiveChunkData.Set(NULL, 0, 0); iReceiveData.Set(NULL, 0, 0); iReceiveDataSink = NULL; SetStreamState(EIdle); - __FLOG(_L8("CMTPUsbEpBase::ResetReceiveDataStream - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBASE_RESETRECEIVEDATASTREAM_EXIT ); } /** @@ -505,12 +512,12 @@ */ void CMTPUsbEpBase::ResetSendDataStream() { - __FLOG(_L8("CMTPUsbEpBase::ResetSendDataStream - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_RESETSENDDATASTREAM_ENTRY ); iSendChunkData.Set(NULL, 0); iSendData.Set(NULL, 0); iSendDataSource = NULL; SetStreamState(EIdle); - __FLOG(_L8("CMTPUsbEpBase::ResetSendDataStream - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBASE_RESETSENDDATASTREAM_EXIT ); } /** @@ -521,16 +528,17 @@ */ TBool CMTPUsbEpBase::ValidateUSBHeaderL() { - __FLOG(_L8("CMTPUsbEpBase::ValidateUSBHeader - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_VALIDATEUSBHEADERL_ENTRY ); TBool result(EFalse); TUint16 containerType(Connection().BulkContainer().Uint16L(CMTPUsbContainer::EContainerType)); iDataLength = Connection().BulkContainer().Uint32L(CMTPUsbContainer::EContainerLength); -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE TUint32 transactionId(Connection().BulkContainer().Uint32L(CMTPUsbContainer::ETransactionID)); TUint16 code(Connection().BulkContainer().Uint16L(CMTPUsbContainer::ECode)); - __FLOG_VA((_L8("ContainerLength = %lu, containerType = 0x%x, code = 0x%x, transactionID = 0x%x"), iDataLength, containerType, code, transactionId)); + OstTraceExt4( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_VALIDATEUSBHEADERL, + "ContainerLength = %lu, containerType = 0x%x, code = 0x%x, transactionID = 0x%x", iDataLength, containerType, code, transactionId ); #endif //Due to an issue of Windows OS, the value of CMTPUsbContainer::EContainerLength is incorrect if the @@ -538,13 +546,14 @@ //implementation it will be a value between 0 and 11. //Here we reset the iDateLength to the actual size of iReceiveDataSink as a walkaround. if(containerType == 2 && (iDataLength <= 11 || iDataLength == KMaxTUint32)) - { - __FLOG(_L8("iDataLength <= 11, change to size of receive data sink")); + { + OstTrace0( TRACE_NORMAL, DUP2_CMTPUSBEPBASE_VALIDATEUSBHEADERL, "iDataLength <= 11, change to size of receive data sink" ); iDataLength = iReceiveDataSink->Size(); } - __FLOG_VA((_L8("containerType = %u , dataLength = %lu bytes"), containerType, iDataLength)); - + OstTraceExt2( TRACE_NORMAL, DUP3_CMTPUSBEPBASE_VALIDATEUSBHEADERL, + "containerType = %u , dataLength = %lu bytes", (TUint)containerType, iDataLength ); + if (iDataLength >= KUSBHeaderSize && (containerType == EMTPUsbContainerTypeCommandBlock || containerType == EMTPUsbContainerTypeDataBlock)) { @@ -552,7 +561,8 @@ iDataCounter = 0; } - __FLOG_VA((_L8("CMTPUsbEpBase::ValidateUSBHeader - Exit with the result of %d"), result)); + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_VALIDATEUSBHEADERL, "Exit with the result of %d", result ); + OstTraceFunctionExit0( CMTPUSBEPBASE_VALIDATEUSBHEADERL_EXIT ); return result; } @@ -561,22 +571,24 @@ */ void CMTPUsbEpBase::InitiateFirstChunkReceiveL() { - __FLOG(_L8("CMTPUsbEpBase::InitiateFirstChunkReceiveL - Entry")); - - __FLOG(_L8("Fetching first write data chunk")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL_ENTRY ); + + OstTrace0( TRACE_NORMAL, CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL, "Fetching first write data chunk" ); iChunkStatus = iReceiveDataSink->FirstWriteChunk(iReceiveChunkData); // The first chunk is going to be read. iIsFirstChunk = ETrue; iReceiveData.Set(iReceiveChunkData); - __FLOG_VA((_L8("Issuing ReadUntilShort request on endpoint %d"), EndpointNumber())); - __FLOG_VA((_L8("Receive chunk capacity = %d bytes, length = %d bytes"), iReceiveChunkData.MaxLength(), iReceiveChunkData.Length())); - __FLOG_VA((_L8("Chunk status = %d"), iChunkStatus)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL, + "Issuing ReadUntilShort request on endpoint %d", EndpointNumber()); + OstTraceExt2( TRACE_NORMAL, DUP2_CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL, + "Receive chunk capacity = %d bytes, length = %d bytes", iReceiveChunkData.MaxLength(), iReceiveChunkData.Length()); + OstTrace1( TRACE_NORMAL, DUP3_CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL, "Chunk status = %d", iChunkStatus); Connection().Ldd().ReadUntilShort(iStatus, EndpointNumber(), iReceiveData); SetStreamState(EReceiveInProgress); SetActive(); - - __FLOG(_L8("Request issued")); - __FLOG(_L8("CMTPUsbEpBase::InitiateFirstChunkReceiveL - Exit")); + + OstTrace0( TRACE_NORMAL, DUP4_CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL, "Request issued" ); + OstTraceFunctionExit0( CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL_EXIT ); } /** @@ -584,7 +596,7 @@ */ void CMTPUsbEpBase::ProcessFirstReceivedChunkL() { - __FLOG(_L8("CMTPUsbEpBase::ProcessFirstReceivedChunkL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL_ENTRY ); // Reset it back. iIsFirstChunk = EFalse; @@ -600,6 +612,7 @@ FlushOnePacketL(); InitiateFirstChunkReceiveL(); + OstTraceFunctionExit0( CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL_EXIT ); return; } @@ -614,6 +627,7 @@ { //trash data received, just diacard it and initiate next receiving InitiateFirstChunkReceiveL(); + OstTraceFunctionExit0( DUP1_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL_EXIT ); return; } else if (iReceiveChunkData.MaxLength() == iReceiveChunkData.Length()) @@ -622,23 +636,28 @@ // All the desired data should be received. SetStreamState(EReceiveComplete); } - - __FLOG_VA((_L8("CMTPUsbEpBase state = 0x%08X"), iState)); + + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL, "CMTPUsbEpBase state = 0x%08X", iState ); + if (iState == EReceiveComplete) { // All data is received just using the first chunk. It could be a USB Command block without parameters // or USB control request setup or data. - __FLOG_VA((_L8("Received = %d bytes, write data chunk capacity = %d bytes"), iReceiveChunkData.Length(), iReceiveChunkData.MaxLength())); + OstTraceExt2( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL, + "Received = %d bytes, write data chunk capacity = %d bytes", iReceiveChunkData.Length(), iReceiveChunkData.MaxLength() ); -#ifdef MTP_DEBUG_FLOG_HEX_DUMP - __FLOG_HEXDUMP((iReceiveChunkData, _L8("Received data "))); +#ifdef MTP_DEBUG_OST_HEX_DUMP + OstTrace0( TRACE_DUMP, DUP4_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL, "" ); + OstTraceData( TRACE_DUMP, DUP3_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL, + "%x", iReceiveChunkData.Ptr(), iReceiveChunkData.Size()); + OstTrace0( TRACE_DUMP, DUP5_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL, "" ); #endif // Commit the received data if required. if (iReceiveDataCommit) { - __FLOG(_L8("Commiting write data chunk")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL, "Commiting write data chunk" ); iReceiveDataSink->CommitChunkL(iReceiveChunkData); } } @@ -648,7 +667,7 @@ ResumeReceiveDataStreamL(); } - __FLOG(_L8("CMTPUsbEpBase::ProcessFirstReceivedChunkL - Exit")); + OstTraceFunctionExit0( DUP2_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL_EXIT ); } /** @@ -657,16 +676,16 @@ */ void CMTPUsbEpBase::ResumeReceiveDataStreamL() { - __FLOG(_L8("CMTPUsbEpBase::ResumeReceiveDataStreamL - Entry")); - __FLOG_VA((_L8("CMTPUsbEpBase state on entry = 0x%08X"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "CMTPUsbEpBase state on entry = 0x%08X", iState ); TBool endStream(EFalse); TBool lastChunkCommited(EFalse); TBool nullPacketReceived(EFalse); MMTPType *needCommit = NULL; // Process the received chunk (if any). iDataCounter += iReceiveData.Length(); - __FLOG_VA((_L8("iDataLength = %lu bytes"), iDataLength)); - __FLOG_VA((_L8("iDataCounter = %lu bytes"), iDataCounter)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "iDataLength = %lu bytes", iDataLength ); + OstTrace1( TRACE_NORMAL, DUP2_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "iDataCounter = %lu bytes", iDataCounter ); if (iDataCounter == iDataLength) { @@ -674,11 +693,16 @@ nullPacketReceived = ((iState == EReceiveCompleting) && (iReceiveData.Length() == 0)); } - __FLOG_VA((_L8("Received = %d bytes, write data chunk capacity = %d bytes"), iReceiveChunkData.Length(), iReceiveChunkData.MaxLength())); -#ifdef MTP_DEBUG_FLOG_HEX_DUMP - __FLOG_HEXDUMP((iReceiveChunkData, _L8("Received data "))); + OstTraceExt2( TRACE_NORMAL, DUP3_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, + "Received = %d bytes, write data chunk capacity = %d bytes", iReceiveChunkData.Length(), iReceiveChunkData.MaxLength() ); + +#ifdef MTP_DEBUG_OST_HEX_DUMP + OstTrace0( TRACE_DUMP, DUP24_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "" ); + OstTraceData( TRACE_DUMP, DUP23_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, + "%x", iReceiveChunkData.Ptr(), iReceiveChunkData.Size()); + OstTrace0( TRACE_DUMP, DUP25_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "" ); #endif - __FLOG_VA((_L8("End of stream = %d"), endStream)); + OstTrace1( TRACE_NORMAL, DUP4_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "End of stream = %d", endStream ); // Commit the received data if required. if (iReceiveDataCommit) @@ -691,7 +715,8 @@ // 1. MTP file receiving: MTP type file never returns KMTPChunkSequenceCompletion,It can be received // one part after another. Also it can be commited mutiple times. // 2. Other MTP datatype receiving during the middle of data stream - __FLOG(_L8("Commiting write data chunk - 1")); + OstTrace0( TRACE_NORMAL, DUP5_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Commiting write data chunk - 1" ); + needCommit = iReceiveDataSink->CommitChunkL(iReceiveChunkData); lastChunkCommited = ETrue; } @@ -701,7 +726,7 @@ { // It should be the end of MTP type file receiving since it never returns KMTPChunkSequenceCompletion. // it can be commited mutiple times. - __FLOG(_L8("Commiting write data chunk - 2")); + OstTrace0( TRACE_NORMAL, DUP6_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Commiting write data chunk - 2" ); needCommit = iReceiveDataSink->CommitChunkL(iReceiveChunkData); } else if ((iChunkStatus == KMTPChunkSequenceCompletion) @@ -710,7 +735,7 @@ { // The last chunk data which type is any other MTP data type than MTP file type. // It will not be commited until all the chunk data is received. - __FLOG(_L8("Commiting write data chunk - 3")); + OstTrace0( TRACE_NORMAL, DUP7_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Commiting write data chunk - 3" ); needCommit = iReceiveDataSink->CommitChunkL(iReceiveChunkData); } else if ((iChunkStatus == KMTPChunkSequenceCompletion) @@ -720,8 +745,8 @@ // The last chunk data is received and chunk has been filled up: // just flush one packet and set endStream true and commit received data. // This condition tries to make MTP more robust if DP forgets to handle data-out phase. - __FLOG(_L8("Commiting write data chunk - 4")); - + OstTrace0( TRACE_NORMAL, DUP8_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Commiting write data chunk - 4" ); + FlushOnePacketL(); endStream = ETrue; needCommit = iReceiveDataSink->CommitChunkL(iReceiveChunkData); @@ -736,37 +761,37 @@ { if (lastChunkCommited) { - __FLOG(_L8("Fetching next write data chunk")); + OstTrace0( TRACE_NORMAL, DUP9_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Fetching next write data chunk" ); iChunkStatus = iReceiveDataSink->NextWriteChunk(iReceiveChunkData, iDataLength - KUSBHeaderSize); } } else { - __FLOG(_L8("Fetching next write data chunk")); + OstTrace0( TRACE_NORMAL, DUP10_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Fetching next write data chunk" ); iChunkStatus = iReceiveDataSink->NextWriteChunk(iReceiveChunkData, iDataLength - KUSBHeaderSize); } break; case EReceiveCompleting: - __FLOG(_L8("Write data chunk sequence completing")); - __FLOG_VA((_L8("Null packet received = %d"), nullPacketReceived)); + OstTrace0( TRACE_NORMAL, DUP11_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Write data chunk sequence completing" ); + OstTrace1( TRACE_NORMAL, DUP12_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Null packet received = %d", nullPacketReceived ); break; case EIdle: default: - __FLOG(_L8("Invalid receive data stream state")); + OstTraceDef0(OST_TRACE_CATEGORY_PRODUCTION, TRACE_FATAL, DUP13_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Invalid receive data stream state" ); Panic(EMTPUsbBadState); break; } - __FLOG_VA((_L8("Chunk status = %d"), iChunkStatus)); - + OstTrace1( TRACE_NORMAL, DUP14_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Chunk status = %d", iChunkStatus ); + // Update the data stream state. switch (iChunkStatus) { case KErrNone: if (endStream) { - __FLOG(_L8("Terminating packet received.")); + OstTrace0( TRACE_NORMAL, DUP15_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Terminating packet received." ); SetStreamState(EReceiveComplete); } else @@ -780,7 +805,7 @@ if (endStream) { - __FLOG(_L8("Terminating packet received.")); + OstTrace0( TRACE_NORMAL, DUP16_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Terminating packet received." ); SetStreamState(EReceiveComplete); } else @@ -792,6 +817,7 @@ break; default: + OstTrace1( TRACE_ERROR, DUP22_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Invalid iChunkStatus %d", iChunkStatus); User::Leave(iChunkStatus); break; } @@ -799,9 +825,13 @@ // If necessary, process the next chunk. if (iState != EReceiveComplete) { - __FLOG_VA((_L8("Issuing ReadUntilShort request on endpoint %d"), EndpointNumber())); - __FLOG_VA((_L8("Receive chunk capacity = %d bytes, length = %d bytes"), iReceiveChunkData.MaxLength(), iReceiveChunkData.Length())); - __FLOG_VA((_L8("iReceiveChunkData pointer address is %08x"), iReceiveChunkData.Ptr())); + OstTrace1( TRACE_NORMAL, DUP17_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, + "Issuing ReadUntilShort request on endpoint %d", EndpointNumber()); + OstTraceExt2( TRACE_NORMAL, DUP18_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, + "Receive chunk capacity = %d bytes, length = %d bytes", iReceiveChunkData.MaxLength(), iReceiveChunkData.Length() ); + OstTrace1( TRACE_NORMAL, DUP19_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, + "iReceiveChunkData pointer address is %08x", iReceiveChunkData.Ptr()); + // TDesC8's Right() method is not used here, because the parameter passed in like iReceiveChunkData.MaxLength() - iReceiveChunkData.Length()is greater than // the length of the descriptor, the function extracts the whole of the descriptor. if(iDataLength-iDataCounter < iReceiveChunkData.MaxLength() - iReceiveChunkData.Length()) @@ -819,11 +849,12 @@ TPtr8 tmp(NULL, 0, 0); needCommit->CommitChunkL(tmp); } - __FLOG(_L8("Request issued")); + OstTrace0( TRACE_NORMAL, DUP20_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, "Request issued" ); } - - __FLOG_VA((_L8("CMTPUsbEpBase state on exit = 0x%08X"), iState)); - __FLOG(_L8("CMTPUsbEpBase::ResumeReceiveDataStreamL - Exit")); + + OstTrace1( TRACE_NORMAL, DUP21_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML, + "CMTPUsbEpBase state on exit = 0x%08X", iState ); + OstTraceFunctionExit0( CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML_EXIT ); } /** @@ -843,8 +874,9 @@ */ void CMTPUsbEpBase::ProcessSendDataStreamL() { - __FLOG(_L8("CMTPUsbEpBase::ProcessSendDataStreamL - Entry")); - __FLOG_VA((_L8("CMTPUsbEpBase state on entry = 0x%08X"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPBASE_PROCESSSENDDATASTREAML_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_PROCESSSENDDATASTREAML, "CMTPUsbEpBase state on entry = 0x%08X", iState ); + // Clear the send data stream data pointer. iSendData.Set(KNullDesC8); @@ -856,13 +888,13 @@ switch (iState) { case ESendInitialising: - __FLOG(_L8("Fetching first read data chunk")); + OstTrace0( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, "Fetching first read data chunk" ); iChunkStatus = iSendDataSource->FirstReadChunk(iSendChunkData); iPacketBuffer.Zero(); break; case ESendInProgress: - __FLOG(_L8("Fetching next read data chunk")); + OstTrace0( TRACE_NORMAL, DUP2_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, "Fetching next read data chunk" ); iChunkStatus = iSendDataSource->NextReadChunk(iSendChunkData); break; @@ -871,7 +903,8 @@ case EIdle: default: - __FLOG(_L8("Invalid send data stream state")); + OstTraceDef1( OST_TRACE_CATEGORY_PRODUCTION, TRACE_FATAL, DUP3_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, + "Invalid send data stream state. iState %d", iState ); Panic(EMTPUsbBadState); break; } @@ -898,22 +931,28 @@ break; default: + OstTrace1( TRACE_ERROR, DUP16_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, "Invalid iChunkStatus %d", iChunkStatus); User::Leave(iChunkStatus); break; } } - __FLOG_VA((_L8("Chunk status = %d"), iChunkStatus)); + OstTrace1( TRACE_NORMAL, DUP4_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, "Chunk status = %d", iChunkStatus ); + // Process the buffered residual and/or available chunk data. TUint bufferedLen(iPacketBuffer.Length()); TUint chunkIntegralLen((chunkAvailableLen / iPacketSizeMax) * iPacketSizeMax); TUint chunkResidualLen(chunkAvailableLen % iPacketSizeMax); TBool zlp(EFalse); - __FLOG_VA((_L8("Buffered residual data = %u bytes"), bufferedLen)); - __FLOG_VA((_L8("Chunk data available = %u bytes"), chunkAvailableLen)); - __FLOG_VA((_L8("Chunk data packet integral portion = %u bytes"), chunkIntegralLen)); - __FLOG_VA((_L8("Chunk data packet residual portion = %u bytes"), chunkResidualLen)); + OstTrace1( TRACE_NORMAL, DUP5_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, + "Buffered residual data = %u bytes", bufferedLen ); + OstTrace1( TRACE_NORMAL, DUP6_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, + "Chunk data available = %u bytes", chunkAvailableLen ); + OstTrace1( TRACE_NORMAL, DUP7_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, + "Chunk data packet integral portion = %u bytes", chunkIntegralLen ); + OstTrace1( TRACE_NORMAL, DUP8_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, + "Chunk data packet residual portion = %u bytes", chunkResidualLen ); if (bufferedLen) { @@ -933,11 +972,13 @@ { consumedLen = chunkAvailableLen; } - __FLOG_VA((_L8("Buffering %u bytes"), consumedLen)); + OstTrace1( TRACE_NORMAL, DUP9_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, "Buffering %u bytes", consumedLen ); iPacketBuffer.Append(iSendChunkData.Left(consumedLen)); // Update the available chunk data to reflect only the unconsumed portion. - __FLOG_VA((_L8("Residual chunk data = %u bytes"), unconsumedLen)); + OstTrace1( TRACE_NORMAL, DUP10_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, + "Residual chunk data = %u bytes", unconsumedLen ); + if (unconsumedLen) { iSendChunkData.Set(iSendChunkData.Right(unconsumedLen)); @@ -969,7 +1010,7 @@ // Buffer the chunk data packet residual portion. if (chunkResidualLen) { - __FLOG_VA((_L8("Buffering %u bytes"), chunkResidualLen)); + OstTrace1( TRACE_NORMAL, DUP11_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, "Buffering %u bytes", chunkResidualLen ); iPacketBuffer.Append(iSendChunkData.Right(chunkResidualLen)); } @@ -990,11 +1031,13 @@ TUint sendBytes(iSendData.Length()); if ( sendBytes||zlp ) { - __FLOG_VA((_L8("Issuing Write request on endpoint %d, Zlp = %d"), EndpointNumber(), zlp)); - __FLOG_VA((_L8("Send data length = %d bytes"), iSendData.Length())); + OstTraceExt2( TRACE_NORMAL, DUP12_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, + "Issuing Write request on endpoint %d, Zlp = %d", EndpointNumber(), zlp ); + OstTrace1( TRACE_NORMAL, DUP13_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, + "Send data length = %d bytes", iSendData.Length() ); Connection().Ldd().Write(iStatus, EndpointNumber(), iSendData, sendBytes, zlp); SetActive(); - __FLOG(_L8("Request issued")); + OstTrace0( TRACE_NORMAL, DUP14_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, "Request issued" ); } else if (iState != ESendComplete) { @@ -1004,8 +1047,9 @@ User::RequestComplete(status, KErrNone); } - __FLOG_VA((_L8("CMTPUsbEpBase state on exit = 0x%08X"), iState)); - __FLOG(_L8("CMTPUsbEpBase::ProcessSendDataStreamL - Exit")); + OstTrace1( TRACE_NORMAL, DUP15_CMTPUSBEPBASE_PROCESSSENDDATASTREAML, + "CMTPUsbEpBase state on exit = 0x%08X", iState ); + OstTraceFunctionExit0( CMTPUSBEPBASE_PROCESSSENDDATASTREAML_EXIT ); } /** @@ -1014,10 +1058,10 @@ */ void CMTPUsbEpBase::SetStreamState(TInt aState) { - __FLOG(_L8("SetStreamState - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_SETSTREAMSTATE_ENTRY ); iState = aState; - __FLOG_VA((_L8("Stream state set to 0x%08X"), iState)); - __FLOG(_L8("SetStreamState - Exit")); + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_SETSTREAMSTATE, "Stream state set to 0x%08X", iState ); + OstTraceFunctionExit0( CMTPUSBEPBASE_SETSTREAMSTATE_EXIT ); } // Fix so that cancelling works. @@ -1033,7 +1077,7 @@ void CMTPUsbEpBase::FlushRxDataL() { - __FLOG(_L8("FlushRxDataL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBASE_FLUSHRXDATAL_ENTRY ); // create the read buff RBuf8 readBuf; readBuf.CreateL(KFlushBufferMaxLen); @@ -1045,9 +1089,10 @@ // get the data size in the receive buffer ready to read TInt nbytes = 0; TInt err = Connection().Ldd().QueryReceiveBuffer(EndpointNumber(), nbytes); - - __FLOG_VA((_L8("FlushRxDataL()--1---err is %d , nbytes is %d"), err, nbytes)); - + + OstTraceExt2( TRACE_NORMAL, CMTPUSBEPBASE_FLUSHRXDATAL, + "FlushRxDataL()--1---err is %d , nbytes is %d", err, nbytes ); + // has data, read it if( (err == KErrNone) && (nbytes > 0) ) { @@ -1058,29 +1103,34 @@ if(status.Int() != KErrNone) break; -#ifdef __FLOG_ACTIVE +#ifdef OST_TRACE_COMPILER_IN_USE TInt length = readBuf.Length(); - __FLOG_VA((_L8("The length of trash data is %d"), length)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPBASE_FLUSHRXDATAL, "The length of trash data is %d", length ); - __FLOG(_L8("Begining of trash data")); + + OstTrace0( TRACE_NORMAL, DUP2_CMTPUSBEPBASE_FLUSHRXDATAL, "Begining of trash data" ); + for (int i=0; i<4&&(i*4+4)<=length; i++) - { - __FLOG_VA((_L8("0x%x 0x%x 0x%x 0x%x"), readBuf[i*4], readBuf[i*4+1], readBuf[i*4+2], readBuf[i*4+3])); + { + OstTraceExt4( TRACE_NORMAL, DUP3_CMTPUSBEPBASE_FLUSHRXDATAL, + "0x%x 0x%x 0x%x 0x%x", (TUint)readBuf[i*4], readBuf[i*4+1], readBuf[i*4+2], readBuf[i*4+3] ); } - - __FLOG(_L8("Residual of trash data if any")); + + OstTrace0( TRACE_NORMAL, DUP4_CMTPUSBEPBASE_FLUSHRXDATAL, "Residual of trash data if any" ); TInt residualLength = length%512; for (int i=0; i<4&&(i*4+4)<=residualLength; i++) { TInt beginIndex = length - residualLength; - __FLOG_VA((_L8("0x%x 0x%x 0x%x 0x%x"), readBuf[beginIndex + i*4], readBuf[beginIndex + i*4+1], readBuf[beginIndex + i*4+2], readBuf[beginIndex + i*4+3])); + OstTraceExt4( TRACE_NORMAL, DUP5_CMTPUSBEPBASE_FLUSHRXDATAL, + "0x%x 0x%x 0x%x 0x%x", (TUint)readBuf[beginIndex + i*4], readBuf[beginIndex + i*4+1], + readBuf[beginIndex + i*4+2], readBuf[beginIndex + i*4+3] ); } #endif // whenever some data read, reset the rest wait time. uRestTimeToWait = INTERVAL_FOR_FLUSH_TRASH_DATA; - - __FLOG(_L8("FlushRxDataL()---Reset the rest wait time")); + + OstTrace0( TRACE_NORMAL, DUP6_CMTPUSBEPBASE_FLUSHRXDATAL, "FlushRxDataL()---Reset the rest wait time" ); } else { @@ -1089,13 +1139,14 @@ // reduce the rest time to wait uRestTimeToWait -= INTERVAL_FOR_READ_TRASH_DATA ; } - - __FLOG_VA((_L8("FlushRxDataL()---uRestTimeToWait is %d"), uRestTimeToWait)); + + OstTrace1( TRACE_NORMAL, DUP7_CMTPUSBEPBASE_FLUSHRXDATAL, "FlushRxDataL()---uRestTimeToWait is %d", uRestTimeToWait ); + }while( uRestTimeToWait > 0); readBuf.Close(); - __FLOG(_L8("FlushRxDataL - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBASE_FLUSHRXDATAL_EXIT ); } /* @@ -1131,6 +1182,8 @@ readBuf.CreateL(KMaxPacketTypeBulkHS); Connection().Ldd().ReadPacket(status, EndpointNumber(), readBuf, KMaxPacketTypeBulkHS); User::WaitForRequest(status); - RDebug::Print(_L("CMTPUsbEpBase::ProcessFirstReceivedChunkL(), trash data length = %d"), readBuf.Length()); + OstTrace1( TRACE_NORMAL, CMTPUSBEPBASE_FLUSHONEPACKETL, + "trash data length = %d", readBuf.Length()); + readBuf.Close(); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepbulkin.cpp --- a/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepbulkin.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepbulkin.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -24,9 +24,11 @@ #include "cmtpusbepbulkin.h" #include "mtpdebug.h" #include "mtpusbpanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpusbepbulkinTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"UsbEpBulkIn");) /** USB MTP device class bulk-in endpoint data transfer controller factory method. @@ -41,12 +43,8 @@ { CMTPUsbEpBulkIn* self = new(ELeave) CMTPUsbEpBulkIn(aId, aConnection); CleanupStack::PushL(self); - -#ifdef __FLOG_ACTIVE - self->ConstructL(KComponent); -#else + self->ConstructL(); -#endif CleanupStack::Pop(self); return self; @@ -57,8 +55,8 @@ */ CMTPUsbEpBulkIn::~CMTPUsbEpBulkIn() { - __FLOG(_L8("~CMTPUsbEpBulkIn - Entry")); - __FLOG(_L8("~CMTPUsbEpBulkIn - Exit")); + OstTraceFunctionEntry0( CMTPUSBEPBULKIN_CMTPUSBEPBULKIN_DES_ENTRY ); + OstTraceFunctionExit0( CMTPUSBEPBULKIN_CMTPUSBEPBULKIN_DES_EXIT ); } /** @@ -68,17 +66,17 @@ */ void CMTPUsbEpBulkIn::SendBulkDataL(const MMTPType& aData) { - __FLOG(_L8("SendBulkDataL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBULKIN_SENDBULKDATAL_ENTRY ); // Pass the bulk data source buffer to the base class for processing. SendDataL(aData); - __FLOG(_L8("SendBulkDataL - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBULKIN_SENDBULKDATAL_EXIT ); } void CMTPUsbEpBulkIn::SendDataCompleteL(TInt aError, const MMTPType& aSource) { - __FLOG(_L8("SendDataCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBULKIN_SENDDATACOMPLETEL_ENTRY ); Connection().SendBulkDataCompleteL(aError, aSource); - __FLOG(_L8("SendDataCompleteL - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBULKIN_SENDDATACOMPLETEL_EXIT ); } /** diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepbulkout.cpp --- a/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepbulkout.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepbulkout.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,9 +23,11 @@ #include "cmtpusbconnection.h" #include "cmtpusbepbulkout.h" #include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpusbepbulkoutTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"UsbEpBulkOut");) /** USB MTP device class bulk-out endpoint data transfer controller factory method. @@ -40,12 +42,8 @@ { CMTPUsbEpBulkOut* self = new(ELeave) CMTPUsbEpBulkOut(aId, aConnection); CleanupStack::PushL(self); - -#ifdef __FLOG_ACTIVE - self->ConstructL(KComponent); -#else + self->ConstructL(); -#endif CleanupStack::Pop(self); return self; @@ -56,8 +54,8 @@ */ CMTPUsbEpBulkOut::~CMTPUsbEpBulkOut() { - __FLOG(_L8("~CMTPUsbEpBulkOut - Entry")); - __FLOG(_L8("~CMTPUsbEpBulkOut - Exit")); + OstTraceFunctionEntry0( CMTPUSBEPBULKOUT_CMTPUSBEPBULKOUT_DES_ENTRY ); + OstTraceFunctionExit0( CMTPUSBEPBULKOUT_CMTPUSBEPBULKOUT_DES_EXIT ); } /** @@ -67,17 +65,17 @@ */ void CMTPUsbEpBulkOut::ReceiveBulkDataL(MMTPType& aData) { - __FLOG(_L8("ReceiveBulkContainerL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBULKOUT_RECEIVEBULKDATAL_ENTRY ); // Pass the bulk data sink buffer to the base class for processing. ReceiveDataL(aData); - __FLOG(_L8("ReceiveBulkContainerL - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBULKOUT_RECEIVEBULKDATAL_EXIT ); } void CMTPUsbEpBulkOut::ReceiveDataCompleteL(TInt aError, MMTPType& aSink) { - __FLOG(_L8("ReceiveDataCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPBULKOUT_RECEIVEDATACOMPLETEL_ENTRY ); Connection().ReceiveBulkDataCompleteL(aError, aSink); - __FLOG(_L8("ReceiveDataCompleteL - Exit")); + OstTraceFunctionExit0( CMTPUSBEPBULKOUT_RECEIVEDATACOMPLETEL_EXIT ); } /** diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepcontrol.cpp --- a/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepcontrol.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepcontrol.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -6,7 +6,6 @@ // at the URL "http://www.eclipse.org/legal/epl-v10.html". // // Initial Contributors: -// Nokia Corporation - initial contribution. // // Contributors: // @@ -22,9 +21,11 @@ #include "cmtpusbepcontrol.h" #include "mtpusbpanic.h" #include "mtpusbtransportconstants.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpusbepcontrolTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"UsbEpControl");) /** USB MTP device class control endpoint data transfer controller factory method. @@ -39,12 +40,8 @@ { CMTPUsbEpControl* self = new(ELeave) CMTPUsbEpControl(aId, aConnection); CleanupStack::PushL(self); - -#ifdef __FLOG_ACTIVE - self->ConstructL(KComponent); -#else + self->ConstructL(); -#endif CleanupStack::Pop(self); return self; @@ -55,8 +52,8 @@ */ CMTPUsbEpControl::~CMTPUsbEpControl() { - __FLOG(_L8("~CMTPUsbEpControl - Entry")); - __FLOG(_L8("~CMTPUsbEpControl - Exit")); + OstTraceFunctionEntry0( CMTPUSBEPCONTROL_CMTPUSBEPCONTROL_DES_ENTRY ); + OstTraceFunctionExit0( CMTPUSBEPCONTROL_CMTPUSBEPCONTROL_DES_EXIT ); } /** @@ -66,16 +63,19 @@ */ void CMTPUsbEpControl::ReceiveControlRequestDataL(MMTPType& aData) { - __FLOG(_L8("ReceiveControlRequestDataL - Entry")); - __FLOG_VA((_L8("CMTPUsbEpControl state on entry = %d"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTDATAL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTDATAL, + "CMTPUsbEpControl state on entry = %d", iState ); + __ASSERT_DEBUG((iState == EControlRequestSetupComplete), Panic(EMTPUsbBadState)); // Pass the bulk data sink buffer to the base class and update state.. ReceiveDataL(aData); SetState(EControlRequestDataReceive); - - __FLOG_VA((_L8("CMTPUsbEpControl state on entry = %d"), iState)); - __FLOG(_L8("ReceiveControlRequestDataL - Exit")); + + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTDATAL, + "CMTPUsbEpControl state on entry = %d", iState ); + OstTraceFunctionExit0( CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTDATAL_EXIT ); } /** @@ -85,16 +85,19 @@ */ void CMTPUsbEpControl::ReceiveControlRequestSetupL(MMTPType& aData) { - __FLOG(_L8("ReceiveControlRequestSetupL - Entry")); - __FLOG_VA((_L8("CMTPUsbEpControl state on entry = %d"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTSETUPL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTSETUPL, + "CMTPUsbEpControl state on entry = %d", iState ); + __ASSERT_DEBUG((iState == EIdle), Panic(EMTPUsbBadState)); // Pass the bulk data sink buffer to the base class and update state. ReceiveDataL(aData); SetState(EControlRequestSetupPending); - - __FLOG_VA((_L8("CMTPUsbEpControl state on entry = %d"), iState)); - __FLOG(_L8("ReceiveControlRequestSetupL - Exit")); + + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTSETUPL, + "CMTPUsbEpControl state on entry = %d", iState ); + OstTraceFunctionExit0( CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTSETUPL_EXIT ); } /** @@ -104,14 +107,14 @@ */ void CMTPUsbEpControl::SendControlRequestDataL(const MMTPType& aData) { - __FLOG(_L8("SendControlRequestDataL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPCONTROL_SENDCONTROLREQUESTDATAL_ENTRY ); __ASSERT_DEBUG((iState == EControlRequestSetupComplete), Panic(EMTPUsbBadState)); // Pass the bulk data source buffer to the base class and update state. SendDataL(aData); SetState(EControlRequestDataSend); - - __FLOG(_L8("SendControlRequestDataL - Exit")); + + OstTraceFunctionExit0( CMTPUSBEPCONTROL_SENDCONTROLREQUESTDATAL_EXIT ); } /** @@ -119,20 +122,25 @@ */ void CMTPUsbEpControl::SendControlRequestStatus() { - __FLOG(_L8("SendControlRequestStatus - Entry")); - __FLOG_VA((_L8("CMTPUsbEpControl state on entry = %d"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPCONTROL_SENDCONTROLREQUESTSTATUS_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPCONTROL_SENDCONTROLREQUESTSTATUS, + "CMTPUsbEpControl state on entry = %d", iState ); __ASSERT_DEBUG(((iState == EControlRequestStatusSend) || (iState == EControlRequestSetupComplete)), Panic(EMTPUsbBadState)); TInt ret = Connection().Ldd().SendEp0StatusPacket(); - __FLOG_VA((_L8("SendEp0StatusPacket result = %d."), ret)); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPCONTROL_SENDCONTROLREQUESTSTATUS, + "SendEp0StatusPacket result = %d.", ret ); SetState(EIdle); - __FLOG_VA((_L8("CMTPUsbEpControl state on exit = %d"), iState)); - __FLOG(_L8("SendControlRequestStatus - Exit")); + OstTrace1( TRACE_NORMAL, DUP2_CMTPUSBEPCONTROL_SENDCONTROLREQUESTSTATUS, + "CMTPUsbEpControl state on exit = %d", iState ); + OstTraceFunctionExit0( CMTPUSBEPCONTROL_SENDCONTROLREQUESTSTATUS_EXIT ); } void CMTPUsbEpControl::ReceiveDataCompleteL(TInt aError, MMTPType& aSink) { - __FLOG(_L8("ReceiveDataCompleteL - Entry")); - __FLOG_VA((_L8("CMTPUsbEpControl state on entry = %d"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPCONTROL_RECEIVEDATACOMPLETEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPCONTROL_RECEIVEDATACOMPLETEL, + "CMTPUsbEpControl state on entry = %d", iState ); + switch (iState) { case EControlRequestSetupPending: @@ -161,19 +169,23 @@ // Reset the internal state to idle. SetState(EIdle); } - __FLOG_VA((_L8("CMTPUsbEpControl state on exit = %d"), iState)); - __FLOG(_L8("ReceiveDataCompleteL - Exit")); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPCONTROL_RECEIVEDATACOMPLETEL, + "CMTPUsbEpControl state on exit = %d", iState ); + OstTraceFunctionExit0( CMTPUSBEPCONTROL_RECEIVEDATACOMPLETEL_EXIT ); } void CMTPUsbEpControl::SendDataCompleteL(TInt aError, const MMTPType& aSource) { - __FLOG(_L8("SendDataCompleteL - Entry")); - __FLOG_VA((_L8("CMTPUsbEpControl state on entry = %d"), iState)); + OstTraceFunctionEntry0( CMTPUSBEPCONTROL_SENDDATACOMPLETEL_ENTRY ); + OstTrace1( TRACE_NORMAL, CMTPUSBEPCONTROL_SENDDATACOMPLETEL, + "CMTPUsbEpControl state on entry = %d", iState ); __ASSERT_DEBUG((iState == EControlRequestDataSend), Panic(EMTPUsbBadState)); SetState(EIdle); Connection().SendControlRequestDataCompleteL(aError, aSource); - __FLOG_VA((_L8("CMTPUsbEpControl state on exit = %d"), iState)); - __FLOG(_L8("SendDataCompleteL - Exit")); + OstTrace1( TRACE_NORMAL, DUP1_CMTPUSBEPCONTROL_SENDDATACOMPLETEL, + "CMTPUsbEpControl state on exit = %d", iState ); + + OstTraceFunctionExit0( CMTPUSBEPCONTROL_SENDDATACOMPLETEL_EXIT ); } /** @@ -194,10 +206,10 @@ */ void CMTPUsbEpControl::SetState(TUint aState) { - __FLOG(_L8("SetState - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPCONTROL_SETSTATE_ENTRY ); iState = aState; - __FLOG_VA((_L8("State set to %d"), iState)); - __FLOG(_L8("SetState - Exit")); + OstTrace1( TRACE_NORMAL, CMTPUSBEPCONTROL_SETSTATE, "State set to %d", iState ); + OstTraceFunctionExit0( CMTPUSBEPCONTROL_SETSTATE_EXIT ); } /** Overide this method derived from base class. @@ -205,10 +217,10 @@ */ void CMTPUsbEpControl::DoCancel() { - __FLOG(_L8("DoCancel - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPCONTROL_DOCANCEL_ENTRY ); CMTPUsbEpBase::DoCancel(); SetState(EIdle); - __FLOG(_L8("DoCancel - Exit")); + OstTraceFunctionExit0( CMTPUSBEPCONTROL_DOCANCEL_EXIT ); } diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepinterruptin.cpp --- a/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepinterruptin.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepinterruptin.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -23,9 +23,11 @@ #include "cmtpusbconnection.h" #include "cmtpusbepinterruptin.h" #include "mtpdebug.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpusbepinterruptinTraces.h" +#endif -// Class constants. -__FLOG_STMT(_LIT8(KComponent,"UsbEpInterruptIn");) /** USB MTP device class interrupt endpoint data transfer controller factory @@ -41,12 +43,8 @@ { CMTPUsbEpInterruptIn* self = new(ELeave) CMTPUsbEpInterruptIn(aId, aConnection); CleanupStack::PushL(self); - -#ifdef __FLOG_ACTIVE - self->ConstructL(KComponent); -#else + self->ConstructL(); -#endif CleanupStack::Pop(self); return self; @@ -57,8 +55,8 @@ */ CMTPUsbEpInterruptIn::~CMTPUsbEpInterruptIn() { - __FLOG(_L8("~CMTPUsbEpInterruptIn - Entry")); - __FLOG(_L8("~CMTPUsbEpInterruptIn - Exit")); + OstTraceFunctionEntry0( CMTPUSBEPINTERRUPTIN_CMTPUSBEPINTERRUPTIN_DES_ENTRY ); + OstTraceFunctionExit0( CMTPUSBEPINTERRUPTIN_CMTPUSBEPINTERRUPTIN_DES_EXIT ); } /** @@ -70,17 +68,17 @@ */ void CMTPUsbEpInterruptIn::SendInterruptDataL(const MMTPType& aData) { - __FLOG(_L8("SendInterruptDataL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPINTERRUPTIN_SENDINTERRUPTDATAL_ENTRY ); // Pass the bulk data source buffer to the base class for processing. SendDataL(aData); - __FLOG(_L8("SendInterruptDataL - Exit")); + OstTraceFunctionExit0( CMTPUSBEPINTERRUPTIN_SENDINTERRUPTDATAL_EXIT ); } void CMTPUsbEpInterruptIn::SendDataCompleteL(TInt aError, const MMTPType& aData) { - __FLOG(_L8("SendDataCompleteL - Entry")); + OstTraceFunctionEntry0( CMTPUSBEPINTERRUPTIN_SENDDATACOMPLETEL_ENTRY ); Connection().SendInterruptDataCompleteL(aError, aData); - __FLOG(_L8("SendDataCompleteL - Exit")); + OstTraceFunctionExit0( CMTPUSBEPINTERRUPTIN_SENDDATACOMPLETEL_EXIT ); } /** diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepwatcher.cpp --- a/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepwatcher.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbepwatcher.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -21,8 +21,6 @@ #include "cmtpusbconnection.h" #include "cmtpusbepwatcher.h" -__FLOG_STMT(_LIT8(KComponent,"UsbEpWatcher");) - /** USB MTP device class endpoint stall status observer factory method. @return A pointer to an USB MTP device class endpoint stall status diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbtransport.cpp --- a/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbtransport.cpp Thu Sep 02 21:21:26 2010 +0300 +++ b/mtptransports/mtpusbtransport/usbsic_imp/src/cmtpusbtransport.cpp Fri Sep 17 08:34:51 2010 +0300 @@ -24,8 +24,11 @@ #include "cmtpusbtransport.h" #include "mmtpconnectionmgr.h" #include "mtpusbpanic.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "cmtpusbtransportTraces.h" +#endif -__FLOG_STMT(_LIT8(KComponent,"UsbTransport");) /** USB MTP device class transport plug-in factory method. @@ -37,6 +40,7 @@ { if ( aParameter != NULL ) { + OstTrace0( TRACE_ERROR, CMTPUSBTRANSPORT_NEWL, "Parameter should be NULL!" ); User::Leave(KErrArgument); } CMTPUsbTransport* self = new (ELeave) CMTPUsbTransport; @@ -51,10 +55,9 @@ */ CMTPUsbTransport::~CMTPUsbTransport() { - __FLOG(_L8("~CMTPUsbTransport - Entry")); + OstTraceFunctionEntry0( CMTPUSBTRANSPORT_CMTPUSBTRANSPORT_DES_ENTRY ); delete iConnection; - __FLOG(_L8("~CMTPUsbTransport - Exit")); - __FLOG_CLOSE; + OstTraceFunctionExit0( CMTPUSBTRANSPORT_CMTPUSBTRANSPORT_DES_EXIT ); } /** @@ -68,27 +71,27 @@ void CMTPUsbTransport::ModeChanged(TMTPOperationalMode /*aMode*/) { - __FLOG(_L8("ModeChanged - Entry")); - __FLOG(_L8("ModeChanged - Exit")); + OstTraceFunctionEntry0( CMTPUSBTRANSPORT_MODECHANGED_ENTRY ); + OstTraceFunctionExit0( CMTPUSBTRANSPORT_MODECHANGED_EXIT ); } void CMTPUsbTransport::StartL(MMTPConnectionMgr& aConnectionMgr) { - __FLOG(_L8("StartL - Entry")); + OstTraceFunctionEntry0( CMTPUSBTRANSPORT_STARTL_ENTRY ); __ASSERT_ALWAYS(!iConnection, Panic(EMTPUsbConnectionAlreadyExist)); iConnection = CMTPUsbConnection::NewL(aConnectionMgr); - __FLOG(_L8("StartL - Exit")); + OstTraceFunctionExit0( CMTPUSBTRANSPORT_STARTL_EXIT ); } void CMTPUsbTransport::Stop(MMTPConnectionMgr& /*aConnectionMgr*/) { - __FLOG(_L8("Stop - Entry")); + OstTraceFunctionEntry0( CMTPUSBTRANSPORT_STOP_ENTRY ); if(iConnection) { delete iConnection; iConnection = NULL; } - __FLOG(_L8("Stop - Exit")); + OstTraceFunctionExit0( CMTPUSBTRANSPORT_STOP_EXIT ); } TAny* CMTPUsbTransport::GetExtendedInterface(TUid /*aInterfaceUid*/) @@ -109,10 +112,9 @@ */ void CMTPUsbTransport::ConstructL() { - __FLOG_OPEN(KMTPSubsystem, KComponent); - __FLOG(_L8("ConstructL - Entry")); - __FLOG(_L8("USB MTP Device class plug-in loaded.")); - __FLOG(_L8("ConstructL - Exit")); + OstTraceFunctionEntry0( CMTPUSBTRANSPORT_CONSTRUCTL_ENTRY ); + OstTrace0( TRACE_NORMAL, CMTPUSBTRANSPORT_CONSTRUCTL, "USB MTP Device class plug-in loaded." ); + OstTraceFunctionExit0( CMTPUSBTRANSPORT_CONSTRUCTL_EXIT ); } // Define the implementation UID of MTP USB transport implementation. diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpusbtransport/usbsic_imp/traces/OstTraceDefinitions.h Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,7 @@ +#ifndef __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ +// OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler +// REMOVE BEFORE CHECK-IN TO VERSION CONTROL +//#define OST_TRACE_COMPILER_IN_USE +#include +#endif diff -r a5deb6b96675 -r 63cf70d3ecd8 mtptransports/mtpusbtransport/usbsic_imp/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mtptransports/mtpusbtransport/usbsic_imp/traces/fixed_id.definitions Fri Sep 17 08:34:51 2010 +0300 @@ -0,0 +1,446 @@ +## +# This is Default Licence added by TraceCompiler +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# +## +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_DUMP=0x89 +[GROUP]TRACE_ERROR=0x82 +[GROUP]TRACE_FATAL=0x81 +[GROUP]TRACE_FLOW=0x8a +[GROUP]TRACE_IMPORTANT=0x85 +[GROUP]TRACE_NORMAL=0x86 +[TRACE]TRACE_DUMP[0x89]_DUP23_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x5 +[TRACE]TRACE_DUMP[0x89]_DUP24_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x4 +[TRACE]TRACE_DUMP[0x89]_DUP25_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x6 +[TRACE]TRACE_DUMP[0x89]_DUP3_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL=0x2 +[TRACE]TRACE_DUMP[0x89]_DUP4_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL=0x1 +[TRACE]TRACE_DUMP[0x89]_DUP5_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL=0x3 +[TRACE]TRACE_ERROR[0x82]_CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORSETL=0x9 +[TRACE]TRACE_ERROR[0x82]_CMTPUSBCONNECTION_PROCESSCONTROLREQUESTDEVICESTATUSL=0x7 +[TRACE]TRACE_ERROR[0x82]_CMTPUSBCONNECTION_STARTUSBL=0xc +[TRACE]TRACE_ERROR[0x82]_CMTPUSBTRANSPORT_NEWL=0x11 +[TRACE]TRACE_ERROR[0x82]_DUP16_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x10 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORSETL=0xa +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPUSBCONNECTION_CONSTRUCTL=0x6 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPUSBCONNECTION_ENDPOINTCAPSL=0x4 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPUSBCONNECTION_PROCESSCONTROLREQUESTDEVICESTATUSL=0x8 +[TRACE]TRACE_ERROR[0x82]_DUP1_CMTPUSBCONNECTION_RECEIVEBULKDATACOMPLETEL=0x1 +[TRACE]TRACE_ERROR[0x82]_DUP22_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0xf +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORSETL=0xb +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPUSBCONNECTION_RECEIVEBULKDATACOMPLETEL=0x2 +[TRACE]TRACE_ERROR[0x82]_DUP2_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTSETUPCOMPLETEL=0x3 +[TRACE]TRACE_ERROR[0x82]_DUP3_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL=0xd +[TRACE]TRACE_ERROR[0x82]_DUP4_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL=0xe +[TRACE]TRACE_ERROR[0x82]_DUP6_CMTPUSBCONNECTION_ENDPOINTCAPSL=0x5 +[TRACE]TRACE_FATAL[0x81]_DUP13_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x6 +[TRACE]TRACE_FATAL[0x81]_DUP2_CMTPUSBCONNECTION_SENDBULKDATACOMPLETEL=0x3 +[TRACE]TRACE_FATAL[0x81]_DUP3_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x7 +[TRACE]TRACE_FATAL[0x81]_DUP4_CMTPUSBCONNECTION_RUNL=0x4 +[TRACE]TRACE_FATAL[0x81]_DUP4_CMTPUSBEPBASE_RUNL=0x5 +[TRACE]TRACE_FATAL[0x81]_DUP5_CMTPUSBCONNECTION_SENDEVENTL=0x1 +[TRACE]TRACE_FATAL[0x81]_DUP6_CMTPUSBCONNECTION_SENDEVENTL=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BINDL_ENTRY=0x3 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BINDL_EXIT=0x4 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BOUNDPROTOCOLLAYER_ENTRY=0x5 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BOUNDPROTOCOLLAYER_EXIT=0x6 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BUFFEREVENTDATAL_ENTRY=0x31 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BUFFEREVENTDATAL_EXIT=0x32 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BULKENDPOINTSSTALLCLEARL_ENTRY=0x57 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BULKENDPOINTSSTALLCLEARL_EXIT=0x58 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BULKENDPOINTSSTALLL_ENTRY=0x55 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BULKENDPOINTSSTALLL_EXIT=0x56 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BULKREQUESTERRORHANDLED_ENTRY=0x47 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BULKREQUESTERRORHANDLED_EXIT=0x48 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BULKREQUESTTRANSACTIONSTATEVALID_ENTRY=0x49 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_BULKREQUESTTRANSACTIONSTATEVALID_EXIT=0x4a +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CLOSECONNECTION_ENTRY=0x7 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CLOSECONNECTION_EXIT=0x8 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CMTPUSBCONNECTION_DES_ENTRY=0x1 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CMTPUSBCONNECTION_DES_EXIT=0x2 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORCLEAR_ENTRY=0x4d +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORCLEAR_EXIT=0x4e +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORSETL_ENTRY=0x4f +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CONFIGURATIONDESCRIPTORSETL_EXIT=0x50 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CONSTRUCTL_ENTRY=0x2d +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CONSTRUCTL_EXIT=0x2e +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CONTROLENDPOINTSTARTL_ENTRY=0x51 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CONTROLENDPOINTSTARTL_EXIT=0x52 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CONTROLENDPOINTSTOP_ENTRY=0x53 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CONTROLENDPOINTSTOP_EXIT=0x54 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CONTROLREQUESTERRORHANDLED_ENTRY=0x4b +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_CONTROLREQUESTERRORHANDLED_EXIT=0x4c +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_DATAENDPOINTSSTARTL_ENTRY=0x59 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_DATAENDPOINTSSTARTL_EXIT=0x5a +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_DATAENDPOINTSSTOP_ENTRY=0x5b +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_DATAENDPOINTSSTOP_EXIT=0x5c +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_DOCANCEL_ENTRY=0x27 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_DOCANCEL_EXIT=0x28 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_ENDPOINTCAPSL_ENTRY=0x25 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_ENDPOINTCAPSL_EXIT=0x26 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_ENDPOINTSTALLCLEARL_ENTRY=0x5f +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_ENDPOINTSTALLCLEARL_EXIT=0x60 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_ENDPOINTSTALLL_ENTRY=0x5d +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_ENDPOINTSTALLL_EXIT=0x5e +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_INITIATEBULKREQUESTSEQUENCEL_ENTRY=0x37 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_INITIATEBULKREQUESTSEQUENCEL_EXIT=0x38 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_INITIATECONTROLREQUESTSEQUENCEL_ENTRY=0x39 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_INITIATECONTROLREQUESTSEQUENCEL_EXIT=0x3a +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_ISSUEALTERNATEDEVICESTATUSNOTIFYREQUEST_ENTRY=0x2f +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_ISSUEALTERNATEDEVICESTATUSNOTIFYREQUEST_EXIT=0x30 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL_ENTRY=0x3b +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL_EXIT=0x3c +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_PROCESSBULKDATAINL_ENTRY=0x3d +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_PROCESSBULKDATAINL_EXIT=0x3e +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_PROCESSBULKDATAOUTL_ENTRY=0x3f +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_PROCESSBULKDATAOUTL_EXIT=0x40 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_PROCESSCONTROLREQUESTCANCELL_ENTRY=0x41 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_PROCESSCONTROLREQUESTCANCELL_EXIT=0x42 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_PROCESSCONTROLREQUESTDEVICERESETL_ENTRY=0x43 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_PROCESSCONTROLREQUESTDEVICERESETL_EXIT=0x44 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_PROCESSCONTROLREQUESTDEVICESTATUSL_ENTRY=0x45 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_PROCESSCONTROLREQUESTDEVICESTATUSL_EXIT=0x46 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RECEIVEBULKDATACOMPLETEL_ENTRY=0x19 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RECEIVEBULKDATACOMPLETEL_EXIT=0x1a +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL_ENTRY=0x1b +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL_EXIT=0x1c +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTSETUPCOMPLETEL_ENTRY=0x1d +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTSETUPCOMPLETEL_EXIT=0x1e +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RECEIVEDATACANCELL_ENTRY=0xb +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RECEIVEDATACANCELL_EXIT=0xc +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RECEIVEDATAL_ENTRY=0x9 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RECEIVEDATAL_EXIT=0xa +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RESUMECONNECTIONL_ENTRY=0x61 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RESUMECONNECTIONL_EXIT=0x62 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RUNERROR_ENTRY=0x29 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RUNERROR_EXIT=0x2a +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RUNL_ENTRY=0x2b +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_RUNL_EXIT=0x2c +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDBULKDATACOMPLETEL_ENTRY=0x1f +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDBULKDATACOMPLETEL_EXIT=0x20 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDCONTROLREQUESTDATACOMPLETEL_ENTRY=0x21 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDCONTROLREQUESTDATACOMPLETEL_EXIT=0x22 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDDATACANCELL_ENTRY=0xf +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDDATACANCELL_EXIT=0x10 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDDATAL_ENTRY=0xd +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDDATAL_EXIT=0xe +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDEVENTDATAL_ENTRY=0x33 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDEVENTDATAL_EXIT=0x34 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDEVENTL_ENTRY=0x11 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDEVENTL_EXIT=0x12 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDINTERRUPTDATACOMPLETEL_ENTRY=0x23 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDINTERRUPTDATACOMPLETEL_EXIT=0x24 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDRESPONSEL_ENTRY=0x13 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDRESPONSEL_EXIT=0x14 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDUNREPORTEDSTATUSEVENTL_ENTRY=0x35 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SENDUNREPORTEDSTATUSEVENTL_EXIT=0x36 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SETBULKTRANSACTIONSTATE_ENTRY=0x6d +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SETBULKTRANSACTIONSTATE_EXIT=0x6e +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SETCONNECTIONSTATE_ENTRY=0x73 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SETCONNECTIONSTATE_EXIT=0x74 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SETDEVICESTATUS_ENTRY=0x6f +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SETDEVICESTATUS_EXIT=0x70 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL_ENTRY=0x71 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL_EXIT=0x72 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SETSUSPENDSTATE_ENTRY=0x75 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SETSUSPENDSTATE_EXIT=0x76 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SETTRANSPORTPACKETSIZEL_ENTRY=0x77 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SETTRANSPORTPACKETSIZEL_EXIT=0x78 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_STARTCONNECTIONL_ENTRY=0x63 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_STARTCONNECTIONL_EXIT=0x64 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_STARTUSBL_ENTRY=0x69 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_STARTUSBL_EXIT=0x6a +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_STOPCONNECTION_ENTRY=0x65 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_STOPCONNECTION_EXIT=0x66 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_STOPUSB_ENTRY=0x6b +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_STOPUSB_EXIT=0x6c +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SUSPENDCONNECTIONL_ENTRY=0x67 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_SUSPENDCONNECTIONL_EXIT=0x68 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_TRANSACTIONCOMPLETEL_ENTRY=0x15 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_TRANSACTIONCOMPLETEL_EXIT=0x16 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_UNBIND_ENTRY=0x17 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBCONNECTION_UNBIND_EXIT=0x18 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_CANCELRECEIVEL_ENTRY=0x83 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_CANCELRECEIVEL_EXIT=0x84 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_CANCELSENDL_ENTRY=0x85 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_CANCELSENDL_EXIT=0x86 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_CMTPUSBEPBASE_DES_ENTRY=0x79 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_CMTPUSBEPBASE_DES_EXIT=0x7a +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_CONSTRUCTL_ENTRY=0x7b +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_CONSTRUCTL_EXIT=0x7c +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_DOCANCEL_ENTRY=0x91 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_DOCANCEL_EXIT=0x92 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_FLUSHRXDATAL_ENTRY=0xaa +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_FLUSHRXDATAL_EXIT=0xab +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL_ENTRY=0x9e +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL_EXIT=0x9f +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL_ENTRY=0xa0 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL_EXIT=0xa1 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_PROCESSSENDDATASTREAML_ENTRY=0xa6 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_PROCESSSENDDATASTREAML_EXIT=0xa7 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RECEIVEDATACOMPLETEL_ENTRY=0x8b +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RECEIVEDATACOMPLETEL_EXIT=0x8c +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RECEIVEDATAL_ENTRY=0x87 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RECEIVEDATAL_EXIT=0x88 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RESETRECEIVEDATASTREAM_ENTRY=0x98 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RESETRECEIVEDATASTREAM_EXIT=0x99 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RESETSENDDATASTREAM_ENTRY=0x9a +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RESETSENDDATASTREAM_EXIT=0x9b +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RESUMERECEIVEDATAL_ENTRY=0x89 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RESUMERECEIVEDATAL_EXIT=0x8a +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML_ENTRY=0xa4 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML_EXIT=0xa5 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RUNERROR_ENTRY=0x93 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RUNERROR_EXIT=0x94 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RUNL_ENTRY=0x95 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_RUNL_EXIT=0x96 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_SENDDATACOMPLETEL_ENTRY=0x8f +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_SENDDATACOMPLETEL_EXIT=0x90 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_SENDDATAL_ENTRY=0x8d +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_SENDDATAL_EXIT=0x8e +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_SETMAXPACKETSIZEL_ENTRY=0x7d +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_SETMAXPACKETSIZEL_EXIT=0x7e +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_SETSTREAMSTATE_ENTRY=0xa8 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_SETSTREAMSTATE_EXIT=0xa9 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_STALLCLEAR_ENTRY=0x81 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_STALLCLEAR_EXIT=0x82 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_STALL_ENTRY=0x7f +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_STALL_EXIT=0x80 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_VALIDATEUSBHEADERL_ENTRY=0x9c +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBASE_VALIDATEUSBHEADERL_EXIT=0x9d +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBULKIN_CMTPUSBEPBULKIN_DES_ENTRY=0xac +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBULKIN_CMTPUSBEPBULKIN_DES_EXIT=0xad +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBULKIN_SENDBULKDATAL_ENTRY=0xae +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBULKIN_SENDBULKDATAL_EXIT=0xaf +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBULKIN_SENDDATACOMPLETEL_ENTRY=0xb0 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBULKIN_SENDDATACOMPLETEL_EXIT=0xb1 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBULKOUT_CMTPUSBEPBULKOUT_DES_ENTRY=0xb2 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBULKOUT_CMTPUSBEPBULKOUT_DES_EXIT=0xb3 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBULKOUT_RECEIVEBULKDATAL_ENTRY=0xb4 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBULKOUT_RECEIVEBULKDATAL_EXIT=0xb5 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBULKOUT_RECEIVEDATACOMPLETEL_ENTRY=0xb6 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPBULKOUT_RECEIVEDATACOMPLETEL_EXIT=0xb7 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_CMTPUSBEPCONTROL_DES_ENTRY=0xb8 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_CMTPUSBEPCONTROL_DES_EXIT=0xb9 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_DOCANCEL_ENTRY=0xc8 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_DOCANCEL_EXIT=0xc9 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTDATAL_ENTRY=0xba +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTDATAL_EXIT=0xbb +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTSETUPL_ENTRY=0xbc +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTSETUPL_EXIT=0xbd +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_RECEIVEDATACOMPLETEL_ENTRY=0xc2 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_RECEIVEDATACOMPLETEL_EXIT=0xc3 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_SENDCONTROLREQUESTDATAL_ENTRY=0xbe +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_SENDCONTROLREQUESTDATAL_EXIT=0xbf +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_SENDCONTROLREQUESTSTATUS_ENTRY=0xc0 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_SENDCONTROLREQUESTSTATUS_EXIT=0xc1 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_SENDDATACOMPLETEL_ENTRY=0xc4 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_SENDDATACOMPLETEL_EXIT=0xc5 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_SETSTATE_ENTRY=0xc6 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPCONTROL_SETSTATE_EXIT=0xc7 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPINTERRUPTIN_CMTPUSBEPINTERRUPTIN_DES_ENTRY=0xca +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPINTERRUPTIN_CMTPUSBEPINTERRUPTIN_DES_EXIT=0xcb +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPINTERRUPTIN_SENDDATACOMPLETEL_ENTRY=0xce +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPINTERRUPTIN_SENDDATACOMPLETEL_EXIT=0xcf +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPINTERRUPTIN_SENDINTERRUPTDATAL_ENTRY=0xcc +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBEPINTERRUPTIN_SENDINTERRUPTDATAL_EXIT=0xcd +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBTRANSPORT_CMTPUSBTRANSPORT_DES_ENTRY=0xd0 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBTRANSPORT_CMTPUSBTRANSPORT_DES_EXIT=0xd1 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBTRANSPORT_CONSTRUCTL_ENTRY=0xd8 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBTRANSPORT_CONSTRUCTL_EXIT=0xd9 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBTRANSPORT_MODECHANGED_ENTRY=0xd2 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBTRANSPORT_MODECHANGED_EXIT=0xd3 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBTRANSPORT_STARTL_ENTRY=0xd4 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBTRANSPORT_STARTL_EXIT=0xd5 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBTRANSPORT_STOP_ENTRY=0xd6 +[TRACE]TRACE_FLOW[0x8A]_CMTPUSBTRANSPORT_STOP_EXIT=0xd7 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL_EXIT=0xa2 +[TRACE]TRACE_FLOW[0x8A]_DUP1_CMTPUSBEPBASE_RUNL_EXIT=0x97 +[TRACE]TRACE_FLOW[0x8A]_DUP2_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL_EXIT=0xa3 +[TRACE]TRACE_IMPORTANT[0x85]_CMTPUSBCONNECTION_RUNERROR=0x1 +[TRACE]TRACE_IMPORTANT[0x85]_CMTPUSBEPBASE_RUNERROR=0x2 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_BULKREQUESTERRORHANDLED=0x33 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_BULKREQUESTTRANSACTIONSTATEVALID=0x34 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_CONNECTIONSTATE=0x40 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_CONSTRUCTL=0x25 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_CONTROLREQUESTERRORHANDLED=0x36 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_DATAENDPOINTSSTOP=0x37 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_ENDPOINTCAPSL=0x1b +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_ENDPOINTSTALLCLEARL=0x3d +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_ENDPOINTSTALLL=0x3c +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL=0x27 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_PROCESSBULKDATAINL=0x2e +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_PROCESSBULKDATAOUTL=0x31 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_PROCESSCONTROLREQUESTCANCELL=0x32 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_RECEIVEBULKDATACOMPLETEL=0xd +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL=0xe +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTSETUPCOMPLETEL=0x16 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_RECEIVEDATAL=0x1 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_RUNL=0x20 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_SENDBULKDATACOMPLETEL=0x18 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_SENDCONTROLREQUESTDATACOMPLETEL=0x1a +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_SENDEVENTDATAL=0x26 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_SENDEVENTL=0x2 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_SENDRESPONSEL=0x7 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_SETBULKTRANSACTIONSTATE=0x42 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_SETCONNECTIONSTATE=0x48 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_SETDEVICESTATUS=0x43 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL=0x44 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_SETSUSPENDSTATE=0x49 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_SETTRANSPORTPACKETSIZEL=0x4a +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_STARTCONNECTIONL=0x3e +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_STOPCONNECTION=0x3f +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_SUSPENDSTATE=0x41 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBCONNECTION_TRANSACTIONCOMPLETEL=0xc +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_CANCELRECEIVEL=0x53 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_CANCELSENDL=0x54 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_DOCANCEL=0x5d +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_FLUSHONEPACKETL=0xa0 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_FLUSHRXDATAL=0x98 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL=0x6b +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL=0x70 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x88 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_RECEIVEDATAL=0x55 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_RESUMERECEIVEDATAL=0x57 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x73 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_RUNL=0x62 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_SENDDATAL=0x5b +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_SETMAXPACKETSIZEL=0x4c +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_SETSTREAMSTATE=0x97 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_STALL=0x4d +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_STALLCLEAR=0x50 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPBASE_VALIDATEUSBHEADERL=0x6a +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTDATAL=0xa1 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTSETUPL=0xa3 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPCONTROL_RECEIVEDATACOMPLETEL=0xa8 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPCONTROL_SENDCONTROLREQUESTSTATUS=0xa5 +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPCONTROL_SENDDATACOMPLETEL=0xaa +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBEPCONTROL_SETSTATE=0xac +[TRACE]TRACE_NORMAL[0x86]_CMTPUSBTRANSPORT_CONSTRUCTL=0xad +[TRACE]TRACE_NORMAL[0x86]_DUP10_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x91 +[TRACE]TRACE_NORMAL[0x86]_DUP10_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x7d +[TRACE]TRACE_NORMAL[0x86]_DUP11_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x92 +[TRACE]TRACE_NORMAL[0x86]_DUP11_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x7e +[TRACE]TRACE_NORMAL[0x86]_DUP12_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x93 +[TRACE]TRACE_NORMAL[0x86]_DUP12_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x7f +[TRACE]TRACE_NORMAL[0x86]_DUP13_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x94 +[TRACE]TRACE_NORMAL[0x86]_DUP14_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x95 +[TRACE]TRACE_NORMAL[0x86]_DUP14_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x80 +[TRACE]TRACE_NORMAL[0x86]_DUP15_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x96 +[TRACE]TRACE_NORMAL[0x86]_DUP15_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x81 +[TRACE]TRACE_NORMAL[0x86]_DUP16_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x82 +[TRACE]TRACE_NORMAL[0x86]_DUP17_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x83 +[TRACE]TRACE_NORMAL[0x86]_DUP18_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x84 +[TRACE]TRACE_NORMAL[0x86]_DUP19_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x85 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBCONNECTION_BULKREQUESTTRANSACTIONSTATEVALID=0x35 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBCONNECTION_DATAENDPOINTSSTOP=0x38 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL=0x28 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBCONNECTION_PROCESSBULKDATAINL=0x2f +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL=0xf +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTSETUPCOMPLETEL=0x17 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBCONNECTION_RUNL=0x21 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBCONNECTION_SENDBULKDATACOMPLETEL=0x19 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBCONNECTION_SENDEVENTL=0x3 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBCONNECTION_SENDRESPONSEL=0x8 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL=0x45 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBCONNECTION_SETTRANSPORTPACKETSIZEL=0x4b +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_DOCANCEL=0x5e +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_FLUSHRXDATAL=0x99 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL=0x6c +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL=0x71 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x89 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_RECEIVEDATAL=0x56 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_RESUMERECEIVEDATAL=0x58 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x74 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_RUNERROR=0x60 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_RUNL=0x63 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_SENDDATAL=0x5c +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_STALL=0x4e +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_STALLCLEAR=0x51 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPBASE_VALIDATEUSBHEADERL=0x67 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTDATAL=0xa2 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPCONTROL_RECEIVECONTROLREQUESTSETUPL=0xa4 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPCONTROL_RECEIVEDATACOMPLETEL=0xa9 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPCONTROL_SENDCONTROLREQUESTSTATUS=0xa6 +[TRACE]TRACE_NORMAL[0x86]_DUP1_CMTPUSBEPCONTROL_SENDDATACOMPLETEL=0xab +[TRACE]TRACE_NORMAL[0x86]_DUP20_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x86 +[TRACE]TRACE_NORMAL[0x86]_DUP21_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x87 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBCONNECTION_DATAENDPOINTSSTOP=0x39 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBCONNECTION_ENDPOINTCAPSL=0x1c +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL=0x29 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBCONNECTION_PROCESSBULKDATAINL=0x30 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL=0x10 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBCONNECTION_RUNL=0x22 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBCONNECTION_SENDEVENTL=0x4 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBCONNECTION_SENDRESPONSEL=0x9 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL=0x46 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPBASE_DOCANCEL=0x5f +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPBASE_FLUSHRXDATAL=0x9a +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL=0x6d +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPBASE_PROCESSFIRSTRECEIVEDCHUNKL=0x72 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x8a +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPBASE_RESUMERECEIVEDATAL=0x59 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x75 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPBASE_RUNERROR=0x61 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPBASE_RUNL=0x64 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPBASE_STALL=0x4f +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPBASE_STALLCLEAR=0x52 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPBASE_VALIDATEUSBHEADERL=0x68 +[TRACE]TRACE_NORMAL[0x86]_DUP2_CMTPUSBEPCONTROL_SENDCONTROLREQUESTSTATUS=0xa7 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBCONNECTION_DATAENDPOINTSSTOP=0x3a +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBCONNECTION_ENDPOINTCAPSL=0x1d +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL=0x2a +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL=0x11 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBCONNECTION_RUNL=0x23 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBCONNECTION_SENDEVENTL=0x5 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBCONNECTION_SENDRESPONSEL=0xa +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBEPBASE_FLUSHRXDATAL=0x9b +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL=0x6e +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBEPBASE_RESUMERECEIVEDATAL=0x5a +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x76 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBEPBASE_RUNL=0x65 +[TRACE]TRACE_NORMAL[0x86]_DUP3_CMTPUSBEPBASE_VALIDATEUSBHEADERL=0x69 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPUSBCONNECTION_DATAENDPOINTSSTOP=0x3b +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPUSBCONNECTION_ENDPOINTCAPSL=0x1e +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL=0x2b +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL=0x12 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPUSBCONNECTION_SENDEVENTL=0x6 +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPUSBCONNECTION_SENDRESPONSEL=0xb +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPUSBEPBASE_FLUSHRXDATAL=0x9c +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPUSBEPBASE_INITIATEFIRSTCHUNKRECEIVEL=0x6f +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x8b +[TRACE]TRACE_NORMAL[0x86]_DUP4_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x77 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPUSBCONNECTION_ENDPOINTCAPSL=0x1f +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL=0x2c +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL=0x13 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPUSBCONNECTION_RUNL=0x24 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPUSBCONNECTION_SETINTERFACEDESCRIPTORL=0x47 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPUSBEPBASE_FLUSHRXDATAL=0x9d +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x8c +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x78 +[TRACE]TRACE_NORMAL[0x86]_DUP5_CMTPUSBEPBASE_RUNL=0x66 +[TRACE]TRACE_NORMAL[0x86]_DUP6_CMTPUSBCONNECTION_PROCESSBULKCOMMANDL=0x2d +[TRACE]TRACE_NORMAL[0x86]_DUP6_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL=0x14 +[TRACE]TRACE_NORMAL[0x86]_DUP6_CMTPUSBEPBASE_FLUSHRXDATAL=0x9e +[TRACE]TRACE_NORMAL[0x86]_DUP6_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x8d +[TRACE]TRACE_NORMAL[0x86]_DUP6_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x79 +[TRACE]TRACE_NORMAL[0x86]_DUP7_CMTPUSBCONNECTION_RECEIVECONTROLREQUESTDATACOMPLETEL=0x15 +[TRACE]TRACE_NORMAL[0x86]_DUP7_CMTPUSBEPBASE_FLUSHRXDATAL=0x9f +[TRACE]TRACE_NORMAL[0x86]_DUP7_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x8e +[TRACE]TRACE_NORMAL[0x86]_DUP7_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x7a +[TRACE]TRACE_NORMAL[0x86]_DUP8_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x8f +[TRACE]TRACE_NORMAL[0x86]_DUP8_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x7b +[TRACE]TRACE_NORMAL[0x86]_DUP9_CMTPUSBEPBASE_PROCESSSENDDATASTREAML=0x90 +[TRACE]TRACE_NORMAL[0x86]_DUP9_CMTPUSBEPBASE_RESUMERECEIVEDATASTREAML=0x7c diff -r a5deb6b96675 -r 63cf70d3ecd8 remoteconn_plat/locod_bearer_plugin_api/inc/locodbearerplugin.inl --- a/remoteconn_plat/locod_bearer_plugin_api/inc/locodbearerplugin.inl Thu Sep 02 21:21:26 2010 +0300 +++ b/remoteconn_plat/locod_bearer_plugin_api/inc/locodbearerplugin.inl Fri Sep 17 08:34:51 2010 +0300 @@ -17,7 +17,7 @@ */ -#include +#include // ----------------------------------------------------------------------------- // Creates the bearer plug ins and return it to caller diff -r a5deb6b96675 -r 63cf70d3ecd8 remoteconn_plat/locod_service_plugin_api/inc/locodserviceplugin.inl --- a/remoteconn_plat/locod_service_plugin_api/inc/locodserviceplugin.inl Thu Sep 02 21:21:26 2010 +0300 +++ b/remoteconn_plat/locod_service_plugin_api/inc/locodserviceplugin.inl Fri Sep 17 08:34:51 2010 +0300 @@ -17,7 +17,7 @@ */ -#include +#include // ----------------------------------------------------------------------------- // Constructor method, just saves the arguments into member variables