Author: tim.bunce
Date: Fri Jul 10 16:29:35 2009
New Revision: 818

Modified:
    trunk/NYTProf.xs
    trunk/t/test01.rdt
    trunk/t/test02.rdt
    trunk/t/test03.rdt
    trunk/t/test05.rdt
    trunk/t/test06.rdt
    trunk/t/test07.rdt
    trunk/t/test08.rdt
    trunk/t/test09.rdt
    trunk/t/test10.rdt
    trunk/t/test12.rdt
    trunk/t/test13.rdt
    trunk/t/test20-streval.rdt
    trunk/t/test21-streval3.rdt
    trunk/t/test22-strevala.rdt
    trunk/t/test23-strevall.rdt
    trunk/t/test30-fork-0.rdt
    trunk/t/test50-disable.rdt
    trunk/t/test51-enable.rdt
    trunk/t/test61-submerge.rdt
    trunk/t/test80-recurs.rdt

Log:
Sub calls made outside of subs are now deemed to have been called from  
<Package>::BEGIN.
Calls to non-existent import() subs are no longer profiled.


Modified: trunk/NYTProf.xs
==============================================================================
--- trunk/NYTProf.xs    (original)
+++ trunk/NYTProf.xs    Fri Jul 10 16:29:35 2009
@@ -2182,7 +2182,6 @@
          default:
              if (!SvROK(sv)) {
                  char *sym;
-                STRLEN n_a;

                  if (sv == &PL_sv_yes) {           /* unfound import,  
ignore */
                      if (subname_out_sv)
@@ -2196,7 +2195,7 @@
                      sym = SvPOKp(sv) ? SvPVX(sv) : Nullch;
                  }
                  else
-                    sym = SvPV(sv, n_a);
+                    sym = SvPV_nolen(sv);
                  if (!sym)
                      return NULL;
                  if (PL_op->op_private & HINT_STRICT_REFS)
@@ -2239,6 +2238,7 @@
  {
      /* returning the current cv */
      /* logic based on perl's S_deb_curcv in dump.c */
+    /* see also http://search.cpan.org/dist/Devel-StackBlech/ */
      PERL_CONTEXT *cx;
      if (!si)
          si = PL_curstackinfo;
@@ -2247,6 +2247,9 @@
      /* the common case of finding the caller on the same stack */
      if (CxTYPE(cx) == CXt_SUB || CxTYPE(cx) == CXt_FORMAT)
          return cx->blk_sub.cv;
+    else if (CxTYPE(cx) == CXt_EVAL && cx->blk_eval.old_namesv) {
+        return (CV*)&PL_sv_yes;     /* indicates a require */
+    }
      else if (CxTYPE(cx) == CXt_EVAL && !CxTRYBLOCK(cx))
          return current_cv(aTHX_ ix - 1, si); /* recurse up stack */
      else if (ix == 0 && si->si_type == PERLSI_MAIN)
@@ -2286,7 +2289,10 @@
      I32 save_ix;
      SV *sub_sv;
      subr_entry_t *subr_entry;
-    int profile_sub_call = (profile_subs && is_profiling);
+    int profile_sub_call = (profile_subs && is_profiling
+        /* don't profile calls to non-existant import() methods */
+        && !(op_type==OP_ENTERSUB && *SP == &PL_sv_yes)
+    );

      if (profile_sub_call) {
          char *file;
@@ -2300,7 +2306,7 @@
              /* crude, but the only way to deal with the miriad logic at the
               * start of pp_entersub (which ought to be available as  
separate sub)
               */
-            sv_dump(*PL_stack_sp);
+            sv_dump(sub_sv);
          }

          /* allocate struct to save stack (very efficient) */
@@ -2366,6 +2372,11 @@

          if (subr_entry->caller_cv == PL_main_cv)
              caller_pv = "MAIN";
+        else if (subr_entry->caller_cv == (CV*)&PL_sv_yes) {
+            caller_sv = newSV(0); /* XXX add cache/stack thing for these  
SVs */
+            stash_name = CopSTASHPV(PL_curcop);
+            sv_setpvf(caller_sv, "%s::%s", stash_name, "BEGIN");
+        }
          else {
              caller_sv = newSV(0); /* XXX add cache/stack thing for these  
SVs */
              GV *gv = CvGV(subr_entry->caller_cv);
@@ -2376,6 +2387,8 @@
                  sv_dump(subr_entry->caller_cv);
                  sv_setpv(caller_sv, "XXXNULLGV");
              }
+        }
+        if (caller_sv) {
              caller_pv = SvPV_nolen(caller_sv);
              sv_2mortal(caller_sv);
          }
@@ -2985,7 +2998,7 @@
          }
          last_line = atoi(++last);

