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

Use atomic instruct to avoid concurrence signal 0

Browse Source
This commit is contained in:
Cloud Wu
2020-10-23 18:21:16 +08:00
parent 1dfddc0d84
commit a6adc69090
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
service-src/service_snlua.c
View File

@@ -1,4 +1,5 @@
#include "skynet.h" #include "skynet.h"
#include "atomic.h"
#include <lua.h> #include <lua.h>
#include <lualib.h> #include <lualib.h>
@@ -87,6 +88,10 @@ lua_resumeX(lua_State *L, lua_State *from, int nargs, int *nresults) {
struct snlua *l = (struct snlua *)ud; struct snlua *l = (struct snlua *)ud;
switchL(L, l); switchL(L, l);
int err = lua_resume(L, from, nargs, nresults); int err = lua_resume(L, from, nargs, nresults);
if (l->trap) {
// wait for lua_sethook. (l->trap == -1)
while (l->trap >= 0) ;
}
switchL(from, l); switchL(from, l);
return err; return err;
} }
@@ -516,8 +521,12 @@ snlua_signal(struct snlua *l, int signal) {
skynet_error(l->ctx, "recv a signal %d", signal); skynet_error(l->ctx, "recv a signal %d", signal);
if (signal == 0) { if (signal == 0) {
if (l->trap == 0) { if (l->trap == 0) {
l->trap = 1; // only one thread can set trap ( l->trap 0->1 )
if (!ATOM_CAS(&l->trap, 0, 1))
return;
lua_sethook (l->activeL, signal_hook, LUA_MASKCOUNT, 1); lua_sethook (l->activeL, signal_hook, LUA_MASKCOUNT, 1);
// set finish ( l->trap 1 -> -1 )
l->trap = -1;
} }
} else if (signal == 1) { } else if (signal == 1) {
skynet_error(l->ctx, "Current Memory %.3fK", (float)l->mem / 1024); skynet_error(l->ctx, "Current Memory %.3fK", (float)l->mem / 1024);