Revision: 1415
Author:   [email protected]
Date:     Thu Mar 22 08:46:17 2012
Log:      nytprofmerge no longer dies on some errors, RT#75918
http://code.google.com/p/perl-devel-nytprof/source/detail?r=1415

Modified:
 /trunk/Changes
 /trunk/bin/nytprofmerge

=======================================
--- /trunk/Changes      Thu Mar 22 08:07:46 2012
+++ /trunk/Changes      Thu Mar 22 08:46:17 2012
@@ -13,6 +13,7 @@
   Added and clarified some notes in the troubleshooting docs.
   Added warning for Apache2::SizeLimit in ::Apache, RT#75912.
   Updated ::Apache docs including troubleshooting, RT#75912.
+  nytprofmerge no longer dies on some errors, RT#75918.

 =head2 Changes in Devel::NYTProf 4.06 (svn r1406) 30th Nov 2010

=======================================
--- /trunk/bin/nytprofmerge     Fri Nov 19 08:45:40 2010
+++ /trunk/bin/nytprofmerge     Thu Mar 22 08:46:17 2012
@@ -215,14 +215,20 @@
            if($eval_fid) {
                # Generally, treat every eval as distinct, even at the same 
location
                $new_eval_fid = $fids{$eval_fid};
-               confess("unknown eval_fid $eval_fid") unless defined 
$new_eval_fid;
+
+               # Sanity check. Should never happen except that
+               # if $eval_fid < $fid then this is a known problem
+               # with evals fids getting profiled/output before the parent fid
+               warn("unknown eval_fid $eval_fid in $input fid $fid\n")
+                   unless defined $new_eval_fid;

                $new_fid = $next_fid++;
                $fids{$fid} = $new_fid;

                # But also track the first fid to be allocated at that line of 
the eval
                my $folded_fid = $fids_folded{$eval_fid};
-               confess("unknown folded eval_fid $eval_fid") unless defined 
$folded_fid;
+               Carp::cluck("unknown folded eval_fid $eval_fid in $input fid 
$fid")
+                   unless defined $folded_fid;

                my $corresponding_eval = $eval_to_fid{"$folded_fid,$eval_line"};
                if (!defined $corresponding_eval) {

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