lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move garbage collection out of Lua hooks. 

That's supposed to be run once a frame, not once per hook
per mobj per frame you moron. If you just run it seven
thousand times a frame, of course your framerate will drop.
This commit is contained in:
Yukita Mayako 2015-06-10 13:42:45 -04:00
parent 06b82d172b
commit 0af32ee2fa
6 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/d_main.c
View File

@ -96,6 +96,10 @@ int snprintf(char *str, size_t n, const char *fmt, ...);
#include "hardware/hw3sound.h"
#endif
#ifdef HAVE_BLUA
#include "lua_script.h"
#endif
// platform independant focus loss
UINT8 window_notinfocus = false;
@ -634,6 +638,10 @@ void D_SRB2Loop(void)
#ifdef HW3SOUND
HW3S_EndFrameUpdate();
#endif
#ifdef HAVE_BLUA
LUA_Step();
#endif
}
}

17
src/lua_hooklib.c
View File

@ -204,7 +204,6 @@ boolean LUAh_MobjHook(mobj_t *mo, enum hook which)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
return hooked;
}
@ -238,7 +237,6 @@ boolean LUAh_PlayerHook(player_t *plr, enum hook which)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
return hooked;
}
@ -262,7 +260,6 @@ void LUAh_MapChange(void)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
}
// Hook for map load
@ -285,7 +282,6 @@ void LUAh_MapLoad(void)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
}
// Hook for Got_AddPlayer
@ -308,7 +304,6 @@ void LUAh_PlayerJoin(int playernum)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCCOLLECT, 0);
}
// Hook for frame (after mobj and player thinkers)
@ -330,8 +325,6 @@ void LUAh_ThinkFrame(void)
hookp->error = true;
}
}
lua_gc(gL, LUA_GCSTEP, 1);
}
// Hook for mobj collisions
@ -375,7 +368,6 @@ UINT8 LUAh_MobjCollideHook(mobj_t *thing1, mobj_t *thing2, enum hook which)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
return shouldCollide;
}
@ -415,7 +407,6 @@ boolean LUAh_TouchSpecial(mobj_t *special, mobj_t *toucher)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
return hooked;
}
@ -464,7 +455,6 @@ UINT8 LUAh_ShouldDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
return shouldDamage;
}
@ -508,7 +498,6 @@ boolean LUAh_MobjDamage(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
return hooked;
}
@ -550,7 +539,6 @@ boolean LUAh_MobjDeath(mobj_t *target, mobj_t *inflictor, mobj_t *source)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
return hooked;
}
@ -589,7 +577,6 @@ boolean LUAh_BotTiccmd(player_t *bot, ticcmd_t *cmd)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
return hooked;
}
@ -651,7 +638,6 @@ boolean LUAh_BotAI(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
return hooked;
}
@ -685,7 +671,6 @@ boolean LUAh_LinedefExecute(line_t *line, mobj_t *mo, sector_t *sector)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
return hooked;
}
@ -739,7 +724,6 @@ boolean LUAh_PlayerMsg(int source, int target, int flags, char *msg)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
return hooked;
}
@ -781,7 +765,6 @@ boolean LUAh_HurtMsg(player_t *player, mobj_t *inflictor, mobj_t *source)
}
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
return hooked;
}

4
src/lua_hudlib.c
View File

@ -674,8 +674,6 @@ void LUAh_GameHUD(player_t *stplayr)
LUA_Call(gL, 3);
}
lua_pop(gL, -1);
lua_gc(gL, LUA_GCCOLLECT, 0);
hud_running = false;
}
@ -701,8 +699,6 @@ void LUAh_ScoresHUD(void)
LUA_Call(gL, 1);
}
lua_pop(gL, -1);
lua_gc(gL, LUA_GCCOLLECT, 0);
hud_running = false;
}

2
src/lua_infolib.c
View File

@ -137,8 +137,6 @@ static void A_Lua(mobj_t *actor)
--superstack;
superactions[superstack] = NULL;
}
lua_gc(gL, LUA_GCSTEP, 1);
}
// Arbitrary states[] table index -> state_t *

8
src/lua_script.c
View File

@ -939,6 +939,14 @@ static void NetArchiveHook(lua_CFunction archFunc)
lua_pop(gL, 2);
}
void LUA_Step(void)
{
if (!gL)
return;
lua_settop(gL, 0);
lua_gc(gL, LUA_GCSTEP, 1);
}
void LUA_Archive(void)
{
INT32 i;

1
src/lua_script.h
View File

@ -48,6 +48,7 @@ void LUA_InvalidateUserdata(void *data);
void LUA_InvalidateLevel(void);
void LUA_InvalidateMapthings(void);
void LUA_InvalidatePlayer(player_t *player);
void LUA_Step(void);
void LUA_Archive(void);
void LUA_UnArchive(void);
void Got_Luacmd(UINT8 **cp, INT32 playernum); // lua_consolelib.c