[Catalyst-commits] r7039 - in Catalyst-Runtime/5.70/trunk/lib: . Catalyst

[jrockway at dev.catalyst.perl.org]

Author: jrockway
Date: 2007-10-22 05:53:07 +0100 (Mon, 22 Oct 2007)
New Revision: 7039

Modified:
   Catalyst-Runtime/5.70/trunk/lib/Catalyst.pm
   Catalyst-Runtime/5.70/trunk/lib/Catalyst/Stats.pm
Log:
fix from Jon Schutz


Modified: Catalyst-Runtime/5.70/trunk/lib/Catalyst/Stats.pm
===================================================================
--- Catalyst-Runtime/5.70/trunk/lib/Catalyst/Stats.pm	2007-10-22 02:40:24 UTC (rev 7038)
+++ Catalyst-Runtime/5.70/trunk/lib/Catalyst/Stats.pm	2007-10-22 04:53:07 UTC (rev 7039)
@@ -62,7 +62,7 @@
     }
     if ($params{parent}) {
     # parent is explicitly defined
-    $prev = $parent = $self->_get_uid($params{parent}) or return undef;
+    $prev = $parent = $self->_get_uid($params{parent});
     }
     if (!$parent) {
     # Find previous node, which is either previous sibling or parent, for ref time.

Modified: Catalyst-Runtime/5.70/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.70/trunk/lib/Catalyst.pm	2007-10-22 02:40:24 UTC (rev 7038)
+++ Catalyst-Runtime/5.70/trunk/lib/Catalyst.pm	2007-10-22 04:53:07 UTC (rev 7039)
@@ -1266,24 +1266,29 @@
         }
     }
 
+    my $uid = "$code" . $c->counter->{"$code"};
+
     # is this a root-level call or a forwarded call?
     if ( $callsub =~ /forward$/ ) {
 
         # forward, locate the caller
         if ( my $parent = $c->stack->[-1] ) {
             $c->stats->profile(begin => $action, 
-                               parent => "$parent" . $c->counter->{"$parent"});
+                               parent => "$parent" . $c->counter->{"$parent"},
+			       uid => $uid);
         }
         else {
 
             # forward with no caller may come from a plugin
-            $c->stats->profile(begin => $action);
+            $c->stats->profile(begin => $action,
+			       uid => $uid);
         }
     }
     else {
         
         # root-level call
-        $c->stats->profile(begin => $action);
+        $c->stats->profile(begin => $action,
+			   uid => $uid);
     }
     return $action;