FCL/sf/mw/remoteconn: comparison backupandrestore/backupengine/src/sbedataownermanager.cpp

equal deleted inserted replaced

-:a5deb6b96675
+:63cf70d3ecd8
 */
 #include "sbpackagedatatransfer.h"
 #include "sbedataowner.h"
 #include "sbedataownermanager.h"
 #include "sbebufferhandler.h"
-#include "sblog.h"
 #include "abserver.h"
 #include "sbecompressionandencryption.h"
 #include <e32svr.h>
 #include <ezcompressor.h>
 #include <ezdecompressor.h>
 #include <swi/sisregistrypackage.h>
 #include <swi/sisregistryentry.h>
 #include <swi/swispubsubdefs.h>
+#include "OstTraceDefinitions.h"
+#include "sbtrace.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "sbedataownermanagerTraces.h"
+#endif
 namespace conn
 	{
 	const TInt KSID = 0x10202D56;
 	_LIT_SECURITY_POLICY_S0(KWritePolicy, KSID);
 	CDataOwnerContainer* CDataOwnerContainer::NewL(TSecureId aSecureId, CDataOwnerManager* apDataOwnerManager)
 	/** Symbian OS static constructor
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERCONTAINER_NEWL_ENTRY );
 		CDataOwnerContainer* self = new(ELeave) CDataOwnerContainer(aSecureId);
 		CleanupStack::PushL(self);
 		self->ConstructL(apDataOwnerManager);
 		CleanupStack::Pop(self);
+		OstTraceFunctionExit0( CDATAOWNERCONTAINER_NEWL_EXIT );
 		return self;
 		}
 	CDataOwnerContainer::CDataOwnerContainer(TSecureId aSecureId) :
 		iSecureId(aSecureId)
 	/** Standard C++ constructor
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_CONS_ENTRY );
+		OstTraceFunctionExit0( CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_CONS_EXIT );
 		}
 	CDataOwnerContainer::~CDataOwnerContainer()
 		{
+		OstTraceFunctionEntry0( CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_DES_ENTRY );
 		delete ipDataOwner;
+		OstTraceFunctionExit0( CDATAOWNERCONTAINER_CDATAOWNERCONTAINER_DES_EXIT );
 		}
 	void CDataOwnerContainer::ConstructL(CDataOwnerManager* apDataOwnerManager)
 	/* Symbian second phase constructor
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERCONTAINER_CONSTRUCTL_ENTRY );
 		ipDataOwner = CDataOwner::NewL(iSecureId, apDataOwnerManager);
+		OstTraceFunctionExit0( CDATAOWNERCONTAINER_CONSTRUCTL_EXIT );
 		}
 	TSecureId CDataOwnerContainer::SecureId() const
 	/** Secure Id accessor
 	@see RArray::Sort()
 	*/
 	TInt CDataOwnerContainer::Compare(const CDataOwnerContainer& aFirst, const CDataOwnerContainer& aSecond)
 		{
+		OstTraceFunctionEntry0( CDATAOWNERCONTAINER_COMPARE_ENTRY );
 		if (aFirst.SecureId() < aSecond.SecureId())
 			{
+			OstTraceFunctionExit0( CDATAOWNERCONTAINER_COMPARE_EXIT );
 			return -1;
 			}
 		else if (aFirst.SecureId() > aSecond.SecureId())
 			{
+			OstTraceFunctionExit0( DUP1_CDATAOWNERCONTAINER_COMPARE_EXIT );
 			return 1;
 			}
 		else
 			{
+			OstTraceFunctionExit0( DUP2_CDATAOWNERCONTAINER_COMPARE_EXIT );
 			return 0;
 			}
 		}
 	/**
 	CDataOwnerManager* CDataOwnerManager::NewLC()
 	/** Symbian OS static constructor
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_NEWLC_ENTRY );
 		CDataOwnerManager* self	= new(ELeave) CDataOwnerManager();
 		CleanupStack::PushL(self);
 		self->ConstructL();
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_NEWLC_EXIT );
 		return self;
 		}
 	CDataOwnerManager::CDataOwnerManager()
 	*/
 	: ipABServer(NULL), iBufferFileReader(NULL), iDecompressor(NULL),
 	  iResetAfterRestore(EFalse), iJavaDOM(NULL), iSIDListForPartial(NULL),
 	  iConfig(NULL), iBaBackupSession(NULL)
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_CDATAOWNERMANAGER_CONS_ENTRY );
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_CDATAOWNERMANAGER_CONS_EXIT );
 		}
 	void CDataOwnerManager::ConstructL()
 	/** Symbian OS second phase contrutor
 	*/
 		{
-		User::LeaveIfError(iFs.Connect());
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_CONSTRUCTL_ENTRY );
-		TInt err = RProperty::Define(TUid::Uid(KUidSystemCategoryValue),
+		TInt err = iFs.Connect();
+		LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP4_CDATAOWNERMANAGER_CONSTRUCTL, "Leave: %d", err));
+		err = RProperty::Define(TUid::Uid(KUidSystemCategoryValue),
 						  KUidBackupRestoreKey,
 						  RProperty::EInt, KReadPolicy, KWritePolicy, 0);
 		if ((err != KErrNone) && (err != KErrAlreadyExists))
 			{
+		    OstTrace1(TRACE_ERROR, DUP3_CDATAOWNERMANAGER_CONSTRUCTL, "Leave: %d", err);
 			User::Leave(err);
 			}
 		// Load a reference plugin with implementation Uid 0x2000D926
 		const TUid aImplementationUid = { 0x2000D926 };
 		iDecompressor = CSBEDecompressAndEncrypt::NewL();
 		iConfig = CSBEConfig::NewL(iFs);
 		TRAP(err, iConfig->ParseL());
 		if (err != KErrNone)
 			{
-			__LOG1("Error trying to parse sbeconfig.xml : %d", err);
+		    OstTrace1(TRACE_NORMAL, CDATAOWNERMANAGER_CONSTRUCTL, "Error trying to parse sbeconfig.xml : %d", err);
-			__LOG("Using Default Settings !");
+		    OstTrace0(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_CONSTRUCTL, "Using Default Settings !");
 			iConfig->SetDefault();
 			}
 		else
 			{
-			__LOG("sbeconfig.xml parsed sucessfully");
+		    OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_CONSTRUCTL, "sbeconfig.xml parsed sucessfully");
 			}
 		iBaBackupSession = CBaBackupSessionWrapper::NewL();
 		iParserProxy = CSBEParserProxy::NewL(iFs);
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_CONSTRUCTL_EXIT );
 		}
 	CDataOwnerManager::~CDataOwnerManager()
 	/** C++ Destructor
 	when objects are destroyed (deallocated).
 	The destructor is commonly used to "clean up" when an object is no longer necessary.
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_CDATAOWNERMANAGER_DES_ENTRY );
 		if(iJavaDOM)
 			{
 			delete iJavaDOM;
 			}
 			iSIDListForPartial->Close();
 			delete iSIDListForPartial;
 			}
 		delete iConfig;
 		delete iBaBackupSession;
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_CDATAOWNERMANAGER_DES_EXIT );
 		}
 	void CDataOwnerManager::AllSystemFilesRestoredL()
 	/**
 	Handle send from the client informing us that the reg files have now all been supplied and
 	we can parse/start active data owners etc.
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL_ENTRY );
 		if(iBURType == EBURRestoreFull || iBURType == EBURRestorePartial)
 			{
-			__LOG("CDataOwnerManager::AllSystemFilesRestored() - called, parse reg files & start active DO's");
+		    OstTrace0(TRACE_NORMAL, CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "called, parse reg files & start active DO's");
 			// Build the list of dataOwners
 			TInt err;
 			TRAP(err, FindDataOwnersL());
 			if (err != KErrNone)
 				{
-				__LOG1("CDataOwnerManager::AllSystemFilesRestored() - Error while finding data owners: %d", err);
+			    OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "Error while finding data owners: %d", err);
 				}
 			TInt doCount = iDataOwners.Count();
 			// Loop throught the list
 			// update partial state of active data owners
 			TRAP(err, UpdateDataOwnersPartialStateL());
 			if (err != KErrNone)
 				{
-				__LOG1("CDataOwnerManager::AllSystemFilesRestored() - Error while updating state: %d", err);
+			    OstTrace1(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "Error while updating state: %d", err);
 				}
 			for (TInt index = 0; index < doCount; index++)
 				{
 				// Start data owning process if necessary for active data owners
 				TRAP(err, iDataOwners[index]->DataOwner().StartProcessIfNecessaryL());
 				if (err != KErrNone)
 					{
-					__LOG1("CDataOwnerManager::AllSystemFilesRestored() - Error while starting process if necessary: %d", err);
+				    OstTrace1(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "Error while starting process if necessary: %d", err);
 					}
 				// Set up the internal state of the data owners now that all reg files and proxies are back
 				TRAP(err, iDataOwners[index]->DataOwner().BuildDriveStateArrayL());
 				if (err != KErrNone)
 					{
-					__LOG1("CDataOwnerManager::AllSystemFilesRestored() - Error while building drive array: %d", err);
+				    OstTrace1(TRACE_NORMAL, DUP4_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "Error while building drive array: %d", err);
 					}
 				}
 			if(iJavaDOM)
 				{
 				TRAP_IGNORE(iJavaDOM->AllSystemFilesRestored());
 				}
 			else
 				{
-				__LOG("CDataOwnerManager::AllSystemFilesRestored() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
+			    OstTrace0(TRACE_NORMAL, DUP5_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
 				}
 			// now deal with special case packages
 			CDesCArray* files = new(ELeave) CDesCArrayFlat(KDesCArrayGranularity);
 			CleanupStack::PushL(files);
 						TRAP(err, pDataTransfer->SetRegistrationFileL(fileName));
 						if (err == KErrNone)
 							{
 							TRAP(err, pDataTransfer->ParseL());
 							}
-						__LOG2("CDataOwnerManager::AllSystemFilesRestored() - found reg file: %S for Package: 0x%08x", &fileName, sid.iId);
+						OstTraceExt2(TRACE_NORMAL, DUP6_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "found reg file: %S for Package: 0x%08x", fileName, sid.iId);
 						}
 					if (err == KErrNoMemory)
 						{
+					    OstTrace0(TRACE_ERROR, DUP8_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "Leave: KErrNoMemory");
 						User::Leave(KErrNoMemory);
 						}
 					}
 				} // for
 			CleanupStack::PopAndDestroy(files);
 			} // end if
 		else
 			{
-			__LOG("CDataOwnerManager::AllSystemFilesRestored() - *Error: called when device is not in Restore mode !");
+		    OstTrace0(TRACE_NORMAL, DUP7_CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL, "*Error: called when device is not in Restore mode !");
 			}
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_ALLSYSTEMFILESRESTOREDL_EXIT );
 		}
 	void CDataOwnerManager::SetBURModeL(const TDriveList& aDriveList, TBURPartType aBURType,
 						 		   	   TBackupIncType aBackupIncType)
 	@param aBURType the type
 	@param aBackupIncType the incremental type
 	@leave KErrInUse a Software install is in progress, plus system wide errors
 	*/
 		{
-		__LOG2("CDataOwnerManager::SetBURModeL() - Request new BURType (0x%08x), IncType (0x%08x)", aBURType, aBackupIncType);
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_SETBURMODEL_ENTRY );
-		__LOG2("CDataOwnerManager::SetBURModeL() - Previous BURType (0x%08x), IncType (0x%08x)", iBURType, iIncType);
+		OstTraceExt2(TRACE_NORMAL, CDATAOWNERMANAGER_SETBURMODEL, "Request new BURType (0x%08x), IncType (0x%08x)", aBURType, aBackupIncType);
+		OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_SETBURMODEL, "CDataOwnerManager::SetBURModeL() - Previous BURType (0x%08x), IncType (0x%08x)", iBURType, iIncType);
 		// Ensure that the device can't transition directly from backup to restore mode. It must
 		// go through a normal state first. Allow the state to be set to the same.
 		switch(aBURType)
 			{
 			case EBURNormal:
 			// allow to set Normal mode in any case. no need to do anything if previous mode was Normal
 				if (iBURType == EBURNormal)
 					{
+					OstTraceFunctionExit0( CDATAOWNERMANAGER_SETBURMODEL_EXIT );
 					return;
 					}
 				break;
 			case EBURUnset:
 			// don't do anything if previous modes were Normal or Unset
 				if (iBURType == EBURNormal || iBURType == EBURUnset)
 					{
+					OstTraceFunctionExit0( DUP1_CDATAOWNERMANAGER_SETBURMODEL_EXIT );
 					return;
 					}
 				break;
 			case EBURBackupFull:
 			case EBURBackupPartial:
 			case EBURRestoreFull:
 			case EBURRestorePartial:
 			// don't allow mode change unless , device was put into normal mode before
 				if (iBURType != EBURNormal && iBURType != EBURUnset)
 					{
-					__LOG2("CDataOwnerManager::SetBURModeL() - *Error: BUR type has not transitioned between modes correctly, %d became %d", iBURType, aBURType);
+				    OstTraceExt2(TRACE_ERROR, DUP2_CDATAOWNERMANAGER_SETBURMODEL, "*Error: BUR type has not transitioned between modes correctly, %d became %d", iBURType, aBURType);
 					User::Leave(KErrCorrupt);
 					}
 				break;
 			} // switch
 		TBURPartType previousBURType = iBURType;
 		// Need to reset the list of data owners, and old style babackup
 		if ((aBURType == EBURNormal) || (aBURType == EBURUnset))
 			{
-			__LOG1("CDataOwnerManager::SetBURModeL() - Going Normal/Unset/NoBackup (%d)", aBURType);
+		    OstTrace1(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_SETBURMODEL, "Going Normal/Unset/NoBackup (%d)", aBURType);
 			// If we've transitioned from a Restore to a Normal mode, we need to send a RestoreComplete
 			if (previousBURType == EBURRestoreFull || previousBURType == EBURRestorePartial)
 				{
-				__LOG("CDataOwnerManager::SetBURModeL() - Calling RestoreCompleteL on all active data owners");
+			    OstTrace0(TRACE_NORMAL, DUP4_CDATAOWNERMANAGER_SETBURMODEL, "Calling RestoreCompleteL on all active data owners");
 				TInt restoreCompleteCount = iDataOwners.Count();
 				for (TInt index = 0; index < restoreCompleteCount; index++)
 					{
 					// Start data owning process if necessary for active data owners
 				}
 			iResetAfterRestore = EFalse;
 			iDataOwners.ResetAndDestroy();
 			iPackageDataOwners.ResetAndDestroy();
-			__LOG("CDataOwnerManager::SetBURModeL() - Restart All Non-System Applications");
+			OstTrace0(TRACE_NORMAL, DUP5_CDATAOWNERMANAGER_SETBURMODEL, "Restart All Non-System Applications");
 			iBaBackupSession->NotifyBackupOperationL(TBackupOperationAttributes(MBackupObserver::ETakeLock, MBackupOperationObserver::EEnd));
 			iBaBackupSession->RestartAll();
 			}
 		else
 			{
 			// Check that SWInstall are not doing anything.
 			TInt value;
 			TInt regErr = RProperty::Get(KUidSystemCategory, Swi::KUidSoftwareInstallKey, value);
 			if (regErr == KErrNone && value != Swi::ESwisNone)
 				{
-				__LOG("CDataOwnerManager::SetBURModeL() - *Error: Leave software Install in progress.");
+			    OstTrace0(TRACE_ERROR, DUP6_CDATAOWNERMANAGER_SETBURMODEL, "*Error: Leave software Install in progress.");
 				User::Leave(KErrInUse);
 				} // if
 			else if (regErr != KErrNotFound && regErr != KErrNone)
 				{
-				__LOG("CDataOwnerManager::SetBURModeL() - *Error: Leave could not get KUidSoftwareInsallKey");
+			    OstTrace0(TRACE_ERROR, DUP7_CDATAOWNERMANAGER_SETBURMODEL, "*Error: Leave could not get KUidSoftwareInsallKey");
 				User::Leave(regErr);
 				} // else
 			// Clobber files that are locked open
 			TRequestStatus status;
-			__LOG("CDataOwnerManager::SetBURModeL() - Calling CloseAll()");
+			OstTrace0(TRACE_NORMAL, DUP8_CDATAOWNERMANAGER_SETBURMODEL, "Calling CloseAll()");
 			if(aBURType == EBURBackupFull || aBURType == EBURBackupPartial)
 				{
 				TBackupOperationAttributes atts(MBackupObserver::EReleaseLockReadOnly, MBackupOperationObserver::EStart);
 				iBaBackupSession->NotifyBackupOperationL(atts);
 				iBaBackupSession->CloseAll(MBackupObserver::EReleaseLockReadOnly, status);
 				iBaBackupSession->NotifyBackupOperationL(atts);
 				iBaBackupSession->CloseAll(MBackupObserver::EReleaseLockNoAccess, status);
 				}
 		 	User::WaitForRequest(status);
-			__LOG("CDataOwnerManager::SetBURModeL() - CloseAll() returned");
+		 	OstTrace0(TRACE_NORMAL, DUP9_CDATAOWNERMANAGER_SETBURMODEL, "CloseAll() returned");
 			// update partial state for active data owners
 			if (aBURType == EBURBackupPartial)
 				{
 				UpdateDataOwnersPartialStateL();
 					{
 					// Start data owning process if necessary for active data owners
 					TRAPD(err, iDataOwners[index]->DataOwner().StartProcessIfNecessaryL());
 					if (err != KErrNone)
 						{
-						__LOG2("CDataOwnerManager::SetBURModeL() - Data owner (or proxy) with SID 0x%08x errored (%d) whilst starting", iDataOwners[index]->SecureId().iId, err);
+					    OstTraceExt2(TRACE_NORMAL, DUP10_CDATAOWNERMANAGER_SETBURMODEL, "Data owner (or proxy) with SID 0x%08x errored (%d) whilst starting", iDataOwners[index]->SecureId().iId, static_cast<TInt32>(err));
 						}
 					}
 				}
 			}
 		TInt setError = RProperty::Set(TUid::Uid(KUidSystemCategoryValue), KUidBackupRestoreKey, aBURType | aBackupIncType);
-		__LOG3("CDataOwnerManager::SetBURModeL() - Setting P&S flag to BURType (0x%08x), IncType (0x%08x), err: ", aBURType, aBackupIncType, setError);
+		OstTraceExt3(TRACE_NORMAL, DUP11_CDATAOWNERMANAGER_SETBURMODEL, "Setting P&S flag to BURType (0x%08x), IncType (0x%08x), err: %d", static_cast<TUint>(aBURType), static_cast<TUint>(aBackupIncType), setError);
-		User::LeaveIfError(setError);
+		LEAVEIFERROR(setError, OstTrace1(TRACE_ERROR, DUP13_CDATAOWNERMANAGER_SETBURMODEL, "Leave: %d", setError));
 		// This configurable delay allows extra time to close all non-system apps.
 		TUint closeDelay = iConfig->AppCloseDelay();
 	 	if((closeDelay>0) && (aBURType == EBURBackupFull || aBURType == EBURBackupPartial ||
 	 	                      aBURType == EBURRestoreFull || aBURType == EBURRestorePartial))
 		//When we set back to normal mode, invalidate all current available
 		//CABSessions,since they could not be used in sequent backup/restore event
 		if (aBURType == EBURUnset || aBURType == EBURNormal)
 			{
-			__LOG1("Invalidate all ABSessions after set Setting P&S flag to 0x%08x", aBURType);
+		    OstTrace1(TRACE_NORMAL, DUP12_CDATAOWNERMANAGER_SETBURMODEL, "Invalidate all ABSessions after set Setting P&S flag to 0x%08x", aBURType);
 			ipABServer->InvalidateABSessions();
 			}
+		OstTraceFunctionExit0( DUP2_CDATAOWNERMANAGER_SETBURMODEL_EXIT );
 		}
 	void CDataOwnerManager::GetDataOwnersL(RPointerArray<CDataOwnerInfo>& aDataOwners)
 	/** Gets the Information about data owners
 	@param aDataOwners on return the list of data owners
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_GETDATAOWNERSL_ENTRY );
 		if (iBURType != EBURNormal && iBURType != EBURUnset)
 			{
-			__LOG("CDataOwnerManager::GetDataOwnersL() - *Error: ListOfDataOnwers called when device isn't in Normal/Unset mode");
+		    OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_GETDATAOWNERSL, "*Error: ListOfDataOnwers called when device isn't in Normal/Unset mode");
 			User::Leave(KErrAccessDenied);
 			}
 		// Build the list of dataOwners
 		FindDataOwnersL();
 		Swi::RSisRegistrySession registrySession;
-		User::LeaveIfError(registrySession.Connect());
+		TInt err = registrySession.Connect();
+		LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, DUP9_CDATAOWNERMANAGER_GETDATAOWNERSL, "Leave: %d", err));
 		CleanupClosePushL(registrySession);
-		TInt err = KErrNone;
+		err = KErrNone;
 		TUint count = iDataOwners.Count();
 		// Loop throught the list
 		while(count--)
 			{
 			CDataOwnerContainer* pContainer = iDataOwners[count];
 			// parse registration files
 			TRAP(err, dataOwner.ParseFilesL());
 			if (err != KErrNone)
 				{
-				__LOG2("CDataOwnerManager::GetDataOwnersL() - ParseFilesL() - Error in sid: 0x%08x (%d)", secureId.iId, err);
+			    OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_GETDATAOWNERSL, "ParseFilesL() - Error in sid: 0x%08x (%d)", secureId.iId, static_cast<TInt32>(err));
 				} // if
 			else
 				{
 				// Reset the state for these data owners
 				TRAP(err, dataOwner.BuildDriveStateArrayL());
 				if (err != KErrNone)
 					{
-					__LOG2("CDataOwnerManager::GetDataOwnersL() - BuildDriveStateArrayL() - Error in sid: 0x%08x (%d)", secureId.iId, err);
+				    OstTraceExt2(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_GETDATAOWNERSL, "BuildDriveStateArrayL() - Error in sid: 0x%08x (%d)", secureId.iId, static_cast<TInt32>(err));
 					}//if
 				else
 					{
 					// Get drive list (this is needed to update drive list for packages)
 					TRAP(err, dataOwner.GetDriveListL(driveList));
 					if (err != KErrNone)
 						{
-						__LOG2("CDataOwnerManager::GetDataOwnersL() - GetDriveListL() - Error in sid: 0x%08x (%d)", secureId.iId, err);
+					    OstTraceExt2(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_GETDATAOWNERSL, "GetDriveListL() - Error in sid: 0x%08x (%d)", secureId.iId, static_cast<TInt32>(err));
 						}//if
 					else
 						{
 						TRAP(err, commonSettings = dataOwner.CommonSettingsL());
 						if (err != KErrNone)
 							{
-							__LOG2("CDataOwnerManager::GetDataOwnersL() - CommonSettingsL() - Error in sid: 0x%08x (%d)", secureId.iId, err);
+						    OstTraceExt2(TRACE_NORMAL, DUP4_CDATAOWNERMANAGER_GETDATAOWNERSL, "CommonSettingsL() - Error in sid: 0x%08x (%d)", secureId.iId, static_cast<TInt32>(err));
 							}//if
 						}//else
 					}
 				}//else
 					Swi::CSisRegistryPackage* pRegistryPackage = NULL;
 					TRAPD(error, pRegistryPackage = registrySession.SidToPackageL(secureId));
 					if ((error == KErrNone))
 						{
 						TUid packageUid = pRegistryPackage->Uid();
-						__LOG2("CDataOwnerManager::GetDataOwnersL() - Found package for secure id 0x%08x, package id 0x%08x", secureId.iId, packageUid);
+						OstTraceExt2(TRACE_NORMAL, DUP5_CDATAOWNERMANAGER_GETDATAOWNERSL, "Found package for secure id 0x%08x, package id 0x%08x", secureId.iId, packageUid.iUid);
 						CleanupStack::PushL(pRegistryPackage);
 						pId = CSBPackageId::NewL(packageUid, secureId, pRegistryPackage->Name());
 						CleanupStack::PopAndDestroy(pRegistryPackage);
 						CleanupStack::PushL(pId);
 						CPackageDataTransfer* pak = FindPackageDataContainerL(packageUid);
 						//renews the drive list
 						TRAP(err, pak->GetDriveListL(driveList));
 						if( err == KErrNotSupported)
 							{
-							__LOG("CDataOwnerManager::GetDataOwnersL() - Error KErrNotSupported");
+						    OstTrace0(TRACE_NORMAL, DUP6_CDATAOWNERMANAGER_GETDATAOWNERSL, "Error KErrNotSupported");
 							err = KErrNone;
 							}
 						} // if
 					else
 						{
-						__LOG2("CDataOwnerManager::GetDataOwnersL() - Error(%d) retrieving package data for sid 0x%08x", error, secureId.iId);
+					    OstTraceExt2(TRACE_NORMAL, DUP7_CDATAOWNERMANAGER_GETDATAOWNERSL, "Error(%d) retrieving package data for sid 0x%08x", static_cast<TInt32>(error), secureId.iId);
 						} // else
 					} // if
 				} // if
 			if (pId == NULL) // not a package or error happend
 			{
 			iJavaDOM->GetDataOwnersL(aDataOwners);
 			}
 		else
 			{
-			__LOG("CDataOwnerManager::GetDataOwnersL() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
+		    OstTrace0(TRACE_NORMAL, DUP8_CDATAOWNERMANAGER_GETDATAOWNERSL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
 			}
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_GETDATAOWNERSL_EXIT );
 		}
 	CDataOwner& CDataOwnerManager::DataOwnerL(TSecureId aSID)
 	/**
 	Called by the ABServer when creating a session in order for the session to query the DataOwner
 	@param aSID The SID of the active data owner
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_DATAOWNERL_ENTRY );
 		CDataOwnerContainer* pDOContainer = NULL;
 		pDOContainer = FindL(aSID);
 		if (!pDOContainer)
 			{
+		    OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_DATAOWNERL, "Leave: KErrNotFound");
 			User::Leave(KErrNotFound);
 			}
-		return pDOContainer->DataOwner();
+		CDataOwner& dataOwner = pDOContainer->DataOwner();
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_DATAOWNERL_EXIT );
+		return dataOwner;
 		}
 	void CDataOwnerManager::GetExpectedDataSizeL(CSBGenericTransferType* apGenericTransferType, TUint& aSize)
 	/** Gets the expected data size of a backup for the given information
 	@post deletes the apGenericTransferType
 	@leave KErrNotSupported unsupported transfer type
 	@leave KErrNotFound object relating to apGenericTransferType not found
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL_ENTRY );
 		if (iBURType != EBURBackupPartial && iBURType != EBURBackupFull)
 			{
-			__LOG("CDataOwnerManager::GetExpectedDataSizeL() - *Error: GetExpectedDataSizeL called when device is not in Backup mode !");
+		    OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "*Error: GetExpectedDataSizeL called when device is not in Backup mode !");
 			User::Leave(KErrAccessDenied);
 			}
 		switch (apGenericTransferType->DerivedTypeL())
 			{
 			case ESIDTransferDerivedType:
 				{
-				__LOG("CDataOwnerManager::GetExpectedDataSizeL() - ESIDTransferDerivedType");
+				OstTrace0(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "ESIDTransferDerivedType");
 				CSBSIDTransferType* pSIDTransferType = CSBSIDTransferType::NewL(apGenericTransferType);
 				CleanupStack::PushL(pSIDTransferType);
 				DataOwnerL(pSIDTransferType->SecureIdL()).GetExpectedDataSizeL(pSIDTransferType->DataTypeL(), pSIDTransferType->DriveNumberL(), aSize);
 				CleanupStack::PopAndDestroy(pSIDTransferType);
 				break;
 				};
 			case EPackageTransferDerivedType:
 				{
-				__LOG("CDataOwnerManager::GetExpectedDataSizeL() - EPackageTransferDerivedType");
+				OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "EPackageTransferDerivedType");
 				// This code should be changed.  Ideally, the GetExpectedDataSizeL method should be virtual, rendering
 				// this switch statement unnecessary.  When java support is added this will become even more important.
 				//
 				// For the moment, to avoid re-structuring the data owner class,
 				//
 				const TUid packageId = pPackageTransferType->PackageIdL();
 				const TPackageDataType dataType = pPackageTransferType->DataTypeL();
 				const TDriveNumber driveNumber = pPackageTransferType->DriveNumberL();
 				//
-				__LOG3("CDataOwnerManager::GetExpectedDataSizeL() - package id: 0x%08x, dataType: %d, drive: %c ", packageId.iUid, dataType, driveNumber + 'A');
+				OstTraceExt3(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "package id: 0x%08x, dataType: %d, drive: %c ", packageId.iUid, static_cast<TInt32>(dataType), static_cast<TInt8>(driveNumber + 'A'));
 				CPackageDataTransfer* pDataTransfer = FindPackageDataContainerL(pPackageTransferType->PackageIdL());
 				pDataTransfer->GetExpectedDataSizeL(dataType, driveNumber, aSize);
 				CleanupStack::PopAndDestroy(pPackageTransferType);
 				break;
 				}
 			case EJavaTransferDerivedType:
 				{
-				__LOG("CDataOwnerManager::GetExpectedDataSizeL() - EJavaTransferDerivedType");
+				OstTrace0(TRACE_NORMAL, DUP4_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "EJavaTransferDerivedType");
 				// Call the Java DOM to calculate and return the expected size of the data specified in
 				// apGenericTransferType
 				if(iJavaDOM)
 					{
 					iJavaDOM->GetExpectedDataSizeL(apGenericTransferType, aSize);
 					}
 				else
 					{
-					__LOG("CDataOwnerManager::GetExpectedDataSizeL() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
+				    OstTrace0(TRACE_NORMAL, DUP5_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
 					}
 				break;
 				}
 			default:
 				{
-				__LOG("CDataOwnerManager::GetExpectedDataSizeL() - ERROR - unsupported transfer type");
+				OstTrace0(TRACE_ERROR, DUP6_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "unsupported transfer type");
 				User::Leave(KErrNotSupported);
 				}
 			} // switch
-		__LOG1("CDataOwnerManager::GetExpectedDataSizeL() - END - size is: %d", aSize);
+		OstTrace1(TRACE_NORMAL, DUP7_CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL, "size is: %d", aSize);
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_GETEXPECTEDDATASIZEL_EXIT );
 		}
 	void CDataOwnerManager::GetPublicFileListL(CSBGenericDataType* aGenericDataType,
 											   TDriveNumber aDriveNumber,
 	@param aSID 			the Secure Id of the data owner you are requesting information for
 	@param aDriveNumber		the drive number to obtain the public files for
 	@param aFiles			on return the list of public files
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_GETPUBLICFILELISTL_ENTRY );
 		if (iBURType != EBURBackupPartial && iBURType != EBURBackupFull)
 			{
-			__LOG("CDataOwnerManager::GetPublicFileListL() - *Error: GetPublicFileListL called when device is not in Backup mode !");
+		    OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_GETPUBLICFILELISTL, "*Error: GetPublicFileListL called when device is not in Backup mode !");
 			User::Leave(KErrAccessDenied);
 			}
 		if (!(iDriveList[aDriveNumber]))
 			{
-			__LOG("CDataOwnerManager::GetPublicFileListL() - The drive in the argument is not in the list of the drives for backup/restore");
+		    OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_GETPUBLICFILELISTL, "The drive in the argument is not in the list of the drives for backup/restore");
 			User::Leave(KErrArgument);
 			}
 		switch (aGenericDataType->DerivedTypeL())
 			{
 					{
 					iJavaDOM->GetPublicFileListL(aGenericDataType, aDriveNumber, aFiles);
 					}
 				else
 					{
-					__LOG("CDataOwnerManager::GetPublicFileListL() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
+				    OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_GETPUBLICFILELISTL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
 					}
 				break;
 				}
 			default:
 				{
+				OstTrace0(TRACE_ERROR, DUP3_CDATAOWNERMANAGER_GETPUBLICFILELISTL, "Leave: KErrNotSupported");
 				User::Leave(KErrNotSupported);
 				}
 			}
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_GETPUBLICFILELISTL_EXIT );
 		}
 void CDataOwnerManager::GetRawPublicFileListL(CSBGenericDataType* aGenericDataType, TDriveNumber aDriveNumber,
 						   					  RRestoreFileFilterArray& aFileFilter)
 	@param aSID the secure id
 	@param aDriveNumber the drive number
 	@param aFileFilter on return an array of TRestoreFileFilter
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL_ENTRY );
 		if (iBURType != EBURBackupPartial && iBURType != EBURBackupFull)
 			{
-			__LOG("CDataOwnerManager::GetRawPublicFileListL() - *Error: GetRawPublicFileListL called when device is not in Backup mode !");
+		    OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL, "*Error: GetRawPublicFileListL called when device is not in Backup mode !");
 			User::Leave(KErrAccessDenied);
 			}
 		if (!(iDriveList[aDriveNumber]))
 			{
-			__LOG("CDataOwnerManager::GetRawPublicFileListL() - The drive in the argument is not in the list of the drives for backup/restore");
+		    OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL, "The drive in the argument is not in the list of the drives for backup/restore");
 			User::Leave(KErrArgument);
 			}
 		switch (aGenericDataType->DerivedTypeL())
 			{
 					{
 					iJavaDOM->GetRawPublicFileListL(aGenericDataType, aDriveNumber, aFileFilter);
 					}
 				else
 					{
-					__LOG("CDataOwnerManager::GetRawPublicFileListL() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
+				    OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
 					}
 				break;
 				}
 			default:
 				{
+				OstTrace0(TRACE_ERROR, DUP3_CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL, "Leave: KErrNotSupported");
 				User::Leave(KErrNotSupported);
 				}
 			}
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_GETRAWPUBLICFILELISTL_EXIT );
 		}
 void CDataOwnerManager::GetXMLPublicFileListL(TSecureId /*aSID*/, TDriveNumber /*aDriveNumber*/,
 											  HBufC*& /*aBuffer*/)
 	@param aDriveNumber the drive number
 	@param aBuffer the buffer to write the data too
 	*/
 	{
+	OstTraceFunctionEntry0( CDATAOWNERMANAGER_GETXMLPUBLICFILELISTL_ENTRY );
 	if (iBURType != EBURBackupPartial && iBURType != EBURBackupFull)
 			{
-			__LOG("CDataOwnerManager::GetXMLPublicFileListL() - *Error: GetXMLPublicFileListL called when device is not in Backup mode !");
+	    OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_GETXMLPUBLICFILELISTL, "*Error: GetXMLPublicFileListL called when device is not in Backup mode !");
 			User::Leave(KErrAccessDenied);
 			}
 		else
 			{
 			//will need to check if the drive exists in our list
-			__LOG("CDataOwnerManager::GetXMLPublicFileListL() - *Error: GetXMLPublicFileListL Not Yet Implemented");
+		    OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_GETXMLPUBLICFILELISTL, "*Error: GetXMLPublicFileListL Not Yet Implemented");
 			User::Leave(KErrNotSupported);
 			}
