summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'main.c')
-rw-r--r--main.c40
1 files changed, 20 insertions, 20 deletions
diff --git a/main.c b/main.c
index c240da2..1dbc3c2 100644
--- a/main.c
+++ b/main.c
@@ -546,14 +546,14 @@ struct signalfd_ev {
static void
signalfd_free(struct uring_task *task)
{
- struct signalfd_ev *sev = container_of(task, struct signalfd_ev, task);
+ struct signalfd_ev *signal = container_of(task, struct signalfd_ev, task);
assert_return(task);
debug(DBG_SIG, "called");
- close(sev->pipe[PIPE_WR]);
- cfg->sev = NULL;
- xfree(sev);
+ close(signal->pipe[PIPE_WR]);
+ cfg->signal = NULL;
+ xfree(signal);
}
static void
@@ -568,8 +568,8 @@ dump_tree()
info("Dumping Tree");
info("============");
uring_task_refdump(&cfg->task);
- if (cfg->sev)
- uring_task_refdump(&cfg->sev->task);
+ if (cfg->signal)
+ uring_task_refdump(&cfg->signal->task);
uring_refdump();
idle_refdump();
igmp_refdump();
@@ -584,7 +584,7 @@ dump_tree()
static void
signalfd_read(struct uring_task *task, int res)
{
- struct signalfd_ev *sev = container_of(task, struct signalfd_ev, task);
+ struct signalfd_ev *signal = container_of(task, struct signalfd_ev, task);
struct server *server, *stmp;
static unsigned count = 0;
siginfo_t *si;
@@ -641,7 +641,7 @@ signalfd_read(struct uring_task *task, int res)
verbose("got a signal to dump tree");
sd_notifyf(0, "STOPPING=1\nSTATUS=Received signal, exiting");
dump_tree();
- uring_task_destroy(&sev->task);
+ uring_task_destroy(&signal->task);
igmp_delete();
announce_delete();
idle_delete();
@@ -657,7 +657,7 @@ signalfd_read(struct uring_task *task, int res)
}
out:
- uring_tbuf_read(&sev->task, signalfd_read);
+ uring_tbuf_read(&signal->task, signalfd_read);
}
static void
@@ -667,7 +667,7 @@ hack_signal_handler(int signum, siginfo_t *si, void *ucontext)
assert_return(signum > 0 && si);
- r = write(cfg->sev->pipe[PIPE_WR], si, sizeof(*si));
+ r = write(cfg->signal->pipe[PIPE_WR], si, sizeof(*si));
if (r != sizeof(*si))
error("write: %zi\n", r);
@@ -677,13 +677,13 @@ static void
signalfd_init()
{
//sigset_t mask;
- struct signalfd_ev *sev;
+ struct signalfd_ev *signal;
- sev = zmalloc(sizeof(*sev));
- if (!sev)
+ signal = zmalloc(sizeof(*signal));
+ if (!signal)
die("malloc: %m");
- if (pipe2(sev->pipe, O_CLOEXEC) < 0)
+ if (pipe2(signal->pipe, O_CLOEXEC) < 0)
die("pipe2: %m");
/*
@@ -712,12 +712,12 @@ signalfd_init()
sigaction(SIGPIPE, &action, NULL);
debug(DBG_SIG, "using pipe fds %i -> %i",
- sev->pipe[PIPE_WR], sev->pipe[PIPE_RD]);
- uring_task_init(&sev->task, "signal", uring_parent(), signalfd_free);
- uring_task_set_fd(&sev->task, sev->pipe[PIPE_RD]);
- uring_task_set_buf(&sev->task, &sev->tbuf);
- cfg->sev = sev;
- uring_tbuf_read(&sev->task, signalfd_read);
+ signal->pipe[PIPE_WR], signal->pipe[PIPE_RD]);
+ uring_task_init(&signal->task, "signal", uring_parent(), signalfd_free);
+ uring_task_set_fd(&signal->task, signal->pipe[PIPE_RD]);
+ uring_task_set_buf(&signal->task, &signal->tbuf);
+ cfg->signal = signal;
+ uring_tbuf_read(&signal->task, signalfd_read);
}
int