mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-04-22 23:04:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Improve Redbean Lua memory (#241)

Browse source 
- Update redbean Lua to check there is enough stack to use
- Add explicit Lua gc pass after each message is processed
- Add Lua memory reporting to redbean
This commit is contained in:
Paul Kulchenko 2021-08-13 02:11:49 -07:00 • committed by GitHub
parent b420ed8248
commit a22f0736d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
tool/net/redbean.c
View file

@ -545,6 +545,9 @@ static void CollectGarbage(void) {
LOGIFNEG1(munmap(unmaplist.p[unmaplist.n].p, unmaplist.p[unmaplist.n].n)); LOGIFNEG1(munmap(unmaplist.p[unmaplist.n].p, unmaplist.p[unmaplist.n].n));
LOGIFNEG1(close(unmaplist.p[unmaplist.n].f)); LOGIFNEG1(close(unmaplist.p[unmaplist.n].f));
} }
#ifndef STATIC
(void)lua_gc(L, LUA_GCCOLLECT);
#endif
} }
static void UseOutput(void) { static void UseOutput(void) {
@ -1080,6 +1083,8 @@ static int LuaCallWithTrace(lua_State *L, int nargs, int nres) {
} else { } else {
// move results to the main stack // move results to the main stack
lua_xmove(co, L, nresults); lua_xmove(co, L, nresults);
// make sure the stack has enough space to grow
luaL_checkstack(L, nres - nresults, NULL);
// grow the stack in case returned fewer results // grow the stack in case returned fewer results
// than the caller expects, as lua_resume // than the caller expects, as lua_resume
// doesn't adjust the stack for needed results // doesn't adjust the stack for needed results
@ -3130,6 +3135,9 @@ static char *ServeStatusz(void) {
AppendLong1("lastmeltdown", shared->lastmeltdown); AppendLong1("lastmeltdown", shared->lastmeltdown);
AppendLong1("workers", shared->workers); AppendLong1("workers", shared->workers);
AppendLong1("assets.n", assets.n); AppendLong1("assets.n", assets.n);
#ifndef STATIC
AppendLong1("lua.memory", lua_gc(L, LUA_GCCOUNT)*1024 + lua_gc(L, LUA_GCCOUNTB));
#endif
ServeCounters(); ServeCounters();
AppendRusage("server", &shared->server); AppendRusage("server", &shared->server);
AppendRusage("children", &shared->children); AppendRusage("children", &shared->children);