Author: tim.bunce
Date: Fri Jul 10 16:43:11 2009
New Revision: 819

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/test09.rdt
    trunk/t/test10.rdt
    trunk/t/test11.rdt
    trunk/t/test13.rdt
    trunk/t/test14.rdt
    trunk/t/test20-streval.rdt
    trunk/t/test21-streval3.rdt
    trunk/t/test22-strevala.rdt
    trunk/t/test30-fork-0.rdt
    trunk/t/test40pmc.rdt
    trunk/t/test50-disable.rdt
    trunk/t/test51-enable.rdt
    trunk/t/test60-subname.rdt
    trunk/t/test61-submerge.rdt
    trunk/t/test80-recurs.rdt

Log:
Renamed MAIN to main::BEGIN to match the name derived elsewhere.
Improved an error message.
Resync'd the tests.


Modified: trunk/NYTProf.xs
==============================================================================
--- trunk/NYTProf.xs    (original)
+++ trunk/NYTProf.xs    Fri Jul 10 16:43:11 2009
@@ -2370,12 +2370,12 @@
          char *caller_pv;
          SV *caller_sv = NULL;

-        if (subr_entry->caller_cv == PL_main_cv)
-            caller_pv = "MAIN";
+        if (subr_entry->caller_cv == PL_main_cv) {
+            caller_pv = "main::BEGIN";
+        }
          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");
