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

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11015 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/PerformancePkg/Dp_App/Dp.c b/PerformancePkg/Dp_App/Dp.c
index 3237138b22f6e0d6373b5bfc2116bad12d925ae1..b8e07c5cca99ae5e6846a82da1a91f87a3316a47 100644 (file)
--- a/PerformancePkg/Dp_App/Dp.c
+++ b/PerformancePkg/Dp_App/Dp.c
@@ -44,6 +44,7 @@
 /// Module-Global Variables\r
 ///@{\r
 EFI_HII_HANDLE   gHiiHandle;\r
 /// Module-Global Variables\r
 ///@{\r
 EFI_HII_HANDLE   gHiiHandle;\r

+SHELL_PARAM_ITEM *DpParamList       = NULL;\r

 CHAR16           *mPrintTokenBuffer = NULL;\r
 CHAR16           mGaugeString[DXE_PERFORMANCE_STRING_SIZE];\r
 CHAR16           mUnicodeToken[PERF_TOKEN_LENGTH + 1];\r
 CHAR16           *mPrintTokenBuffer = NULL;\r
 CHAR16           mGaugeString[DXE_PERFORMANCE_STRING_SIZE];\r
 CHAR16           mUnicodeToken[PERF_TOKEN_LENGTH + 1];\r


@@ -65,26 +66,51 @@ PERF_CUM_DATA CumData[] = {
 /// Number of items for which we are gathering cumulative statistics.\r
 UINT32 const      NumCum = sizeof(CumData) / sizeof(PERF_CUM_DATA);\r
 \r
 /// Number of items for which we are gathering cumulative statistics.\r
 UINT32 const      NumCum = sizeof(CumData) / sizeof(PERF_CUM_DATA);\r
 \r

-SHELL_PARAM_ITEM  DpParamList[] = {\r
-  {STR_DP_OPTION_QH, TypeFlag},   // -?   Help\r
-  {STR_DP_OPTION_LH, TypeFlag},   // -h   Help\r
-  {STR_DP_OPTION_UH, TypeFlag},   // -H   Help\r
-  {STR_DP_OPTION_LV, TypeFlag},   // -v   Verbose Mode\r
-  {STR_DP_OPTION_UA, TypeFlag},   // -A   All, Cooked\r
-  {STR_DP_OPTION_UR, TypeFlag},   // -R   RAW All\r
-  {STR_DP_OPTION_LS, TypeFlag},   // -s   Summary\r
+PARAM_ITEM_LIST  ParamList[] = {\r
+  {STRING_TOKEN (STR_DP_OPTION_QH), TypeFlag},   // -?   Help\r
+  {STRING_TOKEN (STR_DP_OPTION_LH), TypeFlag},   // -h   Help\r
+  {STRING_TOKEN (STR_DP_OPTION_UH), TypeFlag},   // -H   Help\r
+  {STRING_TOKEN (STR_DP_OPTION_LV), TypeFlag},   // -v   Verbose Mode\r
+  {STRING_TOKEN (STR_DP_OPTION_UA), TypeFlag},   // -A   All, Cooked\r
+  {STRING_TOKEN (STR_DP_OPTION_UR), TypeFlag},   // -R   RAW All\r
+  {STRING_TOKEN (STR_DP_OPTION_LS), TypeFlag},   // -s   Summary\r

 #if PROFILING_IMPLEMENTED\r
 #if PROFILING_IMPLEMENTED\r

-  {STR_DP_OPTION_UP, TypeFlag},   // -P   Dump Profile Data\r
-  {STR_DP_OPTION_UT, TypeFlag},   // -T   Dump Trace Data\r
+  {STRING_TOKEN (STR_DP_OPTION_UP), TypeFlag},   // -P   Dump Profile Data\r
+  {STRING_TOKEN (STR_DP_OPTION_UT), TypeFlag},   // -T   Dump Trace Data\r

 #endif\r
 #endif\r

-  {STR_DP_OPTION_LX, TypeFlag},   // -x   eXclude Cumulative Items\r
-  {STR_DP_OPTION_LN, TypeValue},  // -n # Number of records to display for A and R\r
-  {STR_DP_OPTION_LT, TypeValue},  // -t # Threshold of interest\r
-  {NULL, TypeMax}\r
+  {STRING_TOKEN (STR_DP_OPTION_LX), TypeFlag},   // -x   eXclude Cumulative Items\r
+  {STRING_TOKEN (STR_DP_OPTION_LN), TypeValue},  // -n # Number of records to display for A and R\r
+  {STRING_TOKEN (STR_DP_OPTION_LT), TypeValue}   // -t # Threshold of interest\r

   };\r
 \r
 ///@}\r
 \r
   };\r
 \r
 ///@}\r
 \r

+/**\r
+  Transfer the param list value and get the command line parse.\r
+\r
+**/\r
+VOID\r
+InitialShellParamList( void )\r
+{\r
+  UINT32            ListIndex;\r
+  UINT32            ListLength;  \r
+\r
+  //\r
+  // Allocate one more for the end tag.\r
+  //\r
+  ListLength = sizeof (ParamList) / sizeof (ParamList[0]) + 1;  \r
+  DpParamList = AllocatePool (sizeof (SHELL_PARAM_ITEM) * ListLength);\r
+  ASSERT (DpParamList != NULL);\r
+  \r
+  for (ListIndex = 0; ListIndex < ListLength - 1; ListIndex ++)\r
+  { \r
+    DpParamList[ListIndex].Name = HiiGetString (gHiiHandle, ParamList[ListIndex].Token, NULL);      \r
+    DpParamList[ListIndex].Type = ParamList[ListIndex].Type;\r
+  }\r
+  DpParamList[ListIndex].Name = NULL;\r
+  DpParamList[ListIndex].Type = TypeMax;\r
+}\r
+\r

 /**\r
    Display Usage and Help information.\r
 **/\r
 /**\r
    Display Usage and Help information.\r
 **/\r


@@ -120,10 +146,11 @@ VOID
 DumpStatistics( void )\r
 {\r
   EFI_STRING                StringPtr;\r
 DumpStatistics( void )\r
 {\r
   EFI_STRING                StringPtr;\r

-\r
-  StringPtr = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_SECTION_STATISTICS), NULL);\r
+  EFI_STRING                StringPtrUnknown;\r
+  StringPtr        = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_SECTION_STATISTICS), NULL);\r
+  StringPtrUnknown = HiiGetString (gHiiHandle, STRING_TOKEN (STR_ALIT_UNKNOWN), NULL);  \r

   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\r
   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\r

