From f00c77d497bc2b5f4dd55f4b21c645ea729eca70 Mon Sep 17 00:00:00 2001 From: Benoit Germain Date: Mon, 25 Mar 2024 09:51:56 +0100 Subject: C++ migration: make deep_test build and run --- deep_test/deep_test.c | 267 ------------------------------------ deep_test/deep_test.cpp | 260 +++++++++++++++++++++++++++++++++++ deep_test/deep_test.vcxproj | 10 +- deep_test/deep_test.vcxproj.filters | 14 +- docs/index.html | 10 +- 5 files changed, 277 insertions(+), 284 deletions(-) delete mode 100644 deep_test/deep_test.c create mode 100644 deep_test/deep_test.cpp diff --git a/deep_test/deep_test.c b/deep_test/deep_test.c deleted file mode 100644 index eca7479..0000000 --- a/deep_test/deep_test.c +++ /dev/null @@ -1,267 +0,0 @@ -#include -#include -#include - -#include "lua.h" -#include "lualib.h" -#include "lauxlib.h" - -#include "lanes/src/deep.h" -#include "lanes/src/compat.h" - -// ################################################################################################ - -// a lanes-deep userdata. needs DeepPrelude and luaG_newdeepuserdata from Lanes code. -struct s_MyDeepUserdata -{ - DeepPrelude prelude; // Deep userdata MUST start with this header - lua_Integer val; -}; -static void* deep_test_id( lua_State* L, enum eDeepOp op_); - -// ################################################################################################ - -static int deep_set( lua_State* L) -{ - struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1); - lua_Integer i = lua_tointeger( L, 2); - self->val = i; - return 0; -} - -// ################################################################################################ - -// won't actually do anything as deep userdata don't have uservalue slots -static int deep_setuv( lua_State* L) -{ - struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1); - int uv = (int) luaL_optinteger( L, 2, 1); - lua_settop( L, 3); - lua_pushboolean( L, lua_setiuservalue( L, 1, uv) != 0); - return 1; -} - -// ################################################################################################ - -// won't actually do anything as deep userdata don't have uservalue slots -static int deep_getuv( lua_State* L) -{ - struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1); - int uv = (int) luaL_optinteger( L, 2, 1); - lua_getiuservalue( L, 1, uv); - return 1; -} - -// ################################################################################################ - -static int deep_tostring( lua_State* L) -{ - struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1); - lua_pushfstring( L, "%p:deep(%d)", lua_topointer( L, 1), self->val); - return 1; -} - -// ################################################################################################ - -static int deep_gc( lua_State* L) -{ - struct s_MyDeepUserdata* self = luaG_todeep( L, deep_test_id, 1); - return 0; -} - -// ################################################################################################ - -static luaL_Reg const deep_mt[] = -{ - { "__tostring", deep_tostring}, - { "__gc", deep_gc}, - { "set", deep_set}, - { "setuv", deep_setuv}, - { "getuv", deep_getuv}, - { NULL, NULL } -}; - -// ################################################################################################ - -static void* deep_test_id( lua_State* L, enum eDeepOp op_) -{ - switch( op_) - { - case eDO_new: - { - struct s_MyDeepUserdata* deep_test = (struct s_MyDeepUserdata*) malloc( sizeof(struct s_MyDeepUserdata)); - deep_test->prelude.magic.value = DEEP_VERSION.value; - deep_test->val = 0; - return deep_test; - } - - case eDO_delete: - { - struct s_MyDeepUserdata* deep_test = (struct s_MyDeepUserdata*) lua_touserdata( L, 1); - free( deep_test); - return NULL; - } - - case eDO_metatable: - { - luaL_getmetatable( L, "deep"); // mt - return NULL; - } - - case eDO_module: - return "deep_test"; - - default: - { - return NULL; - } - } -} - -// ################################################################################################ - -int luaD_new_deep( lua_State* L) -{ - int nuv = (int) luaL_optinteger( L, 1, 0); - // no additional parameter to luaG_newdeepuserdata! - lua_settop( L, 0); - return luaG_newdeepuserdata( L, deep_test_id, nuv); -} - -// ################################################################################################ -// ################################################################################################ - -struct s_MyClonableUserdata -{ - lua_Integer val; -}; - -// ################################################################################################ - -static int clonable_set( lua_State* L) -{ - struct s_MyClonableUserdata* self = (struct s_MyClonableUserdata*) lua_touserdata( L, 1); - lua_Integer i = lua_tointeger( L, 2); - self->val = i; - return 0; -} - -// ################################################################################################ - -static int clonable_setuv( lua_State* L) -{ - struct s_MyClonableUserdata* self = (struct s_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); - return 1; -} - -// ################################################################################################ - -static int clonable_getuv( lua_State* L) -{ - struct s_MyClonableUserdata* self = (struct s_MyClonableUserdata*) lua_touserdata( L, 1); - int uv = (int) luaL_optinteger( L, 2, 1); - lua_getiuservalue( L, 1, uv); - return 1; -} - -// ################################################################################################ - -static int clonable_tostring(lua_State* L) -{ - struct s_MyClonableUserdata* self = (struct s_MyClonableUserdata*) lua_touserdata( L, 1); - lua_pushfstring( L, "%p:clonable(%d)", lua_topointer( L, 1), self->val); - return 1; -} - -// ################################################################################################ - -static int clonable_gc( lua_State* L) -{ - struct s_MyClonableUserdata* self = (struct s_MyClonableUserdata*) lua_touserdata( L, 1); - return 0; -} - -// ################################################################################################ - -// this is all we need to make a userdata lanes-clonable. no dependency on Lanes code. -static int clonable_lanesclone( lua_State* L) -{ - switch( lua_gettop( L)) - { - case 3: - { - struct s_MyClonableUserdata* self = lua_touserdata( L, 1); - struct s_MyClonableUserdata* from = lua_touserdata( L, 2); - size_t len = lua_tointeger( L, 3); - assert( len == sizeof(struct s_MyClonableUserdata)); - *self = *from; - } - return 0; - - default: - (void) luaL_error( L, "Lanes called clonable_lanesclone with unexpected parameters"); - } - return 0; -} - -// ################################################################################################ - -static luaL_Reg const clonable_mt[] = -{ - { "__tostring", clonable_tostring}, - { "__gc", clonable_gc}, - { "__lanesclone", clonable_lanesclone}, - { "set", clonable_set}, - { "setuv", clonable_setuv}, - { "getuv", clonable_getuv}, - { NULL, NULL } -}; - -// ################################################################################################ - -int luaD_new_clonable( lua_State* L) -{ - int nuv = (int) luaL_optinteger( L, 1, 1); - lua_newuserdatauv( L, sizeof( struct s_MyClonableUserdata), nuv); - luaL_setmetatable( L, "clonable"); - return 1; -} - -// ################################################################################################ -// ################################################################################################ - -static luaL_Reg const deep_module[] = -{ - { "new_deep", luaD_new_deep}, - { "new_clonable", luaD_new_clonable}, - { NULL, NULL} -}; - -// ################################################################################################ - -LANES_API int luaopen_deep_test(lua_State* L) -{ - luaL_newlib( 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 - { - luaL_setfuncs( L, clonable_mt, 0); - lua_pushvalue(L, -1); // M mt mt - lua_setfield(L, -2, "__index"); // M mt - } - lua_setfield(L, -2, "__clonableMT"); // M - - if( luaL_newmetatable( L, "deep")) // mt - { - luaL_setfuncs( L, deep_mt, 0); - lua_pushvalue(L, -1); // mt mt - lua_setfield(L, -2, "__index"); // mt - } - lua_setfield(L, -2, "__deepMT"); // M - - return 1; -} diff --git a/deep_test/deep_test.cpp b/deep_test/deep_test.cpp new file mode 100644 index 0000000..bbae48e --- /dev/null +++ b/deep_test/deep_test.cpp @@ -0,0 +1,260 @@ +#include "lanes/src/deep.h" +#include "lanes/src/compat.h" + +#include +#include +#include + +// ################################################################################################ + +// a lanes-deep userdata. needs DeepPrelude and luaG_newdeepuserdata from Lanes code. +struct MyDeepUserdata +{ + DeepPrelude prelude; // Deep userdata MUST start with this header + lua_Integer val{ 0 }; +}; + +// ################################################################################################ + +static void* deep_test_id( lua_State* L, DeepOp op_) +{ + switch( op_) + { + case eDO_new: + { + MyDeepUserdata* deep_test = new MyDeepUserdata; + return deep_test; + } + + case eDO_delete: + { + MyDeepUserdata* deep_test = static_cast(lua_touserdata( L, 1)); + delete deep_test; + return nullptr; + } + + case eDO_metatable: + { + luaL_getmetatable( L, "deep"); // mt + return nullptr; + } + + case eDO_module: + return (void*)"deep_test"; + + default: + { + return nullptr; + } + } +} + +// ################################################################################################ + +static int deep_set( lua_State* L) +{ + MyDeepUserdata* self = static_cast(luaG_todeep(L, deep_test_id, 1)); + lua_Integer i = lua_tointeger( L, 2); + self->val = i; + return 0; +} + +// ################################################################################################ + +// won't actually do anything as deep userdata don't have uservalue slots +static int deep_setuv( lua_State* L) +{ + MyDeepUserdata* self = static_cast(luaG_todeep(L, deep_test_id, 1)); + int uv = (int) luaL_optinteger(L, 2, 1); + lua_settop( L, 3); + lua_pushboolean( L, lua_setiuservalue( L, 1, uv) != 0); + return 1; +} + +// ################################################################################################ + +// won't actually do anything as deep userdata don't have uservalue slots +static int deep_getuv( lua_State* L) +{ + MyDeepUserdata* self = static_cast(luaG_todeep(L, deep_test_id, 1)); + int uv = (int) luaL_optinteger(L, 2, 1); + lua_getiuservalue( L, 1, uv); + return 1; +} + +// ################################################################################################ + +static int deep_tostring( lua_State* L) +{ + MyDeepUserdata* self = static_cast(luaG_todeep(L, deep_test_id, 1)); + lua_pushfstring(L, "%p:deep(%d)", lua_topointer(L, 1), self->val); + return 1; +} + +// ################################################################################################ + +static int deep_gc( lua_State* L) +{ + MyDeepUserdata* self = static_cast(luaG_todeep(L, deep_test_id, 1)); + return 0; +} + +// ################################################################################################ + +static luaL_Reg const deep_mt[] = +{ + { "__tostring", deep_tostring}, + { "__gc", deep_gc}, + { "set", deep_set}, + { "setuv", deep_setuv}, + { "getuv", deep_getuv}, + { nullptr, nullptr } +}; + +// ################################################################################################ + +int luaD_new_deep( lua_State* L) +{ + int nuv = (int) luaL_optinteger( L, 1, 0); + // no additional parameter to luaG_newdeepuserdata! + lua_settop( L, 0); + return luaG_newdeepuserdata( L, deep_test_id, nuv); +} + +// ################################################################################################ +// ################################################################################################ + +struct MyClonableUserdata +{ + lua_Integer val; +}; + +// ################################################################################################ + +static int clonable_set( lua_State* L) +{ + MyClonableUserdata* self = static_cast(lua_touserdata(L, 1)); + lua_Integer i = lua_tointeger(L, 2); + self->val = i; + return 0; +} + +// ################################################################################################ + +static int clonable_setuv( lua_State* L) +{ + MyClonableUserdata* self = static_cast(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); + return 1; +} + +// ################################################################################################ + +static int clonable_getuv( lua_State* L) +{ + MyClonableUserdata* self = static_cast(lua_touserdata(L, 1)); + int uv = (int) luaL_optinteger(L, 2, 1); + lua_getiuservalue( L, 1, uv); + return 1; +} + +// ################################################################################################ + +static int clonable_tostring(lua_State* L) +{ + MyClonableUserdata* self = static_cast(lua_touserdata(L, 1)); + lua_pushfstring(L, "%p:clonable(%d)", lua_topointer(L, 1), self->val); + return 1; +} + +// ################################################################################################ + +static int clonable_gc( lua_State* L) +{ + MyClonableUserdata* self = static_cast(lua_touserdata(L, 1)); + return 0; +} + +// ################################################################################################ + +// this is all we need to make a userdata lanes-clonable. no dependency on Lanes code. +static int clonable_lanesclone( lua_State* L) +{ + switch( lua_gettop( L)) + { + case 3: + { + MyClonableUserdata* self = static_cast(lua_touserdata(L, 1)); + MyClonableUserdata* from = static_cast(lua_touserdata(L, 2)); + size_t len = lua_tointeger( L, 3); + assert( len == sizeof(MyClonableUserdata)); + *self = *from; + } + return 0; + + default: + (void) luaL_error( L, "Lanes called clonable_lanesclone with unexpected parameters"); + } + return 0; +} + +// ################################################################################################ + +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 nuv = (int) luaL_optinteger( L, 1, 1); + lua_newuserdatauv( L, sizeof(MyClonableUserdata), nuv); + luaL_setmetatable( L, "clonable"); + return 1; +} + +// ################################################################################################ +// ################################################################################################ + +static luaL_Reg const deep_module[] = +{ + { "new_deep", luaD_new_deep}, + { "new_clonable", luaD_new_clonable}, + { nullptr, nullptr } +}; + +// ################################################################################################ + +LANES_API int luaopen_deep_test(lua_State* L) +{ + luaL_newlib( 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 + { + luaL_setfuncs( L, clonable_mt, 0); + lua_pushvalue(L, -1); // M mt mt + lua_setfield(L, -2, "__index"); // M mt + } + lua_setfield(L, -2, "__clonableMT"); // M + + if( luaL_newmetatable( L, "deep")) // mt + { + luaL_setfuncs( L, deep_mt, 0); + lua_pushvalue(L, -1); // mt mt + lua_setfield(L, -2, "__index"); // mt + } + lua_setfield(L, -2, "__deepMT"); // M + + return 1; +} diff --git a/deep_test/deep_test.vcxproj b/deep_test/deep_test.vcxproj index 730c137..1b4f57b 100644 --- a/deep_test/deep_test.vcxproj +++ b/deep_test/deep_test.vcxproj @@ -675,11 +675,11 @@ - - - - - + + + + + diff --git a/deep_test/deep_test.vcxproj.filters b/deep_test/deep_test.vcxproj.filters index be47da9..814301f 100644 --- a/deep_test/deep_test.vcxproj.filters +++ b/deep_test/deep_test.vcxproj.filters @@ -15,21 +15,21 @@ - - Source Files - - + Lanes - + Lanes - + Lanes - + Lanes + + Source Files + diff --git a/docs/index.html b/docs/index.html index aed022a..e9c3239 100644 --- a/docs/index.html +++ b/docs/index.html @@ -917,7 +917,7 @@

