Move some define code to the uni file. Also fixed some memory leak.

[mirror_edk2.git] / PerformancePkg / Dp_App / DpTrace.c

diff --git a/PerformancePkg/Dp_App/DpTrace.c b/PerformancePkg/Dp_App/DpTrace.c
index 3799af482ec199d07dbe89f3790c4488b296f774..5038473c077c1f15a27aea4dd1e02a726d895dac 100644 (file)
--- a/PerformancePkg/Dp_App/DpTrace.c
+++ b/PerformancePkg/Dp_App/DpTrace.c
@@ -137,10 +137,13 @@ DumpAllTrace(
   UINTN                     Size;\r
   EFI_HANDLE                TempHandle;\r
   EFI_STATUS                Status;\r
+  EFI_STRING                StringPtrUnknown;\r
 \r
+  StringPtrUnknown = HiiGetString (gHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);  \r
   IncFlag = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_SECTION_ALL), NULL);\r
   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\r
-              (IncFlag == NULL) ? ALit_UNKNOWN: IncFlag);\r
+              (IncFlag == NULL) ? StringPtrUnknown : IncFlag);\r
+  FreePool (StringPtrUnknown);\r
 \r
   // Get Handle information\r
   //\r
@@ -183,13 +186,16 @@ DumpAllTrace(
     {\r
       ++Index;    // Count every record.  First record is 1.\r
       ElapsedTime = 0;\r
+      if (IncFlag != NULL) {\r
+        FreePool ((void *)IncFlag);\r
+      }\r
       if (Measurement.EndTimeStamp != 0) {\r
         Duration = GetDuration (&Measurement);\r
         ElapsedTime = DurationInMicroSeconds ( Duration );\r
-        IncFlag = STR_DP_COMPLETE;\r
+        IncFlag = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_COMPLETE), NULL);\r
       }\r
       else {\r
-        IncFlag = STR_DP_INCOMPLETE;  // Mark incomplete records\r
+        IncFlag = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_INCOMPLETE), NULL);  // Mark incomplete records\r
       }\r
       if ((ElapsedTime < mInterestThreshold)                 ||\r
           ((ExcludeFlag) && (GetCumulativeItem(&Measurement) >= 0))\r
@@ -230,6 +236,7 @@ DumpAllTrace(
   if (HandleBuffer != &TempHandle) {\r
     FreePool (HandleBuffer);\r
   }\r
+  FreePool ((void *)IncFlag);\r
 }\r
 \r
 /** \r
@@ -264,10 +271,14 @@ DumpRawTrace(
   UINTN                     Index;\r
 \r
   EFI_STRING    StringPtr;\r
+  EFI_STRING    StringPtrUnknown;\r
 \r
+  StringPtrUnknown = HiiGetString (gHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);  \r
   StringPtr = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_SECTION_RAWTRACE), NULL);\r
   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\r
-              (StringPtr == NULL) ? ALit_UNKNOWN: StringPtr);\r
+              (StringPtr == NULL) ? StringPtrUnknown : StringPtr);\r
+  FreePool (StringPtr);\r
+  FreePool (StringPtrUnknown);\r
 \r
   PrintToken (STRING_TOKEN (STR_DP_RAW_HEADR) );\r
   PrintToken (STRING_TOKEN (STR_DP_RAW_DASHES) );\r
@@ -331,6 +342,7 @@ ProcessPhases(
   UINT64                    Total;\r
   EFI_STRING                StringPtr;\r
   UINTN                     LogEntryKey;\r
+  EFI_STRING                StringPtrUnknown;\r
 \r
   BdsTimeoutValue = 0;\r
   SecTime         = 0;\r
@@ -341,9 +353,12 @@ ProcessPhases(
   //\r
   // Get Execution Phase Statistics\r
   //\r
+  StringPtrUnknown = HiiGetString (gHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);   \r
   StringPtr = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_SECTION_PHASES), NULL);\r
   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\r
-              (StringPtr == NULL) ? ALit_UNKNOWN: StringPtr);\r
+              (StringPtr == NULL) ? StringPtrUnknown : StringPtr);\r
+  FreePool (StringPtr);\r
+  FreePool (StringPtrUnknown);\r
 \r
   LogEntryKey = 0;\r
   while ((LogEntryKey = GetPerformanceMeasurement (\r
@@ -467,10 +482,14 @@ ProcessHandles(
   UINTN                     Size;\r
   EFI_HANDLE                TempHandle;\r
   EFI_STATUS                Status;\r
+  EFI_STRING                StringPtrUnknown;\r
 \r
+  StringPtrUnknown = HiiGetString (gHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);  \r
   StringPtr = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_SECTION_DRIVERS), NULL);\r
   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\r
-              (StringPtr == NULL) ? ALit_UNKNOWN: StringPtr);\r
+              (StringPtr == NULL) ? StringPtrUnknown : StringPtr);\r
+  FreePool (StringPtr);\r
+  FreePool (StringPtrUnknown);\r
 \r
   Size = 0;\r
   HandleBuffer = &TempHandle;\r
@@ -562,11 +581,14 @@ ProcessPeims(
   EFI_STRING                StringPtr;\r
   UINTN                     LogEntryKey;\r
   UINTN                     TIndex;\r
+  EFI_STRING                StringPtrUnknown;\r
 \r
-\r
+  StringPtrUnknown = HiiGetString (gHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);  \r
   StringPtr = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_SECTION_PEIMS), NULL);\r
   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\r
-              (StringPtr == NULL) ? ALit_UNKNOWN: StringPtr);\r
+              (StringPtr == NULL) ? StringPtrUnknown : StringPtr);\r
+  FreePool (StringPtr);\r
+  FreePool (StringPtrUnknown);\r
 \r
   PrintToken (STRING_TOKEN (STR_DP_PEIM_SECTION));\r
   PrintToken (STRING_TOKEN (STR_DP_DASHES));\r
@@ -621,10 +643,14 @@ ProcessGlobal(
   EFI_STRING                StringPtr;\r
   UINTN                     LogEntryKey;\r
   UINTN                     Index;        // Index, or number, of the measurement record being processed\r
+  EFI_STRING                StringPtrUnknown;\r
 \r
+  StringPtrUnknown = HiiGetString (gHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);  \r
   StringPtr = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_SECTION_GENERAL), NULL);\r
   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\r
-              (StringPtr == NULL) ? ALit_UNKNOWN: StringPtr);\r
+              (StringPtr == NULL) ? StringPtrUnknown: StringPtr);\r
+  FreePool (StringPtr);\r
+  FreePool (StringPtrUnknown);\r
 \r
   PrintToken (STRING_TOKEN (STR_DP_GLOBAL_SECTION));\r
   PrintToken (STRING_TOKEN (STR_DP_DASHES));\r
@@ -680,11 +706,14 @@ ProcessCumulative(
   UINT64                    Avgval;         // the computed average duration\r
   EFI_STRING                StringPtr;\r
   UINTN                     TIndex;\r
+  EFI_STRING                StringPtrUnknown;\r
 \r
-\r
+  StringPtrUnknown = HiiGetString (gHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);  \r
   StringPtr = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_SECTION_CUMULATIVE), NULL);\r
   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\r
-              (StringPtr == NULL) ? ALit_UNKNOWN: StringPtr);\r
+              (StringPtr == NULL) ? StringPtrUnknown: StringPtr);\r
+  FreePool (StringPtr);\r
+  FreePool (StringPtrUnknown);\r
 \r
   PrintToken (STRING_TOKEN (STR_DP_CUMULATIVE_SECT_1));\r
   PrintToken (STRING_TOKEN (STR_DP_CUMULATIVE_SECT_2));\r