--- a/telephonyprotocols/csdagt/script/SIO.CPP Tue Aug 31 16:23:08 2010 +0300
+++ b/telephonyprotocols/csdagt/script/SIO.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,14 +19,9 @@
@file Sio.cpp
*/
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "SIOTraces.h"
-#endif
-
#include "SSCREXEC.H"
#include "SIO.H"
+#include "SLOGGER.H"
#include <networking/bca.h>
const TInt KChatterPriority=0;
@@ -85,13 +80,13 @@
void CScriptIO::CreateChannel(TRequestStatus& aStatus)
{
ASSERT(iCreateAndShutdownStatus == NULL);
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CREATECHANNEL_1,"Script:\tOpening Comm Port '%S'", iCommsChannel);
+ __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),_L("Script:\tOpening Comm Port '%S'"), &iCommsChannel);
iCommClosed = EFalse;
TInt err = CommOpen(iCommsChannel);
if (err != KErrNone)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CREATECHANNEL_2, "Script: Error %d opening Comm Port", err);
+ __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),_L("Script: Error %d opening Comm Port"), err);
TRequestStatus* stat = &aStatus;
User::RequestComplete(stat, err);
}
@@ -100,13 +95,15 @@
void CScriptIO::CancelCreateChannel()
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CANCELCREATECHANNEL_1, "Script:\tCancelCreateChannel()");
+ __FLOG_STMT(_LIT8(logString,"Script:\tCancelCreateChannel()");)
+ __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
CommCancel();
}
void CScriptIO::InitializeComplete()
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_INITIALIZECOMPLETE_1,"Script:\tInitializeComplete()");
+ __FLOG_STMT(_LIT8(logString,"Script:\tInitializeComplete()");)
+ __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
ASSERT(iCreateAndShutdownStatus);
User::RequestComplete(iCreateAndShutdownStatus, KErrNone);
iCreateAndShutdownStatus = NULL;
@@ -114,7 +111,8 @@
void CScriptIO::ShutdownComplete(TInt aError)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_SHUTDOWNCOMPLETE_1, _"Script:\tShutdownComplete(aError %d)", aError);
+ __FLOG_STMT(_LIT8(logString,"Script:\tShutdownComplete(aError %d)");)
+ __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString(), aError);
ASSERT(iCreateAndShutdownStatus);
if (iCreateError != KErrNone) //The creation error is probably more interesting than a bad shutdown error
@@ -161,7 +159,8 @@
@param aError System wide error code.
*/
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_STOP_1,"Script:\tStop(aError %d)", aError);
+ __FLOG_STMT(_LIT8(logString,"Script:\tStop(aError %d)");)
+ __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString(), aError);
iCreateError = aError;
delete iChat;
@@ -201,16 +200,19 @@
Reads completely - stops timer and if no error checks string against the desired string
*/
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_1,"Script:\tRead Complete");
+ __FLOG_STMT(_LIT8(logString1,"Script:\tRead Complete");)
+ __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
if(aStatus==KErrCommsLineFail)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_2,"Script:\tComms Error %d",aStatus);
+ __FLOG_STMT(_LIT8(logString2,"Script:\tComms Error %d");)
+ __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString2()),aStatus);
iChat->StopTimer();
iReadPending=EFalse;
TRAPD(ret,iScriptExecutor->CompletedReadL(KErrCommsLineFail));
if (KErrNone != ret)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_3,"Script:\tCompleteReadL Failure");
+ __FLOG_STMT(_LIT8(logString6,"Script:\tCompleteReadL Failure");)
+ __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString6());
}
return;
}
@@ -221,7 +223,8 @@
if (aStatus==KErrCommsFrame)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_4, "Script:\tComms Error %d",aStatus);
+ __FLOG_STMT(_LIT(logString3,"Script:\tComms Error %d");)
+ __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString3()),aStatus);
User::After(KClockTick); // wait for a clock tick and continue
aStatus=KErrNone;
}
@@ -231,13 +234,18 @@
TRAPD(ret,iScriptExecutor->CompletedReadL(aStatus));
if (KErrNone != ret)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_5,"Script:\tCompleteReadL Failure");
+ __FLOG_STMT(_LIT8(logString7,"Script:\tCompleteReadL Failure");)
+ __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString7());
}
return;
}
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_7, "Rx:\t%s",iRxBuffer);
-
+#ifdef __FLOG_ACTIVE
+ _LIT(logString4,"Rx:\t%S");
+ TBuf16<KLogBufferSize> temp;
+ temp.Copy(iRxBuffer.Left(Min(iRxBuffer.Length(),KLogBufferSize)));
+ __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString4()),&temp);
+#endif
if (iScriptExecutor->RequestUsePct())
{
@@ -247,7 +255,8 @@
TRAPD(ret,iScriptExecutor->CompletedReadL(err));
if (KErrNone != ret)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_8,"Script:\tCompleteReadL Failure");
+ __FLOG_STMT(_LIT8(logString8,"Script:\tCompleteReadL Failure");)
+ __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString8());
}
return;
}
@@ -261,7 +270,12 @@
if(iStringFound!=-1)
{
iExcessData.Set(iRxBuffer.Right(iRxBuffer.Length()-iRxBufOffset-1));
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_9, "Script:\tExcess data buffer set to: %s",iExcessData);
+#ifdef __FLOG_ACTIVE
+ _LIT(logString5,"Script:\tExcess data buffer set to: %S");
+ TBuf16<KLogBufferSize> temp;
+ temp.Copy(iExcessData.Left(Min(iExcessData.Length(),KLogBufferSize)));
+ __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString5()),&temp);
+#endif
break;
}
}
@@ -275,7 +289,8 @@
TRAPD(ret,iScriptExecutor->CompletedReadL(aStatus,iStringFound));
if (KErrNone != ret)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMREADCOMPLETE_10, "Script:\tCompleteReadL Failure");
+ __FLOG_STMT(_LIT8(logString9,"Script:\tCompleteReadL Failure");)
+ __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString9());
}
}
else
@@ -290,11 +305,13 @@
Writes completely - stops timer
*/
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMWRITECOMPLETE_1,"Script:\tWrite Complete");
+ __FLOG_STMT(_LIT8(logString,"Script:\tWrite Complete");)
+ __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
iChat->StopTimer();
if(aStatus==KErrCommsLineFail)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_COMMWRITECOMPLETE_2, "Script:\tComms Error %d",aStatus);
+ __FLOG_STMT(_LIT8(logString2,"Script:\tComms Error %d");)
+ __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString2(),aStatus);
iWritePending=EFalse;
iScriptExecutor->CompletedWrite(KErrCommsLineFail);
return;
@@ -311,7 +328,8 @@
Logs matching string found and sets iStringFound to aIndex.
*/
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CHATSTRINGMATCH_1, "Script:\tMatching String Found %d",aIndex);
+ __FLOG_STMT(_LIT8(logString,"Script:\tMatching String Found %d");)
+ __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC8>(logString()),aIndex);
iStringFound=aIndex;
}
@@ -323,18 +341,21 @@
CommCancel();
if(iWritePending)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CHATTIMEOUT_1, "Script:\tWrite Chat Time Out");
+ __FLOG_STMT(_LIT8(logString1,"Script:\tWrite Chat Time Out");)
+ __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString1());
iWritePending=EFalse;
iScriptExecutor->CompletedWrite(KErrTimedOut);
}
else if(iReadPending)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CHATTIMEOUT_2,"Script:\tRead Chat Time Out");
+ __FLOG_STMT(_LIT8(logString2,"Script:\tRead Chat Time Out");)
+ __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString2());
iReadPending=EFalse;
TRAPD(ret,iScriptExecutor->CompletedReadL(KErrTimedOut));
if (KErrNone != ret)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_CHATTIMEOUT_3,"Script:\tCompleteReadL Failure");
+ __FLOG_STMT(_LIT8(logString3,"Script:\tCompleteReadL Failure");)
+ __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString3());
}
}
else
@@ -361,8 +382,8 @@
TInt timeInterval=TInt(realTimeInterval);
if (realTimeInterval>TReal(timeInterval))
timeInterval++;
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_READ_1,"Script:\tRead Pending In %d Microseconds",timeInterval);
-
+ __FLOG_STMT(_LIT8(logString,"Script:\tRead Pending In %d Microseconds");)
+ __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),logString(),timeInterval);
//
iChat->StartTimer(timeInterval);
CommReadOneOrMore(iRxBuffer);
@@ -374,7 +395,8 @@
Reads echo.
*/
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_READECHO_1,"Script:\tRead Echo");
+ __FLOG_STMT(_LIT8(logString,"Script:\tRead Echo");)
+ __FLOG_STATIC(KNetDialLogFolder(),KNetDialLogFile(),logString());
iExcessData.Set(NULL,0); // clear excess data buffer
iReadPending=ETrue;
@@ -402,7 +424,12 @@
PreSend pause is finished, can now do write.
*/
{
- OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSCRIPTIO_PRESENDPAUSECOMPLETED_1, "Tx:\t%s",iTxBuffer);
+#ifdef __FLOG_ACTIVE
+ _LIT(logString,"Tx:\t%S");
+ TBuf16<KLogBufferSize> temp;
+ temp.Copy(iTxBuffer.Left(Min(iTxBuffer.Length(),KLogBufferSize)));
+ __FLOG_STATIC1(KNetDialLogFolder(),KNetDialLogFile(),TRefByValue<const TDesC>(logString()),&temp);
+#endif
CommWrite(iTxBuffer);
iChat->StartTimer(KWriteTimeOutSec*KOneSecInMicroSecs);
}