mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 05:07:42 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.signal: Wrap signalfd in an userdatum for gc handling etc

Browse source
This commit is contained in:
Kim Alvefur 2024-02-24 01:00:44 +01:00
parent 49c296360d
commit 761643abcc
2 changed files with 63 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
net/server_epoll.lua
View file

@ -1147,12 +1147,13 @@ end
local hook_signal;
if have_signal and signal.signalfd then
local function dispatch(self)
return self:on("signal", signal.signalfd_read(self:getfd()));
return self:on("signal", self.conn:read());
end
function hook_signal(signum, cb)
local watch = watchfd(signal.signalfd(signum), dispatch);
watch.listeners = { onsignal = cb };
watch.close = nil; -- revert to default
return watch;
end
end

69
util-src/signal.c
View file

@ -373,29 +373,66 @@ static int l_kill(lua_State *L) {
#endif
#ifdef __linux__
static int l_signalfd(lua_State *L) {
struct lsignalfd {
int fd;
sigset_t mask;
};
sigemptyset(&mask);
sigaddset(&mask, luaL_checkinteger(L, 1));
static int l_signalfd(lua_State *L) {
struct lsignalfd *sfd = lua_newuserdata(L, sizeof(struct lsignalfd));
sigprocmask(SIG_BLOCK, &mask, NULL); /* TODO check err */
sigemptyset(&sfd->mask);
sigaddset(&sfd->mask, luaL_checkinteger(L, 1));
lua_pushinteger(L, signalfd(-1, &mask, SFD_NONBLOCK));
sigprocmask(SIG_BLOCK, &sfd->mask, NULL); /* TODO check err */
sfd->fd = signalfd(-1, &sfd->mask, SFD_NONBLOCK);
if(sfd->fd == -1) {
lua_pushnil(L);
return 1;
}
luaL_setmetatable(L, "signalfd");
return 1;
}
static int l_signalfd_getfd(lua_State *L) {
struct lsignalfd *sfd = luaL_checkudata(L, 1, "signalfd");
if (sfd->fd == -1) {
lua_pushnil(L);
return 1;
}
lua_pushinteger(L, sfd->fd);
return 1;
}
static int l_signalfd_read(lua_State *L) {
const int sigfd = luaL_checkinteger(L, 1);
struct lsignalfd *sfd = luaL_checkudata(L, 1, "signalfd");
struct signalfd_siginfo siginfo;
if(read(sigfd, &siginfo, sizeof(siginfo)) < 0) {
if(read(sfd->fd, &siginfo, sizeof(siginfo)) < 0) {
return 0;
}
lua_pushinteger(L, siginfo.ssi_signo);
return 1;
}
static int l_signalfd_close(lua_State *L) {
struct lsignalfd *sfd = luaL_checkudata(L, 1, "signalfd");
if(close(sfd->fd) != 0) {
lua_pushboolean(L, 0);
return 1;
}
sfd->fd = -1;
lua_pushboolean(L, 1);
return 1;
}
#endif
static const struct luaL_Reg lsignal_lib[] = {
@ -406,7 +443,6 @@ static const struct luaL_Reg lsignal_lib[] = {
#endif
#ifdef __linux__
{"signalfd", l_signalfd},
{"signalfd_read", l_signalfd_read},
#endif
{NULL, NULL}
};
@ -415,6 +451,23 @@ int luaopen_prosody_util_signal(lua_State *L) {
luaL_checkversion(L);
int i = 0;
#ifdef __linux__
luaL_newmetatable(L, "signalfd");
lua_pushcfunction(L, l_signalfd_close);
lua_setfield(L, -2, "__gc");
lua_createtable(L, 0, 1);
{
lua_pushcfunction(L, l_signalfd_getfd);
lua_setfield(L, -2, "getfd");
lua_pushcfunction(L, l_signalfd_read);
lua_setfield(L, -2, "read");
lua_pushcfunction(L, l_signalfd_close);
lua_setfield(L, -2, "close");
}
lua_setfield(L, -2, "__index");
lua_pop(L, 1);
#endif
/* add the library */
lua_newtable(L);
luaL_setfuncs(L, lsignal_lib, 0);