FCL/sf/mw/appsupport: comparison tzservices/tzserver/Server/Source/readonlytzdb.cpp

equal deleted inserted replaced

-:175a0d824084
+:676b6116ca93
-// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-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".
 #include <tz.h>
 #include "ReadOnlyTzDb.h"
 #include <f32file.h>
 #include "dataprovider.h"
 #include <vtzrules.h>
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "readonlytzdbTraces.h"
+#endif
 const TUint KDefaultTzNumericId = 0;
 // TZ Database is stored in the timezone server's own private area
 _LIT(KTzDbFileNameRom,"Z:\\private\\1020383E\\TZDB.DBZ");
 //
 // Loads the TZ Database from given file into RAM.
 //
 TInt CReadOnlyTzDb::CopyDatabaseToRam(const TDesC& aTzDbFileName)
 {
+OstTraceDefExt1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_COPYDATABASETORAM_ENTRY, "CReadOnlyTzDb::CopyDatabaseToRam Entry;aTzDbFileName=%S", aTzDbFileName );
 	TInt error = KErrNone;
 	RFile file;
 	TUint fileMode = EFileShareReadersOnly | EFileRead | EFileStream;
 					}
 				}
 			}
 		}
 	file.Close();
+	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_COPYDATABASETORAM_EXIT, "CReadOnlyTzDb::CopyDatabaseToRam Exit;error=%d", error );
 	return error;
 	}
 TInt CReadOnlyTzDb::InvalidateFlashDatabaseL()
 	{
 	return error;
 	}
 void CReadOnlyTzDb::InitialiseL()
 	{
+OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, DUP1_CREADONLYTZDB_INITIALISEL_ENTRY, "CReadOnlyTzDb::InitialiseL Entry" );
 	// deny access to Flash-based database
 	// if it is being restored in this precise moment
 	// We must not allow access to the ROM-based DB either,
 	// because this might contain outdated data.
 	if (iRestoreInProcess)
 		{
+	    OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_ERROR, CREADONLYTZDB_INITIALISEL, "CReadOnlyTzDb::InitialiseL:Error:Restoring in process" );
 		User::Leave(KErrNotReady);
 		}
 	//
 	// try to copy TZ Database from file in Flash drive
 	iLinksTable	= CTzDbLinksTable::NewL(*this, *(reinterpret_cast<TTzLinksTable*>(KLinksBaseAddress)));
 	iStdTimeAlignmentsTable	= CTzDbStdTimeAlignmentsTable::NewL(*(reinterpret_cast<TTzStdTimeAlignmentsTable*>(KStdTimeAlignmentsBaseAddress)));
 	iRuleSetsTable = CTzDbRuleSetsTable::NewL(*this, *(reinterpret_cast<TTzRuleSetsTable*>(KRuleSetsBaseAddress)));
 	iRuleUsesTable = CTzDbRuleUsesTable::NewL(*(reinterpret_cast<TTzRuleUsesTable*>(KRuleUsesBaseAddress)));
 	iRuleDefinitionsTable = CTzDbRuleDefinitionsTable::NewL(*(reinterpret_cast<TTzRuleDefinitionsTable*>(KRuleDefinitionsBaseAddress)));
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, DUP1_CREADONLYTZDB_INITIALISEL_EXIT, "CReadOnlyTzDb::InitialiseL Exit" );
 	}
 //
 // Releases all RAM used by the database
 //
 //
 // Returns the CTzId object that corresponds to the location set as default in the database
 //
 CTzId* CReadOnlyTzDb::GetDefaultTimeZoneIdL()
 	{
+OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_ENTRY, "CReadOnlyTzDb::GetDefaultTimeZoneIdL Entry" );
 	if (iZonesTable == NULL)
 		{
 		InitialiseL();
 		}
 	CTzId* defTZID = NULL;
 	CTzDbZone* defZone = GetZoneL((reinterpret_cast<TTzHeader*>(iStartAddress))->iOffsetToDefaultZone);
 	if (defZone)
 		{
 		CleanupStack::PushL(defZone); // push #1
 		HBufC8* fullZoneName = defZone->GetFullZoneNameLC(); // push #2
 		defTZID = CTzId::NewL(defZone->LocationId());
 		CleanupStack::PushL(defTZID); // push #3
 		defTZID->SetIdL(*fullZoneName);
 		CleanupStack::Pop(defTZID);
 		CleanupStack::PopAndDestroy(2, defZone);
-		}
+		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_GETDEFAULTTIMEZONEIDL_EXIT, "CReadOnlyTzDb::GetDefaultTimeZoneIdL Exit" );
 	return defTZID;
 	}
 void CReadOnlyTzDb::GetTzRulesL(CTzRules& aTzRules, CTzId& aTzId)
 	{
+OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_GETTZRULESL_ENTRY, "CReadOnlyTzDb::GetTzRulesL Entry;Time zone id =%u", aTzId.TimeZoneNumericID());
 	if (iZonesTable == NULL)
 		{
 		InitialiseL();
 		}
 	TRAPD(err, DoGetTzRulesL(aTzRules, aTzId));
 	if ( (err == KErrCorrupt) && (iTzDbData) )
 		{
 		ReleaseData();
 		// if the corruption occurred while accessing the Flash DB, we must flag it
 		// as corrupt before propagating the leave
 		if (iTzDbDataFromFlash)
 		  {
 			InvalidateFlashDatabaseL();
 			}
 		}
 	User::LeaveIfError(err);
