Revision: 1214
Author: [email protected]
Date: Tue May 4 03:48:10 2010
Log: I'd missed another place where eval sequence numbers were normalized.
http://code.google.com/p/perl-devel-nytprof/source/detail?r=1214
Modified:
/trunk/lib/Devel/NYTProf/FileInfo.pm
/trunk/t/test22-strevala.rdt
/trunk/t/test24-strevalc.rdt
/trunk/t/test61-submerge.rdt
=======================================
--- /trunk/lib/Devel/NYTProf/FileInfo.pm Mon May 3 13:49:06 2010
+++ /trunk/lib/Devel/NYTProf/FileInfo.pm Tue May 4 03:48:10 2010
@@ -408,7 +408,8 @@
my $self = shift;
# normalize eval sequence numbers in 'file' names to 0
- $self->[NYTP_FIDi_FILENAME] =~ s/ \( ((?:re_)?) eval \s \d+ \)
/(${1}eval 0)/xg;
+ $self->[NYTP_FIDi_FILENAME] =~ s/ \( ((?:re_)?) eval \s \d+ \)
/(${1}eval 0)/xg
+ if not $ENV{NYTPROF_TEST_SKIP_EVAL_NORM};
# normalize flags to avoid failures due to savesrc and perl version
$self->[NYTP_FIDi_FLAGS] &= ~(NYTP_FIDf_HAS_SRC|NYTP_FIDf_SAVE_SRC);
=======================================
--- /trunk/t/test22-strevala.rdt Mon May 3 13:49:06 2010
+++ /trunk/t/test22-strevala.rdt Tue May 4 03:48:10 2010
@@ -38,23 +38,23 @@
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 [ (eval 1)[test22-strevala.p:6] 1 6 2 2 0 0 ]
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 0)[test22-strevala.p:9] 1 9 3 2 0 0 ]
+fid_fileinfo 3 [ (eval 2)[test22-strevala.p:9] 1 9 3 2 0 0 ]
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 0)[test22-strevala.p:9] 1 9 4 2 0 0 ]
+fid_fileinfo 4 [ (eval 3)[test22-strevala.p:9] 1 9 4 2 0 0 ]
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 0)[test22-strevala.p:12] 1 12 5 2 0 0 ]
+fid_fileinfo 5 [ (eval 4)[test22-strevala.p:12] 1 12 5 2 0 0 ]
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 0)[(eval 0)[test22-strevala.p:12]:2] 5 2 6 2 0
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 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 0)[(eval 0)[test22-strevala.p:12]:2] 5 2 7 2 0
0 ]
+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 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 ]
=======================================
--- /trunk/t/test24-strevalc.rdt Mon May 3 13:49:06 2010
+++ /trunk/t/test24-strevalc.rdt Tue May 4 03:48:10 2010
@@ -26,17 +26,17 @@
fid_fileinfo 1 sub main::BEGIN 0-0
fid_fileinfo 1 sub main::RUNTIME 1-1
fid_fileinfo 1 eval 7 [ count 5 nested 2 merged 1 ]
-fid_fileinfo 2 [ (eval 0)[test24-strevalc.p:7] 1 7 2 2 0 0 ]
-fid_fileinfo 4 [ (eval 0)[test24-strevalc.p:7] 1 7 4 2 0 0 ]
+fid_fileinfo 2 [ (eval 1)[test24-strevalc.p:7] 1 7 2 2 0 0 ]
+fid_fileinfo 4 [ (eval 3)[test24-strevalc.p:7] 1 7 4 2 0 0 ]
fid_fileinfo 4 eval 1 [ count 1 nested 0 merged 0 ]
-fid_fileinfo 5 [ (eval 0)[(eval 0)[test24-strevalc.p:7]:1] 4 1 5 2 0 0
]
-fid_fileinfo 6 [ (eval 0)[test24-strevalc.p:7] 1 7 6 2 0 0 ]
+fid_fileinfo 5 [ (eval 4)[(eval 3)[test24-strevalc.p:7]:1] 4 1 5 2 0 0
]
+fid_fileinfo 6 [ (eval 5)[test24-strevalc.p:7] 1 7 6 2 0 0 ]
fid_fileinfo 6 eval 1 [ count 1 nested 0 merged 0 ]
-fid_fileinfo 7 [ (eval 0)[(eval 0)[test24-strevalc.p:7]:1] 6 1 7 2 0 0
]
-fid_fileinfo 8 [ (eval 0)[test24-strevalc.p:7] 1 7 8 2 0 0 ]
+fid_fileinfo 7 [ (eval 6)[(eval 5)[test24-strevalc.p:7]:1] 6 1 7 2 0 0
]
+fid_fileinfo 8 [ (eval 7)[test24-strevalc.p:7] 1 7 8 2 0 0 ]
fid_fileinfo 8 sub main::__ANON__[(eval 7)[test24-strevalc.p:7]:1]
1-1
fid_fileinfo 8 call 1 main::__ANON__[(eval 7)[test24-strevalc.p:7]:1] [ 1
0 0 0 0 0 0 main::RUNTIME ]
-fid_fileinfo 9 [ (eval 0)[test24-strevalc.p:7] 1 7 9 2 0 0 ]
+fid_fileinfo 9 [ (eval 8)[test24-strevalc.p:7] 1 7 9 2 0 0 ]
fid_fileinfo 9 sub main::__ANON__[(eval 8)[test24-strevalc.p:7]:1]
1-1
fid_fileinfo 9 call 1 main::__ANON__[(eval 8)[test24-strevalc.p:7]:1] [ 1
0 0 0 0 0 0 main::RUNTIME ]
fid_line_time 1 2 [ 0 1 ]
=======================================
--- /trunk/t/test61-submerge.rdt Mon May 3 13:49:06 2010
+++ /trunk/t/test61-submerge.rdt Tue May 4 03:48:10 2010
@@ -32,13 +32,13 @@
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 0)[test61-submerge.p:8] 1 8 2 2 0 0 ]
+fid_fileinfo 2 [ (eval 1)[test61-submerge.p:8] 1 8 2 2 0 0 ]
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 0)[test61-submerge.p:8] 1 8 3 2 0 0 ]
+fid_fileinfo 3 [ (eval 2)[test61-submerge.p:8] 1 8 3 2 0 0 ]
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 0)[test61-submerge.p:8] 1 8 4 2 0 0 ]
+fid_fileinfo 4 [ (eval 3)[test61-submerge.p:8] 1 8 4 2 0 0 ]
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 ]
--
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]