+	OstTraceFunctionExit0( CDATAOWNERMANAGER_GETXMLPUBLICFILELISTL_EXIT );
 	}
 	void CDataOwnerManager::SetSIDListForPartialBURL(TDesC8& aFlatArrayPtr)
 	/**
 	Sets the list of Active SID's participating in a backup or restore
 	@param aFlatArrayPtr Flat Array Pointer
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_SETSIDLISTFORPARTIALBURL_ENTRY );
 		if (iBURType != EBURNormal && iBURType != EBURUnset)
 			{
-			__LOG("CDataOwnerManager::SetSIDListForPartialBURL() - *Error: called when device isn't in Normal/Unset mode");
+		    OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_SETSIDLISTFORPARTIALBURL, "*Error: called when device isn't in Normal/Unset mode");
 			User::Leave(KErrAccessDenied);
 			}
 		if (iSIDListForPartial != NULL)
 			{
 			delete iSIDListForPartial;
 			iSIDListForPartial = NULL;
 			}
 		iSIDListForPartial = RSIDArray::InternaliseL(aFlatArrayPtr);
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_SETSIDLISTFORPARTIALBURL_EXIT );
 		}
 	void CDataOwnerManager::UpdateDataOwnersPartialStateL()
 	/**
 	Specifies the list of SID's that are to be backed up in a partial backup
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_UPDATEDATAOWNERSPARTIALSTATEL_ENTRY );
 		if (iSIDListForPartial != NULL)
 			{
 			TUint count = iSIDListForPartial->Count();
 			while(count--)
 				{
 				// Find the data owner responsible for this SID and set it's partial backup flag to ETrue
 				DataOwnerL((*iSIDListForPartial)[count]).SetBackedUpAsPartial(ETrue);
 				} // for
 			} // if
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_UPDATEDATAOWNERSPARTIALSTATEL_EXIT );
 		}
 	void CDataOwnerManager::SIDStatusL(RSIDStatusArray& aSIDStatus)
 	/**
 	Returns the ready statuses of selected Data Owner's
 	@param aSIDStatus Array of SID's and their associated statuses. The statuses will be populated upon return
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_SIDSTATUSL_ENTRY );
 		if (iBURType == EBURNormal || iBURType == EBURUnset)
 			{
-			__LOG("CDataOwnerManager::SIDStatusL() - *Error: called when device is in Normal/Unset mode");
+		    OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_SIDSTATUSL, "*Error: called when device is in Normal/Unset mode");
 			User::Leave(KErrAccessDenied);
 			}
 		TUint count = aSIDStatus.Count();
 		CDataOwnerContainer* pDOContainer = NULL;
 				{
 				// Assign the status of the data owner to the array element
 				aSIDStatus[count].iStatus = pDOContainer->DataOwner().ReadyState();
 				}
 			}
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_SIDSTATUSL_EXIT );
 		}
 	void CDataOwnerManager::AllSnapshotsSuppliedL()
 	/**
 	All the snapshots have been supplied
 	*/
 		{
-		__LOG("CDataOwnerManager::AllSnapshotsSuppliedL() - Begin");
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_ALLSNAPSHOTSSUPPLIEDL_ENTRY );
 		if (iBURType == EBURBackupPartial || iBURType == EBURBackupFull)
 			{
 			TUint count = iDataOwners.Count();
 			while(count--)
 				{
 					} // if
 				} // while
 			} //if
 		else
 			{
-			__LOG("CDataOwnerManager::AllSnapshotsSuppliedL() - *Error: can only be called in Backup mode");
+		    OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_ALLSNAPSHOTSSUPPLIEDL, "*Error: can only be called in Backup mode");
 			User::Leave(KErrAccessDenied);
 			} // else