-              (StringPtr == NULL) ? ALit_UNKNOWN: StringPtr);\r
+              (StringPtr == NULL) ? StringPtrUnknown : StringPtr);\r

 \r
   PrintToken( STRING_TOKEN (STR_DP_STATS_NUMTRACE),       SummaryData.NumTrace);\r
   PrintToken( STRING_TOKEN (STR_DP_STATS_NUMINCOMPLETE),  SummaryData.NumIncomplete);\r
 \r
   PrintToken( STRING_TOKEN (STR_DP_STATS_NUMTRACE),       SummaryData.NumTrace);\r
   PrintToken( STRING_TOKEN (STR_DP_STATS_NUMINCOMPLETE),  SummaryData.NumIncomplete);\r


@@ -134,6 +161,8 @@ DumpStatistics( void )
 #if PROFILING_IMPLEMENTED\r
   PrintToken( STRING_TOKEN (STR_DP_STATS_NUMPROFILE),     SummaryData.NumProfile);\r
 #endif // PROFILING_IMPLEMENTED\r
 #if PROFILING_IMPLEMENTED\r
   PrintToken( STRING_TOKEN (STR_DP_STATS_NUMPROFILE),     SummaryData.NumProfile);\r
 #endif // PROFILING_IMPLEMENTED\r