-        if (!first_line && !last_line && strstr(sub_name, "::BEGIN"))
+        if (0 &&!first_line && !last_line && strstr(sub_name, "::BEGIN"))
              continue;                             /* no point writing  
these XXX? */

          if (!filename_len) {    /* no filename, so presumably a fake entry  
for xsub */
@@ -3081,13 +3094,19 @@
                  trace = 1;
              }

-            if (trace)
-                logwarn("%s called by %.*s at %u:%u: count %"NVff"  
(i%"NVff"s e%"NVff"s u%"NVff"s s%"NVff"s, d%"NVff" ri%"NVff"s)\n",
-                    called_subname,
-                    caller_subname_len, caller_subname, fid, line,  
sc[NYTP_SCi_CALL_COUNT],
-                    sc[NYTP_SCi_INCL_RTIME], sc[NYTP_SCi_EXCL_RTIME],
-                    sc[NYTP_SCi_INCL_UTIME], sc[NYTP_SCi_INCL_STIME],
-                    sc[NYTP_SCi_REC_DEPTH], sc[NYTP_SCi_RECI_RTIME]);
+            if (trace) {
+                if (!fid && !line) {
+                    logwarn("%s is xsub\n", called_subname);
+                }
+                else {
+                    logwarn("%s called by %.*s at %u:%u: count %ld  
(i%"NVff"s e%"NVff"s u%"NVff"s s%"NVff"s, d%"NVff" ri%"NVff"s)\n",
+                        called_subname,
+                        caller_subname_len, caller_subname, fid, line,  
(long)sc[NYTP_SCi_CALL_COUNT],
+                        sc[NYTP_SCi_INCL_RTIME], sc[NYTP_SCi_EXCL_RTIME],
+                        sc[NYTP_SCi_INCL_UTIME], sc[NYTP_SCi_INCL_STIME],
+                        sc[NYTP_SCi_REC_DEPTH], sc[NYTP_SCi_RECI_RTIME]);
+                }
+            }
          }
      }
  }

