diff -r 630d2f34d719 -r 07a122eea281 telephonyprotocols/csdagt/src/ND_DIRECTSTATES.CPP --- a/telephonyprotocols/csdagt/src/ND_DIRECTSTATES.CPP Tue Aug 31 16:23:08 2010 +0300 +++ b/telephonyprotocols/csdagt/src/ND_DIRECTSTATES.CPP Wed Sep 01 12:40:21 2010 +0100 @@ -1,4 +1,4 @@ -// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -19,17 +19,11 @@ @file Nd_directstates.cpp */ - - -#include "OstTraceDefinitions.h" -#ifdef OST_TRACE_COMPILER_IN_USE -#include "ND_DIRECTSTATESTraces.h" -#endif - #include "ND_DIRCT.H" #include "ND_SCR.H" #include "ND_DBACC.H" #include "ND_STD.H" +#include "SLOGGER.H" #include "ND_DIRECTSTATES.H" CDirCtInit* CDirCtInit::NewL(MAgentStateMachineEnv& aSMObserver, MNetdialEnv& aNdEnv) @@ -242,7 +236,8 @@ { if(iStatus!=KErrNone) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTSCANSCRIPT_RUNL_1,"NetDial:\tCompleted Phase Scan Script with Error %d", iStatus.Int()); + __FLOG_STMT(_LIT(logString3,"Scan Script");) + __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),KCompletedPhaseLogString(), &logString3(), iStatus.Int()); if (iNdEnv->Script()!=NULL) iNdEnv->Script()->CloseScript(); iSMObserver->ConnectionComplete(ECsdScannedScript,iStatus.Int()); @@ -252,11 +247,11 @@ iSMObserver->UpdateProgress(ECsdScannedScript,iStatus.Int()); if (!(iNdEnv->BaseEnv())->IsReconnect()) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTSCANSCRIPT_RUNL_2, "NetDial:\tService Started"); + __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KServiceStartedLogString()); } else { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTSCANSCRIPT_RUNL_3,"NetDial:\tService Started On Reconnection"); + __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KServiceStartedReconnLogString()); } //iSMObserver->ServiceStarted(); (iNdEnv->BaseEnv())->CompleteState(KErrNone); @@ -436,7 +431,8 @@ { if(iStatus!=KErrNone) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONNECT_RUNL_1, "NetDial:\tCompleted Phase Execute Script with Error %d", iStatus.Int()); + __FLOG_STMT(_LIT(logString3,"Execute Script");) + __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),KCompletedPhaseLogString(), &logString3(), iStatus.Int()); if (iNdEnv->Script()!=NULL) iNdEnv->Script()->CloseScript(); iSMObserver->ConnectionComplete(ECsdFinishedConnect,iStatus.Int()); @@ -468,7 +464,8 @@ { if (iNdEnv->UseScript()) { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONNECT_DOSTARTSTATEL_1, "NetDial:\tExecuting Script"); + __FLOG_STMT(_LIT8(logString,"NetDial:\tExecuting Script");) + __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString()); (iNdEnv->Script())->ExecuteL(*this); iStatus=KRequestPending; @@ -570,7 +567,8 @@ { __ASSERT_DEBUG(iStatus==KErrNone,User::Invariant()); iSMObserver->UpdateProgress(ECsdConnectionOpen,KErrNone); - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTOPEN_RUNL_1, "NetDial:\tConnection Open"); + __FLOG_STMT(_LIT8(logString,"NetDial:\tConnection Open");) + __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString()); if (iNdEnv->Script()!=NULL) iNdEnv->Script()->CloseScript(); iSMObserver->ConnectionComplete(ECsdConnectionOpen,KErrNone); @@ -660,12 +658,14 @@ Complete hangup state. */ { + __FLOG_STMT(_LIT(logString3,"Hang Up");) if(iStatus!=KErrNone) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTHANGUP_RUNL_1,"NetDial:\tCompleted Phase Hang Up with Error %d", iStatus.Int()); - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTHANGUP_RUNL_2, "NetDial:\tDisconnection Error %d", iStatus.Int()); + __FLOG_STMT(_LIT8(logString2,"NetDial:\tDisconnection Error %d");) + __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(KCompletedPhaseLogString()), &logString3(), iStatus.Int()); + __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(logString2()), iStatus.Int()); } - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTHANGUP_RUNL_3,"Hang Up"); + __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString3()); iSMObserver->UpdateProgress(ECsdFinishedHangUp,iStatus.Int()); (iNdEnv->BaseEnv())->CompleteState(iStatus.Int()); } @@ -751,7 +751,8 @@ Call DisconnectComplete(). */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTDISCONNECT_RUNL_1, "NetDial:\tDisconnect Complete"); + __FLOG_STMT(_LIT8(logString,"NetDial:\tDisconnect Complete");) + __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString()); iSMObserver->DisconnectComplete(); } @@ -922,7 +923,8 @@ TRAPD(ret,DoStartStateL()); if (ret!=KErrNone) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONFIGURECOMMPORT_STARTSTATE_1, "NetDial:\tError %d Configuring Comm Port", ret); + __FLOG_STMT(_LIT8(logString, "NetDial:\tError %d Configuring Comm Port");) + __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(logString()), ret); JumpToRunl(ret); } } @@ -953,8 +955,8 @@ Cancels active requests */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONFIGURECOMMPORT_DOCANCEL_1,"NetDial:\tCancel Configure Comm Port"); - + __FLOG_STMT(_LIT8(logString, "NetDial:\tCancel Configure Comm Port");) + __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(logString())); (iNdEnv->Script())->CancelConfigureCommPort(); } @@ -968,7 +970,8 @@ { if(iStatus!=KErrNone) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONFIGURECOMMPORT_RUNL_1, "NetDial:\tCompleted Phase Configuring Comm Port with Error %d", iStatus.Int()); + __FLOG_STMT(_LIT(logString3,"Configuring Comm Port");) + __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),KCompletedPhaseLogString(), &logString3(), iStatus.Int()); if (iNdEnv->Script()!=NULL) iNdEnv->Script()->CloseScript(); iSMObserver->ConnectionComplete(ECsdFinishedConnect,iStatus.Int()); @@ -985,8 +988,8 @@ @exception Leaves if GetCommConfigForDirectConnectL() leaves. */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCONFIGURECOMMPORT_DOSTARTSTATEL_1,"NetDial:\tConfiguring Comm Port"); - + __FLOG_STMT(_LIT8(logString1,"NetDial:\tConfiguring Comm Port");) + __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1()); (iNdEnv->NetDialDb())->GetCommConfigForDirectConnectL(iConfigPckg); iStatus = KRequestPending; @@ -1047,7 +1050,8 @@ Reconfigure port to allow signals to be dropped. */ { - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTRECONFIGURECOMMPORT_STARTSTATE_1, "NetDial:\tReconfiguring Comm Port"); + __FLOG_STMT(_LIT8(logString, "NetDial:\tReconfiguring Comm Port");) + __FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString()); iStatus = KRequestPending; SetActive(); // Reconfigure the Comm Port to allow the signals to be set. @@ -1110,7 +1114,8 @@ if (!iDropping) { // ReConfigureAndCancelCommPort() has completed to allow us to drop the Comm Port signals. - OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTRECONFIGURECOMMPORT_RUNL_1, "NetDial:\tDropping Signals"); + __FLOG_STMT(_LIT8(logString, "NetDial:\tDropping Signals");) + __FLOG_STATIC(KNetDialLogFolder(), KNetDialLogFile(), logString()); iDropping = ETrue; iStatus = KRequestPending; @@ -1218,11 +1223,15 @@ // in response to its earlier Connect()). Consequently, we can't call either method with an error argument // for a second time (otherwise NIFMAN will panic due to too many ConnectComplete() responses). if (iStatus!=KErrNone) - { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCLOSEDATAPORT_RUNL_1, "NetDial:\tCompleted Phase Close Data Port with Error %d", iStatus.Int()); + { +#ifdef __FLOG_ACTIVE + _LIT(logString3,"Close Data Port"); + _LIT8(logstring2,"Saved error = %d"); +#endif + __FLOG_STATIC2(KNetDialLogFolder(), KNetDialLogFile(), TRefByValue(KCompletedPhaseLogString()), &logString3(), iStatus.Int()); if (iError != KErrNone) { - OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDIRCTCLOSEDATAPORT_RUNL_2,"Saved error = %d", iError); + __FLOG_STATIC1(KNetDialLogFolder(), KNetDialLogFile(), TRefByValue(logstring2()), iError); } else {