# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1279210044 -10800 # Node ID 63c982fb92f2bd5300bd8d3514b3487c6ffcc9f7 # Parent 9422ed56ee45755ca42445c2250630c4da5cef7a Revision: 201025 Kit: 2010127 diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/blacklistclient/group/blacklistclient.mmp --- a/harvester/blacklistclient/group/blacklistclient.mmp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/blacklistclient/group/blacklistclient.mmp Thu Jul 15 19:07:24 2010 +0300 @@ -28,6 +28,7 @@ USERINCLUDE ../../blacklistserver/inc USERINCLUDE ../../common/inc USERINCLUDE ../../../inc +USERINCLUDE ../traces SOURCEPATH ../src SOURCE blacklistclient.cpp diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/blacklistclient/src/blacklistclient.cpp --- a/harvester/blacklistclient/src/blacklistclient.cpp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/blacklistclient/src/blacklistclient.cpp Thu Jul 15 19:07:24 2010 +0300 @@ -20,6 +20,11 @@ #include "mdcserializationbuffer.h" #include "blacklistitem.h" #include "harvesterlog.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "blacklistclientTraces.h" +#endif + // --------------------------------------------------------------------------- @@ -38,6 +43,7 @@ EXPORT_C RBlacklistClient::~RBlacklistClient() { WRITELOG( "RBlacklistClient::~RBlacklistClient - begin" ); + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_RBLACKLISTCLIENT, "RBlacklistClient::~RBlacklistClient -begin" ); RSessionBase::Close(); iBlacklistMemoryTable.ResetAndDestroy(); @@ -46,6 +52,8 @@ iFs.Close(); WRITELOG( "RBlacklistClient::~RBlacklistClient - end" ); + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_RBLACKLISTCLIENT, "RBlacklistClient::~RBlacklistClient - end" ); + } // --------------------------------------------------------------------------- @@ -55,7 +63,8 @@ EXPORT_C TInt RBlacklistClient::Connect() { WRITELOG( "RBlacklistClient::Connect - begin" ); - + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_CONNECT, "RBlacklistClient::Connect - begin" ); + iSessionOk = EFalse; TInt error = iFs.Connect(); @@ -83,7 +92,8 @@ } WRITELOG( "RBlacklistClient::Connect - end" ); - + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_CONNECT, "RBlacklistClient::Connect - end" ); + return error; } @@ -94,7 +104,8 @@ TVersion RBlacklistClient::Version() const { WRITELOG( "RBlacklistClient::Version - begin" ); - + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_VERSION, "RBlacklistClient::Version - begin" ); + return TVersion( KBlacklistServerMajorVersion, KBlacklistServerMinorVersion, KBlacklistServerBuildVersion ); @@ -107,6 +118,7 @@ TInt RBlacklistClient::StartServer() { WRITELOG( "RBlacklistClient::StartServer - begin" ); + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_STARTSERVER, "RBlacklistClient::StartServer - begin" ); RProcess server; TInt error = server.Create( KBlacklistServerExe, KNullDesC ); @@ -132,7 +144,8 @@ server.Close(); WRITELOG( "RBlacklistClient::StartServer - end" ); - + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_STARTSERVER, "RBlacklistClient::StartServer - end" ); + return error; } @@ -143,7 +156,8 @@ void RBlacklistClient::RemoveFromDBL( const TDesC& aUri, TUint32 aMediaId ) const { WRITELOG( "RBlacklistClient::RemoveFromDBL - begin" ); - + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_REMOVEFROMDBL, "RBlacklistClient::RemoveFromDBL - begin" ); + TPckgBuf mediaIdPckg( aMediaId ); TIpcArgs ipcArgs; @@ -154,6 +168,8 @@ User::LeaveIfError( err ); WRITELOG( "RBlacklistClient::RemoveFromDBL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_REMOVEFROMDBL, "RBlacklistClient::RemoveFromDBL end" ); + } // --------------------------------------------------------------------------- @@ -163,7 +179,8 @@ void RBlacklistClient::DoLoadBlacklistL( TInt& aHandle ) const { WRITELOG( "RBlacklistClient::DoLoadBlacklistL - begin" ); - + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_DOLOADBLACKLISTL, "RBlacklistClient::DoLoadBlacklistL - begin" ); + TPckgBuf handleBuf; TIpcArgs ipcArgs; ipcArgs.Set( 1, &handleBuf ); @@ -172,6 +189,8 @@ aHandle = handleBuf(); WRITELOG( "RBlacklistClient::DoLoadBlacklistL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_DOLOADBLACKLISTL, "RBlacklistClient::DoLoadBlacklistL - end" ); + } // --------------------------------------------------------------------------- @@ -181,7 +200,8 @@ EXPORT_C void RBlacklistClient::LoadBlacklistL() { WRITELOG( "RBlacklistClient::LoadBlacklistL - begin" ); - + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_LOADBLACKLISTL, "RBlacklistClient::LoadBlacklistL - begin" ); + if ( !iSessionOk ) { return; @@ -238,6 +258,8 @@ CleanupStack::PopAndDestroy( name ); WRITELOG( "RBlacklistClient::LoadBlacklistL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_LOADBLACKLISTL, "RBlacklistClient::LoadBlacklistL - end" ); + } // --------------------------------------------------------------------------- @@ -248,7 +270,8 @@ const TDesC& aUri, const TUint32 aMediaId ) { WRITELOG( "RBlacklistClient::AddToMemoryTableL - begin" ); - + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_ADDTOMEMORYTABLEL, "RBlacklistClient::AddToMemoryTableL - begin" ); + CBlacklistItem* item = CBlacklistItem::NewL( aModified, aUri, aMediaId ); const TInt err = iBlacklistMemoryTable.Append( item ); // ownership is transferred @@ -259,6 +282,8 @@ WRITELOG( "RBlacklistClient::AddToMemoryTableL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_ADDTOMEMORYTABLEL, "RBlacklistClient::AddToMemoryTableL - end" ); + } // --------------------------------------------------------------------------- @@ -268,7 +293,8 @@ void RBlacklistClient::RemoveFromMemoryTableL( const TDesC& aUri, const TUint32 aMediaId ) { WRITELOG( "RBlacklistClient::RemoveFromMemoryTableL - begin" ); - + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_REMOVEFROMMEMORYTABLEL, "RBlacklistClient::RemoveFromMemoryTableL - begin" ); + const TInt index = GetListIndex( aUri, aMediaId ); if ( index >= 0 ) { @@ -278,6 +304,8 @@ } WRITELOG( "RBlacklistClient::RemoveFromMemoryTableL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_REMOVEFROMMEMORYTABLEL, "RBlacklistClient::RemoveFromMemoryTableL - end" ); + } @@ -288,6 +316,8 @@ EXPORT_C TBool RBlacklistClient::IsBlacklistedL( const TDesC& aUri, TUint32 aMediaId, TTime /*aLastModifiedTime*/ ) { WRITELOG( "RBlacklistClient::IsBlacklistedL - begin" ); + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_ISBLACKLISTEDL, "RBlacklistClient::IsBlacklistedL - begin" ); + if ( !iSessionOk ) { @@ -316,6 +346,8 @@ if ( modified == fileLastModified.Int64() ) { WRITELOG( "RBlacklistClient::IsBlacklistedL - file is blacklisted, modification time is the same" ); + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_ISBLACKLISTEDL, "RBlacklistClient::IsBlacklistedL - file is blacklisted, modification time is the same" ); + return ETrue; } else @@ -331,12 +363,16 @@ else { WRITELOG( "RBlacklistClient::IsBlacklistedL - file is blacklisted, no modification time found" ); + OstTrace0( TRACE_NORMAL, DUP2_RBLACKLISTCLIENT_ISBLACKLISTEDL, "RBlacklistClient::IsBlacklistedL - file is blacklisted, no modification time found" ); + return ETrue; } } WRITELOG( "RBlacklistClient::IsBlacklistedL - end" ); + OstTrace0( TRACE_NORMAL, DUP3_RBLACKLISTCLIENT_ISBLACKLISTEDL, "RBlacklistClient::IsBlacklistedL - end" ); + return EFalse; } @@ -347,7 +383,8 @@ TInt RBlacklistClient::GetListIndex( const TDesC& aUri, TUint32 aMediaId ) { WRITELOG( "RBlacklistClient::GetListIndex - begin" ); - + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_GETLISTINDEX, "RBlacklistClient::GetListIndex - begin" ); + for ( TInt i( 0 ); i < iBlacklistMemoryTable.Count(); ++i ) { if ( iBlacklistMemoryTable[i]->Compare( aUri, aMediaId ) ) @@ -357,7 +394,8 @@ } WRITELOG( "RBlacklistClient::GetListIndex - end" ); - + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_GETLISTINDEX, "RBlacklistClient::GetListIndex - end" ); + return KErrNotFound; } @@ -369,7 +407,8 @@ EXPORT_C void RBlacklistClient::AddL( const TDesC& aUri, TUint32 aMediaId, TTime aLastModifiedTime ) const { WRITELOG( "RBlacklistClient::AddL - begin" ); - + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_ADDL, "RBlacklistClient::AddL - begin" ); + TPckgC mediaIdPckg( aMediaId ); TPckgC lastModifiedTimePckg( aLastModifiedTime ); @@ -382,6 +421,8 @@ User::LeaveIfError( err ); WRITELOG( "RBlacklistClient::AddL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_ADDL, "RBlacklistClient::AddL - end" ); + } @@ -392,7 +433,8 @@ EXPORT_C void RBlacklistClient::RemoveL( const TDesC& aUri, TUint32 aMediaId ) const { WRITELOG( "RBlacklistClient::RemoveL - begin" ); - + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_REMOVEL, "RBlacklistClient::RemoveL - begin" ); + TPckgBuf mediaIdPckg( aMediaId ); TIpcArgs ipcArgs; @@ -403,6 +445,8 @@ User::LeaveIfError( err ); WRITELOG( "RBlacklistClient::RemoveL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_REMOVEL, "RBlacklistClient::RemoveL - end" ); + } // --------------------------------------------------------------------------- @@ -412,7 +456,8 @@ EXPORT_C void RBlacklistClient::CloseDBL() { WRITELOG( "RBlacklistClient::CloseDBL - begin" ); - + OstTrace0( TRACE_NORMAL, RBLACKLISTCLIENT_CLOSEDBL, "RBlacklistClient::CloseDBL - begin" ); + if ( !iSessionOk ) { User::Leave( KErrDisconnected ); @@ -423,6 +468,8 @@ } WRITELOG( "RBlacklistClient::CloseDBL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_RBLACKLISTCLIENT_CLOSEDBL, "RBlacklistClient::CloseDBL- end" ); + } diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/blacklistclient/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/blacklistclient/traces/OstTraceDefinitions.h Thu Jul 15 19:07:24 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 9422ed56ee45 -r 63c982fb92f2 harvester/blacklistclient/traces/blacklistclientTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/blacklistclient/traces/blacklistclientTraces.h Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,43 @@ +// Created by TraceCompiler 1.3.1 +// DO NOT EDIT, CHANGES WILL BE LOST + +#ifndef __BLACKLISTCLIENTTRACES_H__ +#define __BLACKLISTCLIENTTRACES_H__ + +#define KOstTraceComponentID 0x2001b2ed + +#define RBLACKLISTCLIENT_RBLACKLISTCLIENT 0x30001 +#define DUP1_RBLACKLISTCLIENT_RBLACKLISTCLIENT 0x30002 +#define RBLACKLISTCLIENT_CONNECT 0x30003 +#define DUP1_RBLACKLISTCLIENT_CONNECT 0x30004 +#define RBLACKLISTCLIENT_VERSION 0x30005 +#define RBLACKLISTCLIENT_STARTSERVER 0x30006 +#define DUP1_RBLACKLISTCLIENT_STARTSERVER 0x30007 +#define RBLACKLISTCLIENT_REMOVEFROMDBL 0x30008 +#define DUP1_RBLACKLISTCLIENT_REMOVEFROMDBL 0x30009 +#define RBLACKLISTCLIENT_DOLOADBLACKLISTL 0x3000a +#define DUP1_RBLACKLISTCLIENT_DOLOADBLACKLISTL 0x3000b +#define RBLACKLISTCLIENT_LOADBLACKLISTL 0x3000c +#define DUP1_RBLACKLISTCLIENT_LOADBLACKLISTL 0x3000d +#define RBLACKLISTCLIENT_ADDTOMEMORYTABLEL 0x3000e +#define DUP1_RBLACKLISTCLIENT_ADDTOMEMORYTABLEL 0x3000f +#define RBLACKLISTCLIENT_REMOVEFROMMEMORYTABLEL 0x30010 +#define DUP1_RBLACKLISTCLIENT_REMOVEFROMMEMORYTABLEL 0x30011 +#define RBLACKLISTCLIENT_ISBLACKLISTEDL 0x30012 +#define DUP1_RBLACKLISTCLIENT_ISBLACKLISTEDL 0x30013 +#define DUP2_RBLACKLISTCLIENT_ISBLACKLISTEDL 0x30014 +#define DUP3_RBLACKLISTCLIENT_ISBLACKLISTEDL 0x30015 +#define RBLACKLISTCLIENT_GETLISTINDEX 0x30016 +#define DUP1_RBLACKLISTCLIENT_GETLISTINDEX 0x30017 +#define RBLACKLISTCLIENT_ADDL 0x30018 +#define DUP1_RBLACKLISTCLIENT_ADDL 0x30019 +#define RBLACKLISTCLIENT_REMOVEL 0x3001a +#define DUP1_RBLACKLISTCLIENT_REMOVEL 0x3001b +#define RBLACKLISTCLIENT_CLOSEDBL 0x3001c +#define DUP1_RBLACKLISTCLIENT_CLOSEDBL 0x3001d + + +#endif + +// End of file + diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/blacklistclient/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/blacklistclient/traces/fixed_id.definitions Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,31 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_NORMAL=0x3 +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_ADDL=0x19 +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_ADDTOMEMORYTABLEL=0xf +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_CLOSEDBL=0x1d +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_CONNECT=0x4 +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_DOLOADBLACKLISTL=0xb +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_GETLISTINDEX=0x17 +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_ISBLACKLISTEDL=0x13 +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_LOADBLACKLISTL=0xd +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_RBLACKLISTCLIENT=0x2 +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_REMOVEFROMDBL=0x9 +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_REMOVEFROMMEMORYTABLEL=0x11 +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_REMOVEL=0x1b +[TRACE]TRACE_NORMAL[0x3]_DUP1_RBLACKLISTCLIENT_STARTSERVER=0x7 +[TRACE]TRACE_NORMAL[0x3]_DUP2_RBLACKLISTCLIENT_ISBLACKLISTEDL=0x14 +[TRACE]TRACE_NORMAL[0x3]_DUP3_RBLACKLISTCLIENT_ISBLACKLISTEDL=0x15 +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_ADDL=0x18 +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_ADDTOMEMORYTABLEL=0xe +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_CLOSEDBL=0x1c +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_CONNECT=0x3 +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_DOLOADBLACKLISTL=0xa +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_GETLISTINDEX=0x16 +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_ISBLACKLISTEDL=0x12 +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_LOADBLACKLISTL=0xc +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_RBLACKLISTCLIENT=0x1 +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_REMOVEFROMDBL=0x8 +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_REMOVEFROMMEMORYTABLEL=0x10 +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_REMOVEL=0x1a +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_STARTSERVER=0x6 +[TRACE]TRACE_NORMAL[0x3]_RBLACKLISTCLIENT_VERSION=0x5 diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/blacklistserver/group/blacklistserver.mmp --- a/harvester/blacklistserver/group/blacklistserver.mmp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/blacklistserver/group/blacklistserver.mmp Thu Jul 15 19:07:24 2010 +0300 @@ -31,6 +31,7 @@ USERINCLUDE ../../common/inc USERINCLUDE ../../../metadataengine/server/inc USERINCLUDE ../../../inc +USERINCLUDE ../traces SOURCEPATH ../src SOURCE blacklistserver.cpp diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/blacklistserver/src/blacklistserver.cpp --- a/harvester/blacklistserver/src/blacklistserver.cpp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/blacklistserver/src/blacklistserver.cpp Thu Jul 15 19:07:24 2010 +0300 @@ -24,6 +24,11 @@ #include "mdcserializationbuffer.h" #include +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "blacklistserverTraces.h" +#endif + // Security policy const TUint KServerPolicyRangeCount = 6; @@ -67,7 +72,8 @@ const RMessage2& aMsg, TInt& /*aAction*/, TSecurityInfo& /*aMissing*/ ) { WRITELOG( "CBlacklistServer::CustomSecurityCheckL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_CUSTOMSECURITYCHECKL, "CBlacklistServer::CustomSecurityCheckL -begin" ); + CPolicyServer::TCustomResult securityCheckResult = EFail; switch ( aMsg.Function() ) @@ -92,7 +98,8 @@ } WRITELOG( "CBlacklistServer::CustomSecurityCheckL - end" ); - + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_CUSTOMSECURITYCHECKL, "CBlacklistServer::CustomSecurityCheckL- end" ); + return securityCheckResult; } @@ -105,7 +112,8 @@ const RMessage2& /*aMsg*/, TInt /*aAction*/, const TSecurityInfo& /*aMissing*/ ) { WRITELOG( "CBlacklistServer::CustomFailureActionL" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_CUSTOMFAILUREACTIONL, "CBlacklistServer::CustomFailureActionL" ); + // Not used return EFail; } @@ -117,11 +125,14 @@ CBlacklistServer* CBlacklistServer::NewL() { WRITELOG( "CBlacklistServer::NewL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_NEWL, "CBlacklistServer::NewL -begin" ); + CBlacklistServer* self = NewLC(); CleanupStack::Pop( self ); WRITELOG( "CBlacklistServer::NewL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_NEWL, "CBlacklistServer::NewL - end" ); + return self; } @@ -132,12 +143,15 @@ CBlacklistServer* CBlacklistServer::NewLC() { WRITELOG( "CBlacklistServer::NewLC - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_NEWLC, "CBlacklistServer::NewLC -begin" ); + CBlacklistServer* self = new( ELeave ) CBlacklistServer(); CleanupStack::PushL( self ); self->ConstructL(); WRITELOG( "CBlacklistServer::NewLC - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_NEWLC, "CBlacklistServer::NewLC - end" ); + return self; } @@ -153,12 +167,15 @@ void CBlacklistServer::ConstructL() { WRITELOG( "CBlacklistServer::ConstructL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_CONSTRUCTL, "CBlacklistServer::ConstructL - begin" ); + StartL( KBlacklistServerName ); iSqLiteConnection = CMdSSqLiteConnection::NewL(); WRITELOG( "CBlacklistServer::ConstructL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_CONSTRUCTL, "CBlacklistServer::ConstructL -end" ); + } // --------------------------------------------------------------------------- @@ -168,6 +185,7 @@ CBlacklistServer::~CBlacklistServer() { WRITELOG( "CBlacklistServer::~CBlacklistServer - begin" ); + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_CBLACKLISTSERVER, "CBlacklistServer::~CBlacklistServer -begin" ); if ( iDatabaseOpen ) { @@ -201,6 +219,7 @@ delete iSqLiteConnection; WRITELOG( "CBlacklistServer::~CBlacklistServer - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_CBLACKLISTSERVER, "CBlacklistServer::~CBlacklistServer -end " ); } // --------------------------------------------------------------------------- @@ -210,7 +229,8 @@ void CBlacklistServer::CloseDB() { WRITELOG( "CBlacklistServer::CloseDB - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_CLOSEDB, "CBlacklistServer::CloseDB -begin" ); + if ( iDatabaseOpen ) { iSqLiteConnection->CloseDb(); @@ -218,6 +238,8 @@ } WRITELOG( "CBlacklistServer::CloseDB - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_CLOSEDB, "CBlacklistServer::CloseDB - end" ); + } // --------------------------------------------------------------------------- @@ -227,6 +249,8 @@ void CBlacklistServer::ExeMainL() { WRITELOG( "CBlacklistServer::ExeMainL - begin" ); + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_EXEMAINL, "CBlacklistServer::ExeMainL -begin" ); + User::LeaveIfError( User::RenameThread(KBlacklistServerName) ); // Construct active scheduler CActiveScheduler* activeScheduler = new ( ELeave ) CActiveScheduler; @@ -247,6 +271,8 @@ CleanupStack::PopAndDestroy( 2, activeScheduler ); WRITELOG( "CBlacklistServer::ExeMainL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_EXEMAINL, "CBlacklistServer::ExeMainL - end" ); + } // --------------------------------------------------------------------------- @@ -256,6 +282,8 @@ TInt E32Main() { WRITELOG( "CBlacklistServer::E32Main - begin" ); + OstTrace0( TRACE_NORMAL, _E32MAIN, "CBlacklistServer::E32Main - begin" ); + __UHEAP_MARK; CTrapCleanup* cleanup=CTrapCleanup::New(); TInt result = KErrNoMemory; @@ -266,6 +294,8 @@ } __UHEAP_MARKEND; WRITELOG( "CBlacklistServer::E32Main - end" ); + OstTrace0( TRACE_NORMAL, DUP1__E32MAIN, "CBlacklistServer::E32Main -end" ); + return result; } @@ -277,6 +307,7 @@ void CBlacklistServer::OpenDatabaseL() { WRITELOG( "CBlacklistServer::OpenDatabaseL - begin" ); + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_OPENDATABASEL, "CBlacklistServer::OpenDatabaseL - begin" ); if ( iDatabaseOpen ) { @@ -307,6 +338,8 @@ SerializeToSharedMemoryL(); WRITELOG( "CBlacklistServer::OpenDatabaseL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_OPENDATABASEL, "CBlacklistServer::OpenDatabaseL - end" ); + } // --------------------------------------------------------------------------- @@ -316,7 +349,8 @@ void CBlacklistServer::SerializeToSharedMemoryL() { WRITELOG( "CBlacklistServer::SerializeToSharedMemoryL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_SERIALIZETOSHAREDMEMORYL, "CBlacklistServer::SerializeToSharedMemoryL - begin" ); + TUint32 bufferSize = 0; TUint32 blacklistMemoryTableCount = iBlacklistMemoryTable.Count(); @@ -365,6 +399,8 @@ iBlacklistMemoryTable.ResetAndDestroy(); WRITELOG( "CBlacklistServer::SerializeToSharedMemoryL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_SERIALIZETOSHAREDMEMORYL, "CBlacklistServer::SerializeToSharedMemoryL- end" ); + } // --------------------------------------------------------------------------- @@ -374,6 +410,8 @@ TInt CBlacklistServer::MemoryHandle() { WRITELOG( "CBlacklistServer::MemoryHandle" ); + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_MEMORYHANDLE, "CBlacklistServer::MemoryHandle" ); + return iHandle; } @@ -384,7 +422,8 @@ void CBlacklistServer::LoadDatabaseToMemoryL() { WRITELOG( "CBlacklistServer::LoadDatabaseToMemoryL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_LOADDATABASETOMEMORYL, "CBlacklistServer::LoadDatabaseToMemoryL - begin" ); + iBlacklistMemoryTable.ResetAndDestroy(); RMdsStatement statement; CleanupClosePushL( statement ); @@ -415,6 +454,8 @@ CleanupStack::PopAndDestroy( &statement ); WRITELOG( "CBlacklistServer::LoadDatabaseToMemoryL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_LOADDATABASETOMEMORYL, "CBlacklistServer::LoadDatabaseToMemoryL - end" ); + } // --------------------------------------------------------------------------- @@ -424,7 +465,8 @@ void CBlacklistServer::CreateBlacklistTableL() { WRITELOG( "CBlacklistServer::CreateBlacklistTableL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_CREATEBLACKLISTTABLEL, "CBlacklistServer::CreateBlacklistTableL - begin" ); + RRowData emptyRowData; CleanupClosePushL( emptyRowData ); iSqLiteConnection->ExecuteL( KDropBlacklistTable, emptyRowData ); @@ -432,6 +474,8 @@ CleanupStack::PopAndDestroy( &emptyRowData ); WRITELOG( "CBlacklistServer::CreateBlacklistTableL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_CREATEBLACKLISTTABLEL, "CBlacklistServer::CreateBlacklistTableL - end" ); + } @@ -444,7 +488,8 @@ { WRITELOG( "CBlacklistServer::AddToMemoryTableL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_ADDTOMEMORYTABLEL, "CBlacklistServer::AddToMemoryTableL - begin" ); + CBlacklistItem* item = CBlacklistItem::NewL( aModified, aUri, aMediaId ); const TInt err = iBlacklistMemoryTable.Append( item ); // ownership is transferred if ( err != KErrNone ) @@ -453,6 +498,8 @@ } WRITELOG( "CBlacklistServer::AddToMemoryTableL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_ADDTOMEMORYTABLEL, "CBlacklistServer::AddToMemoryTableL - end" ); + } // --------------------------------------------------------------------------- @@ -464,7 +511,8 @@ { WRITELOG( "CBlacklistServer::RemoveFromMemoryTable - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_REMOVEFROMMEMORYTABLE, "CBlacklistServer::RemoveFromMemoryTable - begin" ); + const TInt index = GetMemoryTableIndex( aUri, aMediaId ); if ( index >= 0 ) { @@ -474,6 +522,8 @@ } WRITELOG( "CBlacklistServer::RemoveFromMemoryTable - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_REMOVEFROMMEMORYTABLE, "CBlacklistServer::RemoveFromMemoryTable - end" ); + } // --------------------------------------------------------------------------- @@ -483,7 +533,8 @@ TInt CBlacklistServer::GetMemoryTableIndex( const TDesC& aUri, TUint32 aMediaId ) { WRITELOG( "CBlacklistServer::GetMemoryTableIndex - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_GETMEMORYTABLEINDEX, "CBlacklistServer::GetMemoryTableIndex - begin" ); + for ( TInt i( 0 ); i < iBlacklistMemoryTable.Count(); ++i ) { if ( iBlacklistMemoryTable[i]->Compare( aUri, aMediaId ) ) @@ -493,6 +544,8 @@ } WRITELOG( "CBlacklistServer::GetMemoryTableIndex - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_GETMEMORYTABLEINDEX, "CBlacklistServer::GetMemoryTableIndex - end" ); + return KErrNotFound; } @@ -503,7 +556,8 @@ TBool CBlacklistServer::TableExistsL() { WRITELOG( "CBlacklistServer::TableExistsL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_TABLEEXISTSL, "CBlacklistServer::TableExistsL - begin" ); + RMdsStatement validationQuery; CleanupClosePushL( validationQuery ); RRowData emptyRowData; @@ -515,7 +569,8 @@ CleanupStack::PopAndDestroy( &validationQuery ); // validationQuery WRITELOG( "CBlacklistServer::TableExistsL - end" ); - + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_TABLEEXISTSL, "CBlacklistServer::TableExistsL - end" ); + return ( err == KErrNone ); } @@ -526,7 +581,8 @@ CSession2* CBlacklistServer::NewSessionL( const TVersion& aVersion, const RMessage2& /*aMessage*/ ) const { WRITELOG( "CBlacklistServer::NewSessionL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_NEWSESSIONL, "CBlacklistServer::NewSessionL - begin" ); + // Check we are the right version if ( !User::QueryVersionSupported( TVersion( KBlacklistServerMajorVersion, KBlacklistServerMinorVersion, @@ -537,7 +593,8 @@ } WRITELOG( "CBlacklistServer::NewSessionL - end" ); - + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_NEWSESSIONL, "CBlacklistServer::NewSessionL - end" ); + return new( ELeave ) CBlacklistSession; } @@ -548,7 +605,8 @@ TInt CBlacklistServer::RunError( TInt aError ) { WRITELOG1( "CBlacklistServer::RunError - begin, error %d", aError ); - + OstTrace1( TRACE_NORMAL, CBLACKLISTSERVER_RUNERROR, "CBlacklistServer::RunError - begin, error %d", aError ); + // Bad descriptor implies bad client if ( aError == KErrBadDescriptor ) { @@ -563,7 +621,8 @@ ReStart(); WRITELOG( "CBlacklistServer::RunError - end" ); - + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_RUNERROR, "CBlacklistServer::RunError - end" ); + return KErrNone; } @@ -574,6 +633,8 @@ void CBlacklistServer::AddSession() { WRITELOG( "CBlacklistServer::AddSession" ); + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_ADDSESSION, "CBlacklistServer::AddSession" ); + ++iSessionCount; } @@ -584,7 +645,8 @@ void CBlacklistServer::RemoveSession() { WRITELOG( "CBlacklistServer::RemoveSession - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_REMOVESESSION, "CBlacklistServer::RemoveSession - begin" ); + --iSessionCount; #ifdef _DEBUG @@ -593,6 +655,9 @@ TRAP_IGNORE ( WriteAllDataToDBL() ); #endif WRITELOG1( "CBlacklistServer::RemoveSession - err %d", err ); +#ifdef _DEBUG + OstTrace1( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_REMOVESESSION, "CBlacklistServer::RemoveSession - err %d", err ); +#endif if ( iSessionCount == 0 ) { @@ -600,6 +665,8 @@ } WRITELOG( "CBlacklistServer::RemoveSession - end" ); + OstTrace0( TRACE_NORMAL, DUP2_CBLACKLISTSERVER_REMOVESESSION, "CBlacklistServer::RemoveSession - end" ); + } // --------------------------------------------------------------------------- @@ -609,10 +676,13 @@ void CBlacklistServer::AddL( const TUint32& mediaId, const TDesC& aUri, const TTime& aLastModifiedTime ) { WRITELOG( "CBlacklistServer::AddL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_ADDL, "CBlacklistServer::AddL - begin" ); + AddToMemoryTableL( aLastModifiedTime.Int64(), aUri, mediaId ); WRITELOG( "CBlacklistServer::AddL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_ADDL, "CBlacklistServer::AddL - end" ); + } // --------------------------------------------------------------------------- @@ -622,10 +692,13 @@ void CBlacklistServer::RemoveL( const TUint32& mediaId, const TDesC& aUri ) { WRITELOG( "CBlacklistServer::RemoveL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_REMOVEL, "CBlacklistServer::RemoveL - begin" ); + RemoveFromMemoryTable( aUri, mediaId ); WRITELOG( "CBlacklistServer::RemoveL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_REMOVEL, "CBlacklistServer::RemoveL - end" ); + } // --------------------------------------------------------------------------- @@ -635,6 +708,7 @@ void CBlacklistServer::RemoveFromDBL( const TDesC& aUri, const TUint32 aMediaId ) { WRITELOG( "CBlacklistServer::RemoveFromDBL - begin" ); + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_REMOVEFROMDBL, "CBlacklistServer::RemoveFromDBL - begin" ); RRowData* variables = new ( ELeave ) RRowData(); CleanupStack::PushL( variables ); @@ -666,6 +740,8 @@ } WRITELOG( "CBlacklistServer::RemoveFromDBL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_REMOVEFROMDBL, "CBlacklistServer::RemoveFromDBL - end" ); + } @@ -677,7 +753,8 @@ const TInt64& aLastModifiedTime ) { WRITELOG( "CBlacklistServer::AddToDBL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_ADDTODBL, "CBlacklistServer::AddToDBL - begin" ); + RRowData* rowData = new ( ELeave ) RRowData(); CleanupStack::PushL( rowData ); CleanupClosePushL( *rowData ); @@ -711,6 +788,8 @@ } WRITELOG( "CBlacklistServer::AddToDBL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_ADDTODBL, "CBlacklistServer::AddToDBL - end" ); + } // --------------------------------------------------------------------------- @@ -720,13 +799,16 @@ void CBlacklistServer::WriteAllDataToDBL() { WRITELOG( "CBlacklistServer::WriteAllDataToDBL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_WRITEALLDATATODBL, "CBlacklistServer::WriteAllDataToDBL - begin" ); + for ( TInt i( 0 ); i < iBlacklistMemoryTable.Count(); ++i ) { AddToDBL( *iBlacklistMemoryTable[i]->Uri(), iBlacklistMemoryTable[i]->MediaId(), iBlacklistMemoryTable[i]->Modified() ); } WRITELOG( "CBlacklistServer::WriteAllDataToDBL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_WRITEALLDATATODBL, "CBlacklistServer::WriteAllDataToDBL - end" ); + } // --------------------------------------------------------------------------- @@ -736,7 +818,8 @@ void CBlacklistServer::CommitBufferedItemsL() { WRITELOG( "CBlacklistServer::CommitBufferedItemsL - begin" ); - + OstTrace0( TRACE_NORMAL, CBLACKLISTSERVER_COMMITBUFFEREDITEMSL, "CBlacklistServer::CommitBufferedItemsL - begin" ); + // First, removed items const TInt removedCount( iBufferedRemoveItems.Count() ); for ( TInt i( 0 ); i < removedCount; ++i ) @@ -754,6 +837,8 @@ } WRITELOG( "CBlacklistServer::CommitBufferedItemsL - end" ); + OstTrace0( TRACE_NORMAL, DUP1_CBLACKLISTSERVER_COMMITBUFFEREDITEMSL, "CBlacklistServer::CommitBufferedItemsL - end" ); + } // End of File diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/blacklistserver/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/blacklistserver/traces/OstTraceDefinitions.h Thu Jul 15 19:07:24 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 9422ed56ee45 -r 63c982fb92f2 harvester/blacklistserver/traces/blacklistserverTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/blacklistserver/traces/blacklistserverTraces.h Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,68 @@ +// Created by TraceCompiler 1.3.1 +// DO NOT EDIT, CHANGES WILL BE LOST + +#ifndef __BLACKLISTSERVERTRACES_H__ +#define __BLACKLISTSERVERTRACES_H__ + +#define KOstTraceComponentID 0x2001b2eb + +#define CBLACKLISTSERVER_CUSTOMSECURITYCHECKL 0x30001 +#define DUP1_CBLACKLISTSERVER_CUSTOMSECURITYCHECKL 0x30002 +#define CBLACKLISTSERVER_CUSTOMFAILUREACTIONL 0x30003 +#define CBLACKLISTSERVER_NEWL 0x30004 +#define DUP1_CBLACKLISTSERVER_NEWL 0x30005 +#define CBLACKLISTSERVER_NEWLC 0x30006 +#define DUP1_CBLACKLISTSERVER_NEWLC 0x30007 +#define CBLACKLISTSERVER_CONSTRUCTL 0x30008 +#define DUP1_CBLACKLISTSERVER_CONSTRUCTL 0x30009 +#define CBLACKLISTSERVER_CBLACKLISTSERVER 0x3000a +#define DUP1_CBLACKLISTSERVER_CBLACKLISTSERVER 0x3000b +#define CBLACKLISTSERVER_CLOSEDB 0x3000c +#define DUP1_CBLACKLISTSERVER_CLOSEDB 0x3000d +#define CBLACKLISTSERVER_EXEMAINL 0x3000e +#define DUP1_CBLACKLISTSERVER_EXEMAINL 0x3000f +#define _E32MAIN 0x30010 +#define DUP1__E32MAIN 0x30011 +#define CBLACKLISTSERVER_OPENDATABASEL 0x30012 +#define DUP1_CBLACKLISTSERVER_OPENDATABASEL 0x30013 +#define CBLACKLISTSERVER_SERIALIZETOSHAREDMEMORYL 0x30014 +#define DUP1_CBLACKLISTSERVER_SERIALIZETOSHAREDMEMORYL 0x30015 +#define CBLACKLISTSERVER_MEMORYHANDLE 0x30016 +#define CBLACKLISTSERVER_LOADDATABASETOMEMORYL 0x30017 +#define DUP1_CBLACKLISTSERVER_LOADDATABASETOMEMORYL 0x30018 +#define CBLACKLISTSERVER_CREATEBLACKLISTTABLEL 0x30019 +#define DUP1_CBLACKLISTSERVER_CREATEBLACKLISTTABLEL 0x3001a +#define CBLACKLISTSERVER_ADDTOMEMORYTABLEL 0x3001b +#define DUP1_CBLACKLISTSERVER_ADDTOMEMORYTABLEL 0x3001c +#define CBLACKLISTSERVER_REMOVEFROMMEMORYTABLE 0x3001d +#define DUP1_CBLACKLISTSERVER_REMOVEFROMMEMORYTABLE 0x3001e +#define CBLACKLISTSERVER_GETMEMORYTABLEINDEX 0x3001f +#define DUP1_CBLACKLISTSERVER_GETMEMORYTABLEINDEX 0x30020 +#define CBLACKLISTSERVER_TABLEEXISTSL 0x30021 +#define DUP1_CBLACKLISTSERVER_TABLEEXISTSL 0x30022 +#define CBLACKLISTSERVER_NEWSESSIONL 0x30023 +#define DUP1_CBLACKLISTSERVER_NEWSESSIONL 0x30024 +#define CBLACKLISTSERVER_RUNERROR 0x30025 +#define DUP1_CBLACKLISTSERVER_RUNERROR 0x30026 +#define CBLACKLISTSERVER_ADDSESSION 0x30027 +#define CBLACKLISTSERVER_REMOVESESSION 0x30028 +#define DUP1_CBLACKLISTSERVER_REMOVESESSION 0x30029 +#define DUP2_CBLACKLISTSERVER_REMOVESESSION 0x3002a +#define CBLACKLISTSERVER_ADDL 0x3002b +#define DUP1_CBLACKLISTSERVER_ADDL 0x3002c +#define CBLACKLISTSERVER_REMOVEL 0x3002d +#define DUP1_CBLACKLISTSERVER_REMOVEL 0x3002e +#define CBLACKLISTSERVER_REMOVEFROMDBL 0x3002f +#define DUP1_CBLACKLISTSERVER_REMOVEFROMDBL 0x30030 +#define CBLACKLISTSERVER_ADDTODBL 0x30031 +#define DUP1_CBLACKLISTSERVER_ADDTODBL 0x30032 +#define CBLACKLISTSERVER_WRITEALLDATATODBL 0x30033 +#define DUP1_CBLACKLISTSERVER_WRITEALLDATATODBL 0x30034 +#define CBLACKLISTSERVER_COMMITBUFFEREDITEMSL 0x30035 +#define DUP1_CBLACKLISTSERVER_COMMITBUFFEREDITEMSL 0x30036 + + +#endif + +// End of file + diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/blacklistserver/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/blacklistserver/traces/fixed_id.definitions Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,56 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_NORMAL=0x3 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_ADDL=0x2b +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_ADDSESSION=0x27 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_ADDTODBL=0x31 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_ADDTOMEMORYTABLEL=0x1b +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_CBLACKLISTSERVER=0xa +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_CLOSEDB=0xc +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_COMMITBUFFEREDITEMSL=0x35 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_CONSTRUCTL=0x8 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_CREATEBLACKLISTTABLEL=0x19 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_CUSTOMFAILUREACTIONL=0x3 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_CUSTOMSECURITYCHECKL=0x1 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_EXEMAINL=0xe +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_GETMEMORYTABLEINDEX=0x1f +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_LOADDATABASETOMEMORYL=0x17 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_MEMORYHANDLE=0x16 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_NEWL=0x4 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_NEWLC=0x6 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_NEWSESSIONL=0x23 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_OPENDATABASEL=0x12 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_REMOVEFROMDBL=0x2f +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_REMOVEFROMMEMORYTABLE=0x1d +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_REMOVEL=0x2d +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_REMOVESESSION=0x28 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_RUNERROR=0x25 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_SERIALIZETOSHAREDMEMORYL=0x14 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_TABLEEXISTSL=0x21 +[TRACE]TRACE_NORMAL[0x3]_CBLACKLISTSERVER_WRITEALLDATATODBL=0x33 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_ADDL=0x2c +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_ADDTODBL=0x32 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_ADDTOMEMORYTABLEL=0x1c +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_CBLACKLISTSERVER=0xb +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_CLOSEDB=0xd +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_COMMITBUFFEREDITEMSL=0x36 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_CONSTRUCTL=0x9 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_CREATEBLACKLISTTABLEL=0x1a +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_CUSTOMSECURITYCHECKL=0x2 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_EXEMAINL=0xf +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_GETMEMORYTABLEINDEX=0x20 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_LOADDATABASETOMEMORYL=0x18 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_NEWL=0x5 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_NEWLC=0x7 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_NEWSESSIONL=0x24 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_OPENDATABASEL=0x13 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_REMOVEFROMDBL=0x30 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_REMOVEFROMMEMORYTABLE=0x1e +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_REMOVEL=0x2e +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_REMOVESESSION=0x29 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_RUNERROR=0x26 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_SERIALIZETOSHAREDMEMORYL=0x15 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_TABLEEXISTSL=0x22 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CBLACKLISTSERVER_WRITEALLDATATODBL=0x34 +[TRACE]TRACE_NORMAL[0x3]_DUP1__E32MAIN=0x11 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CBLACKLISTSERVER_REMOVESESSION=0x2a +[TRACE]TRACE_NORMAL[0x3]__E32MAIN=0x10 diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/client/group/harvesterclient.mmp --- a/harvester/client/group/harvesterclient.mmp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/client/group/harvesterclient.mmp Thu Jul 15 19:07:24 2010 +0300 @@ -37,6 +37,7 @@ USERINCLUDE ../../../inc USERINCLUDE ../../common/inc USERINCLUDE ../inc +USERINCLUDE ../traces SOURCEPATH ../src SOURCE harvesterclient.cpp diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/client/src/harvesterclient.cpp --- a/harvester/client/src/harvesterclient.cpp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/client/src/harvesterclient.cpp Thu Jul 15 19:07:24 2010 +0300 @@ -26,6 +26,10 @@ #include "mdsutils.h" #include "harvesterrequestactive.h" #include "mdscommoninternal.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "harvesterclientTraces.h" +#endif /** @var Message slots */ const TInt KDefaultMessageSlots = -1; // Global pool @@ -48,6 +52,8 @@ EXPORT_C RHarvesterClient::RHarvesterClient() : RSessionBase() { WRITELOG( "RHarvesterClient::RHarvesterClient() - Constructor" ); + OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_RHARVESTERCLIENT, "RHarvesterClient::RHarvesterClient" ); + iHarvesterClientAO = NULL; iObserver = NULL; iHEO = NULL; @@ -61,7 +67,9 @@ EXPORT_C TInt RHarvesterClient::Connect() { WRITELOG( "RHarvesterClient::Connect()" ); - + OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_CONNECT, "RHarvesterClient::Connect" ); + + RProperty property; const TInt error( property.Attach( KHarvesterPSShutdown, KShutdown, EOwnerThread ) ); TInt value = 0; @@ -137,6 +145,8 @@ // EXPORT_C TInt RHarvesterClient::Pause() { + OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_PAUSE, "RHarvesterClient::Pause" ); + WRITELOG( "RHarvesterClient::Pause() - sending command EPauseHarvester" ); if( iHandle ) { @@ -152,6 +162,8 @@ EXPORT_C TInt RHarvesterClient::Resume() { WRITELOG( "RHarvesterClient::Resume() - sending command EResumeHarvester" ); + OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_RESUME, "RHarvesterClient::Resume" ); + if( iHandle ) { return SendReceive( EResumeHarvester ); @@ -166,6 +178,7 @@ EXPORT_C void RHarvesterClient::Close() { WRITELOG( "RHarvesterClient::Close()" ); + OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_CLOSE, "RHarvesterClient::Close" ); delete iSessionWatcher; iSessionWatcher = NULL; @@ -202,6 +215,7 @@ EXPORT_C void RHarvesterClient::SetObserver( MHarvestObserver* aObserver ) { WRITELOG( "RHarvesterClient::SetObserver()" ); + OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_SETOBSERVER, "RHarvesterClient::SetObserver" ); if ( iHarvesterClientAO ) { @@ -217,6 +231,7 @@ EXPORT_C void RHarvesterClient::RemoveObserver( MHarvestObserver* aObserver ) { WRITELOG( "RHarvesterClient::RemoveObserver()" ); + OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_REMOVEOBSERVER, "RHarvesterClient::RemoveObserver" ); if ( iHarvesterClientAO ) { @@ -283,6 +298,8 @@ EXPORT_C void RHarvesterClient::HarvestFile( const TDesC& aURI, RArray& aAlbumIds, TBool aAddLocation ) { WRITELOG1( "RHarvesterClient::HarvestFile() - file %S", &aURI ); + OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_HARVESTFILE, "RHarvesterClient::HarvestFile" ); + HBufC8* paramBuf = NULL; TRAPD( err, paramBuf = SerializeArrayL( aAlbumIds ) ); @@ -354,6 +371,8 @@ TUid /*aUid*/ ) { WRITELOG1( "RHarvesterClient::HarvestFileWithUID() - file %S", &aURI ); + OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_HARVESTFILEWITHUID, "RHarvesterClient::HarvestFileWithUID" ); + HBufC8* paramBuf = NULL; TRAPD( err, paramBuf = SerializeArrayL( aAlbumIds ) ); @@ -447,6 +466,8 @@ void RHarvesterClient::RegisterHarvestComplete(TDes& aURI, TRequestStatus& aStatus) { TIpcArgs ipcArgs( &aURI ); + OstTrace0( TRACE_NORMAL, RHARVESTERCLIENT_REGISTERHARVESTCOMPLETE, "RHarvesterClient::RegisterHarvestComplete" ); + if( !iHandle ) { @@ -512,6 +533,7 @@ static TInt StartServer() { WRITELOG( "StartServer() - begin" ); + OstTrace0( TRACE_NORMAL, _STARTSERVER, "::StartServer" ); TFindServer findHarvesterServer( KHarvesterServerName ); TFullName name; @@ -555,6 +577,8 @@ static TInt CreateServerProcess() { WRITELOG( "CreateServerProcess() - begin" ); + OstTrace0( TRACE_NORMAL, _CREATESERVERPROCESS, "::CreateServerProcess" ); + RProcess server; TInt result = server.Create( KHarvesterServerExe, KNullDesC ); if ( result != KErrNone ) diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/client/src/harvesterclientao.cpp --- a/harvester/client/src/harvesterclientao.cpp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/client/src/harvesterclientao.cpp Thu Jul 15 19:07:24 2010 +0300 @@ -20,6 +20,10 @@ #include "harvestercommon.h" #include "harvesterlog.h" #include "mdsutils.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "harvesterclientaoTraces.h" +#endif // --------------------------------------------------------------------------- @@ -29,6 +33,8 @@ CHarvesterClientAO* CHarvesterClientAO::NewL( RHarvesterClient& aHarvesterClient ) { WRITELOG( "CHarvesterClientAO::NewL()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERCLIENTAO_NEWL, "CHarvesterClientAO::NewL" ); + CHarvesterClientAO* self = new (ELeave) CHarvesterClientAO( aHarvesterClient ); CleanupStack::PushL( self ); self->ConstructL(); @@ -42,6 +48,8 @@ // CHarvesterClientAO::~CHarvesterClientAO() // destruct { + OstTrace0( TRACE_NORMAL, CHARVESTERCLIENTAO_CHARVESTERCLIENTAO, "CHarvesterClientAO::~CHarvesterClientAO" ); + WRITELOG( "CHarvesterClientAO::~CHarvesterClientAO()" ); Cancel(); } @@ -56,6 +64,8 @@ iObserver( NULL ), iHarvesterClient( aHarvesterClient ) { + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERCLIENTAO_CHARVESTERCLIENTAO, "CHarvesterClientAO::CHarvesterClientAO" ); + WRITELOG( "CHarvesterClientAO::CHarvesterClientAO()" ); } @@ -65,7 +75,9 @@ // void CHarvesterClientAO::ConstructL() // second-phase constructor { - WRITELOG( "CHarvesterClientAO::ConstructL()" ); + WRITELOG( "CHarvesterClientAO::ConstructL()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERCLIENTAO_CONSTRUCTL, "CHarvesterClientAO::ConstructL" ); + CActiveScheduler::Add( this ); } @@ -76,6 +88,8 @@ void CHarvesterClientAO::SetObserver( MHarvestObserver* aObserver ) { WRITELOG( "CHarvesterClientAO::SetObserver()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERCLIENTAO_SETOBSERVER, "CHarvesterClientAO::SetObserver" ); + iObserver = aObserver; } @@ -86,6 +100,8 @@ void CHarvesterClientAO::RemoveObserver( MHarvestObserver* aObserver ) { WRITELOG( "CHarvesterClientAO::RemoveObserver()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERCLIENTAO_REMOVEOBSERVER, "CHarvesterClientAO::RemoveObserver" ); + if ( aObserver == iObserver ) { if ( iObserver ) @@ -103,7 +119,8 @@ void CHarvesterClientAO::DoCancel() { WRITELOG( "CHarvesterClientAO::DoCancel()" ); - iHarvesterClient.UnregisterHarvestComplete(); + OstTrace0( TRACE_NORMAL, CHARVESTERCLIENTAO_DOCANCEL, "CHarvesterClientAO::DoCancel" ); + } // --------------------------------------------------------------------------- @@ -126,6 +143,8 @@ void CHarvesterClientAO::RunL() { WRITELOG( "CHarvesterClientAO::RunL()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERCLIENTAO_RUNL, "CHarvesterClientAO::RunL" ); + const TInt status = iStatus.Int(); diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/client/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/client/traces/OstTraceDefinitions.h Thu Jul 15 19:07:24 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 9422ed56ee45 -r 63c982fb92f2 harvester/client/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/client/traces/fixed_id.definitions Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,22 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_NORMAL=0x3 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERCLIENTAO_CHARVESTERCLIENTAO=0xe +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERCLIENTAO_CONSTRUCTL=0x10 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERCLIENTAO_DOCANCEL=0x13 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERCLIENTAO_NEWL=0xd +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERCLIENTAO_REMOVEOBSERVER=0x12 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERCLIENTAO_RUNL=0x14 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERCLIENTAO_SETOBSERVER=0x11 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERCLIENTAO_CHARVESTERCLIENTAO=0xf +[TRACE]TRACE_NORMAL[0x3]_RHARVESTERCLIENT_CLOSE=0x5 +[TRACE]TRACE_NORMAL[0x3]_RHARVESTERCLIENT_CONNECT=0x2 +[TRACE]TRACE_NORMAL[0x3]_RHARVESTERCLIENT_HARVESTFILE=0x8 +[TRACE]TRACE_NORMAL[0x3]_RHARVESTERCLIENT_HARVESTFILEWITHUID=0x9 +[TRACE]TRACE_NORMAL[0x3]_RHARVESTERCLIENT_PAUSE=0x3 +[TRACE]TRACE_NORMAL[0x3]_RHARVESTERCLIENT_REGISTERHARVESTCOMPLETE=0xa +[TRACE]TRACE_NORMAL[0x3]_RHARVESTERCLIENT_REMOVEOBSERVER=0x7 +[TRACE]TRACE_NORMAL[0x3]_RHARVESTERCLIENT_RESUME=0x4 +[TRACE]TRACE_NORMAL[0x3]_RHARVESTERCLIENT_RHARVESTERCLIENT=0x1 +[TRACE]TRACE_NORMAL[0x3]_RHARVESTERCLIENT_SETOBSERVER=0x6 +[TRACE]TRACE_NORMAL[0x3]__CREATESERVERPROCESS=0xc +[TRACE]TRACE_NORMAL[0x3]__STARTSERVER=0xb diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/client/traces/harvesterclientTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/client/traces/harvesterclientTraces.h Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,26 @@ +// Created by TraceCompiler 1.3.1 +// DO NOT EDIT, CHANGES WILL BE LOST + +#ifndef __HARVESTERCLIENTTRACES_H__ +#define __HARVESTERCLIENTTRACES_H__ + +#define KOstTraceComponentID 0x200009f4 + +#define RHARVESTERCLIENT_RHARVESTERCLIENT 0x30001 +#define RHARVESTERCLIENT_CONNECT 0x30002 +#define RHARVESTERCLIENT_PAUSE 0x30003 +#define RHARVESTERCLIENT_RESUME 0x30004 +#define RHARVESTERCLIENT_CLOSE 0x30005 +#define RHARVESTERCLIENT_SETOBSERVER 0x30006 +#define RHARVESTERCLIENT_REMOVEOBSERVER 0x30007 +#define RHARVESTERCLIENT_HARVESTFILE 0x30008 +#define RHARVESTERCLIENT_HARVESTFILEWITHUID 0x30009 +#define RHARVESTERCLIENT_REGISTERHARVESTCOMPLETE 0x3000a +#define _STARTSERVER 0x3000b +#define _CREATESERVERPROCESS 0x3000c + + +#endif + +// End of file + diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/client/traces/harvesterclientaoTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/client/traces/harvesterclientaoTraces.h Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,22 @@ +// Created by TraceCompiler 1.3.1 +// DO NOT EDIT, CHANGES WILL BE LOST + +#ifndef __HARVESTERCLIENTAOTRACES_H__ +#define __HARVESTERCLIENTAOTRACES_H__ + +#define KOstTraceComponentID 0x200009f4 + +#define CHARVESTERCLIENTAO_NEWL 0x3000d +#define CHARVESTERCLIENTAO_CHARVESTERCLIENTAO 0x3000e +#define DUP1_CHARVESTERCLIENTAO_CHARVESTERCLIENTAO 0x3000f +#define CHARVESTERCLIENTAO_CONSTRUCTL 0x30010 +#define CHARVESTERCLIENTAO_SETOBSERVER 0x30011 +#define CHARVESTERCLIENTAO_REMOVEOBSERVER 0x30012 +#define CHARVESTERCLIENTAO_DOCANCEL 0x30013 +#define CHARVESTERCLIENTAO_RUNL 0x30014 + + +#endif + +// End of file + diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/common/bwincw/harvesterplugininterfacewinscw.def --- a/harvester/common/bwincw/harvesterplugininterfacewinscw.def Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/common/bwincw/harvesterplugininterfacewinscw.def Thu Jul 15 19:07:24 2010 +0300 @@ -12,4 +12,5 @@ ?SetBlacklist@CHarvesterPlugin@@UAEXAAVCHarvesterBlacklist@@@Z @ 11 NONAME ; void CHarvesterPlugin::SetBlacklist(class CHarvesterBlacklist &) ?GetMimeType@CHarvesterPlugin@@UAEXABVTDesC16@@AAVTDes16@@@Z @ 12 NONAME ; void CHarvesterPlugin::GetMimeType(class TDesC16 const &, class TDes16 &) ?SetHarvesterPluginFactory@CHarvesterPlugin@@QAEXAAVCHarvesterPluginFactory@@@Z @ 13 NONAME ; void CHarvesterPlugin::SetHarvesterPluginFactory(class CHarvesterPluginFactory &) + ?PluginInIdleState@CHarvesterPlugin@@QAEHXZ @ 14 NONAME ; int CHarvesterPlugin::PluginInIdleState(void) diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/common/eabi/harvesterplugininterfacearm.def --- a/harvester/common/eabi/harvesterplugininterfacearm.def Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/common/eabi/harvesterplugininterfacearm.def Thu Jul 15 19:07:24 2010 +0300 @@ -16,4 +16,5 @@ _ZN16CHarvesterPlugin12SetBlacklistER19CHarvesterBlacklist @ 15 NONAME _ZN16CHarvesterPlugin11GetMimeTypeERK7TDesC16R6TDes16 @ 16 NONAME _ZN16CHarvesterPlugin25SetHarvesterPluginFactoryER23CHarvesterPluginFactory @ 17 NONAME + _ZN16CHarvesterPlugin17PluginInIdleStateEv @ 18 NONAME diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/common/group/harvestercommon.mmp --- a/harvester/common/group/harvestercommon.mmp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/common/group/harvestercommon.mmp Thu Jul 15 19:07:24 2010 +0300 @@ -40,6 +40,7 @@ USERINCLUDE ../../../inc USERINCLUDE ../inc USERINCLUDE ../../monitorplugins/inc +USERINCLUDE ../traces SOURCEPATH ../src SOURCE harvesterblacklist.cpp diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/common/src/harvestereventmanager.cpp --- a/harvester/common/src/harvestereventmanager.cpp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/common/src/harvestereventmanager.cpp Thu Jul 15 19:07:24 2010 +0300 @@ -18,6 +18,11 @@ #include "harvestereventmanager.h" #include "harvesterlog.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "harvestereventmanagerTraces.h" +#endif + const TInt KHarvesterEventManagerTLSKey = 0x200104D9; @@ -47,6 +52,7 @@ EXPORT_C CHarvesterEventManager* CHarvesterEventManager::GetInstanceL() { WRITELOG( "CHarvesterEventManager::GetInstanceL" ); + OstTrace0( TRACE_NORMAL, CHARVESTEREVENTMANAGER_GETINSTANCEL, "CHarvesterEventManager::GetInstanceL" ); CHarvesterEventManagerStaticData* data = static_cast( @@ -75,6 +81,8 @@ EXPORT_C void CHarvesterEventManager::ReleaseInstance() { WRITELOG( "CHarvesterEventManager::ReleaseInstance" ); + OstTrace0( TRACE_NORMAL, CHARVESTEREVENTMANAGER_RELEASEINSTANCE, "CHarvesterEventManager::ReleaseInstance" ); + CHarvesterEventManagerStaticData* data = static_cast( UserSvr::DllTls( KHarvesterEventManagerTLSKey ) ); @@ -100,32 +108,52 @@ switch(aHEObserverType) { case EHEObserverTypePlaceholder: + { WRITELOG( "CHarvesterEventManager::IncreaseItemCount() EHEObserverTypePlaceholder"); + OstTrace0( TRACE_NORMAL, CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT, "CHarvesterEventManager::IncreaseItemCount EHEObserverTypePlaceholder" ); break; + } case EHEObserverTypeMMC: + { WRITELOG( "CHarvesterEventManager::IncreaseItemCount() EHEObserverTypeMMC"); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT, "CHarvesterEventManager::IncreaseItemCount EHEObserverTypeMMC" ); break; + } case EHEObserverTypeOverall: + { WRITELOG( "CHarvesterEventManager::IncreaseItemCount() EHEObserverTypeOverall"); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT, "CHarvesterEventManager::IncreaseItemCount EHEObserverTypeOverall" ); break; + } default: + { WRITELOG( "CHarvesterEventManager::IncreaseItemCount() Unknown type!"); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT, "CHarvesterEventManager::IncreaseItemCount Unknown type!" ); + } }; #endif if( eventStatus ) { WRITELOG1( "CHarvesterEventManager::IncreaseItemCount() itemsleft = %d old ", eventStatus->iItemsLeft); + OstTrace1( TRACE_NORMAL, DUP4_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT, "CHarvesterEventManager::IncreaseItemCount) itemsleft = %d old", eventStatus->iItemsLeft ); + eventStatus->iItemsLeft += aCount; WRITELOG1( "CHarvesterEventManager::IncreaseItemCount() itemsleft = %d ", eventStatus->iItemsLeft); + OstTrace1( TRACE_NORMAL, DUP5_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT, "CHarvesterEventManager::IncreaseItemCount itemsleft = %d", eventStatus->iItemsLeft ); + } else { TEventStatus eventStatus; eventStatus.iCurrentState = EHEStateStarted; WRITELOG1( "CHarvesterEventManager::IncreaseItemCount() itemsleft = %d old", aCount); + OstTrace1( TRACE_NORMAL, DUP6_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT, "CHarvesterEventManager::IncreaseItemCount itemsleft = %d old", aCount ); + eventStatus.iItemsLeft = aCount; WRITELOG1( "CHarvesterEventManager::IncreaseItemCount() itemsleft = %d ", aCount); + OstTrace1( TRACE_NORMAL, DUP7_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT, "CHarvesterEventManager::IncreaseItemCount itemsleft = %d", aCount ); + eventStatus.iObserverType = aHEObserverType; iEventStatuses.Append( eventStatus ); } @@ -141,22 +169,36 @@ switch(aHEObserverType) { case EHEObserverTypePlaceholder: + { WRITELOG( "CHarvesterEventManager::DecreaseItemCountL() EHEObserverTypePlaceholder"); + OstTrace0( TRACE_NORMAL, CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL, "CHarvesterEventManager::DecreaseItemCountL EHEObserverTypePlaceholder" ); break; + } case EHEObserverTypeMMC: + { WRITELOG( "CHarvesterEventManager::DecreaseItemCountL() EHEObserverTypeMMC"); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL, "CHarvesterEventManager::DecreaseItemCountL EHEObserverTypeMMC" ); break; + } case EHEObserverTypeOverall: + { WRITELOG( "CHarvesterEventManager::DecreaseItemCountL() EHEObserverTypeOverall"); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL, "CHarvesterEventManager::DecreaseItemCountL EHEObserverTypeOverall" ); break; + } default: + { WRITELOG( "CHarvesterEventManager::DecreaseItemCountL() Unknown type!"); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL, "CHarvesterEventManager::DecreaseItemCountL Unknown type!" ); + } }; #endif if( eventStatus ) { WRITELOG1( "CHarvesterEventManager::DecreaseItemCountL() iItemsLeft = %d old", eventStatus->iItemsLeft); + OstTrace1( TRACE_NORMAL, DUP4_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL, "CHarvesterEventManager::DecreaseItemCountL iItemsLeft = %d old", eventStatus->iItemsLeft ); + TUint newCount = eventStatus->iItemsLeft - aCount; // check for wrap @@ -179,6 +221,7 @@ } WRITELOG1( "CHarvesterEventManager::DecreaseItemCountL() iItemsLeft = %d", eventStatus->iItemsLeft ); + OstTrace1( TRACE_NORMAL, DUP5_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL, "CHarvesterEventManager::DecreaseItemCountL iItemsLeft = %d", eventStatus->iItemsLeft ); // send finished event to all matching observers if ( eventStatus->iItemsLeft <= 0 ) diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/common/src/harvesterexifutil.cpp --- a/harvester/common/src/harvesterexifutil.cpp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/common/src/harvesterexifutil.cpp Thu Jul 15 19:07:24 2010 +0300 @@ -23,6 +23,11 @@ #include "mdeproperty.h" #include "tz.h" #include +#include "OstTraceDefinitions.h" + +#ifdef OST_TRACE_COMPILER_IN_USE +#include "harvesterexifutilTraces.h" +#endif @@ -137,6 +142,7 @@ EXPORT_C TBool CHarvesterExifUtil::IsValidExifData(TPtr8 aPtr) { WRITELOG( "CHarvesterExifUtil::IsValidExifData start" ); + OstTrace0( TRACE_NORMAL, CHARVESTEREXIFUTIL_ISVALIDEXIFDATA, "CHarvesterExifUtil::IsValidExifData start" ); CExifRead* reader = NULL; @@ -144,13 +150,15 @@ if (err != KErrNone || !reader ) { WRITELOG1( "CHarvesterExifUtil::IsValidExifData - error code: %d", err ); - + OstTrace1( TRACE_NORMAL, DUP1_CHARVESTEREXIFUTIL_ISVALIDEXIFDATA, "CHarvesterExifUtil::IsValidExifData -error code:%d", err ); + return EFalse; } delete reader; WRITELOG( "CHarvesterExifUtil::IsValidExifData end" ); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTEREXIFUTIL_ISVALIDEXIFDATA, "CHarvesterExifUtil::IsValidExifData end" ); return ETrue; } @@ -183,6 +191,8 @@ EXPORT_C TInt CHarvesterExifUtil::ReadExifDataL( CHarvestData& aHd, CFileData& aFileData ) { WRITELOG( "CHarvesterExifUtil::ReadExifDataL()" ); + OstTrace0( TRACE_NORMAL, CHARVESTEREXIFUTIL_READEXIFDATAL, "CHarvesterExifUtil::ReadExifDataL" ); + CExifRead* reader = CExifRead::NewL( aFileData.iImageData->Des(), CExifRead::ENoJpeg | CExifRead::ENoTagChecking); @@ -227,6 +237,8 @@ if ( reader->TagExists(KIdDateTime, EIfd0) ) { WRITELOG( "CHarvesterExifUtil::ReadExifDataL() - getting last aFileData.iModified date (exif)" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTEREXIFUTIL_READEXIFDATAL, "CHarvesterExifUtil::ReadExifDataL - getting last aFileData.iModified date (exif)" ); + aHd.iDateModified8 = reader->GetDateTimeL(); } @@ -234,6 +246,8 @@ if ( reader->TagExists(KIdDateTimeOriginal, EIfdExif) ) { WRITELOG( "CHarvesterExifUtil::ReadExifDataL() - getting original date (exif)" ); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTEREXIFUTIL_READEXIFDATAL, "CHarvesterExifUtil::ReadExifDataL - getting original date (exif)" ); + aHd.iDateOriginal8 = reader->GetDateTimeOriginalL(); } @@ -241,6 +255,8 @@ if ( reader->TagExists(KIdDateTimeDigitized, EIfdExif) ) { WRITELOG( "CHarvesterExifUtil::ReadExifDataL() - getting digitized date (exif)" ); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTEREXIFUTIL_READEXIFDATAL, "CHarvesterExifUtil::ReadExifDataL - getting digitized date (exif)" ); + aHd.iDateDigitized8 = reader->GetDateTimeDigitizedL(); } @@ -336,6 +352,8 @@ aHd.iStoreSamplesPerPixel = ETrue; WRITELOG1( "CHarvesterExifUtil::ReadExifDataL() - samples per pixel: %d", aHd.iSamplesPerPixel ); + OstTrace1( TRACE_NORMAL, DUP4_CHARVESTEREXIFUTIL_READEXIFDATAL, "CHarvesterExifUtil::ReadExifDataL - samples per pixel: %d", aHd.iSamplesPerPixel ); + } //Getting ISO speed rating. @@ -415,6 +433,7 @@ const TDesC8& aDateTime ) { WRITELOG( "CHarvesterImagePluginAO::ConvertExifDateTimeToSymbianTimeL()" ); + OstTrace0( TRACE_NORMAL, CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL, "CHarvesterExifUtil::ConvertExifDateTimeToSymbianTimeL" ); TDateTime datetime( 0, EJanuary, 0, 0, 0, 0, 0 ); TBuf<4> text; @@ -427,6 +446,8 @@ if ( error != KErrNone ) { WRITELOG( "CHarvesterImagePluginAO::ConvertExifDateTimeToSymbianTimeL() - couldn't get year" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL, "CHarvesterExifUtil::ConvertExifDateTimeToSymbianTimeL - couldn't get year" ); + User::Leave( error ); } datetime.SetYear( number ); @@ -438,6 +459,8 @@ if ( error != KErrNone ) { WRITELOG( "CHarvesterImagePluginAO::ConvertExifDateTimeToSymbianTimeL() - couldn't get month" ); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL, "CHarvesterExifUtil::ConvertExifDateTimeToSymbianTimeL - couldn't get month" ); + User::Leave( error ); } number--; @@ -451,6 +474,8 @@ if ( error != KErrNone ) { WRITELOG( "CHarvesterImagePluginAO::ConvertExifDateTimeToSymbianTimeL() - couldn't get date" ); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL, "CHarvesterExifUtil::ConvertExifDateTimeToSymbianTimeL - couldn't get date" ); + User::Leave( error ); } datetime.SetDay( number - 1 ); @@ -462,6 +487,8 @@ if ( error != KErrNone ) { WRITELOG( "CHarvesterImagePluginAO::ConvertExifDateTimeToSymbianTimeL() - couldn't get hours" ); + OstTrace0( TRACE_NORMAL, DUP4_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL, "CHarvesterExifUtil::ConvertExifDateTimeToSymbianTimeL - couldn't get hours" ); + User::Leave( error ); } datetime.SetHour( number ); @@ -473,6 +500,8 @@ if ( error != KErrNone ) { WRITELOG( "CHarvesterImagePluginAO::ConvertExifDateTimeToSymbianTimeL() - couldn't get minutes" ); + OstTrace0( TRACE_NORMAL, DUP5_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL, "CHarvesterExifUtil::ConvertExifDateTimeToSymbianTimeL - couldn't get minutes" ); + User::Leave( error ); } datetime.SetMinute( number ); @@ -484,6 +513,8 @@ if ( error != KErrNone ) { WRITELOG( "CHarvesterImagePluginAO::ConvertExifDateTimeToSymbianTimeL() - couldn't get seconds" ); + OstTrace0( TRACE_NORMAL, DUP6_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL, "CHarvesterExifUtil::ConvertExifDateTimeToSymbianTimeL - couldn't get seconds" ); + User::Leave( error ); } datetime.SetSecond( number ); @@ -1751,7 +1782,7 @@ TReal64 latitude = 0.0; const CExifTag* refTag = aReader->GetTagL( EIfdGps, KIdGpsLatitudeRef ); - TBuf8<2> latitudeRef = refTag->Data(); + TBuf8<3> latitudeRef = refTag->Data(); const CExifTag* latitudeTag = aReader->GetTagL( EIfdGps, KIdGpsLatitude ); TBuf8 latitudeBuf = latitudeTag->Data(); @@ -1784,7 +1815,7 @@ TReal64 longitude = 0.0; const CExifTag* refTag = aReader->GetTagL( EIfdGps, KIdGpsLongitudeRef ); - TBuf8<2> longitudeRef = refTag->Data(); + TBuf8<3> longitudeRef = refTag->Data(); const CExifTag* longitudeTag = aReader->GetTagL( EIfdGps, KIdGpsLongitude ); TBuf8 longitudeBuf = longitudeTag->Data(); diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/common/src/harvesterplugin.cpp --- a/harvester/common/src/harvesterplugin.cpp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/common/src/harvesterplugin.cpp Thu Jul 15 19:07:24 2010 +0300 @@ -65,7 +65,7 @@ iDtor_ID_Key( KNullUid ), iOriginPropertyDef( NULL ), iTitlePropertyDef( NULL ), - iHarvesting( NULL ) + iHarvesting( EFalse ) { } @@ -132,6 +132,11 @@ { case EHarvesterIdle: { + if( iHarvesting ) + { + TRAP_IGNORE( iFactory->SendHarvestingStatusEventL( EFalse ) ); + iHarvesting = EFalse; + } } break; @@ -332,6 +337,19 @@ } // --------------------------------------------------------------------------- +// PluginInIdleState +// --------------------------------------------------------------------------- +// +EXPORT_C TBool CHarvesterPlugin::PluginInIdleState() + { + if( iState == EHarvesterIdle ) + { + return ETrue; + } + return EFalse; + } + +// --------------------------------------------------------------------------- // E32Dll // --------------------------------------------------------------------------- // diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/common/src/harvesterpluginfactory.cpp --- a/harvester/common/src/harvesterpluginfactory.cpp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/common/src/harvesterpluginfactory.cpp Thu Jul 15 19:07:24 2010 +0300 @@ -439,13 +439,22 @@ { const TInt pluginInfoCount = iHarvesterPluginInfoArray.Count(); TBool itemsLeft( EFalse ); + TBool allPluginsOnIdle( ETrue ); for ( TInt i = pluginInfoCount; --i >= 0; ) { CHarvesterPluginInfo* info = iHarvesterPluginInfoArray[i]; if( info && info->iQueue.Count() ) { itemsLeft = ETrue; - break; + if( aStarted ) + { + // Idle state is only checked if finished event is sent + break; + } + } + if( info && info->iPlugin && !(info->iPlugin->PluginInIdleState()) ) + { + allPluginsOnIdle = EFalse; } } @@ -458,7 +467,7 @@ iHarvesterEventManager->IncreaseItemCount( EHEObserverTypeOverall, KCacheItemCountForEventCaching ); return; } - else if( iHarvesting && !itemsLeft && !aStarted ) + else if( iHarvesting && (!itemsLeft || allPluginsOnIdle) && !aStarted ) { iHarvesting = EFalse; iHarvesterEventManager->SendEventL( EHEObserverTypeOverall, EHEStateFinished ); diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/common/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/common/traces/OstTraceDefinitions.h Thu Jul 15 19:07:24 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 9422ed56ee45 -r 63c982fb92f2 harvester/common/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/common/traces/fixed_id.definitions Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,33 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_NORMAL=0x3 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL=0xb +[TRACE]TRACE_NORMAL[0x3]_CHARVESTEREVENTMANAGER_GETINSTANCEL=0x1 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT=0x3 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTEREVENTMANAGER_RELEASEINSTANCE=0x2 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL=0x19 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTEREXIFUTIL_ISVALIDEXIFDATA=0x11 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTEREXIFUTIL_READEXIFDATAL=0x14 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL=0xc +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT=0x4 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL=0x1a +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTEREXIFUTIL_ISVALIDEXIFDATA=0x12 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTEREXIFUTIL_READEXIFDATAL=0x15 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL=0xd +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT=0x5 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL=0x1b +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTEREXIFUTIL_ISVALIDEXIFDATA=0x13 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTEREXIFUTIL_READEXIFDATAL=0x16 +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL=0xe +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT=0x6 +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL=0x1c +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTEREXIFUTIL_READEXIFDATAL=0x17 +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL=0xf +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT=0x7 +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL=0x1d +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTEREXIFUTIL_READEXIFDATAL=0x18 +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL=0x10 +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT=0x8 +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL=0x1e +[TRACE]TRACE_NORMAL[0x3]_DUP6_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT=0x9 +[TRACE]TRACE_NORMAL[0x3]_DUP6_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL=0x1f +[TRACE]TRACE_NORMAL[0x3]_DUP7_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT=0xa diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/common/traces/harvestereventmanagerTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/common/traces/harvestereventmanagerTraces.h Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,30 @@ +// Created by TraceCompiler 1.3.1 +// DO NOT EDIT, CHANGES WILL BE LOST + +#ifndef __HARVESTEREVENTMANAGERTRACES_H__ +#define __HARVESTEREVENTMANAGERTRACES_H__ + +#define KOstTraceComponentID 0x200009fe + +#define CHARVESTEREVENTMANAGER_GETINSTANCEL 0x30001 +#define CHARVESTEREVENTMANAGER_RELEASEINSTANCE 0x30002 +#define CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT 0x30003 +#define DUP1_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT 0x30004 +#define DUP2_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT 0x30005 +#define DUP3_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT 0x30006 +#define DUP4_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT 0x30007 +#define DUP5_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT 0x30008 +#define DUP6_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT 0x30009 +#define DUP7_CHARVESTEREVENTMANAGER_INCREASEITEMCOUNT 0x3000a +#define CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL 0x3000b +#define DUP1_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL 0x3000c +#define DUP2_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL 0x3000d +#define DUP3_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL 0x3000e +#define DUP4_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL 0x3000f +#define DUP5_CHARVESTEREVENTMANAGER_DECREASEITEMCOUNTL 0x30010 + + +#endif + +// End of file + diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/common/traces/harvesterexifutilTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/common/traces/harvesterexifutilTraces.h Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,29 @@ +// Created by TraceCompiler 1.3.1 +// DO NOT EDIT, CHANGES WILL BE LOST + +#ifndef __HARVESTEREXIFUTILTRACES_H__ +#define __HARVESTEREXIFUTILTRACES_H__ + +#define KOstTraceComponentID 0x200009fe + +#define CHARVESTEREXIFUTIL_ISVALIDEXIFDATA 0x30011 +#define DUP1_CHARVESTEREXIFUTIL_ISVALIDEXIFDATA 0x30012 +#define DUP2_CHARVESTEREXIFUTIL_ISVALIDEXIFDATA 0x30013 +#define CHARVESTEREXIFUTIL_READEXIFDATAL 0x30014 +#define DUP1_CHARVESTEREXIFUTIL_READEXIFDATAL 0x30015 +#define DUP2_CHARVESTEREXIFUTIL_READEXIFDATAL 0x30016 +#define DUP3_CHARVESTEREXIFUTIL_READEXIFDATAL 0x30017 +#define DUP4_CHARVESTEREXIFUTIL_READEXIFDATAL 0x30018 +#define CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL 0x30019 +#define DUP1_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL 0x3001a +#define DUP2_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL 0x3001b +#define DUP3_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL 0x3001c +#define DUP4_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL 0x3001d +#define DUP5_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL 0x3001e +#define DUP6_CHARVESTEREXIFUTIL_CONVERTEXIFDATETIMETOSYMBIANTIMEL 0x3001f + + +#endif + +// End of file + diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/server/group/harvesterserver.mmp --- a/harvester/server/group/harvesterserver.mmp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/server/group/harvesterserver.mmp Thu Jul 15 19:07:24 2010 +0300 @@ -41,6 +41,7 @@ USERINCLUDE ../../common/inc USERINCLUDE ../inc USERINCLUDE ../../monitorplugins/inc +USERINCLUDE ../traces SOURCEPATH ../src SOURCE harvesterserver.cpp diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/server/src/harvesterao.cpp --- a/harvester/server/src/harvesterao.cpp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/server/src/harvesterao.cpp Thu Jul 15 19:07:24 2010 +0300 @@ -42,6 +42,11 @@ #include "harvestercenreputil.h" #include "restorewatcher.h" #include "backupsubscriber.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "harvesteraoTraces.h" +#endif + // constants const TInt32 KFileMonitorPluginUid = 0x20007186; // file monitor plugin implementation uid @@ -104,6 +109,7 @@ CHarvesterAO* CHarvesterAO::NewLC() { WRITELOG( "CHarvesterAO::NewLC() - begin" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_NEWLC, "CHarvesterAO::NewLC" ); CHarvesterAO* self = new (ELeave) CHarvesterAO(); CleanupStack::PushL( self ); @@ -118,6 +124,7 @@ CHarvesterAO* CHarvesterAO::NewL() { WRITELOG( "CHarvesterAO::NewL() - begin" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_NEWL, "CHarvesterAO::NewL" ); CHarvesterAO* self = CHarvesterAO::NewLC(); CleanupStack::Pop( self ); @@ -131,6 +138,7 @@ CHarvesterAO::CHarvesterAO() : CActive( KHarvesterPriorityHarvestingPlugin ) { WRITELOG( "CHarvesterAO::CHarvesterAO() - begin" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_CHARVESTERAO, "CHarvesterAO::CHarvesterAO" ); iServerPaused = ETrue; iNextRequest = ERequestIdle; @@ -155,6 +163,7 @@ CHarvesterAO::~CHarvesterAO() { WRITELOG( "CHarvesterAO::~CHarvesterAO()" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_CHARVESTERAO, "CHarvesterAO::~CHarvesterAO" ); Cancel(); @@ -246,7 +255,8 @@ void CHarvesterAO::ConstructL() { WRITELOG( "CHarvesterAO::ConstructL() - begin" ); - + OstTrace0( TRACE_NORMAL, CHARVESTERAO_CONSTRUCTL, "CHarvesterAO::ConstructL - begin" ); + CActiveScheduler::Add( this ); User::LeaveIfError( iFs.Connect() ); @@ -323,7 +333,9 @@ TFileName mmcSoundPath( mmcRoot ); mmcSoundPath.Append( sounds ); iMmcSoundsPath = mmcSoundPath.Right( mmcSoundPath.Length() - 1 ).AllocL(); - + + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_CONSTRUCTL, "CHarvesterAO::ConstructL - end" ); + WRITELOG( "CHarvesterAO::ConstructL() - end" ); } @@ -334,6 +346,7 @@ void CHarvesterAO::LoadMonitorPluginsL() { WRITELOG( "CHarvesterAO::LoadMonitorPluginsL()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_LOADMONITORPLUGINSL, "CHarvesterAO::LoadMonitorPluginsL" ); RImplInfoPtrArray infoArray; @@ -364,6 +377,8 @@ else { WRITELOG( "CHarvesterAO::LoadMonitorPlugins() - Failed to load a monitor plugin!" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_LOADMONITORPLUGINSL, "CHarvesterAO::LoadMonitorPluginsL - Failed to load a monitor plugin!" ); + delete plugin; plugin = NULL; } @@ -379,9 +394,11 @@ void CHarvesterAO::DeleteMonitorPlugins() { WRITELOG( "CHarvesterAO::DeleteMonitorPlugins()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_DELETEMONITORPLUGINS, "CHarvesterAO::DeleteMonitorPlugins" ); iMonitorPluginArray.ResetAndDestroy(); iMonitorPluginArray.Close(); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_DELETEMONITORPLUGINS, "CHarvesterAO::DeleteMonitorPlugins - end" ); WRITELOG( "CHarvesterAO::DeleteMonitorPlugins() - end" ); } @@ -392,7 +409,8 @@ void CHarvesterAO::StartMonitoring() { WRITELOG( "CHarvesterAO::StartMonitoring()" ); - + OstTrace0( TRACE_NORMAL, CHARVESTERAO_STARTMONITORING, "CHarvesterAO::StartMonitoring" ); + const TInt count( iMonitorPluginArray.Count() ); for ( TInt i = 0; i < count; i++ ) @@ -409,6 +427,8 @@ void CHarvesterAO::StopMonitoring() { WRITELOG( "CHarvesterAO::StopMonitoring()" ); + + OstTrace0( TRACE_NORMAL, CHARVESTERAO_STOPMONITORING, "CHarvesterAO::StopMonitoring" ); const TInt count( iMonitorPluginArray.Count() ); @@ -425,12 +445,15 @@ void CHarvesterAO::PauseMonitoring() { WRITELOG( "CHarvesterAO::PauseMonitoring()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_PAUSEMONITORING, "CHarvesterAO::PauseMonitoring" ); + const TInt count( iMonitorPluginArray.Count() ); for ( TInt i = 0; iPauseMonitoring(); } + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_PAUSEMONITORING, "CHarvesterAO::PauseMonitoring - end" ); WRITELOG( "CHarvesterAO::PauseMonitoring() - end" ); } @@ -441,6 +464,7 @@ void CHarvesterAO::ResumeMonitoring() { WRITELOG( "CHarvesterAO::ResumeMonitoring()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_RESUMEMONITORING, "CHarvesterAO::ResumeMonitoring" ); const TInt count( iMonitorPluginArray.Count() ); @@ -459,6 +483,7 @@ void CHarvesterAO::HandleUnmount( TUint32 aMediaId ) { WRITELOG1( "CHarvesterAO::HandleUnmount(%d)", aMediaId ); + OstTrace1( TRACE_NORMAL, CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount;aMediaId=%d", aMediaId ); iUnmountDetected = ETrue; @@ -477,6 +502,8 @@ #ifdef _DEBUG WRITELOG1( "CHarvesterAO::HandleUnmount() iReadyPHArray.Count() = %d", iReadyPHArray.Count() ); + OstTrace1( TRACE_NORMAL, DUP1_CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount;iReadyPHArray.Count()=%d", iReadyPHArray.Count() ); + #endif TInt arrayCount( iReadyPHArray.Count() ); if( arrayCount > 0 ) @@ -489,6 +516,8 @@ if( err == KErrNone && mediaId == aMediaId ) { WRITELOG1( "CHarvesterAO::HandleUnmount() remove iReadyPHArray %d", i); + OstTrace1( TRACE_NORMAL, DUP2_CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount remove iReadyPHArray %d", i ); + delete hd; hd = NULL; iReadyPHArray.Remove( i ); @@ -501,6 +530,8 @@ iReadyPHArray.Compress(); } WRITELOG1( "CHarvesterAO::HandleUnmount() DecreaseItemCountL iReadyPHArray %d", removed); + OstTrace1( TRACE_NORMAL, DUP3_CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount DecreaseItemCountL iReadyPHArray %d", removed ); + TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder, removed) ); } @@ -508,6 +539,8 @@ #ifdef _DEBUG WRITELOG1( "CHarvesterAO::HandleUnmount() iPHArray.Count() = %d", iPHArray.Count() ); + OstTrace1( TRACE_NORMAL, DUP4_CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount iPHArray.Count()=%d", iPHArray.Count() ); + #endif arrayCount = iPHArray.Count(); if( arrayCount > 0 ) @@ -520,6 +553,8 @@ if( err == KErrNone && mediaId == aMediaId ) { WRITELOG1( "CHarvesterAO::HandleUnmount() remove iPHArray %d", i); + OstTrace1( TRACE_NORMAL, DUP5_CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount remove iPHArray %d", i ); + delete hd; hd = NULL; iPHArray.Remove( i ); @@ -532,6 +567,7 @@ iPHArray.Compress(); } WRITELOG1( "CHarvesterAO::HandleUnmount() DecreaseItemCountL iPHArray %d", removed); + OstTrace1( TRACE_NORMAL, DUP6_CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount DecreaseItemCountL iPHArray %d", removed ); TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder, removed) ); } @@ -539,6 +575,8 @@ #ifdef _DEBUG WRITELOG1( "CHarvesterAO::HandleUnmount() iContainerPHArray.Count() = %d", iContainerPHArray.Count() ); + OstTrace1( TRACE_NORMAL, DUP7_CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount iContainerPHArray.Count()=%d", iContainerPHArray.Count() ); + #endif arrayCount = iContainerPHArray.Count(); if( arrayCount > 0 ) @@ -551,6 +589,8 @@ if( err == KErrNone && mediaId == aMediaId ) { WRITELOG1( "CHarvesterAO::HandleUnmount() remove iContainerPHArray %d", i); + OstTrace1( TRACE_NORMAL, DUP8_CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount remove iContainerPHArray %d", i ); + delete hd; hd = NULL; iContainerPHArray.Remove( i ); @@ -601,11 +641,16 @@ const TUint count = iQueue->ItemsInQueue(); WRITELOG1( "CHarvesterAO::HandleUnmount() iQueue.Count() = %d", count ); + OstTrace1( TRACE_NORMAL, DUP10_CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount iQueue.Count() = %d", count ); + if( count > 0 ) { WRITELOG( "CHarvesterAO::HandleUnmount() remove iQueue" ); + OstTrace0( TRACE_NORMAL, DUP11_CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount remove iQueue" ); removed = iQueue->RemoveItems( aMediaId ); WRITELOG1( "CHarvesterAO::HandleUnmount() removed iQueue = %d", removed ); + OstTrace1( TRACE_NORMAL, DUP12_CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount removed iQueue = %d", removed ); + TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder, removed ) ); TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypeMMC, removed ) ); } @@ -650,6 +695,8 @@ if( removed ) { WRITELOG1( "CHarvesterAO::HandleUnmount() remove from plugins = %d", removed); + OstTrace1( TRACE_NORMAL, DUP13_CHARVESTERAO_HANDLEUNMOUNT, "CHarvesterAO::HandleUnmount remove from plugins = %d", removed ); + TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder, removed ) ); TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypeMMC, removed ) ); } @@ -673,7 +720,8 @@ void CHarvesterAO::StartComposersL() { WRITELOG( "CHarvesterAO::StartComposersL()" ); - + OstTrace0( TRACE_NORMAL, CHARVESTERAO_STARTCOMPOSERSL, "CHarvesterAO::StartComposersL" ); + RImplInfoPtrArray infoArray; TCleanupItem cleanupItem( MdsUtils::CleanupEComArray, &infoArray ); CleanupStack::PushL( cleanupItem ); @@ -707,6 +755,7 @@ void CHarvesterAO::StopComposers() { WRITELOG( "CHarvesterAO::StopComposers()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_STOPCOMPOSERS, "CHarvesterAO::StopComposers" ); const TInt count( iComposerPluginArray.Count() ); for ( TInt i = count; --i >= 0; ) @@ -724,6 +773,7 @@ void CHarvesterAO::DeleteComposers() { WRITELOG( "CHarvesterAO::DeleteComposers()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_DELETECOMPOSERS, "CHarvesterAO::DeleteComposers" ); iComposerPluginArray.ResetAndDestroy(); iComposerPluginArray.Close(); @@ -738,6 +788,7 @@ TBool CHarvesterAO::IsComposingReady() { WRITELOG( "CHarvesterAO::IsComposingReady()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_ISCOMPOSINGREADY, "CHarvesterAO::IsComposingReady" ); const TInt count( iComposerPluginArray.Count() ); for ( TInt i = count; --i >= 0; ) @@ -759,6 +810,7 @@ void CHarvesterAO::ReadItemFromQueueL() { WRITELOG( "CHarvesterAO::ReadItemFromQueueL()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_READITEMFROMQUEUEL, "CHarvesterAO::ReadItemFromQueueL" ); CHarvesterData* hd = iQueue->GetNextItem(); @@ -873,6 +925,7 @@ void CHarvesterAO::HandlePlaceholdersL( TBool aCheck ) { WRITELOG( "CHarvesterAO::HandlePlaceholdersL()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_HANDLEPLACEHOLDERSL, "CHarvesterAO::HandlePlaceholdersL" ); RPointerArray mdeObjectArray; CleanupClosePushL( mdeObjectArray ); @@ -974,6 +1027,8 @@ if ( err != KErrNone ) { WRITELOG( "CHarvesterAO::HandlePlaceholdersL() - cannot create placeholder data object for camera. file does not exists" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_HANDLEPLACEHOLDERSL, "CHarvesterAO::HandlePlaceholdersL- cannot create placeholder data object for camera. file does not exists" ); + // notify observer HarvestCompleted( hd->ClientId(), hd->Uri(), err ); delete hd; @@ -1002,6 +1057,8 @@ if( !phData ) { WRITELOG( "CHarvesterAO::HandlePlaceholdersL() - Placeholder data object NULL - abort" ); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTERAO_HANDLEPLACEHOLDERSL, "CHarvesterAO::HandlePlaceholdersL - Placeholder data object NULL - abort" ); + const TInt error( KErrUnknown ); // notify observer HarvestCompleted( hd->ClientId(), hd->Uri(), error ); @@ -1088,6 +1145,8 @@ if( isPreinstalled == MdeConstants::MediaObject::EPreinstalled ) { WRITELOG("CHarvesterAO::HandlePlaceholdersL() - preinstalled"); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTERAO_HANDLEPLACEHOLDERSL, "CHarvesterAO::HandlePlaceholdersL - preinstalled" ); + mdeObject->AddInt32PropertyL( *iPropDefs->iPreinstalledPropertyDef, isPreinstalled ); } @@ -1193,6 +1252,8 @@ if( objDefStr.Length() == 0 ) { WRITELOG( "CHarvesterAO::CheckFileExtensionAndHarvestL() - cannot get object definition" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL, "CHarvesterAO::CheckFileExtensionAndHarvestL - cannot get object definition" ); + isError = ETrue; } else if( objDefStr == KInUse ) @@ -1221,21 +1282,29 @@ else { WRITELOG( "CHarvesterAO::CheckFileExtensionAndHarvestL() - getting mdeobject" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL, "CHarvesterAO::CheckFileExtensionAndHarvestL - getting mdeobject" ); + TRAP( mdeError, mdeObject = iMdeObjectHandler->GetMetadataObjectL( *aHD, objDefStr ) ); } TInt harvesterError = KErrNone; if( mdeError != KErrNone) { WRITELOG1( "CHarvesterAO::CheckFileExtensionAndHarvestL() - cannot get mde object. error: %d", mdeError ); + OstTrace1( TRACE_NORMAL, DUP2_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL, "CHarvesterAO::CheckFileExtensionAndHarvestL - cannot get mde object. error: %d", mdeError ); + MdsUtils::ConvertTrapError( mdeError, harvesterError ); if( harvesterError == KMdEErrHarvestingFailedPermanent ) { WRITELOG( "CHarvesterAO::CheckFileExtensionAndHarvestL() - permanent fail" ); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL, "CHarvesterAO::CheckFileExtensionAndHarvestL - permanent fail" ); + isError = ETrue; } else if ( harvesterError == KMdEErrHarvestingFailed ) { WRITELOG( "CHarvesterAO::CheckFileExtensionAndHarvestL() - KMdEErrHarvestingFailed"); + OstTrace0( TRACE_NORMAL, DUP4_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL, "CHarvesterAO::CheckFileExtensionAndHarvestL - KMdEErrHarvestingFailed" ); + aHD->SetErrorCode( KMdEErrHarvestingFailed ); HarvestingCompleted( aHD ); return; @@ -1245,6 +1314,8 @@ if( !mdeObject ) { WRITELOG( "CHarvesterAO::CheckFileExtensionAndHarvestL() - mde object is null. stop harvesting" ); + OstTrace0( TRACE_NORMAL, DUP5_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL, "CHarvesterAO::CheckFileExtensionAndHarvestL - mde object is null. stop harvesting" ); + isError = ETrue; } } @@ -1284,9 +1355,13 @@ if ( err != KErrNone ) { WRITELOG1( "CHarvesterAO::CheckFileExtensionAndHarvestL() - plugin error: %d", err ); + OstTrace1( TRACE_NORMAL, DUP6_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL, "CHarvesterAO::CheckFileExtensionAndHarvestL - plugin error: %d", err ); + if ( err == KErrInUse ) { WRITELOG( "CHarvesterAO::CheckFileExtensionAndHarvestL() - item in use" ); + OstTrace0( TRACE_NORMAL, DUP7_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL, "CHarvesterAO::CheckFileExtensionAndHarvestL - item in use" ); + aHD->SetErrorCode( KMdEErrHarvestingFailed ); HarvestingCompleted( aHD ); return; @@ -1305,6 +1380,8 @@ } WRITELOG1("CHarvesterAO::CheckFileExtensionAndHarvestL() - ends with error %d", pluginErr ); + OstTrace1( TRACE_NORMAL, DUP8_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL, "CHarvesterAO::CheckFileExtensionAndHarvestL) - ends with error %d", pluginErr ); + SetNextRequest( ERequestHarvest ); } @@ -1315,7 +1392,8 @@ void CHarvesterAO::HarvestingCompleted( CHarvesterData* aHD ) { WRITELOG( "CHarvesterAO::HarvestingCompleted()" ); - + OstTrace0( TRACE_NORMAL, CHARVESTERAO_HARVESTINGCOMPLETED, "CHarvesterAO::HarvestingCompleted" ); + if ( aHD->ErrorCode() == KErrNone ) { iReHarvester->CheckItem( *aHD ); @@ -1324,6 +1402,8 @@ if( !aHD->TakeSnapshot() ) { WRITELOG( "CHarvesterAO::HarvestingCompleted() origin is not camera or clf" ); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTERAO_HARVESTINGCOMPLETED, "CHarvesterAO::HarvestingCompleted origin is not camera or clf" ); + aHD->MdeObject().SetPlaceholder( EFalse ); TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypePlaceholder ) ); TRAP( mdeError, iMdeObjectHandler->SetMetadataObjectL( *aHD ) ); @@ -1334,6 +1414,8 @@ WRITELOG( "==============================ERROR===============================" ); WRITELOG( "CHarvesterAO::HarvestingCompleted() - cannot set metadata object" ); WRITELOG( "==============================ERROR done =========================" ); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTERAO_HARVESTINGCOMPLETED, "CHarvesterAO::HarvestingCompleted - cannot set metadata object" ); + delete aHD; aHD = NULL; @@ -1342,9 +1424,13 @@ else { WRITELOG( "CHarvesterAO::HarvestingCompleted() mdeError == KErrNone" ); + OstTrace0( TRACE_NORMAL, DUP4_CHARVESTERAO_HARVESTINGCOMPLETED, "CHarvesterAO::HarvestingCompleted mdeError == KErrNone" ); + if ( aHD->TakeSnapshot() && iCtxEngine ) { WRITELOG( "CHarvesterAO::HarvestingCompleted() - Taking a context snapshot." ); + OstTrace0( TRACE_NORMAL, DUP5_CHARVESTERAO_HARVESTINGCOMPLETED, "CHarvesterAO::HarvestingCompleted - Taking a context snapshot." ); + iCtxEngine->ContextSnapshot( *this, *aHD ); } else @@ -1353,6 +1439,8 @@ if( locData ) { WRITELOG( "CHarvesterAO::HarvestingCompleted() - Creating location object. " ); + OstTrace0( TRACE_NORMAL, DUP6_CHARVESTERAO_HARVESTINGCOMPLETED, "CHarvesterAO::HarvestingCompleted - Creating location object." ); + RLocationObjectManipulator lo; const TInt loError = lo.Connect(); @@ -1363,11 +1451,14 @@ if( err != KErrNone ) { WRITELOG( "CHarvesterAO::HarvestingCompleted() - Location object creation failed!!!" ); + OstTrace0( TRACE_NORMAL, DUP7_CHARVESTERAO_HARVESTINGCOMPLETED, "CHarvesterAO::HarvestingCompleted - Location object creation failed!!!" ); + } } else { WRITELOG( "CHarvesterAO::HarvestingCompleted() - LocationObjectManipulator connect failed!!!" ); + OstTrace0( TRACE_NORMAL, DUP8_CHARVESTERAO_HARVESTINGCOMPLETED, "CHarvesterAO::HarvestingCompleted - LocationObjectManipulator connect failed!!" ); } lo.Close(); @@ -1385,6 +1476,8 @@ #ifdef _DEBUG WRITELOG( "==============================ERROR===============================" ); WRITELOG1( "CHarvesterAO::HarvestingCompleted() - not OK! Error: %d", aHD->ErrorCode() ); + OstTrace1( TRACE_NORMAL, DUP9_CHARVESTERAO_HARVESTINGCOMPLETED, "CHarvesterAO::HarvestingCompleted - not OK! Error: %d", aHD->ErrorCode() ); + #endif const TInt errorCode( aHD->ErrorCode() ); @@ -1392,6 +1485,7 @@ { #ifdef _DEBUG WRITELOG1("CHarvesterAO::HarvestingCompleted() - KMdEErrHarvestingFailed - %S - reharvesting", &aHD->Uri() ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_HARVESTINGCOMPLETED, "CHarvesterAO::HarvestingCompleted - KMdEErrHarvestingFailed - reharvesting" ); #endif iReHarvester->AddItem( aHD ); } @@ -1399,7 +1493,7 @@ errorCode == KMdEErrHarvestingFailedUnknown ) { WRITELOG( "CHarvesterAO::HarvestingCompleted() - KMdEErrHarvestingFailedPermanent - no need to re-harvest!" ); - + OstTrace0( TRACE_NORMAL, DUP10_CHARVESTERAO_HARVESTINGCOMPLETED, "CHarvesterAO::HarvestingCompleted - KMdEErrHarvestingFailedPermanent - no need to re-harvest!" ); TRAP_IGNORE( iHarvesterEventManager->DecreaseItemCountL( EHEObserverTypeMMC, 1 ) ); delete aHD; @@ -1408,11 +1502,15 @@ else { WRITELOG1( "CHarvesterAO::HarvestingCompleted() - unknown error: %d", errorCode ); + OstTrace1( TRACE_NORMAL, DUP11_CHARVESTERAO_HARVESTINGCOMPLETED, "CHarvesterAO::HarvestingCompleted - unknown error: %d", errorCode ); + delete aHD; aHD = NULL; } WRITELOG( "==============================ERROR done =========================" ); + OstTrace0( TRACE_NORMAL, DUP12_CHARVESTERAO_HARVESTINGCOMPLETED, "==============================ERROR done =========================" ); + } SetNextRequest( ERequestHarvest ); @@ -1425,7 +1523,8 @@ void CHarvesterAO::HandleSessionOpened( CMdESession& aSession, TInt aError ) { WRITELOG( "HarvesterThread::HandleSessionOpened()" ); - + OstTrace0( TRACE_NORMAL, CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened" ); + if ( KErrNone == aError ) { TBool isTNMDaemonEnabled( EFalse ); @@ -1444,6 +1543,7 @@ else { WRITELOG( "CHarvesterAO::HandleSessionOpened() - error creating mde harvester session" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened) - error creating mde harvester session" ); } // Setting up context Engine (initialization is ready when ContextInitializationStatus -callback is called) @@ -1451,6 +1551,7 @@ if ( errorTrap != KErrNone ) { WRITELOG( "CHarvesterAO::HandleSessionOpened() - Context Engine creation failed" ); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened - Context Engine creation failed" ); } #ifdef _DEBUG @@ -1458,6 +1559,7 @@ if ( errorTrap != KErrNone ) { WRITELOG( "CHarvesterAO::HandleSessionOpened() - ObjectHandler creation failed" ); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened - ObjectHandler creation failed" ); } // Setting up monitor plugins @@ -1465,6 +1567,7 @@ if ( errorTrap != KErrNone ) { WRITELOG( "CHarvesterAO::HandleSessionOpened() - error loading monitor plugins" ); + OstTrace0( TRACE_NORMAL, DUP4_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened - error loading monitor plugins" ); } // To check if the default namespace structure is in order @@ -1472,12 +1575,15 @@ if ( errorTrap != KErrNone ) { WRITELOG( "CHarvesterAO::HandleSessionOpened() - error loading default schema" ); + OstTrace0( TRACE_NORMAL, DUP5_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened - error loading default schema" ); } TRAP( errorTrap, StartComposersL() ); if ( errorTrap != KErrNone ) { WRITELOG( "CHarvesterAO::HandleSessionOpened() - couldn't start composer plugins" ); + OstTrace0( TRACE_NORMAL, DUP6_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened - couldn't start composer plugins" ); + } #else // The idea here is that all of these methods needs to be called, @@ -1495,6 +1601,7 @@ if ( errorTrap != KErrNone ) { WRITELOG( "CHarvesterAO::HandleSessionOpened() - couldn't start diskspace observer" ); + OstTrace0( TRACE_NORMAL, DUP7_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened - couldn't start diskspace observer" ); } TRAP( errorTrap, iOnDemandAO = COnDemandAO::NewL( *iMdESession, *iQueue, @@ -1505,11 +1612,13 @@ if ( errorTrap != KErrNone ) { WRITELOG( "CHarvesterAO::HandleSessionOpened() - couldn't start on demand observer" ); + OstTrace0( TRACE_NORMAL, DUP8_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened - couldn't start on demand observer" ); } } else { WRITELOG( "CHarvesterAO::HandleSessionOpened() - couldn't create on demand observer" ); + OstTrace0( TRACE_NORMAL, DUP9_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened - couldn't create on demand observer" ); } // Initializing pause indicator @@ -1517,7 +1626,8 @@ #ifdef _DEBUG WRITELOG( "HarvesterThread::HandleSessionOpened() - Succeeded!" ); - + OstTrace0( TRACE_NORMAL, DUP10_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened - Succeeded!" ); + TBool isRomScanEnabled( EFalse ); TRAP_IGNORE( CHarvesterCenRepUtil::IsRomScanEnabledL( isRomScanEnabled ) ); @@ -1527,6 +1637,7 @@ if( errorTrap != KErrNone ) { WRITELOG1( "CHarvesterAO::HandleSessionOpened() - BootRomScanL() returned error: %d", errorTrap ); + OstTrace1( TRACE_NORMAL, DUP11_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened - BootRomScanL() returned error: %d", errorTrap ); } } @@ -1534,6 +1645,7 @@ if( errorTrap != KErrNone ) { WRITELOG1( "CHarvesterAO::HandleSessionOpened() - BootPartialRestoreScanL() returned error: %d", errorTrap ); + OstTrace1( TRACE_NORMAL, DUP12_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened - BootPartialRestoreScanL() returned error: %d", errorTrap ); } #else // The idea here is that all of these three methods needs to be called, @@ -1574,6 +1686,7 @@ { iServerPaused = ETrue; WRITELOG1( "HarvesterThread::HandleSessionOpened() - Failed: %d!", aError ); + OstTrace1( TRACE_NORMAL, DUP13_CHARVESTERAO_HANDLESESSIONOPENED, "CHarvesterAO::HandleSessionOpened - Failed: %d!", aError ); } } @@ -1585,7 +1698,8 @@ { if ( KErrNone != aError ) { - WRITELOG1( "HarvesterThread::HandleSessionError() - Error: %d!", aError ); + WRITELOG1( "HarvesterThread::HandleSessionError() - Error: %d!", aError ); + OstTrace1( TRACE_NORMAL, CHARVESTERAO_HANDLESESSIONERROR, "CHarvesterAO::HandleSessionError - Error: %d!", aError ); } } @@ -1596,10 +1710,13 @@ void CHarvesterAO::ContextInitializationStatus( TInt aErrorCode ) { WRITELOG( "CHarvesterAO::ContextInitializationStatus()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_CONTEXTINITIALIZATIONSTATUS, "CHarvesterAO::ContextInitializationStatus" ); if ( KErrNone == aErrorCode ) { WRITELOG( "HarvesterThread::ContextInitializationStatus() - Succeeded!" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_CONTEXTINITIALIZATIONSTATUS, "CHarvesterAO::ContextInitializationStatus - Succeeded!" ); + iContextEngineInitialized = ETrue; if ( iMdeSessionInitialized ) { @@ -1609,6 +1726,8 @@ else { WRITELOG1( "HarvesterThread::ContextInitializationStatus() - Failed: %d!", aErrorCode ); + OstTrace1( TRACE_NORMAL, DUP2_CHARVESTERAO_CONTEXTINITIALIZATIONSTATUS, "CHarvesterAO::ContextInitializationStatus - Failed: %d!", aErrorCode ); + } } @@ -1619,6 +1738,7 @@ TInt CHarvesterAO::PauseHarvester() { WRITELOG( "CHarvesterAO::PauseHarvester()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_PAUSEHARVESTER, "CHarvesterAO::PauseHarvester" ); iHarvesterPluginFactory->PauseHarvester( ETrue ); iServerPaused = ETrue; @@ -1630,7 +1750,8 @@ // Everything is paused WRITELOG( "CHarvesterAO::PauseHarvester() - Moving paused state paused" ); - + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_PAUSEHARVESTER, "CHarvesterAO::PauseHarvester - Moving paused state paused" ); + return KErrNone; } @@ -1641,6 +1762,7 @@ void CHarvesterAO::ResumeHarvesterL() { WRITELOG( "CHarvesterAO::ResumeHarvesterL()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_RESUMEHARVESTERL, "CHarvesterAO::ResumeHarvesterL" ); iHarvesterPluginFactory->PauseHarvester( EFalse ); iServerPaused = EFalse; @@ -1661,6 +1783,8 @@ void CHarvesterAO::RunL() { WRITELOG( "CHarvesterAO::RunL" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_RUNL, "CHarvesterAO::RunL" ); + // check if pause is requested if ( this->iServerPaused && iNextRequest != ERequestPause && iNextRequest != ERequestResume) { @@ -1679,6 +1803,8 @@ case ERequestIdle: { WRITELOG( "CHarvesterAO::RunL - ERequestIdle" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_RUNL, "CHarvesterAO::RunL - ERequestIdle" ); + iReadyPHArray.Compress(); iContainerPHArray.Compress(); iPHArray.Compress(); @@ -1690,6 +1816,7 @@ case ERequestHarvest: { WRITELOG( "CHarvesterAO::RunL - ERequestHarvest" ); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTERAO_RUNL, "CHarvesterAO::RunL - ERequestHarvest" ); // harvest new items first... if ( iQueue->ItemsInQueue() > 0 ) @@ -1735,6 +1862,7 @@ { #ifdef _DEBUG WRITELOG1("CHarvesterAO::RunL - items in ready pharray: %d", arrayCount ); + OstTrace1( TRACE_NORMAL, DUP3_CHARVESTERAO_RUNL, "CHarvesterAO::RunL - items in ready pharray: %d", arrayCount ); #endif TInt endIndex( KPlaceholderQueueSize ); if( arrayCount < KPlaceholderQueueSize ) @@ -1770,7 +1898,9 @@ { #ifdef _DEBUG WRITELOG( "CHarvesterAO::RunL - ERequestContainerPlaceholder" ); + OstTrace0( TRACE_NORMAL, DUP4_CHARVESTERAO_RUNL, "CHarvesterAO::RunL - ERequestContainerPlaceholder" ); WRITELOG1( "CHarvesterAO::RunL - Items in container pharray: %d", iContainerPHArray.Count() ); + OstTrace1( TRACE_NORMAL, DUP5_CHARVESTERAO_RUNL, "CHarvesterAO::RunL - Items in container pharray: %d", iContainerPHArray.Count() ); #endif TInt count = iContainerPHArray.Count() > KContainerPlaceholderQueueSize ? KContainerPlaceholderQueueSize : iContainerPHArray.Count(); TInt i = 0; @@ -1799,6 +1929,7 @@ case ERequestPause: { WRITELOG( "CHarvesterAO::RunL - ERequestPause" ); + OstTrace0( TRACE_NORMAL, DUP6_CHARVESTERAO_RUNL, "CHarvesterAO::RunL - ERequestPause" ); User::LeaveIfError( PauseHarvester() ); iHarvesterEventManager->SendEventL( EHEObserverTypeOverall, EHEStatePaused ); if( iHarvesterStatusObserver ) @@ -1812,6 +1943,7 @@ case ERequestResume: { WRITELOG( "CHarvesterAO::RunL - ERequestResume" ); + OstTrace0( TRACE_NORMAL, DUP7_CHARVESTERAO_RUNL, "CHarvesterAO::RunL - ERequestResume" ); ResumeHarvesterL(); iHarvesterEventManager->SendEventL( EHEObserverTypeOverall, EHEStateResumed ); if( iHarvesterStatusObserver ) @@ -1825,6 +1957,7 @@ default: { WRITELOG( "CHarvesterAO::RunL - Not supported request" ); + OstTrace0( TRACE_NORMAL, DUP8_CHARVESTERAO_RUNL, "CHarvesterAO::RunL - Not supported request" ); User::Leave( KErrNotSupported ); } break; @@ -1838,6 +1971,7 @@ void CHarvesterAO::DoCancel() { WRITELOG( "CHarvesterAO::DoCancel()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_DOCANCEL, "CHarvesterAO::DoCancel" ); } // --------------------------------------------------------------------------- @@ -1847,17 +1981,22 @@ TInt CHarvesterAO::RunError( TInt aError ) { WRITELOG( "CHarvesterAO::RunError" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_RUNERROR, "CHarvesterAO::RunError" ); + switch( iNextRequest ) { case ERequestHarvest: { WRITELOG( "CHarvesterAO::RunError - state ERequestHarvest" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_RUNERROR, "CHarvesterAO::RunError - state ERequestHarvest" ); } break; case ERequestPause: { WRITELOG( "CHarvesterAO::RunError - state ERequestPause" ); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTERAO_RUNERROR, "CHarvesterAO::RunError - state ERequestPause" ); + if ( aError == KErrNotReady ) { SetNextRequest( ERequestPause ); @@ -1872,6 +2011,8 @@ case ERequestResume: { WRITELOG( "CHarvesterAO::RunError - state ERequestResume" ); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTERAO_RUNERROR, "CHarvesterAO::RunError - state ERequestResume" ); + if( iHarvesterStatusObserver ) { iHarvesterStatusObserver->ResumeReady( aError ); @@ -1882,6 +2023,7 @@ default: { WRITELOG( "CHarvesterAO::RunError - unknown state" ); + OstTrace0( TRACE_NORMAL, DUP4_CHARVESTERAO_RUNERROR, "CHarvesterAO::RunError - unknown state" ); } break; } @@ -1896,6 +2038,8 @@ void CHarvesterAO::SetNextRequest( TRequest aRequest ) { WRITELOG( "CHarvesterAO::SetNextRequest" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_SETNEXTREQUEST, "CHarvesterAO::SetNextRequest" ); + iNextRequest = aRequest; if ( !IsActive() ) @@ -1914,6 +2058,8 @@ TBool CHarvesterAO::IsServerPaused() { WRITELOG( "CHarvesterAO::IsServerPaused" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_ISSERVERPAUSED, "CHarvesterAO::IsServerPaused" ); + return iServerPaused; } @@ -1927,6 +2073,8 @@ { // close blacklist database connection WRITELOG( "CHarvesterAO::BackupRestoreStart" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_BACKUPRESTORESTART, "CHarvesterAO::BackupRestoreStart" ); + iBlacklist->CloseDatabase(); } @@ -1940,6 +2088,8 @@ { // restart blacklist database connection WRITELOG( "CHarvesterAO::BackupRestoreReady" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_BACKUPRESTOREREADY, "CHarvesterAO::BackupRestoreReady" ); + iBlacklist->OpenDatabase(); } @@ -1951,14 +2101,18 @@ void CHarvesterAO::HandleDiskSpaceNotificationL( TDiskSpaceDirection aDiskSpaceDirection ) { WRITELOG("CHarvesterAO::HandleDiskSpaceNotificationL()"); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_HANDLEDISKSPACENOTIFICATIONL, "CHarvesterAO::HandleDiskSpaceNotificationL" ); + if( MMdSHarvesterDiskSpaceObserver::EMore == aDiskSpaceDirection ) { WRITELOG("CHarvesterAO::HandleDiskSpaceNotificationL() - disk full"); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_HANDLEDISKSPACENOTIFICATIONL, "CHarvesterAO::HandleDiskSpaceNotificationL - disk full" ); iDiskFull = EFalse; } else { WRITELOG("CHarvesterAO::HandleDiskSpaceNotificationL() - disk space available"); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTERAO_HANDLEDISKSPACENOTIFICATIONL, "CHarvesterAO::HandleDiskSpaceNotificationL - disk space available" ); iDiskFull = ETrue; if( iServerPaused ) { @@ -1987,6 +2141,8 @@ void CHarvesterAO::HarvestFile( const RMessage2& aMessage ) { WRITELOG( "CHarvesterAO::HarvestFile" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_HARVESTFILE, "CHarvesterAO::HarvestFile" ); + const TInt KParamUri = 0; const TInt KParamAlbumIds = 1; const TInt KParamAddLocation = 2; @@ -1997,6 +2153,8 @@ if ( ! uri ) { WRITELOG( "CHarvesterAO::HarvestFile - out of memory creating uri container" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_HARVESTFILE, "CHarvesterAO::HarvestFile - out of memory creating uri container" ); + if (!aMessage.IsNull()) { aMessage.Complete( KErrNoMemory ); @@ -2009,6 +2167,8 @@ if ( err != KErrNone ) { WRITELOG1( "CHarvesterAO::HarvestFile - error in reading aMessage (uri): %d", err ); + OstTrace1( TRACE_NORMAL, DUP2_CHARVESTERAO_HARVESTFILE, "CHarvesterAO::HarvestFile - error in reading aMessage (uri): %d", err ); + if (!aMessage.IsNull()) { aMessage.Complete( err ); @@ -2028,6 +2188,8 @@ if ( !albumIdBuf ) { WRITELOG( "CHarvesterAO::HarvestFile - error creating album id buffer." ); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTERAO_HARVESTFILE, "CHarvesterAO::HarvestFile - error creating album id buffer." ); + if (!aMessage.IsNull()) { aMessage.Complete( KErrNoMemory ); @@ -2041,6 +2203,7 @@ if ( err != KErrNone ) { WRITELOG1( "CHarvesterAO::HarvestFile - error in reading aMessage (albumIds): %d", err ); + OstTrace1( TRACE_NORMAL, DUP4_CHARVESTERAO_HARVESTFILE, "CHarvesterAO::HarvestFile - error in reading aMessage (albumIds): %d", err ); delete albumIdBuf; albumIdBuf = NULL; delete uri; @@ -2056,6 +2219,8 @@ if ( err != KErrNone ) { WRITELOG1( "CHarvesterAO::HarvestFile - error in reading album id array: %d", err ); + OstTrace1( TRACE_NORMAL, DUP5_CHARVESTERAO_HARVESTFILE, "CHarvesterAO::HarvestFile - error in reading album id array: %d", err ); + delete albumIdBuf; albumIdBuf = NULL; delete uri; @@ -2079,6 +2244,8 @@ albumIdBuf = NULL; WRITELOG1( "CHarvesterAO::HarvestFile - album id count: %d", albumIds.Count() ); + OstTrace1( TRACE_NORMAL, DUP6_CHARVESTERAO_HARVESTFILE, "CHarvesterAO::HarvestFile - album id count: %d", albumIds.Count() ); + } TBool addLocation; @@ -2087,6 +2254,8 @@ if ( err != KErrNone ) { WRITELOG1( "CHarvesterAO::HarvestFile - error in reading aMessage (addLocation): %d", err ); + OstTrace1( TRACE_NORMAL, DUP7_CHARVESTERAO_HARVESTFILE, "CHarvesterAO::HarvestFile - error in reading aMessage (addLocation): %d", err ); + delete uri; uri = NULL; if (!aMessage.IsNull()) @@ -2097,12 +2266,16 @@ } WRITELOG1( "RHarvesterClient::HarvestFile - add location: %d", addLocation ); + OstTrace1( TRACE_NORMAL, DUP8_CHARVESTERAO_HARVESTFILE, "CHarvesterAO::HarvestFile - add location: %d", addLocation ); + CHarvesterData* hd = NULL; TRAP( err, hd = CHarvesterData::NewL( uri ) ); if ( err != KErrNone || !hd ) { WRITELOG( "CHarvesterAO::HarvestFile - creating harvUri failed" ); + OstTrace0( TRACE_NORMAL, DUP9_CHARVESTERAO_HARVESTFILE, "CHarvesterAO::HarvestFile - creating harvUri failed" ); + albumIds.Close(); delete uri; uri = NULL; @@ -2129,6 +2302,7 @@ else { WRITELOG( "CHarvesterAO::HarvestFile - creating clientData failed" ); + OstTrace0( TRACE_NORMAL, DUP10_CHARVESTERAO_HARVESTFILE, "CHarvesterAO::HarvestFile - creating clientData failed" ); } if( iQueue ) @@ -2164,6 +2338,8 @@ void CHarvesterAO::HarvestFileWithUID( const RMessage2& aMessage ) { WRITELOG( "CHarvesterAO::HarvestFileWithUID" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_HARVESTFILEWITHUID, "CHarvesterAO::HarvestFileWithUID" ); + const TInt KParamUri = 0; const TInt KParamAlbumIds = 1; const TInt KParamAddLocation = 2; @@ -2174,6 +2350,8 @@ if ( ! uri ) { WRITELOG( "CHarvesterAO::HarvestFileWithUID - out of memory creating uri container" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_HARVESTFILEWITHUID, "CHarvesterAO::HarvestFileWithUID - out of memory creating uri container" ); + if (!aMessage.IsNull()) { aMessage.Complete( KErrNoMemory ); @@ -2186,6 +2364,8 @@ if ( err != KErrNone ) { WRITELOG1( "CHarvesterAO::HarvestFileWithUID - error in reading aMessage (uri): %d", err ); + OstTrace1( TRACE_NORMAL, DUP2_CHARVESTERAO_HARVESTFILEWITHUID, "CHarvesterAO::HarvestFileWithUID - error in reading aMessage (uri): %d", err ); + if (!aMessage.IsNull()) { aMessage.Complete( err ); @@ -2205,6 +2385,8 @@ if ( !albumIdBuf ) { WRITELOG( "CHarvesterAO::HarvestFileWithUID - error creating album id buffer." ); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTERAO_HARVESTFILEWITHUID, "CHarvesterAO::HarvestFileWithUID - error creating album id buffer." ); + if (!aMessage.IsNull()) { aMessage.Complete( KErrNoMemory ); @@ -2218,6 +2400,8 @@ if ( err != KErrNone ) { WRITELOG1( "CHarvesterAO::HarvestFileWithUID - error in reading aMessage (albumIds): %d", err ); + OstTrace1( TRACE_NORMAL, DUP4_CHARVESTERAO_HARVESTFILEWITHUID, "CHarvesterAO::HarvestFileWithUID - error in reading aMessage (albumIds): %d", err ); + delete albumIdBuf; albumIdBuf = NULL; delete uri; @@ -2233,6 +2417,8 @@ if ( err != KErrNone ) { WRITELOG1( "CHarvesterAO::HarvestFileWithUID - error in reading album id array: %d", err ); + OstTrace1( TRACE_NORMAL, DUP5_CHARVESTERAO_HARVESTFILEWITHUID, "CHarvesterAO::HarvestFileWithUID - error in reading album id array: %d", err ); + delete albumIdBuf; albumIdBuf = NULL; delete uri; @@ -2257,6 +2443,7 @@ #ifdef _DEBUG WRITELOG1( "CHarvesterAO::HarvestFileWithUID - album id count: %d", albumIds.Count() ); + OstTrace1( TRACE_NORMAL, DUP6_CHARVESTERAO_HARVESTFILEWITHUID, "CHarvesterAO::HarvestFileWithUID - album id count: %d", albumIds.Count() ); #endif } @@ -2266,6 +2453,8 @@ if ( err != KErrNone ) { WRITELOG1( "CHarvesterAO::HarvestFileWithUID - error in reading aMessage (addLocation): %d", err ); + OstTrace1( TRACE_NORMAL, DUP7_CHARVESTERAO_HARVESTFILEWITHUID, "CHarvesterAO::HarvestFileWithUID - error in reading aMessage (addLocation): %d", err ); + delete uri; uri = NULL; if (!aMessage.IsNull()) @@ -2276,12 +2465,16 @@ } WRITELOG1( "RHarvesterClient::HarvestFileWithUID - add location: %d", addLocation ); + OstTrace1( TRACE_NORMAL, DUP8_CHARVESTERAO_HARVESTFILEWITHUID, "CHarvesterAO::HarvestFileWithUID - add location: %d", addLocation ); + CHarvesterData* hd = NULL; TRAP( err, hd = CHarvesterData::NewL( uri ) ); if ( err != KErrNone || !hd ) { WRITELOG( "CHarvesterAO::HarvestFileWithUID - creating harvUri failed" ); + OstTrace0( TRACE_NORMAL, DUP9_CHARVESTERAO_HARVESTFILEWITHUID, "CHarvesterAO::HarvestFileWithUID - creating harvUri failed" ); + albumIds.Close(); delete uri; uri = NULL; @@ -2308,6 +2501,7 @@ else { WRITELOG( "CHarvesterAO::HarvestFileWithUID - creating clientData failed" ); + OstTrace0( TRACE_NORMAL, DUP10_CHARVESTERAO_HARVESTFILEWITHUID, "CHarvesterAO::HarvestFileWithUID - creating clientData failed" ); } if( iQueue ) @@ -2341,10 +2535,13 @@ void CHarvesterAO::RegisterProcessOrigin( const RMessage2& aMessage ) { WRITELOG( "CHarvesterAO::RegisterProcessOrigin" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_REGISTERPROCESSORIGIN, "CHarvesterAO::RegisterProcessOrigin" ); if ( !iProcessOriginMapper ) { WRITELOG( "CHarvesterAO::RegisterProcessOrigin - mapper not available." ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_REGISTERPROCESSORIGIN, "CHarvesterAO::RegisterProcessOrigin - mapper not available." ); + if (!aMessage.IsNull()) { aMessage.Complete( KErrNotSupported ); @@ -2357,6 +2554,8 @@ if ( MdsUtils::IsValidProcessId( processId ) ) { WRITELOG1( "CHarvesterAO::RegisterProcessOrigin - error reading processId. Read: %d", processId.iUid ); + OstTrace1( TRACE_NORMAL, DUP2_CHARVESTERAO_REGISTERPROCESSORIGIN, "CHarvesterAO::RegisterProcessOrigin - error reading processId. Read: %d", processId.iUid ); + if (!aMessage.IsNull()) { aMessage.Complete( KErrCorrupt ); @@ -2368,9 +2567,13 @@ TOrigin origin = STATIC_CAST( TOrigin, aMessage.Int1() ); WRITELOG1( "CHarvesterAO::RegisterProcessOrigin - origin: %d", origin ); + OstTrace1( TRACE_NORMAL, DUP3_CHARVESTERAO_REGISTERPROCESSORIGIN, "CHarvesterAO::RegisterProcessOrigin - origin: %d", origin ); + if ( origin < 0 ) { WRITELOG( "CHarvesterAO::RegisterProcessOrigin - error reading origin from aMessage (negative)." ); + OstTrace0( TRACE_NORMAL, DUP4_CHARVESTERAO_REGISTERPROCESSORIGIN, "CHarvesterAO::RegisterProcessOrigin - error reading origin from aMessage (negative)." ); + if (!aMessage.IsNull()) { aMessage.Complete( KErrCorrupt ); @@ -2382,6 +2585,8 @@ if ( err != KErrNone ) { WRITELOG1( "CHarvesterAO::RegisterProcessOrigin - error registering mapping: %d", err ); + OstTrace1( TRACE_NORMAL, DUP5_CHARVESTERAO_REGISTERPROCESSORIGIN, "CHarvesterAO::RegisterProcessOrigin - error registering mapping: %d", err ); + if (!aMessage.IsNull()) { aMessage.Complete( err ); @@ -2401,10 +2606,13 @@ void CHarvesterAO::UnregisterProcessOrigin( const RMessage2& aMessage ) { WRITELOG( "CHarvesterAO::UnregisterProcessOrigin" ); - + OstTrace0( TRACE_NORMAL, CHARVESTERAO_UNREGISTERPROCESSORIGIN, "CHarvesterAO::UnregisterProcessOrigin" ); + if ( !iProcessOriginMapper ) { WRITELOG( "CHarvesterAO::RegisterProcessOrigin - mapper not available." ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_UNREGISTERPROCESSORIGIN, "CHarvesterAO::UnregisterProcessOrigin - mapper not available." ); + if (!aMessage.IsNull()) { aMessage.Complete( KErrNotSupported ); @@ -2417,6 +2625,8 @@ if ( MdsUtils::IsValidProcessId( processId ) ) { WRITELOG1( "CHarvesterAO::UnregisterProcessOrigin - error reading processId. Read: %d", processId.iUid ); + OstTrace1( TRACE_NORMAL, DUP2_CHARVESTERAO_UNREGISTERPROCESSORIGIN, "CHarvesterAO::UnregisterProcessOrigin - error reading processId. Read: %d", processId.iUid ); + if (!aMessage.IsNull()) { aMessage.Complete( KErrCorrupt ); @@ -2428,6 +2638,8 @@ if ( err != KErrNone ) { WRITELOG1( "CHarvesterAO::UnregisterProcessOrigin - error unregistering mapping: %d", err ); + OstTrace1( TRACE_NORMAL, DUP3_CHARVESTERAO_UNREGISTERPROCESSORIGIN, "CHarvesterAO::UnregisterProcessOrigin - error unregistering mapping: %d", err ); + if (!aMessage.IsNull()) { aMessage.Complete( err ); @@ -2447,7 +2659,8 @@ TInt CHarvesterAO::RegisterHarvestComplete( const CHarvesterServerSession& aSession, const RMessage2& aMessage ) { WRITELOG( "CHarvesterAO::RegisterHarvestComplete" ); - + OstTrace0( TRACE_NORMAL, CHARVESTERAO_REGISTERHARVESTCOMPLETE, "CHarvesterAO::RegisterHarvestComplete" ); + return iHarvestFileMessages.Append( THarvestFileRequest( aSession, aMessage ) ); } @@ -2459,6 +2672,7 @@ TInt CHarvesterAO::UnregisterHarvestComplete( const CHarvesterServerSession& aSession ) { WRITELOG( "CHarvesterAO::UnregisterHarvestComplete" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_UNREGISTERHARVESTCOMPLETE, "CHarvesterAO::UnregisterHarvestComplete" ); TInt err( KErrNotFound ); if ( iHarvestFileMessages.Count() > 0 ) @@ -2502,6 +2716,7 @@ void CHarvesterAO::RegisterHarvesterEvent( const RMessage2& aMessage ) { WRITELOG( "CHarvesterAO::RegisterHarvesterEvent" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_REGISTERHARVESTEREVENT, "CHarvesterAO::RegisterHarvesterEvent" ); TRAPD( err, iHarvesterEventManager->RegisterEventObserverL( aMessage ) ); aMessage.Complete( err ); @@ -2514,6 +2729,7 @@ void CHarvesterAO::UnregisterHarvesterEvent( const RMessage2& aMessage ) { WRITELOG( "CHarvesterAO::UnregisterHarvesterEvent" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_UNREGISTERHARVESTEREVENT, "CHarvesterAO::UnregisterHarvesterEvent" ); const TInt err = iHarvesterEventManager->UnregisterEventObserver( aMessage ); aMessage.Complete( err ); @@ -2522,6 +2738,7 @@ void CHarvesterAO::GetLastObserverId( const RMessage2& aMessage ) { WRITELOG( "CHarvesterAO::GetLastObserverId" ); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_GETLASTOBSERVERID, "CHarvesterAO::GetLastObserverId" ); TUint observerId = iHarvesterEventManager->GetLastClientId(); @@ -2537,24 +2754,29 @@ void CHarvesterAO::ContextSnapshotStatus( CHarvesterData* aHD ) { WRITELOG( "CHarvesterAO::ContextSnapshotStatus()" ); - + OstTrace0( TRACE_NORMAL, CHARVESTERAO_CONTEXTSNAPSHOTSTATUS, "CHarvesterAO::ContextSnapshotStatus" ); + HarvestCompleted( aHD->ClientId(), aHD->Uri(), aHD->ErrorCode() ); const TInt errorCode = aHD->ErrorCode(); if( errorCode != KErrNone && errorCode != KErrCompletion ) { - WRITELOG1( "CHarvesterAO::ContextSnapshotStatus() - error occurred: %d", errorCode ); + WRITELOG1( "CHarvesterAO::ContextSnapshotStatus() - error occurred: %d", errorCode ); + OstTrace1( TRACE_NORMAL, DUP1_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS, "CHarvesterAO::ContextSnapshotStatus - error occurred: %d", errorCode ); } else { if( errorCode == KErrCompletion ) { WRITELOG( "CHarvesterAO::ContextSnapshotStatus() - snapshot could not be completed" ); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS, "CHarvesterAO::ContextSnapshotStatus - snapshot could not be completed" ); WRITELOG( "CHarvesterAO::ContextSnapshotStatus() - processing non-context data anyway" ); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS, "CHarvesterAO::ContextSnapshotStatus - processing non-context data anyway" ); } else { WRITELOG( "CHarvesterAO::ContextSnapshotStatus() - successfully completed" ); + OstTrace0( TRACE_NORMAL, DUP4_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS, "CHarvesterAO::ContextSnapshotStatus - successfully completed" ); } if( aHD->Origin() == MdeConstants::Object::ECamera ) { @@ -2566,6 +2788,7 @@ WRITELOG( "==============================ERROR===============================" ); WRITELOG( "CHarvesterAO::HarvestingCompleted() - cannot set metadata object" ); WRITELOG( "==============================ERROR done =========================" ); + OstTrace0( TRACE_NORMAL, DUP5_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS, "CHarvesterAO::ContextSnapshotStatus - cannot set metadata object" ); } } } @@ -2598,6 +2821,8 @@ if ( aClientId == msg.Identity() ) { WRITELOG1( "CHarvesterAO::HarvestingCompleted() - Completing Fast Harvest request! Error code: %d", aErr ); + OstTrace1( TRACE_NORMAL, CHARVESTERAO_HARVESTCOMPLETED, "CHarvesterAO::HarvestCompleted - Completing Fast Harvest request! Error code: %d", aErr ); + if (!msg.IsNull()) { msg.Write( KParamUri, aUri ); @@ -2606,6 +2831,7 @@ else { WRITELOG("CHarvesterAO::HarvestingCompleted() NOT COMPLETING AS msg->iMessage->IsNull returns ETrue"); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_HARVESTCOMPLETED, "CHarvesterAO::HarvestCompleted NOT COMPLETING AS msg->iMessage->IsNull returns ETrue" ); } iHarvestFileMessages.Remove( i ); if( iHarvestFileMessages.Count() == 0 ) @@ -2620,6 +2846,7 @@ void CHarvesterAO::BootRomScanL() { WRITELOG("CHarvesterAO::BootRomScanL()"); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_BOOTROMSCANL, "CHarvesterAO::BootRomScanL" ); if( !iMdeSessionInitialized ) { @@ -2666,7 +2893,8 @@ iMdEHarvesterSession->ChangeCDriveMediaId(); WRITELOG("CHarvesterAO::BootPartialRestoreScanL() - partial restore"); - + OstTrace0( TRACE_NORMAL, CHARVESTERAO_BOOTPARTIALRESTORESCANL, "CHarvesterAO::BootPartialRestoreScanL - partial restore" ); + RPointerArray scanItems; TCleanupItem cleanupItem( MdsUtils::CleanupPtrArray, &scanItems ); CleanupStack::PushL( cleanupItem ); @@ -2682,6 +2910,8 @@ BootScanL( scanItems, ignorePaths, EFalse ); WRITELOG("CHarvesterAO::BootPartialRestoreScanL() - iRestoreWatcher->UnregisterL()"); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERAO_BOOTPARTIALRESTORESCANL, "CHarvesterAO::BootPartialRestoreScanL - iRestoreWatcher->UnregisterL()" ); + iRestoreWatcher->UnregisterL(); CleanupStack::PopAndDestroy( &ignorePaths ); @@ -2710,8 +2940,8 @@ TBool aCheckDrive ) { WRITELOG("CHarvesterAO::BootScanL() - begin"); - - + OstTrace0( TRACE_NORMAL, CHARVESTERAO_BOOTSCANL, "CHarvesterAO::BootScanL - begin" ); + TInt drive( -1 ); TInt massStorageError( DriveInfo::GetDefaultDrive( DriveInfo::EDefaultMassStorage, drive ) ); if( massStorageError == KErrNone ) @@ -2740,6 +2970,7 @@ #ifdef _DEBUG WRITELOG1("CHarvesterAO::BootScanL() - item count: %d", aScanItems.Count() ); + OstTrace1( TRACE_NORMAL, DUP1_CHARVESTERAO_BOOTSCANL, "CHarvesterAO::BootScanL - item count: %d", aScanItems.Count() ); #endif RPointerArray hdArray; @@ -2808,6 +3039,7 @@ if( !IsDescInArray( path, aIgnorePaths ) ) { WRITELOG("CHarvesterAO::BootScanL() - scanFolders.AppendL"); + OstTrace0( TRACE_NORMAL, DUP2_CHARVESTERAO_BOOTSCANL, "CHarvesterAO::BootScanL - scanFolders.AppendL" ); TScanItem* item = new (ELeave) TScanItem(); item->iPath = name->AllocL(); item->iPreinstalled = MdeConstants::MediaObject::ENotPreinstalled; @@ -2824,6 +3056,7 @@ if( !IsDescInArray( filename, aIgnorePaths ) ) { WRITELOG("CHarvesterAO::BootScanL() - check files"); + OstTrace0( TRACE_NORMAL, DUP3_CHARVESTERAO_BOOTSCANL, "CHarvesterAO::BootScanL - check files" ); RArray uris; RArray fileInfos; @@ -2888,6 +3121,8 @@ } WRITELOG("CHarvesterAO::BootScanL() - iQueue->Append"); + OstTrace0( TRACE_NORMAL, DUP4_CHARVESTERAO_BOOTSCANL, "CHarvesterAO::BootScanL - iQueue->Append" ); + iQueue->MonitorEvent( hdArray ); CleanupStack::PopAndDestroy( &hdArray ); @@ -2896,6 +3131,7 @@ iMassMemoryIdChecked = ETrue; WRITELOG("CHarvesterAO::BootScanL() - end"); + OstTrace0( TRACE_NORMAL, DUP5_CHARVESTERAO_BOOTSCANL, "CHarvesterAO::BootScanL - end" ); } void CHarvesterAO::SetHarvesterStatusObserver( MHarvesterStatusObserver* aObserver ) @@ -2973,6 +3209,8 @@ void CHarvesterAO::MemoryLow() { WRITELOG("CHarvesterAO::MemoryLow()"); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_MEMORYLOW, "CHarvesterAO::MemoryLow" ); + iRamFull = ETrue; if( iServerPaused ) @@ -2992,6 +3230,8 @@ void CHarvesterAO::MemoryGood() { WRITELOG("CHarvesterAO::MemoryGood()"); + OstTrace0( TRACE_NORMAL, CHARVESTERAO_MEMORYGOOD, "CHarvesterAO::MemoryGood" ); + iRamFull = EFalse; if( !iDiskFull && !iManualPauseEnabled && iServerPaused ) diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/server/src/harvesterserver.cpp --- a/harvester/server/src/harvesterserver.cpp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/server/src/harvesterserver.cpp Thu Jul 15 19:07:24 2010 +0300 @@ -25,6 +25,11 @@ #include "harvesterao.h" #include "harvesterblacklist.h" #include "mdsactivescheduler.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "harvesterserverTraces.h" +#endif + // ---------------------------------------------------------------------------------------- // Server's policy here @@ -194,6 +199,8 @@ void CHarvesterServer::ConstructL() { WRITELOG( "CHarvesterServer::ConstructL() - begin" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_CONSTRUCTL, "CHarvesterServer::ConstructL - begin" ); + StartL( KHarvesterServerName ); iHarvesterAO = CHarvesterAO::NewL(); @@ -207,6 +214,7 @@ // create shutdown observer iShutdownObserver = CHarvesterShutdownObserver::NewL( *this ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERSERVER_CONSTRUCTL, "CHarvesterServer::ConstructL - end" ); WRITELOG( "CHarvesterServer::ConstructL() - end" ); } @@ -217,6 +225,7 @@ void CHarvesterServer::Pause( const RMessage2& aMessage ) { WRITELOG( "CHarvesterServer::Pause() - begin" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_PAUSE, "CHarvesterServer::Pause" ); if ( !iHarvesterAO->IsServerPaused() ) { @@ -237,6 +246,7 @@ void CHarvesterServer::Resume( const RMessage2& aMessage ) { WRITELOG( "CHarvesterServer::Resume()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_RESUME, "CHarvesterServer::Resume" ); if ( iHarvesterAO->IsServerPaused() ) { @@ -256,7 +266,8 @@ void CHarvesterServer::Pause() { WRITELOG( "CHarvesterServer::Pause()" ); - + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERSERVER_PAUSE, "CHarvesterServer::Pause" ); + if ( !iHarvesterAO->IsServerPaused() ) { iHarvesterAO->SetNextRequest( CHarvesterAO::ERequestPause ); @@ -270,7 +281,8 @@ void CHarvesterServer::Resume() { WRITELOG( "CHarvesterServer::Resume()" ); - + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERSERVER_RESUME, "CHarvesterServer::Resume" ); + if ( iHarvesterAO->IsServerPaused() ) { iHarvesterAO->SetNextRequest( CHarvesterAO::ERequestResume ); @@ -281,6 +293,8 @@ void CHarvesterServer::PauseReady( TInt aError ) { WRITELOG1( "CHarvesterServer::PauseReady( %d )", aError ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_PAUSEREADY, "CHarvesterServer::PauseReady" ); + if( iMessage ) { iMessage->Complete( aError ); @@ -291,6 +305,8 @@ void CHarvesterServer::ResumeReady( TInt aError ) { WRITELOG1( "CHarvesterServer::ResumeReady( %d )", aError ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_RESUMEREADY, "CHarvesterServer::ResumeReady" ); + if( iMessage ) { iMessage->Complete( aError ); @@ -305,6 +321,8 @@ void CHarvesterServer::ShutdownNotification() { WRITELOG( "CHarvesterServer::ShutdownNotification" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_SHUTDOWNNOTIFICATION, "CHarvesterServer::ShutdownNotification" ); + CActiveScheduler::Stop(); } @@ -315,6 +333,8 @@ void CHarvesterServer::RestartNotification() { WRITELOG( "CHarvesterServer::RestartNotification" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_RESTARTNOTIFICATION, "CHarvesterServer::RestartNotification" ); + } @@ -325,6 +345,7 @@ void CHarvesterServer::HarvestFile( const RMessage2& aMessage ) { WRITELOG( "CHarvesterServer::HarvestFile()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_HARVESTFILE, "CHarvesterServer::HarvestFile" ); iHarvesterAO->HarvestFile( aMessage ); } @@ -336,6 +357,7 @@ void CHarvesterServer::HarvestFileWithUID( const RMessage2& aMessage ) { WRITELOG( "CHarvesterServer::HarvestFile()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_HARVESTFILEWITHUID, "CHarvesterServer::HarvestFileWithUID" ); iHarvesterAO->HarvestFileWithUID( aMessage ); } @@ -347,6 +369,7 @@ void CHarvesterServer::RegisterProcessOrigin( const RMessage2& aMessage ) { WRITELOG( "CHarvesterServer::RegisterProcessOrigin()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_REGISTERPROCESSORIGIN, "CHarvesterServer::RegisterProcessOrigin" ); iHarvesterAO->RegisterProcessOrigin( aMessage ); } @@ -358,6 +381,7 @@ void CHarvesterServer::UnregisterProcessOrigin( const RMessage2& aMessage ) { WRITELOG( "CHarvesterServer::UnregisterProcessOrigin()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_UNREGISTERPROCESSORIGIN, "CHarvesterServer::UnregisterProcessOrigin" ); iHarvesterAO->UnregisterProcessOrigin( aMessage ); } @@ -369,6 +393,7 @@ TInt CHarvesterServer::RegisterHarvestComplete( const CHarvesterServerSession& aSession, const RMessage2& aMessage ) { WRITELOG( "CHarvesterServer::RegisterHarvestComplete()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_REGISTERHARVESTCOMPLETE, "CHarvesterServer::RegisterHarvestComplete" ); return iHarvesterAO->RegisterHarvestComplete( aSession, aMessage ); } @@ -380,6 +405,7 @@ TInt CHarvesterServer::UnregisterHarvestComplete( const CHarvesterServerSession& aSession ) { WRITELOG( "CHarvesterServer::UnregisterHarvestComplete()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_UNREGISTERHARVESTCOMPLETE, "CHarvesterServer::UnregisterHarvestComplete" ); return iHarvesterAO->UnregisterHarvestComplete( aSession ); } @@ -391,6 +417,7 @@ void CHarvesterServer::RegisterHarvesterEvent( const RMessage2& aMessage ) { WRITELOG( "CHarvesterServer::RegisterHarvesterEvent()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_REGISTERHARVESTEREVENT, "CHarvesterServer::RegisterHarvesterEvent" ); iHarvesterAO->RegisterHarvesterEvent( aMessage ); } @@ -402,6 +429,7 @@ void CHarvesterServer::UnregisterHarvesterEvent( const RMessage2& aMessage ) { WRITELOG( "CHarvesterServer::UnregisterHarvesterEvent()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_UNREGISTERHARVESTEREVENT, "CHarvesterServer::UnregisterHarvesterEvent" ); iHarvesterAO->UnregisterHarvesterEvent( aMessage ); } @@ -413,9 +441,13 @@ CHarvesterServer::~CHarvesterServer() { WRITELOG( "CHarvesterServer::~CHarvesterServer()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_CHARVESTERSERVER, "CHarvesterServer::~CHarvesterServer" ); + delete iHarvesterAO; delete iPauseObserverAO; delete iShutdownObserver; + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERSERVER_CHARVESTERSERVER, "CHarvesterServer::~CHarvesterServer end" ); + WRITELOG( "CHarvesterServer::~CHarvesterServer() end" ); } @@ -427,6 +459,7 @@ const TDesC& aPanicDescription ) { WRITELOG( "CHarvesterServer::PanicClient()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_PANICCLIENT, "CHarvesterServer::PanicClient" ); aMessage.Panic( aPanicDescription, aPanic ); } @@ -438,6 +471,7 @@ void CHarvesterServer::PanicServer( TInt aPanic, const TDesC& aPanicDescription ) { WRITELOG( "CHarvesterServer::PanicServer() - begin" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_PANICSERVER, "CHarvesterServer::PanicServer" ); User::Panic( aPanicDescription, aPanic ); } @@ -450,7 +484,8 @@ const TVersion& aVersion, const RMessage2& ) const { WRITELOG( "CHarvesterServer::NewSessionL() - begin" ); - + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_NEWSESSIONL, "CHarvesterServer::NewSessionL" ); + //If there isn't connection to mde, we can't do much. Inform client about situation. //This doesn't leave on first client because Process::Rendezcvouz is called when mde:s //HandleSessionOpened is called. @@ -462,6 +497,8 @@ if ( iShutdownObserver->UpdateInProgress() ) { WRITELOG( "CHarvesterServer::NewSessionL - iad update in progress: KErrLocked"); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERSERVER_NEWSESSIONL, "CHarvesterServer::NewSessionL- iad update in progress: KErrLocked" ); + User::Leave(KErrLocked); } @@ -485,7 +522,8 @@ TInt CHarvesterServer::RunError( TInt aError ) { WRITELOG1( "CHarvesterServer::RunError - %d()", aError ); - + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_RUNERROR, "CHarvesterServer::RunError" ); + if ( aError == KErrBadDescriptor ) { // A bad descriptor error implies a badly programmed client, @@ -512,6 +550,7 @@ void CHarvesterServer::ThreadFunctionL() { WRITELOG( "CHarvesterServer::ThreadFunctionL() - begin" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_THREADFUNCTIONL, "CHarvesterServer::ThreadFunctionL - begin" ); User::LeaveIfError( User::RenameThread( KHarvesterServerName ) ); // Construct active scheduler @@ -532,6 +571,8 @@ CleanupStack::PopAndDestroy( 2, activeScheduler ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERSERVER_THREADFUNCTIONL, "CHarvesterServer::ThreadFunctionL - end" ); + WRITELOG( "CHarvesterServer::ThreadFunctionL() - end" ); } @@ -542,6 +583,7 @@ TInt CHarvesterServer::ThreadFunction( TAny* /*aNone*/ ) { WRITELOG( "CHarvesterServer::ThreadFunction() - TAny - begin" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVER_THREADFUNCTION, "CHarvesterServer::ThreadFunction - TAny - begin" ); CTrapCleanup* cleanupStack = CTrapCleanup::New(); if ( !cleanupStack ) @@ -556,6 +598,8 @@ delete cleanupStack; cleanupStack = NULL; } + + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERSERVER_THREADFUNCTION, "CHarvesterServer::ThreadFunction - TAny - end" ); WRITELOG( "CHarvesterServer::ThreadFunction() - TAny - end" ); return err; @@ -568,7 +612,8 @@ TInt E32Main() { WRITELOG( "CHarvesterServer::E32Main() - begin" ); - + OstTrace0( TRACE_NORMAL, _E32MAIN, "CHarvesterServer::E32Main() - begin" ); + __UHEAP_MARK; const TInt result = CHarvesterServer::ThreadFunction( NULL ); diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/server/src/harvesterserversession.cpp --- a/harvester/server/src/harvesterserversession.cpp Mon Jun 21 16:09:02 2010 +0300 +++ b/harvester/server/src/harvesterserversession.cpp Thu Jul 15 19:07:24 2010 +0300 @@ -18,6 +18,10 @@ #include "harvesterserversession.h" #include "harvestercommon.h" #include "harvesterlog.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "harvesterserversessionTraces.h" +#endif // ========================= MEMBER FUNCTIONS ================================== @@ -28,6 +32,7 @@ CHarvesterServerSession* CHarvesterServerSession::NewL( CHarvesterServer& aServer ) { WRITELOG( "CHarvesterServerSession::NewL()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVERSESSION_NEWL, "CHarvesterServerSession::NewL" ); CHarvesterServerSession* self = CHarvesterServerSession::NewLC( aServer ); CleanupStack::Pop( self ); @@ -41,6 +46,7 @@ CHarvesterServerSession* CHarvesterServerSession::NewLC( CHarvesterServer& aServer ) { WRITELOG( "CHarvesterServerSession::NewLC()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVERSESSION_NEWLC, "CHarvesterServerSession::NewLC" ); CHarvesterServerSession* self = new ( ELeave ) CHarvesterServerSession( aServer ); CleanupStack::PushL( self ); @@ -55,6 +61,8 @@ void CHarvesterServerSession::ConstructL() { WRITELOG( "CHarvesterServerSession::ConstructL()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVERSESSION_CONSTRUCTL, "CHarvesterServerSession::ConstructL" ); + } // --------------------------------------------------------------------------- @@ -65,6 +73,8 @@ : iServer( aServer ) { WRITELOG( "CHarvesterServerSession::CHarvesterServerSession()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVERSESSION_CHARVESTERSERVERSESSION, "CHarvesterServerSession::CHarvesterServerSession" ); + } // --------------------------------------------------------------------------- @@ -74,6 +84,8 @@ CHarvesterServerSession::~CHarvesterServerSession() { WRITELOG( "CHarvesterServerSession::~CHarvesterServerSession()" ); + OstTrace0( TRACE_NORMAL, DUP1_CHARVESTERSERVERSESSION_CHARVESTERSERVERSESSION, "CHarvesterServerSession::~CHarvesterServerSession" ); + } // --------------------------------------------------------------------------- @@ -83,6 +95,7 @@ void CHarvesterServerSession::ServiceL( const RMessage2& aMessage ) { WRITELOG( "CHarvesterServerSession::ServiceL()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVERSESSION_SERVICEL, "CHarvesterServerSession::ServiceL" ); /* Command can't be negative */ if ( aMessage.Function() < 0 ) @@ -204,6 +217,7 @@ { //just make sure the server is cleaned after client crash WRITELOG( "CHarvesterServerSession::Disconnect()" ); + OstTrace0( TRACE_NORMAL, CHARVESTERSERVERSESSION_DISCONNECT, "CHarvesterServerSession::Disconnect" ); iServer.UnregisterHarvestComplete( *this ); diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/server/traces/OstTraceDefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/server/traces/OstTraceDefinitions.h Thu Jul 15 19:07:24 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 9422ed56ee45 -r 63c982fb92f2 harvester/server/traces/fixed_id.definitions --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/server/traces/fixed_id.definitions Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,197 @@ +#Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt. +[GROUP]TRACE_NORMAL=0x3 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_BACKUPRESTOREREADY=0x63 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_BACKUPRESTORESTART=0x62 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_BOOTPARTIALRESTORESCANL=0x95 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_BOOTROMSCANL=0x94 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_BOOTSCANL=0x97 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_CHARVESTERAO=0x3 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL=0x26 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_CONSTRUCTL=0x5 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_CONTEXTINITIALIZATIONSTATUS=0x4b +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS=0x8c +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_DELETECOMPOSERS=0x1f +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_DELETEMONITORPLUGINS=0x9 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_DOCANCEL=0x5a +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_GETLASTOBSERVERID=0x8b +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_HANDLEDISKSPACENOTIFICATIONL=0x64 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_HANDLEPLACEHOLDERSL=0x22 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_HANDLESESSIONERROR=0x4a +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_HANDLESESSIONOPENED=0x3c +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_HANDLEUNMOUNT=0x10 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_HARVESTCOMPLETED=0x92 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_HARVESTFILE=0x67 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_HARVESTFILEWITHUID=0x72 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_HARVESTINGCOMPLETED=0x2f +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_ISCOMPOSINGREADY=0x20 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_ISSERVERPAUSED=0x61 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_LOADMONITORPLUGINSL=0x7 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_MEMORYGOOD=0x9e +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_MEMORYLOW=0x9d +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_NEWL=0x2 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_NEWLC=0x1 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_PAUSEHARVESTER=0x4e +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_PAUSEMONITORING=0xd +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_READITEMFROMQUEUEL=0x21 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_REGISTERHARVESTCOMPLETE=0x87 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_REGISTERHARVESTEREVENT=0x89 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_REGISTERPROCESSORIGIN=0x7d +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_RESUMEHARVESTERL=0x50 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_RESUMEMONITORING=0xf +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_RUNERROR=0x5b +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_RUNL=0x51 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_SETNEXTREQUEST=0x60 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_STARTCOMPOSERSL=0x1d +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_STARTMONITORING=0xb +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_STOPCOMPOSERS=0x1e +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_STOPMONITORING=0xc +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_UNREGISTERHARVESTCOMPLETE=0x88 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_UNREGISTERHARVESTEREVENT=0x8a +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERAO_UNREGISTERPROCESSORIGIN=0x83 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVERSESSION_CHARVESTERSERVERSESSION=0xc0 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVERSESSION_CONSTRUCTL=0xbf +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVERSESSION_DISCONNECT=0xc3 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVERSESSION_NEWL=0xbd +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVERSESSION_NEWLC=0xbe +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVERSESSION_SERVICEL=0xc2 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_CHARVESTERSERVER=0xb1 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_CONSTRUCTL=0x9f +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_HARVESTFILE=0xa9 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_HARVESTFILEWITHUID=0xaa +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_NEWSESSIONL=0xb5 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_PANICCLIENT=0xb3 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_PANICSERVER=0xb4 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_PAUSE=0xa1 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_PAUSEREADY=0xa5 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_REGISTERHARVESTCOMPLETE=0xad +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_REGISTERHARVESTEREVENT=0xaf +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_REGISTERPROCESSORIGIN=0xab +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_RESTARTNOTIFICATION=0xa8 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_RESUME=0xa2 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_RESUMEREADY=0xa6 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_RUNERROR=0xb7 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_SHUTDOWNNOTIFICATION=0xa7 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_THREADFUNCTION=0xba +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_THREADFUNCTIONL=0xb8 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_UNREGISTERHARVESTCOMPLETE=0xae +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_UNREGISTERHARVESTEREVENT=0xb0 +[TRACE]TRACE_NORMAL[0x3]_CHARVESTERSERVER_UNREGISTERPROCESSORIGIN=0xac +[TRACE]TRACE_NORMAL[0x3]_DUP10_CHARVESTERAO_HANDLESESSIONOPENED=0x46 +[TRACE]TRACE_NORMAL[0x3]_DUP10_CHARVESTERAO_HANDLEUNMOUNT=0x19 +[TRACE]TRACE_NORMAL[0x3]_DUP10_CHARVESTERAO_HARVESTFILE=0x71 +[TRACE]TRACE_NORMAL[0x3]_DUP10_CHARVESTERAO_HARVESTFILEWITHUID=0x7c +[TRACE]TRACE_NORMAL[0x3]_DUP10_CHARVESTERAO_HARVESTINGCOMPLETED=0x39 +[TRACE]TRACE_NORMAL[0x3]_DUP11_CHARVESTERAO_HANDLESESSIONOPENED=0x47 +[TRACE]TRACE_NORMAL[0x3]_DUP11_CHARVESTERAO_HANDLEUNMOUNT=0x1a +[TRACE]TRACE_NORMAL[0x3]_DUP11_CHARVESTERAO_HARVESTINGCOMPLETED=0x3a +[TRACE]TRACE_NORMAL[0x3]_DUP12_CHARVESTERAO_HANDLESESSIONOPENED=0x48 +[TRACE]TRACE_NORMAL[0x3]_DUP12_CHARVESTERAO_HANDLEUNMOUNT=0x1b +[TRACE]TRACE_NORMAL[0x3]_DUP12_CHARVESTERAO_HARVESTINGCOMPLETED=0x3b +[TRACE]TRACE_NORMAL[0x3]_DUP13_CHARVESTERAO_HANDLESESSIONOPENED=0x49 +[TRACE]TRACE_NORMAL[0x3]_DUP13_CHARVESTERAO_HANDLEUNMOUNT=0x1c +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_BOOTPARTIALRESTORESCANL=0x96 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_BOOTSCANL=0x98 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_CHARVESTERAO=0x4 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL=0x27 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_CONSTRUCTL=0x6 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_CONTEXTINITIALIZATIONSTATUS=0x4c +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS=0x8d +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_DELETEMONITORPLUGINS=0xa +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_HANDLEDISKSPACENOTIFICATIONL=0x65 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_HANDLEPLACEHOLDERSL=0x23 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_HANDLESESSIONOPENED=0x3d +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_HANDLEUNMOUNT=0x11 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_HARVESTCOMPLETED=0x93 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_HARVESTFILE=0x68 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_HARVESTFILEWITHUID=0x73 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_HARVESTINGCOMPLETED=0x38 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_LOADMONITORPLUGINSL=0x8 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_PAUSEHARVESTER=0x4f +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_PAUSEMONITORING=0xe +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_REGISTERPROCESSORIGIN=0x7e +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_RUNERROR=0x5c +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_RUNL=0x52 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERAO_UNREGISTERPROCESSORIGIN=0x84 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERSERVERSESSION_CHARVESTERSERVERSESSION=0xc1 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERSERVER_CHARVESTERSERVER=0xb2 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERSERVER_CONSTRUCTL=0xa0 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERSERVER_NEWSESSIONL=0xb6 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERSERVER_PAUSE=0xa3 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERSERVER_RESUME=0xa4 +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERSERVER_THREADFUNCTION=0xbb +[TRACE]TRACE_NORMAL[0x3]_DUP1_CHARVESTERSERVER_THREADFUNCTIONL=0xb9 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_BOOTSCANL=0x99 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL=0x28 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_CONTEXTINITIALIZATIONSTATUS=0x4d +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS=0x8e +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_HANDLEDISKSPACENOTIFICATIONL=0x66 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_HANDLEPLACEHOLDERSL=0x24 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_HANDLESESSIONOPENED=0x3e +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_HANDLEUNMOUNT=0x12 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_HARVESTFILE=0x69 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_HARVESTFILEWITHUID=0x74 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_HARVESTINGCOMPLETED=0x30 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_REGISTERPROCESSORIGIN=0x7f +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_RUNERROR=0x5d +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_RUNL=0x53 +[TRACE]TRACE_NORMAL[0x3]_DUP2_CHARVESTERAO_UNREGISTERPROCESSORIGIN=0x85 +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_BOOTSCANL=0x9a +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL=0x29 +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS=0x8f +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_HANDLEPLACEHOLDERSL=0x25 +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_HANDLESESSIONOPENED=0x3f +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_HANDLEUNMOUNT=0x13 +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_HARVESTFILE=0x6a +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_HARVESTFILEWITHUID=0x75 +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_HARVESTINGCOMPLETED=0x31 +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_REGISTERPROCESSORIGIN=0x80 +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_RUNERROR=0x5e +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_RUNL=0x54 +[TRACE]TRACE_NORMAL[0x3]_DUP3_CHARVESTERAO_UNREGISTERPROCESSORIGIN=0x86 +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTERAO_BOOTSCANL=0x9b +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL=0x2a +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS=0x90 +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTERAO_HANDLESESSIONOPENED=0x40 +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTERAO_HANDLEUNMOUNT=0x14 +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTERAO_HARVESTFILE=0x6b +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTERAO_HARVESTFILEWITHUID=0x76 +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTERAO_HARVESTINGCOMPLETED=0x32 +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTERAO_REGISTERPROCESSORIGIN=0x81 +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTERAO_RUNERROR=0x5f +[TRACE]TRACE_NORMAL[0x3]_DUP4_CHARVESTERAO_RUNL=0x55 +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTERAO_BOOTSCANL=0x9c +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL=0x2b +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS=0x91 +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTERAO_HANDLESESSIONOPENED=0x41 +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTERAO_HANDLEUNMOUNT=0x15 +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTERAO_HARVESTFILE=0x6c +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTERAO_HARVESTFILEWITHUID=0x77 +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTERAO_HARVESTINGCOMPLETED=0x33 +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTERAO_REGISTERPROCESSORIGIN=0x82 +[TRACE]TRACE_NORMAL[0x3]_DUP5_CHARVESTERAO_RUNL=0x56 +[TRACE]TRACE_NORMAL[0x3]_DUP6_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL=0x2c +[TRACE]TRACE_NORMAL[0x3]_DUP6_CHARVESTERAO_HANDLESESSIONOPENED=0x42 +[TRACE]TRACE_NORMAL[0x3]_DUP6_CHARVESTERAO_HANDLEUNMOUNT=0x16 +[TRACE]TRACE_NORMAL[0x3]_DUP6_CHARVESTERAO_HARVESTFILE=0x6d +[TRACE]TRACE_NORMAL[0x3]_DUP6_CHARVESTERAO_HARVESTFILEWITHUID=0x78 +[TRACE]TRACE_NORMAL[0x3]_DUP6_CHARVESTERAO_HARVESTINGCOMPLETED=0x34 +[TRACE]TRACE_NORMAL[0x3]_DUP6_CHARVESTERAO_RUNL=0x57 +[TRACE]TRACE_NORMAL[0x3]_DUP7_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL=0x2d +[TRACE]TRACE_NORMAL[0x3]_DUP7_CHARVESTERAO_HANDLESESSIONOPENED=0x43 +[TRACE]TRACE_NORMAL[0x3]_DUP7_CHARVESTERAO_HANDLEUNMOUNT=0x17 +[TRACE]TRACE_NORMAL[0x3]_DUP7_CHARVESTERAO_HARVESTFILE=0x6e +[TRACE]TRACE_NORMAL[0x3]_DUP7_CHARVESTERAO_HARVESTFILEWITHUID=0x79 +[TRACE]TRACE_NORMAL[0x3]_DUP7_CHARVESTERAO_HARVESTINGCOMPLETED=0x35 +[TRACE]TRACE_NORMAL[0x3]_DUP7_CHARVESTERAO_RUNL=0x58 +[TRACE]TRACE_NORMAL[0x3]_DUP8_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL=0x2e +[TRACE]TRACE_NORMAL[0x3]_DUP8_CHARVESTERAO_HANDLESESSIONOPENED=0x44 +[TRACE]TRACE_NORMAL[0x3]_DUP8_CHARVESTERAO_HANDLEUNMOUNT=0x18 +[TRACE]TRACE_NORMAL[0x3]_DUP8_CHARVESTERAO_HARVESTFILE=0x6f +[TRACE]TRACE_NORMAL[0x3]_DUP8_CHARVESTERAO_HARVESTFILEWITHUID=0x7a +[TRACE]TRACE_NORMAL[0x3]_DUP8_CHARVESTERAO_HARVESTINGCOMPLETED=0x36 +[TRACE]TRACE_NORMAL[0x3]_DUP8_CHARVESTERAO_RUNL=0x59 +[TRACE]TRACE_NORMAL[0x3]_DUP9_CHARVESTERAO_HANDLESESSIONOPENED=0x45 +[TRACE]TRACE_NORMAL[0x3]_DUP9_CHARVESTERAO_HARVESTFILE=0x70 +[TRACE]TRACE_NORMAL[0x3]_DUP9_CHARVESTERAO_HARVESTFILEWITHUID=0x7b +[TRACE]TRACE_NORMAL[0x3]_DUP9_CHARVESTERAO_HARVESTINGCOMPLETED=0x37 +[TRACE]TRACE_NORMAL[0x3]__E32MAIN=0xbc diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/server/traces/harvesteraoTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/server/traces/harvesteraoTraces.h Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,172 @@ +// Created by TraceCompiler 1.3.1 +// DO NOT EDIT, CHANGES WILL BE LOST + +#ifndef __HARVESTERAOTRACES_H__ +#define __HARVESTERAOTRACES_H__ + +#define KOstTraceComponentID 0x200009f5 + +#define CHARVESTERAO_NEWLC 0x30001 +#define CHARVESTERAO_NEWL 0x30002 +#define CHARVESTERAO_CHARVESTERAO 0x30003 +#define DUP1_CHARVESTERAO_CHARVESTERAO 0x30004 +#define CHARVESTERAO_CONSTRUCTL 0x30005 +#define DUP1_CHARVESTERAO_CONSTRUCTL 0x30006 +#define CHARVESTERAO_LOADMONITORPLUGINSL 0x30007 +#define DUP1_CHARVESTERAO_LOADMONITORPLUGINSL 0x30008 +#define CHARVESTERAO_DELETEMONITORPLUGINS 0x30009 +#define DUP1_CHARVESTERAO_DELETEMONITORPLUGINS 0x3000a +#define CHARVESTERAO_STARTMONITORING 0x3000b +#define CHARVESTERAO_STOPMONITORING 0x3000c +#define CHARVESTERAO_PAUSEMONITORING 0x3000d +#define DUP1_CHARVESTERAO_PAUSEMONITORING 0x3000e +#define CHARVESTERAO_RESUMEMONITORING 0x3000f +#define CHARVESTERAO_HANDLEUNMOUNT 0x30010 +#define DUP1_CHARVESTERAO_HANDLEUNMOUNT 0x30011 +#define DUP2_CHARVESTERAO_HANDLEUNMOUNT 0x30012 +#define DUP3_CHARVESTERAO_HANDLEUNMOUNT 0x30013 +#define DUP4_CHARVESTERAO_HANDLEUNMOUNT 0x30014 +#define DUP5_CHARVESTERAO_HANDLEUNMOUNT 0x30015 +#define DUP6_CHARVESTERAO_HANDLEUNMOUNT 0x30016 +#define DUP7_CHARVESTERAO_HANDLEUNMOUNT 0x30017 +#define DUP8_CHARVESTERAO_HANDLEUNMOUNT 0x30018 +#define DUP10_CHARVESTERAO_HANDLEUNMOUNT 0x30019 +#define DUP11_CHARVESTERAO_HANDLEUNMOUNT 0x3001a +#define DUP12_CHARVESTERAO_HANDLEUNMOUNT 0x3001b +#define DUP13_CHARVESTERAO_HANDLEUNMOUNT 0x3001c +#define CHARVESTERAO_STARTCOMPOSERSL 0x3001d +#define CHARVESTERAO_STOPCOMPOSERS 0x3001e +#define CHARVESTERAO_DELETECOMPOSERS 0x3001f +#define CHARVESTERAO_ISCOMPOSINGREADY 0x30020 +#define CHARVESTERAO_READITEMFROMQUEUEL 0x30021 +#define CHARVESTERAO_HANDLEPLACEHOLDERSL 0x30022 +#define DUP1_CHARVESTERAO_HANDLEPLACEHOLDERSL 0x30023 +#define DUP2_CHARVESTERAO_HANDLEPLACEHOLDERSL 0x30024 +#define DUP3_CHARVESTERAO_HANDLEPLACEHOLDERSL 0x30025 +#define CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL 0x30026 +#define DUP1_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL 0x30027 +#define DUP2_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL 0x30028 +#define DUP3_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL 0x30029 +#define DUP4_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL 0x3002a +#define DUP5_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL 0x3002b +#define DUP6_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL 0x3002c +#define DUP7_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL 0x3002d +#define DUP8_CHARVESTERAO_CHECKFILEEXTENSIONANDHARVESTL 0x3002e +#define CHARVESTERAO_HARVESTINGCOMPLETED 0x3002f +#define DUP2_CHARVESTERAO_HARVESTINGCOMPLETED 0x30030 +#define DUP3_CHARVESTERAO_HARVESTINGCOMPLETED 0x30031 +#define DUP4_CHARVESTERAO_HARVESTINGCOMPLETED 0x30032 +#define DUP5_CHARVESTERAO_HARVESTINGCOMPLETED 0x30033 +#define DUP6_CHARVESTERAO_HARVESTINGCOMPLETED 0x30034 +#define DUP7_CHARVESTERAO_HARVESTINGCOMPLETED 0x30035 +#define DUP8_CHARVESTERAO_HARVESTINGCOMPLETED 0x30036 +#define DUP9_CHARVESTERAO_HARVESTINGCOMPLETED 0x30037 +#define DUP1_CHARVESTERAO_HARVESTINGCOMPLETED 0x30038 +#define DUP10_CHARVESTERAO_HARVESTINGCOMPLETED 0x30039 +#define DUP11_CHARVESTERAO_HARVESTINGCOMPLETED 0x3003a +#define DUP12_CHARVESTERAO_HARVESTINGCOMPLETED 0x3003b +#define CHARVESTERAO_HANDLESESSIONOPENED 0x3003c +#define DUP1_CHARVESTERAO_HANDLESESSIONOPENED 0x3003d +#define DUP2_CHARVESTERAO_HANDLESESSIONOPENED 0x3003e +#define DUP3_CHARVESTERAO_HANDLESESSIONOPENED 0x3003f +#define DUP4_CHARVESTERAO_HANDLESESSIONOPENED 0x30040 +#define DUP5_CHARVESTERAO_HANDLESESSIONOPENED 0x30041 +#define DUP6_CHARVESTERAO_HANDLESESSIONOPENED 0x30042 +#define DUP7_CHARVESTERAO_HANDLESESSIONOPENED 0x30043 +#define DUP8_CHARVESTERAO_HANDLESESSIONOPENED 0x30044 +#define DUP9_CHARVESTERAO_HANDLESESSIONOPENED 0x30045 +#define DUP10_CHARVESTERAO_HANDLESESSIONOPENED 0x30046 +#define DUP11_CHARVESTERAO_HANDLESESSIONOPENED 0x30047 +#define DUP12_CHARVESTERAO_HANDLESESSIONOPENED 0x30048 +#define DUP13_CHARVESTERAO_HANDLESESSIONOPENED 0x30049 +#define CHARVESTERAO_HANDLESESSIONERROR 0x3004a +#define CHARVESTERAO_CONTEXTINITIALIZATIONSTATUS 0x3004b +#define DUP1_CHARVESTERAO_CONTEXTINITIALIZATIONSTATUS 0x3004c +#define DUP2_CHARVESTERAO_CONTEXTINITIALIZATIONSTATUS 0x3004d +#define CHARVESTERAO_PAUSEHARVESTER 0x3004e +#define DUP1_CHARVESTERAO_PAUSEHARVESTER 0x3004f +#define CHARVESTERAO_RESUMEHARVESTERL 0x30050 +#define CHARVESTERAO_RUNL 0x30051 +#define DUP1_CHARVESTERAO_RUNL 0x30052 +#define DUP2_CHARVESTERAO_RUNL 0x30053 +#define DUP3_CHARVESTERAO_RUNL 0x30054 +#define DUP4_CHARVESTERAO_RUNL 0x30055 +#define DUP5_CHARVESTERAO_RUNL 0x30056 +#define DUP6_CHARVESTERAO_RUNL 0x30057 +#define DUP7_CHARVESTERAO_RUNL 0x30058 +#define DUP8_CHARVESTERAO_RUNL 0x30059 +#define CHARVESTERAO_DOCANCEL 0x3005a +#define CHARVESTERAO_RUNERROR 0x3005b +#define DUP1_CHARVESTERAO_RUNERROR 0x3005c +#define DUP2_CHARVESTERAO_RUNERROR 0x3005d +#define DUP3_CHARVESTERAO_RUNERROR 0x3005e +#define DUP4_CHARVESTERAO_RUNERROR 0x3005f +#define CHARVESTERAO_SETNEXTREQUEST 0x30060 +#define CHARVESTERAO_ISSERVERPAUSED 0x30061 +#define CHARVESTERAO_BACKUPRESTORESTART 0x30062 +#define CHARVESTERAO_BACKUPRESTOREREADY 0x30063 +#define CHARVESTERAO_HANDLEDISKSPACENOTIFICATIONL 0x30064 +#define DUP1_CHARVESTERAO_HANDLEDISKSPACENOTIFICATIONL 0x30065 +#define DUP2_CHARVESTERAO_HANDLEDISKSPACENOTIFICATIONL 0x30066 +#define CHARVESTERAO_HARVESTFILE 0x30067 +#define DUP1_CHARVESTERAO_HARVESTFILE 0x30068 +#define DUP2_CHARVESTERAO_HARVESTFILE 0x30069 +#define DUP3_CHARVESTERAO_HARVESTFILE 0x3006a +#define DUP4_CHARVESTERAO_HARVESTFILE 0x3006b +#define DUP5_CHARVESTERAO_HARVESTFILE 0x3006c +#define DUP6_CHARVESTERAO_HARVESTFILE 0x3006d +#define DUP7_CHARVESTERAO_HARVESTFILE 0x3006e +#define DUP8_CHARVESTERAO_HARVESTFILE 0x3006f +#define DUP9_CHARVESTERAO_HARVESTFILE 0x30070 +#define DUP10_CHARVESTERAO_HARVESTFILE 0x30071 +#define CHARVESTERAO_HARVESTFILEWITHUID 0x30072 +#define DUP1_CHARVESTERAO_HARVESTFILEWITHUID 0x30073 +#define DUP2_CHARVESTERAO_HARVESTFILEWITHUID 0x30074 +#define DUP3_CHARVESTERAO_HARVESTFILEWITHUID 0x30075 +#define DUP4_CHARVESTERAO_HARVESTFILEWITHUID 0x30076 +#define DUP5_CHARVESTERAO_HARVESTFILEWITHUID 0x30077 +#define DUP6_CHARVESTERAO_HARVESTFILEWITHUID 0x30078 +#define DUP7_CHARVESTERAO_HARVESTFILEWITHUID 0x30079 +#define DUP8_CHARVESTERAO_HARVESTFILEWITHUID 0x3007a +#define DUP9_CHARVESTERAO_HARVESTFILEWITHUID 0x3007b +#define DUP10_CHARVESTERAO_HARVESTFILEWITHUID 0x3007c +#define CHARVESTERAO_REGISTERPROCESSORIGIN 0x3007d +#define DUP1_CHARVESTERAO_REGISTERPROCESSORIGIN 0x3007e +#define DUP2_CHARVESTERAO_REGISTERPROCESSORIGIN 0x3007f +#define DUP3_CHARVESTERAO_REGISTERPROCESSORIGIN 0x30080 +#define DUP4_CHARVESTERAO_REGISTERPROCESSORIGIN 0x30081 +#define DUP5_CHARVESTERAO_REGISTERPROCESSORIGIN 0x30082 +#define CHARVESTERAO_UNREGISTERPROCESSORIGIN 0x30083 +#define DUP1_CHARVESTERAO_UNREGISTERPROCESSORIGIN 0x30084 +#define DUP2_CHARVESTERAO_UNREGISTERPROCESSORIGIN 0x30085 +#define DUP3_CHARVESTERAO_UNREGISTERPROCESSORIGIN 0x30086 +#define CHARVESTERAO_REGISTERHARVESTCOMPLETE 0x30087 +#define CHARVESTERAO_UNREGISTERHARVESTCOMPLETE 0x30088 +#define CHARVESTERAO_REGISTERHARVESTEREVENT 0x30089 +#define CHARVESTERAO_UNREGISTERHARVESTEREVENT 0x3008a +#define CHARVESTERAO_GETLASTOBSERVERID 0x3008b +#define CHARVESTERAO_CONTEXTSNAPSHOTSTATUS 0x3008c +#define DUP1_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS 0x3008d +#define DUP2_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS 0x3008e +#define DUP3_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS 0x3008f +#define DUP4_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS 0x30090 +#define DUP5_CHARVESTERAO_CONTEXTSNAPSHOTSTATUS 0x30091 +#define CHARVESTERAO_HARVESTCOMPLETED 0x30092 +#define DUP1_CHARVESTERAO_HARVESTCOMPLETED 0x30093 +#define CHARVESTERAO_BOOTROMSCANL 0x30094 +#define CHARVESTERAO_BOOTPARTIALRESTORESCANL 0x30095 +#define DUP1_CHARVESTERAO_BOOTPARTIALRESTORESCANL 0x30096 +#define CHARVESTERAO_BOOTSCANL 0x30097 +#define DUP1_CHARVESTERAO_BOOTSCANL 0x30098 +#define DUP2_CHARVESTERAO_BOOTSCANL 0x30099 +#define DUP3_CHARVESTERAO_BOOTSCANL 0x3009a +#define DUP4_CHARVESTERAO_BOOTSCANL 0x3009b +#define DUP5_CHARVESTERAO_BOOTSCANL 0x3009c +#define CHARVESTERAO_MEMORYLOW 0x3009d +#define CHARVESTERAO_MEMORYGOOD 0x3009e + + +#endif + +// End of file + diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/server/traces/harvesterserverTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/server/traces/harvesterserverTraces.h Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,44 @@ +// Created by TraceCompiler 1.3.1 +// DO NOT EDIT, CHANGES WILL BE LOST + +#ifndef __HARVESTERSERVERTRACES_H__ +#define __HARVESTERSERVERTRACES_H__ + +#define KOstTraceComponentID 0x200009f5 + +#define CHARVESTERSERVER_CONSTRUCTL 0x3009f +#define DUP1_CHARVESTERSERVER_CONSTRUCTL 0x300a0 +#define CHARVESTERSERVER_PAUSE 0x300a1 +#define CHARVESTERSERVER_RESUME 0x300a2 +#define DUP1_CHARVESTERSERVER_PAUSE 0x300a3 +#define DUP1_CHARVESTERSERVER_RESUME 0x300a4 +#define CHARVESTERSERVER_PAUSEREADY 0x300a5 +#define CHARVESTERSERVER_RESUMEREADY 0x300a6 +#define CHARVESTERSERVER_SHUTDOWNNOTIFICATION 0x300a7 +#define CHARVESTERSERVER_RESTARTNOTIFICATION 0x300a8 +#define CHARVESTERSERVER_HARVESTFILE 0x300a9 +#define CHARVESTERSERVER_HARVESTFILEWITHUID 0x300aa +#define CHARVESTERSERVER_REGISTERPROCESSORIGIN 0x300ab +#define CHARVESTERSERVER_UNREGISTERPROCESSORIGIN 0x300ac +#define CHARVESTERSERVER_REGISTERHARVESTCOMPLETE 0x300ad +#define CHARVESTERSERVER_UNREGISTERHARVESTCOMPLETE 0x300ae +#define CHARVESTERSERVER_REGISTERHARVESTEREVENT 0x300af +#define CHARVESTERSERVER_UNREGISTERHARVESTEREVENT 0x300b0 +#define CHARVESTERSERVER_CHARVESTERSERVER 0x300b1 +#define DUP1_CHARVESTERSERVER_CHARVESTERSERVER 0x300b2 +#define CHARVESTERSERVER_PANICCLIENT 0x300b3 +#define CHARVESTERSERVER_PANICSERVER 0x300b4 +#define CHARVESTERSERVER_NEWSESSIONL 0x300b5 +#define DUP1_CHARVESTERSERVER_NEWSESSIONL 0x300b6 +#define CHARVESTERSERVER_RUNERROR 0x300b7 +#define CHARVESTERSERVER_THREADFUNCTIONL 0x300b8 +#define DUP1_CHARVESTERSERVER_THREADFUNCTIONL 0x300b9 +#define CHARVESTERSERVER_THREADFUNCTION 0x300ba +#define DUP1_CHARVESTERSERVER_THREADFUNCTION 0x300bb +#define _E32MAIN 0x300bc + + +#endif + +// End of file + diff -r 9422ed56ee45 -r 63c982fb92f2 harvester/server/traces/harvesterserversessionTraces.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/harvester/server/traces/harvesterserversessionTraces.h Thu Jul 15 19:07:24 2010 +0300 @@ -0,0 +1,21 @@ +// Created by TraceCompiler 1.3.1 +// DO NOT EDIT, CHANGES WILL BE LOST + +#ifndef __HARVESTERSERVERSESSIONTRACES_H__ +#define __HARVESTERSERVERSESSIONTRACES_H__ + +#define KOstTraceComponentID 0x200009f5 + +#define CHARVESTERSERVERSESSION_NEWL 0x300bd +#define CHARVESTERSERVERSESSION_NEWLC 0x300be +#define CHARVESTERSERVERSESSION_CONSTRUCTL 0x300bf +#define CHARVESTERSERVERSESSION_CHARVESTERSERVERSESSION 0x300c0 +#define DUP1_CHARVESTERSERVERSESSION_CHARVESTERSERVERSESSION 0x300c1 +#define CHARVESTERSERVERSESSION_SERVICEL 0x300c2 +#define CHARVESTERSERVERSESSION_DISCONNECT 0x300c3 + + +#endif + +// End of file + diff -r 9422ed56ee45 -r 63c982fb92f2 mds_plat/harvester_framework_api/inc/harvesterplugin.h --- a/mds_plat/harvester_framework_api/inc/harvesterplugin.h Mon Jun 21 16:09:02 2010 +0300 +++ b/mds_plat/harvester_framework_api/inc/harvesterplugin.h Thu Jul 15 19:07:24 2010 +0300 @@ -208,6 +208,11 @@ */ IMPORT_C void SetHarvesterPluginFactory( CHarvesterPluginFactory& aFactory ); + /** + * Method for checking if the plugin is in idle state + */ + IMPORT_C TBool PluginInIdleState(); + private: /** diff -r 9422ed56ee45 -r 63c982fb92f2 mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/conf/MonitorPluginTest.cfg --- a/mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/conf/MonitorPluginTest.cfg Mon Jun 21 16:09:02 2010 +0300 +++ b/mds_plat/harvester_framework_api/tsrc/MonitorPluginTest/conf/MonitorPluginTest.cfg Thu Jul 15 19:07:24 2010 +0300 @@ -53,8 +53,6 @@ test StartMonitoring request Monitor test CreateEvents -wait Monitor -request Monitor test CreateEventsDelete wait Monitor test StopMonitoring diff -r 9422ed56ee45 -r 63c982fb92f2 sis/mds/mds_stub.sis Binary file sis/mds/mds_stub.sis has changed diff -r 9422ed56ee45 -r 63c982fb92f2 sis/mds/package.pkg --- a/sis/mds/package.pkg Mon Jun 21 16:09:02 2010 +0300 +++ b/sis/mds/package.pkg Thu Jul 15 19:07:24 2010 +0300 @@ -17,7 +17,7 @@ &EN ;packet-header (name, uid, major, minor, build, type) -#{"Metadata System Upgrade"},(0x200009F5), 9, 20, 19, TYPE=SA, RU +#{"Metadata System Upgrade"},(0x200009F5), 9, 20, 21, TYPE=SA, RU ; Localised vendor name %{"Nokia"} diff -r 9422ed56ee45 -r 63c982fb92f2 sis/mds/package_separate.pkg --- a/sis/mds/package_separate.pkg Mon Jun 21 16:09:02 2010 +0300 +++ b/sis/mds/package_separate.pkg Thu Jul 15 19:07:24 2010 +0300 @@ -17,7 +17,7 @@ &EN ;packet-header (name, uid, major, minor, build, type) -#{"Metadata System Upgrade"},(0x200009F5), 9, 20, 19, TYPE=SA, RU +#{"Metadata System Upgrade"},(0x200009F5), 9, 20, 21, TYPE=SA, RU ; Localised vendor name %{"Nokia"} diff -r 9422ed56ee45 -r 63c982fb92f2 sis/mds/stub.pkg --- a/sis/mds/stub.pkg Mon Jun 21 16:09:02 2010 +0300 +++ b/sis/mds/stub.pkg Thu Jul 15 19:07:24 2010 +0300 @@ -17,7 +17,7 @@ &EN ; Header -#{"Metadata System"}, (0x200009F5), 9, 20, 19, TYPE=SA +#{"Metadata System"}, (0x200009F5), 9, 20, 21, TYPE=SA ; Localised Vendor name %{"Nokia"}