MCL/sf/os/cellularsrv: comparison telephonyprotocols/psdagt/src/psdstates.cpp

equal deleted inserted replaced

-:630d2f34d719
+:07a122eea281
-// 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"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 /**
 @file PsdStates.cpp
 */
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "psdstatesTraces.h"
-#endif
 #include <comms-infras/cagentsmbase.h>
 #include <etelpckt.h>
 #include <connectprog.h>  // for circuit-switched progress enums
 #include <netconerror.h>
 #include "psdlogger.h"
 #include "psdstates.h"
 #include "psdagt.h"
 #include "psdprog.h"
+#include "debuglogger.h"
 #include <logengevents.h>
 CPsdOutInit::CPsdOutInit(MAgentStateMachineEnv* aObserver,MPsdEnv* aPsdSM, MPsdCommDbAccess* aDb)
 : CPsdInitBase(aObserver,aPsdSM,aDb)
 /**
 Internal function that performs all the initialisation of the common resources
 held by the state machine for use by subsequent states
 */
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDINITBASE_DOSTARTSTATEL_1, "Packet Data:\tInitialising");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tInitialising");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
 	iSMObserver->PreventConnectionRetries();
 	//
 	//	PSD AGX does not allow any more connection retries. It assumes that GenConn has
 	//  already done the packet network availability check, so we would only get to this stage
 	//	should there be packet network (or if it was unknown).
 void CPsdInitBase::RunL()
 /**
 Complete state for the initialisation state for both incomming and outgoing connections.
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDINITBASE_RUNL_1, "Packet Data:\tInitialised");
+	__FLOG_STMT(_LIT8(logString2,"Packet Data:\tInitialised");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString2());
 	if (iStatus!=KErrNone)
 		iSMObserver->ConnectionComplete(EPsdStartingConfiguration,iStatus.Int()); // correct progress?
 	else
 		iSM->BaseEnv().CompleteState(KErrNone);	// this tells the SM to move onto the next state
 	}
 	const CPsdContextConfig& config = iSM->Config();
 	if(!config.IsConfigSupportedL(packetNetwork,iSM->Direction()) )
 		{
 		User::Leave(KErrNotSupported);
 		}
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCHECKCONFIG_DOINITL_1,"Packet Data:\tChecked Config");
+	__FLOG_STMT(_LIT8(logString2,"Packet Data:\tChecked Config");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString2());
 	}
 void CPsdCheckConfig::RunL()
 /**
 Complete state for the config checking state for both incomming and outgoing connections.
 */
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDNETWORKCHECK_STARTSTATE_1,"Packet Data:\tChecking network availability");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tChecking network availability");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
 	iSubState = EGettingInitialStatus;
 	iSM->PacketNetwork().GetNtwkRegStatus(iStatus,iRegStatus);
 	SetActive();
 	}
 	if (iRegStatus==RPacketService::ERegistrationDenied ||
 		iRegStatus==RPacketService::ENotRegisteredNotSearching ||
 		iRegStatus==RPacketService::ENotRegisteredAndNotAvailable)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDNETWORKCHECK_DONETWORKCHECK_1, "Packet Data:\tNo network");
+		__FLOG_STMT(_LIT8(logString1,"Packet Data:\tNo network");)
+		__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
 		JumpToRunl(KErrNetConNoGPRSNetwork);
 		return;
 		}
 	if (iRegStatus==RPacketService::ERegisteredOnHomeNetwork ||
 		iRegStatus==RPacketService::ERegisteredRoaming ||
 		iRegStatus==RPacketService::ENotRegisteredButAvailable ||
 		iRegStatus==RPacketService::EUnknown)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDNETWORKCHECK_DONETWORKCHECK_2,"Packet Data:\tReg status %d. Proceeding",iRegStatus);
+		__FLOG_STMT(_LIT8(logString1,"Packet Data:\tReg status %d. Proceeding");)
+		__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),iRegStatus);
 		iSM->BaseEnv().CompleteState(KErrNone);
 		return;
 		}
 Function called by the genconn state machine framework to start the state
 */
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDWAITFORINCOMING_STARTSTATE_1,"Packet Data:\tWaiting for incoming Packet request");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tWaiting for incoming Packet request");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 	iSM->PacketNetwork().NotifyContextActivationRequested(iStatus,iPdpTypeRequested,iAddressRequested);
 	SetActive();
 	}
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
 	if (iStatus==KErrNone)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDWAITFORINCOMING_RUNL_1, "Packet Data:\tReceived network context activation request");
