In PerformanceLib, Identifier is for single PERF, not the pair of PERF.
EDKII performance library implementation dumps the duration between the
matched START and END pair. When find the matched START and END pair,
the identifier will not be checked.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming....@intel.com>
---
MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c | 5 ++---
MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c | 5 ++---
MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
index c3a6d70..8563564 100644
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.c
@@ -10,7 +10,7 @@
This library is mainly used by DxeCore to start performance logging to
ensure that
Performance Protocol is installed at the very beginning of DXE phase.
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -110,8 +110,7 @@ InternalSearchForGaugeEntry (
if (GaugeEntryExArray[Index2].EndTimeStamp == 0 &&
(GaugeEntryExArray[Index2].Handle == (EFI_PHYSICAL_ADDRESS) (UINTN)
Handle) &&
AsciiStrnCmp (GaugeEntryExArray[Index2].Token, Token,
DXE_PERFORMANCE_STRING_LENGTH) == 0 &&
- AsciiStrnCmp (GaugeEntryExArray[Index2].Module, Module,
DXE_PERFORMANCE_STRING_LENGTH) == 0 &&
- (GaugeEntryExArray[Index2].Identifier == Identifier)) {
+ AsciiStrnCmp (GaugeEntryExArray[Index2].Module, Module,
DXE_PERFORMANCE_STRING_LENGTH) == 0) {
Index = Index2;
break;
}
diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
index b3b11b9..2db0808 100644
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.c
@@ -7,7 +7,7 @@
number of performance logging entry is specified by
PcdMaxPeiPerformanceLogEntries or
PcdMaxPeiPerformanceLogEntries16.
-Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2015-2016 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD
License
@@ -140,8 +140,7 @@ InternalSearchForLogEntry (
if (LogEntryArray[Index2].EndTimeStamp == 0 &&
(LogEntryArray[Index2].Handle == (EFI_PHYSICAL_ADDRESS) (UINTN)
Handle) &&
AsciiStrnCmp (LogEntryArray[Index2].Token, Token,
PEI_PERFORMANCE_STRING_LENGTH) == 0 &&
- AsciiStrnCmp (LogEntryArray[Index2].Module, Module,
PEI_PERFORMANCE_STRING_LENGTH) == 0 &&
- (PeiPerformanceIdArray[Index2] == Identifier)) {
+ AsciiStrnCmp (LogEntryArray[Index2].Module, Module,
PEI_PERFORMANCE_STRING_LENGTH) == 0) {
Index = Index2;
break;
}
diff --git a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
index e59cc28..2f1e67d 100644
--- a/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
+++ b/MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.c
@@ -16,7 +16,7 @@
SmmPerformanceHandlerEx(), SmmPerformanceHandler() will receive untrusted
input and do basic validation.
-Copyright (c) 2011 - 2015, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2016, 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
@@ -118,8 +118,7 @@ SmmSearchForGaugeEntry (
if (GaugeEntryExArray[Index2].EndTimeStamp == 0 &&
(GaugeEntryExArray[Index2].Handle == (EFI_PHYSICAL_ADDRESS) (UINTN)
Handle) &&
AsciiStrnCmp (GaugeEntryExArray[Index2].Token, Token,
SMM_PERFORMANCE_STRING_LENGTH) == 0 &&
- AsciiStrnCmp (GaugeEntryExArray[Index2].Module, Module,
SMM_PERFORMANCE_STRING_LENGTH) == 0 &&
- (GaugeEntryExArray[Index2].Identifier == Identifier)) {
+ AsciiStrnCmp (GaugeEntryExArray[Index2].Module, Module,
SMM_PERFORMANCE_STRING_LENGTH) == 0) {
Index = Index2;
break;
}
--
2.8.0.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
