Skip to content

lua: update deprecated lua_open to luaL_newstate #14297

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattklein123 merged 3 commits into from
Dec 8, 2020
Merged

lua: update deprecated lua_open to luaL_newstate #14297

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bb9139
lua: update deprecated lua_open to luaL_newstate
spacewander Dec 7, 2020
a7e41d0
add ref link & update style
spacewander Dec 7, 2020
89b1aac
fix spell
spacewander Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions source/extensions/filters/common/lua/lua.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ ThreadLocalState::ThreadLocalState(const std::string& code, ThreadLocal::SlotAll
: tls_slot_(ThreadLocal::TypedSlot<LuaThreadLocal>::makeUnique(tls)) {

// First verify that the supplied code can be parsed.
CSmartPtr<lua_State, lua_close> state(lua_open());
CSmartPtr<lua_State, lua_close> state(luaL_newstate());
RELEASE_ASSERT(state.get() != nullptr, "unable to create new Lua state object");
luaL_openlibs(state.get());

Expand Down Expand Up @@ -90,7 +90,9 @@ CoroutinePtr ThreadLocalState::createCoroutine() {
return std::make_unique<Coroutine>(std::make_pair(lua_newthread(state), state));
}

ThreadLocalState::LuaThreadLocal::LuaThreadLocal(const std::string& code) : state_(lua_open()) {
ThreadLocalState::LuaThreadLocal::LuaThreadLocal(const std::string& code)
: state_(luaL_newstate()) {

RELEASE_ASSERT(state_.get() != nullptr, "unable to create new Lua state object");
luaL_openlibs(state_.get());
int rc = luaL_dostring(state_.get(), code.c_str());
Expand Down
4 changes: 3 additions & 1 deletion test/extensions/filters/http/lua/lua_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,7 +893,9 @@ TEST_P(LuaIntegrationTest, BasicTestOfLuaPerRoute) {
// Test whether Rds can correctly deliver LuaPerRoute configuration.
TEST_P(LuaIntegrationTest, RdsTestOfLuaPerRoute) {
// When the route configuration is updated dynamically via RDS and the configuration contains an
// inline Lua code, Envoy may call lua_open in multiple threads to create new lua_State objects.
// inline Lua code, Envoy may call `luaL_newstate`
// (https://www.lua.org/manual/5.1/manual.html#luaL_newstate) in multiple threads to create new
// lua_State objects.
// During lua_State creation, 'LuaJIT' uses some static local variables shared by multiple threads
// to aid memory allocation. Although 'LuaJIT' itself guarantees that there is no thread safety
// issue here, the use of these static local variables by multiple threads will cause a TSAN alarm.
Expand Down