[svn:parrot] r41129 - in trunk: . compilers/imcc src/runcore

cotto at svn.parrot.org cotto at svn.parrot.org
Mon Sep 7 18:59:30 UTC 2009


Author: cotto
Date: Mon Sep  7 18:59:30 2009
New Revision: 41129
URL: https://trac.parrot.org/parrot/changeset/41129

Log:
[profiling] add news item, update imcc options and helpful output to profiling exit message

Modified:
   trunk/NEWS
   trunk/compilers/imcc/main.c
   trunk/src/runcore/cores.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	Mon Sep  7 18:55:17 2009	(r41128)
+++ trunk/NEWS	Mon Sep  7 18:59:30 2009	(r41129)
@@ -2,6 +2,7 @@
 
 New in 1.6.0
 - Core
+  + Profiling runcore can now be used to generate Callgrind-compatible output
   + PMC allocator now automatically allocates ATTR structures
   + Added fixed-size structure allocator to GC
   + Contexts are not garbage-collectable

Modified: trunk/compilers/imcc/main.c
==============================================================================
--- trunk/compilers/imcc/main.c	Mon Sep  7 18:55:17 2009	(r41128)
+++ trunk/compilers/imcc/main.c	Mon Sep  7 18:59:30 2009	(r41129)
@@ -148,7 +148,7 @@
     ASSERT_ARGS(usage)
     fprintf(fp,
             "parrot -[acEGhprtvVwy.] [-d [FLAGS]] [-D [FLAGS]]"
-            "[-O [level]] [-o FILE] <file>\n");
+            "[-O [level]] [-R runcore] [-o FILE] <file>\n");
 }
 
 /*
@@ -221,8 +221,7 @@
     "    -X --dynext add path to dynamic extension search\n"
     "   <Run core options>\n"
     "    -R --runcore slow|bounds|fast|jit|cgoto|cgp|cgp-jit\n"
-    "    -R --runcore switch|switch-jit|trace|exec|gcdebug\n"
-    "    -p --profile\n"
+    "    -R --runcore switch|switch-jit|trace|profiling|gcdebug\n"
     "    -t --trace [flags]\n"
     "   <VM options>\n"
     "    -D --parrot-debug[=HEXFLAGS]\n"
@@ -308,7 +307,6 @@
     { 'h', 'h', (OPTION_flags)0, { "--help" } },
     { 'o', 'o', OPTION_required_FLAG, { "--output" } },
     { '\0', OPT_PBC_OUTPUT, (OPTION_flags)0, { "--output-pbc" } },
-    { 'p', 'p', (OPTION_flags)0, { "--profile" } },
     { 'r', 'r', (OPTION_flags)0, { "--run-pbc" } },
     { '\0', OPT_RUNTIME_PREFIX, (OPTION_flags)0, { "--runtime-prefix" } },
     { 't', 't', OPTION_optional_FLAG, { "--trace" } },
@@ -400,9 +398,6 @@
                         "main: Unrecognized runcore '%s' specified."
                         "\n\nhelp: parrot -h\n", opt.opt_arg);
                 break;
-            case 'p':
-                SET_FLAG(PARROT_PROFILE_FLAG);
-                break;
             case 't':
                 if (opt.opt_arg && is_all_hex_digits(opt.opt_arg))
                     SET_TRACE(strtoul(opt.opt_arg, NULL, 16));

Modified: trunk/src/runcore/cores.c
==============================================================================
--- trunk/src/runcore/cores.c	Mon Sep  7 18:55:17 2009	(r41128)
+++ trunk/src/runcore/cores.c	Mon Sep  7 18:59:30 2009	(r41129)
@@ -1313,7 +1313,9 @@
     ASSERT_ARGS(destroy_profiling_core)
 
     char *filename_cstr = Parrot_str_to_cstring(interp, runcore->profile_filename);
-    fprintf(stderr, "\nPROFILING RUNCORE: Wrote profile to %s .\n", filename_cstr);
+    fprintf(stderr, "\nPROFILING RUNCORE: wrote profile to %s\n", filename_cstr);
+    fprintf(stderr, "Use tools/dev/pprof2cg.pl to generate Callgrind-compatible "
+            "output from this file.\n");
     Parrot_str_free_cstring(filename_cstr);
 
     fclose(runcore->profile_fd);


More information about the parrot-commits mailing list