Heap profiling: fix a few cc tags

diff --git a/coregrind/m_initimg/initimg-linux.c b/coregrind/m_initimg/initimg-linux.c
index 5477075555f14a3abb6329a98d4d1ba01755427e..a33710c39ee304802ef9010e2265f289bbf7b8a9 100644 (file)
--- a/coregrind/m_initimg/initimg-linux.c
+++ b/coregrind/m_initimg/initimg-linux.c
@@ -961,7 +961,7 @@ Addr setup_client_stack( void*  init_sp,
       }
       HChar resolved_name[VKI_PATH_MAX];
       VG_(realpath)(exe_name, resolved_name);
-      VG_(resolved_exename) = VG_(strdup)("initimg-linux.sre.1", resolved_name);
+      VG_(resolved_exename) = VG_(strdup)("initimg-linux.scs.1", resolved_name);
    }
 
    /* client_SP is pointing at client's argc/argv */

diff --git a/coregrind/m_pathscan.c b/coregrind/m_pathscan.c
index 841c674e33b97f0cfe551e6ccdf41954ad1871ad..a1193c3875dccbb70c8bc4746a6398a1c59137d7 100644 (file)
--- a/coregrind/m_pathscan.c
+++ b/coregrind/m_pathscan.c
@@ -102,12 +102,12 @@ static Bool match_executable(const HChar *entry)
    // matching executable later in the path.
    if (VG_(access)(buf, True/*r*/, False/*w*/, True/*x*/) == 0) {
       VG_(free)(executable_name_out);
-      executable_name_out = VG_(strdup)("match_executable", buf);
+      executable_name_out = VG_(strdup)("match_executable.1", buf);
       return True;      // Stop looking
    } else if (VG_(access)(buf, True/*r*/, False/*w*/, False/*x*/) == 0 
               && executable_name_out == NULL)
    {
-      executable_name_out = VG_(strdup)("match_executable", buf);
+      executable_name_out = VG_(strdup)("match_executable.2", buf);
       return False;     // Keep looking
    } else { 
       return False;     // Keep looking

diff --git a/coregrind/m_syswrap/syswrap-darwin.c b/coregrind/m_syswrap/syswrap-darwin.c
index 2784105af329f4404ae0924c116830fb67146d50..2687b3b4c57bb490ee2a38f2703daf384002ddd3 100644 (file)
--- a/coregrind/m_syswrap/syswrap-darwin.c
+++ b/coregrind/m_syswrap/syswrap-darwin.c
@@ -410,7 +410,7 @@ static void log_decaying ( const HChar* format, ... )
    // Now see if it already exists in the table of strings that we have.
    if (!decaying_string_table) {
       decaying_string_table
-         = VG_(newFM)( VG_(malloc), "syswrap-darwin.pd.1",
+         = VG_(newFM)( VG_(malloc), "syswrap-darwin.ld.1",
                        VG_(free), decaying_string_table_cmp );
    }
 
@@ -421,7 +421,7 @@ static void log_decaying ( const HChar* format, ... )
       // We haven't seen this string before, so strdup it and add
       // it to the table.
       vg_assert(key == NULL && val == 0);
-      key = VG_(strdup)("syswrap-darwin.pd.2", buf);
+      key = VG_(strdup)("syswrap-darwin.ld.2", buf);
       VG_(addToFM)(decaying_string_table, (UWord)key, (UWord)0);
    }
 

diff --git a/coregrind/m_ume/elf.c b/coregrind/m_ume/elf.c
index 20e0185cb47992f1c1491b008c1f6b16e4c316bf..3213874b8dbebf950279a20176b66d924aafe2bd 100644 (file)
--- a/coregrind/m_ume/elf.c
+++ b/coregrind/m_ume/elf.c
@@ -658,7 +658,6 @@ Int VG_(load_ELF)(Int fd, const HChar* name, /*MOD*/ExeInfo* info)
          if (sr_isError(sres))
 #endif
          sres = VG_(open)(buf, VKI_O_RDONLY, 0);
-         //sres = VG_(open)("/usr/home/paulf/build/src/obj/usr/home/paulf/build/src/amd64.amd64/libexec/rtld-elf/ld-elf.so.1.full", VKI_O_RDONLY, 0);
          if (sr_isError(sres)) {
             VG_(printf)("valgrind: m_ume.c: can't open interpreter\n");
             VG_(exit)(1);

diff --git a/coregrind/m_ume/macho.c b/coregrind/m_ume/macho.c
index a8fdfd7088c4f030c1bce8e25e6dcb74d80da95e..22f2d7a0d6e435cc24ed32e38278e4782315198f 100644 (file)
--- a/coregrind/m_ume/macho.c
+++ b/coregrind/m_ume/macho.c
@@ -864,7 +864,7 @@ Int VG_(load_macho)(Int fd, const HChar *name, ExeInfo *info)
       return VKI_ENOEXEC;
    }
 
-   info->executable_path = VG_(strdup)("ume.macho.executable_path", name);
+   info->executable_path = VG_(strdup)("ume.macho.load_macho", name);
 
    SysRes res = VG_(dup)(fd);
    if (!sr_isError(res))