Dp uses this information to group records in different ways. It also uses\r
timer information to calculate elapsed time for each measurement.\r
\r
- Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>\r
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
**/\r
\r
#include <Library/UefiApplicationEntryPoint.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
#include <Library/ShellLib.h>\r
#include <Library/BaseLib.h>\r
#include <Library/MemoryAllocationLib.h>\r
#include <Library/DebugLib.h>\r
-#include <Library/TimerLib.h>\r
#include <Library/UefiLib.h>\r
+#include <Library/UefiHiiServicesLib.h>\r
#include <Library/HiiLib.h>\r
#include <Library/PcdLib.h>\r
\r
#include "Literals.h"\r
#include "DpInternal.h"\r
\r
+//\r
+// String token ID of help message text.\r
+// Shell supports to find help message in the resource section of an application image if\r
+// .MAN file is not found. This global variable is added to make build tool recognizes\r
+// that the help string is consumed by user and then build tool will add the string into\r
+// the resource section. Thus the application can use '-?' option to show help message in\r
+// Shell.\r
+//\r
+GLOBAL_REMOVE_IF_UNREFERENCED EFI_STRING_ID mDpStrEngHelpTokenId = STRING_TOKEN (STR_DP_HELP_INFORMATION);\r
+\r
//\r
/// Module-Global Variables\r
///@{\r
//\r
// Allocate one more for the end tag.\r
//\r
- ListLength = sizeof (ParamList) / sizeof (ParamList[0]) + 1; \r
+ ListLength = ARRAY_SIZE (ParamList) + 1; \r
DpParamList = AllocatePool (sizeof (SHELL_PARAM_ITEM) * ListLength);\r
ASSERT (DpParamList != NULL);\r
\r
FreePool (StringPtrUnknown);\r
}\r
\r
-/**\r
- Initialize the cumulative data.\r
-\r
-**/\r
-VOID\r
-InitCumulativeData (\r
- VOID\r
- )\r
-{\r
- UINTN Index;\r
-\r
- for (Index = 0; Index < NumCum; ++Index) {\r
- CumData[Index].Count = 0;\r
- CumData[Index].MinDur = PERF_MAXDUR;\r
- CumData[Index].MaxDur = 0;\r
- CumData[Index].Duration = 0;\r
- }\r
-}\r
-\r
/**\r
Dump performance data.\r
\r
IN EFI_SYSTEM_TABLE *SystemTable\r
)\r
{\r
- UINT64 Freq;\r
- UINT64 Ticker;\r
- UINT32 ListIndex;\r
- \r
- LIST_ENTRY *ParamPackage;\r
- CONST CHAR16 *CmdLineArg;\r
- EFI_STRING StringPtr;\r
- UINTN Number2Display;\r
-\r
- EFI_STATUS Status;\r
- BOOLEAN SummaryMode;\r
- BOOLEAN VerboseMode;\r
- BOOLEAN AllMode;\r
- BOOLEAN RawMode;\r
- BOOLEAN TraceMode;\r
- BOOLEAN ProfileMode;\r
- BOOLEAN ExcludeMode;\r
- BOOLEAN CumulativeMode;\r
- CONST CHAR16 *CustomCumulativeToken;\r
- PERF_CUM_DATA *CustomCumulativeData;\r
+ PERFORMANCE_PROPERTY *PerformanceProperty;\r
+ UINT32 ListIndex;\r
+\r
+ LIST_ENTRY *ParamPackage;\r
+ CONST CHAR16 *CmdLineArg;\r
+ EFI_STRING StringPtr;\r
+ UINTN Number2Display;\r
+\r
+ EFI_STATUS Status;\r
+ BOOLEAN SummaryMode;\r
+ BOOLEAN VerboseMode;\r
+ BOOLEAN AllMode;\r
+ BOOLEAN RawMode;\r
+ BOOLEAN TraceMode;\r
+ BOOLEAN ProfileMode;\r
+ BOOLEAN ExcludeMode;\r
+ BOOLEAN CumulativeMode;\r
+ CONST CHAR16 *CustomCumulativeToken;\r
+ PERF_CUM_DATA *CustomCumulativeData;\r
+ UINTN NameSize;\r
+ EFI_HII_PACKAGE_LIST_HEADER *PackageList;\r
\r
EFI_STRING StringDpOptionQh;\r
EFI_STRING StringDpOptionLh;\r
StringDpOptionLc = 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
- Ticker = GetPerformanceCounter ();\r
+ // Retrieve HII package list from ImageHandle\r
+ //\r
+ Status = gBS->OpenProtocol (\r
+ ImageHandle,\r
+ &gEfiHiiPackageListProtocolGuid,\r
+ (VOID **) &PackageList,\r
+ ImageHandle,\r
+ NULL,\r
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
\r
- // Register our string package with HII and return the handle to it.\r
//\r
- gHiiHandle = HiiAddPackages (&gEfiCallerIdGuid, ImageHandle, DPStrings, NULL);\r
+ // Publish HII package list to HII Database.\r
+ //\r
+ Status = gHiiDatabase->NewPackageList (\r
+ gHiiDatabase,\r
+ PackageList,\r
+ NULL,\r
+ &gHiiHandle\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ return Status;\r
+ }\r
ASSERT (gHiiHandle != NULL);\r
+ \r
\r
// Initial the command list\r
//\r
CustomCumulativeData->MaxDur = 0;\r
CustomCumulativeData->Count = 0;\r
CustomCumulativeData->Duration = 0;\r
- CustomCumulativeData->Name = AllocateZeroPool (StrLen (CustomCumulativeToken) + 1);\r
- UnicodeStrToAsciiStr (CustomCumulativeToken, CustomCumulativeData->Name);\r
+ NameSize = StrLen (CustomCumulativeToken) + 1;\r
+ CustomCumulativeData->Name = AllocateZeroPool (NameSize);\r
+ UnicodeStrToAsciiStrS (CustomCumulativeToken, CustomCumulativeData->Name, NameSize);\r
}\r
\r
/****************************************************************************\r
// StartCount = Value loaded into the counter when it starts counting\r
// EndCount = Value counter counts to before it needs to be reset\r
//\r
- Freq = GetPerformanceCounterProperties (&TimerInfo.StartCount, &TimerInfo.EndCount);\r
+ Status = EfiGetSystemConfigurationTable (&gPerformanceProtocolGuid, (VOID **) &PerformanceProperty);\r
+ if (EFI_ERROR (Status) || (PerformanceProperty == NULL)) {\r
+ PrintToken (STRING_TOKEN (STR_PERF_PROPERTY_NOT_FOUND));\r
+ goto Done;\r
+ }\r
\r
// Convert the Frequency from Hz to KHz\r
- TimerInfo.Frequency = (UINT32)DivU64x32 (Freq, 1000);\r
+ TimerInfo.Frequency = (UINT32)DivU64x32 (PerformanceProperty->Frequency, 1000);\r
+ TimerInfo.StartCount = PerformanceProperty->TimerStartValue;\r
+ TimerInfo.EndCount = PerformanceProperty->TimerEndValue;\r
\r
// Determine in which direction the performance counter counts.\r
TimerInfo.CountUp = (BOOLEAN) (TimerInfo.EndCount >= TimerInfo.StartCount);\r
else {\r
//------------- Begin Cooked Mode Processing\r
if (TraceMode) {\r
- ProcessPhases ( Ticker );\r
+ ProcessPhases ();\r
if ( ! SummaryMode) {\r
Status = ProcessHandles ( ExcludeMode);\r
if (Status == EFI_ABORTED) {\r
projects / mirror_edk2.git / blobdiff