+  FreePool (StringPtr);\r
+  FreePool (StringPtrUnknown);\r

 }\r
 \r
 /** \r
 }\r
 \r
 /** \r


@@ -156,7 +185,8 @@ InitializeDp (
 {\r
   UINT64                    Freq;\r
   UINT64                    Ticker;\r
 {\r
   UINT64                    Freq;\r
   UINT64                    Ticker;\r

-\r
+  UINT32                    ListIndex;\r
+  \r

   LIST_ENTRY                *ParamPackage;\r
   CONST CHAR16              *CmdLineArg;\r
   EFI_STRING                StringPtr;\r
   LIST_ENTRY                *ParamPackage;\r
   CONST CHAR16              *CmdLineArg;\r
   EFI_STRING                StringPtr;\r


@@ -171,6 +201,20 @@ InitializeDp (
   BOOLEAN                   ProfileMode;\r
   BOOLEAN                   ExcludeMode;\r
 \r
   BOOLEAN                   ProfileMode;\r
   BOOLEAN                   ExcludeMode;\r
 \r

+  EFI_STRING                StringDpOptionQh;\r
+  EFI_STRING                StringDpOptionLh;\r
+  EFI_STRING                StringDpOptionUh;\r
+  EFI_STRING                StringDpOptionLv;\r
+  EFI_STRING                StringDpOptionUs;\r
+  EFI_STRING                StringDpOptionLs;\r
+  EFI_STRING                StringDpOptionUa;\r
+  EFI_STRING                StringDpOptionUr;\r
+  EFI_STRING                StringDpOptionUt;\r
+  EFI_STRING                StringDpOptionUp;\r
+  EFI_STRING                StringDpOptionLx;\r
+  EFI_STRING                StringDpOptionLn;\r
+  EFI_STRING                StringDpOptionLt;\r
+  \r

   SummaryMode     = FALSE;\r
   VerboseMode     = FALSE;\r
   AllMode         = FALSE;\r
   SummaryMode     = FALSE;\r
   VerboseMode     = FALSE;\r
   AllMode         = FALSE;\r


@@ -178,6 +222,22 @@ InitializeDp (
   TraceMode       = FALSE;\r
   ProfileMode     = FALSE;\r
   ExcludeMode     = FALSE;\r
   TraceMode       = FALSE;\r
   ProfileMode     = FALSE;\r
   ExcludeMode     = FALSE;\r

+\r
+  StringDpOptionQh = NULL;\r
+  StringDpOptionLh = NULL;\r
+  StringDpOptionUh = NULL;\r
+  StringDpOptionLv = NULL;\r
+  StringDpOptionUs = NULL;\r
+  StringDpOptionLs = NULL;\r
+  StringDpOptionUa = NULL;\r
+  StringDpOptionUr = NULL;\r
+  StringDpOptionUt = NULL;\r
+  StringDpOptionUp = NULL;\r
+  StringDpOptionLx = NULL;\r
+  StringDpOptionLn = NULL;\r
+  StringDpOptionLt = NULL;\r
+  StringPtr        = NULL;\r
+\r

   // Get DP's entry time as soon as possible.\r
   // This is used as the Shell-Phase end time.\r
   //\r
   // Get DP's entry time as soon as possible.\r
   // This is used as the Shell-Phase end time.\r
   //\r


@@ -188,6 +248,10 @@ InitializeDp (
   gHiiHandle = HiiAddPackages (&gEfiCallerIdGuid, ImageHandle, DPStrings, NULL);\r
   ASSERT (gHiiHandle != NULL);\r
 \r
   gHiiHandle = HiiAddPackages (&gEfiCallerIdGuid, ImageHandle, DPStrings, NULL);\r
   ASSERT (gHiiHandle != NULL);\r
 \r

+  // Initial the command list\r
+  //\r
+  InitialShellParamList ();\r
+  \r

 /****************************************************************************\r
 ****            Process Command Line arguments                           ****\r
 ****************************************************************************/\r
 /****************************************************************************\r
 ****            Process Command Line arguments                           ****\r
 ****************************************************************************/\r


