Update DxeCore for the performance infrastructure updates: Use Raw sting to replace XXX_TOKEN

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7567 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qhuang8 2009-02-23 03:01:59 +00:00
parent 9105d2c338
commit bc6b5892b0
4 changed files with 11 additions and 12 deletions

View File

@ -48,7 +48,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
#include <Protocol/FirmwareVolumeBlock.h> #include <Protocol/FirmwareVolumeBlock.h>
#include <Protocol/Capsule.h> #include <Protocol/Capsule.h>
#include <Protocol/BusSpecificDriverOverride.h> #include <Protocol/BusSpecificDriverOverride.h>
#include <Protocol/Performance.h>
#include <Protocol/TcgService.h> #include <Protocol/TcgService.h>
#include <Protocol/TcgPlatform.h> #include <Protocol/TcgPlatform.h>
#include <Guid/MemoryTypeInformation.h> #include <Guid/MemoryTypeInformation.h>

View File

@ -258,8 +258,8 @@ DxeMain (
// Call constructor for all libraries // Call constructor for all libraries
// //
ProcessLibraryConstructorList (gDxeCoreImageHandle, gDxeCoreST); ProcessLibraryConstructorList (gDxeCoreImageHandle, gDxeCoreST);
PERF_END (0,PEI_TOK, NULL, 0) ; PERF_END (0,"PEI", NULL, 0) ;
PERF_START (0,DXE_TOK, NULL, 0) ; PERF_START (0,"DXE", NULL, 0) ;
// //
// Initialize the Global Coherency Domain Services // Initialize the Global Coherency Domain Services

View File

@ -541,13 +541,13 @@ CoreConnectSingleController (
for (Index = 0; (Index < NumberOfSortedDriverBindingProtocols) && !DriverFound; Index++) { for (Index = 0; (Index < NumberOfSortedDriverBindingProtocols) && !DriverFound; Index++) {
if (SortedDriverBindingProtocols[Index] != NULL) { if (SortedDriverBindingProtocols[Index] != NULL) {
DriverBinding = SortedDriverBindingProtocols[Index]; DriverBinding = SortedDriverBindingProtocols[Index];
PERF_START (DriverBinding->DriverBindingHandle, DRIVERBINDING_SUPPORT_TOK, NULL, 0); PERF_START (DriverBinding->DriverBindingHandle, "DB:Support:", NULL, 0);
Status = DriverBinding->Supported( Status = DriverBinding->Supported(
DriverBinding, DriverBinding,
ControllerHandle, ControllerHandle,
RemainingDevicePath RemainingDevicePath
); );
PERF_END (DriverBinding->DriverBindingHandle, DRIVERBINDING_SUPPORT_TOK, NULL, 0); PERF_END (DriverBinding->DriverBindingHandle, "DB:Support:", NULL, 0);
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
SortedDriverBindingProtocols[Index] = NULL; SortedDriverBindingProtocols[Index] = NULL;
DriverFound = TRUE; DriverFound = TRUE;
@ -556,13 +556,13 @@ CoreConnectSingleController (
// A driver was found that supports ControllerHandle, so attempt to start the driver // A driver was found that supports ControllerHandle, so attempt to start the driver
// on ControllerHandle. // on ControllerHandle.
// //
PERF_START (DriverBinding->DriverBindingHandle, DRIVERBINDING_START_TOK, NULL, 0); PERF_START (DriverBinding->DriverBindingHandle, "DB:Start:", NULL, 0);
Status = DriverBinding->Start ( Status = DriverBinding->Start (
DriverBinding, DriverBinding,
ControllerHandle, ControllerHandle,
RemainingDevicePath RemainingDevicePath
); );
PERF_END (DriverBinding->DriverBindingHandle, DRIVERBINDING_START_TOK, NULL, 0); PERF_END (DriverBinding->DriverBindingHandle, "DB:Start:", NULL, 0);
if (!EFI_ERROR (Status)) { if (!EFI_ERROR (Status)) {
// //

View File

@ -1024,8 +1024,8 @@ CoreLoadImage (
EFI_LOAD_PE_IMAGE_ATTRIBUTE_RUNTIME_REGISTRATION | EFI_LOAD_PE_IMAGE_ATTRIBUTE_DEBUG_IMAGE_INFO_TABLE_REGISTRATION EFI_LOAD_PE_IMAGE_ATTRIBUTE_RUNTIME_REGISTRATION | EFI_LOAD_PE_IMAGE_ATTRIBUTE_DEBUG_IMAGE_INFO_TABLE_REGISTRATION
); );
PERF_START (*ImageHandle, LOAD_IMAGE_TOK, NULL, Tick); PERF_START (*ImageHandle, "LoadImage:", NULL, Tick);
PERF_END (*ImageHandle, LOAD_IMAGE_TOK, NULL, 0); PERF_END (*ImageHandle, "LoadImage:", NULL, 0);
return Status; return Status;
} }
@ -1131,7 +1131,7 @@ CoreStartImage (
// //
// Don't profile Objects or invalid start requests // Don't profile Objects or invalid start requests
// //
PERF_START (ImageHandle, START_IMAGE_TOK, NULL, 0); PERF_START (ImageHandle, "StartImage:", NULL, 0);
// //
@ -1151,7 +1151,7 @@ CoreStartImage (
// //
Image->JumpBuffer = AllocatePool (sizeof (BASE_LIBRARY_JUMP_BUFFER) + BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT); Image->JumpBuffer = AllocatePool (sizeof (BASE_LIBRARY_JUMP_BUFFER) + BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT);
if (Image->JumpBuffer == NULL) { if (Image->JumpBuffer == NULL) {
PERF_END (ImageHandle, START_IMAGE_TOK, NULL, 0); PERF_END (ImageHandle, "StartImage:", NULL, 0);
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
Image->JumpContext = ALIGN_POINTER (Image->JumpBuffer, BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT); Image->JumpContext = ALIGN_POINTER (Image->JumpBuffer, BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT);
@ -1247,7 +1247,7 @@ CoreStartImage (
// //
// Done // Done
// //
PERF_END (ImageHandle, START_IMAGE_TOK, NULL, 0); PERF_END (ImageHandle, "StartImage:", NULL, 0);
return Status; return Status;
} }