lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 20:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix issue #331

Browse Source
This commit is contained in:
Cloud Wu
2015-08-29 15:24:24 +08:00
parent c1c5cd39e5
commit 633e5fbe32
1 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
3rd/lua/lstring.c
View File

@@ -252,36 +252,33 @@ struct shrmap {
int n; int n;
}; };
static struct shrmap *SSM = NULL; static struct shrmap SSM;
LUA_API void LUA_API void
luaS_initshr() { luaS_initshr() {
struct shrmap * s = malloc(sizeof(*s)); struct shrmap * s = &SSM;
memset(s, 0, sizeof(*s));
int i; int i;
for (i=0;i<SHRSTR_SLOT;i++) { for (i=0;i<SHRSTR_SLOT;i++) {
rwlock_init(&s->h[i].lock); rwlock_init(&s->h[i].lock);
} }
SSM = s;
} }
LUA_API void LUA_API void
luaS_exitshr() { luaS_exitshr() {
int i; int i;
for (i=0;i<SHRSTR_SLOT;i++) { for (i=0;i<SHRSTR_SLOT;i++) {
TString *str = SSM->h[i].str; TString *str = SSM.h[i].str;
while (str) { while (str) {
TString * next = str->u.hnext; TString * next = str->u.hnext;
free(str); free(str);
str = next; str = next;
} }
} }
free(SSM);
} }
static TString * static TString *
query_string(unsigned int h, const char *str, lu_byte l) { query_string(unsigned int h, const char *str, lu_byte l) {
struct shrmap_slot *s = &SSM->h[HASH_NODE(h)]; struct shrmap_slot *s = &SSM.h[HASH_NODE(h)];
rwlock_rlock(&s->lock); rwlock_rlock(&s->lock);
TString *ts = s->str; TString *ts = s->str;
while (ts) { while (ts) {
@@ -299,7 +296,7 @@ query_string(unsigned int h, const char *str, lu_byte l) {
static TString * static TString *
query_ptr(TString *t) { query_ptr(TString *t) {
unsigned int h = t->hash; unsigned int h = t->hash;
struct shrmap_slot *s = &SSM->h[HASH_NODE(h)]; struct shrmap_slot *s = &SSM.h[HASH_NODE(h)];
rwlock_rlock(&s->lock); rwlock_rlock(&s->lock);
TString *ts = s->str; TString *ts = s->str;
while (ts) { while (ts) {
@@ -326,7 +323,7 @@ new_string(unsigned int h, const char *str, lu_byte l) {
static TString * static TString *
add_string(unsigned int h, const char *str, lu_byte l) { add_string(unsigned int h, const char *str, lu_byte l) {
TString * tmp = new_string(h, str, l); TString * tmp = new_string(h, str, l);
struct shrmap_slot *s = &SSM->h[HASH_NODE(h)]; struct shrmap_slot *s = &SSM.h[HASH_NODE(h)];
rwlock_wlock(&s->lock); rwlock_wlock(&s->lock);
TString *ts = s->str; TString *ts = s->str;
while (ts) { while (ts) {
@@ -366,9 +363,9 @@ internshrstr (lua_State *L, const char *str, size_t l) {
ts = query_string(h0, str, l); ts = query_string(h0, str, l);
if (ts) if (ts)
return ts; return ts;
// If SSM->n greate than 0, add it to SSM // If SSM.n greate than 0, add it to SSM
if (SSM->n > 0) { if (SSM.n > 0) {
ATOM_DEC(&SSM->n); ATOM_DEC(&SSM.n);
return add_string(h0, str, l); return add_string(h0, str, l);
} }
// Else add it to global state (local) // Else add it to global state (local)
@@ -377,7 +374,7 @@ internshrstr (lua_State *L, const char *str, size_t l) {
LUA_API void LUA_API void
luaS_expandshr(int n) { luaS_expandshr(int n) {
ATOM_ADD(&SSM->n, n); ATOM_ADD(&SSM.n, n);
} }
LUAI_FUNC TString * LUAI_FUNC TString *
@@ -430,7 +427,7 @@ luaS_shrinfo(lua_State *L) {
int i; int i;
int len = 0; int len = 0;
for (i=0;i<SHRSTR_SLOT;i++) { for (i=0;i<SHRSTR_SLOT;i++) {
struct shrmap_slot *s = &SSM->h[i]; struct shrmap_slot *s = &SSM.h[i];
getslot(s, &tmp); getslot(s, &tmp);
len += tmp.len; len += tmp.len;
if (tmp.len > total.len) { if (tmp.len > total.len) {
@@ -441,6 +438,6 @@ luaS_shrinfo(lua_State *L) {
lua_pushinteger(L, len); lua_pushinteger(L, len);
lua_pushinteger(L, total.size); lua_pushinteger(L, total.size);
lua_pushinteger(L, total.len); lua_pushinteger(L, total.len);
lua_pushinteger(L, SSM->n); lua_pushinteger(L, SSM.n);
return 4; return 4;
} }