@@ -198,27 +262,43 @@ InitializeDp (
     ShowHelp();\r
   }\r
   else {\r
     ShowHelp();\r
   }\r
   else {\r

-    if (ShellCommandLineGetFlag (ParamPackage, STR_DP_OPTION_QH)  ||\r
-        ShellCommandLineGetFlag (ParamPackage, STR_DP_OPTION_LH)  ||\r
-        ShellCommandLineGetFlag (ParamPackage, STR_DP_OPTION_UH))\r
+    StringDpOptionQh = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_QH), NULL);\r
+    StringDpOptionLh = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_LH), NULL);\r
+    StringDpOptionUh = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_UH), NULL);\r
+    \r
+    if (ShellCommandLineGetFlag (ParamPackage, StringDpOptionQh)  ||\r
+        ShellCommandLineGetFlag (ParamPackage, StringDpOptionLh)  ||\r
+        ShellCommandLineGetFlag (ParamPackage, StringDpOptionUh))\r

     {\r
       ShowHelp();\r
     }\r
     else {\r
     {\r
       ShowHelp();\r
     }\r
     else {\r

+      StringDpOptionLv = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_LV), NULL);\r
+      StringDpOptionUs = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_US), NULL);\r
+      StringDpOptionLs = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_LS), NULL);\r
+      StringDpOptionUa = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_UA), NULL);\r
+      StringDpOptionUr = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_UR), NULL);\r
+      StringDpOptionUt = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_UT), NULL);\r
+      StringDpOptionUp = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_UP), NULL);\r
+      StringDpOptionLx = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_LX), NULL);\r
+      StringDpOptionLn = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_LN), NULL);\r
+      StringDpOptionLt = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_OPTION_LT), NULL);\r
+      \r

       // Boolean Options\r
       // Boolean Options\r

-      VerboseMode = (ShellCommandLineGetFlag (ParamPackage, STR_DP_OPTION_LV));\r
-      SummaryMode = (ShellCommandLineGetFlag (ParamPackage, STR_DP_OPTION_US) ||\r
-                     ShellCommandLineGetFlag (ParamPackage, STR_DP_OPTION_LS));\r
-      AllMode     = (ShellCommandLineGetFlag (ParamPackage, STR_DP_OPTION_UA));\r
-      RawMode     = (ShellCommandLineGetFlag (ParamPackage, STR_DP_OPTION_UR));\r
+      // \r
+      VerboseMode = ShellCommandLineGetFlag (ParamPackage, StringDpOptionLv);\r
+      SummaryMode = ShellCommandLineGetFlag (ParamPackage, StringDpOptionUs) ||\r
+                    ShellCommandLineGetFlag (ParamPackage, StringDpOptionLs);\r
+      AllMode     = ShellCommandLineGetFlag (ParamPackage, StringDpOptionUa);\r
+      RawMode     = ShellCommandLineGetFlag (ParamPackage, StringDpOptionUr);\r

 #if PROFILING_IMPLEMENTED\r
 #if PROFILING_IMPLEMENTED\r

-      TraceMode   = (ShellCommandLineGetFlag (ParamPackage, STR_DP_OPTION_UT));\r
-      ProfileMode = (ShellCommandLineGetFlag (ParamPackage, STR_DP_OPTION_UP));\r
+      TraceMode   = ShellCommandLineGetFlag (ParamPackage, StringDpOptionUt);\r
+      ProfileMode = ShellCommandLineGetFlag (ParamPackage, StringDpOptionUp);\r

 #endif  // PROFILING_IMPLEMENTED\r
 #endif  // PROFILING_IMPLEMENTED\r

-      ExcludeMode = (ShellCommandLineGetFlag (ParamPackage, STR_DP_OPTION_LX));\r
+      ExcludeMode = ShellCommandLineGetFlag (ParamPackage, StringDpOptionLx);\r

 \r
       // Options with Values\r
 \r
       // Options with Values\r

