Changeset 2773 for trunk/plugins/event_tracer

Timestamp:

Oct 18, 2008, 3:08:58 AM (16 years ago)

Author:

rvelices

Message:

merge rev 2771,2772 from branch 2.0

• 2771 event tracer improvement: option to show all registered event handlers for every page
• 2772 php optims (small): remove/replace preg_xxx with faster simple string functions

Location:

trunk/plugins/event_tracer

Files:

• main.inc.php (modified) (6 diffs)
• tracer_admin.php (modified) (2 diffs)
• tracer_admin.tpl (modified) (1 diff)

trunk/plugins/event_tracer/main.inc.php

@@ -35 +35 @@
 class EventTracer
 {
-  var $me_working;
   var $my_config;
+  var $trigger_counts = array();
 
   function EventTracer()
   {
-    $this->me_working=0;
   }
 
@@ -68 +67 @@
       $this->my_config['filters'] = array( '.*' );
       $this->my_config['show_args'] = false;
+      $this->my_config['show_registered'] = true;
       $this->save_config();
     }
@@ -83 +83 @@
   function on_pre_trigger_event($event_info)
   {
+    @$this->trigger_counts[$event_info['event']]++;
     $this->dump('pre_trigger_event', $event_info);
   }
@@ -92 +93 @@
   function on_trigger_action($event_info)
   {
+   @$this->trigger_counts[$event_info['event']]++;
     $this->dump('trigger_action', $event_info);
+  }
+
+  function on_page_tail()
+  {
+    if (1 || @$this->my_config['show_registered'])
+    {
+      global $debug, $pwg_event_handlers;
+      $out = '';
+      foreach ($pwg_event_handlers as $event => $prio_array)
+      {
+        $out .= $event.' '.intval(@$this->trigger_counts[$event])." calls\n";
+        foreach ($prio_array as $prio => $handlers)
+        {
+          foreach ($handlers as $handler)
+          {
+            $out .= "\t$prio ";
+            if ( is_array($handler['function']) )
+            {
+              if ( is_string($handler['function'][0]) )
+                $out .= $handler['function'][0].'::';
+              else
+                $out .= @get_class($handler['function'][0]).'->';
+              $out .= $handler['function'][1];
+            }
+            else
+             $out .= $handler['function'];
+            $out .= "\n";
+          }
+        }
+        $out .= "\n";
+      }
+      $debug .= '<pre>'.$out.'</pre>';
+    }
   }
 
@@ -109 +144 @@
         else
           $s = '';
-        pwg_debug($event.' "'.$event_info['event'].'" '.($s) );
+        pwg_debug($event.' "'.$event_info['event'].'" '.($this->trigger_counts[$event_info['event']]).' calls '.($s) );
         break;
       }
@@ -133 +168 @@
 add_event_handler('pre_trigger_event', array(&$obj, 'on_pre_trigger_event') );
 add_event_handler('post_trigger_event', array(&$obj, 'on_post_trigger_event') );
+add_event_handler('loc_begin_page_tail', array(&$obj, 'on_page_tail') );
 add_event_handler('trigger_action', array(&$obj, 'on_trigger_action') );
 set_plugin_data($plugin['id'], $obj);

trunk/plugins/event_tracer/tracer_admin.php

@@ -18 +18 @@
     $me->my_config['filters'] = array();
   $me->my_config['show_args'] = isset($_POST['eventTracer_show_args']);
+  $me->my_config['show_registered'] = isset($_POST['eventTracer_show_registered']);
   $me->save_config();
   global $page;
@@ -25 +26 @@
 $template->assign('EVENT_TRACER_SHOW_ARGS', $me->my_config['show_args'] ? 'checked="checked"' : '' );
 $template->assign('U_LIST_EVENTS', get_admin_plugin_menu_link(dirname(__FILE__).'/event_list.php'));
+$template->assign('EVENT_TRACER_SHOW_REGISTERED', $me->my_config['show_registered'] ? 'checked="checked"' : '' );
 
 //$template->assign_var('EVENT_TRACER_F_ACTION', $my_url);

trunk/plugins/event_tracer/tracer_admin.tpl

@@ -13 +13 @@
         <legend>Event Tracer</legend>
 
-<label>Show event argument
+<label>Show event arguments
         <input type="checkbox" name="eventTracer_show_args" {$EVENT_TRACER_SHOW_ARGS} />
 </label>
+
 <br/>
+
 <label>Fill below a list of regular expressions (one per line).
 An event will be logged if its name matches at least one expression in the list.
         <textarea name="eventTracer_filters" id="eventTracer_filters"rows="10" cols="80">{$EVENT_TRACER_FILTERS}</textarea>
+</label>
+
+<br/>
+
+<label>Show all registered handlers
+        <input type="checkbox" name="eventTracer_show_registered" {$EVENT_TRACER_SHOW_REGISTERED} />
 </label>