Skip to content

Synced Lua: call lua_next directly in next, one closure for pairs #3484

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moss-orbit-9f339e wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Synced Lua: call lua_next directly in next, one closure for pairs #3484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b32c6e
Synced Lua: call lua_next directly in next, one closure for pairs
moss-orbit-9f339e Oct 13, 2026
4c8d102
Add changelog for #3484
moss-orbit-9f339e Oct 13, 2026
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
1 change: 1 addition & 0 deletions doc/pr-changelogs/3484.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* synced Lua next and pairs call lua_next directly and make no closure per pairs call.
29 changes: 8 additions & 21 deletions rts/Lua/LuaHandleSynced.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,6 @@ bool CUnsyncedLuaHandle::DrawMaterial(const LuaMaterial* material)
CSyncedLuaHandle::CSyncedLuaHandle(CSplitLuaHandle* _base, const std::string& _name, int _order)
: CLuaHandle(_name, _order, false, true)
, base(*_base)
, origNextRef(-1)
{
}

Expand Down Expand Up @@ -439,9 +438,6 @@ bool CSyncedLuaHandle::Init(std::string code, const std::string& file)
LuaLibs::OpenSynced(L, true);
EnactDevMode();

lua_getglobal(L, "next");
origNextRef = luaL_ref(L, LUA_REGISTRYINDEX);

// delete/replace some dangerous functions
lua_pushnil(L); lua_setglobal(L, "dofile");
lua_pushnil(L); lua_setglobal(L, "loadfile");
Expand All @@ -458,7 +454,9 @@ bool CSyncedLuaHandle::Init(std::string code, const std::string& file)

lua_pushvalue(L, LUA_GLOBALSINDEX);
LuaPushNamedCFunc(L, "loadstring", CLuaHandle::LoadStringData);
LuaPushNamedCFunc(L, "pairs", SyncedPairs);
lua_pushcfunction(L, SyncedNext);
lua_pushcclosure(L, SyncedPairs, 1);
lua_setfield(L, -2, "pairs");
LuaPushNamedCFunc(L, "next", SyncedNext);
lua_pop(L, 1);

Expand Down Expand Up @@ -1969,22 +1967,11 @@ int CSyncedLuaHandle::SyncedNext(lua_State* L)
LUA_TTHREAD //FIXME LUA_TTHREAD is normally _not_ synced safe but LUS handler needs it atm (and uses it in a safe way)
};

const CSyncedLuaHandle* slh = GetSyncedHandle(L);
assert(slh->origNextRef > 0);
const int oldTop = lua_gettop(L);

lua_rawgeti(L, LUA_REGISTRYINDEX, slh->origNextRef);
lua_pushvalue(L, 1);

if (oldTop >= 2) {
lua_pushvalue(L, 2);
} else {
luaL_checktype(L, 1, LUA_TTABLE);
lua_settop(L, 2);
const int retCount = lua_next(L, 1) ? 2 : 1;
if (retCount == 1)
lua_pushnil(L);
}

lua_call(L, 2, LUA_MULTRET);
const int retCount = lua_gettop(L) - oldTop;
assert(retCount == 1 || retCount == 2);

if (retCount >= 2) {
const int keyType = lua_type(L, -2);
Expand All @@ -2010,7 +1997,7 @@ int CSyncedLuaHandle::SyncedPairs(lua_State* L)
RECOIL_DETAILED_TRACY_ZONE;
/* copied from lbaselib.cpp */
luaL_checktype(L, 1, LUA_TTABLE);
lua_pushcfunction(L, SyncedNext); /* return generator, */
lua_pushvalue(L, lua_upvalueindex(1)); /* return generator, */
lua_pushvalue(L, 1); /* state, */
lua_pushnil(L); /* and initial value */
return 3;
Expand Down
9 changes: 1 addition & 8 deletions rts/Lua/LuaHandleSynced.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* This file is part of the Spring engine (GPL v2 or later), see LICENSE.html */

#ifndef LUA_HANDLE_SYNCED
#define LUA_HANDLE_SYNCED
#pragma once

#include <string>

Expand Down Expand Up @@ -142,9 +141,6 @@ class CSyncedLuaHandle : public CLuaHandle

spring::unordered_map<std::string, std::string> textCommands; // name, help

private:
int origNextRef;

private: // call-outs
static int SyncedRandom(lua_State* L);
static int SyncedRandomSeed(lua_State* L);
Expand Down Expand Up @@ -282,6 +278,3 @@ class CSplitLuaHandle
friend class CGameStateCollector;
static LuaRulesParams::Params gameParams;
};


#endif /* LUA_HANDLE_SYNCED */
Loading