--- a/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/creceivethreadmanager.cpp	Thu Aug 19 11:03:36 2010 +0300
+++ b/telephonyserverplugins/ctsydispatchlayer/test/ltsyskeleton_using_dispatcher/ltsyskeleton/src/creceivethreadmanager.cpp	Tue Aug 31 16:23:08 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2008-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"
@@ -13,6 +13,11 @@
 // Description:
 //
 
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "creceivethreadmanagerTraces.h"
+#endif
+
 #include "creceivethreadmanager.h"
 #include <ctsy/ltsy/ltsylogger.h>
 
@@ -71,7 +76,7 @@
  
  TInt CReceiveThreadManager::StartReceiveThreadFn(TAny* aArg)
  	{
- 	LOG(_L8("StartReceiveThreadFn, thread id = %d"), RThread().Id().Id());
+ 	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVETHREADMANAGER_SPAWNRECEIVETHREADL_1, "StartReceiveThreadFn, thread id = %d", RThread().Id().Id());
  	
 	// Create a cleanup stack object
 	CTrapCleanup* cleanup=CTrapCleanup::New();
@@ -83,7 +88,7 @@
  	TInt err =  signaller->WaitLoop();
  	
  	delete cleanup;
- 	LOG(_L8("StartReceiveThreadFn, thread id = %d, Terminated with err = %d"), RThread().Id().Id(), err);
+ 	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVETHREADMANAGER_SPAWNRECEIVETHREADL_2, "StartReceiveThreadFn, thread id = %d, Terminated with err = %d", RThread().Id().Id(), err);
  	return err;
  	}
 
@@ -140,13 +145,13 @@
 	User::LeaveIfError(iThread.Open(aID));
 	iThread.Logon(iStatus);
 	SetActive();
-	LOG(_L8("CReceiveThreadLifeWatcher::LogonL.  Watching thread id = %d"), iThread.Id().Id());
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVETHREADLIFEWATCHER_LOGONL_1, "CReceiveThreadLifeWatcher::LogonL.  Watching thread id = %d", iThread.Id().Id());
 	}
 
 void CReceiveThreadLifeWatcher::RunL()
 	{
 	TSYLOGENTRYEXIT;
-	LOG(_L8("CReceiveThreadLifeWatcher::RunL iThread = %d, iStatus=%d, exit reason = %d"), iThread.Id().Id(), iStatus.Int(), iThread.ExitReason() );
+	OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CRECEIVETHREADLIFEWATCHER_RUNL_1, "CReceiveThreadLifeWatcher::RunL iThread = %d, iStatus=%d, exit reason = %d", iThread.Id().Id(), iStatus.Int(), iThread.ExitReason() );
 	iReceiveThreadLifeObserver.HandleReceiveThreadLifeWatcherComplete(iStatus.Int());
 	}