From bc6b5892b007447b1024d98004681aa7a3305ddf Mon Sep 17 00:00:00 2001
From: qhuang8 <qhuang8@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 23 Feb 2009 03:01:59 +0000
Subject: [PATCH] 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
---
 MdeModulePkg/Core/Dxe/DxeMain.h            |  1 -
 MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c    |  4 ++--
 MdeModulePkg/Core/Dxe/Hand/DriverSupport.c |  8 ++++----
 MdeModulePkg/Core/Dxe/Image/Image.c        | 10 +++++-----
 4 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index aecf72f87f..5027c93a32 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -48,7 +48,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/FirmwareVolumeBlock.h>
 #include <Protocol/Capsule.h>
 #include <Protocol/BusSpecificDriverOverride.h>
-#include <Protocol/Performance.h>
 #include <Protocol/TcgService.h>
 #include <Protocol/TcgPlatform.h>
 #include <Guid/MemoryTypeInformation.h>
diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 7b01802840..68fcca483d 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -258,8 +258,8 @@ DxeMain (
   // Call constructor for all libraries
   //
   ProcessLibraryConstructorList (gDxeCoreImageHandle, gDxeCoreST);
-  PERF_END   (0,PEI_TOK, NULL, 0) ;
-  PERF_START (0,DXE_TOK, NULL, 0) ;
+  PERF_END   (0,"PEI", NULL, 0) ;
+  PERF_START (0,"DXE", NULL, 0) ;
 
   //
   // Initialize the Global Coherency Domain Services
diff --git a/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c b/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
index d92eef7924..71676d0ef7 100644
--- a/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
+++ b/MdeModulePkg/Core/Dxe/Hand/DriverSupport.c
@@ -541,13 +541,13 @@ CoreConnectSingleController (
     for (Index = 0; (Index < NumberOfSortedDriverBindingProtocols) && !DriverFound; Index++) {
       if (SortedDriverBindingProtocols[Index] != NULL) {
         DriverBinding = SortedDriverBindingProtocols[Index];
-        PERF_START (DriverBinding->DriverBindingHandle, DRIVERBINDING_SUPPORT_TOK, NULL, 0);
+        PERF_START (DriverBinding->DriverBindingHandle, "DB:Support:", NULL, 0);
         Status = DriverBinding->Supported(
                                   DriverBinding,
                                   ControllerHandle,
                                   RemainingDevicePath
                                   );
-        PERF_END (DriverBinding->DriverBindingHandle, DRIVERBINDING_SUPPORT_TOK, NULL, 0);
+        PERF_END (DriverBinding->DriverBindingHandle, "DB:Support:", NULL, 0);
         if (!EFI_ERROR (Status)) {
           SortedDriverBindingProtocols[Index] = NULL;
           DriverFound = TRUE;
@@ -556,13 +556,13 @@ CoreConnectSingleController (
           // A driver was found that supports ControllerHandle, so attempt to start the driver
           // on ControllerHandle.
           //
-          PERF_START (DriverBinding->DriverBindingHandle, DRIVERBINDING_START_TOK, NULL, 0);
+          PERF_START (DriverBinding->DriverBindingHandle, "DB:Start:", NULL, 0);
           Status = DriverBinding->Start (
                                     DriverBinding,
                                     ControllerHandle,
                                     RemainingDevicePath
                                     );
-          PERF_END (DriverBinding->DriverBindingHandle, DRIVERBINDING_START_TOK, NULL, 0);
+          PERF_END (DriverBinding->DriverBindingHandle, "DB:Start:", NULL, 0);
 
           if (!EFI_ERROR (Status)) {
             //
diff --git a/MdeModulePkg/Core/Dxe/Image/Image.c b/MdeModulePkg/Core/Dxe/Image/Image.c
index 1ee65ae024..15b474aea9 100644
--- a/MdeModulePkg/Core/Dxe/Image/Image.c
+++ b/MdeModulePkg/Core/Dxe/Image/Image.c
@@ -1024,8 +1024,8 @@ CoreLoadImage (
              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_END (*ImageHandle, LOAD_IMAGE_TOK, NULL, 0);
+  PERF_START (*ImageHandle, "LoadImage:", NULL, Tick);
+  PERF_END (*ImageHandle, "LoadImage:", NULL, 0);
 
   return Status;
 }
@@ -1131,7 +1131,7 @@ CoreStartImage (
   //
   // 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);
   if (Image->JumpBuffer == NULL) {
-    PERF_END (ImageHandle, START_IMAGE_TOK, NULL, 0);
+    PERF_END (ImageHandle, "StartImage:", NULL, 0);
     return EFI_OUT_OF_RESOURCES;
   }
   Image->JumpContext = ALIGN_POINTER (Image->JumpBuffer, BASE_LIBRARY_JUMP_BUFFER_ALIGNMENT);
@@ -1247,7 +1247,7 @@ CoreStartImage (
   //
   // Done
   //
-  PERF_END (ImageHandle, START_IMAGE_TOK, NULL, 0);
+  PERF_END (ImageHandle, "StartImage:", NULL, 0);
   return Status;
 }
 
-- 
2.39.2