[Controller] POC: overall speedup

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.cpp

@@ -38,11 +38,96 @@ namespace sofapython3
 using sofa::core::objectmodel::Event;
 using sofa::core::objectmodel::BaseObject;
 
+Controller_Trampoline::Controller_Trampoline() = default;
+
+Controller_Trampoline::~Controller_Trampoline()
+{
+    // Clean up Python objects while holding the GIL
+    if (m_cacheInitialized)
+    {
+        PythonEnvironment::gil acquire {"~Controller_Trampoline"};
+        m_methodCache.clear();
+        m_pySelf = py::object();
+    }
+}
+
+void Controller_Trampoline::initializePythonCache()
+{
+    if (m_cacheInitialized)
+        return;
+
+    // Must be called with GIL held
+    m_pySelf = py::cast(this);
+
+    // Pre-cache the fallback "onEvent" method via the standard cache path
+    getCachedMethod("onEvent");
+
+    m_cacheInitialized = true;
+}
+
+py::object Controller_Trampoline::getCachedMethod(const std::string& methodName)
+{
+    // Must be called with GIL held and cache initialized
+
+    // Check if we've already looked up this method
+    auto it = m_methodCache.find(methodName);
+    if (it != m_methodCache.end())
+    {
+        return it->second;
+    }
+
+    // First time looking up this method - check if it exists
+    py::object method;
+    if (py::hasattr(m_pySelf, methodName.c_str()))
+    {
+        py::object fct = m_pySelf.attr(methodName.c_str());
+        if (PyCallable_Check(fct.ptr()))
+        {
+            method = fct;
+        }
+    }
+
+    // Cache the result (even if empty, to avoid repeated hasattr checks)
+    m_methodCache[methodName] = method;
+    return method;
+}
+
+bool Controller_Trampoline::callCachedMethod(const py::object& method, Event* event)
+{
+    // Must be called with GIL held
+    if (f_printLog.getValue())
+    {
+        std::string eventStr = py::str(PythonFactory::toPython(event));
+        msg_info() << "on" << event->getClassName() << " " << eventStr;
+    }
+
+    py::object result = method(PythonFactory::toPython(event));
+    if (result.is_none())
+        return false;
+
+    return py::cast<bool>(result);
+}
+
+void Controller_Trampoline::invalidateMethodCache(const std::string& methodName)
+{
+    if (!m_cacheInitialized)
+        return;
+
+    // Remove the entry so getCachedMethod will re-resolve it on next call
+    m_methodCache.erase(methodName);
+}
+
 std::string Controller_Trampoline::getClassName() const
 {
     PythonEnvironment::gil acquire {"getClassName"};
-    // Get the actual class name from python.
-    return py::str(py::cast(this).get_type().attr("__name__"));
+
+    if (m_pySelf)
+    {
+        return py::str(py::type::of(m_pySelf).attr("__name__"));
+    }
+
+    // Fallback for when cache isn't initialized yet
+    return py::str(py::type::of(py::cast(this)).attr("__name__"));
 }
 
 void Controller_Trampoline::draw(const sofa::core::visual::VisualParams* params)
@@ -55,6 +140,8 @@ void Controller_Trampoline::draw(const sofa::core::visual::VisualParams* params)
 void Controller_Trampoline::init()
 {
     PythonEnvironment::executePython(this, [this](){
+        // Initialize the Python object cache on first init
+        initializePythonCache();
         PYBIND11_OVERLOAD(void, Controller, init, );
     });
 }