+	OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CREADONLYTZDB_GETTZRULESL_EXIT, "CReadOnlyTzDb::GetTzRulesL Exit" );
 	}
 void CReadOnlyTzDb::DoGetTzRulesL(CTzRules& aTzRules, CTzId& aTzId)
 	{
 	CTzDbZone* zone = FindZoneL(aTzId,ETrue);
 //
 // If aFillInLocationIDs is ETrue, it also fills in the unset zone ID in the supplied CTzId
 //
 CTzDbZone* CReadOnlyTzDb::FindZoneL(CTzId& aLocation, TBool aFillInLocationIDs)
 	{
+OstTraceDefExt3( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CREADONLYTZDB_FINDZONEL_EnTRY, "CReadOnlyTzDb::FindZoneL;Time zone id=%u;Time zone name=%s;aFillInLocationIDs=%u", aLocation.TimeZoneNumericID(), aLocation.TimeZoneNameID(), aFillInLocationIDs );
 	CTzDbZone* zone = NULL;
 	if (aLocation.TimeZoneNumericID() > KDefaultTzNumericId)
 		{
 		zone = FindZoneByNumericIdL(aLocation.TimeZoneNumericID());
 		if (zone && aFillInLocationIDs)
 			CleanupStack::PushL(zone); // push #1
 			aLocation.SetId(zone->LocationId());
 			CleanupStack::Pop(zone); // pop #1
 			}
 		}
+OstTraceDef0( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CREADONLYTZDB_FINDZONEL_EXIT, "CReadOnlyTzDb::FindZoneL Exit" );
 	return zone;
 	}
 //
 // Returns the Zone as a CTzDbZone* (NULL if it can't find
 // a Zone in the database that matches the received location)
 //
 CTzDbZone* CReadOnlyTzDb::FindZoneByNameL(const TDesC8& aLocation)
 	{
+OstTraceDefExt1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CREADONLYTZDB_FINDZONEBYNAMEL_ENTRY, "CReadOnlyTzDb::FindZoneByNameL Entry;aLocation.=%s", aLocation );
 	// first of all, look in links table
 	CTzDbZone* retZone = iLinksTable->FindZoneL(aLocation);
 	if (retZone == NULL)
 		{ // received location was the name of an actual zone
 			CleanupStack::PopAndDestroy(region); // pop #3
 			} // if (region)
 		CleanupStack::PopAndDestroy(2,regionName); // pop #2, #1 - cityName, regionName
 		}
+	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_FINDZONEBYNAMEL_EXIT, "CReadOnlyTzDb::FindZoneByNameL Exit" );
 	return retZone;
 	}
 CTzDbZone* CReadOnlyTzDb::FindZoneByNumericIdL(TUint aLocationId)
 @return	TInt offset from UTC (in minutes).
 */
 TInt CReadOnlyTzDb::GetOffsetForTimeZoneIdL(const TTime& aTime, TInt aTzId)
 	{
+OstTraceDefExt4(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_ENTRY, "CReadOnlyTzDb::GetOffsetForTimeZoneIdL Entry;aTzId=%d;Year=%d;Month=%d;Day=%d", aTzId, aTime.DateTime().Year(), aTime.DateTime().Month(), aTime.DateTime().Day());
+OstTraceDefExt3(OST_TRACE_CATEGORY_DEBUG, TRACE_FLOW_PARAM, CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_PARAM, "parameters..;Hour=%d;Minute=%d;seconds=%d",aTime.DateTime().Hour(),aTime.DateTime().Minute() ,aTime.DateTime().Second() );
 	if (iZonesTable == NULL)
 		{
 		InitialiseL();
 		}
 			offset = timeAlignment->UtcOffset();
 			delete timeAlignment;
 			}
 		CleanupStack::PopAndDestroy(zone);
 		}
+		OstTraceDef1( OST_TRACE_CATEGORY_DEBUG,TRACE_FLOW_PARAM, CREADONLYTZDB_GETOFFSETFORTIMEZONEIDL_EXIT, "CReadOnlyTzDb::GetOffsetForTimeZoneIdL Exit;offset=%u", offset );
 	return offset;
 	}
 //

changeset 81	676b6116ca93
parent 0	2e3d3ce01487