Use SplHeap for handler sorting

szjani · Jan 11, 2015 · 9983c3c · 9983c3c
1 parent 095adaf
commit 9983c3c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 115 deletions.
diff --git a/composer.json b/composer.json
@@ -11,7 +11,7 @@
     ],
     "require": {
         "php": ">=5.4",
-        "precore/precore": "~1.8",
+        "precore/precore": "~1.9@dev",
         "doctrine/annotations": "~1.1",
         "doctrine/cache": "~1.0",
         "lf4php/lf4php": "~4.2",

diff --git a/src/predaddy/messagehandling/FunctionDescriptors.php b/src/predaddy/messagehandling/FunctionDescriptors.php
diff --git a/src/predaddy/messagehandling/InterceptableMessageBus.php b/src/predaddy/messagehandling/InterceptableMessageBus.php
@@ -29,6 +29,7 @@
 use Iterator;
 use precore\lang\Object;
 use predaddy\messagehandling\util\MessageCallbackClosures;
+use SplFixedArray;
 
 /**
  * @author Janos Szurovecz <szjani@szjani.hu>
@@ -41,7 +42,7 @@ abstract class InterceptableMessageBus extends Object implements MessageBus
     private static $emptyCallback;
 
     /**
-     * @var DispatchInterceptor[]
+     * @var SplFixedArray
      */
     private $interceptors;
 
@@ -55,7 +56,7 @@ public static function init()
 
     public function __construct(array $interceptors = [])
     {
-        $this->interceptors = $interceptors;
+        $this->interceptors = SplFixedArray::fromArray($interceptors);
     }
 
     /**
@@ -103,24 +104,16 @@ final protected static function emptyCallback()
         return self::$emptyCallback;
     }
 
-    /**
-     * @return Iterator of Interceptor
-     */
-    protected function createInterceptorIterator()
-    {
-        return new ArrayIterator($this->interceptors);
-    }
-
     /**
      * @param $message
      * @param Closure $dispatchClosure
      * @return InterceptorChain
      */
-    protected function createChain($message, Closure $dispatchClosure)
+    private function createChain($message, Closure $dispatchClosure)
     {
         return new DefaultInterceptorChain(
             $message,
-            $this->createInterceptorIterator(),
+            $this->interceptors,
             $dispatchClosure
         );
     }

diff --git a/src/predaddy/messagehandling/SimpleMessageBus.php b/src/predaddy/messagehandling/SimpleMessageBus.php
@@ -27,6 +27,7 @@
 use Closure;
 use Exception;
 use precore\lang\ObjectClass;
+use precore\util\Collections;
 use precore\util\Objects;
 use SplObjectStorage;
 
@@ -67,7 +68,7 @@ class SimpleMessageBus extends InterceptableMessageBus implements HandlerFactory
     private $exceptionHandler;
 
     /**
-     * @var FunctionDescriptors
+     * @var SplObjectStorage
      */
     private $functionDescriptors;
 
@@ -84,7 +85,7 @@ public function __construct(SimpleMessageBusBuilder $builder = null)
         $this->exceptionHandler = $builder->getExceptionHandler();
         $this->handlerDescriptorFactory = $builder->getHandlerDescriptorFactory();
         $this->closureDescriptorFactory = $builder->getHandlerDescriptorFactory()->getFunctionDescriptorFactory();
-        $this->functionDescriptors = new FunctionDescriptors();
+        $this->functionDescriptors = new SplObjectStorage();
         $this->factories = new SplObjectStorage();
     }
 
@@ -113,8 +114,8 @@ public function unregisterHandlerFactory(Closure $factory)
     public function register($handler)
     {
         $descriptor = $this->handlerDescriptorFactory->create($handler);
-        foreach ($descriptor->getFunctionDescriptors() as $functionDescriptors) {
-            $this->functionDescriptors->add($functionDescriptors);
+        foreach ($descriptor->getFunctionDescriptors() as $functionDescriptor) {
+            $this->functionDescriptors->attach($functionDescriptor);
         }
     }
 
@@ -124,8 +125,8 @@ public function register($handler)
     public function unregister($handler)
     {
         $descriptor = $this->handlerDescriptorFactory->create($handler);
-        foreach ($descriptor->getFunctionDescriptors() as $functionDescriptors) {
-            $this->functionDescriptors->remove($functionDescriptors);
+        foreach ($descriptor->getFunctionDescriptors() as $functionDescriptor) {
+            $this->functionDescriptors->detach($functionDescriptor);
         }
     }
 
@@ -136,7 +137,7 @@ public function unregister($handler)
     public function registerClosure(Closure $closure, $priority = self::DEFAULT_PRIORITY)
     {
         $descriptor = $this->closureDescriptorFactory->create(new ClosureWrapper($closure), $priority);
-        $this->functionDescriptors->add($descriptor);
+        $this->functionDescriptors->attach($descriptor);
     }
 
     /**
@@ -146,7 +147,13 @@ public function registerClosure(Closure $closure, $priority = self::DEFAULT_PRIO
     public function unregisterClosure(Closure $closure, $priority = self::DEFAULT_PRIORITY)
     {
         $descriptor = $this->closureDescriptorFactory->create(new ClosureWrapper($closure), $priority);
-        $this->functionDescriptors->remove($descriptor);
+        $this->functionDescriptors->detach($descriptor);
+        foreach ($this->functionDescriptors as $key => $value) {
+            if ($value->equals($descriptor)) {
+                $this->functionDescriptors->offsetUnset($value);
+                break;
+            }
+        }
     }
 
     /**
@@ -204,13 +211,19 @@ protected function dispatch($message, MessageCallback $callback)
 
     /**
      * @param $message
-     * @return \Traversable|\Countable
+     * @return ArrayObject
      */
     protected function callableWrappersFor($message)
     {
         $objectClass = ObjectClass::forName(get_class($message));
-        /* @var $functionDescriptors FunctionDescriptors */
-        $functionDescriptors = clone $this->functionDescriptors;
+        $heap = Collections::createHeap(Collections::reverseOrder());
+
+        /* @var $functionDescriptor FunctionDescriptor */
+        foreach ($this->functionDescriptors as $functionDescriptor) {
+            if ($functionDescriptor->isHandlerFor($objectClass)) {
+                $heap->insert($functionDescriptor);
+            }
+        }
 
         foreach ($this->factories as $factory) {
             /* @var $factoryDescriptor FunctionDescriptor */
@@ -219,17 +232,14 @@ protected function callableWrappersFor($message)
                 $handler = call_user_func($factory, $message);
                 $descriptor = $this->handlerDescriptorFactory->create($handler);
                 foreach ($descriptor->getFunctionDescriptors() as $functionDescriptor) {
-                    $functionDescriptors->add($functionDescriptor);
+                    $heap->insert($functionDescriptor);
                 }
             }
         }
 
         $res = new ArrayObject();
-        /* @var $functionDescriptor FunctionDescriptor */
-        foreach ($functionDescriptors as $functionDescriptor) {
-            if ($functionDescriptor->isHandlerFor($objectClass)) {
-                $res->append($functionDescriptor->getCallableWrapper());
-            }
+        foreach ($heap as $functionDescriptor) {
+            $res->append($functionDescriptor->getCallableWrapper());
         }
         return $res;
     }