1 files changed, 12 insertions, 13 deletions

diff --git a/src/universe.hpp b/src/universe.hpp
index ab06907..f781e92 100644
--- a/src/universe.hpp
+++ b/src/universe.hpp
@@ -4,6 +4,7 @@
 #include "cancel.hpp"
 #include "keeper.hpp"
 #include "lanesconf.h"
+#include "threading.hpp"
 #include "tracker.hpp"
 #include "uniquekey.hpp"
 
@@ -27,12 +28,7 @@ class ProtectedAllocator final
     std::mutex mutex;
 
     [[nodiscard]]
-    static void* protected_lua_Alloc(void* const ud_, void* const ptr_, size_t const osize_, size_t const nsize_)
-    {
-        ProtectedAllocator* const allocator{ static_cast<ProtectedAllocator*>(ud_) };
-        std::lock_guard<std::mutex> guard{ allocator->mutex };
-        return allocator->alloc(ptr_, osize_, nsize_);
-    }
+    static void* Protected_lua_Alloc(void* const ud_, void* const ptr_, size_t const osize_, size_t const nsize_);
 
     public:
     // we are not like our base class: we can't be created inside a full userdata (or we would have to install a metatable and __gc handler to destroy ourselves properly)
@@ -42,13 +38,13 @@ class ProtectedAllocator final
 
     AllocatorDefinition makeDefinition()
     {
-        return AllocatorDefinition{ protected_lua_Alloc, this };
+        return AllocatorDefinition{ Protected_lua_Alloc, this };
     }
 
     void installIn(lua_State* const L_) const
     {
         // install our replacement allocator function (this is a C function, we need to deconst ourselves)
-        lua_setallocf(L_, protected_lua_Alloc, static_cast<void*>(const_cast<ProtectedAllocator*>(this)));
+        lua_setallocf(L_, Protected_lua_Alloc, static_cast<void*>(const_cast<ProtectedAllocator*>(this)));
     }
 
     void removeFrom(lua_State* const L_) const
@@ -75,9 +71,9 @@ class Universe final
 
 #ifdef PLATFORM_LINUX
     // Linux needs to check, whether it's been run as root
-    bool const sudo{ geteuid() == 0 };
+    SudoFlag const sudo{ geteuid() == 0 };
 #else
-    bool const sudo{ false };
+    SudoFlag const sudo{ false };
 #endif // PLATFORM_LINUX
 
     // for verbose errors
@@ -99,6 +95,8 @@ class Universe final
 
     Keepers keepers;
 
+    lua_Duration lindaWakePeriod{};
+
     // Initialized by 'init_once_LOCKED()': the deep userdata Linda object
     // used for timers (each lane will get a proxy to this)
     Linda* timerLinda{ nullptr };
@@ -106,7 +104,7 @@ class Universe final
     LaneTracker tracker;
 
     // Protects modifying the selfdestruct chain
-    std::mutex selfdestructMutex;
+    mutable std::mutex selfdestructMutex;
 
     // require() serialization
     std::recursive_mutex requireMutex;
@@ -126,10 +124,11 @@ class Universe final
 
     private:
     static int UniverseGC(lua_State* L_);
+    void flagDanglingLanes() const;
 
     public:
     [[nodiscard]]
-    static void* operator new([[maybe_unused]] size_t const size_, lua_State* const L_) noexcept { return luaG_newuserdatauv<Universe>(L_, UserValueCount{ 0 }); };
+    static void* operator new([[maybe_unused]] size_t const size_, lua_State* const L_) noexcept { return luaW_newuserdatauv<Universe>(L_, UserValueCount{ 0 }); };
     // can't actually delete the operator because the compiler generates stack unwinding code that could call it in case of exception
     static void operator delete([[maybe_unused]] void* const p_, [[maybe_unused]] lua_State* const L_) {} // nothing to do, as nothing is allocated independently
 
@@ -150,7 +149,7 @@ class Universe final
     static int InitializeFinalizer(lua_State* L_);
     void initializeOnStateCreate(lua_State* L_);
     [[nodiscard]]
-    lanes::AllocatorDefinition resolveAllocator(lua_State* L_, std::string_view const& hint_) const;
+    lanes::AllocatorDefinition resolveAndValidateAllocator(lua_State* L_, std::string_view const& hint_) const;
     static inline void Store(lua_State* L_, Universe* U_);
     [[nodiscard]]
     bool terminateFreeRunningLanes(lua_Duration shutdownTimeout_, CancelOp op_);