-		__LOG("CDataOwnerManager::AllSnapshotsSuppliedL() - End");
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_ALLSNAPSHOTSSUPPLIEDL_EXIT );
 		}
 	void CDataOwnerManager::GetNextPublicFileL(CSBGenericDataType* aGenericDataType,
 											   TBool aReset,
 	                           				   TDriveNumber aDriveNumber,
 	@param aReset set true to start reading from the beginning of the list
 	@param aDriveNumber the drive to retrieve the public files for
 	@param aEntry on return the next entry in the list, an empty entry indicates the end of the list has been reached
 	*/
 		{
-		__LOG("CDataOwnerManager::GetNextPublicFileL() - Begin");
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_GETNEXTPUBLICFILEL_ENTRY );
 		if (iBURType != EBURBackupPartial && iBURType != EBURBackupFull)
 			{
-			__LOG("CDataOwnerManager::GetNextPublicFileL() - *Error: GetPublicFileListL called when device is not in Backup mode !");
+		    OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_GETNEXTPUBLICFILEL, "*Error: GetPublicFileListL called when device is not in Backup mode !");
 			User::Leave(KErrAccessDenied);
 			}
 		if (!(iDriveList[aDriveNumber]))
 			{
-			__LOG("CDataOwnerManager::GetNextPublicFileL() - The drive in the argument is not in the list of the drives for backup/restore");
+		    OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_GETNEXTPUBLICFILEL, "The drive in the argument is not in the list of the drives for backup/restore");
 			User::Leave(KErrArgument);
 			}
 		if (aGenericDataType->DerivedTypeL() == ESIDDerivedType)
 			{
 			DataOwnerL(pSID->SecureIdL()).GetNextPublicFileL(aReset, aDriveNumber, aEntry);
 			CleanupStack::PopAndDestroy(pSID);
 			}
 		else
 			{
+		    OstTrace0(TRACE_ERROR, DUP2_CDATAOWNERMANAGER_GETNEXTPUBLICFILEL, "Leave: KErrNotSupported");
 			User::Leave(KErrNotSupported);
 			}