-      CmdLineArg  = ( ShellCommandLineGetValue (ParamPackage, STR_DP_OPTION_LN));\r
+      CmdLineArg  = ShellCommandLineGetValue (ParamPackage, StringDpOptionLn);\r

       if (CmdLineArg == NULL) {\r
         Number2Display = DEFAULT_DISPLAYCOUNT;\r
       }\r
       if (CmdLineArg == NULL) {\r
         Number2Display = DEFAULT_DISPLAYCOUNT;\r
       }\r


@@ -228,7 +308,7 @@ InitializeDp (
           Number2Display = MAXIMUM_DISPLAYCOUNT;\r
         }\r
       }\r
           Number2Display = MAXIMUM_DISPLAYCOUNT;\r
         }\r
       }\r

-      CmdLineArg  = (ShellCommandLineGetValue (ParamPackage, STR_DP_OPTION_LT));\r
+      CmdLineArg  = ShellCommandLineGetValue (ParamPackage, StringDpOptionLt);\r

       if (CmdLineArg == NULL) {\r
         mInterestThreshold = DEFAULT_THRESHOLD;  // 1ms := 1,000 us\r
       }\r
       if (CmdLineArg == NULL) {\r
         mInterestThreshold = DEFAULT_THRESHOLD;  // 1ms := 1,000 us\r
       }\r


@@ -344,7 +424,32 @@ InitializeDp (
       }\r
     }\r
   }\r
       }\r
     }\r
   }\r

-  (void) FreePool (mPrintTokenBuffer);\r
+\r
+  // Free the memory allocate from HiiGetString\r
+  //\r
+  ListIndex = 0;\r
+  while (DpParamList[ListIndex].Name != NULL) {\r
+    FreePool (DpParamList[ListIndex].Name);\r
+    ListIndex ++;\r
+  }  \r
+  FreePool (DpParamList);\r
+  \r
+  FreePool (StringDpOptionQh);\r
+  FreePool (StringDpOptionLh);\r
+  FreePool (StringDpOptionUh);\r
+  FreePool (StringDpOptionLv);\r
+  FreePool (StringDpOptionUs);\r
+  FreePool (StringDpOptionLs);\r
+  FreePool (StringDpOptionUa);\r
+  FreePool (StringDpOptionUr);\r
+  FreePool (StringDpOptionUt);\r
+  FreePool (StringDpOptionUp);\r
+  FreePool (StringDpOptionLx);\r
+  FreePool (StringDpOptionLn);\r
+  FreePool (StringDpOptionLt);  \r
+  FreePool (StringPtr);\r
+  FreePool (mPrintTokenBuffer);\r
+  \r

   HiiRemovePackages (gHiiHandle);\r
   return Status;\r
 }\r
   HiiRemovePackages (gHiiHandle);\r
   return Status;\r
 }\r

diff --git a/PerformancePkg/Dp_App/Dp.h b/PerformancePkg/Dp_App/Dp.h
index 072ae1b983ce2d20803efd1981129bf7b63950cb..06dbe044ab378a379f70554c2f7a965d2a6116f3 100644 (file)
--- a/PerformancePkg/Dp_App/Dp.h
+++ b/PerformancePkg/Dp_App/Dp.h
@@ -14,6 +14,8 @@
 #ifndef _EFI_APP_DP_H_\r
 #define _EFI_APP_DP_H_\r
 \r
 #ifndef _EFI_APP_DP_H_\r
 #define _EFI_APP_DP_H_\r
 \r

+#include <Library/ShellLib.h>\r
+\r

 #define DP_MAJOR_VERSION        2\r
 #define DP_MINOR_VERSION        3\r
 \r
 #define DP_MAJOR_VERSION        2\r
 #define DP_MINOR_VERSION        3\r
 \r


@@ -91,4 +93,8 @@ typedef struct {
   UINT32                Count;            ///< Number of measurements accumulated.\r
 } PROFILE_RECORD;\r
 \r
   UINT32                Count;            ///< Number of measurements accumulated.\r
 } PROFILE_RECORD;\r
 \r

