[svn:parrot] r40829 - in branches/pluggable_runcore: config/gen/platform/generic src/runcore

[cotto at svn.parrot.org]

Author: cotto
Date: Thu Aug 27 18:23:46 2009
New Revision: 40829
URL: https://trac.parrot.org/parrot/changeset/40829

Log:
[profiling] remove some redundant info from the profile and a minor cleanup

Modified:
   branches/pluggable_runcore/config/gen/platform/generic/hires_timer.c
   branches/pluggable_runcore/src/runcore/cores.c

Modified: branches/pluggable_runcore/config/gen/platform/generic/hires_timer.c
==============================================================================
--- branches/pluggable_runcore/config/gen/platform/generic/hires_timer.c	Thu Aug 27 16:17:16 2009	(r40828)
+++ branches/pluggable_runcore/config/gen/platform/generic/hires_timer.c	Thu Aug 27 18:23:46 2009	(r40829)
@@ -22,7 +22,6 @@
 */
 
 #include <time.h>
-#include "parrot/platform.h"
 
 #define TIME_IN_NS(n) ((n).tv_sec * 1000*1000*1000 + (n).tv_nsec)
 

Modified: branches/pluggable_runcore/src/runcore/cores.c
==============================================================================
--- branches/pluggable_runcore/src/runcore/cores.c	Thu Aug 27 16:17:16 2009	(r40828)
+++ branches/pluggable_runcore/src/runcore/cores.c	Thu Aug 27 18:23:46 2009	(r40829)
@@ -1164,29 +1164,25 @@
             if (strcmp(preop_file_name, postop_file_name))
                 fprintf(runcore->prof_fd, "F:%s\n", postop_file_name);
 
-            if (strcmp(preop_sub_name, postop_sub_name))
-                fprintf(runcore->prof_fd, "S:%s;%s\n",
-                        VTABLE_get_string(interp, preop_ctx->current_namespace)->strstart,
-                        postop_sub_name);
-
-            fprintf(runcore->prof_fd, "%d:%lli:%s:sub at 0x%x:ctx at 0x%x\n",
+            fprintf(runcore->prof_fd, "%d:%lli:%s\n",
                     postop_info.line, op_time,
-                    (interp->op_info_table)[*preop_pc].name,
-                    (unsigned int) preop_sub, (unsigned int) preop_ctx);
+                    (interp->op_info_table)[*preop_pc].name);
 
             if (preop_sub != CONTEXT(interp)->current_sub || Profiling_first_op_TEST(runcore)) {
                 Profiling_first_op_CLEAR(runcore);
 
                 if (info.subname->strstart) {
-                    fprintf(runcore->prof_fd, "CS:%s;%s at 0x%x\n",
+                    fprintf(runcore->prof_fd, "CS:%s;%s at 0x%X,0x%X\n",
                             VTABLE_get_string(interp, CONTEXT(interp)->current_namespace)->strstart,
                             info.subname->strstart,
-                            (unsigned int) CONTEXT(interp)->current_sub);
+                            (unsigned int) CONTEXT(interp)->current_sub,
+                            (unsigned int) CONTEXT(interp));
                 }
                 else {
-                    fprintf(runcore->prof_fd, "CS:%s;<unknown sub>@0x%x\n",
+                    fprintf(runcore->prof_fd, "CS:%s;<unknown sub>@0x%X,0X%X\n",
                             VTABLE_get_string(interp, CONTEXT(interp)->current_namespace)->strstart,
-                            (unsigned int) CONTEXT(interp)->current_sub);
+                            (unsigned int) CONTEXT(interp)->current_sub,
+                            (unsigned int) CONTEXT(interp));
                 }
             }