1 files changed, 67 insertions, 68 deletions

diff --git a/deep_test/deep_test.cpp b/deep_test/deep_test.cpp
index 0a09921..da467f3 100644
--- a/deep_test/deep_test.cpp
+++ b/deep_test/deep_test.cpp
@@ -1,18 +1,12 @@
 #include "lanes/src/deep.h"
 #include "lanes/src/compat.h"
 
-#include <malloc.h>
-#include <memory.h>
-#include <assert.h>
-
 class MyDeepFactory : public DeepFactory
 {
     public:
-
     static MyDeepFactory Instance;
 
     private:
-
     void createMetatable(lua_State* const L_) const override
     {
         luaL_getmetatable(L_, "deep");
@@ -28,6 +22,7 @@ class MyDeepFactory : public DeepFactory
 // a lanes-deep userdata. needs DeepPrelude and luaG_newdeepuserdata from Lanes code.
 struct MyDeepUserdata : public DeepPrelude // Deep userdata MUST start with a DeepPrelude
 {
+    std::atomic<int> inUse{};
     lua_Integer val{ 0 };
 };
 
@@ -49,22 +44,20 @@ void MyDeepFactory::deleteDeepObjectInternal(lua_State* const L_, DeepPrelude* c
 
 // #################################################################################################
 
-[[nodiscard]] static int deep_set(lua_State* const L_)
+[[nodiscard]] static int deep_gc(lua_State* L)
 {
-    MyDeepUserdata* const _self{ static_cast<MyDeepUserdata*>(MyDeepFactory::Instance.toDeep(L_, 1)) };
-    lua_Integer i = lua_tointeger(L_, 2);
-    _self->val = i;
+    MyDeepUserdata* const _self{ static_cast<MyDeepUserdata*>(MyDeepFactory::Instance.toDeep(L, 1)) };
     return 0;
 }
 
 // #################################################################################################
 
-[[nodiscard]] static int deep_setuv(lua_State* L)
+[[nodiscard]] static int deep_tostring(lua_State* L)
 {
-    MyDeepUserdata* const self{ static_cast<MyDeepUserdata*>(MyDeepFactory::Instance.toDeep(L, 1)) };
-    int uv = (int) luaL_optinteger(L, 2, 1);
-    lua_settop( L, 3);
-    lua_pushboolean( L, lua_setiuservalue( L, 1, uv) != 0);
+    MyDeepUserdata* const _self{ static_cast<MyDeepUserdata*>(MyDeepFactory::Instance.toDeep(L, 1)) };
+    _self->inUse.fetch_add(1, std::memory_order_seq_cst);
+    lua_pushfstring(L, "%p:deep(%d)", lua_topointer(L, 1), _self->val);
+    _self->inUse.fetch_sub(1, std::memory_order_seq_cst);
     return 1;
 }
 
@@ -73,44 +66,53 @@ void MyDeepFactory::deleteDeepObjectInternal(lua_State* const L_, DeepPrelude* c
 // won't actually do anything as deep userdata don't have uservalue slots
 [[nodiscard]] static int deep_getuv(lua_State* L)
 {
-    MyDeepUserdata* const self{ static_cast<MyDeepUserdata*>(MyDeepFactory::Instance.toDeep(L, 1)) };
-    int uv = (int) luaL_optinteger(L, 2, 1);
-    lua_getiuservalue( L, 1, uv);
+    MyDeepUserdata* const _self{ static_cast<MyDeepUserdata*>(MyDeepFactory::Instance.toDeep(L, 1)) };
+    _self->inUse.fetch_add(1, std::memory_order_seq_cst);
+    int _uv = (int) luaL_optinteger(L, 2, 1);
+    lua_getiuservalue(L, 1, _uv);
+    _self->inUse.fetch_sub(1, std::memory_order_seq_cst);
     return 1;
 }
 
 // #################################################################################################
 
-[[nodiscard]] static int deep_tostring(lua_State* L)
+[[nodiscard]] static int deep_set(lua_State* const L_)
 {
-    MyDeepUserdata* const self{ static_cast<MyDeepUserdata*>(MyDeepFactory::Instance.toDeep(L, 1)) };
-    lua_pushfstring(L, "%p:deep(%d)", lua_topointer(L, 1), self->val);
-    return 1;
+    MyDeepUserdata* const _self{ static_cast<MyDeepUserdata*>(MyDeepFactory::Instance.toDeep(L_, 1)) };
+    _self->inUse.fetch_add(1, std::memory_order_seq_cst);
+    lua_Integer _i = lua_tointeger(L_, 2);
+    _self->val = _i;
+    _self->inUse.fetch_sub(1, std::memory_order_seq_cst);
+    return 0;
 }
 
 // #################################################################################################
 
-[[nodiscard]] static int deep_gc(lua_State* L)
+[[nodiscard]] static int deep_setuv(lua_State* L)
 {
-    MyDeepUserdata* const self{ static_cast<MyDeepUserdata*>(MyDeepFactory::Instance.toDeep(L, 1)) };
-    return 0;
+    MyDeepUserdata* const _self{ static_cast<MyDeepUserdata*>(MyDeepFactory::Instance.toDeep(L, 1)) };
+    _self->inUse.fetch_add(1, std::memory_order_seq_cst);
+    int _uv = (int) luaL_optinteger(L, 2, 1);
+    lua_settop(L, 3);
+    lua_pushboolean(L, lua_setiuservalue(L, 1, _uv) != 0);
+    _self->inUse.fetch_sub(1, std::memory_order_seq_cst);
+    return 1;
 }
 
 // #################################################################################################
 
-static luaL_Reg const deep_mt[] =
-{
-    { "__tostring", deep_tostring},
-    { "__gc", deep_gc},
-    { "set", deep_set},
-    { "setuv", deep_setuv},
-    { "getuv", deep_getuv},
+static luaL_Reg const deep_mt[] = {
+    { "__gc", deep_gc },
+    { "__tostring", deep_tostring },
+    { "getuv", deep_getuv },
+    { "set", deep_set },
+    { "setuv", deep_setuv },
     { nullptr, nullptr }
 };
 
 // #################################################################################################
 
-int luaD_new_deep( lua_State* L)
+int luaD_new_deep(lua_State* L)
 {
     int const nuv{ static_cast<int>(luaL_optinteger(L, 1, 0)) };
     lua_settop(L, 0);
@@ -141,8 +143,8 @@ struct MyClonableUserdata
 {
     MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
     int uv = (int) luaL_optinteger(L, 2, 1);
-    lua_settop( L, 3);
-    lua_pushboolean( L, lua_setiuservalue( L, 1, uv) != 0);
+    lua_settop(L, 3);
+    lua_pushboolean(L, lua_setiuservalue(L, 1, uv) != 0);
     return 1;
 }
 
@@ -152,7 +154,7 @@ struct MyClonableUserdata
 {
     MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
     int uv = (int) luaL_optinteger(L, 2, 1);
-    lua_getiuservalue( L, 1, uv);
+    lua_getiuservalue(L, 1, uv);
     return 1;
 }
 
@@ -178,19 +180,18 @@ struct MyClonableUserdata
 // this is all we need to make a userdata lanes-clonable. no dependency on Lanes code.
 [[nodiscard]] static int clonable_lanesclone(lua_State* L)
 {
-    switch( lua_gettop(L))
-    {
-        case 3:
+    switch (lua_gettop(L)) {
+    case 3:
         {
             MyClonableUserdata* self = static_cast<MyClonableUserdata*>(lua_touserdata(L, 1));
             MyClonableUserdata* from = static_cast<MyClonableUserdata*>(lua_touserdata(L, 2));
             size_t len = lua_tointeger(L, 3);
-            assert( len == sizeof(MyClonableUserdata));
+            assert(len == sizeof(MyClonableUserdata));
             *self = *from;
         }
         return 0;
 
-        default:
+    default:
         raise_luaL_error(L, "Lanes called clonable_lanesclone with unexpected parameters");
     }
     return 0;
@@ -198,34 +199,32 @@ struct MyClonableUserdata
 
 // #################################################################################################
 
-static luaL_Reg const clonable_mt[] =
-{
-    { "__tostring", clonable_tostring},
-    { "__gc", clonable_gc},
-    { "__lanesclone", clonable_lanesclone},
-    { "set", clonable_set},
-    { "setuv", clonable_setuv},
-    { "getuv", clonable_getuv},
+static luaL_Reg const clonable_mt[] = {
+    { "__tostring", clonable_tostring },
+    { "__gc", clonable_gc },
+    { "__lanesclone", clonable_lanesclone },
+    { "set", clonable_set },
+    { "setuv", clonable_setuv },
+    { "getuv", clonable_getuv },
     { nullptr, nullptr }
 };
 
 // #################################################################################################
 
-int luaD_new_clonable( lua_State* L)
+int luaD_new_clonable(lua_State* L)
 {
-    int const nuv{ static_cast<int>(luaL_optinteger(L, 1, 1)) };
-    lua_newuserdatauv( L, sizeof(MyClonableUserdata), nuv);
-    luaL_setmetatable( L, "clonable");
+    int const _nuv{ static_cast<int>(luaL_optinteger(L, 1, 1)) };
+    lua_newuserdatauv(L, sizeof(MyClonableUserdata), _nuv);
+    luaG_setmetatable(L, "clonable");
     return 1;
 }
 
 // #################################################################################################
 // #################################################################################################
 
-static luaL_Reg const deep_module[] =
-{
-    { "new_deep", luaD_new_deep},
-    { "new_clonable", luaD_new_clonable},
+static luaL_Reg const deep_module[] = {
+    { "new_deep", luaD_new_deep },
+    { "new_clonable", luaD_new_clonable },
     { nullptr, nullptr }
 };
 
@@ -233,24 +232,24 @@ static luaL_Reg const deep_module[] =
 
 LANES_API int luaopen_deep_test(lua_State* L)
 {
-    luaL_newlib( L, deep_module);                           // M
+    luaG_newlib<std::size(deep_module)>(L, deep_module);                                           // M
 
     // preregister the metatables for the types we can instantiate so that Lanes can know about them
-    if (luaL_newmetatable( L, "clonable"))                  // M mt
+    if (luaL_newmetatable(L, "clonable"))                                                          // M mt
     {
-        luaL_setfuncs( L, clonable_mt, 0);
-        lua_pushvalue(L, -1);                               // M mt mt
-        lua_setfield(L, -2, "__index");                     // M mt
+        luaG_registerlibfuncs(L, clonable_mt);
+        lua_pushvalue(L, -1);                                                                      // M mt mt
+        lua_setfield(L, -2, "__index");                                                            // M mt
     }
-    lua_setfield(L, -2, "__clonableMT");                    // M
+    lua_setfield(L, -2, "__clonableMT");                                                           // M
 
-    if (luaL_newmetatable( L, "deep"))                      // mt
+    if (luaL_newmetatable(L, "deep"))                                                              // mt
     {
-        luaL_setfuncs( L, deep_mt, 0);
-        lua_pushvalue(L, -1);                               // mt mt
-        lua_setfield(L, -2, "__index");                     // mt
+        luaG_registerlibfuncs(L, deep_mt);
+        lua_pushvalue(L, -1);                                                                      // mt mt
+        lua_setfield(L, -2, "__index");                                                            // mt
     }
-    lua_setfield(L, -2, "__deepMT");                        // M
+    lua_setfield(L, -2, "__deepMT");                                                               // M
 
     return 1;
 }