Revision: 813 Author: tim.bunce Date: Thu Jul 9 14:28:02 2009 Log: Added the calling sub name to the sub call data structure (a hack for now - sub call info needs to be name a firstclass citizen and fid:line's downgraded)
http://code.google.com/p/perl-devel-nytprof/source/detail?r=813 Modified: /trunk/NYTProf.xs /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/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 ======================================= --- /trunk/NYTProf.xs Tue Jul 7 15:54:53 2009 +++ /trunk/NYTProf.xs Thu Jul 9 14:28:02 2009 @@ -140,7 +140,8 @@ #define NYTP_SCi_INCL_STIME 4 /* incl sys cpu time in sub */ #define NYTP_SCi_RECI_RTIME 5 /* recursive incl real time in sub */ #define NYTP_SCi_REC_DEPTH 6 /* max recursion call depth */ -#define NYTP_SCi_elements 7 /* highest index, plus 1 */ +#define NYTP_SCi_CALLING_SUB 7 /* name of calling sub */ +#define NYTP_SCi_elements 8 /* highest index, plus 1 */ /* Hash table definitions */ #define MAX_HASH_SIZE 512 @@ -3008,6 +3009,7 @@ calling_subname_len = fid_line_start-calling_subname; output_tag_int(NYTP_TAG_SUB_CALLERS, fid); + output_str(calling_subname, calling_subname_len); output_int(line); sc[NYTP_SCi_CALL_COUNT] = output_uv_from_av(aTHX_ av, NYTP_SCi_CALL_COUNT, 0) * 1.0; sc[NYTP_SCi_INCL_RTIME] = output_nv_from_av(aTHX_ av, NYTP_SCi_INCL_RTIME, 0.0); @@ -3017,7 +3019,6 @@ sc[NYTP_SCi_RECI_RTIME] = output_nv_from_av(aTHX_ av, NYTP_SCi_RECI_RTIME, 0.0); sc[NYTP_SCi_REC_DEPTH] = output_uv_from_av(aTHX_ av, NYTP_SCi_REC_DEPTH , 0) * 1.0; output_str(called_subname, called_subname_len); - output_str(calling_subname, calling_subname_len); /* sanity check - early warning */ if (sc[NYTP_SCi_INCL_RTIME] < 0.0 || sc[NYTP_SCi_EXCL_RTIME] < 0.0) { @@ -3720,11 +3721,10 @@ { char text[MAXPATHLEN*2]; SV *sv; - SV *subname_sv; - SV *calling_subname_sv = Nullsv; AV *subinfo_av; int len; unsigned int fid = read_int(); + SV *calling_subname_sv = normalize_eval_seqn(aTHX_ read_str(aTHX_ tmp_str2_sv)); unsigned int line = read_int(); unsigned int count = read_int(); NV incl_time = read_nv(); @@ -3733,8 +3733,7 @@ NV scpu_time = read_nv(); NV reci_time = read_nv(); UV rec_depth = read_int(); - subname_sv = normalize_eval_seqn(aTHX_ read_str(aTHX_ tmp_str1_sv)); - calling_subname_sv = normalize_eval_seqn(aTHX_ read_str(aTHX_ tmp_str2_sv)); + SV *called_subname_sv = normalize_eval_seqn(aTHX_ read_str(aTHX_ tmp_str1_sv)); if (cb) { PUSHMARK(SP); @@ -3750,7 +3749,7 @@ sv_setnv(cb_args[i], scpu_time); XPUSHs(cb_args[i++]); sv_setnv(cb_args[i], reci_time); XPUSHs(cb_args[i++]); sv_setiv(cb_args[i], rec_depth); XPUSHs(cb_args[i++]); - sv_setsv(cb_args[i], subname_sv); XPUSHs(cb_args[i++]); + sv_setsv(cb_args[i], called_subname_sv); XPUSHs(cb_args[i++]); assert(i <= C_ARRAY_LENGTH(cb_args)); PUTBACK; @@ -3760,12 +3759,12 @@ if (trace_level >= 3) logwarn("Sub %s called by %s %u:%u: count %d, incl %f, excl %f, ucpu %f scpu %f\n", - SvPV_nolen(subname_sv), SvPV_nolen(calling_subname_sv), fid, line, + SvPV_nolen(called_subname_sv), SvPV_nolen(calling_subname_sv), fid, line, count, incl_time, excl_time, ucpu_time, scpu_time); - subinfo_av = lookup_subinfo_av(aTHX_ subname_sv, sub_subinfo_hv); - - /* { caller_fid => { caller_line => [ count, incl_time, excl_time ] } } */ + subinfo_av = lookup_subinfo_av(aTHX_ called_subname_sv, sub_subinfo_hv); + + /* { caller_fid => { caller_line => [ count, incl_time, ... ] } } */ sv = *av_fetch(subinfo_av, NYTP_SIi_CALLED_BY, 1); if (!SvROK(sv)) /* autoviv */ sv_setsv(sv, newRV_noinc((SV*)newHV())); @@ -3783,9 +3782,9 @@ sv = *hv_fetch((HV*)SvRV(sv), text, len, 1); if (!SvROK(sv)) /* autoviv */ sv_setsv(sv, newRV_noinc((SV*)newAV())); - else if (!instr(SvPV_nolen(subname_sv), "__ANON__[(eval") || trace_level) + else if (!instr(SvPV_nolen(called_subname_sv), "__ANON__[(eval") || trace_level) logwarn("Merging extra sub caller info for %s %d:%d\n", - SvPV_nolen(subname_sv), fid, line); + SvPV_nolen(called_subname_sv), fid, line); av = (AV *)SvRV(sv); sv = *av_fetch(av, NYTP_SCi_CALL_COUNT, 1); sv_setuv(sv, (SvOK(sv)) ? SvUV(sv) + count : count); @@ -3803,6 +3802,12 @@ if (!SvOK(sv) || SvUV(sv) < rec_depth) /* max() */ sv_setuv(sv, rec_depth); + /* XXX temp hack way to store calling subname */ + sv = *av_fetch(av, NYTP_SCi_CALLING_SUB, 1); + if (!SvROK(sv)) /* autoviv */ + sv_setsv(sv, newRV_noinc((SV*)newHV())); + hv_fetch_ent((HV *)SvRV(sv), calling_subname_sv, 1, 0); + /* 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)); @@ -3810,7 +3815,7 @@ fi = *hv_fetch((HV*)SvRV(fi), text, len, 1); if (!SvROK(fi)) /* autoviv */ sv_setsv(fi, newRV_noinc((SV*)newHV())); - fi = HeVAL(hv_fetch_ent((HV *)SvRV(fi), subname_sv, 1, 0)); + fi = HeVAL(hv_fetch_ent((HV *)SvRV(fi), called_subname_sv, 1, 0)); sv_setsv(fi, newRV((SV *)av)); } else { /* is meta-data about sub */ @@ -4113,6 +4118,7 @@ newCONSTSUB(stash, "NYTP_SCi_INCL_STIME", newSViv(NYTP_SCi_INCL_STIME)); newCONSTSUB(stash, "NYTP_SCi_RECI_RTIME", newSViv(NYTP_SCi_RECI_RTIME)); newCONSTSUB(stash, "NYTP_SCi_REC_DEPTH", newSViv(NYTP_SCi_REC_DEPTH)); + newCONSTSUB(stash, "NYTP_SCi_CALLING_SUB", newSViv(NYTP_SCi_CALLING_SUB)); /* others */ newCONSTSUB(stash, "NYTP_DEFAULT_COMPRESSION", newSViv(default_compression_level)); } ======================================= --- /trunk/lib/Devel/NYTProf/FileInfo.pm Wed Jun 3 04:23:31 2009 +++ /trunk/lib/Devel/NYTProf/FileInfo.pm Thu Jul 9 14:28:02 2009 @@ -14,6 +14,7 @@ NYTP_SCi_CALL_COUNT NYTP_SCi_INCL_RTIME NYTP_SCi_EXCL_RTIME NYTP_SCi_INCL_UTIME NYTP_SCi_INCL_STIME NYTP_SCi_RECI_RTIME + NYTP_SCi_CALLING_SUB ); @@ -224,12 +225,13 @@ my $subs_called = $sub_call_lines->{$line}; for my $subname (sort keys %$subs_called) { - my $sc = $subs_called->{$subname}; + my @sc = @{$subs_called->{$subname}}; + $sc[NYTP_SCi_CALLING_SUB] = join "|", keys %{ $sc[NYTP_SCi_CALLING_SUB] }; printf $fh "%s%s%s%s%s%s%s[ %s ]\n", $prefix, 'call', $separator, $line, $separator, $subname, $separator, - join(" ", map { defined($_) ? $_ : 'undef' } @$sc) + join(" ", map { defined($_) ? $_ : 'undef' } @sc) } } ======================================= --- /trunk/lib/Devel/NYTProf/SubInfo.pm Mon Jun 29 07:48:00 2009 +++ /trunk/lib/Devel/NYTProf/SubInfo.pm Thu Jul 9 14:28:02 2009 @@ -12,6 +12,7 @@ NYTP_SCi_INCL_RTIME NYTP_SCi_EXCL_RTIME NYTP_SCi_INCL_UTIME NYTP_SCi_INCL_STIME NYTP_SCi_RECI_RTIME + NYTP_SCi_CALLING_SUB ); use List::Util qw(sum min max); @@ -120,7 +121,7 @@ # adding reci_rtime is correct only if one sub doesn't call the other $self->[NYTP_SIi_RECI_RTIME] += $new->[NYTP_SIi_RECI_RTIME]; # XXX - # { fid => { line => [ count, incl_time ] } } + # { fid => { line => [ count, incl_time, ... ] } } my $dst_called_by = $self->[NYTP_SIi_CALLED_BY] ||= {}; my $src_called_by = $new ->[NYTP_SIi_CALLED_BY] || {}; @@ -153,6 +154,11 @@ # 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]); + + my $src_cs = $src_line_info->[NYTP_SCi_CALLING_SUB]||={}; + my $dst_cs = $dst_line_info->[NYTP_SCi_CALLING_SUB]||={}; + $dst_cs->{$_} = $src_cs->{$_} for keys %$src_cs; + #push @{$src_line_info}, "merged"; # flag hack, for debug } } @@ -169,6 +175,7 @@ sub caller_count { return scalar shift->caller_places; } # XXX deprecate later +# array of [ $fid, $line, $sub_call_info ], ... sub caller_places { my ($self, $merge_evals) = @_; my $callers = $self->callers || {}; @@ -221,12 +228,14 @@ my @caller_places = $self->caller_places; for my $cp (@caller_places) { my ($fid, $line, $sc) = @$cp; + my @sc = @$sc; + $sc[NYTP_SCi_CALLING_SUB] = join "|", keys %{ $sc[NYTP_SCi_CALLING_SUB] }; printf $fh "%s%s%s%d%s%d%s[ %s ]\n", $prefix, 'called_by', $separator, $fid, $separator, $line, $separator, - join(" ", map { defined($_) ? $_ : 'undef' } @$sc); + join(" ", map { defined($_) ? $_ : 'undef' } @sc); } } ======================================= --- /trunk/t/test01.rdt Mon Dec 22 10:17:23 2008 +++ /trunk/t/test01.rdt Thu Jul 9 14:28:02 2009 @@ -22,12 +22,12 @@ 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_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 [1:16] ] +fid_fileinfo 1 call 17 main::baz [ 1 0 0 0 0 0 0 [1:17] ] +fid_fileinfo 1 call 18 main::foo [ 1 0 0 0 0 0 0 [1:18] ] fid_line_time 1 2 [ 0 2 ] fid_line_time 1 3 [ 0 2 ] fid_line_time 1 7 [ 0 4 ] @@ -47,11 +47,11 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub 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 ] -sub_subinfo main::bar called_by 1 12 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::bar called_by 1 16 [ 1 0 0 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 [1:16] ] 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 ] +sub_subinfo main::baz called_by 1 17 [ 1 0 0 0 0 0 0 [1:17] ] 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 ] -sub_subinfo main::foo called_by 1 18 [ 1 0 0 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 [1:18] ] ======================================= --- /trunk/t/test02.rdt Mon Dec 22 10:17:23 2008 +++ /trunk/t/test02.rdt Thu Jul 9 14:28:02 2009 @@ -23,15 +23,15 @@ 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_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::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 [1:18] ] +fid_fileinfo 1 call 19 main::bar [ 1 0 0 0 0 0 0 [1:19] ] +fid_fileinfo 1 call 20 main::baz [ 1 0 0 0 0 0 0 [1:20] ] +fid_fileinfo 1 call 21 main::foo [ 1 0 0 0 0 0 0 [1:21] ] fid_line_time 1 2 [ 0 2 ] fid_line_time 1 3 [ 0 2 ] fid_line_time 1 7 [ 0 7 ] @@ -55,14 +55,14 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub sub_subinfo main::bar [ 1 6 8 7 0 0 0 0 ] -sub_subinfo main::bar called_by 1 3 [ 2 0 0 0 0 0 0 ] -sub_subinfo main::bar called_by 1 12 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::bar called_by 1 13 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::bar called_by 1 14 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::bar called_by 1 18 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::bar called_by 1 19 [ 1 0 0 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 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 [1:18] ] +sub_subinfo main::bar called_by 1 19 [ 1 0 0 0 0 0 0 [1:19] ] 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 ] +sub_subinfo main::baz called_by 1 20 [ 1 0 0 0 0 0 0 [1:20] ] 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 ] -sub_subinfo main::foo called_by 1 21 [ 1 0 0 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 [1:21] ] ======================================= --- /trunk/t/test03.rdt Mon Dec 22 10:17:23 2008 +++ /trunk/t/test03.rdt Thu Jul 9 14:28:02 2009 @@ -21,10 +21,10 @@ 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_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 [1:17] ] +fid_fileinfo 1 call 18 main::baz [ 1 0 0 0 0 0 0 [1:18] ] fid_line_time 1 2 [ 0 1 ] fid_line_time 1 3 [ 0 1 ] fid_line_time 1 8 [ 0 2 ] @@ -42,9 +42,9 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub 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 ] -sub_subinfo main::bar called_by 1 17 [ 1 0 0 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 [1:17] ] 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 ] +sub_subinfo main::baz called_by 1 18 [ 1 0 0 0 0 0 0 [1:18] ] 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 ] +sub_subinfo main::foo called_by 1 14 [ 1 0 0 0 0 0 0 main::baz ] ======================================= --- /trunk/t/test05.rdt Mon Dec 22 10:17:23 2008 +++ /trunk/t/test05.rdt Thu Jul 9 14:28:02 2009 @@ -23,11 +23,11 @@ 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_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 [1:22] ] +fid_fileinfo 1 call 23 main::foo2 [ 1 0 0 0 0 0 0 [1:23] ] fid_line_time 1 5 [ 0 1 ] fid_line_time 1 6 [ 0 1 ] fid_line_time 1 9 [ 0 1 ] @@ -47,11 +47,11 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub sub_subinfo main::bar [ 1 12 17 2 0 0 0 0 ] -sub_subinfo main::bar called_by 1 6 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::bar called_by 1 10 [ 1 0 0 0 0 0 0 ] +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 ] +sub_subinfo main::foo1 called_by 1 22 [ 1 0 0 0 0 0 0 [1:22] ] 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 ] +sub_subinfo main::foo2 called_by 1 23 [ 1 0 0 0 0 0 0 [1:23] ] 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 ] +sub_subinfo main::yeppers called_by 1 14 [ 2 0 0 0 0 0 0 main::bar ] ======================================= --- /trunk/t/test06.rdt Mon Dec 22 10:17:23 2008 +++ /trunk/t/test06.rdt Thu Jul 9 14:28:02 2009 @@ -31,14 +31,14 @@ 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_fileinfo 1 call 12 main::noop [ 10 0 0 0 0 0 0 main::foo ] +fid_fileinfo 1 call 14 main::noop [ 100 0 0 0 0 0 0 main::foo ] +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 [1:42] ] +fid_fileinfo 1 call 43 main::bar [ 1 0 0 0 0 0 0 [1:43] ] +fid_fileinfo 1 call 44 main::baz [ 1 0 0 0 0 0 0 [1:44] ] fid_line_time 1 4 [ 0 1 ] fid_line_time 1 6 [ 0 410 ] fid_line_time 1 10 [ 0 1 ] @@ -74,14 +74,14 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub 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 ] +sub_subinfo main::bar called_by 1 43 [ 1 0 0 0 0 0 0 [1:43] ] 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 ] +sub_subinfo main::baz called_by 1 44 [ 1 0 0 0 0 0 0 [1:44] ] 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 ] +sub_subinfo main::foo called_by 1 42 [ 1 0 0 0 0 0 0 [1:42] ] 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 ] -sub_subinfo main::noop called_by 1 14 [ 100 0 0 0 0 0 0 ] -sub_subinfo main::noop called_by 1 25 [ 100 0 0 0 0 0 0 ] -sub_subinfo main::noop called_by 1 36 [ 100 0 0 0 0 0 0 ] -sub_subinfo main::noop called_by 1 37 [ 100 0 0 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 ] +sub_subinfo main::noop called_by 1 25 [ 100 0 0 0 0 0 0 main::bar ] +sub_subinfo main::noop called_by 1 36 [ 100 0 0 0 0 0 0 main::baz ] +sub_subinfo main::noop called_by 1 37 [ 100 0 0 0 0 0 0 main::baz ] ======================================= --- /trunk/t/test09.rdt Mon Dec 22 10:17:23 2008 +++ /trunk/t/test09.rdt Thu Jul 9 14:28:02 2009 @@ -26,16 +26,16 @@ fid_fileinfo 1 [ test09.p 1 2 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 ] -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 1 call 11 main::foo [ 1 0 0 0 0 0 0 [1:11] ] +fid_fileinfo 1 call 12 main::foo [ 1 0 0 0 0 0 0 [1:12] ] +fid_fileinfo 1 call 13 main::bar [ 1 0 0 0 0 0 0 [1:13] ] 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 ] -fid_fileinfo 2 call 3 main::bar [ 1 0 0 0 0 0 0 ] +fid_fileinfo 2 call 3 main::bar [ 1 0 0 0 0 0 0 main::foo ] 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 4 call 3 main::bar [ 1 0 0 0 0 0 0 ] +fid_fileinfo 4 call 3 main::bar [ 1 0 0 0 0 0 0 main::foo ] 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_line_time 1 2 0 0 @@ -64,9 +64,9 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub 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 ] -sub_subinfo main::bar called_by 2 3 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::bar called_by 4 3 [ 1 0 0 0 0 0 0 ] +sub_subinfo main::bar called_by 1 13 [ 1 0 0 0 0 0 0 [1:13] ] +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 ] -sub_subinfo main::foo called_by 1 12 [ 1 0 0 0 0 0 0 ] +sub_subinfo main::foo called_by 1 11 [ 1 0 0 0 0 0 0 [1:11] ] +sub_subinfo main::foo called_by 1 12 [ 1 0 0 0 0 0 0 [1:12] ] ======================================= --- /trunk/t/test10.rdt Thu Jul 2 14:53:40 2009 +++ /trunk/t/test10.rdt Thu Jul 9 14:28:02 2009 @@ -19,11 +19,11 @@ fid_block_time 1 2 [ 0 1 ] fid_fileinfo 1 [ test10.p 1 2 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 ] +fid_fileinfo 1 call 2 main::__ANON__[(eval 0)[test10.p:1]:1] [ 1 0 0 0 0 0 0 [1:2] ] 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 -fid_fileinfo 2 call 1 main::CORE:sleep [ 1 0 0 0 0 0 0 ] +fid_fileinfo 2 call 1 main::CORE:sleep [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[test10.p: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 ] @@ -38,6 +38,6 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub 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 ] +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 ] +sub_subinfo main::__ANON__[(eval 0)[test10.p:1]:1] called_by 1 2 [ 1 0 0 0 0 0 0 [1:2] ] ======================================= --- /trunk/t/test11.rdt Mon Jan 19 06:04:11 2009 +++ /trunk/t/test11.rdt Thu Jul 9 14:28:02 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 ] -fid_fileinfo 1 call 6 main::__ANON__[(eval 0)[test11.p:3]:1] [ 1 0 0 0 0 0 0 ] +fid_fileinfo 1 call 5 main::__ANON__[(eval 0)[test11.p:3]:1] [ 1 0 0 0 0 0 0 [1:5] ] +fid_fileinfo 1 call 6 main::__ANON__[(eval 0)[test11.p:3]:1] [ 1 0 0 0 0 0 0 [1:6] ] 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 ] -sub_subinfo main::__ANON__[(eval 0)[test11.p:3]:1] called_by 1 6 [ 1 0 0 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 [1:5] ] +sub_subinfo main::__ANON__[(eval 0)[test11.p:3]:1] called_by 1 6 [ 1 0 0 0 0 0 0 [1:6] ] ======================================= --- /trunk/t/test13.rdt Mon Dec 22 10:17:23 2008 +++ /trunk/t/test13.rdt Thu Jul 9 14:28:02 2009 @@ -26,13 +26,13 @@ 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 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 [1:20] ] +fid_fileinfo 1 call 21 main::baz [ 1 0 0 0 0 0 0 [1:21] ] 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 ] +fid_fileinfo 2 call 1 main::foo [ 1 0 0 0 0 0 0 [2:1] ] fid_line_time 1 4 [ 0 3 ] fid_line_time 1 8 [ 0 1 ] fid_line_time 1 12 [ 0 1 ] @@ -56,10 +56,10 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub 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 ] +sub_subinfo main::bar called_by 1 20 [ 1 0 0 0 0 0 0 [1:20] ] 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 ] +sub_subinfo main::baz called_by 1 21 [ 1 0 0 0 0 0 0 [1:21] ] 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 ] -sub_subinfo main::foo called_by 1 14 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::foo called_by 2 1 [ 1 0 0 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 [2:1] ] ======================================= --- /trunk/t/test14.rdt Mon Mar 23 05:06:40 2009 +++ /trunk/t/test14.rdt Thu Jul 9 14:28:02 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 ] -fid_fileinfo 1 call 18 AutoLoader::AUTOLOAD [ 1 0 0 0 0 0 0 ] -fid_fileinfo 1 call 19 AutoLoader::AUTOLOAD [ 1 0 0 0 0 0 0 ] +fid_fileinfo 1 call 17 test14::pre [ 1 0 0 0 0 0 0 [1:17] ] +fid_fileinfo 1 call 18 AutoLoader::AUTOLOAD [ 1 0 0 0 0 0 0 [1:18] ] +fid_fileinfo 1 call 19 AutoLoader::AUTOLOAD [ 1 0 0 0 0 0 0 [1:19] ] 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 ] +sub_subinfo test14::pre called_by 1 17 [ 1 0 0 0 0 0 0 [1:17] ] ======================================= --- /trunk/t/test20-streval.rdt Mon Dec 22 10:17:23 2008 +++ /trunk/t/test20-streval.rdt Thu Jul 9 14:28:02 2009 @@ -29,15 +29,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 ] +fid_fileinfo 2 call 1 main::foo [ 1 0 0 0 0 0 0 [2:1] ] 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 ] +fid_fileinfo 3 call 1 main::foo [ 1 0 0 0 0 0 0 [3:1] ] 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 ] +fid_fileinfo 4 call 1 main::foo [ 1 0 0 0 0 0 0 [4:1] ] 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 ] +fid_fileinfo 6 call 1 main::foo [ 1 0 0 0 0 0 0 [6:1] ] fid_line_time 1 3 [ 0 4 ] fid_line_time 1 5 [ 0 1 ] fid_line_time 1 8 0 0 @@ -64,7 +64,7 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub 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 ] -sub_subinfo main::foo called_by 3 1 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::foo called_by 4 1 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::foo called_by 6 1 [ 1 0 0 0 0 0 0 ] +sub_subinfo main::foo called_by 2 1 [ 1 0 0 0 0 0 0 [2:1] ] +sub_subinfo main::foo called_by 3 1 [ 1 0 0 0 0 0 0 [3:1] ] +sub_subinfo main::foo called_by 4 1 [ 1 0 0 0 0 0 0 [4:1] ] +sub_subinfo main::foo called_by 6 1 [ 1 0 0 0 0 0 0 [6:1] ] ======================================= --- /trunk/t/test21-streval3.rdt Mon Dec 22 10:17:23 2008 +++ /trunk/t/test21-streval3.rdt Thu Jul 9 14:28:02 2009 @@ -23,13 +23,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 ] +fid_fileinfo 2 call 3 main::foo [ 1 0 0 0 0 0 0 [2:3] ] 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 ] +fid_fileinfo 3 call 3 main::foo [ 1 0 0 0 0 0 0 [3:3] ] 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 ] +fid_fileinfo 4 call 3 main::foo [ 1 0 0 0 0 0 0 [4:3] ] fid_line_time 1 4 [ 0 3 ] fid_line_time 1 5 [ 0 1 ] fid_line_time 1 17 0 0 @@ -48,6 +48,6 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub 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 ] -sub_subinfo main::foo called_by 3 3 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::foo called_by 4 3 [ 1 0 0 0 0 0 0 ] +sub_subinfo main::foo called_by 2 3 [ 1 0 0 0 0 0 0 [2:3] ] +sub_subinfo main::foo called_by 3 3 [ 1 0 0 0 0 0 0 [3:3] ] +sub_subinfo main::foo called_by 4 3 [ 1 0 0 0 0 0 0 [4:3] ] ======================================= --- /trunk/t/test22-strevala.rdt Tue Jan 20 05:00:55 2009 +++ /trunk/t/test22-strevala.rdt Thu Jul 9 14:28:02 2009 @@ -26,8 +26,8 @@ fid_block_time 1 12 2 1 [ 0 2 ] fid_block_time 1 12 2 2 [ 0 4 ] fid_fileinfo 1 [ test22-strevala.p 1 2 0 0 ] -fid_fileinfo 1 call 6 main::__ANON__[(eval 0)[test22-strevala.p:6]:1] [ 1 0 0 0 0 0 0 ] -fid_fileinfo 1 call 9 main::__ANON__[(eval 0)[test22-strevala.p:9]:1] [ 2 0 0 0 0 0 0 ] +fid_fileinfo 1 call 6 main::__ANON__[(eval 0)[test22-strevala.p:6]:1] [ 1 0 0 0 0 0 0 [1:6] ] +fid_fileinfo 1 call 9 main::__ANON__[(eval 0)[test22-strevala.p:9]:1] [ 2 0 0 0 0 0 0 [1:9] ] fid_fileinfo 1 eval 6 [ 1 0 ] fid_fileinfo 1 eval 9 [ 2 0 ] fid_fileinfo 1 eval 12 [ 1 2 ] @@ -38,7 +38,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 ] +fid_fileinfo 5 call 2 main::__ANON__[(eval 0)[(eval 0)[test22-strevala.p:12]:2]:1] [ 2 0 0 0 0 0 0 [5:2] ] 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 @@ -74,8 +74,8 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub 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 ] +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 [5:2] ] 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 ] +sub_subinfo main::__ANON__[(eval 0)[test22-strevala.p:6]:1] called_by 1 6 [ 1 0 0 0 0 0 0 [1:6] ] 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 ] +sub_subinfo main::__ANON__[(eval 0)[test22-strevala.p:9]:1] called_by 1 9 [ 2 0 0 0 0 0 0 [1:9] ] ======================================= --- /trunk/t/test30-fork-0.rdt Thu Jul 2 14:53:40 2009 +++ /trunk/t/test30-fork-0.rdt Thu Jul 9 14:28:02 2009 @@ -25,12 +25,12 @@ 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_fileinfo 1 call 22 main::CORE:wait [ 1 0 0 0 0 0 0 ] +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 [1:15] ] +fid_fileinfo 1 call 19 main::postfork [ 1 0 0 0 0 0 0 [1:19] ] +fid_fileinfo 1 call 20 main::other [ 1 0 0 0 0 0 0 [1:20] ] +fid_fileinfo 1 call 22 main::CORE:wait [ 1 0 0 0 0 0 0 [1:22] ] fid_line_time 1 2 [ 0 1 ] fid_line_time 1 3 [ 0 1 ] fid_line_time 1 7 [ 0 3 ] @@ -53,12 +53,12 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub 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 ] +sub_subinfo main::CORE:wait called_by 1 22 [ 1 0 0 0 0 0 0 [1:22] ] 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 ] -sub_subinfo main::other called_by 1 12 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::other called_by 1 20 [ 1 0 0 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 [1:20] ] 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 ] +sub_subinfo main::postfork called_by 1 19 [ 1 0 0 0 0 0 0 [1:19] ] 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 ] +sub_subinfo main::prefork called_by 1 15 [ 1 0 0 0 0 0 0 [1:15] ] ======================================= --- /trunk/t/test40pmc.rdt Mon Dec 22 10:17:23 2008 +++ /trunk/t/test40pmc.rdt Thu Jul 9 14:28:02 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 ] +fid_fileinfo 1 call 4 test40pmc::foo [ 1 0 0 0 0 0 0 [1:4] ] 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 ] +sub_subinfo test40pmc::foo called_by 1 4 [ 1 0 0 0 0 0 0 [1:4] ] ======================================= --- /trunk/t/test50-disable.rdt Wed Apr 22 06:50:48 2009 +++ /trunk/t/test50-disable.rdt Thu Jul 9 14:28:02 2009 @@ -17,8 +17,8 @@ fid_block_time 1 4 [ 0 1 ] fid_block_time 1 5 [ 0 1 ] fid_fileinfo 1 [ test50-disable.p 1 2 0 0 ] -fid_fileinfo 1 call 2 DB::disable_profile [ 1 0 0 0 0 0 0 ] -fid_fileinfo 1 call 6 DB::disable_profile [ 1 0 0 0 0 0 0 ] +fid_fileinfo 1 call 2 DB::disable_profile [ 1 0 0 0 0 0 0 [1:2] ] +fid_fileinfo 1 call 6 DB::disable_profile [ 1 0 0 0 0 0 0 [1:6] ] fid_line_time 1 1 [ 0 1 ] fid_line_time 1 2 [ 0 1 ] fid_line_time 1 4 [ 0 1 ] @@ -31,5 +31,5 @@ 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 ] -sub_subinfo DB::disable_profile called_by 1 6 [ 1 0 0 0 0 0 0 ] +sub_subinfo DB::disable_profile called_by 1 2 [ 1 0 0 0 0 0 0 [1:2] ] +sub_subinfo DB::disable_profile called_by 1 6 [ 1 0 0 0 0 0 0 [1:6] ] ======================================= --- /trunk/t/test51-enable.rdt Wed Apr 22 06:50:48 2009 +++ /trunk/t/test51-enable.rdt Thu Jul 9 14:28:02 2009 @@ -20,8 +20,8 @@ fid_block_time 1 7 2 1 [ 0 1 ] fid_block_time 1 9 [ 0 1 ] fid_fileinfo 1 [ test51-enable.p 1 2 0 0 ] -fid_fileinfo 1 call 9 main::sub1 [ 1 0 0 0 0 0 0 ] -fid_fileinfo 1 call 11 DB::disable_profile [ 1 0 0 0 0 0 0 ] +fid_fileinfo 1 call 9 main::sub1 [ 1 0 0 0 0 0 0 [1:9] ] +fid_fileinfo 1 call 11 DB::disable_profile [ 1 0 0 0 0 0 0 [1:11] ] 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 @@ -45,7 +45,7 @@ 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 ] +sub_subinfo DB::disable_profile called_by 1 11 [ 1 0 0 0 0 0 0 [1:11] ] 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 ] +sub_subinfo main::sub1 called_by 1 9 [ 1 0 0 0 0 0 0 [1:9] ] sub_subinfo main::sub9 [ 3 1 1 0 0 0 0 0 ] ======================================= --- /trunk/t/test60-subname.rdt Thu Jul 2 14:53:40 2009 +++ /trunk/t/test60-subname.rdt Thu Jul 9 14:28:02 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 ] -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 22 main::CORE:wait [ 1 0 0 0 0 0 0 ] -fid_fileinfo 1 call 28 main::launch [ 1 0 0 0 0 0 0 ] +fid_fileinfo 1 call 5 Devel::NYTProf::Test::example_xsub [ 1 0 0 0 0 0 0 [1:5] ] +fid_fileinfo 1 call 9 Devel::NYTProf::Test::example_xsub [ 1 0 0 0 0 0 0 [1:9] ] +fid_fileinfo 1 call 12 Devel::NYTProf::Test::example_xsub [ 1 0 0 0 0 0 0 [1:12] ] +fid_fileinfo 1 call 16 Devel::NYTProf::Test::example_xsub [ 1 0 0 0 0 0 0 [1:16] ] +fid_fileinfo 1 call 19 Devel::NYTProf::Test::example_xsub [ 1 0 0 0 0 0 0 [1:19] ] +fid_fileinfo 1 call 22 main::CORE:wait [ 1 0 0 0 0 0 0 [1:22] ] +fid_fileinfo 1 call 28 main::launch [ 1 0 0 0 0 0 0 [1:28] ] 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 ] -sub_subinfo Devel::NYTProf::Test::example_xsub called_by 1 9 [ 1 0 0 0 0 0 0 ] -sub_subinfo Devel::NYTProf::Test::example_xsub called_by 1 12 [ 1 0 0 0 0 0 0 ] -sub_subinfo Devel::NYTProf::Test::example_xsub called_by 1 16 [ 1 0 0 0 0 0 0 ] -sub_subinfo Devel::NYTProf::Test::example_xsub called_by 1 19 [ 1 0 0 0 0 0 0 ] +sub_subinfo Devel::NYTProf::Test::example_xsub called_by 1 5 [ 1 0 0 0 0 0 0 [1:5] ] +sub_subinfo Devel::NYTProf::Test::example_xsub called_by 1 9 [ 1 0 0 0 0 0 0 [1:9] ] +sub_subinfo Devel::NYTProf::Test::example_xsub called_by 1 12 [ 1 0 0 0 0 0 0 [1:12] ] +sub_subinfo Devel::NYTProf::Test::example_xsub called_by 1 16 [ 1 0 0 0 0 0 0 [1:16] ] +sub_subinfo Devel::NYTProf::Test::example_xsub called_by 1 19 [ 1 0 0 0 0 0 0 [1:19] ] 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 ] +sub_subinfo main::CORE:wait called_by 1 22 [ 1 0 0 0 0 0 0 [1:22] ] 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 ] +sub_subinfo main::launch called_by 1 28 [ 1 0 0 0 0 0 0 [1:28] ] ======================================= --- /trunk/t/test61-submerge.rdt Tue Jan 20 05:00:55 2009 +++ /trunk/t/test61-submerge.rdt Thu Jul 9 14:28:02 2009 @@ -20,17 +20,17 @@ fid_block_time 1 8 2 2 [ 0 3 ] fid_fileinfo 1 [ test61-submerge.p 1 2 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 ] +fid_fileinfo 1 call 8 main::__ANON__[(eval 0)[test61-submerge.p:8]:1] [ 3 0 0 0 0 0 0 [1:8] ] 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 -fid_fileinfo 2 call 1 main::foo [ 1 0 0 0 0 0 0 ] +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 3 [ (eval 0)[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 ] +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 4 [ (eval 0)[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 ] +fid_fileinfo 4 call 1 main::foo [ 1 0 0 0 0 0 0 main::__ANON__[(eval 0)[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 0 @@ -47,8 +47,8 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub 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 ] +sub_subinfo main::__ANON__[(eval 0)[test61-submerge.p:8]:1] called_by 1 8 [ 3 0 0 0 0 0 0 [1:8] ] 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 ] -sub_subinfo main::foo called_by 3 1 [ 1 0 0 0 0 0 0 ] -sub_subinfo main::foo called_by 4 1 [ 1 0 0 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] ] ======================================= --- /trunk/t/test80-recurs.rdt Thu Jul 2 15:55:13 2009 +++ /trunk/t/test80-recurs.rdt Thu Jul 9 14:28:02 2009 @@ -16,8 +16,8 @@ fid_block_time 1 7 [ 0 1 ] fid_fileinfo 1 [ test80-recurs.p 1 2 0 0 ] fid_fileinfo 1 sub main::recurs 1-5 -fid_fileinfo 1 call 4 main::recurs [ 2 0 0 0 0 0 2 ] -fid_fileinfo 1 call 7 main::recurs [ 1 0 0 0 0 0 0 ] +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 [1:7] ] fid_line_time 1 2 [ 0 3 ] fid_line_time 1 3 [ 0 3 ] fid_line_time 1 4 [ 0 3 ] @@ -28,5 +28,5 @@ profile_modes fid_line_time line profile_modes fid_sub_time sub 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 ] -sub_subinfo main::recurs called_by 1 7 [ 1 0 0 0 0 0 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 [1:7] ] --~--~---------~--~----~------------~-------~--~----~ 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] -~----------~----~----~----~------~----~------~--~---
