[Jifty-commit] r5436 - Runops-Trace/trunk

[Jifty commits]

Author: nothingmuch
Date: Sat May 10 10:22:57 2008
New Revision: 5436

Modified:
   Runops-Trace/trunk/Trace.xs

Log:
opmask is everything

Modified: Runops-Trace/trunk/Trace.xs
==============================================================================
--- Runops-Trace/trunk/Trace.xs	(original)
+++ Runops-Trace/trunk/Trace.xs	Sat May 10 10:22:57 2008
@@ -42,8 +42,12 @@
 
     /* global flag controls all hooking behavior */
     if (Runops_Trace_enabled) {
-      if (Runops_Trace_hook && CALL_FPTR( Runops_Trace_hook) (aTHX))
-        continue;
+      /* only trace enabled ops */
+      if (!Runops_Trace_mask || Runops_Trace_mask[PL_op->op_type]) {
+        /* the hook may have assigned PL_op itself */
+        if (Runops_Trace_hook && CALL_FPTR( Runops_Trace_hook) (aTHX))
+          continue;
+      }
     }
 
     PL_op = CALL_FPTR(PL_op->op_ppaddr)(aTHX);
@@ -163,10 +167,6 @@
   int ret;
   IV arity;
 
-  /* only trace enabled ops */
-  if (Runops_Trace_mask && !Runops_Trace_mask[PL_op->op_type])
-    return 0;
-
   /* if the threshold is enabled, only trace if the op has exceeded the threshold */
   if (Runops_Trace_threshold != 0) {
     SV **count;