+		__FLOG_STMT(_LIT8(logString1,"Packet Data:\tReceived network context activation request");)
+		__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 		if(iSM->Config().QueryIfIncommingConnectionAcceptable(iPdpTypeRequested,iAddressRequested) )
 			{
 			iSMObserver->UpdateProgress(EPsdAnsweringIncoming,KErrNone);
 			TInt ret = iSMObserver->IncomingConnectionReceived();	// to switch NIFMAN to connecting
 */
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCREATECONTEXT_STARTSTATE_1, "Packet Data:\tCreating context");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tCreating context");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 	RPacketService& packetNetwork = iSM->PacketNetwork();
 	RPacketContext& context = iSM->Context();
 	TName name;
 */
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCREATECONTEXT_RUNL_1, "Packet Data:\tCompleted with error %d",iStatus.Int());
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tCompleted with error %d");)
+	__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),iStatus.Int());
 	if (iStatus==KErrNone)
 		{
 		// Have added new configure qos state that follows this one
 		// therefore don't report config completion until that state has finished
 */
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCREATEQOS_STARTSTATE_1, "Packet Data:\tCreating QoS");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tCreating QoS");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 	RPacketContext& context = iSM->Context();
 	RPacketQoS& qoS = iSM->QoS();
 	TName name;
 */
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCREATEQOS_RUNL_1,"Packet Data:\tCompleted with error %d",iStatus.Int());
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tCompleted with error %d");)
+	__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),iStatus.Int());
 	if (iStatus==KErrNone)
 		{
 		iSMObserver->UpdateProgress(EPsdFinishedConfiguration,KErrNone);
 		iSM->BaseEnv().CompleteState(KErrNone);
 */
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDACTIVATECONTEXT_STARTSTATE_1, "Packet Data:\tActivating context");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tActivating context");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 	iSMObserver->UpdateProgress(EPsdStartingActivation,KErrNone);
 	// Check if the context is already active since in the reconnect case it may be
 	RPacketContext::TContextStatus contextStatus;
 	iSM->Context().GetStatus(contextStatus);
 */
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	__ASSERT_DEBUG(iSMObserver,User::Invariant());
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDACTIVATECONTEXT_RUNL_1, "Packet Data:\tCompleted with error %d",iStatus.Int());
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tCompleted with error %d");)
+	__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),iStatus.Int());
 	if( (iSubState==EActivatingContext&&(iStatus==KErrNone || iStatus==KErrNotSupported) )
 		||(iSubState==ELoaningCommPort&&iStatus==KErrNone) )
 		{
 		if(iSubState==EActivatingContext)
 				}
 			else
 				{
 				iSMObserver->UpdateProgress(EPsdFinishedActivation,KErrNone);// may want to do this when it really
 																// activates
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDACTIVATECONTEXT_RUNL_2,"Packet Data:\tHanding control to PPP");
+				__FLOG_STMT(_LIT8(logString1,"Packet Data:\tHanding control to PPP");)
+				__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 				iSMObserver->ServiceStarted();
 				iSM->BaseEnv().CompleteState(KErrNone);
 				}
 			}
 	//wait for TSY to tell us it has become active. This is because calling Activate()
 	//doesn't necessarily mean it's activated in the network - have to wait for PPP to do its
 	//stuff.
 	RequestStatusChange();
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_STARTSTATE_1, "Packet Data:\tCalling ConnectionComplete");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tCalling ConnectionComplete");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
 	iSMObserver->Notification(EAgentToNifEventTypeModifyInitialTimer,NULL);
 	iSMObserver->UpdateProgress(KConnectionOpen,KErrNone); // I think NIFMAN just swallows this after
 												// a ConnectComplete(Open)
 	iSMObserver->ConnectionComplete(KConnectionOpen,KErrNone);
 		TRAPD(err, iDbPsd->GetRemotePartyL(remoteParty));
 		// logg err
 		if(err != KErrNone)
 			{
 #ifdef __FLOG_ACTIVE
-			OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_LOGACTIVE_1, "CPsdOpen:\t Error in getting remote party %d.",err);
+			_LIT8(logString1,"CPsdOpen:\t Error in getting remote party %d.");
+			__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),err);
 #endif
 			}
 		iEventLoggerStarted = ETrue;
 		if (!iSM->BaseEnv().IsReconnect())
 			{
 Update progress for open state.
 */
 	{
 	__ASSERT_DEBUG(iSM && iSMObserver,User::Invariant());
+	__FLOG_STMT(_LIT8(logString1,"PacketData:\tStatus change to %s\0");)
 	if (iStatus==KErrNone)
 		{
 		switch (iContextStatus)
 			{
 		case RPacketContext::EStatusSuspended:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_1, "PacketData:\tStatus change to suspended");
+			__FLOG_STMT(const TText8 value[] = "suspended";)
+			__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 			iSMObserver->Notification(EAgentToNifEventTypeDisableTimers,NULL);
 			iSMObserver->UpdateProgress(EPsdSuspended,KErrNone);
 			iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_SUSPENDED, KLogPacketDataEventTypeUid);
 			RequestStatusChange();
 			}
 		case RPacketContext::EStatusActive:
 			{
 			// if reconnect happened then the logger is allready started and we just do an update
 			if (!iEventLoggerStarted)
 				{
-OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_2, "PacketData:\tStatus change to log active");
+				__FLOG_STMT(const TText8 value[] = "log active";)
+				__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 				WatchForConfigChangesL();	//those 2 functions should have been called in start state but
 				LogActive();				//RPacketContext was not EStatusActive at that time
 				}
 			else	// the LogCallStart() has completed
 				{
 				iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_CONNECTED, KLogPacketDataEventTypeUid);
-				OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_3, "PacketData:\tStatus change to active");
+				__FLOG_STMT(const TText8 value[] = "active";)
+				__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 				}
 			iSMObserver->Notification(EAgentToNifEventTypeEnableTimers,NULL);
 			iSMObserver->UpdateProgress(KConnectionOpen,KErrNone);
 			RequestStatusChange();
 			}
 			break;
 		case RPacketContext::EStatusDeactivating:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_4, "PacketData:\tStatus change to deactivating");
