Improve message listener system for 5x higher throughput

Author: timothyschoen

Libraries/pure-data

@@ -193,7 +193,7 @@ Canvas::~Canvas()
     saveViewportState();
     zoomScale.removeListener(this);
     editor->removeModifierKeyListener(this);
-    pd->unregisterMessageListener(patch.getUncheckedPointer(), this);
+    pd->unregisterMessageListener(this);
     patch.setVisible(false);
 }
 
@@ -2478,7 +2478,7 @@ bool Canvas::panningModifierDown()
     return isPanDragKeysActive || ModifierKeys::getCurrentModifiers().isMiddleButtonDown();
 }
 
-void Canvas::receiveMessage(t_symbol* symbol, StackArray<pd::Atom, 8> const& atoms, int numAtoms)
+void Canvas::receiveMessage(t_symbol* symbol, StackArray<pd::Atom, 7> const& atoms, int numAtoms)
 {
     switch (hash(symbol->s_name)) {
     case hash("sync"):

Source/Canvas.cpp

@@ -177,7 +177,7 @@ class Canvas : public Component
 
     ObjectParameters& getInspectorParameters();
 
-    void receiveMessage(t_symbol* symbol, StackArray<pd::Atom, 8> const& atoms, int numAtoms) override;
+    void receiveMessage(t_symbol* symbol, StackArray<pd::Atom, 7> const& atoms, int numAtoms) override;
 
     void activateCanvasSearchHighlight(Object* obj);
     void removeCanvasSearchHighlight();

Source/Canvas.h

@@ -93,7 +93,7 @@ Connection::Connection(Canvas* parent, Iolet* s, Iolet* e, t_outconnect* oc)
 
 Connection::~Connection()
 {
-    cnv->pd->unregisterMessageListener(ptr.getRawUnchecked<void>(), this);
+    cnv->pd->unregisterMessageListener(this);
     cnv->selectedComponents.removeChangeListener(this);
 
     if (outlet) {
@@ -369,14 +369,28 @@ void Connection::popPathState()
     updatePath();
 }
 
+t_pd* Connection::getTargetObject(t_outconnect* oc)
+{
+    struct _outconnect
+    {
+        struct _outconnect *oc_next;
+        t_pd *oc_to;
+        t_symbol* oc_path_data;
+        t_signal* oc_signal;
+        void* oc_signal_reference;
+    };
+    
+    return reinterpret_cast<_outconnect*>(oc)->oc_to;
+}
+
 void Connection::setPointer(t_outconnect* newPtr)
 {
     auto originalPointer = ptr.getRawUnchecked<t_outconnect>();
     if (originalPointer != newPtr) {
         ptr = pd::WeakReference(newPtr, cnv->pd);
 
-        cnv->pd->unregisterMessageListener(originalPointer, this);
-        cnv->pd->registerMessageListener(newPtr, this);
+        cnv->pd->unregisterMessageListener(this);
+        cnv->pd->registerMessageListener(getTargetObject(newPtr), this);
     }
 }
 
@@ -569,8 +583,8 @@ StringArray Connection::getMessageFormated()
         formatedMessage.add("symbol:");
         formatedMessage.add(args[0].toString());
     } else if (name == "list") {
-        if (lastNumArgs >= 8) {
-            formatedMessage.add("list (7+):");
+        if (lastNumArgs >= 7) {
+            formatedMessage.add("list (6+):");
         } else {
             formatedMessage.add("list (" + String(lastNumArgs) + "):");
         }
@@ -581,7 +595,7 @@ StringArray Connection::getMessageFormated()
                 formatedMessage.add(args[arg].toString());
             }
         }
-        if (lastNumArgs >= 8) {
+        if (lastNumArgs >= 7) {
             formatedMessage.add("...");
         }
     } else {
@@ -1366,7 +1380,7 @@ void ConnectionPathUpdater::timerCallback()
     canvas->patch.endUndoSequence("SetConnectionPaths");
 }
 
-void Connection::receiveMessage(t_symbol* symbol, StackArray<pd::Atom, 8> const& atoms, int numAtoms)
+void Connection::receiveMessage(t_symbol* symbol, StackArray<pd::Atom, 7> const& atoms, int numAtoms)
 {
     if (cnv->shouldShowConnectionActivity()) {
         startTimer(StopAnimation, 1000 / 8.0f);

Source/Connection.cpp

@@ -97,7 +97,7 @@ class Connection : public DrawablePath
 
     bool straightLineIntersectsObject(Line<float> toCheck, SmallArray<Object*>& objects);
 
-    void receiveMessage(t_symbol* symbol, StackArray<pd::Atom, 8> const& atoms, int numAtoms) override;
+    void receiveMessage(t_symbol* symbol, StackArray<pd::Atom, 7> const& atoms, int numAtoms) override;
 
     bool isSelected() const;
 
@@ -111,6 +111,8 @@ class Connection : public DrawablePath
         Animation };
 
     void timerCallback(int ID) override;
+        
+    static t_pd* getTargetObject(t_outconnect* oc);
 
     void animate();
 
@@ -158,7 +160,7 @@ class Connection : public DrawablePath
     NVGCachedPath cachedPath;
     pd::WeakReference ptr;
 
-    StackArray<pd::Atom, 8> lastValue;
+    StackArray<pd::Atom, 7> lastValue;
     int lastNumArgs = 0;
     t_symbol* lastSelector = nullptr;
 

Source/Connection.h

@@ -57,7 +57,7 @@ class GraphicalArray : public Component
 
     ~GraphicalArray()
     {
-        pd->unregisterMessageListener(arr.getRawUnchecked<void>(), this);
+        pd->unregisterMessageListener(this);
     }
 
     static HeapArray<float> rescale(HeapArray<float> const& v, unsigned const newSize)
@@ -222,7 +222,7 @@ class GraphicalArray : public Component
         }
     }
 
-    void receiveMessage(t_symbol* symbol, StackArray<pd::Atom, 8> const& atoms, int numAtoms) override
+    void receiveMessage(t_symbol* symbol, StackArray<pd::Atom, 7> const& atoms, int numAtoms) override
     {
         switch (hash(symbol->s_name)) {
         case hash("edit"): {
@@ -712,7 +712,7 @@ struct ArrayPropertiesPanel : public PropertiesPanelProperty
 
     AddArrayButton addButton;
     OwnedArray<SmallIconButton> deleteButtons;
-    SmallArray<Value> nameValues;
+    HeapArray<Value> nameValues;
 
     std::function<void()> syncCanvas = []() { };
 
@@ -1316,7 +1316,7 @@ class ArrayObject final : public ObjectBase {
         });
     }
 
-    void receiveObjectMessage(hash32 symbol, StackArray<pd::Atom, 8> const& atoms, int numAtoms) override
+    void receiveObjectMessage(hash32 symbol, StackArray<pd::Atom, 7> const& atoms, int numAtoms) override
     {
         switch (symbol) {
         case hash("redraw"): {
@@ -1409,7 +1409,7 @@ class ArrayDefineObject final : public TextBase {
         }
     }
 
-    void receiveObjectMessage(hash32 symbol, StackArray<pd::Atom, 8> const& atoms, int numAtoms) override
+    void receiveObjectMessage(hash32 symbol, StackArray<pd::Atom, 7> const& atoms, int numAtoms) override
     {
     }
 };

Source/Objects/ArrayObject.h

@@ -206,7 +206,7 @@ class BangObject final : public ObjectBase
         }
     }
 
-    void receiveObjectMessage(hash32 symbol, StackArray<pd::Atom, 8> const& atoms, int numAtoms) override
+    void receiveObjectMessage(hash32 symbol, StackArray<pd::Atom, 7> const& atoms, int numAtoms) override
     {
         switch (symbol) {
         case hash("float"):

Source/Objects/BangObject.h

@@ -624,7 +624,7 @@ class BicoeffObject final : public ObjectBase {
         graph.saveProperties();
     }
 
-    void receiveObjectMessage(hash32 symbol, StackArray<pd::Atom, 8> const& atoms, int numAtoms) override
+    void receiveObjectMessage(hash32 symbol, StackArray<pd::Atom, 7> const& atoms, int numAtoms) override
     {
         switch (symbol) {
         case hash("allpass"): {

Source/Objects/BicoeffObject.h

@@ -272,7 +272,7 @@ class ButtonObject final : public ObjectBase {
         }
     }
 
-    void receiveObjectMessage(hash32 symbol, StackArray<pd::Atom, 8> const& atoms, int numAtoms) override
+    void receiveObjectMessage(hash32 symbol, StackArray<pd::Atom, 7> const& atoms, int numAtoms) override
     {
         switch (symbol) {
         case hash("bgcolor"): {

Source/Objects/ButtonObject.h

@@ -80,7 +80,7 @@ class CanvasObject final : public ObjectBase {
         repaint();
     }
 
-    void receiveObjectMessage(hash32 symbol, StackArray<pd::Atom, 8> const& atoms, int numAtoms) override
+    void receiveObjectMessage(hash32 symbol, StackArray<pd::Atom, 7> const& atoms, int numAtoms) override
     {
         switch (symbol) {
         case hash("size"):