+typedef struct {\r
+  UINT16             Token;\r
+  SHELL_PARAM_TYPE   Type;\r
+} PARAM_ITEM_LIST;\r

 #endif  // _EFI_APP_DP_H_\r
 #endif  // _EFI_APP_DP_H_\r

diff --git a/PerformancePkg/Dp_App/DpProfile.c b/PerformancePkg/Dp_App/DpProfile.c
index b0e0eba509a9594a9b1920ab1f0d3625267335a5..d550760f8397ce18b9f1f5d9a1fbaabcbe47e8af 100644 (file)
--- a/PerformancePkg/Dp_App/DpProfile.c
+++ b/PerformancePkg/Dp_App/DpProfile.c
@@ -54,10 +54,15 @@ DumpAllProfile(
   )\r
 {\r
   EFI_STRING    StringPtr;\r
   )\r
 {\r
   EFI_STRING    StringPtr;\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_PROFILE), NULL);\r
   StringPtr = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_SECTION_PROFILE), NULL);\r

+\r

   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\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

   return;\r
 }\r
 \r
   return;\r
 }\r
 \r


@@ -86,9 +91,13 @@ DumpRawProfile(
   )\r
 {\r
   EFI_STRING    StringPtr;\r
   )\r
 {\r
   EFI_STRING    StringPtr;\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_RAWPROFILE), NULL);\r
   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\r
   StringPtr = HiiGetString (gHiiHandle, STRING_TOKEN (STR_DP_SECTION_RAWPROFILE), 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

   return;\r
 }\r
   return;\r
 }\r

diff --git a/PerformancePkg/Dp_App/DpStrings.uni b/PerformancePkg/Dp_App/DpStrings.uni
index 2d355dffb063b401a627b47f16268dd1872fa30c..f120985324ecc798ffdf896a4ff22b825f3b0bb3 100644 (file)
Binary files a/PerformancePkg/Dp_App/DpStrings.uni and b/PerformancePkg/Dp_App/DpStrings.uni differ

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
   UINTN                     Size;\r
   EFI_HANDLE                TempHandle;\r
   EFI_STATUS                Status;\r

+  EFI_STRING                StringPtrUnknown;\r

 \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 = 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
 \r
   // Get Handle information\r
   //\r