+			__FLOG_STMT(const TText8 value[] = "deactivating";)
+			__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 			iSMObserver->UpdateProgress(EPsdStartingDeactivation,KErrNone);
 			iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTING, KLogPacketDataEventTypeUid);
 			RequestStatusChange();
 			}
 			break;
 		case RPacketContext::EStatusInactive:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_5, "PacketData:\tStatus change to inactive");
+			__FLOG_STMT(const TText8 value[] = "inactive";)
+			__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 			iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTED, KLogPacketDataEventTypeUid);
 			}
 			break;
 		case RPacketContext::EStatusDeleted:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_6, "PacketData:\tStatus change to deleted");
+			__FLOG_STMT(const TText8 value[] = "deleted";)
+			__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 			iSMObserver->UpdateProgress(EPsdFinishedDeactivation,KErrNone);
 			iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_DISCONNECTED, KLogPacketDataEventTypeUid);
 			}
 			break;
 		case RPacketContext::EStatusActivating:
 			{
-			OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDOPEN_RUNL_7, "PacketData:\tStatus change to activating");
+			__FLOG_STMT(const TText8 value[] = "activating";)
+			__FLOG_STATIC1(KPsdAgxLogFolder(),KPsdAgxLogFile(),TRefByValue<const TDesC8>(logString1()),&value);
 			iSM->Logger()->LogDataUpdateEvent(R_LOG_CON_CONNECTING, KLogPacketDataEventTypeUid);
 			RequestStatusChange();
 			}
 			break;
 		default:
 Function called by the genconn state machine framework to start the state
 */
 	{
 	__ASSERT_DEBUG(iSM && iSMObserver,User::Invariant());
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDRECOVERCOMMPORT_STARTSTATE_1, "Packet Data:\tRecovering Comm Port to ETel");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tRecovering Comm Port to ETel");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 	iSMObserver->UpdateProgress(EPsdStartingDeactivation,KErrNone);
 	iSM->Context().RecoverCommPort(iStatus);
 	SetActive();
 	}
 Complete state for Recover comm port state.
 */
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
 	// what can we do with errors at this stage in the game?
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDRECOVERCOMMPORT_RUNL_1, "Packet Data:\tRecovered Comm Port");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tRecovered Comm Port");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 	iSM->BaseEnv().CompleteState(KErrNone);
 	}
 void CPsdRecoverCommPort::DoCancel()
 void CPsdCloseLog::StartState()
 /**
 Function called by the genconn state machine framework to start the state
 */
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCLOSELOG_STARTSTATE_1, "Packet Data:\tClosing Log");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tClosing Log");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1());
 	// We need to make sure that logging is finished before closing everything.
 	// forward iStatus to the logger, which will be responsible to complete iStatus when it is finished.
 			iStatus = KRequestPending;
 			SetActive();
 	iSM->Logger()->LogDataNotifyLastEventUpdate(&iStatus);
 Function called by the genconn state machine framework to start the state
 */
 	{
 	__ASSERT_DEBUG(iSM,User::Invariant());
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDDEACTIVATION_STARTSTATE_1, "Packet Data:\tDeactivating Context");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tDeactivating Context");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 	iSM->Context().Deactivate(iStatus);
 	SetActive();
 	}
 Complete state for deactivation state.
 */
 	{
 	__ASSERT_DEBUG(iSM && iSMObserver,User::Invariant());
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDDEACTIVATION_RUNL_1,"Packet Data:\tDeactivated Context");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tDeactivated Context");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 	iSMObserver->UpdateProgress(EPsdFinishedDeactivation,KErrNone);
 	iSM->BaseEnv().CompleteState(KErrNone);
 	}
 Complete Disconnection for closure state.
 */
 	{
 	__ASSERT_DEBUG(iSM && iSMObserver,User::Invariant());
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CPSDCLOSURE_RUNL_1,"Packet Data:\tClosing down");
+	__FLOG_STMT(_LIT8(logString1,"Packet Data:\tClosing down");)
+	__FLOG_STATIC(KPsdAgxLogFolder(),KPsdAgxLogFile(),logString1);
 	RTelServer& etel = iSM->TelServer();
 	RPhone& phone = iSM->Phone();
 	RPacketService& packetNetwork = iSM->PacketNetwork();
 	RPacketContext& context = iSM->Context();

branch	RCL_3
changeset 20	07a122eea281
parent 19	630d2f34d719