-		__LOG("CDataOwnerManager::GetNextPublicFileL() - End");
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_GETNEXTPUBLICFILEL_EXIT );
 		}
 void CDataOwnerManager::SupplyDataL(CSBGenericTransferType* apGenericTransferType, TDesC8& aBuffer,
 				 					TBool aLastSection)
 @param aLastSection is this the last section.
 @leave KErrNotSupported Unknown transfer type
 @leave KErrNotFound Unknown object
 */
 		{
-		__LOG1("CDataOwnerManager::SupplyDataL() - START - about to decompress %d bytes of data", aBuffer.Length());
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_SUPPLYDATAL_ENTRY );
+		OstTrace1(TRACE_NORMAL, CDATAOWNERMANAGER_SUPPLYDATAL, "about to decompress %d bytes of data", aBuffer.Length());
 if (iBURType == EBURNormal || iBURType == EBURUnset)
 			{
-			__LOG("CDataOwnerManager::SupplyDataL() - *Error: called not when device in Normal/Unset mode");
+OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_SUPPLYDATAL, "*Error: called not when device in Normal/Unset mode");
 			User::Leave(KErrAccessDenied);
 			}
 		// The buffer that we are given is compressed. We need to uncompress this into
 		// 64K chunks and then pass through the code
 		while (moreData && packageContinue)
 			{
 			uncompressedData = NULL;
 			if (!iDecompressor->NextLC(uncompressedData, moreData))
 				{
-				__LOG("CDataOwnerManager::SupplyDataL() - iDecompressor->NextLC returned EFalse");
+			    OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_SUPPLYDATAL, "iDecompressor->NextLC returned EFalse");
 				if (uncompressedData != NULL)
 					{
-					__LOG("CDataOwnerManager::SupplyDataL() - uncompressedData not NULL so cleaning up");
+				    OstTrace0(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_SUPPLYDATAL, "uncompressedData not NULL so cleaning up");
 					CleanupStack::PopAndDestroy(uncompressedData);
 					}
 				break;
 				}
 			if (uncompressedData == NULL)
 				{
-				__LOG("CDataOwnerManager::SupplyDataL() - uncompressedData is NULL after NextLC, corrupt data");
+			    OstTrace0(TRACE_ERROR, DUP4_CDATAOWNERMANAGER_SUPPLYDATAL, "uncompressedData is NULL after NextLC, corrupt data");
 				User::Leave(KErrCorrupt);
 				}
 			TPtr8 dataPtr(uncompressedData->Des());