Modified: trunk/t/test01.rdt
==============================================================================
--- trunk/t/test01.rdt  (original)
+++ trunk/t/test01.rdt  Fri Jul 10 16:29:35 2009
@@ -19,6 +19,7 @@
  fid_block_time        1       17      [ 0 1 ]
  fid_block_time        1       18      [ 0 1 ]
  fid_fileinfo  1       [ test01.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::bar       6-8
  fid_fileinfo  1       sub     main::baz       10-14
  fid_fileinfo  1       sub     main::foo       1-4
@@ -46,6 +47,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::bar       [ 1 6 8 4 0 0 0 0 ]
  sub_subinfo   main::bar       called_by       1       3       [ 2 0 0 0 0 0 0 
main::foo ]
  sub_subinfo   main::bar       called_by       1       12      [ 1 0 0 0 0 0 0 
main::baz ]

Modified: trunk/t/test02.rdt
==============================================================================
--- trunk/t/test02.rdt  (original)
+++ trunk/t/test02.rdt  Fri Jul 10 16:29:35 2009
@@ -20,6 +20,7 @@
  fid_block_time        1       20      [ 0 1 ]
  fid_block_time        1       21      [ 0 1 ]
  fid_fileinfo  1       [ test02.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::bar       6-8
  fid_fileinfo  1       sub     main::baz       10-16
  fid_fileinfo  1       sub     main::foo       1-4
@@ -54,6 +55,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::bar       [ 1 6 8 7 0 0 0 0 ]
  sub_subinfo   main::bar       called_by       1       3       [ 2 0 0 0 0 0 0 
main::foo ]
  sub_subinfo   main::bar       called_by       1       12      [ 1 0 0 0 0 0 0 
main::baz ]

Modified: trunk/t/test03.rdt
==============================================================================
--- trunk/t/test03.rdt  (original)
+++ trunk/t/test03.rdt  Fri Jul 10 16:29:35 2009
@@ -18,6 +18,7 @@
  fid_block_time        1       17      [ 0 1 ]
  fid_block_time        1       18      [ 0 1 ]
  fid_fileinfo  1       [ test03.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::bar       7-9
  fid_fileinfo  1       sub     main::baz       11-15
  fid_fileinfo  1       sub     main::foo       1-5
@@ -41,6 +42,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::bar       [ 1 7 9 2 0 0 0 0 ]
  sub_subinfo   main::bar       called_by       1       13      [ 1 0 0 0 0 0 0 
main::baz ]
  sub_subinfo   main::bar       called_by       1       17      [ 1 0 0 0 0 0 0 
MAIN ]

Modified: trunk/t/test05.rdt
==============================================================================
--- trunk/t/test05.rdt  (original)
+++ trunk/t/test05.rdt  Fri Jul 10 16:29:35 2009
@@ -19,6 +19,7 @@
  fid_block_time        1       22      [ 0 1 ]
  fid_block_time        1       23      [ 0 1 ]
  fid_fileinfo  1       [ test05.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::bar       12-17
  fid_fileinfo  1       sub     main::foo1      4-7
  fid_fileinfo  1       sub     main::foo2      8-11
@@ -46,6 +47,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::bar       [ 1 12 17 2 0 0 0 0 ]
  sub_subinfo   main::bar       called_by       1       6       [ 1 0 0 0 0 0 0 
main::foo1 ]
  sub_subinfo   main::bar       called_by       1       10      [ 1 0 0 0 0 0 0 
main::foo2 ]

Modified: trunk/t/test06.rdt
==============================================================================
--- trunk/t/test06.rdt  (original)
+++ trunk/t/test06.rdt  Fri Jul 10 16:29:35 2009
@@ -27,6 +27,7 @@
  fid_block_time        1       43      [ 0 1 ]
  fid_block_time        1       44      [ 0 1 ]
  fid_fileinfo  1       [ test06.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::bar       19-28
  fid_fileinfo  1       sub     main::baz       30-40
  fid_fileinfo  1       sub     main::foo       9-17
@@ -73,6 +74,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::bar       [ 1 19 28 1 0 0 0 0 ]
  sub_subinfo   main::bar       called_by       1       43      [ 1 0 0 0 0 0 0 
MAIN ]
  sub_subinfo   main::baz       [ 1 30 40 1 0 0 0 0 ]

Modified: trunk/t/test07.rdt
==============================================================================
--- trunk/t/test07.rdt  (original)
+++ trunk/t/test07.rdt  Fri Jul 10 16:29:35 2009
@@ -14,8 +14,10 @@
  attribute     xs_version      0
  fid_block_time        1       1       [ 0 1 ]
  fid_fileinfo  1       [ test07.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_line_time 1       1       [ 0 1 ]
  fid_sub_time  1       1       [ 0 1 ]
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]

Modified: trunk/t/test08.rdt
==============================================================================
--- trunk/t/test08.rdt  (original)
+++ trunk/t/test08.rdt  Fri Jul 10 16:29:35 2009
@@ -17,6 +17,7 @@
  fid_block_time        1       1       2       1       [ 0 1 ]
  fid_block_time        1       1       2       2       [ 0 1 ]
  fid_fileinfo  1       [ test08.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       eval    1       [ 1 0 ]
  fid_fileinfo  2       [ (eval 0)[test08.p:1] 1 1 2 2 0 0 ]
  fid_line_time 1       1       0       0
@@ -30,3 +31,4 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]

Modified: trunk/t/test09.rdt
==============================================================================
--- trunk/t/test09.rdt  (original)
+++ trunk/t/test09.rdt  Fri Jul 10 16:29:35 2009
@@ -24,6 +24,7 @@
  fid_block_time        1       12      [ 0 1 ]
  fid_block_time        1       13      [ 0 1 ]
  fid_fileinfo  1       [ test09.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::bar       7-9
  fid_fileinfo  1       sub     main::foo       1-5
  fid_fileinfo  1       call    11      main::foo       [ 1 0 0 0 0 0 0 MAIN ]
@@ -63,6 +64,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::bar       [ 1 7 9 3 0 0 0 0 ]
  sub_subinfo   main::bar       called_by       1       13      [ 1 0 0 0 0 0 0 
MAIN ]
  sub_subinfo   main::bar       called_by       2       3       [ 1 0 0 0 0 0 0 
main::foo ]

Modified: trunk/t/test10.rdt
==============================================================================
--- trunk/t/test10.rdt  (original)
+++ trunk/t/test10.rdt  Fri Jul 10 16:29:35 2009
@@ -18,6 +18,7 @@
  fid_block_time        1       1       2       2       [ 0 1 ]
  fid_block_time        1       2       [ 0 1 ]
  fid_fileinfo  1       [ test10.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::CORE:sleep        0-0
  fid_fileinfo  1       call    2       main::__ANON__[(eval 0)[test10.p:1]:1]  
[ 1 0 0 0 0 0  
0 MAIN ]
  fid_fileinfo  1       eval    1       [ 1 0 ]
@@ -37,6 +38,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::CORE:sleep        [ 1 0 0 1 0 0 0 0 ]
  sub_subinfo   main::CORE:sleep        called_by       2       1       [ 1 0 0 
0 0 0 0  
main::__ANON__[(eval 0)[test10.p:1]:1] ]
  sub_subinfo   main::__ANON__[(eval 0)[test10.p:1]:1]  [ 2 1 1 1 0 0 0 0 ]

Modified: trunk/t/test12.rdt
==============================================================================
--- trunk/t/test12.rdt  (original)
+++ trunk/t/test12.rdt  Fri Jul 10 16:29:35 2009
@@ -15,6 +15,7 @@
  fid_block_time        1       1       [ 0 1 ]
  fid_block_time        2       1       [ 0 1 ]
  fid_fileinfo  1       [ test12.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  2       [ test12.pl   2 2 0 0 ]
  fid_line_time 1       1       [ 0 1 ]
  fid_line_time 2       1       [ 0 1 ]
@@ -23,3 +24,4 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]

Modified: trunk/t/test13.rdt
==============================================================================
--- trunk/t/test13.rdt  (original)
+++ trunk/t/test13.rdt  Fri Jul 10 16:29:35 2009
@@ -23,6 +23,7 @@
  fid_block_time        1       20      [ 0 2 ]
  fid_block_time        1       21      [ 0 1 ]
  fid_fileinfo  1       [ test13.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::bar       7-9
  fid_fileinfo  1       sub     main::baz       11-17
  fid_fileinfo  1       sub     main::foo       3-5
@@ -55,6 +56,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::bar       [ 1 7 9 1 0 0 0 0 ]
  sub_subinfo   main::bar       called_by       1       20      [ 1 0 0 0 0 0 0 
MAIN ]
  sub_subinfo   main::baz       [ 1 11 17 1 0 0 0 0 ]

Modified: trunk/t/test20-streval.rdt
==============================================================================
--- trunk/t/test20-streval.rdt  (original)
+++ trunk/t/test20-streval.rdt  Fri Jul 10 16:29:35 2009
@@ -24,6 +24,7 @@
  fid_block_time        1       14      1       1
  fid_block_time        1       14      2       1       [ 0 2 ]
  fid_fileinfo  1       [ test20-streval.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::foo       3-3
  fid_fileinfo  1       eval    8       [ 1 0 ]
  fid_fileinfo  1       eval    11      [ 2 0 ]
@@ -63,6 +64,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::foo       [ 1 3 3 4 0 0 0 0 ]
  sub_subinfo   main::foo       called_by       2       1       [ 1 0 0 0 0 0 0 
MAIN ]
  sub_subinfo   main::foo       called_by       3       1       [ 1 0 0 0 0 0 0 
MAIN ]

Modified: trunk/t/test21-streval3.rdt
==============================================================================
--- trunk/t/test21-streval3.rdt (original)
+++ trunk/t/test21-streval3.rdt Fri Jul 10 16:29:35 2009
@@ -20,6 +20,7 @@
  fid_block_time        1       17      2       3       [ 0 3 ]
  fid_block_time        1       17      2       4       [ 0 2 ]
  fid_fileinfo  1       [ test21-streval3.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::foo       4-4
  fid_fileinfo  1       eval    17      [ 1 2 ]
  fid_fileinfo  2       [ (eval 0)[test21-streval3.p:17] 1 17 2 2 0 0 ]
@@ -47,6 +48,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::foo       [ 1 4 4 3 0 0 0 0 ]
  sub_subinfo   main::foo       called_by       2       3       [ 1 0 0 0 0 0 0 
MAIN ]
  sub_subinfo   main::foo       called_by       3       3       [ 1 0 0 0 0 0 0 
MAIN ]

Modified: trunk/t/test22-strevala.rdt
==============================================================================
--- trunk/t/test22-strevala.rdt (original)
+++ trunk/t/test22-strevala.rdt Fri Jul 10 16:29:35 2009
@@ -26,6 +26,7 @@
  fid_block_time        1       12      2       1       [ 0 2 ]
  fid_block_time        1       12      2       2       [ 0 4 ]
  fid_fileinfo  1       [ test22-strevala.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       call    6       main::__ANON__[(eval 
0)[test22-strevala.p:6]:1] [ 1  
0 0 0 0 0 0 MAIN ]
  fid_fileinfo  1       call    9       main::__ANON__[(eval 
0)[test22-strevala.p:9]:1] [ 2  
0 0 0 0 0 0 MAIN ]
  fid_fileinfo  1       eval    6       [ 1 0 ]
@@ -73,6 +74,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::__ANON__[(eval 0)[(eval 0)[test22-strevala.p:12]:2]:1]    
[  
6 1 1 2 0 0 0 0 ]
  sub_subinfo   main::__ANON__[(eval 0)[(eval 0)[test22-strevala.p:12]:2]:1]    
 
called_by       5       2       [ 2 0 0 0 0 0 0 MAIN ]
  sub_subinfo   main::__ANON__[(eval 0)[test22-strevala.p:6]:1] [ 2 1 1 1 0 0  
0 0 ]

Modified: trunk/t/test23-strevall.rdt
==============================================================================
--- trunk/t/test23-strevall.rdt (original)
+++ trunk/t/test23-strevall.rdt Fri Jul 10 16:29:35 2009
@@ -17,6 +17,7 @@
  fid_block_time        3       1       1       0
  fid_block_time        3       1       2       45      [ 0 1 ]
  fid_fileinfo  1       [ test23-strevall.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  2       [ (eval 0) 3 1 2 2 0 0 ]
  fid_fileinfo  3       [ /unknown-eval-invoker   3 130 0 0 ]
  fid_fileinfo  3       eval    1       [ 1 0 ]
@@ -31,3 +32,4 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]

Modified: trunk/t/test30-fork-0.rdt
==============================================================================
--- trunk/t/test30-fork-0.rdt   (original)
+++ trunk/t/test30-fork-0.rdt   Fri Jul 10 16:29:35 2009
@@ -21,6 +21,7 @@
  fid_block_time        1       20      [ 0 1 ]
  fid_block_time        1       22      [ 0 1 ]
  fid_fileinfo  1       [ test30-fork-0.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::CORE:wait 0-0
  fid_fileinfo  1       sub     main::other     6-8
  fid_fileinfo  1       sub     main::postfork  10-13
@@ -52,6 +53,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::CORE:wait [ 1 0 0 1 0 0 0 0 ]
  sub_subinfo   main::CORE:wait called_by       1       22      [ 1 0 0 0 0 0 0 
MAIN ]
  sub_subinfo   main::other     [ 1 6 8 3 0 0 0 0 ]

Modified: trunk/t/test50-disable.rdt
==============================================================================
--- trunk/t/test50-disable.rdt  (original)
+++ trunk/t/test50-disable.rdt  Fri Jul 10 16:29:35 2009
@@ -17,6 +17,7 @@
  fid_block_time        1       4       [ 0 1 ]
  fid_block_time        1       5       [ 0 1 ]
  fid_fileinfo  1       [ test50-disable.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       call    2       DB::disable_profile     [ 1 0 0 0 0 0 0 
MAIN ]
  fid_fileinfo  1       call    6       DB::disable_profile     [ 1 0 0 0 0 0 0 
MAIN ]
  fid_line_time 1       1       [ 0 1 ]
@@ -33,3 +34,4 @@
  sub_subinfo   DB::disable_profile     [ undef 0 0 2 0 0 0 0 ]
  sub_subinfo   DB::disable_profile     called_by       1       2       [ 1 0 0 
0 0 0 0 MAIN ]
  sub_subinfo   DB::disable_profile     called_by       1       6       [ 1 0 0 
0 0 0 0 MAIN ]
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]

Modified: trunk/t/test51-enable.rdt
==============================================================================
--- trunk/t/test51-enable.rdt   (original)
+++ trunk/t/test51-enable.rdt   Fri Jul 10 16:29:35 2009
@@ -20,6 +20,7 @@
  fid_block_time        1       7       2       1       [ 0 1 ]
  fid_block_time        1       9       [ 0 1 ]
  fid_fileinfo  1       [ test51-enable.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       call    9       main::sub1      [ 1 0 0 0 0 0 0 MAIN ]
  fid_fileinfo  1       call    11      DB::disable_profile     [ 1 0 0 0 0 0 0 
MAIN ]
  fid_fileinfo  1       eval    7       [ 2 0 ]
@@ -46,6 +47,7 @@
  profile_modes fid_sub_time    sub
  sub_subinfo   DB::disable_profile     [ undef 0 0 1 0 0 0 0 ]
  sub_subinfo   DB::disable_profile     called_by       1       11      [ 1 0 0 
0 0 0 0 MAIN ]
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::sub1      [ 2 1 1 1 0 0 0 0 ]
  sub_subinfo   main::sub1      called_by       1       9       [ 1 0 0 0 0 0 0 
MAIN ]
  sub_subinfo   main::sub9      [ 3 1 1 0 0 0 0 0 ]

Modified: trunk/t/test61-submerge.rdt
==============================================================================
--- trunk/t/test61-submerge.rdt (original)
+++ trunk/t/test61-submerge.rdt Fri Jul 10 16:29:35 2009
@@ -19,6 +19,7 @@
  fid_block_time        1       8       2       1       [ 0 3 ]
  fid_block_time        1       8       2       2       [ 0 3 ]
  fid_fileinfo  1       [ test61-submerge.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::foo       4-4
  fid_fileinfo  1       call    8       main::__ANON__[(eval 
0)[test61-submerge.p:8]:1] [ 3  
0 0 0 0 0 0 MAIN ]
  fid_fileinfo  1       eval    8       [ 3 0 ]
@@ -46,6 +47,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::__ANON__[(eval 0)[test61-submerge.p:8]:1] [ 2 1 1 3 0 0  
0 0 ]
  sub_subinfo   main::__ANON__[(eval 0)[test61-submerge.p:8]:1] called_by       
1       8        
[ 3 0 0 0 0 0 0 MAIN ]
  sub_subinfo   main::foo       [ 1 4 4 3 0 0 0 0 ]

Modified: trunk/t/test80-recurs.rdt
==============================================================================
--- trunk/t/test80-recurs.rdt   (original)
+++ trunk/t/test80-recurs.rdt   Fri Jul 10 16:29:35 2009
@@ -15,6 +15,7 @@
  fid_block_time        1       2       [ 0 9 ]
  fid_block_time        1       7       [ 0 1 ]
  fid_fileinfo  1       [ test80-recurs.p   1 2 0 0 ]
+fid_fileinfo   1       sub     main::BEGIN     0-0
  fid_fileinfo  1       sub     main::recurs    1-5
  fid_fileinfo  1       call    4       main::recurs    [ 2 0 0 0 0 0 2 
main::recurs ]
  fid_fileinfo  1       call    7       main::recurs    [ 1 0 0 0 0 0 0 MAIN ]
@@ -27,6 +28,7 @@
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
+sub_subinfo    main::BEGIN     [ 1 0 0 0 0 0 0 0 ]
  sub_subinfo   main::recurs    [ 1 1 5 3 0 0 2 0 ]
  sub_subinfo   main::recurs    called_by       1       4       [ 2 0 0 0 0 0 2 
main::recurs ]
  sub_subinfo   main::recurs    called_by       1       7       [ 1 0 0 0 0 0 0 
MAIN ]

--~--~---------~--~----~------------~-------~--~----~
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