Author: tim.bunce
Date: Thu Dec 11 05:02:11 2008
New Revision: 650
Modified:
trunk/HACKING
trunk/NYTProf.xs
trunk/lib/Devel/NYTProf/Data.pm
trunk/lib/Devel/NYTProf/FileInfo.pm
trunk/lib/Devel/NYTProf/SubInfo.pm
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/test11.rdt
trunk/t/test12.rdt
trunk/t/test13.rdt
trunk/t/test14.rdt
trunk/t/test20-streval.rdt
trunk/t/test30-fork.0.rdt
trunk/t/test30-fork.1.rdt
trunk/t/test40pmc.rdt
trunk/t/test50-disable.rdt
trunk/t/test60-subname.rdt
trunk/t/test61-submerge.rdt
trunk/t/test80-recurs.rdt
Log:
Reworked dumping of fileinfo data to include subs defined and subs called.
Added $fi->normalize_for_test method (currently duplicates normalization of
sub
caller info because merging of anon subs isn't done right yet).
Modified: trunk/HACKING
==============================================================================
--- trunk/HACKING (original)
+++ trunk/HACKING Thu Dec 11 05:02:11 2008
@@ -350,3 +350,5 @@
Profile should report _both_ the 'raw original' filename (possibly
relative)
used by the application being profiled, plus an absolute filename
determined
ASAP (to avoid problems with scripts that chdir).
+
+Add (very) basic nytprofhtml test (ie it runs and produces output) so we
check the VERSION has been updated.
Modified: trunk/NYTProf.xs
==============================================================================
--- trunk/NYTProf.xs (original)
+++ trunk/NYTProf.xs Thu Dec 11 05:02:11 2008
@@ -3191,7 +3191,7 @@
sv_setuv(*av_fetch(av, NYTP_SIi_REC_DEPTH, 1), 0); /*
rec_depth */
sv_setnv(*av_fetch(av, NYTP_SIi_RECI_RTIME, 1), 0.0); /*
reci_time */
- /* add sub to NYTP_FIDi_SUBS_DEFINED of fid */
+ /* add sub to NYTP_FIDi_SUBS_DEFINED hash */
sv = SvRV(*av_fetch(fid_fileinfo_av, fid, 1));
sv = SvRV(*av_fetch((AV *)sv, NYTP_FIDi_SUBS_DEFINED, 1));
(void)hv_store((HV *)sv, subname_pv, subname_len,
newRV((SV*)av), 0);
@@ -3203,7 +3203,6 @@
{
char text[MAXPATHLEN*2];
SV *sv;
- HE *he;
SV *subname_sv;
AV *subinfo_av;
int len;
@@ -3275,7 +3274,7 @@
sv_setnv(*av_fetch((AV *)sv, NYTP_SCi_RECI_RTIME, 1),
reci_time);
sv_setuv(*av_fetch((AV *)sv, NYTP_SCi_REC_DEPTH, 1),
rec_depth);
- /* add sub call to NYTP_FIDi_SUBS_CALLED of fid */
+ /* add sub call to NYTP_FIDi_SUBS_CALLED hash of fid
making the call */
/* => { line => { subname => [ ... ] } } */
fi = SvRV(*av_fetch(fid_fileinfo_av, fid, 1));
fi = *av_fetch((AV *)fi, NYTP_FIDi_SUBS_CALLED, 1);
Modified: trunk/lib/Devel/NYTProf/Data.pm
==============================================================================
--- trunk/lib/Devel/NYTProf/Data.pm (original)
+++ trunk/lib/Devel/NYTProf/Data.pm Thu Dec 11 05:02:11 2008
@@ -81,7 +81,7 @@
my $fid_fileinfo = $profile->{fid_fileinfo};
my $sub_subinfo = $profile->{sub_subinfo};
- #use Data::Dumper; warn Dumper($sub_subinfo);
+ #warn _dumper($profile);
# add profile ref so fidinfo & subinfo objects
# XXX circular ref, add weaken
@@ -110,16 +110,20 @@
warn "merged sub_info $oldname into $subname\n" if $trace;
}
else {
-
# is first to change, so just move ref to new name
$sub_subinfo->{$subname} = $subinfo;
$subinfo->[6] = $subname; # XXX breaks encapsulation
warn "renamed sub_info $oldname into $subname\n" if $trace;
}
+
+ # XXX update fid_fileinfo NYTP_FIDi_SUBS_DEFINED
+ # XXX update fid_fileinfo NYTP_FIDi_SUBS_CALLED
}
}
$profile->_clear_caches;
+ #warn _dumper($profile);
+
return $profile;
}
@@ -467,11 +471,6 @@
my @abs_inc = grep { $_ =~ $abs_path_regex } $self->inc;
my $is_lib_regex = get_abs_paths_alternation_regex([EMAIL PROTECTED]);
- for my $fi ($self->all_fileinfos) {
-
- # normalize eval sequence numbers in 'file' names to 0
- $fi->[0] =~ s/$eval_regex/(${1}eval 0)/g;
- }
# normalize line data
for my $level (qw(line block sub)) {
@@ -485,6 +484,7 @@
# zero sub into and sub caller times
$_->normalize_for_test for values %{ $self->{sub_subinfo} };
+ $_->normalize_for_test for $self->all_fileinfos;
for my $info ($self->{sub_subinfo}) {
Modified: trunk/lib/Devel/NYTProf/FileInfo.pm
==============================================================================
--- trunk/lib/Devel/NYTProf/FileInfo.pm (original)
+++ trunk/lib/Devel/NYTProf/FileInfo.pm Thu Dec 11 05:02:11 2008
@@ -10,7 +10,8 @@
NYTP_FIDi_EVAL_FI NYTP_FIDi_HAS_EVALS NYTP_FIDi_SUBS_DEFINED
NYTP_FIDi_SUBS_CALLED
NYTP_FIDf_IS_PMC
- NYTP_SCi_CALL_COUNT
+ NYTP_SCi_CALL_COUNT NYTP_SCi_INCL_RTIME NYTP_SCi_EXCL_RTIME
+ NYTP_SCi_INCL_UTIME NYTP_SCi_INCL_STIME NYTP_SCi_RECI_RTIME
);
sub filename { shift->[NYTP_FIDi_FILENAME()] }
@@ -22,7 +23,7 @@
sub mtime { shift->[NYTP_FIDi_FILEMTIME()] }
sub profile { shift->[NYTP_FIDi_PROFILE()] }
-# if fid is an eval then return fileinfo obj for the fid that executed the
eval
+# if an eval then return fileinfo obj for the fid that executed the eval
sub eval_fi { shift->[NYTP_FIDi_EVAL_FI()] }
# ref to array of fileinfo's for each string eval in the file, else undef
@@ -150,6 +151,24 @@
return [ <$fh> ];
}
+
+sub normalize_for_test {
+ 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;
+
+ for my $sc (map { values %$_ } values %{ $self->sub_call_lines }) {
+ $sc->[NYTP_SCi_INCL_RTIME] =
+ $sc->[NYTP_SCi_EXCL_RTIME] =
+ $sc->[NYTP_SCi_INCL_UTIME] =
+ $sc->[NYTP_SCi_INCL_STIME] =
+ $sc->[NYTP_SCi_RECI_RTIME] = 0;
+ }
+
+}
+
+
sub dump {
my ($self, $separator, $fh, $path, $prefix) = @_;
my @values = @{$self}[
@@ -157,8 +176,38 @@
NYTP_FIDi_FLAGS, NYTP_FIDi_FILESIZE, NYTP_FIDi_FILEMTIME
];
$values[0] = $self->filename_without_inc;
+
+ # include count of number of string eval fids
+ my $evals = $self->has_evals(0) || [];
+ push @values, scalar @$evals;
+
printf $fh "%s[ %s ]\n", $prefix, join(" ", map { defined($_) ?
$_ : 'undef' } @values);
-}
+ my $subs = $self->subs;
+ for my $subname (sort keys %$subs) {
+ my $si = $subs->{$subname};
+
+ printf $fh "%s%s%s%s%s%s-%s\n",
+ $prefix, 'sub', $separator,
+ $si->subname(' and '), $separator,
+ $si->first_line, $si->last_line;
+ }
+
+ # return a ref to a hash of { line => { subname => [...] }, ... }
+ my $sub_call_lines = $self->sub_call_lines;
+ for my $line (sort { $a <=> $b } keys %$sub_call_lines) {
+ my $subs_called = $sub_call_lines->{$line};
+
+ for my $subname (sort keys %$subs_called) {
+ my $sc = $subs_called->{$subname};
+
+ printf $fh "%s%s%s%s%s%s%s[ %s ]\n",
+ $prefix, 'call', $separator,
+ $line, $separator, $subname, $separator,
+ join(" ", map { defined($_) ? $_ : 'undef' } @$sc)
+ }
+ }
+
+}
1;
Modified: trunk/lib/Devel/NYTProf/SubInfo.pm
==============================================================================
--- trunk/lib/Devel/NYTProf/SubInfo.pm (original)
+++ trunk/lib/Devel/NYTProf/SubInfo.pm Thu Dec 11 05:02:11 2008
@@ -125,6 +125,7 @@
# ug, we can't really combine recursive incl_time, but this is
better than undef
$dst_line_info->[NYTP_SCi_RECI_RTIME] =
max($dst_line_info->[NYTP_SCi_RECI_RTIME],
$src_line_info->[NYTP_SCi_RECI_RTIME]);
+ #push @{$src_line_info}, "merged"; # flag hack, for debug
}
}
Modified: trunk/t/test01.rdt
==============================================================================
--- trunk/t/test01.rdt (original)
+++ trunk/t/test01.rdt Thu Dec 11 05:02:11 2008
@@ -18,7 +18,16 @@
fid_block_time 1 16 [ 0 1 ]
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 [ test01.p 1 2 0 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
+fid_fileinfo 1 call 3 main::bar [ 2 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 12 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 13 main::foo [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 16 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 17 main::baz [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 18 main::foo [ 1 0 0 0 0 0 0 ]
fid_line_time 1 2 [ 0 2 ]
fid_line_time 1 3 [ 0 2 ]
fid_line_time 1 7 [ 0 4 ]
Modified: trunk/t/test02.rdt
==============================================================================
--- trunk/t/test02.rdt (original)
+++ trunk/t/test02.rdt Thu Dec 11 05:02:11 2008
@@ -19,7 +19,19 @@
fid_block_time 1 19 [ 0 1 ]
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 [ test02.p 1 2 0 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
+fid_fileinfo 1 call 3 main::bar [ 2 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 12 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 13 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 14 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 15 main::foo [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 18 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 19 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 20 main::baz [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 21 main::foo [ 1 0 0 0 0 0 0 ]
fid_line_time 1 2 [ 0 2 ]
fid_line_time 1 3 [ 0 2 ]
fid_line_time 1 7 [ 0 7 ]
Modified: trunk/t/test03.rdt
==============================================================================
--- trunk/t/test03.rdt (original)
+++ trunk/t/test03.rdt Thu Dec 11 05:02:11 2008
@@ -17,7 +17,14 @@
fid_block_time 1 12 [ 0 3 ]
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 [ test03.p 1 2 0 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
+fid_fileinfo 1 call 13 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 14 main::foo [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 17 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 18 main::baz [ 1 0 0 0 0 0 0 ]
fid_line_time 1 2 [ 0 1 ]
fid_line_time 1 3 [ 0 1 ]
fid_line_time 1 8 [ 0 2 ]
Modified: trunk/t/test05.rdt
==============================================================================
--- trunk/t/test05.rdt (original)
+++ trunk/t/test05.rdt Thu Dec 11 05:02:11 2008
@@ -18,7 +18,16 @@
fid_block_time 1 19 [ 0 2 ]
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 [ test05.p 1 2 0 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
+fid_fileinfo 1 sub main::yeppers 18-20
+fid_fileinfo 1 call 6 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 10 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 14 main::yeppers [ 2 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 22 main::foo1 [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 23 main::foo2 [ 1 0 0 0 0 0 0 ]
fid_line_time 1 5 [ 0 1 ]
fid_line_time 1 6 [ 0 1 ]
fid_line_time 1 9 [ 0 1 ]
Modified: trunk/t/test06.rdt
==============================================================================
--- trunk/t/test06.rdt (original)
+++ trunk/t/test06.rdt Thu Dec 11 05:02:11 2008
@@ -26,7 +26,19 @@
fid_block_time 1 42 [ 0 1 ]
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 [ test06.p 1 2 0 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
+fid_fileinfo 1 sub main::noop 5-7
+fid_fileinfo 1 call 12 main::noop [ 10 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 14 main::noop [ 100 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 25 main::noop [ 100 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 36 main::noop [ 100 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 37 main::noop [ 100 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 42 main::foo [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 43 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 44 main::baz [ 1 0 0 0 0 0 0 ]
fid_line_time 1 4 [ 0 1 ]
fid_line_time 1 6 [ 0 410 ]
fid_line_time 1 10 [ 0 1 ]
Modified: trunk/t/test07.rdt
==============================================================================
--- trunk/t/test07.rdt (original)
+++ trunk/t/test07.rdt Thu Dec 11 05:02:11 2008
@@ -13,7 +13,7 @@
attribute total_sub_calls 0
attribute xs_version 0
fid_block_time 1 1 [ 0 1 ]
-fid_fileinfo 1 [ test07.p 1 2 0 0 ]
+fid_fileinfo 1 [ test07.p 1 2 0 0 0 ]
fid_line_time 1 1 [ 0 1 ]
fid_sub_time 1 1 [ 0 1 ]
profile_modes fid_block_time block
Modified: trunk/t/test08.rdt
==============================================================================
--- trunk/t/test08.rdt (original)
+++ trunk/t/test08.rdt Thu Dec 11 05:02:11 2008
@@ -16,8 +16,8 @@
fid_block_time 1 1 1 1
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 2 [ (eval 0)[test08.p:1] 1 1 2 2 0 0 ]
+fid_fileinfo 1 [ test08.p 1 2 0 0 1 ]
+fid_fileinfo 2 [ (eval 0)[test08.p:1] 1 1 2 2 0 0 0 ]
fid_line_time 1 1 0 0
fid_line_time 1 1 1 1
fid_line_time 1 1 2 1 [ 0 1 ]
Modified: trunk/t/test09.rdt
==============================================================================
--- trunk/t/test09.rdt (original)
+++ trunk/t/test09.rdt Thu Dec 11 05:02:11 2008
@@ -23,12 +23,19 @@
fid_block_time 1 11 [ 0 1 ]
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 2 [ (eval 0)[test09.p:2] 1 2 2 2 0 0 ]
-fid_fileinfo 3 [ (eval 0)[test09.p:8] 1 8 3 2 0 0 ]
-fid_fileinfo 4 [ (eval 0)[test09.p:2] 1 2 4 2 0 0 ]
-fid_fileinfo 5 [ (eval 0)[test09.p:8] 1 8 5 2 0 0 ]
-fid_fileinfo 6 [ (eval 0)[test09.p:8] 1 8 6 2 0 0 ]
+fid_fileinfo 1 [ test09.p 1 2 0 0 5 ]
+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 ]
+fid_fileinfo 1 call 12 main::foo [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 13 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 2 [ (eval 0)[test09.p:2] 1 2 2 2 0 0 0 ]
+fid_fileinfo 2 call 3 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 3 [ (eval 0)[test09.p:8] 1 8 3 2 0 0 0 ]
+fid_fileinfo 4 [ (eval 0)[test09.p:2] 1 2 4 2 0 0 0 ]
+fid_fileinfo 4 call 3 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 5 [ (eval 0)[test09.p:8] 1 8 5 2 0 0 0 ]
+fid_fileinfo 6 [ (eval 0)[test09.p:8] 1 8 6 2 0 0 0 ]
fid_line_time 1 2 0 0
fid_line_time 1 2 1 2
fid_line_time 1 2 2 1 [ 0 2 ]
Modified: trunk/t/test10.rdt
==============================================================================
--- trunk/t/test10.rdt (original)
+++ trunk/t/test10.rdt Thu Dec 11 05:02:11 2008
@@ -17,8 +17,10 @@
fid_block_time 1 1 2 1 [ 0 1 ]
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 2 [ (eval 0)[test10.p:1] 1 1 2 2 0 0 ]
+fid_fileinfo 1 [ test10.p 1 2 0 0 1 ]
+fid_fileinfo 1 call 2 main::__ANON__[(eval 1)[test10.p:1]:1]
[ 1 0 0 0 0 0
0 ]
+fid_fileinfo 2 [ (eval 0)[test10.p:1] 1 1 2 2 0 0 0 ]
+fid_fileinfo 2 sub main::__ANON__[(eval 0)[test10.p:1]:1] 1-1
fid_line_time 1 1 0 0
fid_line_time 1 1 1 1
fid_line_time 1 1 2 1 [ 0 1 ]
Modified: trunk/t/test11.rdt
==============================================================================
--- trunk/t/test11.rdt (original)
+++ trunk/t/test11.rdt Thu Dec 11 05:02:11 2008
@@ -17,8 +17,12 @@
fid_block_time 1 3 2 1 [ 0 2 ]
fid_block_time 1 5 [ 0 1 ]
fid_block_time 1 6 [ 0 1 ]
-fid_fileinfo 1 [ test11.p 1 2 0 0 ]
-fid_fileinfo 2 [ (eval 0)[test11.p:3] 1 3 2 2 0 0 ]
+fid_fileinfo 1 [ test11.p 1 2 0 0 1 ]
+fid_fileinfo 1 sub main::BEGIN 2-4
+fid_fileinfo 1 call 5 main::__ANON__[(eval 1)[test11.p:3]:1]
[ 1 0 0 0 0 0
0 ]
+fid_fileinfo 1 call 6 main::__ANON__[(eval 1)[test11.p:3]:1]
[ 1 0 0 0 0 0
0 ]
+fid_fileinfo 2 [ (eval 0)[test11.p:3] 1 3 2 2 0 0 0 ]
+fid_fileinfo 2 sub main::__ANON__[(eval 0)[test11.p:3]:1] 1-1
fid_line_time 1 3 0 0
fid_line_time 1 3 1 0
fid_line_time 1 3 2 1 [ 0 2 ]
Modified: trunk/t/test12.rdt
==============================================================================
--- trunk/t/test12.rdt (original)
+++ trunk/t/test12.rdt Thu Dec 11 05:02:11 2008
@@ -14,8 +14,8 @@
attribute xs_version 0
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 2 [ test12.pl 2 2 0 0 ]
+fid_fileinfo 1 [ test12.p 1 2 0 0 0 ]
+fid_fileinfo 2 [ test12.pl 2 2 0 0 0 ]
fid_line_time 1 1 [ 0 1 ]
fid_line_time 2 1 [ 0 1 ]
fid_sub_time 1 1 [ 0 1 ]
Modified: trunk/t/test13.rdt
==============================================================================
--- trunk/t/test13.rdt (original)
+++ trunk/t/test13.rdt Thu Dec 11 05:02:11 2008
@@ -22,8 +22,16 @@
fid_block_time 1 19 2 1 [ 0 1 ]
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 2 [ (eval 0)[test13.p:19] 1 19 2 2 0 0 ]
+fid_fileinfo 1 [ test13.p 1 2 0 0 1 ]
+fid_fileinfo 1 sub main::bar 7-9
+fid_fileinfo 1 sub main::baz 11-17
+fid_fileinfo 1 sub main::foo 3-5
+fid_fileinfo 1 call 13 main::foo [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 14 main::foo [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 20 main::bar [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 21 main::baz [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 2 [ (eval 0)[test13.p:19] 1 19 2 2 0 0 0 ]
+fid_fileinfo 2 call 1 main::foo [ 1 0 0 0 0 0 0 ]
fid_line_time 1 4 [ 0 3 ]
fid_line_time 1 8 [ 0 1 ]
fid_line_time 1 12 [ 0 1 ]
Modified: trunk/t/test14.rdt
==============================================================================
--- trunk/t/test14.rdt (original)
+++ trunk/t/test14.rdt Thu Dec 11 05:02:11 2008
@@ -19,10 +19,23 @@
fid_block_time 3 11 1 2
fid_block_time 3 11 2 1 [ 0 1 ]
fid_block_time 3 14 [ 0 1 ]
-fid_fileinfo 1 [ test14.p 1 2 0 0 ]
-fid_fileinfo 2 [ AutoLoader.pm 2 2 0 0 ]
-fid_fileinfo 3 [ test14.pm 3 2 0 0 ]
-fid_fileinfo 4 [ (eval 0)[test14.pm (autosplit into
auto/test14/bar.al):11] 3 11 4 2 0 0 ]
+fid_fileinfo 1 [ test14.p 1 2 0 0 0 ]
+fid_fileinfo 1 sub main::BEGIN 16-16
+fid_fileinfo 1 call 17 AutoLoader::AUTOLOAD [ 1 0 0 0 0 0 0
]
+fid_fileinfo 1 call 18 AutoLoader::AUTOLOAD [ 1 0 0 0 0 0 0
]
+fid_fileinfo 2 [ AutoLoader.pm 2 2 0 0 0 ]
+fid_fileinfo 2 sub AutoLoader::AUTOLOAD 21-52
+fid_fileinfo 2 sub AutoLoader::BEGIN 186-186
+fid_fileinfo 2 sub
AutoLoader::__ANON__[/usr/local/perl589/lib/5.8.9/AutoLoader.pm:31] 31-31
+fid_fileinfo 2 sub AutoLoader::find_filename 54-126
+fid_fileinfo 2 sub AutoLoader::import 128-181
+fid_fileinfo 2 sub AutoLoader::unimport 183-193
+fid_fileinfo 2 call 23 AutoLoader::find_filename [ 2 0 0
0 0 0 0 ]
+fid_fileinfo 3 [ test14.pm 3 2 0 0 1 ]
+fid_fileinfo 3 sub test14::BEGIN 2-2
+fid_fileinfo 3 sub test14::bar 10-12
+fid_fileinfo 3 sub test14::foo 6-8
+fid_fileinfo 4 [ (eval 0)[test14.pm (autosplit into
auto/test14/bar.al):11] 3 11 4 2 0 0 0 ]
fid_line_time 1 17 [ 0 1 ]
fid_line_time 1 18 [ 0 1 ]
fid_line_time 3 7 [ 0 1 ]
Modified: trunk/t/test20-streval.rdt
==============================================================================
--- trunk/t/test20-streval.rdt (original)
+++ trunk/t/test20-streval.rdt Thu Dec 11 05:02:11 2008
@@ -23,12 +23,17 @@
fid_block_time 1 14 0 0
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 2 [ (eval 0)[test20-streval.p:8] 1 8 2 2 0 0 ]
-fid_fileinfo 3 [ (eval 0)[test20-streval.p:11] 1 11 3 2 0 0 ]
-fid_fileinfo 4 [ (eval 0)[test20-streval.p:11] 1 11 4 2 0 0 ]
-fid_fileinfo 5 [ (eval 0)[test20-streval.p:14] 1 14 5 2 0 0 ]
-fid_fileinfo 6 [ (eval 0)[(eval 0)[test20-streval.p:14]:1] 5 1 6 2 0 0
]
+fid_fileinfo 1 [ test20-streval.p 1 2 0 0 4 ]
+fid_fileinfo 1 sub main::foo 3-3
+fid_fileinfo 2 [ (eval 0)[test20-streval.p:8] 1 8 2 2 0 0 0 ]
+fid_fileinfo 2 call 1 main::foo [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 3 [ (eval 0)[test20-streval.p:11] 1 11 3 2 0 0 0 ]
+fid_fileinfo 3 call 1 main::foo [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 4 [ (eval 0)[test20-streval.p:11] 1 11 4 2 0 0 0 ]
+fid_fileinfo 4 call 1 main::foo [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 5 [ (eval 0)[test20-streval.p:14] 1 14 5 2 0 0 1 ]
+fid_fileinfo 6 [ (eval 0)[(eval 0)[test20-streval.p:14]:1] 5 1 6 2 0 0
0 ]
+fid_fileinfo 6 call 1 main::foo [ 1 0 0 0 0 0 0 ]
fid_line_time 1 3 [ 0 4 ]
fid_line_time 1 5 [ 0 1 ]
fid_line_time 1 8 0 0
Modified: trunk/t/test30-fork.0.rdt
==============================================================================
--- trunk/t/test30-fork.0.rdt (original)
+++ trunk/t/test30-fork.0.rdt Thu Dec 11 05:02:11 2008
@@ -20,7 +20,15 @@
fid_block_time 1 19 [ 0 1 ]
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 [ test30-fork.0.p 1 2 0 0 0 ]
+fid_fileinfo 1 sub main::other 6-8
+fid_fileinfo 1 sub main::postfork 10-13
+fid_fileinfo 1 sub main::prefork 1-4
+fid_fileinfo 1 call 3 main::other [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 12 main::other [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 15 main::prefork [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 19 main::postfork [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 20 main::other [ 1 0 0 0 0 0 0 ]
fid_line_time 1 2 [ 0 1 ]
fid_line_time 1 3 [ 0 1 ]
fid_line_time 1 7 [ 0 3 ]
Modified: trunk/t/test30-fork.1.rdt
==============================================================================
--- trunk/t/test30-fork.1.rdt (original)
+++ trunk/t/test30-fork.1.rdt Thu Dec 11 05:02:11 2008
@@ -17,7 +17,13 @@
fid_block_time 1 19 [ 0 1 ]
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 [ test30-fork.0.p 1 2 0 0 0 ]
+fid_fileinfo 1 sub main::other 6-8
+fid_fileinfo 1 sub main::postfork 10-13
+fid_fileinfo 1 sub main::prefork 1-4
+fid_fileinfo 1 call 12 main::other [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 19 main::postfork [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 20 main::other [ 1 0 0 0 0 0 0 ]
fid_line_time 1 7 [ 0 2 ]
fid_line_time 1 11 [ 0 1 ]
fid_line_time 1 12 [ 0 1 ]
Modified: trunk/t/test40pmc.rdt
==============================================================================
--- trunk/t/test40pmc.rdt (original)
+++ trunk/t/test40pmc.rdt Thu Dec 11 05:02:11 2008
@@ -14,8 +14,11 @@
attribute xs_version 0
fid_block_time 1 4 [ 0 1 ]
fid_block_time 2 6 [ 0 1 ]
-fid_fileinfo 1 [ test40pmc.p 1 2 0 0 ]
-fid_fileinfo 2 [ test40pmc.pm 2 3 0 0 ]
+fid_fileinfo 1 [ test40pmc.p 1 2 0 0 0 ]
+fid_fileinfo 1 sub main::BEGIN 3-3
+fid_fileinfo 1 call 4 test40pmc::foo [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 2 [ test40pmc.pm 2 3 0 0 0 ]
+fid_fileinfo 2 sub test40pmc::foo 5-7
fid_line_time 1 4 [ 0 1 ]
fid_line_time 2 6 [ 0 1 ]
fid_sub_time 1 4 [ 0 1 ]
Modified: trunk/t/test50-disable.rdt
==============================================================================
--- trunk/t/test50-disable.rdt (original)
+++ trunk/t/test50-disable.rdt Thu Dec 11 05:02:11 2008
@@ -15,7 +15,8 @@
fid_block_time 1 1 [ 0 1 ]
fid_block_time 1 2 [ 0 1 ]
fid_block_time 1 5 [ 0 1 ]
-fid_fileinfo 1 [ test50-disable.p 1 2 0 0 ]
+fid_fileinfo 1 [ test50-disable.p 1 2 0 0 0 ]
+fid_fileinfo 1 call 4 DB::enable_profile [ 1 0 0 0 0 0 0
]
fid_line_time 1 1 [ 0 1 ]
fid_line_time 1 2 [ 0 1 ]
fid_line_time 1 5 [ 0 1 ]
Modified: trunk/t/test60-subname.rdt
==============================================================================
--- trunk/t/test60-subname.rdt (original)
+++ trunk/t/test60-subname.rdt Thu Dec 11 05:02:11 2008
@@ -21,8 +21,18 @@
fid_block_time 1 19 [ 0 1 ]
fid_block_time 1 24 [ 0 1 ]
fid_block_time 1 25 [ 0 1 ]
-fid_fileinfo 1 [ test60-subname.p 1 2 0 0 ]
-fid_fileinfo 2 [ Devel/NYTProf/Test.pm 2 4 0 0 ]
+fid_fileinfo 1 [ test60-subname.p 1 2 0 0 0 ]
+fid_fileinfo 1 sub main::BEGIN 2-2
+fid_fileinfo 1 sub main::launch 24-24
+fid_fileinfo 1 call 5 Devel::NYTProf::Test::example_xsub
[ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 9 Devel::NYTProf::Test::example_xsub
[ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 12 Devel::NYTProf::Test::example_xsub
[ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 16 Devel::NYTProf::Test::example_xsub
[ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 19 Devel::NYTProf::Test::example_xsub
[ 1 0 0 0 0 0 0 ]
+fid_fileinfo 1 call 25 main::launch [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 2 [ Devel/NYTProf/Test.pm 2 4 0 0 0 ]
+fid_fileinfo 2 sub Devel::NYTProf::Test::example_sub 13-13
+fid_fileinfo 2 sub Devel::NYTProf::Test::example_xsub 0-0
fid_line_time 1 5 [ 0 1 ]
fid_line_time 1 9 [ 0 1 ]
fid_line_time 1 12 [ 0 1 ]
Modified: trunk/t/test61-submerge.rdt
==============================================================================
--- trunk/t/test61-submerge.rdt (original)
+++ trunk/t/test61-submerge.rdt Thu Dec 11 05:02:11 2008
@@ -18,10 +18,20 @@
fid_block_time 1 8 1 2
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 2 [ (eval 0)[test61-submerge.p:8] 1 8 2 2 0 0 ]
-fid_fileinfo 3 [ (eval 0)[test61-submerge.p:8] 1 8 3 2 0 0 ]
-fid_fileinfo 4 [ (eval 0)[test61-submerge.p:8] 1 8 4 2 0 0 ]
+fid_fileinfo 1 [ test61-submerge.p 1 2 0 0 3 ]
+fid_fileinfo 1 sub main::foo 4-4
+fid_fileinfo 1 call 8 main::__ANON__[(eval
1)[test61-submerge.p:8]:1] [ 1
0 0 0 0 0 0 ]
+fid_fileinfo 1 call 8 main::__ANON__[(eval
2)[test61-submerge.p:8]:1] [ 1
0 0 0 0 0 0 ]
+fid_fileinfo 1 call 8 main::__ANON__[(eval
3)[test61-submerge.p:8]:1] [ 1
0 0 0 0 0 0 ]
+fid_fileinfo 2 [ (eval 0)[test61-submerge.p:8] 1 8 2 2 0 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 ]
+fid_fileinfo 3 [ (eval 0)[test61-submerge.p:8] 1 8 3 2 0 0 0 ]
+fid_fileinfo 3 sub main::__ANON__[(eval 0)[test61-submerge.p:8]:1]
and
main::__ANON__[(eval 1)[test61-submerge.p:8]:1] and main::__ANON__[(eval
3)[test61-submerge.p:8]:1] 1-1
+fid_fileinfo 3 call 1 main::foo [ 1 0 0 0 0 0 0 ]
+fid_fileinfo 4 [ (eval 0)[test61-submerge.p:8] 1 8 4 2 0 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 ]
fid_line_time 1 4 [ 0 3 ]
fid_line_time 1 6 [ 0 1 ]
fid_line_time 1 8 0 0
Modified: trunk/t/test80-recurs.rdt
==============================================================================
--- trunk/t/test80-recurs.rdt (original)
+++ trunk/t/test80-recurs.rdt Thu Dec 11 05:02:11 2008
@@ -14,7 +14,10 @@
attribute xs_version 0
fid_block_time 1 2 [ 0 6 ]
fid_block_time 1 7 [ 0 1 ]
-fid_fileinfo 1 [ test80-recurs.p 1 2 0 0 ]
+fid_fileinfo 1 [ test80-recurs.p 1 2 0 0 0 ]
+fid_fileinfo 1 sub main::recurs 1-5
+fid_fileinfo 1 call 4 main::recurs [ 1 0 0 0 0 0 1 ]
+fid_fileinfo 1 call 7 main::recurs [ 1 0 0 0 0 0 0 ]
fid_line_time 1 2 [ 0 2 ]
fid_line_time 1 3 [ 0 2 ]
fid_line_time 1 4 [ 0 2 ]
--~--~---------~--~----~------------~-------~--~----~
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]
-~----------~----~----~----~------~----~------~--~---