-			__LOG1("CDataOwnerManager::SupplyDataL() - decompressed data length: %d", dataPtr.Length());
+			OstTrace1(TRACE_NORMAL, DUP5_CDATAOWNERMANAGER_SUPPLYDATAL, "decompressed data length: %d", dataPtr.Length());
 			// Check aLastSection
 			TBool lastSection = aLastSection && !moreData;
 			switch(apGenericTransferType->DerivedTypeL())
 				{
 			case ESIDTransferDerivedType:
 				{
-				__LOG("CDataOwnerManager::SupplyDataL() - ESIDTransferDerivedType");
+				OstTrace0(TRACE_NORMAL, DUP6_CDATAOWNERMANAGER_SUPPLYDATAL, "ESIDTransferDerivedType");
 				CSBSIDTransferType* pSIDTransferType = CSBSIDTransferType::NewL(apGenericTransferType);
 				CleanupStack::PushL(pSIDTransferType);
 				// Is this the data for registration files? These are now not supported
 				if (pSIDTransferType->DataTypeL() == ERegistrationData)
 					{
+				    OstTrace0(TRACE_ERROR, DUP12_CDATAOWNERMANAGER_SUPPLYDATAL, "Leave: KErrNotSupported");
 					User::Leave(KErrNotSupported);
 					} // if
 				else
 					{
 					// Does this dataowner require a reboot?
 					const TSecureId sid = pSIDTransferType->SecureIdL();
 					const TDriveNumber driveNumber = pSIDTransferType->DriveNumberL();
 					CDataOwner& dataOwner = DataOwnerL(sid);
-					__LOG2("CDataOwnerManager::SupplyDataL() - trying to restore data for SID: 0x%08x, drive: %c", sid.iId, 'A' + driveNumber);
+					OstTraceExt2(TRACE_NORMAL, DUP7_CDATAOWNERMANAGER_SUPPLYDATAL, "trying to restore data for SID: 0x%08x, drive: %c", sid.iId, static_cast<TInt8>('A' + driveNumber));
 					if ((dataOwner.CommonSettingsL() & ERequiresReboot) == ERequiresReboot)
 						{
-						__LOG1("CDataOwnerManager::SupplyDataL() - data owner 0x%08x requires a REBOOT!", sid.iId);
+					    OstTrace1(TRACE_NORMAL, DUP8_CDATAOWNERMANAGER_SUPPLYDATAL, "data owner 0x%08x requires a REBOOT!", sid.iId);
 						iResetAfterRestore = ETrue;
 						}
 					dataOwner.SupplyDataL(driveNumber, pSIDTransferType->DataTypeL(), dataPtr, lastSection);
 					} // else
 				CleanupStack::PopAndDestroy(pSIDTransferType);
 				break;
 				}
 			case EPackageTransferDerivedType:
 				{
-				__LOG("CDataOwnerManager::SupplyDataL() - EPackageTransferDerivedType");
+				OstTrace0(TRACE_NORMAL, DUP9_CDATAOWNERMANAGER_SUPPLYDATAL, "EPackageTransferDerivedType");
 				// Ideally, we would use the same CDataOwner class, or a class derived
 				// from it to handle the package backup/restore, however to do this would
 				// require a re-design.
 				CSBPackageTransferType *pPackageTransferType = CSBPackageTransferType::NewL(apGenericTransferType);
 				CleanupStack::PushL(pPackageTransferType);
 				break;
 				}
 		    case EJavaTransferDerivedType:
 			    {
-				__LOG("CDataOwnerManager::SupplyDataL() - EJavaTransferDerivedType");
+			    OstTrace0(TRACE_NORMAL, DUP10_CDATAOWNERMANAGER_SUPPLYDATAL, "EJavaTransferDerivedType");
 			   if(iJavaDOM)
 					{
 				    iJavaDOM->SupplyDataL(apGenericTransferType, dataPtr, lastSection);
 					}
 				else
 					{
-					__LOG("CDataOwnerManager::SupplyDataL() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
+				    OstTrace0(TRACE_NORMAL, DUP11_CDATAOWNERMANAGER_SUPPLYDATAL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
 					}
 			    break;
 			    }
 default:
 				{
+				OstTrace0(TRACE_ERROR, DUP13_CDATAOWNERMANAGER_SUPPLYDATAL, "Leave: KErrNotSupported");
 				User::Leave(KErrNotSupported);
 				}
 				} // switch
 			// Cleanup
 			CleanupStack::PopAndDestroy(uncompressedData);
 			} // while
-		__LOG("CDataOwnerManager::SupplyDataL() - END");
+	OstTraceFunctionExit0( CDATAOWNERMANAGER_SUPPLYDATAL_EXIT );
 	}
 void CDataOwnerManager::RequestDataL(CSBGenericTransferType* apGenericTransferType,
 	    		  					 TPtr8& aBuffer, TBool& aLastSection)
 @param aLastSection is this the last section.
 @leave KErrNotSupported Unknown transfer type
 @leave KErrNotFound Unknown object
 	*/
 	{
-		__LOG2("CDataOwnerManager::RequestDataL() - START - aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d", aBuffer.Ptr(), aBuffer.Length());
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_REQUESTDATAL_ENTRY );
+		OstTraceExt2(TRACE_NORMAL, CDATAOWNERMANAGER_REQUESTDATAL, "aBuffer.Ptr(): 0x%08x, aBuffer.Length(): %d", reinterpret_cast<TInt32>(aBuffer.Ptr()), static_cast<TInt32>(aBuffer.Length()));
 	if (iBURType == EBURNormal || iBURType == EBURUnset)
 			{
-			__LOG("CDataOwnerManager::RequestDataL() - *Error: called when device is in Normal/Unset mode");
+	    OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_REQUESTDATAL, "*Error: called when device is in Normal/Unset mode");
 			User::Leave(KErrAccessDenied);
 			}
 		// Reserve space to perform inline compression later
 		CSBECompressAndEncrypt* pCE = CSBECompressAndEncrypt::NewLC(apGenericTransferType, aBuffer);
 				{
 				iJavaDOM->RequestDataL(apGenericTransferType, aBuffer, aLastSection);
 				}
 			else
 				{
-				__LOG("CDataOwnerManager::RequestDataL() - Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
+			    OstTrace0(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_REQUESTDATAL, "Java Backup-Restore Plug-In not loaded, java files won't be backed or restored");
 				}
 			break;
 			}
 		default:
 			{
+			OstTrace0(TRACE_ERROR, DUP5_CDATAOWNERMANAGER_REQUESTDATAL, "Leave: KErrNotSupported");
 			User::Leave(KErrNotSupported);
 			}
 			} // switch
 		// Compress the data block
 		if (aBuffer.Size() > 0) // Dont compress no data
 			{
-		    __LOG1("CDataOwnerManager::RequestDataL() - got %d bytes of uncompressed data, about to pack it...", aBuffer.Length());
+		    OstTrace1(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_REQUESTDATAL, "got %d bytes of uncompressed data, about to pack it...", aBuffer.Length());
 			pCE->PackL(aBuffer);
 			}
 		else
 			{
-		    __LOG1("CDataOwnerManager::RequestDataL() - got %d bytes of uncompressed data, free reserved space...", aBuffer.Length());
+		    OstTrace1(TRACE_NORMAL, DUP4_CDATAOWNERMANAGER_REQUESTDATAL, "got %d bytes of uncompressed data, free reserved space...", aBuffer.Length());
 			pCE->FreeReservedSpace(aBuffer);
 			}
 		CleanupStack::PopAndDestroy(pCE);
