diff -r 000000000000 -r e6b17d312c8b ximpfw/core/srcutils/ximptrace.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ximpfw/core/srcutils/ximptrace.cpp	Thu Dec 17 08:54:49 2009 +0200
@@ -0,0 +1,123 @@
+/*
+* Copyright (c) 2006 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".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  XIMP Framework trace implementation
+*
+*/
+
+// INCLUDE FILES
+#include "ximptrace.h"
+
+#include <e32svr.h>
+#include <e32std.h>
+#include <flogger.h>
+
+
+/**
+ * Handler used by trace implementation to truncate
+ * the string rather than panic in case of buffer overflow.
+ *
+ * @since 3.0
+ */
+NONSHARABLE_CLASS( TXIMPOverflowTruncate ) : public TDes16Overflow
+    {
+    public:
+        void Overflow( TDes16& /*aDes*/ ) {}
+    };
+
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// XIMPTrace::Trace()
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void XIMPTrace::Trace( TRefByValue<const TDesC> aFmt,... )
+    {
+    TBuf< 250 > buffer;
+    buffer.Append( _L("[") );
+    buffer.Append( RThread().Name() );
+    buffer.Append( _L("] ") );
+
+    TXIMPOverflowTruncate overflowHandler;
+
+    VA_LIST list;
+    VA_START( list, aFmt );
+    buffer.AppendFormatList( aFmt, list, &overflowHandler );
+
+
+//    #ifdef __WINS__
+    RDebug::Print( _L("%S"), &buffer );
+//    #endif // __WINS__ Pia
+// Pia    #else
+
+    RFileLogger logger;
+    if( logger.Connect() == KErrNone )
+        {
+        logger.SetDateAndTime( EFalse, ETrue );
+        logger.CreateLog( KXIMPTraceLogDir,
+                          KXIMPTraceLogFile,
+                          EFileLoggingModeAppend );
+
+        logger.Write( buffer );
+        logger.CloseLog();
+        logger.Close();
+        }
+
+// Pia   #endif // __WINS__
+   }
+
+
+
+
+// ============================ MEMBER FUNCTIONS ===============================
+
+// -----------------------------------------------------------------------------
+// TXIMPBlockTraceHandler::TXIMPBlockTraceHandler()
+// -----------------------------------------------------------------------------
+//
+EXPORT_C TXIMPBlockTraceHandler::TXIMPBlockTraceHandler( const TText* aBlockName ) 
+    : iBlockName( aBlockName ),
+      iBlockNormalExit( EFalse )
+    {
+    TRACE_1( _L("%S - enter"), &iBlockName );  
+    }   
+
+
+// -----------------------------------------------------------------------------
+// TXIMPBlockTraceHandler::~TXIMPBlockTraceHandler()
+// -----------------------------------------------------------------------------
+//
+EXPORT_C TXIMPBlockTraceHandler::~TXIMPBlockTraceHandler() // CSI: 82 #
+    {
+    if( !iBlockNormalExit )
+        {
+        //Normal exit not recorded so far
+        //Thus report here nonlocal exit
+        TRACE_1( _L("%S - nonlocal exit"), &iBlockName );  
+        }
+    }
+
+
+// -----------------------------------------------------------------------------
+// TXIMPBlockTraceHandler::NormalExit()
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void TXIMPBlockTraceHandler::NormalExit() 
+    {
+    TRACE_1( _L("%S - exit"), &iBlockName );  
+    iBlockNormalExit = ETrue;
+    }
+    
+