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, 203 insertions, 32 deletions

diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
index 5fb3ff2..2ddd983 100644
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
+++ b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.c
@@ -2,8 +2,8 @@
   Performance Library

 

   This library instance provides infrastructure for DXE phase drivers to log performance

-  data. It consumes Performance Protocol published by DxeCorePerformanceLib

-  to log performance data. If Performance Protocol is not available, it does not log any

+  data. It consumes PerformanceEx or Performance Protocol published by DxeCorePerformanceLib

+  to log performance data. If both PerformanceEx and Performance Protocol is not available, it does not log any

   performance information.

 

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

@@ -28,18 +28,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PcdLib.h>

 

 //

-// The cached performance protocol interface.

+// The cached Performance Protocol and PerformanceEx Protocol interface.

 //

-PERFORMANCE_PROTOCOL    *mPerformance = NULL;

+PERFORMANCE_PROTOCOL        *mPerformance = NULL;

+PERFORMANCE_EX_PROTOCOL     *mPerformanceEx = NULL;

 

 /**

-  The constructor function caches the pointer to Performance protocol.

+  The function caches the pointers to PerformanceEx protocol and Performance Protocol.

 

-  The constructor function locates Performance protocol from protocol database.

-  It will ASSERT() if that operation fails and it will always return EFI_SUCCESS.

+  The function locates PerformanceEx protocol and Performance Protocol from protocol database.

 

-  @retval EFI_SUCCESS     Performance protocol is successfully located.

-  @retval Other           Performance protocol is not located to log performance.

+  @retval EFI_SUCCESS     PerformanceEx protocol or Performance Protocol is successfully located.

+  @retval EFI_NOT_FOUND   Both PerformanceEx protocol and Performance Protocol are not located to log performance.

 

 **/

 EFI_STATUS

@@ -47,10 +47,21 @@ GetPerformanceProtocol (
   VOID

   )

 {

-  EFI_STATUS            Status;

-  PERFORMANCE_PROTOCOL  *Performance;

+  EFI_STATUS                Status;

+  PERFORMANCE_PROTOCOL      *Performance;

+  PERFORMANCE_EX_PROTOCOL   *PerformanceEx;

 

-  if (mPerformance != NULL) {

+  if (mPerformanceEx != NULL || mPerformance != NULL) {

+    return EFI_SUCCESS;

+  }

+

+  Status = gBS->LocateProtocol (&gPerformanceExProtocolGuid, NULL, (VOID **) &PerformanceEx);

+  if (!EFI_ERROR (Status)) {

+    ASSERT (PerformanceEx != NULL);

+    //

+    // Cache PerformanceEx Protocol.

+    //

+    mPerformanceEx = PerformanceEx;

     return EFI_SUCCESS;

   }

 

@@ -61,15 +72,16 @@ GetPerformanceProtocol (
     // Cache performance protocol.

     //

     mPerformance = Performance;

+    return EFI_SUCCESS;

   }

 

-  return Status;

+  return EFI_NOT_FOUND;

 }

 

 /**

   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.

@@ -81,6 +93,8 @@ GetPerformanceProtocol (
   @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.

@@ -88,11 +102,12 @@ GetPerformanceProtocol (
 **/

 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

   )

 {

   EFI_STATUS  Status;

@@ -102,7 +117,13 @@ StartPerformanceMeasurement (
     return RETURN_OUT_OF_RESOURCES;

   }

 

-  Status = mPerformance->StartGauge (Handle, Token, Module, TimeStamp);

+  if (mPerformanceEx != NULL) {

+    Status = mPerformanceEx->StartGaugeEx (Handle, Token, Module, TimeStamp, Identifier);

+  } else if (mPerformance != NULL) {

+    Status = mPerformance->StartGauge (Handle, Token, Module, TimeStamp);

+  } else {

+    ASSERT (FALSE);

+  }

 

   return (RETURN_STATUS) Status;

 }

@@ -110,7 +131,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.

@@ -124,6 +145,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.

@@ -131,11 +154,12 @@ 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

   )

 {

   EFI_STATUS  Status;

@@ -145,13 +169,21 @@ EndPerformanceMeasurement (
     return RETURN_NOT_FOUND;

   }

 

-  Status = mPerformance->EndGauge (Handle, Token, Module, TimeStamp);

+  if (mPerformanceEx != NULL) {

+    Status = mPerformanceEx->EndGaugeEx (Handle, Token, Module, TimeStamp, Identifier);

+  } else if (mPerformance != NULL) {

+    Status = mPerformance->EndGauge (Handle, Token, Module, TimeStamp);

+  } else {

+    ASSERT (FALSE);

+  }

 

   return (RETURN_STATUS) Status;

 }

 

 /**

   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,

@@ -162,13 +194,14 @@ 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.

@@ -183,36 +216,48 @@ 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 (

-  IN  UINTN       LogEntryKey,

+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

   )

 {

-  EFI_STATUS        Status;

-  GAUGE_DATA_ENTRY  *GaugeData;

+  EFI_STATUS            Status;

+  GAUGE_DATA_ENTRY_EX   *GaugeData;

+

+  GaugeData = NULL;

 

   ASSERT (Handle != NULL);

   ASSERT (Token != NULL);

   ASSERT (Module != NULL);

   ASSERT (StartTimeStamp != NULL);

   ASSERT (EndTimeStamp != NULL);

+  ASSERT (Identifier != NULL);

 

   Status = GetPerformanceProtocol ();

   if (EFI_ERROR (Status)) {

     return 0;

   }

 

-  Status = mPerformance->GetGauge (LogEntryKey++, &GaugeData);

+  if (mPerformanceEx != NULL) {

+    Status = mPerformanceEx->GetGaugeEx (LogEntryKey++, &GaugeData);

+  } else if (mPerformance != NULL) {

+    Status = mPerformance->GetGauge (LogEntryKey++, (GAUGE_DATA_ENTRY **) &GaugeData);

+  } else {

+    ASSERT (FALSE);

+    return 0;

+  }

 

   //

   // Make sure that LogEntryKey is a valid log entry key,

@@ -233,11 +278,136 @@ GetPerformanceMeasurement (
   *Module         = GaugeData->Module;

   *StartTimeStamp = GaugeData->StartTimeStamp;

   *EndTimeStamp   = GaugeData->EndTimeStamp;

+  if (mPerformanceEx != NULL) {

+    *Identifier   = GaugeData->Identifier;

+  } else {

+    *Identifier   = 0;

+  }

 

   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 log 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/DxePerformanceLib/DxePerformanceLib.inf b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
index 886fa46..c043848 100644
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
+++ b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
@@ -2,11 +2,11 @@
 #  Performance library instance used in DXE phase.

 #  

 #  This library instance provides infrastructure for DXE phase drivers to log performance

-#  data. It consumes Performance Protocol published by DxeCorePerformanceLib

-#  to log performance data. If Performance Protocol is not available, it does not log any

+#  data. It consumes PerformanceEx or Performance Protocol published by DxeCorePerformanceLib

+#  to log performance data. If both PerformanceEx and Performance Protocol are not available, it does not log any

 #  performance information.

 #  

-#  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

@@ -47,7 +47,8 @@
 

 

 [Guids]

-  gPerformanceProtocolGuid  ## CONSUMES ## PROTOCOL

+  gPerformanceProtocolGuid      ## SOMETIMES_CONSUMES ## PROTOCOL

+  gPerformanceExProtocolGuid    ## SOMETIMES_CONSUMES ## PROTOCOL

 

 

 [Pcd]