-		__LOG("CDataOwnerManager::RequestDataL() - End");
+	OstTraceFunctionExit0( CDATAOWNERMANAGER_REQUESTDATAL_EXIT );
 	}
 	// Accessors
 	void CDataOwnerManager::SetActiveBackupServer(CABServer* aABServer)
 		{
 		ipABServer = aABServer;
 		}
 	RFs& CDataOwnerManager::GetRFs()
 		{
 		return iFs;
 	@param aDataOwners appended list of data owners infos
 	*/
 	void CDataOwnerManager::FindImportPackagesL(Swi::RSisRegistrySession& aRegistry, RPointerArray<CDataOwnerInfo>& aDataOwners)
 		{
-		__LOG("CDataOwnerManager::FindImportPackagesL() - Begin");
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_FINDIMPORTPACKAGESL_ENTRY );
 		CDesCArray* files = new(ELeave) CDesCArrayFlat(KDesCArrayGranularity);
 		CleanupStack::PushL(files);
 		FindRegistrationFilesL(KImportDir, *files);
 		const TInt count = files->Count();
 			if (err == KErrNone) // If there was an error then ignore it as it is probally not a dir
 				{
 				err = entry.Open(aRegistry, sid);
 				if (err == KErrNone)
 					{
-					__LOG2("CDataOwnerManager::FindImportPackagesL() - found reg file: %S for Package: 0x%08x", &fileName, sid.iId);
+				    OstTraceExt2(TRACE_NORMAL, CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "found reg file: %S for Package: 0x%08x", fileName, sid.iId);
 					CPackageDataTransfer* pDataTransfer = FindPackageDataContainerL(sid);
 					TRAP(err, pDataTransfer->SetRegistrationFileL(fileName));
 					if (err == KErrNone)
 						{
 						TRAP(err, pDataTransfer->ParseL());
 						}
 					if (err == KErrNoMemory)
 						{
+					    OstTrace0(TRACE_ERROR, DUP8_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "Leave: KErrNoMemory");
 						User::Leave(KErrNoMemory);
 						}
 					// create generic data type
 					HBufC* pkgName = entry.PackageNameL();
 					CleanupStack::PushL(pkgName);
 					TDriveList driveList;
 					TRAP(err, pDataTransfer->GetDriveListL(driveList));
 					if (err != KErrNone)
 					    {//Non-removable, ignore this data owner
 						CleanupStack::PopAndDestroy(pId);
+						entry.Close();
 						continue;
 					    }
 					// create a data owner info
 					CDataOwnerInfo* pDataOwnerInfo = CDataOwnerInfo::NewL(pId, pDataTransfer->CommonSettingsL(),
 														  pDataTransfer->PassiveSettingsL(), pDataTransfer->ActiveSettingsL(),
 					if ( passiveErr == KErrNone && EHasPublicFiles & passiveBURSettings )
 						{
 						CDataOwnerContainer* pDataOwner = FindL(sid);
 						if (pDataOwner == NULL)  // If it does not exist we need to create it
 							{
-							__LOG1("CDataOwnerManager::FindImportPackagesL() - Package has the public files for SID: 0x%08x", sid.iId);
+						    OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "Package has the public files for SID: 0x%08x", sid.iId);
 							pDataOwner = CDataOwnerContainer::NewL(sid, this);
 							CleanupStack::PushL(pDataOwner);
 							iDataOwners.InsertInOrder(pDataOwner, CDataOwnerContainer::Compare);
 							CleanupStack::Pop(pDataOwner);
 							} // if
 						else
 							{
-							__LOG1("CDataOwnerManager::FindImportPackagesL() - SID already exists in the list SID: 0x%08x", sid.iId);
+						    OstTrace1(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "SID already exists in the list SID: 0x%08x", sid.iId);
 							}
 						TRAP_IGNORE(pDataOwner->DataOwner().AddRegistrationFilesL(fileName));
 						// forwards declarations
 						// parse registration files
 						TRAP(err, pDataOwner->DataOwner().ParseFilesL());
 						if (err != KErrNone)
 							{
-							__LOG2("CDataOwnerManager::GetDataOwnersL() - ParseFilesL() - Error in sid: 0x%08x (%d)", sid.iId, err);
+						    OstTraceExt2(TRACE_NORMAL, DUP3_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "ParseFilesL() - Error in sid: 0x%08x (%d)", sid.iId, static_cast<TInt32>(err));
 							} // if
 						else
 							{
 							// Reset the state for these data owners
 							TRAP(err, pDataOwner->DataOwner().BuildDriveStateArrayL());
 							if (err != KErrNone)
 								{
-								__LOG2("CDataOwnerManager::GetDataOwnersL() - BuildDriveStateArrayL() - Error in sid: 0x%08x (%d)", sid.iId, err);
+							    OstTraceExt2(TRACE_NORMAL, DUP4_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "BuildDriveStateArrayL() - Error in sid: 0x%08x (%d)", sid.iId, static_cast<TInt32>(err));
 								}//if
 							else
 								{
 								// Get drive list (this is needed to update drive list for packages)
 								TRAP(err, pDataOwner->DataOwner().GetDriveListL(driveList));
 								if (err != KErrNone)
 									{
-									__LOG2("CDataOwnerManager::GetDataOwnersL() - GetDriveListL() - Error in sid: 0x%08x (%d)", sid.iId, err);
+								    OstTraceExt2(TRACE_NORMAL, DUP5_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "GetDriveListL() - Error in sid: 0x%08x (%d)", sid.iId, static_cast<TInt32>(err));
 									}//if
 								else
 									{
 									TRAP(err, pDataOwner->DataOwner().CommonSettingsL());
 									if (err != KErrNone)
 										{
-										__LOG2("CDataOwnerManager::GetDataOwnersL() - CommonSettingsL() - Error in sid: 0x%08x (%d)", sid.iId, err);
+									    OstTraceExt2(TRACE_NORMAL, DUP6_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "CommonSettingsL() - Error in sid: 0x%08x (%d)", sid.iId, static_cast<TInt32>(err));
 										}//if
 									}//else
 								}
 							}//else
 				entry.Close();
 				} // if
 			if (err != KErrNone)
 				{
-				__LOG1("CDataOwnerManager::FindImportPackagesL() - cannot get Package UID for reg file: %S", &fileName);
+			    OstTraceExt1(TRACE_NORMAL, DUP7_CDATAOWNERMANAGER_FINDIMPORTPACKAGESL, "cannot get Package UID for reg file: %S", fileName);
 				CSBGenericDataType* pId = CSBPackageId::NewL(sid, KDummyId, KNullDesC);
 				CleanupStack::PushL(pId);
 				TDriveList driveList;
 				driveList.SetLength(driveList.MaxLength());
 			} // for x
 		CleanupStack::PopAndDestroy(&entry);
 		CleanupStack::PopAndDestroy(files);
-		__LOG("CDataOwnerManager::FindImportPackagesL() - End");
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_FINDIMPORTPACKAGESL_EXIT );
 		}
 	void CDataOwnerManager::FindRegistrationFilesL(const TDesC& aPath, CDesCArray& aFiles)
 	/** Searches the device for registration files
 	@param aFiles on return a list of registration files on the device
 	*/
 		{
-		__LOG("CDataOwnerManager::FindRegistrationFilesL() - START");
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_FINDREGISTRATIONFILESL_ENTRY );
 		// Find private directorys
 		TFindFile findDir(iFs);
 		CDir* pDir = NULL;
 		TInt errD = findDir.FindWildByDir(KStar, aPath, pDir);
 						// Add to the list of registration files
 						TUint fileCount = pFile->Count();
 						while(fileCount--)
 							{
 							path.Set((*pFile)[fileCount].iName, &findFile.File(), NULL);
-							__LOG1("CDataOwnerManager::FindRegistrationFilesL() - found file: %S", &path.FullName());
+							OstTraceExt1(TRACE_NORMAL, CDATAOWNERMANAGER_FINDREGISTRATIONFILESL, "found file: %S", path.FullName());
 							aFiles.AppendL(path.FullName());
 							} // for y
 						// Cleanup
 						CleanupStack::PopAndDestroy(pFile);
 			// Check next drive
 			errD = findDir.FindWild(pDir);
 			} // while
