vg_profile.c, which is #included by skins that want to profile, was using some

core only functions (vg_assert and VG_(core_panic)), which screwed things up.
Replaced them with the skin versions.  I don't know how this ever worked.

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

diff --git a/include/vg_profile.c b/include/vg_profile.c
index 280bd8e8e2a4a067d7aedd4ea963e924f41ce87a..9269f42b1649f5d41c2b1b301916d312cba1ea2d 100644 (file)
--- a/include/vg_profile.c
+++ b/include/vg_profile.c
@@ -89,7 +89,7 @@ void VGP_(tick) ( int sigNo )
    Int cc;
    vgp_nticks++;
    cc = vgp_stack[vgp_sp];
-   vg_assert(cc >= 0 && cc < VGP_MAX_CCS);
+   sk_assert(cc >= 0 && cc < VGP_MAX_CCS);
    vgp_counts[ cc ]++;
 }
 
@@ -101,7 +101,7 @@ void VGP_(init_profiling) ( void )
    /* Register core events... tricky macro definition causes
       VGP_(register_profile_event)() to be called once for each core event
       in VGP_CORE_LIST. */
-   vg_assert(VgpUnc == 0);
+   sk_assert(VgpUnc == 0);
 #  define VGP_PAIR(n,name) VGP_(register_profile_event)(n,name)
    VGP_CORE_LIST;
 #  undef  VGP_PAIR
@@ -115,7 +115,7 @@ void VGP_(init_profiling) ( void )
 
    signal(SIGPROF, VGP_(tick) );
    ret = setitimer(ITIMER_PROF, &value, NULL);
-   if (ret != 0) VG_(core_panic)("vgp_init_profiling");
+   if (ret != 0) VG_(skin_panic)("vgp_init_profiling");
 }
 
 void VGP_(done_profiling) ( void )