--- a/smsprotocols/smsstack/smsprot/Src/smspproc.cpp Tue Aug 31 16:23:08 2010 +0300
+++ b/smsprotocols/smsstack/smsprot/Src/smspproc.cpp Wed Sep 01 12:40:21 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 1999-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
@@ -18,12 +18,6 @@
*/
-
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspprocTraces.h"
-#endif
-
#include "smspproc.h"
#include "smspmondsk.h"
#include "smspfacadestor.h"
@@ -49,7 +43,7 @@
CSmsSegmentationStore& aSegmentationStore,
CSmsMonitorDiskSpace& aSmsMonitorDiskSpace)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_NEWL_1, "CSmsPDUProcessor::NewL()");
+ LOGSMSPROT1("CSmsPDUProcessor::NewL()");
CSmsPDUProcessor* smsPDUProcessor = new (ELeave) CSmsPDUProcessor(aSmsComm,
aSmsSettings,
@@ -93,13 +87,14 @@
*/
void CSmsPDUProcessor::ConstructL()
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_CONSTRUCTL_1, "CSmsPDUProcessor::ConstructL()");
+ LOGSMSPROT1("CSmsPDUProcessor::ConstructL()");
} // CSmsPDUProcessor::ConstructL
void CSmsPDUProcessor::DecodeAndProcessPDUL(TGsmSmsSlot& aSlot, TBool aIsEnumeration)
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_1, "CSmsPDUProcessor::DecodeAndProcessPDUL(): aIsEnumeration=%d",aIsEnumeration);
+ LOGSMSPROT2("CSmsPDUProcessor::DecodeAndProcessPDUL(): aIsEnumeration=%d",
+ aIsEnumeration);
//
// Store the slot...
@@ -115,7 +110,8 @@
iIsMobileTerminated = ETrue;
}
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_2, "CSmsStoreRead::DecodeAndProcessPDUL(): iIsMobileTerminated=%d",iIsMobileTerminated);
+ LOGSMSPROT2("CSmsStoreRead::DecodeAndProcessPDUL(): iIsMobileTerminated=%d",
+ iIsMobileTerminated);
//
// Put the PDU and Service Center Address in the TGsmSms structure...
@@ -196,7 +192,7 @@
//
if (iSmsMessage->ToFromAddress().CompareF(KNETWORK) == 0)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_DECODEANDPROCESSPDUL_3, "CSmsPDUProcessor::DecodeAndProcessPDUL(): MOSES OTE message!");
+ LOGSMSPROT1("CSmsPDUProcessor::DecodeAndProcessPDUL(): MOSES OTE message!");
if (iSmsComm.NetworkInfoAvailable())
{
iSmsMessage->SetToFromAddressL(iSmsComm.NetworkInfo().iDisplayTag);
@@ -317,7 +313,7 @@
void CSmsPDUProcessor::AnalysePDUCharacteristics()
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_1, "CSmsPDUProcessor::AnalysePDUCharacteristics()");
+ LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics()");
CSmsPDU& pdu = iSmsMessage->SmsPDU();
@@ -330,32 +326,32 @@
{
if (msgClass == TSmsDataCodingScheme::ESmsClass0)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_2, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 0");
+ LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 0");
iIsClass0Message = ETrue;
}
else if (msgClass == TSmsDataCodingScheme::ESmsClass1)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_3, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 1");
+ LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 1");
iIsClass1Message = ETrue;
}
else if (msgClass == TSmsDataCodingScheme::ESmsClass2)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_4, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 2");
+ LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 2");
iIsClass2Message = ETrue;
}
else if (msgClass == TSmsDataCodingScheme::ESmsClass3)
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_5, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 3");
+ LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class 3");
iIsClass3Message = ETrue;
}
else
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_6, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class Unknown!");
+ LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class Unknown!");
}
}
else
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_7, "CSmsPDUProcessor::AnalysePDUCharacteristics(): Class-less");
+ LOGSMSPROT1("CSmsPDUProcessor::AnalysePDUCharacteristics(): Class-less");
}
//
@@ -368,7 +364,8 @@
iIsPIDType0 = ETrue;
}
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_8, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsPIDType0=%d",iIsPIDType0);
+ LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsPIDType0=%d",
+ iIsPIDType0);
//
// Should this message be forwarded to the client?
@@ -381,7 +378,8 @@
iIsForwardMessageToClient = ETrue;
}
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_9, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsForwardMessageToClient=%d",iIsForwardMessageToClient);
+ LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsForwardMessageToClient=%d",
+ iIsForwardMessageToClient);
//
// Is it flaged for auto-delete?
@@ -396,7 +394,8 @@
}
}
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_10, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsMarkedForAutoDelete=%d",iIsMarkedForAutoDelete);
+ LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsMarkedForAutoDelete=%d",
+ iIsMarkedForAutoDelete);
//
// Should this PDU be deleted after processing?
@@ -412,7 +411,8 @@
iIsPDUToBeDeleted = ETrue;
}
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_11, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsPDUToBeDeleted=%d",iIsPDUToBeDeleted);
+ LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsPDUToBeDeleted=%d",
+ iIsPDUToBeDeleted);
//
// Does the message need to be stored???
@@ -430,7 +430,8 @@
iIsMessageGoingToBeStored = ETrue;
}
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_12, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsMessageGoingToBeStored=%d",iIsMessageGoingToBeStored);
+ LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsMessageGoingToBeStored=%d",
+ iIsMessageGoingToBeStored);
//
// Is the message complete? This value may change later, when the segmentation and
@@ -438,7 +439,8 @@
//
iIsComplete = iSmsMessage->IsComplete();
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ANALYSEPDUCHARACTERISTICS_13, "CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsComplete=%d",iIsComplete);
+ LOGSMSPROT2("CSmsPDUProcessor::AnalysePDUCharacteristics(): iIsComplete=%d",
+ iIsComplete);
//
// Store PDU Data. These values may be updated later.
@@ -460,7 +462,7 @@
//
TBool found = iSegmentationStore.AddStatusReportL(iIndex, iIsComplete, *iSmsMessage);
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_FINDORIGINALMESSAGEANDPROCESSSTATUSREPORTL_1, "CSmsPDUReadProcess::FindOriginalMessageAndProcessStatusReportL(): found=%d",found);
+ LOGSMSPROT2("CSmsPDUReadProcess::FindOriginalMessageAndProcessStatusReportL(): found=%d",found);
if (found)
{
@@ -496,7 +498,7 @@
void CSmsPDUProcessor::UpdateStatusReportL()
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_UPDATESTATUSREPORTL_1, "CSmsPDUProcessor::UpdateStatusReportL()");
+ LOGSMSPROT1("CSmsPDUProcessor::UpdateStatusReportL()");
//
// Update the receive time of the status report...
@@ -529,7 +531,7 @@
void CSmsPDUProcessor::AddSlotToSmsMessageIfRequiredL()
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ADDSLOTTOSMSMESSAGEIFREQUIREDL_1, "CSmsPDUProcessor::AddSlotToSmsMessageIfRequiredL()");
+ LOGSMSPROT1("CSmsPDUProcessor::AddSlotToSmsMessageIfRequiredL()");
//
// Add the slot to the message (if it is not going to be deleted and
@@ -565,7 +567,8 @@
*/
void CSmsPDUProcessor::AddSegmentOfMessageToReassemblyStoreIfRequiredL()
{
- OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_ADDSEGMENTOFMESSAGETOREASSEMBLYSTOREIFREQUIREDL_1, "CSmsPDUReadProcess::AddSegmentOfMessageToReassemblyStoreIfRequiredL(): iIsComplete=%d",iIsComplete);
+ LOGSMSPROT2("CSmsPDUReadProcess::AddSegmentOfMessageToReassemblyStoreIfRequiredL(): iIsComplete=%d",
+ iIsComplete);
iReassemblyStore.AddSegmentToReassemblyStoreL(*iSmsMessage, iGsmSms, iIndex, iIsComplete, iIsEnumeration, iSmsPDUData.iReceived, iSmsPDUData.iTotal);
} // CSmsPDUProcessor::AddSegmentOfMessageToReassemblyStoreIfRequiredL
@@ -573,7 +576,7 @@
void CSmsPDUProcessor::UpdateLogServerIdL()
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_UPDATELOGSERVERIDL_1, "CSmsPDUProcessor::UpdateLogServerIdL()");
+ LOGSMSPROT1("CSmsPDUProcessor::UpdateLogServerIdL()");
//
// If this is a SUBMIT or DELIVER PDU,
@@ -589,7 +592,7 @@
void CSmsPDUProcessor::ProcessMessageIfCompleteL()
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_PROCESSMESSAGEIFCOMPLETEL_1, "CSmsPDUProcessor::ProcessMessageIfCompleteL()");
+ LOGSMSPROT1("CSmsPDUProcessor::ProcessMessageIfCompleteL()");
if ((iIsClass0Message && !iIsWapSms) && iReassemblyStore.IsSeparateClass0StoreSupported())
{
@@ -647,7 +650,7 @@
void CSmsPDUProcessor::DeletePDUL()
{
- OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPDUPROCESSOR_DELETEPDUL_1, "CSmsPDUProcessor::DeletePDUL()");
+ LOGSMSPROT1("CSmsPDUProcessor::DeletePDUL()");
//
// If the slot number has an index and store assigned, then we can delete