- Only available if lane tracking feature is compiled (see HAVE_LANE_TRACKING in lanes.c) and track_lanes is set. + Only available if lane tracking feature is compiled (see HAVE_LANE_TRACKING in lanes.cpp) and track_lanes is set.
Returns an array table where each entry is a table containing a lane's name and status. Returns nil if no lane is running.

@@ -1702,9 +1702,9 @@ int luaD_new_clonable( lua_State* L)
  • eDO_metatable: should build a metatable for the object. Don't cache the metatable yourself, Lanes takes care of it (eDO_metatable should only be invoked once per state). Just push the metatable on the stack.
  • eDO_module: requests the name of the module that exports the idfunc, to be returned. It is necessary so that Lanes can require it in any lane state that receives a userdata. This is to prevent crashes in situations where the module could be unloaded while the idfunc pointer is still held.
    • - Take a look at linda_id in lanes.c or deep_test_id in deep_test.c. + Take a look at linda_id in lanes.cpp or deep_test_id in deep_test.cpp. -
  • Include "deep.h" and either link against Lanes or statically compile compat.c deep.c tools.c universe.c into your module if you want to avoid a runtime dependency for users that will use your module without Lanes. +
  • Include "deep.h" and either link against Lanes or statically compile compat.cpp deep.cpp tools.cpp universe.cpp into your module if you want to avoid a runtime dependency for users that will use your module without Lanes.
  • Instanciate your userdata using luaG_newdeepuserdata(), instead of the regular lua_newuserdata(). Given an idfunc, it sets up the support structures and returns a state-specific proxy userdata for accessing your data. This proxy can also be copied over to other lanes.
  • Accessing the deep userdata from your C code, use luaG_todeep() instead of the regular lua_touserdata().
    • @@ -1724,7 +1724,7 @@ int luaD_new_clonable( lua_State* L)

    - NOTE: The lifespan of deep userdata may exceed that of the Lua state that created it. The allocation of the data storage should not be tied to the Lua state used. In other words, use malloc()/free() or similar memory handling mechanism. + NOTE: The lifespan of deep userdata may exceed that of the Lua state that created it. The allocation of the data storage should not be tied to the Lua state used. In other words, use new/delete, malloc()/free() or similar memory handling mechanism.

    @@ -1812,4 +1812,4 @@ int luaD_new_clonable( lua_State* L)

    - \ No newline at end of file + \ No newline at end of file -- cgit v1.2.3-55-g6feb