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

bugfix #976 long string instead of global seed

Browse Source
This commit is contained in:
zixun
2019-03-28 19:58:51 +08:00
committed by 云风
parent ea0cc1fade
commit 3c6c0f7aa4
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
3rd/lua/lstring.c
View File

@@ -11,7 +11,7 @@
#include <string.h> #include <string.h>
#include <time.h>
#include "lua.h" #include "lua.h"
#include "ldebug.h" #include "ldebug.h"
@@ -143,9 +143,19 @@ static TString *createstrobj (lua_State *L, size_t l, int tag, unsigned int h) {
return ts; return ts;
} }
static unsigned int LNGSTR_SEED;
static unsigned int make_lstr_seed() {
size_t buff[4];
unsigned int h = time(NULL);
buff[0] = cast(size_t, h);
buff[1] = cast(size_t, &LNGSTR_SEED);
buff[2] = cast(size_t, &make_lstr_seed);
buff[3] = cast(size_t, &luaS_createlngstrobj);
return luaS_hash((const char*)buff, sizeof(buff), h);
}
TString *luaS_createlngstrobj (lua_State *L, size_t l) { TString *luaS_createlngstrobj (lua_State *L, size_t l) {
TString *ts = createstrobj(L, l, LUA_TLNGSTR, G(L)->seed); TString *ts = createstrobj(L, l, LUA_TLNGSTR, LNGSTR_SEED);
ts->u.lnglen = l; ts->u.lnglen = l;
return ts; return ts;
} }
@@ -284,6 +294,7 @@ luaS_initshr() {
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);
} }
LNGSTR_SEED = make_lstr_seed();
} }
LUA_API void LUA_API void