@@ -183,13 +186,16 @@ DumpAllTrace(
     {\r
       ++Index;    // Count every record.  First record is 1.\r
       ElapsedTime = 0;\r
     {\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
       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
       }\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
       }\r
       if ((ElapsedTime < mInterestThreshold)                 ||\r
           ((ExcludeFlag) && (GetCumulativeItem(&Measurement) >= 0))\r


@@ -230,6 +236,7 @@ DumpAllTrace(
   if (HandleBuffer != &TempHandle) {\r
     FreePool (HandleBuffer);\r
   }\r
   if (HandleBuffer != &TempHandle) {\r
     FreePool (HandleBuffer);\r
   }\r

+  FreePool ((void *)IncFlag);\r

 }\r
 \r
 /** \r
 }\r
 \r
 /** \r


@@ -264,10 +271,14 @@ DumpRawTrace(
   UINTN                     Index;\r
 \r
   EFI_STRING    StringPtr;\r
   UINTN                     Index;\r
 \r
   EFI_STRING    StringPtr;\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_RAWTRACE), NULL);\r
   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\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
 \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
   UINT64                    Total;\r
   EFI_STRING                StringPtr;\r
   UINTN                     LogEntryKey;\r

+  EFI_STRING                StringPtrUnknown;\r

 \r
   BdsTimeoutValue = 0;\r
   SecTime         = 0;\r
 \r
   BdsTimeoutValue = 0;\r
   SecTime         = 0;\r


@@ -341,9 +353,12 @@ ProcessPhases(
   //\r
   // Get Execution Phase Statistics\r
   //\r
   //\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 = 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
 \r
   LogEntryKey = 0;\r
   while ((LogEntryKey = GetPerformanceMeasurement (\r


@@ -467,10 +482,14 @@ ProcessHandles(
   UINTN                     Size;\r
   EFI_HANDLE                TempHandle;\r
   EFI_STATUS                Status;\r
   UINTN                     Size;\r
   EFI_HANDLE                TempHandle;\r
   EFI_STATUS                Status;\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_DRIVERS), NULL);\r
   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\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
 \r
   Size = 0;\r
   HandleBuffer = &TempHandle;\r


@@ -562,11 +581,14 @@ ProcessPeims(
   EFI_STRING                StringPtr;\r
   UINTN                     LogEntryKey;\r
   UINTN                     TIndex;\r
   EFI_STRING                StringPtr;\r
   UINTN                     LogEntryKey;\r
   UINTN                     TIndex;\r

+  EFI_STRING                StringPtrUnknown;\r

 \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 = 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
 \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                StringPtr;\r
   UINTN                     LogEntryKey;\r
   UINTN                     Index;        // Index, or number, of the measurement record being processed\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_GENERAL), NULL);\r
   PrintToken( STRING_TOKEN (STR_DP_SECTION_HEADER),\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
 \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
   UINT64                    Avgval;         // the computed average duration\r
   EFI_STRING                StringPtr;\r
   UINTN                     TIndex;\r

+  EFI_STRING                StringPtrUnknown;\r

 \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 = 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
 \r
   PrintToken (STRING_TOKEN (STR_DP_CUMULATIVE_SECT_1));\r
   PrintToken (STRING_TOKEN (STR_DP_CUMULATIVE_SECT_2));\r

diff --git a/PerformancePkg/Dp_App/DpUtilities.c b/PerformancePkg/Dp_App/DpUtilities.c
index 1c40e8395040e92ff4ceb5c3c6cd8957f3f0ff4e..48e2952aa79eed2d108de7a1bb3e37717d7dc7d1 100644 (file)
--- a/PerformancePkg/Dp_App/DpUtilities.c
+++ b/PerformancePkg/Dp_App/DpUtilities.c
@@ -206,6 +206,7 @@ GetNameFromHandle (
                   );\r
     if (EFI_ERROR (Status)) {\r
       StrCpy (mGaugeString, StringPtr);\r
                   );\r
     if (EFI_ERROR (Status)) {\r
       StrCpy (mGaugeString, StringPtr);\r

+      FreePool (StringPtr);\r

       return ;\r
     }\r
 \r
       return ;\r
     }\r
 \r


@@ -225,6 +226,7 @@ GetNameFromHandle (
   } else {\r
     StrCpy (mGaugeString, StringPtr);\r
   }\r
   } else {\r
     StrCpy (mGaugeString, StringPtr);\r
   }\r

+  FreePool (StringPtr);\r

   return ;\r
 }\r
 \r
   return ;\r
 }\r
 \r


@@ -289,6 +291,7 @@ PrintToken (
   if (Return > 0 && gST->ConOut != NULL) {\r
     gST->ConOut->OutputString (gST->ConOut, mPrintTokenBuffer);\r
   }\r
   if (Return > 0 && gST->ConOut != NULL) {\r
     gST->ConOut->OutputString (gST->ConOut, mPrintTokenBuffer);\r
   }\r

+  FreePool (StringPtr);\r

   return Return;\r
 }\r
 \r
   return Return;\r
 }\r
 \r

diff --git a/PerformancePkg/Dp_App/Literals.c b/PerformancePkg/Dp_App/Literals.c
index 53d950740927ebc22975f0d3ac0f23a87a8137ae..6895f2b15c1566dce89e74e3d3c865bad3a548f9 100644 (file)
--- a/PerformancePkg/Dp_App/Literals.c
+++ b/PerformancePkg/Dp_App/Literals.c
@@ -21,26 +21,3 @@ CHAR8 const ALit_PEI[]    = PEI_TOK;
 CHAR8 const ALit_BDS[]    = BDS_TOK;\r
 CHAR8 const ALit_BdsTO[]  = "BdsTimeOut";\r
 CHAR8 const ALit_PEIM[]   = "PEIM";\r
 CHAR8 const ALit_BDS[]    = BDS_TOK;\r
 CHAR8 const ALit_BdsTO[]  = "BdsTimeOut";\r
 CHAR8 const ALit_PEIM[]   = "PEIM";\r

-\r
-/// UNICODE String literals which should probably be translated\r
-CHAR16  STR_DP_OPTION_UA[]   = L"-A";\r
-CHAR16  STR_DP_OPTION_LA[]   = L"-a";\r
-CHAR16  STR_DP_OPTION_LN[]   = L"-n";\r
-CHAR16  STR_DP_OPTION_LT[]   = L"-t";\r
-CHAR16  STR_DP_OPTION_UP[]   = L"-P";\r
-CHAR16  STR_DP_OPTION_UR[]   = L"-R";\r
-CHAR16  STR_DP_OPTION_LS[]   = L"-s";\r
-CHAR16  STR_DP_OPTION_US[]   = L"-S";\r
-CHAR16  STR_DP_OPTION_UT[]   = L"-T";\r
-CHAR16  STR_DP_OPTION_LV[]   = L"-v";\r
-CHAR16  STR_DP_OPTION_QH[]   = L"-?";\r
-CHAR16  STR_DP_OPTION_LH[]   = L"-h";\r
-CHAR16  STR_DP_OPTION_UH[]   = L"-H";\r
-CHAR16  STR_DP_OPTION_LX[]   = L"-x";\r
-\r
-CHAR16 const ALit_UNKNOWN[]       = L"Unknown";\r
-CHAR16 const STR_DP_INCOMPLETE[]  = L" I ";\r
-CHAR16 const STR_DP_COMPLETE[]    = L"   ";\r
-\r
-CHAR8 const ALit_TRUE[]   = "TRUE";\r
-CHAR8 const ALit_FALSE[]  = "FALSE";\r

diff --git a/PerformancePkg/Dp_App/Literals.h b/PerformancePkg/Dp_App/Literals.h
index 37d8c5a7bf1df41c5e36c6bc63c30b406dc9565f..7e254d0fd1aafa41f95b2e8a60970d18227533d3 100644 (file)
--- a/PerformancePkg/Dp_App/Literals.h
+++ b/PerformancePkg/Dp_App/Literals.h
@@ -23,27 +23,4 @@ extern CHAR8 const ALit_BDS[];
 extern CHAR8 const ALit_BdsTO[];\r
 extern CHAR8 const ALit_PEIM[];\r
 \r
 extern CHAR8 const ALit_BdsTO[];\r
 extern CHAR8 const ALit_PEIM[];\r
 \r

-/// UNICODE String literals which should probably be translated\r
-extern CHAR16  STR_DP_OPTION_UA[];\r
-extern CHAR16  STR_DP_OPTION_LA[];\r
-extern CHAR16  STR_DP_OPTION_LN[];\r
-extern CHAR16  STR_DP_OPTION_LT[];\r
-extern CHAR16  STR_DP_OPTION_UP[];\r
-extern CHAR16  STR_DP_OPTION_UR[];\r
-extern CHAR16  STR_DP_OPTION_LS[];\r
-extern CHAR16  STR_DP_OPTION_US[];\r
-extern CHAR16  STR_DP_OPTION_UT[];\r
-extern CHAR16  STR_DP_OPTION_LV[];\r
-extern CHAR16  STR_DP_OPTION_QH[];\r
-extern CHAR16  STR_DP_OPTION_LH[];\r
-extern CHAR16  STR_DP_OPTION_UH[];\r
-extern CHAR16  STR_DP_OPTION_LX[];\r
-\r
-extern CHAR16 const ALit_UNKNOWN[];\r
-extern CHAR16 const STR_DP_INCOMPLETE[];\r
-extern CHAR16 const STR_DP_COMPLETE[];\r
-\r
-extern CHAR8 const ALit_TRUE[];\r
-extern CHAR8 const ALit_FALSE[];\r
-\r

 #endif  // _LITERALS_H_\r
 #endif  // _LITERALS_H_\r