FCL/sf/os/cellularsrv: comparison smsprotocols/smsstack/smsprot/Src/smspmondsk.cpp

equal deleted inserted replaced

-:17af172ffa5f
+:630d2f34d719
-// Copyright (c) 1999-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1999-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"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 /**
 @file
 @internalComponent
 */
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "smspmondskTraces.h"
+#endif
 #include <barsc.h>
 #include <bautils.h>
 #include "smspcomm.h"
 #include "smspmondsk.h"
 *
 *  @return a newly created CSmsMonitorDiskSpace object.
 */
 CSmsMonitorDiskSpace* CSmsMonitorDiskSpace::NewL(MSmsComm& aSmsComm, RMobileSmsMessaging& aSmsMessaging,RFs& aFs)
 	{
-	LOGSMSPROT1("CSmsMonitorDiskSpace::NewL()");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_NEWL_1, "CSmsMonitorDiskSpace::NewL()");
 	CSmsMonitorDiskSpace*  self = new(ELeave) CSmsMonitorDiskSpace(aSmsComm, aSmsMessaging, aFs);
 	CleanupStack::PushL(self);
 	self->ConstructL();
 	CleanupStack::Pop();
 #endif
 	//
 	// Log the filename in use and whether it is ROM based...
 	//
-#ifdef _SMS_LOGGING_ENABLED
+	OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_1, "CSmsMonitorDiskSpace::ConstructL(): fileName=\"%S\"", fileName);
-	TBuf8<KMaxFileName>  buf8;
-	buf8.Copy(fileName);
-	LOGSMSPROT2("CSmsMonitorDiskSpace::ConstructL(): fileName=\"%S\"", &buf8);
-#endif
 if (iFs.IsFileInRom(fileName) == NULL)
 	{
-	LOGSMSPROT1("CSmsMonitorDiskSpace::ConstructL(): Smsu.rsc not in ROM");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_2, "CSmsMonitorDiskSpace::ConstructL(): Smsu.rsc not in ROM");
 	}
 	//
 	// Read the low and high limits...
 	//
 iInOODTesting = ETrue;
 TInt ret = iFreeDiskSpaceProperty.Attach(KUidPSSMSStackCategory, KUidPSSMSStackFreeDiskSpaceKey);
 if (ret != KErrNone)
 {
-LOGSMSPROT2("iFreeDiskSpaceProperty.Attach(): error=%d", ret);
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_3, "iFreeDiskSpaceProperty.Attach(): error=%d", ret);
 User::Leave(ret);
 }
 }
 #endif
-	LOGSMSPROT3("CSmsMonitorDiskSpace::ConstructL(): iLowLimit=%d, iHighLimit=%d",
+	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CONSTRUCTL_4, "CSmsMonitorDiskSpace::ConstructL(): iLowLimit=%u, iHighLimit=%u",iLowLimit, iHighLimit);
-			    iLowLimit, iHighLimit);
 	} // CSmsMonitorDiskSpace::ConstructL
 /**
 *  Handles a completed disk monitor or resume request.
 */
 void CSmsMonitorDiskSpace::RunL()
 	{
-	LOGSMSPROT3("CSmsMonitorDiskSpace:RunL(): iStatus=%d, iState=%d",
+	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_RUNL_1, "CSmsMonitorDiskSpace:RunL(): iStatus=%d, iState=%d",iStatus.Int(), iState );
-	            iStatus.Int(), iState );
 	switch (iState)
 		{
 		case ESmsMonitorDiskSpaceMonitorLowLimit:
 			{
 /**
 *  Handles a request to cancel the current state machine operation.
 */
 void CSmsMonitorDiskSpace::DoCancel()
 	{
-	LOGSMSPROT2("CSmsMonitorDiskSpace::DoCancel(): iState=%d", iState);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_DOCANCEL_1, "CSmsMonitorDiskSpace::DoCancel(): iState=%d", iState);
 switch (iState)
 		{
 		case ESmsMonitorDiskSpaceIdle:
 			{
 /**
 *  Checks for enough disk space, and starts monitoring disk space if needed.
 */
 void CSmsMonitorDiskSpace::CheckDiskSpaceForPDUL(TBool aPDUIsClass0)
 	{
-	LOGSMSPROT2("CSmsMonitorDiskSpace::CheckDiskSpaceForPDUL(): aPDUIsClass0=%d",
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_CHECKDISKSPACEFORPDUL_1, "CSmsMonitorDiskSpace::CheckDiskSpaceForPDUL(): aPDUIsClass0=%d",aPDUIsClass0);
-				aPDUIsClass0);
 	//
 	// First check the actual disk space before working out what to do.
 	//
 	// If enough space exists, then we don't need to do anything else (even if
 *  @param aState  State to transition to when this request is made.
 */
 void CSmsMonitorDiskSpace::NotifyDiskSpace(TInt aLimit,
 										   TSmsMonitorDiskSpaceState aState)
 	{
-	LOGSMSPROT3("CSmsMonitorDiskSpace::NotifyDiskSpace(): aLimit=%d, aState=%d",
+	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_NOTIFYDISKSPACE_1, "CSmsMonitorDiskSpace::NotifyDiskSpace(): aLimit=%d, aState=%d",aLimit, aState);
-				aLimit, aState);
 	//
 	// Cancel any previously outstanding requests...
 	//
 	if (iState != ESmsMonitorDiskSpaceIdle)
 *         SMS may attempt to be delivered, but monitoring will restart as
 *         before. So again no problem.
 */
 void CSmsMonitorDiskSpace::ResumeSmsReception()
 	{
-	LOGSMSPROT1("CSmsMonitorDiskSpace::ResumeSmsReception");
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_RESUMESMSRECEPTION_1, "CSmsMonitorDiskSpace::ResumeSmsReception");
 	//
 	// Cancel any previously outstanding requests...
 	//
 	if (iState != ESmsMonitorDiskSpaceIdle)
 	// Get the volume info for drive C:...
 	//
 	if (ret != KErrNone)
 		{
-		LOGSMSPROT2("CSmsMonitorDiskSpace::GetFreeDiskSpace(): error=%d", ret);
+		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_GETFREEDISKSPACE_1, "CSmsMonitorDiskSpace::GetFreeDiskSpace(): error=%d", ret);
 		return KErrGeneral;
 		}
 	//
 	// Convert the disk space value to a TInt (allowing 2GB limits)...
 	else
 		{
 		freeSpace = (TInt) volumeInfo.iFree;
 		}
-	LOGSMSPROT2("CSmsMonitorDiskSpace::GetFreeDiskSpace(): freeSpace=%d", freeSpace);
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSMONITORDISKSPACE_GETFREEDISKSPACE_2, "CSmsMonitorDiskSpace::GetFreeDiskSpace(): freeSpace=%d", freeSpace);
 	return freeSpace;
 	} // CSmsMonitorDiskSpace::GetFreeDiskSpace

branch	RCL_3
changeset 65	630d2f34d719
parent 0	3553901f7fa8
child 66	07a122eea281