Renamed some profiling events.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3059

diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 51bf48a46672e0631218ee27a853baea93b0c8e5..5a69316b7aff1272ced61df56294190ef48760ff 100644 (file)
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -2427,9 +2427,9 @@ void VG_(sanity_check_general) ( Bool force_expensive )
    /* Check that nobody has spuriously claimed that the first or
       last 16 pages of memory have become accessible [...] */
    if (VG_(needs).sanity_checks) {
-      VGP_PUSHCC(VgpSkinCheapSanity);
+      VGP_PUSHCC(VgpToolCheapSanity);
       vg_assert(SK_(cheap_sanity_check)());
-      VGP_POPCC(VgpSkinCheapSanity);
+      VGP_POPCC(VgpToolCheapSanity);
    }
 
    /* --- Now some more expensive checks. ---*/
@@ -2452,9 +2452,9 @@ void VG_(sanity_check_general) ( Bool force_expensive )
          VG_(sanity_check_tt_tc)();
 
       if (VG_(needs).sanity_checks) {
-          VGP_PUSHCC(VgpSkinExpensiveSanity);
+          VGP_PUSHCC(VgpToolExpensiveSanity);
           vg_assert(SK_(expensive_sanity_check)());
-          VGP_POPCC(VgpSkinExpensiveSanity);
+          VGP_POPCC(VgpToolExpensiveSanity);
       }
       /* 
       if ((sanity_fast_count % 500) == 0) VG_(mallocSanityCheckAll)(); 

diff --git a/coregrind/vg_syscalls.c b/coregrind/vg_syscalls.c
index c3701cf9f7525622d1c5e51ff4241e7a664db2ec..c2898f77cc5cf63cf014259ebb0ab17fdff6fcfb 100644 (file)
--- a/coregrind/vg_syscalls.c
+++ b/coregrind/vg_syscalls.c
@@ -5793,9 +5793,9 @@ Bool VG_(pre_syscall) ( ThreadId tid )
 
    /* Do any pre-syscall actions */
    if (VG_(needs).syscall_wrapper) {
-      VGP_PUSHCC(VgpSkinSysWrap);
+      VGP_PUSHCC(VgpToolSysWrap);
       tst->sys_pre_res = SK_(pre_syscall)(tid, syscallno, mayBlock);
-      VGP_POPCC(VgpSkinSysWrap);
+      VGP_POPCC(VgpToolSysWrap);
    }
 
    PRINT("SYSCALL[%d,%d](%3d)%s%s:", 
@@ -5926,9 +5926,9 @@ void VG_(post_syscall) ( ThreadId tid, Bool restart )
         pre's than post's)
        */
       if (VG_(needs).syscall_wrapper) {
-        VGP_PUSHCC(VgpSkinSysWrap);
+        VGP_PUSHCC(VgpToolSysWrap);
         SK_(post_syscall)(tid, syscallno, pre_res, res, /*isBlocking*/True); // did block
-        VGP_POPCC(VgpSkinSysWrap);
+        VGP_POPCC(VgpToolSysWrap);
       }
    }
 

diff --git a/coregrind/vg_translate.c b/coregrind/vg_translate.c
index 649bacebd215fc625fcf7954d4a71fa342e367d7..264a9da99437cfc166348d18c80167bee7827001 100644 (file)
--- a/coregrind/vg_translate.c
+++ b/coregrind/vg_translate.c
@@ -2524,7 +2524,7 @@ Bool VG_(translate) ( ThreadId tid, Addr orig_addr,
       VGP_POPCC(VgpImprove);
    }
 
-   /* Skin's instrumentation (Nb: must set VG_(print_codegen) in case
+   /* Tool's instrumentation (Nb: must set VG_(print_codegen) in case
       SK_(instrument) looks at it. */
    VG_(print_codegen) = DECIDE_IF_PRINTING_CODEGEN_FOR_PHASE(3);
    VGP_PUSHCC(VgpInstrument);

diff --git a/massif/ms_main.c b/massif/ms_main.c
index 3d96f55ae246e51cd8fd9ca94c9b21dbab6efb8a..1cd5d5fdcbabf3ef950d0008ced618e366f8ea97 100644 (file)
--- a/massif/ms_main.c
+++ b/massif/ms_main.c
@@ -200,7 +200,7 @@ typedef
       VgpPrintHp,
       VgpPrintXPts,
    }
-   VgpSkinCC;
+   VgpToolCC;
 
 /*------------------------------------------------------------*/
 /*--- Statistics                                           ---*/