+            sv_setpvf(caller_sv, "%s::%s", CopSTASHPV(PL_curcop), "BEGIN");
          }
          else {
              caller_sv = newSV(0); /* XXX add cache/stack thing for these  
SVs */
@@ -2384,8 +2384,10 @@
                  gv_efullname3(caller_sv, CvGV(subr_entry->caller_cv),  
Nullch);
              }
              else {
-                sv_dump(subr_entry->caller_cv);
-                sv_setpv(caller_sv, "XXXNULLGV");
+                logwarn("Can't determine name of calling sub (no GV) at %s  
line %d\n",
+                    OutCopFILE(prev_cop), CopLINE(prev_cop));
+                sv_dump((SV*)subr_entry->caller_cv);
+                sv_setpv(caller_sv, "__UNKNOWN__(NULLGV)");
              }
          }
          if (caller_sv) {

Modified: trunk/t/test01.rdt
==============================================================================
--- trunk/t/test01.rdt  (original)
+++ trunk/t/test01.rdt  Fri Jul 10 16:43:11 2009
@@ -26,9 +26,9 @@
  fid_fileinfo  1       call    3       main::bar       [ 2 0 0 0 0 0 0 
main::foo ]
  fid_fileinfo  1       call    12      main::bar       [ 1 0 0 0 0 0 0 
main::baz ]
  fid_fileinfo  1       call    13      main::foo       [ 1 0 0 0 0 0 0 
main::baz ]
-fid_fileinfo   1       call    16      main::bar       [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    17      main::baz       [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    18      main::foo       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   1       call    16      main::bar       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    17      main::baz       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    18      main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_line_time 1       2       [ 0 2 ]
  fid_line_time 1       3       [ 0 2 ]
  fid_line_time 1       7       [ 0 4 ]
@@ -51,9 +51,9 @@
  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 ]
-sub_subinfo    main::bar       called_by       1       16      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::bar       called_by       1       16      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::baz       [ 1 10 14 1 0 0 0 0 ]
-sub_subinfo    main::baz       called_by       1       17      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::baz       called_by       1       17      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::foo       [ 1 1 4 2 0 0 0 0 ]
  sub_subinfo   main::foo       called_by       1       13      [ 1 0 0 0 0 0 0 
main::baz ]
-sub_subinfo    main::foo       called_by       1       18      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::foo       called_by       1       18      [ 1 0 0 0 0 0 0 
main::BEGIN ]

Modified: trunk/t/test02.rdt
==============================================================================
--- trunk/t/test02.rdt  (original)
+++ trunk/t/test02.rdt  Fri Jul 10 16:43:11 2009
@@ -29,10 +29,10 @@
  fid_fileinfo  1       call    13      main::bar       [ 1 0 0 0 0 0 0 
main::baz ]
  fid_fileinfo  1       call    14      main::bar       [ 1 0 0 0 0 0 0 
main::baz ]
  fid_fileinfo  1       call    15      main::foo       [ 1 0 0 0 0 0 0 
main::baz ]
-fid_fileinfo   1       call    18      main::bar       [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    19      main::bar       [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    20      main::baz       [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    21      main::foo       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   1       call    18      main::bar       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    19      main::bar       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    20      main::baz       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    21      main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_line_time 1       2       [ 0 2 ]
  fid_line_time 1       3       [ 0 2 ]
  fid_line_time 1       7       [ 0 7 ]
@@ -61,10 +61,10 @@
  sub_subinfo   main::bar       called_by       1       12      [ 1 0 0 0 0 0 0 
main::baz ]
  sub_subinfo   main::bar       called_by       1       13      [ 1 0 0 0 0 0 0 
main::baz ]
  sub_subinfo   main::bar       called_by       1       14      [ 1 0 0 0 0 0 0 
main::baz ]
-sub_subinfo    main::bar       called_by       1       18      [ 1 0 0 0 0 0 0 
MAIN ]
-sub_subinfo    main::bar       called_by       1       19      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::bar       called_by       1       18      [ 1 0 0 0 0 0 0 
main::BEGIN ]
+sub_subinfo    main::bar       called_by       1       19      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::baz       [ 1 10 16 1 0 0 0 0 ]
-sub_subinfo    main::baz       called_by       1       20      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::baz       called_by       1       20      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::foo       [ 1 1 4 2 0 0 0 0 ]
  sub_subinfo   main::foo       called_by       1       15      [ 1 0 0 0 0 0 0 
main::baz ]
-sub_subinfo    main::foo       called_by       1       21      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::foo       called_by       1       21      [ 1 0 0 0 0 0 0 
main::BEGIN ]

Modified: trunk/t/test03.rdt
==============================================================================
--- trunk/t/test03.rdt  (original)
+++ trunk/t/test03.rdt  Fri Jul 10 16:43:11 2009
@@ -24,8 +24,8 @@
  fid_fileinfo  1       sub     main::foo       1-5
  fid_fileinfo  1       call    13      main::bar       [ 1 0 0 0 0 0 0 
main::baz ]
  fid_fileinfo  1       call    14      main::foo       [ 1 0 0 0 0 0 0 
main::baz ]
-fid_fileinfo   1       call    17      main::bar       [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    18      main::baz       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   1       call    17      main::bar       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    18      main::baz       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_line_time 1       2       [ 0 1 ]
  fid_line_time 1       3       [ 0 1 ]
  fid_line_time 1       8       [ 0 2 ]
@@ -45,8 +45,8 @@
  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 ]
+sub_subinfo    main::bar       called_by       1       17      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::baz       [ 1 11 15 1 0 0 0 0 ]
-sub_subinfo    main::baz       called_by       1       18      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::baz       called_by       1       18      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::foo       [ 1 1 5 1 0 0 0 0 ]
  sub_subinfo   main::foo       called_by       1       14      [ 1 0 0 0 0 0 0 
main::baz ]

Modified: trunk/t/test05.rdt
==============================================================================
--- trunk/t/test05.rdt  (original)
+++ trunk/t/test05.rdt  Fri Jul 10 16:43:11 2009
@@ -27,8 +27,8 @@
  fid_fileinfo  1       call    6       main::bar       [ 1 0 0 0 0 0 0 
main::foo1 ]
  fid_fileinfo  1       call    10      main::bar       [ 1 0 0 0 0 0 0 
main::foo2 ]
  fid_fileinfo  1       call    14      main::yeppers   [ 2 0 0 0 0 0 0 
main::bar ]
-fid_fileinfo   1       call    22      main::foo1      [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    23      main::foo2      [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   1       call    22      main::foo1      [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    23      main::foo2      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_line_time 1       5       [ 0 1 ]
  fid_line_time 1       6       [ 0 1 ]
  fid_line_time 1       9       [ 0 1 ]
@@ -52,8 +52,8 @@
  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 ]
  sub_subinfo   main::foo1      [ 1 4 7 1 0 0 0 0 ]
-sub_subinfo    main::foo1      called_by       1       22      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::foo1      called_by       1       22      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::foo2      [ 1 8 11 1 0 0 0 0 ]
-sub_subinfo    main::foo2      called_by       1       23      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::foo2      called_by       1       23      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::yeppers   [ 1 18 20 2 0 0 0 0 ]
  sub_subinfo   main::yeppers   called_by       1       14      [ 2 0 0 0 0 0 0 
main::bar ]

Modified: trunk/t/test06.rdt
==============================================================================
--- trunk/t/test06.rdt  (original)
+++ trunk/t/test06.rdt  Fri Jul 10 16:43:11 2009
@@ -37,9 +37,9 @@
  fid_fileinfo  1       call    25      main::noop      [ 100 0 0 0 0 0 0 
main::bar ]
  fid_fileinfo  1       call    36      main::noop      [ 100 0 0 0 0 0 0 
main::baz ]
  fid_fileinfo  1       call    37      main::noop      [ 100 0 0 0 0 0 0 
main::baz ]
-fid_fileinfo   1       call    42      main::foo       [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    43      main::bar       [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    44      main::baz       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   1       call    42      main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    43      main::bar       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    44      main::baz       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_line_time 1       4       [ 0 1 ]
  fid_line_time 1       6       [ 0 410 ]
  fid_line_time 1       10      [ 0 1 ]
@@ -76,11 +76,11 @@
  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::bar       called_by       1       43      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::baz       [ 1 30 40 1 0 0 0 0 ]
-sub_subinfo    main::baz       called_by       1       44      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::baz       called_by       1       44      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::foo       [ 1 9 17 1 0 0 0 0 ]
-sub_subinfo    main::foo       called_by       1       42      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::foo       called_by       1       42      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::noop      [ 1 5 7 410 0 0 0 0 ]
  sub_subinfo   main::noop      called_by       1       12      [ 10 0 0 0 0 0 
0 main::foo ]
  sub_subinfo   main::noop      called_by       1       14      [ 100 0 0 0 0 0 
0 main::foo ]

Modified: trunk/t/test09.rdt
==============================================================================
--- trunk/t/test09.rdt  (original)
+++ trunk/t/test09.rdt  Fri Jul 10 16:43:11 2009
@@ -27,9 +27,9 @@
  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 ]
-fid_fileinfo   1       call    12      main::foo       [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    13      main::bar       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   1       call    11      main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    12      main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    13      main::bar       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_fileinfo  1       eval    2       [ 2 0 ]
  fid_fileinfo  1       eval    8       [ 3 0 ]
  fid_fileinfo  2       [ (eval 0)[test09.p:2] 1 2 2 2 0 0 ]
@@ -66,9 +66,9 @@
  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       1       13      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::bar       called_by       2       3       [ 1 0 0 0 0 0 0 
main::foo ]
  sub_subinfo   main::bar       called_by       4       3       [ 1 0 0 0 0 0 0 
main::foo ]
  sub_subinfo   main::foo       [ 1 1 5 2 0 0 0 0 ]
-sub_subinfo    main::foo       called_by       1       11      [ 1 0 0 0 0 0 0 
MAIN ]
-sub_subinfo    main::foo       called_by       1       12      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::foo       called_by       1       11      [ 1 0 0 0 0 0 0 
main::BEGIN ]
+sub_subinfo    main::foo       called_by       1       12      [ 1 0 0 0 0 0 0 
main::BEGIN ]

Modified: trunk/t/test10.rdt
==============================================================================
--- trunk/t/test10.rdt  (original)
+++ trunk/t/test10.rdt  Fri Jul 10 16:43:11 2009
@@ -20,7 +20,7 @@
  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       call    2       main::__ANON__[(eval 0)[test10.p:1]:1]  
[ 1 0 0 0 0 0  
0 main::BEGIN ]
  fid_fileinfo  1       eval    1       [ 1 0 ]
  fid_fileinfo  2       [ (eval 0)[test10.p:1] 1 1 2 2 0 0 ]
  fid_fileinfo  2       sub     main::__ANON__[(eval 0)[test10.p:1]:1]  1-1
@@ -42,4 +42,4 @@
  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 ]
-sub_subinfo    main::__ANON__[(eval 0)[test10.p:1]:1]  called_by       1       
2       [ 1 0 0 0  
0 0 0 MAIN ]
+sub_subinfo    main::__ANON__[(eval 0)[test10.p:1]:1]  called_by       1       
2       [ 1 0 0 0  
0 0 0 main::BEGIN ]

Modified: trunk/t/test11.rdt
==============================================================================
--- trunk/t/test11.rdt  (original)
+++ trunk/t/test11.rdt  Fri Jul 10 16:43:11 2009
@@ -19,8 +19,8 @@
  fid_block_time        1       6       [ 0 1 ]
  fid_fileinfo  1       [ test11.p   1 2 0 0 ]
  fid_fileinfo  1       sub     main::BEGIN     2-4
-fid_fileinfo   1       call    5       main::__ANON__[(eval 0)[test11.p:3]:1]  
[ 1 0 0 0 0 0  
0 MAIN ]
-fid_fileinfo   1       call    6       main::__ANON__[(eval 0)[test11.p:3]:1]  
[ 1 0 0 0 0 0  
0 MAIN ]
+fid_fileinfo   1       call    5       main::__ANON__[(eval 0)[test11.p:3]:1]  
[ 1 0 0 0 0 0  
0 main::BEGIN ]
+fid_fileinfo   1       call    6       main::__ANON__[(eval 0)[test11.p:3]:1]  
[ 1 0 0 0 0 0  
0 main::BEGIN ]
  fid_fileinfo  1       eval    3       [ 1 0 ]
  fid_fileinfo  2       [ (eval 0)[test11.p:3] 1 3 2 2 0 0 ]
  fid_fileinfo  2       sub     main::__ANON__[(eval 0)[test11.p:3]:1]  1-1
@@ -39,5 +39,5 @@
  profile_modes fid_sub_time    sub
  sub_subinfo   main::BEGIN     [ 1 2 4 0 0 0 0 0 ]
  sub_subinfo   main::__ANON__[(eval 0)[test11.p:3]:1]  [ 2 1 1 2 0 0 0 0 ]
-sub_subinfo    main::__ANON__[(eval 0)[test11.p:3]:1]  called_by       1       
5       [ 1 0 0 0  
0 0 0 MAIN ]
-sub_subinfo    main::__ANON__[(eval 0)[test11.p:3]:1]  called_by       1       
6       [ 1 0 0 0  
0 0 0 MAIN ]
+sub_subinfo    main::__ANON__[(eval 0)[test11.p:3]:1]  called_by       1       
5       [ 1 0 0 0  
0 0 0 main::BEGIN ]
+sub_subinfo    main::__ANON__[(eval 0)[test11.p:3]:1]  called_by       1       
6       [ 1 0 0 0  
0 0 0 main::BEGIN ]

Modified: trunk/t/test13.rdt
==============================================================================
--- trunk/t/test13.rdt  (original)
+++ trunk/t/test13.rdt  Fri Jul 10 16:43:11 2009
@@ -29,11 +29,11 @@
  fid_fileinfo  1       sub     main::foo       3-5
  fid_fileinfo  1       call    13      main::foo       [ 1 0 0 0 0 0 0 
main::baz ]
  fid_fileinfo  1       call    14      main::foo       [ 1 0 0 0 0 0 0 
main::baz ]
-fid_fileinfo   1       call    20      main::bar       [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    21      main::baz       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   1       call    20      main::bar       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    21      main::baz       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_fileinfo  1       eval    19      [ 1 0 ]
  fid_fileinfo  2       [ (eval 0)[test13.p:19] 1 19 2 2 0 0 ]
-fid_fileinfo   2       call    1       main::foo       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   2       call    1       main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_line_time 1       4       [ 0 3 ]
  fid_line_time 1       8       [ 0 1 ]
  fid_line_time 1       12      [ 0 1 ]
@@ -58,10 +58,10 @@
  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::bar       called_by       1       20      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::baz       [ 1 11 17 1 0 0 0 0 ]
-sub_subinfo    main::baz       called_by       1       21      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::baz       called_by       1       21      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::foo       [ 1 3 5 3 0 0 0 0 ]
  sub_subinfo   main::foo       called_by       1       13      [ 1 0 0 0 0 0 0 
main::baz ]
  sub_subinfo   main::foo       called_by       1       14      [ 1 0 0 0 0 0 0 
main::baz ]
-sub_subinfo    main::foo       called_by       2       1       [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::foo       called_by       2       1       [ 1 0 0 0 0 0 0 
main::BEGIN ]

Modified: trunk/t/test14.rdt
==============================================================================
--- trunk/t/test14.rdt  (original)
+++ trunk/t/test14.rdt  Fri Jul 10 16:43:11 2009
@@ -23,9 +23,9 @@
  fid_block_time        2       20      [ 0 1 ]
  fid_fileinfo  1       [ test14.p   1 2 0 0 ]
  fid_fileinfo  1       sub     main::BEGIN     16-16
-fid_fileinfo   1       call    17      test14::pre     [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    18      AutoLoader::AUTOLOAD    [ 1 0 0 0 0 0 0 
MAIN ]
-fid_fileinfo   1       call    19      AutoLoader::AUTOLOAD    [ 1 0 0 0 0 0 0 
MAIN ]
+fid_fileinfo   1       call    17      test14::pre     [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    18      AutoLoader::AUTOLOAD    [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    19      AutoLoader::AUTOLOAD    [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_fileinfo  2       [ test14.pm   2 2 0 0 ]
  fid_fileinfo  2       sub     test14::BEGIN   2-2
  fid_fileinfo  2       sub     test14::bar     16-18
@@ -60,4 +60,4 @@
  sub_subinfo   test14::bar     [ 2 16 18 0 0 0 0 0 ]
  sub_subinfo   test14::foo     [ 2 12 14 0 0 0 0 0 ]
  sub_subinfo   test14::pre     [ 2 8 8 1 0 0 0 0 ]
-sub_subinfo    test14::pre     called_by       1       17      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    test14::pre     called_by       1       17      [ 1 0 0 0 0 0 0 
main::BEGIN ]

Modified: trunk/t/test20-streval.rdt
==============================================================================
--- trunk/t/test20-streval.rdt  (original)
+++ trunk/t/test20-streval.rdt  Fri Jul 10 16:43:11 2009
@@ -30,15 +30,15 @@
  fid_fileinfo  1       eval    11      [ 2 0 ]
  fid_fileinfo  1       eval    14      [ 1 1 ]
  fid_fileinfo  2       [ (eval 0)[test20-streval.p:8] 1 8 2 2 0 0 ]
-fid_fileinfo   2       call    1       main::foo       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   2       call    1       main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_fileinfo  3       [ (eval 0)[test20-streval.p:11] 1 11 3 2 0 0 ]
-fid_fileinfo   3       call    1       main::foo       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   3       call    1       main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_fileinfo  4       [ (eval 0)[test20-streval.p:11] 1 11 4 2 0 0 ]
-fid_fileinfo   4       call    1       main::foo       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   4       call    1       main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_fileinfo  5       [ (eval 0)[test20-streval.p:14] 1 14 5 2 0 0 ]
  fid_fileinfo  5       eval    1       [ 1 0 ]
  fid_fileinfo  6       [ (eval 0)[(eval 0)[test20-streval.p:14]:1] 5 1 6 2 0 0 
]
-fid_fileinfo   6       call    1       main::foo       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   6       call    1       main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_line_time 1       3       [ 0 4 ]
  fid_line_time 1       5       [ 0 1 ]
  fid_line_time 1       8       0       0
@@ -66,7 +66,7 @@
  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 ]
-sub_subinfo    main::foo       called_by       4       1       [ 1 0 0 0 0 0 0 
MAIN ]
-sub_subinfo    main::foo       called_by       6       1       [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::foo       called_by       2       1       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+sub_subinfo    main::foo       called_by       3       1       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+sub_subinfo    main::foo       called_by       4       1       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+sub_subinfo    main::foo       called_by       6       1       [ 1 0 0 0 0 0 0 
main::BEGIN ]

Modified: trunk/t/test21-streval3.rdt
==============================================================================
--- trunk/t/test21-streval3.rdt (original)
+++ trunk/t/test21-streval3.rdt Fri Jul 10 16:43:11 2009
@@ -24,13 +24,13 @@
  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 ]
-fid_fileinfo   2       call    3       main::foo       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   2       call    3       main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_fileinfo  2       eval    4       [ 1 1 ]
  fid_fileinfo  3       [ (eval 0)[(eval 0)[test21-streval3.p:17]:4] 2 4 3 2 0 
0 ]
-fid_fileinfo   3       call    3       main::foo       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   3       call    3       main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_fileinfo  3       eval    4       [ 1 0 ]
  fid_fileinfo  4       [ (eval 0)[(eval 0)[(eval 
0)[test21-streval3.p:17]:4]:4] 3  
4 4 2 0 0 ]
-fid_fileinfo   4       call    3       main::foo       [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   4       call    3       main::foo       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_line_time 1       4       [ 0 3 ]
  fid_line_time 1       5       [ 0 1 ]
  fid_line_time 1       17      0       0
@@ -50,6 +50,6 @@
  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 ]
-sub_subinfo    main::foo       called_by       4       3       [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::foo       called_by       2       3       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+sub_subinfo    main::foo       called_by       3       3       [ 1 0 0 0 0 0 0 
main::BEGIN ]
+sub_subinfo    main::foo       called_by       4       3       [ 1 0 0 0 0 0 0 
main::BEGIN ]

Modified: trunk/t/test22-strevala.rdt
==============================================================================
--- trunk/t/test22-strevala.rdt (original)
+++ trunk/t/test22-strevala.rdt Fri Jul 10 16:43:11 2009
@@ -27,8 +27,8 @@
  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       call    6       main::__ANON__[(eval 
0)[test22-strevala.p:6]:1] [ 1  
0 0 0 0 0 0 main::BEGIN ]
+fid_fileinfo   1       call    9       main::__ANON__[(eval 
0)[test22-strevala.p:9]:1] [ 2  
0 0 0 0 0 0 main::BEGIN ]
  fid_fileinfo  1       eval    6       [ 1 0 ]
  fid_fileinfo  1       eval    9       [ 2 0 ]
  fid_fileinfo  1       eval    12      [ 1 2 ]
@@ -39,7 +39,7 @@
  fid_fileinfo  4       [ (eval 0)[test22-strevala.p:9] 1 9 4 2 0 0 ]
  fid_fileinfo  4       sub     main::__ANON__[(eval 0)[test22-strevala.p:9]:1] 
1-1
  fid_fileinfo  5       [ (eval 0)[test22-strevala.p:12] 1 12 5 2 0 0 ]
-fid_fileinfo   5       call    2       main::__ANON__[(eval 0)[(eval  
0)[test22-strevala.p:12]:2]:1]  [ 2 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   5       call    2       main::__ANON__[(eval 0)[(eval  
0)[test22-strevala.p:12]:2]:1]  [ 2 0 0 0 0 0 0 main::BEGIN ]
  fid_fileinfo  5       eval    2       [ 2 0 ]
  fid_fileinfo  6       [ (eval 0)[(eval 0)[test22-strevala.p:12]:2] 5 2 6 2 0 
0 ]
  fid_fileinfo  6       sub     main::__ANON__[(eval 0)[(eval  
0)[test22-strevala.p:12]:2]:1]  1-1
@@ -76,8 +76,8 @@
  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)[(eval 0)[test22-strevala.p:12]:2]:1]    
 
called_by       5       2       [ 2 0 0 0 0 0 0 main::BEGIN ]
  sub_subinfo   main::__ANON__[(eval 0)[test22-strevala.p:6]:1] [ 2 1 1 1 0 0  
0 0 ]
-sub_subinfo    main::__ANON__[(eval 0)[test22-strevala.p:6]:1] called_by       
1       6        
[ 1 0 0 0 0 0 0 MAIN ]
+sub_subinfo    main::__ANON__[(eval 0)[test22-strevala.p:6]:1] called_by       
1       6        
[ 1 0 0 0 0 0 0 main::BEGIN ]
  sub_subinfo   main::__ANON__[(eval 0)[test22-strevala.p:9]:1] [ 3 1 1 2 0 0  
0 0 ]
-sub_subinfo    main::__ANON__[(eval 0)[test22-strevala.p:9]:1] called_by       
1       9        
[ 2 0 0 0 0 0 0 MAIN ]
+sub_subinfo    main::__ANON__[(eval 0)[test22-strevala.p:9]:1] called_by       
1       9        
[ 2 0 0 0 0 0 0 main::BEGIN ]

Modified: trunk/t/test30-fork-0.rdt
==============================================================================
--- trunk/t/test30-fork-0.rdt   (original)
+++ trunk/t/test30-fork-0.rdt   Fri Jul 10 16:43:11 2009
@@ -28,10 +28,10 @@
  fid_fileinfo  1       sub     main::prefork   1-4
  fid_fileinfo  1       call    3       main::other     [ 1 0 0 0 0 0 0 
main::prefork ]
  fid_fileinfo  1       call    12      main::other     [ 1 0 0 0 0 0 0 
main::postfork ]
-fid_fileinfo   1       call    15      main::prefork   [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    19      main::postfork  [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    20      main::other     [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    22      main::CORE:wait [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   1       call    15      main::prefork   [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    19      main::postfork  [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    20      main::other     [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    22      main::CORE:wait [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_line_time 1       2       [ 0 1 ]
  fid_line_time 1       3       [ 0 1 ]
  fid_line_time 1       7       [ 0 3 ]
@@ -55,12 +55,12 @@
  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::CORE:wait called_by       1       22      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::other     [ 1 6 8 3 0 0 0 0 ]
  sub_subinfo   main::other     called_by       1       3       [ 1 0 0 0 0 0 0 
main::prefork ]
  sub_subinfo   main::other     called_by       1       12      [ 1 0 0 0 0 0 0 
main::postfork ]
-sub_subinfo    main::other     called_by       1       20      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::other     called_by       1       20      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::postfork  [ 1 10 13 1 0 0 0 0 ]
-sub_subinfo    main::postfork  called_by       1       19      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::postfork  called_by       1       19      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::prefork   [ 1 1 4 1 0 0 0 0 ]
-sub_subinfo    main::prefork   called_by       1       15      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::prefork   called_by       1       15      [ 1 0 0 0 0 0 0 
main::BEGIN ]

Modified: trunk/t/test40pmc.rdt
==============================================================================
--- trunk/t/test40pmc.rdt       (original)
+++ trunk/t/test40pmc.rdt       Fri Jul 10 16:43:11 2009
@@ -16,7 +16,7 @@
  fid_block_time        2       6       [ 0 1 ]
  fid_fileinfo  1       [ test40pmc.p   1 2 0 0 ]
  fid_fileinfo  1       sub     main::BEGIN     3-3
-fid_fileinfo   1       call    4       test40pmc::foo  [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   1       call    4       test40pmc::foo  [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_fileinfo  2       [ test40pmc.pm   2 3 0 0 ]
  fid_fileinfo  2       sub     test40pmc::foo  5-7
  fid_line_time 1       4       [ 0 1 ]
@@ -28,4 +28,4 @@
  profile_modes fid_sub_time    sub
  sub_subinfo   main::BEGIN     [ 1 3 3 0 0 0 0 0 ]
  sub_subinfo   test40pmc::foo  [ 2 5 7 1 0 0 0 0 ]
-sub_subinfo    test40pmc::foo  called_by       1       4       [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    test40pmc::foo  called_by       1       4       [ 1 0 0 0 0 0 0 
main::BEGIN ]

Modified: trunk/t/test50-disable.rdt
==============================================================================
--- trunk/t/test50-disable.rdt  (original)
+++ trunk/t/test50-disable.rdt  Fri Jul 10 16:43:11 2009
@@ -18,8 +18,8 @@
  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_fileinfo   1       call    2       DB::disable_profile     [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    6       DB::disable_profile     [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_line_time 1       1       [ 0 1 ]
  fid_line_time 1       2       [ 0 1 ]
  fid_line_time 1       4       [ 0 1 ]
@@ -32,6 +32,6 @@
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
  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    DB::disable_profile     called_by       1       2       [ 1 0 0 
0 0 0 0 main::BEGIN ]
+sub_subinfo    DB::disable_profile     called_by       1       6       [ 1 0 0 
0 0 0 0 main::BEGIN ]
  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:43:11 2009
@@ -21,8 +21,8 @@
  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       call    9       main::sub1      [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    11      DB::disable_profile     [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_fileinfo  1       eval    7       [ 2 0 ]
  fid_fileinfo  2       [ (eval 0)[test51-enable.p:7] 1 7 2 2 0 0 ]
  fid_fileinfo  2       sub     main::sub1      1-1
@@ -46,8 +46,8 @@
  profile_modes fid_line_time   line
  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    DB::disable_profile     called_by       1       11      [ 1 0 0 
0 0 0 0 main::BEGIN  
]
  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::sub1      called_by       1       9       [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::sub9      [ 3 1 1 0 0 0 0 0 ]

Modified: trunk/t/test60-subname.rdt
==============================================================================
--- trunk/t/test60-subname.rdt  (original)
+++ trunk/t/test60-subname.rdt  Fri Jul 10 16:43:11 2009
@@ -26,13 +26,13 @@
  fid_fileinfo  1       sub     main::BEGIN     2-2
  fid_fileinfo  1       sub     main::CORE:wait 0-0
  fid_fileinfo  1       sub     main::launch    27-27
-fid_fileinfo   1       call    5       Devel::NYTProf::Test::example_xsub      
[ 1 0 0 0 0 0 0  
MAIN ]
-fid_fileinfo   1       call    9       Devel::NYTProf::Test::example_xsub      
[ 1 0 0 0 0 0 0  
MAIN ]
-fid_fileinfo   1       call    12      Devel::NYTProf::Test::example_xsub      
[ 1 0 0 0 0 0 0  
MAIN ]
-fid_fileinfo   1       call    16      Devel::NYTProf::Test::example_xsub      
[ 1 0 0 0 0 0 0  
MAIN ]
-fid_fileinfo   1       call    19      Devel::NYTProf::Test::example_xsub      
[ 1 0 0 0 0 0 0  
MAIN ]
-fid_fileinfo   1       call    22      main::CORE:wait [ 1 0 0 0 0 0 0 MAIN ]
-fid_fileinfo   1       call    28      main::launch    [ 1 0 0 0 0 0 0 MAIN ]
+fid_fileinfo   1       call    5       Devel::NYTProf::Test::example_xsub      
[ 1 0 0 0 0 0 0  
main::BEGIN ]
+fid_fileinfo   1       call    9       Devel::NYTProf::Test::example_xsub      
[ 1 0 0 0 0 0 0  
main::BEGIN ]
+fid_fileinfo   1       call    12      Devel::NYTProf::Test::example_xsub      
[ 1 0 0 0 0 0 0  
main::BEGIN ]
+fid_fileinfo   1       call    16      Devel::NYTProf::Test::example_xsub      
[ 1 0 0 0 0 0 0  
main::BEGIN ]
+fid_fileinfo   1       call    19      Devel::NYTProf::Test::example_xsub      
[ 1 0 0 0 0 0 0  
main::BEGIN ]
+fid_fileinfo   1       call    22      main::CORE:wait [ 1 0 0 0 0 0 0 
main::BEGIN ]
+fid_fileinfo   1       call    28      main::launch    [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_fileinfo  2       [ Devel/NYTProf/Test.pm   2 4 0 0 ]
  fid_fileinfo  2       sub     Devel::NYTProf::Test::example_sub       13-13
  fid_fileinfo  2       sub     Devel::NYTProf::Test::example_xsub      0-0
@@ -61,13 +61,13 @@
  profile_modes fid_sub_time    sub
  sub_subinfo   Devel::NYTProf::Test::example_sub       [ 2 13 13 0 0 0 0 0 ]
  sub_subinfo   Devel::NYTProf::Test::example_xsub      [ 2 0 0 5 0 0 0 0 ]
-sub_subinfo    Devel::NYTProf::Test::example_xsub      called_by       1       
5       [ 1 0 0 0 0 0  
0 MAIN ]
-sub_subinfo    Devel::NYTProf::Test::example_xsub      called_by       1       
9       [ 1 0 0 0 0 0  
0 MAIN ]
-sub_subinfo    Devel::NYTProf::Test::example_xsub      called_by       1       
12      [ 1 0 0 0 0  
0 0 MAIN ]
-sub_subinfo    Devel::NYTProf::Test::example_xsub      called_by       1       
16      [ 1 0 0 0 0  
0 0 MAIN ]
-sub_subinfo    Devel::NYTProf::Test::example_xsub      called_by       1       
19      [ 1 0 0 0 0  
0 0 MAIN ]
+sub_subinfo    Devel::NYTProf::Test::example_xsub      called_by       1       
5       [ 1 0 0 0 0 0  
0 main::BEGIN ]
+sub_subinfo    Devel::NYTProf::Test::example_xsub      called_by       1       
9       [ 1 0 0 0 0 0  
0 main::BEGIN ]
+sub_subinfo    Devel::NYTProf::Test::example_xsub      called_by       1       
12      [ 1 0 0 0 0  
0 0 main::BEGIN ]
+sub_subinfo    Devel::NYTProf::Test::example_xsub      called_by       1       
16      [ 1 0 0 0 0  
0 0 main::BEGIN ]
+sub_subinfo    Devel::NYTProf::Test::example_xsub      called_by       1       
19      [ 1 0 0 0 0  
0 0 main::BEGIN ]
  sub_subinfo   main::BEGIN     [ 1 2 2 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::CORE:wait called_by       1       22      [ 1 0 0 0 0 0 0 
main::BEGIN ]
  sub_subinfo   main::launch    [ 1 27 27 1 0 0 0 0 ]
-sub_subinfo    main::launch    called_by       1       28      [ 1 0 0 0 0 0 0 
MAIN ]
+sub_subinfo    main::launch    called_by       1       28      [ 1 0 0 0 0 0 0 
main::BEGIN ]

Modified: trunk/t/test61-submerge.rdt
==============================================================================
--- trunk/t/test61-submerge.rdt (original)
+++ trunk/t/test61-submerge.rdt Fri Jul 10 16:43:11 2009
@@ -21,7 +21,7 @@
  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       call    8       main::__ANON__[(eval 
0)[test61-submerge.p:8]:1] [ 3  
0 0 0 0 0 0 main::BEGIN ]
  fid_fileinfo  1       eval    8       [ 3 0 ]
  fid_fileinfo  2       [ (eval 0)[test61-submerge.p:8] 1 8 2 2 0 0 ]
  fid_fileinfo  2       sub     main::__ANON__[(eval 0)[test61-submerge.p:8]:1] 
1-1
@@ -49,7 +49,7 @@
  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::__ANON__[(eval 0)[test61-submerge.p:8]:1] called_by       
1       8        
[ 3 0 0 0 0 0 0 main::BEGIN ]
  sub_subinfo   main::foo       [ 1 4 4 3 0 0 0 0 ]
  sub_subinfo   main::foo       called_by       2       1       [ 1 0 0 0 0 0 0 
main::__ANON__[(eval  
0)[test61-submerge.p:8]:1] ]
  sub_subinfo   main::foo       called_by       3       1       [ 1 0 0 0 0 0 0 
main::__ANON__[(eval  
0)[test61-submerge.p:8]:1] ]

Modified: trunk/t/test80-recurs.rdt
==============================================================================
--- trunk/t/test80-recurs.rdt   (original)
+++ trunk/t/test80-recurs.rdt   Fri Jul 10 16:43:11 2009
@@ -18,7 +18,7 @@
  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 ]
+fid_fileinfo   1       call    7       main::recurs    [ 1 0 0 0 0 0 0 
main::BEGIN ]
  fid_line_time 1       2       [ 0 3 ]
  fid_line_time 1       3       [ 0 3 ]
  fid_line_time 1       4       [ 0 3 ]
@@ -31,4 +31,4 @@
  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 ]
+sub_subinfo    main::recurs    called_by       1       7       [ 1 0 0 0 0 0 0 
main::BEGIN ]

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