-		__LOG1("CDataOwnerManager::FindRegistrationFilesL() - END - total files %d", aFiles.Count());
+		OstTrace1(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_FINDREGISTRATIONFILESL, "total files %d", aFiles.Count());
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_FINDREGISTRATIONFILESL_EXIT );
 		}
 	CDataOwnerContainer* CDataOwnerManager::FindL(TSecureId aSID)
 	/** Finds a data owner in the array given a secure id
 	@param aSID 			the Secure Id of the data owner you want
 	@leave KErrNotFound		no such secure id
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_FINDL_ENTRY );
 		CDataOwnerContainer* tempCont = CDataOwnerContainer::NewL(aSID, this);
 		TInt res = iDataOwners.Find(tempCont, CDataOwnerContainer::Match);
 		delete tempCont;
 		if (res == KErrNotFound)
 			{
+			OstTraceFunctionExit0( CDATAOWNERMANAGER_FINDL_EXIT );
 			return NULL;
 			}
 		else
 			{
+			OstTraceFunctionExit0( DUP1_CDATAOWNERMANAGER_FINDL_EXIT );
 			return iDataOwners[res];
 			}
 		}
 	/** Finds the package data container
 	@param aPid The process id
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_FINDPACKAGEDATACONTAINERL_ENTRY );
 		CPackageDataTransfer* pPackageTransfer = CPackageDataTransfer::NewL(aPid, this);
 		CleanupStack::PushL(pPackageTransfer);
 		TInt res = iPackageDataOwners.Find(pPackageTransfer, CPackageDataTransfer::Match);
 		if (res == KErrNotFound)
 			{
-			User::LeaveIfError(iPackageDataOwners.InsertInOrder(pPackageTransfer, CPackageDataTransfer::Compare));
+		    TInt err = iPackageDataOwners.InsertInOrder(pPackageTransfer, CPackageDataTransfer::Compare);
+			LEAVEIFERROR(err, OstTrace1(TRACE_ERROR, CDATAOWNERMANAGER_FINDPACKAGEDATACONTAINERL, "Leave: %d", err));
 			CleanupStack::Pop(pPackageTransfer);
+			OstTraceFunctionExit0( CDATAOWNERMANAGER_FINDPACKAGEDATACONTAINERL_EXIT );
 			return pPackageTransfer;
 			}
 		else
 			{
 			CleanupStack::PopAndDestroy(pPackageTransfer);
+			OstTraceFunctionExit0( DUP1_CDATAOWNERMANAGER_FINDPACKAGEDATACONTAINERL_EXIT );
 			return iPackageDataOwners[res];
 			}
 		}
 	void CDataOwnerManager::StripSecureIdL(const TDesC& aStrip, TSecureId& aSecureId)
 	/** Strips a Secure Id from a text string
 	Looks for a "//private//" directory in the string and strips the SID after it.
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_STRIPSECUREIDL_ENTRY );
 		TInt start = aStrip.FindF(KImportDir);
 		if (start == KErrNotFound)
 			{
 			start = aStrip.FindF(KPrivate);
 			if (start == KErrNotFound)
 				{
+			    OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_STRIPSECUREIDL, "Leave: KErrArgument");
 				User::Leave(KErrArgument);
 				}
 			start += KPrivate().Length();
 			}
 		else
 		// Create the secure Id
 		TLex sIdLex(aStrip.Mid(start, end - start + 1));
 		// If we cant do the convert then ignore as it is a directory that is not a SID.
 		if (sIdLex.Val(aSecureId.iId, EHex) != KErrNone)
 			{
+		    OstTrace0(TRACE_ERROR, DUP1_CDATAOWNERMANAGER_STRIPSECUREIDL, "Leave: KErrArgument");
 			User::Leave(KErrArgument);
 			}
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_STRIPSECUREIDL_EXIT );
 		}
 	void CDataOwnerManager::FindDataOwnersL()
 	/** Gets a list of data owners
 	This list only contains the Secure ID's for applications that have a backup
 	registration files.
 	*/
 		{
-		__LOG("CDataOwnerManager::FindDataOwnersL() - Begin");
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_FINDDATAOWNERSL_ENTRY );
 		// Clear out any current list
 		iDataOwners.ResetAndDestroy();
 		// Find all registration files on the device
 		CDesCArray* registrationFiles = new(ELeave) CDesCArrayFlat(KDesCArrayGranularity);
 		CleanupStack::PushL(registrationFiles);
 		FindRegistrationFilesL(KPrivate, *registrationFiles);
