Add new extension PerformanceLib APIs to store ID info.

Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

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

2 files changed, 188 insertions, 41 deletions

diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
index 3b6a44c9b2..49011b701c 100644
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
@@ -32,30 +32,27 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 

 

 /**

-  Gets PEI the GUID HOB for PEI performance.

+  Gets the GUID HOB for PEI performance.

 

   This internal function searches for the GUID HOB for PEI performance.

   If that GUID HOB is not found, it will build a new one.

-  It returns the data area of that GUID HOB to record performance log.

+  It outputs the data area of that GUID HOB to record performance log.

 

-  @param  Handle                  Pointer to environment specific context used

-                                  to identify the component being measured.

-  @param  Token                   Pointer to a Null-terminated ASCII string

-                                  that identifies the component being measured.

-  @param  Module                  Pointer to a Null-terminated ASCII string

-                                  that identifies the module being measured.

-

-  @retval The index of log entry in the array.

+  @param    PeiPerformanceLog           Pointer to Pointer to PEI performance log header.

+  @param    PeiPerformanceIdArray       Pointer to Pointer to PEI performance identifier array.

 

 **/

-PEI_PERFORMANCE_LOG_HEADER *

+VOID

 InternalGetPerformanceHobLog (

-  VOID

+  OUT PEI_PERFORMANCE_LOG_HEADER    **PeiPerformanceLog,

+  OUT UINT32                        **PeiPerformanceIdArray

   )

 {

   EFI_HOB_GUID_TYPE           *GuidHob;

-  PEI_PERFORMANCE_LOG_HEADER  *PeiPerformanceLog;

-  UINTN                       PeiPerformanceLogSize;

+  UINTN                       PeiPerformanceSize;

+

+  ASSERT (PeiPerformanceLog != NULL);

+  ASSERT (PeiPerformanceIdArray != NULL);

 

   GuidHob = GetFirstGuidHob (&gPerformanceProtocolGuid);

 

@@ -63,25 +60,31 @@ InternalGetPerformanceHobLog (
     //

     // PEI Performance HOB was found, then return the existing one.

     //

-    PeiPerformanceLog = GET_GUID_HOB_DATA (GuidHob);

+    *PeiPerformanceLog = GET_GUID_HOB_DATA (GuidHob);

+

+    GuidHob = GetFirstGuidHob (&gPerformanceExProtocolGuid);

+    ASSERT (GuidHob != NULL);

+    *PeiPerformanceIdArray = GET_GUID_HOB_DATA (GuidHob);

   } else {

     //

     // PEI Performance HOB was not found, then build one.

     //

-    PeiPerformanceLogSize = sizeof (PEI_PERFORMANCE_LOG_HEADER) +

-                            sizeof (PEI_PERFORMANCE_LOG_ENTRY) * PcdGet8 (PcdMaxPeiPerformanceLogEntries);

-    PeiPerformanceLog     = BuildGuidHob (&gPerformanceProtocolGuid, PeiPerformanceLogSize);

-    PeiPerformanceLog     = ZeroMem (PeiPerformanceLog, PeiPerformanceLogSize);

+    PeiPerformanceSize     = sizeof (PEI_PERFORMANCE_LOG_HEADER) +

+                             sizeof (PEI_PERFORMANCE_LOG_ENTRY) * PcdGet8 (PcdMaxPeiPerformanceLogEntries);

+    *PeiPerformanceLog     = BuildGuidHob (&gPerformanceProtocolGuid, PeiPerformanceSize);

+    *PeiPerformanceLog     = ZeroMem (*PeiPerformanceLog, PeiPerformanceSize);

+

+    PeiPerformanceSize     = sizeof (UINT32) * PcdGet8 (PcdMaxPeiPerformanceLogEntries);

+    *PeiPerformanceIdArray = BuildGuidHob (&gPerformanceExProtocolGuid, PeiPerformanceSize);

+    *PeiPerformanceIdArray = ZeroMem (*PeiPerformanceIdArray, PeiPerformanceSize);

   }

-

-  return PeiPerformanceLog;

 }

 

 /**

-  Searches in the log array with keyword Handle, Token and Module.

+  Searches in the log array with keyword Handle, Token, Module and Identifier.

 

   This internal function searches for the log entry in the log array.

-  If there is an entry that exactly matches the given key word triple

+  If there is an entry that exactly matches the given keywords

   and its end time stamp is zero, then the index of that log entry is returned;

   otherwise, the the number of log entries in the array is returned.

 

@@ -93,6 +96,7 @@ InternalGetPerformanceHobLog (
                                   that identifies the component being measured.

   @param  Module                  Pointer to a Null-terminated ASCII string

                                   that identifies the module being measured.

+  @param  Identifier              32-bit identifier.

 

   @retval The index of log entry in the array.

 

@@ -100,9 +104,11 @@ InternalGetPerformanceHobLog (
 UINT32

 InternalSearchForLogEntry (

   IN PEI_PERFORMANCE_LOG_HEADER *PeiPerformanceLog,

+  IN UINT32                     *PeiPerformanceIdArray,

   IN CONST VOID                 *Handle,  OPTIONAL

   IN CONST CHAR8                *Token,   OPTIONAL

-  IN CONST CHAR8                *Module   OPTIONAL

+  IN CONST CHAR8                *Module,   OPTIONAL

+  IN UINT32                     Identifier

   )

 {

   UINT32                    Index;

@@ -123,6 +129,7 @@ InternalSearchForLogEntry (
     if ((LogEntryArray[Index].Handle == (EFI_PHYSICAL_ADDRESS) (UINTN) Handle) &&

          AsciiStrnCmp (LogEntryArray[Index].Token, Token, PEI_PERFORMANCE_STRING_LENGTH) == 0 &&

          AsciiStrnCmp (LogEntryArray[Index].Module, Module, PEI_PERFORMANCE_STRING_LENGTH) == 0 &&

+         (PeiPerformanceIdArray[Index] == Identifier) &&

          LogEntryArray[Index].EndTimeStamp == 0

        ) {

       break;

@@ -134,7 +141,7 @@ InternalSearchForLogEntry (
 /**

   Creates a record for the beginning of a performance measurement.

 

-  Creates a record that contains the Handle, Token, and Module.

+  Creates a record that contains the Handle, Token, Module and Identifier.

   If TimeStamp is not zero, then TimeStamp is added to the record as the start time.

   If TimeStamp is zero, then this function reads the current time stamp

   and adds that time stamp value to the record as the start time.

@@ -146,6 +153,8 @@ InternalSearchForLogEntry (
   @param  Module                  Pointer to a Null-terminated ASCII string

                                   that identifies the module being measured.

   @param  TimeStamp               64-bit time stamp.

+  @param  Identifier              32-bit identifier. If the value is 0, the created record

+                                  is same as the one created by StartPerformanceMeasurement.

 

   @retval RETURN_SUCCESS          The start of the measurement was recorded.

   @retval RETURN_OUT_OF_RESOURCES There are not enough resources to record the measurement.

@@ -153,18 +162,20 @@ InternalSearchForLogEntry (
 **/

 RETURN_STATUS

 EFIAPI

