1 files changed, 42 insertions, 40 deletions

diff --git a/src/keeper.h b/src/keeper.h
index 7c55809..627c7ea 100644
--- a/src/keeper.h
+++ b/src/keeper.h
@@ -1,58 +1,60 @@
-#if !defined( __keeper_h__)
-#define __keeper_h__ 1
+#pragma once
 
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
 #include "lua.h"
+#ifdef __cplusplus
+}
+#endif // __cplusplus
+
 #include "threading.h"
 #include "uniquekey.h"
 
+#include <mutex>
+
 // forwards
-struct s_Universe;
-typedef struct s_Universe Universe;
-enum eLookupMode;
-typedef enum eLookupMode LookupMode;
+enum class LookupMode;
+class Universe;
 
-struct s_Keeper
+struct Keeper
 {
-    MUTEX_T keeper_cs;
-    lua_State* L;
-    //int count;
+    std::mutex m_mutex;
+    lua_State* L{ nullptr };
+    // int count;
 };
-typedef struct s_Keeper Keeper;
 
-struct s_Keepers
+struct Keepers
 {
-    int gc_threshold;
-    int nb_keepers;
+    int gc_threshold{ 0 };
+    int nb_keepers{ 0 };
     Keeper keeper_array[1];
 };
-typedef struct s_Keepers Keepers;
 
-void init_keepers( Universe* U, lua_State* L);
-void close_keepers( Universe* U);
+static constexpr uintptr_t KEEPER_MAGIC_SHIFT{ 3 };
+// crc64/we of string "NIL_SENTINEL" generated at http://www.nitrxgen.net/hashgen/
+static constexpr UniqueKey NIL_SENTINEL{ 0x7eaafa003a1d11a1ull };
 
-Keeper* which_keeper( Keepers* keepers_, uintptr_t magic_);
-Keeper* keeper_acquire( Keepers* keepers_, uintptr_t magic_);
-#define KEEPER_MAGIC_SHIFT 3
-void keeper_release( Keeper* K_);
-void keeper_toggle_nil_sentinels( lua_State* L, int val_i_, LookupMode const mode_);
-int keeper_push_linda_storage( Universe* U, lua_State* L, void* ptr_, uintptr_t magic_);
+void init_keepers(Universe* U, lua_State* L);
+void close_keepers(Universe* U);
 
-// crc64/we of string "NIL_SENTINEL" generated at http://www.nitrxgen.net/hashgen/
-static DECLARE_CONST_UNIQUE_KEY( NIL_SENTINEL, 0x7eaafa003a1d11a1);
+[[nodiscard]] Keeper* which_keeper(Keepers* keepers_, uintptr_t magic_);
+[[nodiscard]] Keeper* keeper_acquire(Keepers* keepers_, uintptr_t magic_);
+void keeper_release(Keeper* K_);
+void keeper_toggle_nil_sentinels(lua_State* L, int val_i_, LookupMode const mode_);
+[[nodiscard]] int keeper_push_linda_storage(Universe* U, Dest L, void* ptr_, uintptr_t magic_);
 
-typedef lua_CFunction keeper_api_t;
-#define KEEPER_API( _op) keepercall_ ## _op
+using keeper_api_t = lua_CFunction;
+#define KEEPER_API(_op) keepercall_##_op
 #define PUSH_KEEPER_FUNC lua_pushcfunction
-// lua_Cfunctions to run inside a keeper state (formerly implemented in Lua)
-int keepercall_clear( lua_State* L);
-int keepercall_send( lua_State* L);
-int keepercall_receive( lua_State* L);
-int keepercall_receive_batched( lua_State* L);
-int keepercall_limit( lua_State* L);
-int keepercall_get( lua_State* L);
-int keepercall_set( lua_State* L);
-int keepercall_count( lua_State* L);
-
-int keeper_call( Universe* U, lua_State* K, keeper_api_t _func, lua_State* L, void* linda, uint_t starting_index);
-
-#endif // __keeper_h__
\ No newline at end of file
+// lua_Cfunctions to run inside a keeper state
+[[nodiscard]] int keepercall_clear(lua_State* L);
+[[nodiscard]] int keepercall_send(lua_State* L);
+[[nodiscard]] int keepercall_receive(lua_State* L);
+[[nodiscard]] int keepercall_receive_batched(lua_State* L);
+[[nodiscard]] int keepercall_limit(lua_State* L);
+[[nodiscard]] int keepercall_get(lua_State* L);
+[[nodiscard]] int keepercall_set(lua_State* L);
+[[nodiscard]] int keepercall_count(lua_State* L);
+
+[[nodiscard]] int keeper_call(Universe* U, lua_State* K, keeper_api_t _func, lua_State* L, void* linda, int starting_index);