Changeset 892

Timestamp:

03/05/10 01:24:09 (5 months ago)

Author:

zoogie

Message:

Use generated references instead of a static address to store the table of callbacks.

Location:

trunk/client/Game2

Files:

• SysConsole.cpp (modified) (7 diffs)
• SysConsole.h (modified) (2 diffs)

trunk/client/Game2/SysConsole.cpp

@@ -39 +39 @@
 using namespace HoverRace::Script;
 
-namespace {
-    const char ON_INIT_REG_KEY = 'A';
-}
-
 SysConsole::SysConsole() :
-    SUPER()
+    SUPER(), onInitRef(-1)
 {
 }
@@ -50 +46 @@
 SysConsole::~SysConsole()
 {
+    if (onInitRef >= 0) {
+        lua_State *state = GetScripting()->GetState();
+        luaL_unref(state, LUA_REGISTRYINDEX, onInitRef);
+    }
+}
+
+void SysConsole::InitEnv(Script::Env *scripting)
+{
+    SUPER::InitEnv(scripting);
+    onInitRef = luaL_ref(scripting->GetState(), LUA_REGISTRYINDEX);
 }
 
@@ -58 +64 @@
     lua_State *state = scripting->GetState();
 
-    lua_pushcclosure(state, SysConsole::LOnInit, 0);
+    lua_pushlightuserdata(state, this);
+    lua_pushcclosure(state, SysConsole::LOnInit, 1);
     lua_setglobal(state, "on_init");
 
-    lua_pushcclosure(state, SysConsole::LGetOnInit, 0);
+    lua_pushlightuserdata(state, this);
+    lua_pushcclosure(state, SysConsole::LGetOnInit, 1);
     lua_setglobal(state, "get_on_init");
 
     // Initial arrays for callbacks.
-    lua_pushlightuserdata(state, (void*)&ON_INIT_REG_KEY);
     lua_newtable(state);
-    lua_settable(state, LUA_REGISTRYINDEX);
+    lua_rawseti(state, LUA_REGISTRYINDEX, onInitRef);
 }
 
@@ -116 +123 @@
     lua_State *state = GetScripting()->GetState();
 
-    lua_pushlightuserdata(state, (void*)&ON_INIT_REG_KEY);
-    lua_gettable(state, LUA_REGISTRYINDEX);  // table
+    lua_rawgeti(state, LUA_REGISTRYINDEX, onInitRef);  // table
 
     lua_pushnil(state);  // table nil
@@ -132 +138 @@
     // function on_init(f)
     // Register a callback function for when the game starts up.
+    SysConsole *self = static_cast<SysConsole*>(lua_touserdata(state, lua_upvalueindex(1)));
 
     if (!lua_isfunction(state, 1)) {
@@ -138 +145 @@
     }
 
-    lua_pushlightuserdata(state, (void*)&ON_INIT_REG_KEY);
-    lua_gettable(state, LUA_REGISTRYINDEX);  // table
+    lua_rawgeti(state, LUA_REGISTRYINDEX, self->onInitRef);  // table
 
     lua_pushinteger(state, lua_objlen(state, -1) + 1); // table key
@@ -154 +160 @@
     // function get_on_init()
     // Returns the table of on_init callbacks (for debugging purposes).
+    SysConsole *self = static_cast<SysConsole*>(lua_touserdata(state, lua_upvalueindex(1)));
 
-    lua_pushlightuserdata(state, (void*)&ON_INIT_REG_KEY);
-    lua_gettable(state, LUA_REGISTRYINDEX);  // table
+    lua_rawgeti(state, LUA_REGISTRYINDEX, self->onInitRef);  // table
 
     return 1;

trunk/client/Game2/SysConsole.h

@@ -37 +37 @@
 
     protected:
+        virtual void InitEnv(Script::Env *scripting);
         virtual void InitGlobals(Script::Env *scripting);
 
@@ -56 +57 @@
         static int LOnInit(lua_State *state);
         static int LGetOnInit(lua_State *state);
+
+    private:
+        int onInitRef;
 };