diff -r 17af172ffa5f -r 630d2f34d719 telephonyprotocols/csdagt/script/SCOMMAND.CPP --- a/telephonyprotocols/csdagt/script/SCOMMAND.CPP Thu Aug 19 11:03:36 2010 +0300 +++ b/telephonyprotocols/csdagt/script/SCOMMAND.CPP Tue Aug 31 16:23:08 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2003-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2003-2010 Nokia Corporation and/or its subsidiary(-ies). // All rights reserved. // This component and the accompanying materials are made available // under the terms of "Eclipse Public License v1.0" @@ -19,10 +19,15 @@ @file Scommand.cpp */ + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "SCOMMANDTraces.h" +#endif + #include "SSCRREAD.H" #include "SSCREXEC.H" #include "SIO.H" -#include "SLOGGER.H" // Command names @@ -472,8 +477,7 @@ { if (!iStatus.iSkip) { - __FLOG_STMT(_LIT8(KLogStringExecutingSet,"Script:\tExecuting Set");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KLogStringExecutingSet()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSETCOMMAND_PARSEL_1, "Script:\tExecuting Set"); } iStatus.iOffset=end; EatSpaces(iStatus.iOffset); @@ -487,8 +491,7 @@ if (!iStatus.iSkip) { iVarMan->AddVariableL(varName,value); - __FLOG_STMT(_LIT(KLogStringSetVar,"Script:\tSet Var: %S To %S")); - __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(KLogStringSetVar()),&varName,&value); + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSETCOMMAND_PARSEL_2, "Script:\tSet Var: %S To %S",varName,value); } iStatus.iOffset=end; return ETrue; // Consumed @@ -550,8 +553,7 @@ { if(!iStatus.iSkip) { - __FLOG_STMT(_LIT8(KLogStringExecutingSend,"Script:\tExecuting Send");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KLogStringExecutingSend()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDCOMMAND_PARSEL_1,"Script:\tExecuting Send"); } iStatus.iOffset=end; EatSpaces(iStatus.iOffset); @@ -562,12 +564,7 @@ if(!iStatus.iSkip) { iScriptIO->Write(iSendString); -#ifdef __FLOG_ACTIVE - _LIT(KLogStringSending,"Script:\tSending %S"); - TBuf16 temp; - temp.Copy(iSendString.Left(Min(iSendString.Length(),KLogBufferSize))); - __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(KLogStringSending()),&temp); -#endif + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSENDCOMMAND_PARSEL_2, "Script:\tSending %s",iSendString); } CleanupStack::PopAndDestroy(); return ETrue; // Consumed @@ -714,8 +711,7 @@ queue a read. */ { - __FLOG_STMT(_LIT8(KLogStringExecutingWait,"Script:\tExecuting Wait");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KLogStringExecutingWait()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAITCOMMAND_PARSEACTIONL_1, "Script:\tExecuting Wait"); EatSpaces(iStatus.iOffset); TReal waitPeriod=ParseRealL(iStatus.iOffset); EatSpacesAndLinesAndCommentsL(); @@ -740,16 +736,7 @@ TPtrC8 waitString(buf->Des()); label->CreateCommChatStringL(waitString,EFalse); iLabelArray->AppendL(label); - // for logging - TBuf labelName; - labelName.Copy(label->LabelName().Left(Min(KLogBufferSize,label->LabelName().Length()))); - // -#ifdef __FLOG_ACTIVE - _LIT(KLogStringGog,"Script:\tIf %S is found, Goto %S"); - TBuf16 string; - string.Copy(waitString.Left(Min(waitString.Length(),KLogBufferSize))); - __FLOG_STATIC2(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(KLogStringGog()),&string,&labelName); -#endif + OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CWAITCOMMAND_PARSEACTIONL_2, "Script:\tIf %s is found, Goto %S",waitString,label->LabelName()); CleanupStack::Pop(); // label - will be deleted from array CleanupStack::PopAndDestroy(); // buf - will have been copied into label array } @@ -893,8 +880,7 @@ User::Leave(KErrNestedLoop); if (!iStatus.iSkip) { - __FLOG_STMT(_LIT8(KLogStringExecutingLoop,"Script:\tExecuting Loop");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),KLogStringExecutingLoop()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CLOOPCOMMAND_PARSEL_1,"Script:\tExecuting Loop"); } iStatus.iOffset=end; EatSpaces(iStatus.iOffset); @@ -908,8 +894,7 @@ iScriptReader->CurrentPos(iLoopPosition,iStatus.iOffset); if (!iStatus.iSkip) { - __FLOG_STMT(_LIT(KLogStringLoopCounter,"Script:\tLoop Counter %d");) - __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),KLogStringLoopCounter(),iLoopCounter); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CLOOPCOMMAND_PARSEL_2, "Script:\tLoop Counter %d",iLoopCounter); } return ETrue; // Consumed } @@ -934,10 +919,8 @@ else { iScriptReader->SetCurrentPos(iLoopPosition); - __FLOG_STMT(_LIT8(logString1,"Script:\tRepeat Loop");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1()); - __FLOG_STMT(_LIT8(logString2,"Script:\tLoop Counter %d");) - __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString2(),iLoopCounter); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CLOOPCOMMAND_CHECKLOOPL_1,"Script:\tRepeat Loop"); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CLOOPCOMMAND_CHECKLOOPL_2,"Script:\tLoop Counter %d",iLoopCounter); } return ETrue; // Consumed Something } @@ -999,8 +982,7 @@ { if(!iStatus.iSkip) { - __FLOG_STMT(_LIT8(logString,"Script:\tExecuting Goto");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGOTOCOMMAND_PARSEL_1,"Script:\tExecuting Goto"); } iStatus.iOffset=end; EatSpaces(iStatus.iOffset); @@ -1029,10 +1011,8 @@ { iSearchName.Copy(aLabelName); iStatus.iSkipModeToggleReq=ETrue; - __FLOG_STMT(_LIT(logString1,"Script:\tSearching for Label %S");) - __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(logString1()),&aLabelName); - __FLOG_STMT(_LIT8(logString2,"Script:\tEntering Skip Mode");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2()); + OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGOTOCOMMAND_GOTO_1,"Script:\tSearching for Label %S",aLabelName); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGOTOCOMMAND_GOTO_2, "Script:\tEntering Skip Mode"); } else iScriptReader->SetCurrentPos(pos); @@ -1057,8 +1037,7 @@ if (iStatus.iSkip && (iLabelMan->FindLabel(iSearchName,dummyPos)==KErrNone)) { iStatus.iSkipModeToggleReq=ETrue; - __FLOG_STMT(_LIT8(logString,"Script:\tExiting Skip Mode");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CGOTOCOMMAND_PARSELABELL_1,"Script:\tExiting Skip Mode"); } return ETrue; } @@ -1131,8 +1110,7 @@ { if(!iStatus.iSkip) { - __FLOG_STMT(_LIT8(logString1,"Script:\tExecuting DTR");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDTRCOMMAND_PARSEL_1,"Script:\tExecuting DTR"); } iStatus.iOffset=end; EatSpaces(iStatus.iOffset); @@ -1141,8 +1119,7 @@ { if(!iStatus.iSkip) { - __FLOG_STMT(_LIT8(logString2,"Script:\tRaising DTR");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDTRCOMMAND_PARSEL_2,"Script:\tRaising DTR"); iScriptIO->RaiseDTR(NULL); } } @@ -1150,8 +1127,7 @@ { if(!iStatus.iSkip) { - __FLOG_STMT(_LIT8(logString3,"Script:\tDropping DTR");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString3()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CDTRCOMMAND_PARSEL_3,"Script:\tDropping DTR"); iScriptIO->DropDTR(NULL); } } @@ -1217,8 +1193,7 @@ { if (!iStatus.iSkip) { - __FLOG_STMT(_LIT8(logString,"Script:\tExecuting Read");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CREADPCTCOMMAND_PARSEL_1, "Script:\tExecuting Read"); iCharSet=ParseCharacterTypeL(iStatus.iOffset); iScriptExec->ReadPct(); } @@ -1361,8 +1336,7 @@ { if (!iStatus.iSkip) { - __FLOG_STMT(_LIT8(logString1,"Script:\tExecuting Exit");) - __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1()); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CEXITCOMMAND_PARSEL_1,"Script:\tExecuting Exit"); } iStatus.iOffset=end; EatSpaces(iStatus.iOffset); @@ -1386,8 +1360,7 @@ User::Leave(KErrScriptCompleted); else { - __FLOG_STMT(_LIT8(logString2,"Script:\tExit With Error %d");) - __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue(logString2()),ret); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CEXITCOMMAND_PARSEL_2,"Script:\tExit With Error %d",ret); User::Leave(ret); } }