Revision: 1263
Author: [email protected]
Date: Tue Jun  1 13:42:18 2010
Log: Revert to disabling normalizing eval numbers - subs much be kept distinct and merged later.

http://code.google.com/p/perl-devel-nytprof/source/detail?r=1263

Modified:
 /trunk/NYTProf.xs
 /trunk/t/test22-strevala.rdt
 /trunk/t/test24-strevalc.rdt
 /trunk/t/test61-submerge.rdt

=======================================
--- /trunk/NYTProf.xs   Tue Jun  1 06:18:12 2010
+++ /trunk/NYTProf.xs   Tue Jun  1 13:42:18 2010
@@ -3489,6 +3489,8 @@
     char *start = SvPV(sv, len);
     char *first_space;

+    return; /* disabled, again */
+
     /* effectively does
        s/(
           \(                  # first character is literal (
=======================================
--- /trunk/t/test22-strevala.rdt        Tue Jun  1 04:28:28 2010
+++ /trunk/t/test22-strevala.rdt        Tue Jun  1 13:42:18 2010
@@ -32,29 +32,31 @@
 fid_fileinfo   1       sub     main::BEGIN     0-0
 fid_fileinfo   1       sub     main::CORE:print        0-0
 fid_fileinfo   1       sub     main::RUNTIME   1-1
-fid_fileinfo 1 call 6 main::__ANON__[(eval 0)[test22-strevala.p:6]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ] -fid_fileinfo 1 call 9 main::__ANON__[(eval 0)[test22-strevala.p:9]:1] [ 2 0 0 0 0 0 0 main::RUNTIME ] +fid_fileinfo 1 call 6 main::__ANON__[(eval 1)[test22-strevala.p:6]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ] +fid_fileinfo 1 call 9 main::__ANON__[(eval 2)[test22-strevala.p:9]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ] +fid_fileinfo 1 call 9 main::__ANON__[(eval 3)[test22-strevala.p:9]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ]
 fid_fileinfo   1       eval    6       [ count 1 nested 0 merged 0 ]
 fid_fileinfo   1       eval    9       [ count 2 nested 0 merged 0 ]
 fid_fileinfo   1       eval    12      [ count 1 nested 2 merged 0 ]
 fid_fileinfo   2       [ (eval 1)[test22-strevala.p:6] 1 6 2 2 0 0 ]
-fid_fileinfo   2       sub     main::__ANON__[(eval 0)[test22-strevala.p:6]:1] 
1-1
-fid_fileinfo 2 call 1 main::CORE:print [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[test22-strevala.p:6]:1] ]
+fid_fileinfo   2       sub     main::__ANON__[(eval 1)[test22-strevala.p:6]:1] 
1-1
+fid_fileinfo 2 call 1 main::CORE:print [ 1 0 0 0 0 0 0 main::__ANON__[(eval 1)[test22-strevala.p:6]:1] ]
 fid_fileinfo   3       [ (eval 2)[test22-strevala.p:9] 1 9 3 2 0 0 ]
-fid_fileinfo   3       sub     main::__ANON__[(eval 0)[test22-strevala.p:9]:1] 
1-1
-fid_fileinfo 3 call 1 main::CORE:print [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[test22-strevala.p:9]:1] ]
+fid_fileinfo   3       sub     main::__ANON__[(eval 2)[test22-strevala.p:9]:1] 
1-1
+fid_fileinfo 3 call 1 main::CORE:print [ 1 0 0 0 0 0 0 main::__ANON__[(eval 2)[test22-strevala.p:9]:1] ]
 fid_fileinfo   4       [ (eval 3)[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 4 call 1 main::CORE:print [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[test22-strevala.p:9]:1] ]
+fid_fileinfo   4       sub     main::__ANON__[(eval 3)[test22-strevala.p:9]:1] 
1-1
+fid_fileinfo 4 call 1 main::CORE:print [ 1 0 0 0 0 0 0 main::__ANON__[(eval 3)[test22-strevala.p:9]:1] ]
 fid_fileinfo   5       [ (eval 4)[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::RUNTIME ] +fid_fileinfo 5 call 2 main::__ANON__[(eval 5)[(eval 4)[test22-strevala.p:12]:2]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ] +fid_fileinfo 5 call 2 main::__ANON__[(eval 6)[(eval 4)[test22-strevala.p:12]:2]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ]
 fid_fileinfo   5       eval    2       [ count 2 nested 0 merged 0 ]
 fid_fileinfo   6       [ (eval 5)[(eval 4)[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 -fid_fileinfo 6 call 1 main::CORE:print [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[(eval 0)[test22-strevala.p:12]:2]:1] ] +fid_fileinfo 6 sub main::__ANON__[(eval 5)[(eval 4)[test22-strevala.p:12]:2]:1] 1-1 +fid_fileinfo 6 call 1 main::CORE:print [ 1 0 0 0 0 0 0 main::__ANON__[(eval 5)[(eval 4)[test22-strevala.p:12]:2]:1] ]
 fid_fileinfo   7       [ (eval 6)[(eval 4)[test22-strevala.p:12]:2] 5 2 7 2 0 
0 ]
-fid_fileinfo 7 sub main::__ANON__[(eval 0)[(eval 0)[test22-strevala.p:12]:2]:1] 1-1 -fid_fileinfo 7 call 1 main::CORE:print [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[(eval 0)[test22-strevala.p:12]:2]:1] ] +fid_fileinfo 7 sub main::__ANON__[(eval 6)[(eval 4)[test22-strevala.p:12]:2]:1] 1-1 +fid_fileinfo 7 call 1 main::CORE:print [ 1 0 0 0 0 0 0 main::__ANON__[(eval 6)[(eval 4)[test22-strevala.p:12]:2]:1] ]
 fid_line_time  1       3       [ 0 1 ]
 fid_line_time  1       6       [ 0 1 ]
 fid_line_time  1       9       [ 0 2 ]
@@ -90,15 +92,19 @@
 profile_modes  fid_sub_time    sub
 sub_subinfo    main::BEGIN     [ 1:0-0 calls 0 times 0 0 0 0 ]
 sub_subinfo    main::CORE:print        [ 1:0-0 calls 5 times 0 0 0 0 ]
-sub_subinfo main::CORE:print called_by 2:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[test22-strevala.p:6]:1] ] -sub_subinfo main::CORE:print called_by 3:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[test22-strevala.p:9]:1] ] -sub_subinfo main::CORE:print called_by 4:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[test22-strevala.p:9]:1] ] -sub_subinfo main::CORE:print called_by 6:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[(eval 0)[test22-strevala.p:12]:2]:1] ] -sub_subinfo main::CORE:print called_by 7:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[(eval 0)[test22-strevala.p:12]:2]:1] ] +sub_subinfo main::CORE:print called_by 2:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 1)[test22-strevala.p:6]:1] ] +sub_subinfo main::CORE:print called_by 3:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 2)[test22-strevala.p:9]:1] ] +sub_subinfo main::CORE:print called_by 4:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 3)[test22-strevala.p:9]:1] ] +sub_subinfo main::CORE:print called_by 6:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 5)[(eval 4)[test22-strevala.p:12]:2]:1] ] +sub_subinfo main::CORE:print called_by 7:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 6)[(eval 4)[test22-strevala.p:12]:2]:1] ]
 sub_subinfo    main::RUNTIME   [ 1:1-1 calls 0 times 0 0 0 0 ]
-sub_subinfo main::__ANON__[(eval 0)[(eval 0)[test22-strevala.p:12]:2]:1] [ 6:1-1 calls 2 times 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::RUNTIME ] -sub_subinfo main::__ANON__[(eval 0)[test22-strevala.p:6]:1] [ 2:1-1 calls 1 times 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::RUNTIME ] -sub_subinfo main::__ANON__[(eval 0)[test22-strevala.p:9]:1] [ 3:1-1 calls 2 times 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::RUNTIME ] +sub_subinfo main::__ANON__[(eval 1)[test22-strevala.p:6]:1] [ 2:1-1 calls 1 times 0 0 0 0 ] +sub_subinfo main::__ANON__[(eval 1)[test22-strevala.p:6]:1] called_by 1:6 [ 1 0 0 0 0 0 0 main::RUNTIME ] +sub_subinfo main::__ANON__[(eval 2)[test22-strevala.p:9]:1] [ 3:1-1 calls 1 times 0 0 0 0 ] +sub_subinfo main::__ANON__[(eval 2)[test22-strevala.p:9]:1] called_by 1:9 [ 1 0 0 0 0 0 0 main::RUNTIME ] +sub_subinfo main::__ANON__[(eval 3)[test22-strevala.p:9]:1] [ 4:1-1 calls 1 times 0 0 0 0 ] +sub_subinfo main::__ANON__[(eval 3)[test22-strevala.p:9]:1] called_by 1:9 [ 1 0 0 0 0 0 0 main::RUNTIME ] +sub_subinfo main::__ANON__[(eval 5)[(eval 4)[test22-strevala.p:12]:2]:1] [ 6:1-1 calls 1 times 0 0 0 0 ] +sub_subinfo main::__ANON__[(eval 5)[(eval 4)[test22-strevala.p:12]:2]:1] called_by 5:2 [ 1 0 0 0 0 0 0 main::RUNTIME ] +sub_subinfo main::__ANON__[(eval 6)[(eval 4)[test22-strevala.p:12]:2]:1] [ 7:1-1 calls 1 times 0 0 0 0 ] +sub_subinfo main::__ANON__[(eval 6)[(eval 4)[test22-strevala.p:12]:2]:1] called_by 5:2 [ 1 0 0 0 0 0 0 main::RUNTIME ]
=======================================
--- /trunk/t/test24-strevalc.rdt        Tue Jun  1 04:28:28 2010
+++ /trunk/t/test24-strevalc.rdt        Tue Jun  1 13:42:18 2010
@@ -35,11 +35,11 @@
 fid_fileinfo   6       eval    1       [ count 1 nested 0 merged 0 ]
 fid_fileinfo   7       [ (eval 6)[(eval 5)[test24-strevalc.p:8]:1] 6 1 7 2 0 0 
]
 fid_fileinfo   8       [ (eval 7)[test24-strevalc.p:8] 1 8 8 2 0 0 ]
-fid_fileinfo   8       sub     main::__ANON__[(eval 0)[test24-strevalc.p:8]:1] 
1-1
-fid_fileinfo 8 call 1 main::__ANON__[(eval 0)[test24-strevalc.p:8]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ]
+fid_fileinfo   8       sub     main::__ANON__[(eval 7)[test24-strevalc.p:8]:1] 
1-1
+fid_fileinfo 8 call 1 main::__ANON__[(eval 7)[test24-strevalc.p:8]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ]
 fid_fileinfo   9       [ (eval 8)[test24-strevalc.p:8] 1 8 9 2 0 0 ]
-fid_fileinfo   9       sub     main::__ANON__[(eval 0)[test24-strevalc.p:8]:1] 
1-1
-fid_fileinfo 9 call 1 main::__ANON__[(eval 0)[test24-strevalc.p:8]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ]
+fid_fileinfo   9       sub     main::__ANON__[(eval 8)[test24-strevalc.p:8]:1] 
1-1
+fid_fileinfo 9 call 1 main::__ANON__[(eval 8)[test24-strevalc.p:8]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ]
 fid_line_time  1       2       [ 0 1 ]
 fid_line_time  1       7       [ 0 1 ]
 fid_line_time  1       8       [ 0 6 ]
@@ -65,6 +65,7 @@
 profile_modes  fid_sub_time    sub
 sub_subinfo    main::BEGIN     [ 1:0-0 calls 0 times 0 0 0 0 ]
 sub_subinfo    main::RUNTIME   [ 1:1-1 calls 0 times 0 0 0 0 ]
-sub_subinfo main::__ANON__[(eval 0)[test24-strevalc.p:8]:1] [ 8:1-1 calls 2 times 0 0 0 0 ] -sub_subinfo main::__ANON__[(eval 0)[test24-strevalc.p:8]:1] called_by 8:1 [ 1 0 0 0 0 0 0 main::RUNTIME ] -sub_subinfo main::__ANON__[(eval 0)[test24-strevalc.p:8]:1] called_by 9:1 [ 1 0 0 0 0 0 0 main::RUNTIME ] +sub_subinfo main::__ANON__[(eval 7)[test24-strevalc.p:8]:1] [ 8:1-1 calls 1 times 0 0 0 0 ] +sub_subinfo main::__ANON__[(eval 7)[test24-strevalc.p:8]:1] called_by 8:1 [ 1 0 0 0 0 0 0 main::RUNTIME ] +sub_subinfo main::__ANON__[(eval 8)[test24-strevalc.p:8]:1] [ 9:1-1 calls 1 times 0 0 0 0 ] +sub_subinfo main::__ANON__[(eval 8)[test24-strevalc.p:8]:1] called_by 9:1 [ 1 0 0 0 0 0 0 main::RUNTIME ]
=======================================
--- /trunk/t/test61-submerge.rdt        Tue Jun  1 04:28:28 2010
+++ /trunk/t/test61-submerge.rdt        Tue Jun  1 13:42:18 2010
@@ -28,17 +28,19 @@
 fid_fileinfo   1       sub     main::RUNTIME   1-1
 fid_fileinfo   1       sub     main::foo       4-4
 fid_fileinfo   1       call    4       main::CORE:print        [ 3 0 0 0 0 0 0 
main::foo ]
-fid_fileinfo 1 call 8 main::__ANON__[(eval 0)[test61-submerge.p:8]:1] [ 3 0 0 0 0 0 0 main::RUNTIME ] +fid_fileinfo 1 call 8 main::__ANON__[(eval 1)[test61-submerge.p:8]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ] +fid_fileinfo 1 call 8 main::__ANON__[(eval 2)[test61-submerge.p:8]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ] +fid_fileinfo 1 call 8 main::__ANON__[(eval 3)[test61-submerge.p:8]:1] [ 1 0 0 0 0 0 0 main::RUNTIME ]
 fid_fileinfo   1       eval    8       [ count 3 nested 0 merged 0 ]
 fid_fileinfo   2       [ (eval 1)[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
-fid_fileinfo 2 call 1 main::foo [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[test61-submerge.p:8]:1] ]
+fid_fileinfo   2       sub     main::__ANON__[(eval 1)[test61-submerge.p:8]:1] 
1-1
+fid_fileinfo 2 call 1 main::foo [ 1 0 0 0 0 0 0 main::__ANON__[(eval 1)[test61-submerge.p:8]:1] ]
 fid_fileinfo   3       [ (eval 2)[test61-submerge.p:8] 1 8 3 2 0 0 ]
-fid_fileinfo   3       sub     main::__ANON__[(eval 0)[test61-submerge.p:8]:1] 
1-1
-fid_fileinfo 3 call 1 main::foo [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[test61-submerge.p:8]:1] ]
+fid_fileinfo   3       sub     main::__ANON__[(eval 2)[test61-submerge.p:8]:1] 
1-1
+fid_fileinfo 3 call 1 main::foo [ 1 0 0 0 0 0 0 main::__ANON__[(eval 2)[test61-submerge.p:8]:1] ]
 fid_fileinfo   4       [ (eval 3)[test61-submerge.p:8] 1 8 4 2 0 0 ]
-fid_fileinfo   4       sub     main::__ANON__[(eval 0)[test61-submerge.p:8]:1] 
1-1
-fid_fileinfo 4 call 1 main::foo [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[test61-submerge.p:8]:1] ]
+fid_fileinfo   4       sub     main::__ANON__[(eval 3)[test61-submerge.p:8]:1] 
1-1
+fid_fileinfo 4 call 1 main::foo [ 1 0 0 0 0 0 0 main::__ANON__[(eval 3)[test61-submerge.p:8]:1] ]
 fid_line_time  1       4       [ 0 3 ]
 fid_line_time  1       6       [ 0 1 ]
 fid_line_time  1       8       [ 0 2 ]
@@ -64,9 +66,13 @@
 sub_subinfo    main::CORE:print        [ 1:0-0 calls 3 times 0 0 0 0 ]
 sub_subinfo    main::CORE:print        called_by       1:4     [ 3 0 0 0 0 0 0 
main::foo ]
 sub_subinfo    main::RUNTIME   [ 1:1-1 calls 0 times 0 0 0 0 ]
-sub_subinfo main::__ANON__[(eval 0)[test61-submerge.p:8]:1] [ 2:1-1 calls 3 times 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::RUNTIME ] +sub_subinfo main::__ANON__[(eval 1)[test61-submerge.p:8]:1] [ 2:1-1 calls 1 times 0 0 0 0 ] +sub_subinfo main::__ANON__[(eval 1)[test61-submerge.p:8]:1] called_by 1:8 [ 1 0 0 0 0 0 0 main::RUNTIME ] +sub_subinfo main::__ANON__[(eval 2)[test61-submerge.p:8]:1] [ 3:1-1 calls 1 times 0 0 0 0 ] +sub_subinfo main::__ANON__[(eval 2)[test61-submerge.p:8]:1] called_by 1:8 [ 1 0 0 0 0 0 0 main::RUNTIME ] +sub_subinfo main::__ANON__[(eval 3)[test61-submerge.p:8]:1] [ 4:1-1 calls 1 times 0 0 0 0 ] +sub_subinfo main::__ANON__[(eval 3)[test61-submerge.p:8]:1] called_by 1:8 [ 1 0 0 0 0 0 0 main::RUNTIME ]
 sub_subinfo    main::foo       [ 1:4-4 calls 3 times 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] ] -sub_subinfo main::foo called_by 4:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[test61-submerge.p:8]:1] ] +sub_subinfo main::foo called_by 2:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 1)[test61-submerge.p:8]:1] ] +sub_subinfo main::foo called_by 3:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 2)[test61-submerge.p:8]:1] ] +sub_subinfo main::foo called_by 4:1 [ 1 0 0 0 0 0 0 main::__ANON__[(eval 3)[test61-submerge.p:8]:1] ]

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