Revision: 1191
Author: [email protected]
Date: Wed Apr 21 04:41:03 2010
Log: Make eval dump info more descrptive. Sync golden test results
http://code.google.com/p/perl-devel-nytprof/source/detail?r=1191
Modified:
/trunk/lib/Devel/NYTProf/FileInfo.pm
/trunk/t/test08.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/test23-strevall.rdt
/trunk/t/test51-enable.rdt
/trunk/t/test61-submerge.rdt
=======================================
--- /trunk/lib/Devel/NYTProf/FileInfo.pm Wed Apr 21 04:38:30 2010
+++ /trunk/lib/Devel/NYTProf/FileInfo.pm Wed Apr 21 04:41:03 2010
@@ -455,13 +455,12 @@
my @has_evals = map { $_->has_evals(1) } @$eval_fis;
my @merged_fids = map { @{ $_->meta->{merged_fids}||[]} }
@$eval_fis;
- #printf $fh "%s%s%s%d%s[ count %d nested %d merged %d ]\n",
- printf $fh "%s%s%s%d%s[ %s %s ]\n",
+ printf $fh "%s%s%s%d%s[ count %d nested %d merged %d ]\n",
$prefix, 'eval', $separator,
$eval_fis->[0]->eval_line, $separator,
scalar @$eval_fis, # count of evals executed on this line
scalar @has_evals, # count of nested evals they executed
- #scalar @merged_fids, # count of evals merged (collapsed)
away
+ scalar @merged_fids, # count of evals merged (collapsed)
away
}
}
=======================================
--- /trunk/t/test08.rdt Mon Apr 5 16:22:16 2010
+++ /trunk/t/test08.rdt Wed Apr 21 04:41:03 2010
@@ -18,7 +18,7 @@
fid_block_time 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 1 eval 1 [ count 1 nested 0 merged 0 ]
fid_fileinfo 2 [ (eval 0)[test08.p:1] 1 1 2 2 0 0 ]
fid_line_time 1 1 [ 0 1 ]
fid_line_time 2 1 [ 0 1 ]
=======================================
--- /trunk/t/test09.rdt Wed Apr 21 04:38:30 2010
+++ /trunk/t/test09.rdt Wed Apr 21 04:41:03 2010
@@ -30,8 +30,8 @@
fid_fileinfo 1 call 11 main::foo [ 1 0 0 0 0 0 0
main::RUNTIME ]
fid_fileinfo 1 call 12 main::foo [ 1 0 0 0 0 0 0
main::RUNTIME ]
fid_fileinfo 1 call 13 main::bar [ 1 0 0 0 0 0 0
main::RUNTIME ]
-fid_fileinfo 1 eval 2 [ 1 0 ]
-fid_fileinfo 1 eval 8 [ 1 0 ]
+fid_fileinfo 1 eval 2 [ count 1 nested 0 merged 1 ]
+fid_fileinfo 1 eval 8 [ count 1 nested 0 merged 2 ]
fid_fileinfo 2 [ (eval 0)[test09.p:2] 1 2 2 2 0 0 ]
fid_fileinfo 2 call 3 main::bar [ 2 0 0 0 0 0 0
main::foo ]
fid_fileinfo 3 [ (eval 0)[test09.p:8] 1 8 3 2 0 0 ]
=======================================
--- /trunk/t/test10.rdt Mon Apr 5 16:22:16 2010
+++ /trunk/t/test10.rdt Wed Apr 21 04:41:03 2010
@@ -22,7 +22,7 @@
fid_fileinfo 1 sub main::CORE:sleep 0-0
fid_fileinfo 1 sub main::RUNTIME 1-1
fid_fileinfo 1 call 2 main::__ANON__[(eval 0)[test10.p:1]:1] [ 1 0 0 0 0 0
0 main::RUNTIME ]
-fid_fileinfo 1 eval 1 [ 1 0 ]
+fid_fileinfo 1 eval 1 [ count 1 nested 0 merged 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
fid_fileinfo 2 call 1 main::CORE:sleep [ 1 0 0 0 0 0 0
main::__ANON__[(eval 0)[test10.p:1]:1] ]
=======================================
--- /trunk/t/test11.rdt Mon Apr 5 16:22:16 2010
+++ /trunk/t/test11.rdt Wed Apr 21 04:41:03 2010
@@ -21,7 +21,7 @@
fid_fileinfo 1 sub main::RUNTIME 1-1
fid_fileinfo 1 call 5 main::__ANON__[(eval 0)[test11.p:3]:1] [ 1 0 0 0 0 0
0 main::RUNTIME ]
fid_fileinfo 1 call 6 main::__ANON__[(eval 0)[test11.p:3]:1] [ 1 0 0 0 0 0
0 main::RUNTIME ]
-fid_fileinfo 1 eval 3 [ 1 0 ]
+fid_fileinfo 1 eval 3 [ count 1 nested 0 merged 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
fid_line_time 1 5 [ 0 1 ]
=======================================
--- /trunk/t/test13.rdt Mon Apr 5 16:22:16 2010
+++ /trunk/t/test13.rdt Wed Apr 21 04:41:03 2010
@@ -37,7 +37,7 @@
fid_fileinfo 1 call 15 main::x [ 1 0 0 0 0 0 0 main::baz ]
fid_fileinfo 1 call 20 main::bar [ 1 0 0 0 0 0 0
main::RUNTIME ]
fid_fileinfo 1 call 21 main::baz [ 1 0 0 0 0 0 0
main::RUNTIME ]
-fid_fileinfo 1 eval 19 [ 1 0 ]
+fid_fileinfo 1 eval 19 [ count 1 nested 0 merged 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::RUNTIME ]
fid_line_time 1 4 [ 0 3 ]
=======================================
--- /trunk/t/test14.rdt Sun Apr 18 09:17:15 2010
+++ /trunk/t/test14.rdt Wed Apr 21 04:41:03 2010
@@ -32,7 +32,7 @@
fid_fileinfo 2 sub test14::bar 16-18
fid_fileinfo 2 sub test14::foo 12-14
fid_fileinfo 2 sub test14::pre 8-8
-fid_fileinfo 2 eval 17 [ 1 0 ]
+fid_fileinfo 2 eval 17 [ count 1 nested 0 merged 0 ]
fid_fileinfo 3 [ AutoLoader.pm 3 2 0 0 ]
fid_fileinfo 4 [ (eval 0)[test14.pm (autosplit into
auto/test14/bar.al):17] 2 17 4 2 0 0 ]
fid_line_time 1 17 [ 0 1 ]
=======================================
--- /trunk/t/test20-streval.rdt Wed Apr 21 04:38:30 2010
+++ /trunk/t/test20-streval.rdt Wed Apr 21 04:41:03 2010
@@ -28,15 +28,15 @@
fid_fileinfo 1 sub main::RUNTIME 1-1
fid_fileinfo 1 sub main::foo 3-3
fid_fileinfo 1 call 3 main::CORE:print [ 4 0 0 0 0 0 0
main::foo ]
-fid_fileinfo 1 eval 8 [ 1 0 ]
-fid_fileinfo 1 eval 11 [ 1 0 ]
-fid_fileinfo 1 eval 14 [ 1 1 ]
+fid_fileinfo 1 eval 8 [ count 1 nested 0 merged 0 ]
+fid_fileinfo 1 eval 11 [ count 1 nested 0 merged 1 ]
+fid_fileinfo 1 eval 14 [ count 1 nested 1 merged 0 ]
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::RUNTIME ]
fid_fileinfo 3 [ (eval 0)[test20-streval.p:11] 1 11 3 2 0 0 ]
fid_fileinfo 3 call 1 main::foo [ 2 0 0 0 0 0 0
main::RUNTIME ]
fid_fileinfo 5 [ (eval 0)[test20-streval.p:14] 1 14 5 2 0 0 ]
-fid_fileinfo 5 eval 1 [ 1 0 ]
+fid_fileinfo 5 eval 1 [ count 1 nested 0 merged 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::RUNTIME ]
fid_line_time 1 3 [ 0 4 ]
=======================================
--- /trunk/t/test21-streval3.rdt Mon Apr 5 16:22:16 2010
+++ /trunk/t/test21-streval3.rdt Wed Apr 21 04:41:03 2010
@@ -29,15 +29,15 @@
fid_fileinfo 1 sub main::CORE:sselect 0-0
fid_fileinfo 1 sub main::RUNTIME 1-1
fid_fileinfo 1 sub main::foo 4-4
-fid_fileinfo 1 eval 17 [ 1 2 ]
+fid_fileinfo 1 eval 17 [ count 1 nested 2 merged 0 ]
fid_fileinfo 2 [ (eval 0)[test21-streval3.p:17] 1 17 2 2 0 0 ]
fid_fileinfo 2 call 2 main::CORE:sselect [ 1 0 0 0 0 0 0
main::RUNTIME ]
fid_fileinfo 2 call 3 main::foo [ 1 0 0 0 0 0 0
main::RUNTIME ]
-fid_fileinfo 2 eval 4 [ 1 1 ]
+fid_fileinfo 2 eval 4 [ count 1 nested 1 merged 0 ]
fid_fileinfo 3 [ (eval 0)[(eval 0)[test21-streval3.p:17]:4] 2 4 3 2 0
0 ]
fid_fileinfo 3 call 2 main::CORE:sselect [ 1 0 0 0 0 0 0
main::RUNTIME ]
fid_fileinfo 3 call 3 main::foo [ 1 0 0 0 0 0 0
main::RUNTIME ]
-fid_fileinfo 3 eval 4 [ 1 0 ]
+fid_fileinfo 3 eval 4 [ count 1 nested 0 merged 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 2 main::CORE:sselect [ 1 0 0 0 0 0 0
main::RUNTIME ]
fid_fileinfo 4 call 3 main::foo [ 1 0 0 0 0 0 0
main::RUNTIME ]
=======================================
--- /trunk/t/test22-strevala.rdt Mon Apr 5 16:22:16 2010
+++ /trunk/t/test22-strevala.rdt Wed Apr 21 04:41:03 2010
@@ -34,9 +34,9 @@
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 eval 6 [ 1 0 ]
-fid_fileinfo 1 eval 9 [ 2 0 ]
-fid_fileinfo 1 eval 12 [ 1 2 ]
+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 0)[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] ]
@@ -48,7 +48,7 @@
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 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::RUNTIME ]
-fid_fileinfo 5 eval 2 [ 2 0 ]
+fid_fileinfo 5 eval 2 [ count 2 nested 0 merged 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
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] ]
=======================================
--- /trunk/t/test23-strevall.rdt Mon Apr 5 16:22:16 2010
+++ /trunk/t/test23-strevall.rdt Wed Apr 21 04:41:03 2010
@@ -19,7 +19,7 @@
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 ]
+fid_fileinfo 3 eval 1 [ count 1 nested 0 merged 0 ]
fid_line_time 1 4 [ 0 1 ]
fid_line_time 2 45 [ 0 1 ]
fid_sub_time 1 4 [ 0 1 ]
=======================================
--- /trunk/t/test51-enable.rdt Mon Apr 5 16:22:16 2010
+++ /trunk/t/test51-enable.rdt Wed Apr 21 04:41:03 2010
@@ -26,7 +26,7 @@
fid_fileinfo 1 call 5 main::CORE:unlink [ 1 0 0 0 0 0 0
main::RUNTIME ]
fid_fileinfo 1 call 9 main::sub1 [ 1 0 0 0 0 0 0
main::RUNTIME ]
fid_fileinfo 1 call 11 DB::disable_profile [ 1 0 0 0 0 0 0
main::RUNTIME ]
-fid_fileinfo 1 eval 7 [ 1 0 ]
+fid_fileinfo 1 eval 7 [ count 1 nested 0 merged 0 ]
fid_fileinfo 2 [ (eval 0)[test51-enable.p:7] 1 7 2 2 0 0 ]
fid_fileinfo 2 sub main::sub1 1-1
fid_line_time 1 3 [ 0 1 ]
=======================================
--- /trunk/t/test61-submerge.rdt Mon Apr 5 16:22:16 2010
+++ /trunk/t/test61-submerge.rdt Wed Apr 21 04:41:03 2010
@@ -29,7 +29,7 @@
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 eval 8 [ 3 0 ]
+fid_fileinfo 1 eval 8 [ count 3 nested 0 merged 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
fid_fileinfo 2 call 1 main::foo [ 1 0 0 0 0 0 0 main::__ANON__[(eval
0)[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]