-		__LOG(" ");
+		OstTrace0(TRACE_NORMAL, CDATAOWNERMANAGER_FINDDATAOWNERSL, " ");
 		// Add registration files to iDataOwners
 		const TInt count = registrationFiles->Count();
 		for (TInt x = 0; x < count; x++)
 			{
 			if (err == KErrNone) // If there was an error then ignore it as it is probally not a dir
 				{
 				CDataOwnerContainer* pDataOwner = FindL(sid);
 				if (pDataOwner == NULL)  // If it does not exist we need to create it
 					{
-					__LOG2("CDataOwnerManager::FindDataOwnersL() - found reg file: %S for sid: 0x%08x", &fileName, sid.iId);
+				    OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_FINDDATAOWNERSL, "found reg file: %S for sid: 0x%08x", fileName, sid.iId);
 					pDataOwner = CDataOwnerContainer::NewL(sid, this);
 					CleanupStack::PushL(pDataOwner);
 					iDataOwners.InsertInOrder(pDataOwner, CDataOwnerContainer::Compare);
 					CleanupStack::Pop(pDataOwner);
 					} // if
 				else
 					{
-					__LOG2("CDataOwnerManager::FindDataOwnersL() - found reg file: %S for existing sid: 0x%08x", &fileName, sid.iId);
+				    OstTraceExt2(TRACE_NORMAL, DUP2_CDATAOWNERMANAGER_FINDDATAOWNERSL, "found reg file: %S for existing sid: 0x%08x", fileName, sid.iId);
 					}
 				pDataOwner->DataOwner().AddRegistrationFilesL(fileName);
 				} // if
 			} // for x
 		CleanupStack::PopAndDestroy(registrationFiles);
-		__LOG("CDataOwnerManager::FindDataOwnersL() - End");
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_FINDDATAOWNERSL_EXIT );
 		}
 	CSBEConfig& CDataOwnerManager::Config()
 	/** Getter for the Secure Backup configuration
 	@return Reference to the CSBEConfig instance
 	TBool CDataOwnerManager::IsSetForPartialL(TSecureId aSecureId) const
 	/** Queries whether a SID is included in a partial operation
 	@return TBool specifying whether a SID is included or not
 	*/
 		{
+		OstTraceFunctionEntry0( CDATAOWNERMANAGER_ISSETFORPARTIALL_ENTRY );
 		TBool found = EFalse;
 		if (iSIDListForPartial != NULL)
 			{
 			TInt result = iSIDListForPartial->Find(aSecureId);
 				found = ETrue;
 				}
 			}
 		else
 			{
-			__LOG("CDataOwnerManager::IsSetForPartialL() - SID list not created yet so leaving!");
+		    OstTrace0(TRACE_ERROR, CDATAOWNERMANAGER_ISSETFORPARTIALL, "SID list not created yet so leaving!");
 			User::Leave(KErrNotFound);
 			}
-		__LOG2("CDataOwnerManager::IsSetForPartialL() - SID: 0x%08x, found: %d", aSecureId.iId, found);
+		OstTraceExt2(TRACE_NORMAL, DUP1_CDATAOWNERMANAGER_ISSETFORPARTIALL, "SID: 0x%08x, found: %d", aSecureId.iId, static_cast<TInt32>(found));
+		OstTraceFunctionExit0( CDATAOWNERMANAGER_ISSETFORPARTIALL_EXIT );
 		return found;
 		}
 	} // namespace conn

changeset 47	63cf70d3ecd8
parent 20	6e82ae192c3a