@@ -92,25 +179,28 @@ bool Controller_Trampoline::callScriptMethod(
 
 void Controller_Trampoline::handleEvent(Event* event)
 {
-    PythonEnvironment::executePython(this, [this,event](){
-        py::object self = py::cast(this);
-        std::string name = std::string("on")+event->getClassName();
-        /// Is there a method with this name in the class ?
-        if( py::hasattr(self, name.c_str()) )
+    PythonEnvironment::executePython(this, [this, event](){
+        // Ensure cache is initialized (in case init() wasn't called or
+        // handleEvent is called before init)
+        if (!m_cacheInitialized)
         {
-            py::object fct = self.attr(name.c_str());
-            if (PyCallable_Check(fct.ptr())) {
-                bool isHandled = callScriptMethod(self, event, name);
-                if(isHandled)
-                    event->setHandled();
-                return;
-            }
+            initializePythonCache();
         }
 
-        /// Is the fallback method available.
-        bool isHandled = callScriptMethod(self, event, "onEvent");
-        if(isHandled)
-            event->setHandled();
+        // Build the event-specific method name (e.g., "onAnimateBeginEvent")
+        std::string methodName = std::string("on") + event->getClassName();
+
+        // Try the event-specific method first, then fall back to generic "onEvent"
+        py::object method = getCachedMethod(methodName);
+        if (!method)
+            method = getCachedMethod("onEvent");
+
+        if (method)
+        {
+            bool isHandled = callCachedMethod(method, event);
+            if (isHandled)
+                event->setHandled();
+        }
     });
 }
 
@@ -150,6 +240,22 @@ void moduleAddController(py::module &m) {
     f.def("draw", [](Controller& self, sofa::core::visual::VisualParams* params){
         self.draw(params);
     }, pybind11::return_value_policy::reference);
+
+    // Override __setattr__ to invalidate the method cache when an "on*" attribute is reassigned
+    f.def("__setattr__", [](py::object self, const std::string& s, py::object value) {
+        // If the attribute starts with "on" and the new value is callable, invalidate the cached method
+        if (s.rfind("on", 0) == 0 && PyCallable_Check(value.ptr()))
+        {
+            auto* trampoline = dynamic_cast<Controller_Trampoline*>(py::cast<Controller*>(self));
+            if (trampoline)
+            {
+                trampoline->invalidateMethodCache(s);
+            }
+        }
+
+        // Delegate to the base class __setattr__
+        BindingBase::__setattr__(self, s, value);
+    });
 }
 
 

bindings/Sofa/src/SofaPython3/Sofa/Core/Binding_Controller.h

@@ -22,6 +22,8 @@
 
 #include <pybind11/pybind11.h>
 #include <sofa/core/behavior/BaseController.h>
+#include <unordered_map>
+#include <string>
 
 namespace sofapython3 {
 
@@ -41,6 +43,9 @@ class Controller_Trampoline : public Controller
 public:
     SOFA_CLASS(Controller_Trampoline, Controller);
 
+    Controller_Trampoline();
+    ~Controller_Trampoline() override;
+
     void init() override;
     void reinit() override;
     void draw(const sofa::core::visual::VisualParams* params) override;
@@ -49,9 +54,32 @@ class Controller_Trampoline : public Controller
 
     std::string getClassName() const override;
 
+    /// Invalidates a specific entry in the method cache (called when a user reassigns an on* attribute)
+    void invalidateMethodCache(const std::string& methodName);
+
 private:
+    /// Initializes the Python object cache (m_pySelf and method cache)
+    void initializePythonCache();
+
+    /// Returns a cached method if it exists, or an empty object if not
+    pybind11::object getCachedMethod(const std::string& methodName);
+
+    /// Calls a cached Python method with the given event
+    bool callCachedMethod(const pybind11::object& method, sofa::core::objectmodel::Event* event);
+
+    /// Legacy method for uncached calls (fallback)
     bool callScriptMethod(const pybind11::object& self, sofa::core::objectmodel::Event* event,
         const std::string& methodName);
+
+    /// Cached Python self reference (avoids repeated py::cast(this))
+    pybind11::object m_pySelf;
+
+    /// Cache of Python method objects, keyed by method name (including "onEvent" fallback)
+    /// Stores the method object if it exists, or an empty object if checked and not found
+    std::unordered_map<std::string, pybind11::object> m_methodCache;
+
+    /// Flag indicating whether the cache has been initialized
+    bool m_cacheInitialized = false;
 };
 
 void moduleAddController(pybind11::module &m);

examples/benchmarks/emptyMultipleControllers.py

@@ -0,0 +1,45 @@
+import Sofa
+
+g_nb_controllers = 10
+g_nb_steps = 10000
+
+class EmptyController(Sofa.Core.Controller):
+
+    def __init__(self, *args, **kwargs):
+        Sofa.Core.Controller.__init__(self, *args, **kwargs)
+
+    # Default Events *********************************************
+    def onAnimateBeginEvent(self, event):  # called at each begin of animation step
+        # print(f"{self.name.value} : onAnimateBeginEvent")
+        pass
+
+def createScene(root):
+    root.dt = 0.01
+    root.bbox = [[-1, -1, -1], [1, 1, 1]]
+    root.addObject('DefaultVisualManagerLoop')
+    root.addObject('DefaultAnimationLoop')
+
+
+    for i in range(g_nb_controllers):
+        root.addObject(EmptyController(name=f"MyEmptyController{i}"))
+
+
+def main():
+    root = Sofa.Core.Node("root")
+    createScene(root)
+    Sofa.Simulation.initRoot(root)
+
+    # Import the time library
+    import time
+    start = time.time()
+    for iteration in range(g_nb_steps):
+        Sofa.Simulation.animate(root, root.dt.value)
+    end = time.time()
+
+    print(f"Scene with {g_nb_controllers} controllers and {g_nb_steps} steps took {end - start} seconds.")
+
+    print("End of simulation.")
+
+
+if __name__ == '__main__':
+    main()

examples/tests/testReassignmentController.py

@@ -0,0 +1,46 @@
+import Sofa
+
+g_nb_controllers = 3
+g_controllers = []
+
+class TestReassignmentController(Sofa.Core.Controller):
+
+    def __init__(self, *args, **kwargs):
+        Sofa.Core.Controller.__init__(self, *args, **kwargs)
+
+    def onAnimateBeginEvent(self, event):
+        print(f"{self.name.value} : onAnimateBeginEvent")
+        pass
+
+    def modifiedAnimateBeginEvent(self, event):
+        print(f"{self.name.value} : modifiedAnimateBeginEvent")
+        pass
+
+def createScene(root):
+    root.dt = 0.01
+    root.bbox = [[-1, -1, -1], [1, 1, 1]]
+    root.addObject('DefaultVisualManagerLoop')
+    root.addObject('DefaultAnimationLoop')
+
+    for i in range(g_nb_controllers):
+        controller = root.addObject(TestReassignmentController(name=f"Controller{i}"))
+        g_controllers.append(controller)
+
+
+def main():
+    root = Sofa.Core.Node("root")
+    createScene(root)
+    Sofa.Simulation.initRoot(root)
+
+    # one step with the "fixed" implementation of onAnimateBeginEvent
+    Sofa.Simulation.animate(root, root.dt.value) # should print "ControllerX : onAnimateBeginEvent"
+
+    # reassign onAnimateBeginEvent method
+    for controller in g_controllers:
+        controller.onAnimateBeginEvent = controller.modifiedAnimateBeginEvent
+
+    Sofa.Simulation.animate(root, root.dt.value) # should print "ControllerX : modifiedAnimateBeginEvent"
+
+
+if __name__ == '__main__':
+    main()