rusefi
/
lua
mirror of https://github.com/rusefi/lua.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

'luaE_shrinkCI' shouldn't remove first free CallInfo 

Due to emergency collections, 'luaE_shrinkCI' can be called while Lua
is building a new CallInfo, which for a while is still a free CallInfo.
This commit is contained in:
Roberto Ierusalimschy 2020-06-15 11:58:59 -03:00
parent 69e84805e4
commit d49b288728
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lstate.c
View File

@ -186,20 +186,26 @@ void luaE_freeCI (lua_State *L) {
/* /*
** free half of the CallInfo structures not in use by a thread ** free half of the CallInfo structures not in use by a thread,
** keeping the first one.
*/ */
void luaE_shrinkCI (lua_State *L) { void luaE_shrinkCI (lua_State *L) {
CallInfo *ci = L->ci; CallInfo *ci = L->ci->next; /* first free CallInfo */
CallInfo *next; CallInfo *next;
CallInfo *next2; /* next's next */ if (ci == NULL)
return; /* no extra elements */
L->nCcalls += L->nci; /* add removed elements back to 'nCcalls' */ L->nCcalls += L->nci; /* add removed elements back to 'nCcalls' */
/* while there are two nexts */ while ((next = ci->next) != NULL) { /* two extra elements? */
while ((next = ci->next) != NULL && (next2 = next->next) != NULL) { CallInfo *next2 = next->next; /* next's next */
ci->next = next2; /* remove next from the list */ ci->next = next2; /* remove next from the list */
next2->previous = ci;
luaM_free(L, next); /* free next */
L->nci--; L->nci--;
ci = next2; /* keep next's next */ luaM_free(L, next); /* free next */
if (next2 == NULL)
break; /* no more elements */
else {
next2->previous = ci;
ci = next2; /* continue */
}
} }
L->nCcalls -= L->nci; /* adjust result */ L->nCcalls -= L->nci; /* adjust result */
} }