lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-25 12:43:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

mark all short string shared, see #1027

Browse Source
This commit is contained in:
Cloud Wu
2019-06-13 16:58:57 +08:00
parent ca4f549f0d
commit 7fed938593
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
3rd/lua/lstring.c
View File

@@ -75,7 +75,6 @@ void luaS_clearcache (global_State *g) {
int i, j; int i, j;
for (i = 0; i < STRCACHE_N; i++) for (i = 0; i < STRCACHE_N; i++)
for (j = 0; j < STRCACHE_M; j++) { for (j = 0; j < STRCACHE_M; j++) {
if (!isshared(g->strcache[i][j]) && iswhite(g->strcache[i][j])) /* will entry be collected? */
g->strcache[i][j] = g->memerrmsg; /* replace it with something fixed */ g->strcache[i][j] = g->memerrmsg; /* replace it with something fixed */
} }
} }
@@ -936,6 +935,7 @@ new_string(unsigned int h, const char *str, lu_byte l) {
memset(ts, 0, sz); memset(ts, 0, sz);
setbits(ts->marked, WHITEBITS); setbits(ts->marked, WHITEBITS);
gray2black(ts); gray2black(ts);
makeshared(ts);
ts->tt = LUA_TSHRSTR; ts->tt = LUA_TSHRSTR;
ts->hash = h; ts->hash = h;
ts->shrlen = l; ts->shrlen = l;

1
lualib-src/lua-sharetable.c
View File

@@ -47,7 +47,6 @@ mark_shared(lua_State *L) {
case LUA_TSTRING: { case LUA_TSTRING: {
const char *str = lua_tostring(L, idx); const char *str = lua_tostring(L, idx);
TString *ts = (TString *)(str - sizeof(UTString)); TString *ts = (TString *)(str - sizeof(UTString));
if(ts->tt==LUA_TLNGSTR)
makeshared(ts); makeshared(ts);
break; break;
} }