Using the executor to schedule buffer add/removes

Author: mattkae

src/include/server/mir/graphics/default_initial_render_manager.h

@@ -23,6 +23,7 @@
 
 namespace mir
 {
+class Executor;
 
 namespace time
 {
@@ -43,6 +44,7 @@ class DefaultInitialRenderManager : public InitialRenderManager
 {
 public:
     DefaultInitialRenderManager(
+        std::shared_ptr<Executor> const& scene_executor,
         std::shared_ptr<time::Clock>& clock,
         time::AlarmFactory& alarm_factory,
         std::shared_ptr<input::Scene>& scene);
@@ -51,9 +53,10 @@ class DefaultInitialRenderManager : public InitialRenderManager
 
 private:
     void remove_renderables();
+    std::shared_ptr<Executor> const& scene_executor;
     std::shared_ptr<time::Clock> const& clock;
     std::shared_ptr<input::Scene>& scene;
-    std::vector<std::shared_ptr<InitialRender>> renderable_list;
+    std::vector<std::shared_ptr<Renderable>> renderable_list;
     std::unique_ptr<time::Alarm> const alarm;
 };
 

src/server/graphics/default_configuration.cpp

@@ -507,7 +507,11 @@ mir::DefaultServerConfiguration::the_initial_render_manager(mg::Display& in_disp
     auto in_input_scene = the_input_scene();
     auto in_main_loop = the_main_loop();
     auto in_clock = the_clock();
-    initial_render_manager = std::make_shared<mg::DefaultInitialRenderManager>(in_clock, *in_main_loop, in_input_scene);
+    initial_render_manager = std::make_shared<mg::DefaultInitialRenderManager>(
+        the_main_loop(),
+        in_clock,
+        *in_main_loop,
+        in_input_scene);
     initial_render_manager->add_initial_render(in_display.create_initial_render());
     return initial_render_manager;
 }

src/server/graphics/default_initial_render_manager.cpp

@@ -18,20 +18,23 @@
 #include "mir/input/scene.h"
 #include "mir/time/alarm_factory.h"
 #include "mir/time/clock.h"
+#include "mir/executor.h"
 #include <chrono>
 
 namespace mg = mir::graphics;
 
 mg::DefaultInitialRenderManager::DefaultInitialRenderManager(
+    std::shared_ptr<Executor> const& scene_executor,
     std::shared_ptr<time::Clock>&clock,
     time::AlarmFactory &alarm_factory,
     std::shared_ptr<input::Scene>& scene)
-    : clock{clock},
-     scene{scene},
-     alarm{alarm_factory.create_alarm([&]{
+    : scene_executor{scene_executor},
+      clock{clock},
+      scene{scene},
+      alarm{alarm_factory.create_alarm([&]{
          remove_renderables();
          alarm->cancel();
-     })}
+      })}
 {
     time::Timestamp scheduled_time = clock->now() + std::chrono::seconds {5};
     alarm->reschedule_for(scheduled_time);
@@ -48,19 +51,22 @@ void mg::DefaultInitialRenderManager::add_initial_render(std::shared_ptr<Initial
 
     for (auto const& renderable : initial_render->get_renderables())
     {
-        scene->add_input_visualization(renderable);
+        scene_executor->spawn([scene = scene, to_add = renderable]()
+          {
+              scene->add_input_visualization(to_add);
+          });
+        renderable_list.push_back(renderable);
     }
-    renderable_list.push_back(initial_render);
 }
 
 void mg::DefaultInitialRenderManager::remove_renderables()
 {
-    for (auto inital_render : renderable_list)
+    for (auto const& renderable : renderable_list)
     {
-        for (auto const& renderable : inital_render->get_renderables())
-        {
-            scene->remove_input_visualization(renderable);
-        }
+        scene_executor->spawn([scene = scene, to_remove = renderable]()
+          {
+              scene->remove_input_visualization(to_remove);
+          });
     }
     renderable_list.clear();
 }