merged branch drak/eventdispatcher_opimization (PR symfony#2597)

fabpot · fabpot · commit db6fea9fd014 · 2011-11-11T08:31:28.000+01:00
Commits ------- 0fe8ac6 [EventDispatcher] Removed unused argument. Discussion ---------- [EventDispatcher] Removed unused parameter in doDispatch(). Bug fix: no Feature addition: no Backwards compatibility break: no Symfony2 tests pass: yes Fixes the following tickets: - Removed unused parameter. --------------------------------------------------------------------------- by Seldaek at 2011/11/10 02:30:01 -0800 A simple $foo($arg) is faster than call_user_func, fine, but with all the if/else logic here are you sure it is still faster? --------------------------------------------------------------------------- by drak at 2011/11/10 06:44:41 -0800 call_user_func is inordinately slow, I'll make some benchmarks. The if logic here is pretty, two conditionals for array callables or one conditional for closures/functions. --------------------------------------------------------------------------- by drak at 2011/11/10 12:45:27 -0800 After doing some benchmarks, there are savings to be made in all cases except when the listener is an instantiated object when it's marginally slower, so I've reverted these changes and made this PR just to remove the unused argument in `doDispatch()`. You can see the benchmark code here: https://gist.github.com/1356129. --------------------------------------------------------------------------- by drak at 2011/11/10 12:46:55 -0800 This PR is ready for consideration.
diff --git a/src/Symfony/Component/EventDispatcher/EventDispatcher.php b/src/Symfony/Component/EventDispatcher/EventDispatcher.php
@@ -47,7 +47,7 @@ public function dispatch($eventName, Event $event = null)
             $event = new Event();
         }
 
-        $this->doDispatch($this->getListeners($eventName), $eventName, $event);
+        $this->doDispatch($this->getListeners($eventName), $event);
     }
 
     /**
@@ -150,10 +150,9 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)
      * for each listener.
      *
      * @param array[callback] $listeners The event listeners.
-     * @param string $eventName The name of the event to dispatch.
      * @param Event $event The event object to pass to the event handlers/listeners.
      */
-    protected function doDispatch($listeners, $eventName, Event $event)
+    protected function doDispatch($listeners, Event $event)
     {
         foreach ($listeners as $listener) {
             call_user_func($listener, $event);

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function dispatch($eventName, Event $event = null)`
`47`	`47`	`$event = new Event();`
`48`	`48`	`}`
`49`	`49`
`50`		`- $this->doDispatch($this->getListeners($eventName), $eventName, $event);`
	`50`	`+ $this->doDispatch($this->getListeners($eventName), $event);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
`@@ -150,10 +150,9 @@ public function removeSubscriber(EventSubscriberInterface $subscriber)`
`150`	`150`	`* for each listener.`
`151`	`151`	`*`
`152`	`152`	`* @param array[callback] $listeners The event listeners.`
`153`		`- * @param string $eventName The name of the event to dispatch.`
`154`	`153`	`* @param Event $event The event object to pass to the event handlers/listeners.`
`155`	`154`	`*/`
`156`		`- protected function doDispatch($listeners, $eventName, Event $event)`
	`155`	`+ protected function doDispatch($listeners, Event $event)`
`157`	`156`	`{`
`158`	`157`	`foreach ($listeners as $listener) {`
`159`	`158`	`call_user_func($listener, $event);`