-StartPerformanceMeasurement (

+StartPerformanceMeasurementEx (

   IN CONST VOID   *Handle,  OPTIONAL

   IN CONST CHAR8  *Token,   OPTIONAL

   IN CONST CHAR8  *Module,  OPTIONAL

-  IN UINT64       TimeStamp

+  IN UINT64       TimeStamp,

+  IN UINT32       Identifier

   )

 {

   PEI_PERFORMANCE_LOG_HEADER  *PeiPerformanceLog;

+  UINT32                      *PeiPerformanceIdArray;

   PEI_PERFORMANCE_LOG_ENTRY   *LogEntryArray;

   UINT32                      Index;

 

-  PeiPerformanceLog = InternalGetPerformanceHobLog ();

+  InternalGetPerformanceHobLog (&PeiPerformanceLog, &PeiPerformanceIdArray);

 

   if (PeiPerformanceLog->NumberOfEntries >= PcdGet8 (PcdMaxPeiPerformanceLogEntries)) {

     return RETURN_OUT_OF_RESOURCES;

@@ -180,6 +191,9 @@ StartPerformanceMeasurement (
     AsciiStrnCpy (LogEntryArray[Index].Module, Module, PEI_PERFORMANCE_STRING_LENGTH);

   }

 

+  LogEntryArray[Index].EndTimeStamp = 0;

+  PeiPerformanceIdArray[Index] = Identifier;

+

   if (TimeStamp == 0) {

     TimeStamp = GetPerformanceCounter ();

   }

@@ -191,7 +205,7 @@ StartPerformanceMeasurement (
 /**

   Fills in the end time of a performance measurement.

 

-  Looks up the record that matches Handle, Token, and Module.

+  Looks up the record that matches Handle, Token, Module and Identifier.

   If the record can not be found then return RETURN_NOT_FOUND.

   If the record is found and TimeStamp is not zero,

   then TimeStamp is added to the record as the end time.

@@ -205,6 +219,8 @@ StartPerformanceMeasurement (
   @param  Module                  Pointer to a Null-terminated ASCII string

                                   that identifies the module being measured.

   @param  TimeStamp               64-bit time stamp.

+  @param  Identifier              32-bit identifier. If the value is 0, the found record

+                                  is same as the one found by EndPerformanceMeasurement.

 

   @retval RETURN_SUCCESS          The end of  the measurement was recorded.

   @retval RETURN_NOT_FOUND        The specified measurement record could not be found.

@@ -212,14 +228,16 @@ StartPerformanceMeasurement (
 **/

 RETURN_STATUS

 EFIAPI

-EndPerformanceMeasurement (

+EndPerformanceMeasurementEx (

   IN CONST VOID   *Handle,  OPTIONAL

   IN CONST CHAR8  *Token,   OPTIONAL

   IN CONST CHAR8  *Module,  OPTIONAL

-  IN UINT64       TimeStamp

+  IN UINT64       TimeStamp,

+  IN UINT32       Identifier

   )

 {

   PEI_PERFORMANCE_LOG_HEADER  *PeiPerformanceLog;

+  UINT32                      *PeiPerformanceIdArray;

   PEI_PERFORMANCE_LOG_ENTRY   *LogEntryArray;

   UINT32                      Index;

 

@@ -227,8 +245,8 @@ EndPerformanceMeasurement (
     TimeStamp = GetPerformanceCounter ();

   }

 

-  PeiPerformanceLog = InternalGetPerformanceHobLog ();

-  Index             = InternalSearchForLogEntry (PeiPerformanceLog, Handle, Token, Module);

+  InternalGetPerformanceHobLog (&PeiPerformanceLog, &PeiPerformanceIdArray);

+  Index             = InternalSearchForLogEntry (PeiPerformanceLog, PeiPerformanceIdArray, Handle, Token, Module, Identifier);

   if (Index >= PeiPerformanceLog->NumberOfEntries) {

     return RETURN_NOT_FOUND;

   }

@@ -240,6 +258,8 @@ EndPerformanceMeasurement (
 

 /**

   Attempts to retrieve a performance measurement log entry from the performance measurement log.

+  It can also retrieve the log created by StartPerformanceMeasurement and EndPerformanceMeasurement,

+  and then assign the Identifier with 0.

 

   Attempts to retrieve the performance log entry specified by LogEntryKey.  If LogEntryKey is

   zero on entry, then an attempt is made to retrieve the first entry from the performance log,

@@ -250,17 +270,18 @@ EndPerformanceMeasurement (
   retrieved and an implementation specific non-zero key value that specifies the end of the performance

   log is returned.  If LogEntryKey is equal this implementation specific non-zero key value, then no entry

   is retrieved and zero is returned.  In the cases where a performance log entry can be returned,

-  the log entry is returned in Handle, Token, Module, StartTimeStamp, and EndTimeStamp.

+  the log entry is returned in Handle, Token, Module, StartTimeStamp, EndTimeStamp and Identifier.

   If LogEntryKey is not a valid log entry key for the performance measurement log, then ASSERT().

   If Handle is NULL, then ASSERT().

   If Token is NULL, then ASSERT().

   If Module is NULL, then ASSERT().

   If StartTimeStamp is NULL, then ASSERT().

   If EndTimeStamp is NULL, then ASSERT().

+  If Identifier is NULL, then ASSERT().

 

   @param  LogEntryKey             On entry, the key of the performance measurement log entry to retrieve.

                                   0, then the first performance measurement log entry is retrieved.

-                                  On exit, the key of the next performance lof entry entry.

+                                  On exit, the key of the next performance of entry entry.

   @param  Handle                  Pointer to environment specific context used to identify the component

                                   being measured.

   @param  Token                   Pointer to a Null-terminated ASCII string that identifies the component

@@ -271,22 +292,25 @@ EndPerformanceMeasurement (
                                   was started.

   @param  EndTimeStamp            Pointer to the 64-bit time stamp that was recorded when the measurement

                                   was ended.

+  @param  Identifier              Pointer to the 32-bit identifier that was recorded.

 

   @return The key for the next performance log entry (in general case).

 

 **/

 UINTN

 EFIAPI

-GetPerformanceMeasurement (

+GetPerformanceMeasurementEx (

   IN  UINTN       LogEntryKey,

   OUT CONST VOID  **Handle,

   OUT CONST CHAR8 **Token,

   OUT CONST CHAR8 **Module,

   OUT UINT64      *StartTimeStamp,

-  OUT UINT64      *EndTimeStamp

+  OUT UINT64      *EndTimeStamp,

+  OUT UINT32      *Identifier

   )

 {

   PEI_PERFORMANCE_LOG_HEADER  *PeiPerformanceLog;

+  UINT32                      *PeiPerformanceIdArray;

   PEI_PERFORMANCE_LOG_ENTRY   *CurrentLogEntry;

   PEI_PERFORMANCE_LOG_ENTRY   *LogEntryArray;

   UINTN                       NumberOfEntries;

@@ -296,8 +320,9 @@ GetPerformanceMeasurement (
   ASSERT (Module != NULL);

   ASSERT (StartTimeStamp != NULL);

   ASSERT (EndTimeStamp != NULL);

+  ASSERT (Identifier != NULL);

 

-  PeiPerformanceLog = InternalGetPerformanceHobLog ();

+  InternalGetPerformanceHobLog (&PeiPerformanceLog, &PeiPerformanceIdArray);

 

   NumberOfEntries   = (UINTN) (PeiPerformanceLog->NumberOfEntries);

   LogEntryArray     = (PEI_PERFORMANCE_LOG_ENTRY *) (PeiPerformanceLog + 1);

@@ -310,18 +335,139 @@ GetPerformanceMeasurement (
     return 0;

   }

 

-  CurrentLogEntry = &(LogEntryArray[LogEntryKey++]);

+  CurrentLogEntry = &(LogEntryArray[LogEntryKey]);

 

   *Handle         = (VOID *) (UINTN) (CurrentLogEntry->Handle);

   *Token          = CurrentLogEntry->Token;

   *Module         = CurrentLogEntry->Module;

   *StartTimeStamp = CurrentLogEntry->StartTimeStamp;

   *EndTimeStamp   = CurrentLogEntry->EndTimeStamp;

+  *Identifier     = PeiPerformanceIdArray[LogEntryKey++];

 

   return LogEntryKey;

 }

 

 /**

+  Creates a record for the beginning of a performance measurement.

+

+  Creates a record that contains the Handle, Token, and Module.

+  If TimeStamp is not zero, then TimeStamp is added to the record as the start time.

+  If TimeStamp is zero, then this function reads the current time stamp

+  and adds that time stamp value to the record as the start time.

+

+  @param  Handle                  Pointer to environment specific context used

+                                  to identify the component being measured.

+  @param  Token                   Pointer to a Null-terminated ASCII string

+                                  that identifies the component being measured.

+  @param  Module                  Pointer to a Null-terminated ASCII string

+                                  that identifies the module being measured.

+  @param  TimeStamp               64-bit time stamp.

+

+  @retval RETURN_SUCCESS          The start of the measurement was recorded.

+  @retval RETURN_OUT_OF_RESOURCES There are not enough resources to record the measurement.

+

+**/

+RETURN_STATUS

+EFIAPI

+StartPerformanceMeasurement (

+  IN CONST VOID   *Handle,  OPTIONAL

+  IN CONST CHAR8  *Token,   OPTIONAL

+  IN CONST CHAR8  *Module,  OPTIONAL

+  IN UINT64       TimeStamp

+  )

+{

+  return StartPerformanceMeasurementEx (Handle, Token, Module, TimeStamp, 0);

+}

+

+/**

+  Fills in the end time of a performance measurement.

+

+  Looks up the record that matches Handle, Token, and Module.

+  If the record can not be found then return RETURN_NOT_FOUND.

+  If the record is found and TimeStamp is not zero,

+  then TimeStamp is added to the record as the end time.

+  If the record is found and TimeStamp is zero, then this function reads

+  the current time stamp and adds that time stamp value to the record as the end time.

+

+  @param  Handle                  Pointer to environment specific context used

+                                  to identify the component being measured.

+  @param  Token                   Pointer to a Null-terminated ASCII string

+                                  that identifies the component being measured.

+  @param  Module                  Pointer to a Null-terminated ASCII string

+                                  that identifies the module being measured.

+  @param  TimeStamp               64-bit time stamp.

+

+  @retval RETURN_SUCCESS          The end of  the measurement was recorded.

+  @retval RETURN_NOT_FOUND        The specified measurement record could not be found.

+

+**/

+RETURN_STATUS

+EFIAPI

+EndPerformanceMeasurement (

+  IN CONST VOID   *Handle,  OPTIONAL

+  IN CONST CHAR8  *Token,   OPTIONAL

+  IN CONST CHAR8  *Module,  OPTIONAL

+  IN UINT64       TimeStamp

+  )

+{

+  return EndPerformanceMeasurementEx (Handle, Token, Module, TimeStamp, 0);

+}

+

+/**

+  Attempts to retrieve a performance measurement log entry from the performance measurement log.

+  It can also retrieve the log created by StartPerformanceMeasurementEx and EndPerformanceMeasurementEx,

+  and then eliminate the Identifier.

+

+  Attempts to retrieve the performance log entry specified by LogEntryKey.  If LogEntryKey is

+  zero on entry, then an attempt is made to retrieve the first entry from the performance log,

+  and the key for the second entry in the log is returned.  If the performance log is empty,

+  then no entry is retrieved and zero is returned.  If LogEntryKey is not zero, then the performance

+  log entry associated with LogEntryKey is retrieved, and the key for the next entry in the log is

+  returned.  If LogEntryKey is the key for the last entry in the log, then the last log entry is

+  retrieved and an implementation specific non-zero key value that specifies the end of the performance

+  log is returned.  If LogEntryKey is equal this implementation specific non-zero key value, then no entry

+  is retrieved and zero is returned.  In the cases where a performance log entry can be returned,

+  the log entry is returned in Handle, Token, Module, StartTimeStamp, and EndTimeStamp.

+  If LogEntryKey is not a valid log entry key for the performance measurement log, then ASSERT().

+  If Handle is NULL, then ASSERT().

+  If Token is NULL, then ASSERT().

+  If Module is NULL, then ASSERT().

+  If StartTimeStamp is NULL, then ASSERT().

+  If EndTimeStamp is NULL, then ASSERT().

+

+  @param  LogEntryKey             On entry, the key of the performance measurement log entry to retrieve.

+                                  0, then the first performance measurement log entry is retrieved.

+                                  On exit, the key of the next performance of entry entry.

+  @param  Handle                  Pointer to environment specific context used to identify the component

+                                  being measured.

+  @param  Token                   Pointer to a Null-terminated ASCII string that identifies the component

+                                  being measured.

+  @param  Module                  Pointer to a Null-terminated ASCII string that identifies the module

+                                  being measured.

+  @param  StartTimeStamp          Pointer to the 64-bit time stamp that was recorded when the measurement

+                                  was started.

+  @param  EndTimeStamp            Pointer to the 64-bit time stamp that was recorded when the measurement

+                                  was ended.

+

+  @return The key for the next performance log entry (in general case).

+

+**/

+UINTN

+EFIAPI

+GetPerformanceMeasurement (

+  IN  UINTN       LogEntryKey,

+  OUT CONST VOID  **Handle,

+  OUT CONST CHAR8 **Token,

+  OUT CONST CHAR8 **Module,

+  OUT UINT64      *StartTimeStamp,

+  OUT UINT64      *EndTimeStamp

+  )

+{

+  UINT32 Identifier;

+  return GetPerformanceMeasurementEx (LogEntryKey, Handle, Token, Module, StartTimeStamp, EndTimeStamp, &Identifier);

+}

+

+/**

   Returns TRUE if the performance measurement macros are enabled.

 

   This function returns TRUE if the PERFORMANCE_LIBRARY_PROPERTY_MEASUREMENT_ENABLED bit of

diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
index cee14196a0..572ec5422b 100644
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
@@ -6,7 +6,7 @@
 #  and consumes GUIDed HOB for performance logging. The GUIDed HOB is passed to DXE phase

 #  so that it can be taken over by DxeCorePerformanceLib.  

 #  

-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

 #  which accompanies this distribution.  The full text of the license may be found at

@@ -50,7 +50,8 @@
 

 

 [Guids]

-  gPerformanceProtocolGuid ## HOB

+  gPerformanceProtocolGuid     ## PRODUCES ## HOB

+  gPerformanceExProtocolGuid   ## PRODUCES ## HOB

 

 [Pcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries