Author: tim.bunce
Date: Thu Jun 18 13:29:43 2009
New Revision: 773

Modified:
    trunk/NYTProf.xs
    trunk/bin/nytprofhtml

Log:
Tweaked warning message.
Disabled experimental treemap output (as I'm about to refactor it, again,  
but want to make a release meanwhile).


Modified: trunk/NYTProf.xs
==============================================================================
--- trunk/NYTProf.xs    (original)
+++ trunk/NYTProf.xs    Thu Jun 18 13:29:43 2009
@@ -1340,7 +1340,7 @@
      if (trace_level >= 2) {
          /* including last_executed_fid can be handy for tracking down how
              * a file got loaded */
-        warn("New fid %2u (after %2u:%-4u) %02x e%u:%u %.*s %s %s,%s\n",
+        warn("New fid %2u (after %2u:%-4u) 0x%02x e%u:%u %.*s %s %s,%s\n",
              found->id, last_executed_fid, last_executed_line,
              found->fid_flags, found->eval_fid, found->eval_line_num,
              found->key_len, found->key, (found->key_abs) ?  
found->key_abs : "",
@@ -1757,7 +1757,8 @@
              /* perl options, like -n, -p, -Mfoo etc can cause this as perl  
effectively
               * treats those as 'line 0', so we try not to warn in those  
cases.
               */
-            int is_preamble = (PL_scopestack_ix <= 6 &&  
strEQ(CopSTASHPV(cop),"main"));
+            char *pkg_name = CopSTASHPV(cop);
+            int is_preamble = (PL_scopestack_ix <= 6 &&  
strEQ(pkg_name,"main"));

              /* op is null when called via finish_profile called by END */
              if (!is_preamble && op) {

Modified: trunk/bin/nytprofhtml
==============================================================================
--- trunk/bin/nytprofhtml       (original)
+++ trunk/bin/nytprofhtml       Thu Jun 18 13:29:43 2009
@@ -556,7 +556,7 @@

  output_subs_indexpage($reporter, "index-subs-excl.html", 'excl_time');
  output_subs_indexpage($reporter, "index-subs-incl.html", 'incl_time');
-output_package_treemap($reporter, "package-treemap.html");
+#output_package_treemap($reporter, "package-treemap.html");
  output_indexpage($reporter, "index.html");

  output_js_files($reporter);
@@ -649,7 +649,7 @@

      print OUT file_table($profile, $stats, 1);

-    print OUT q{<br/><a href="package-treemap.html">Package  
treemap</a><br/>};
+    #print OUT q{<br/><a href="package-treemap.html">Package  
treemap</a><br/>};

      print OUT package_tables($profile);

@@ -698,7 +698,7 @@
      local $Data::Dumper::Sortkeys = 1;
      local $Data::Dumper::Indent = 1;
      local $Data::Dumper::Maxdepth = 3;
-    warn Data::Dumper::Dumper($profile->package_subinfo_map(1,1));
+    #warn Data::Dumper::Dumper($profile->package_subinfo_map(1,1));
      my $package_tree_subinfo_map = $profile->package_subinfo_map(1,1);

      # {   "id":"node02", "name":"0.2", "data":[  
{"key":"key1", "value":195}, {"key":"key2", "value":5}], "children":[ ... ]  
}
@@ -722,7 +722,7 @@
      };

      my $nodes = $node_mapper->('', $package_tree_subinfo_map, [], 0);
-    warn $nodes;
+    #warn $nodes;

      print OUT qq{
  <script type="text/javascript">

--~--~---------~--~----~------------~-------~--~----~
You've received this message because you are subscribed to
the Devel::NYTProf Development User group.

Group hosted at:  http://groups.google.com/group/develnytprof-dev
Project hosted at:  http://perl-devel-nytprof.googlecode.com
CPAN distribution:  http://search.cpan.org/dist/Devel-NYTProf

To post, email:  [email protected]
To unsubscribe, email:  [email protected]
-~----------~----~----~----~------~----~------~--~---

Reply via email to