diff options
| author | Neil Moore <neil@s-z.org> | 2014-06-04 13:49:52 -0400 |
|---|---|---|
| committer | Neil Moore <neil@s-z.org> | 2014-06-04 14:19:36 -0400 |
| commit | 97cf85e3ad4f3c109adc8a6e0f1ed4163876178b (patch) | |
| tree | e3901e8411cbc410d422977d519ebe34de3a8ee5 | |
| parent | 1be7c1f13a0b2c0ae7fba9230312ded6065a3b6f (diff) | |
| download | crawl-ref-97cf85e3ad4f3c109adc8a6e0f1ed4163876178b.tar.gz crawl-ref-97cf85e3ad4f3c109adc8a6e0f1ed4163876178b.zip | |
Allow using Luajit on 64-bit systems (#8641)
64-bit luajit doesn't support lua_newstate or custom allocators, so don't
try to use one there. However, give a warning if this happens with a
webtiles or dgamelaunch build, because servers probably do want the
memory throttling.
| -rw-r--r-- | crawl-ref/source/Makefile | 4 | ||||
| -rw-r--r-- | crawl-ref/source/clua.cc | 21 |
2 files changed, 25 insertions, 0 deletions
diff --git a/crawl-ref/source/Makefile b/crawl-ref/source/Makefile index 17eed16f72..286110a5b4 100644 --- a/crawl-ref/source/Makefile +++ b/crawl-ref/source/Makefile @@ -622,6 +622,10 @@ ifndef BUILD_LUA LIBS += $(shell $(PKGCONFIG) $(LUA_PACKAGE) --libs) endif +ifdef USE_LUAJIT +DEFINES_L += -DUSE_LUAJIT +endif + ifndef BUILD_SQLITE ifeq ($(shell grep -q sqlite3_prepare $(SQLITE_INCLUDE_DIR)/sqlite3.h 2>/dev/null && echo yes),yes) # INCLUDES_L += -isystem $(SQLITE_INCLUDE_DIR) diff --git a/crawl-ref/source/clua.cc b/crawl-ref/source/clua.cc index 5f239c2cb2..b9d9d8b7a4 100644 --- a/crawl-ref/source/clua.cc +++ b/crawl-ref/source/clua.cc @@ -18,6 +18,10 @@ #define BUGGY_PCALL_ERROR "667: Malformed response to guarded pcall." #define BUGGY_SCRIPT_ERROR "666: Killing badly-behaved Lua script." +#if defined(USE_LUAJIT) && defined(TARGET_CPU_X64) +#define NO_CUSTOM_ALLOCATOR +#endif + #define CL_RESETSTACK_RETURN(ls, oldtop, retval) \ do \ {\ @@ -31,7 +35,9 @@ static int _clua_panic(lua_State *); static void _clua_throttle_hook(lua_State *, lua_Debug *); +#ifndef NO_CUSTOM_ALLOCATOR static void *_clua_allocator(void *ud, void *ptr, size_t osize, size_t nsize); +#endif static int _clua_guarded_pcall(lua_State *); static int _clua_require(lua_State *); static int _clua_dofile(lua_State *); @@ -634,7 +640,20 @@ void CLua::init_lua() if (_state) return; + // 64-bit luajit does not support custom allocators. Only checking + // TARGET_CPU_X64 because luajit doesn't support other 64-bit archs. +#ifdef NO_CUSTOM_ALLOCATOR + _state = luaL_newstate(); + // If this is likely to be used as a server, warn the builder. +# if defined(USE_TILE_WEB) || defined(DGAMELAUNCH) + // NOTE: #warning doesn't work on MSVC, so this will be fatal there + // (not that webtiles or dgamelaunch are supported on Windows anyway). +# warning Detected 64-bit Luajit, disabling CLua memory throttling. +# endif +#else + // Throttle memory usage in managed (clua) VMs _state = managed_vm? lua_newstate(_clua_allocator, this) : luaL_newstate(); +#endif if (!_state) end(1, false, "Unable to create Lua state."); @@ -951,6 +970,7 @@ static int _clua_panic(lua_State *ls) return 0; } +#ifndef NO_CUSTOM_ALLOCATOR static void *_clua_allocator(void *ud, void *ptr, size_t osize, size_t nsize) { CLua *cl = static_cast<CLua *>(ud); @@ -970,6 +990,7 @@ static void *_clua_allocator(void *ud, void *ptr, size_t osize, size_t nsize) else return realloc(ptr, nsize); } +#endif static void _clua_throttle_hook(lua_State *ls, lua_Debug *dbg) { |