From 4b2003c78a5e4270f384283f72d185cd4a40f30e Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 22 Feb 2024 12:37:01 +1100
Subject: Make property bindings shared amongst all lua threads

---
 src/lua/include/bridge.hpp     | 27 ++++++++++++++++++++-------
 src/lua/include/lua_thread.hpp | 42 +++++++++++++++++++++++++++++++++++++-----
 src/lua/include/property.hpp   |  4 +++-
 3 files changed, 60 insertions(+), 13 deletions(-)

(limited to 'src/lua/include')

diff --git a/src/lua/include/bridge.hpp b/src/lua/include/bridge.hpp
index 62fbc340..64f14e0e 100644
--- a/src/lua/include/bridge.hpp
+++ b/src/lua/include/bridge.hpp
@@ -16,25 +16,38 @@
 
 namespace lua {
 
+/*
+ * Responsible for adding C/C++ module bindings to Lua threads. This class
+ * keeps no thread-specific internal state, and instead uses the LUA_REGISTRY
+ * table of its host threads to store data.
+ */
 class Bridge {
  public:
+  /*
+   * Utility for retrieving the Bridge from a Lua thread in which the Bridge's
+   * bindings have been installed. Use by Lua's C callbacks to access the rest
+   * of the system.
+   */
   static auto Get(lua_State* state) -> Bridge*;
 
-  Bridge(system_fsm::ServiceLocator&, lua_State& s);
+  Bridge(system_fsm::ServiceLocator& s);
 
-  auto AddPropertyModule(
+  system_fsm::ServiceLocator& services() { return services_; }
+
+  auto installBaseModules(lua_State* L) -> void;
+  auto installLvgl(lua_State* L) -> void;
+  auto installPropertyModule(
+      lua_State* L,
       const std::string&,
       std::vector<
-          std::pair<std::string,
-                    std::variant<LuaFunction, Property*>>>)
+          std::pair<std::string, std::variant<LuaFunction, Property*>>>&)
       -> void;
 
-  system_fsm::ServiceLocator& services() { return services_; }
-  PropertyBindings& bindings() { return bindings_; }
+  Bridge(const Bridge&) = delete;
+  Bridge& operator=(const Bridge&) = delete;
 
  private:
   system_fsm::ServiceLocator& services_;
-  lua_State& state_;
   PropertyBindings bindings_;
 };
 
diff --git a/src/lua/include/lua_thread.hpp b/src/lua/include/lua_thread.hpp
index d10dba3a..c12a0bfc 100644
--- a/src/lua/include/lua_thread.hpp
+++ b/src/lua/include/lua_thread.hpp
@@ -23,8 +23,7 @@ auto CallProtected(lua_State*, int nargs, int nresults) -> int;
 
 class LuaThread {
  public:
-  static auto Start(system_fsm::ServiceLocator&, lv_obj_t* lvgl_root = nullptr)
-      -> LuaThread*;
+  static auto Start(system_fsm::ServiceLocator&) -> LuaThread*;
   ~LuaThread();
 
   auto RunScript(const std::string& path) -> bool;
@@ -32,15 +31,48 @@ class LuaThread {
 
   auto DumpStack() -> void;
 
-  auto bridge() -> Bridge& { return *bridge_; }
   auto state() -> lua_State* { return state_; }
 
+  LuaThread(const LuaThread&) = delete;
+  LuaThread& operator=(const LuaThread&) = delete;
+
  private:
-  LuaThread(std::unique_ptr<Allocator>&, std::unique_ptr<Bridge>&, lua_State*);
+  LuaThread(std::unique_ptr<Allocator>&, lua_State*);
 
   std::unique_ptr<Allocator> alloc_;
-  std::unique_ptr<Bridge> bridge_;
   lua_State* state_;
 };
 
+class Registry {
+ public:
+  static auto instance(system_fsm::ServiceLocator&) -> Registry&;
+
+  auto uiThread() -> std::shared_ptr<LuaThread>;
+  auto newThread() -> std::shared_ptr<LuaThread>;
+
+  auto AddPropertyModule(
+      const std::string&,
+      std::vector<
+          std::pair<std::string, std::variant<LuaFunction, Property*>>>)
+      -> void;
+
+  Registry(const Registry&) = delete;
+  Registry& operator=(const Registry&) = delete;
+
+ private:
+  Registry(system_fsm::ServiceLocator&);
+
+  system_fsm::ServiceLocator& services_;
+  std::unique_ptr<Bridge> bridge_;
+
+  std::shared_ptr<LuaThread> ui_thread_;
+  std::list<std::weak_ptr<LuaThread>> threads_;
+
+  std::vector<
+      std::pair<std::string,
+                std::vector<std::pair<std::string,
+                                      std::variant<LuaFunction, Property*>>>>>
+      modules_;
+};
+
 }  // namespace lua
diff --git a/src/lua/include/property.hpp b/src/lua/include/property.hpp
index 03229bc1..7d160fba 100644
--- a/src/lua/include/property.hpp
+++ b/src/lua/include/property.hpp
@@ -53,7 +53,9 @@ class Property {
 
 class PropertyBindings {
  public:
-  PropertyBindings(lua_State&);
+  PropertyBindings();
+
+  auto install(lua_State*) -> void;
 
   auto Register(lua_State*, Property*) -> void;
   auto Register(lua_State*, LuaFunction) -> void;
-- 
cgit v1.2.3