author | Tero Marttila <terom@fixme.fi> |
Mon, 04 May 2009 20:55:04 +0300 | |
branch | new-transport |
changeset 168 | a58ad50911fc |
parent 155 | c59d3eaff0fb |
child 172 | ea4972e51fa3 |
permissions | -rw-r--r-- |
48
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
1 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
2 |
#include "signals.h" |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
3 |
#include "log.h" |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
4 |
|
155
c59d3eaff0fb
most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents:
109
diff
changeset
|
5 |
#define _GNU_SOURCE |
c59d3eaff0fb
most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents:
109
diff
changeset
|
6 |
|
48
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
7 |
#include <string.h> |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
8 |
#include <signal.h> |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
9 |
#include <stdlib.h> |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
10 |
#include <assert.h> |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
11 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
12 |
struct signals { |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
13 |
/** The libevent base to use */ |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
14 |
struct event_base *ev_base; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
15 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
16 |
/** Information about up to MAX_SIGNALS signals */ |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
17 |
struct signal { |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
18 |
/** The event we use to handle the signal */ |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
19 |
struct event *ev; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
20 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
21 |
} sig_list[MAX_SIGNALS]; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
22 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
23 |
/** Number of used sig_list slots */ |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
24 |
int sig_count; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
25 |
}; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
26 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
27 |
void signals_loopexit (int signal, short event, void *arg) |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
28 |
{ |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
29 |
struct signals *signals = arg; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
30 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
31 |
(void) event; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
32 |
|
155
c59d3eaff0fb
most of the new transport/sock code compiles, but things are still missing
Tero Marttila <terom@fixme.fi>
parents:
109
diff
changeset
|
33 |
log_info("caught %s: exiting", /* strsignal(signal) */ "xxx"); |
48
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
34 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
35 |
if (event_base_loopexit(signals->ev_base, NULL)) |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
36 |
FATAL("event_base_loopexit"); |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
37 |
} |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
38 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
39 |
void signals_ignore (int signal, short event, void *arg) |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
40 |
{ |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
41 |
struct signals *signals = arg; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
42 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
43 |
(void) signal; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
44 |
(void) event; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
45 |
(void) arg; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
46 |
(void) signals; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
47 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
48 |
/* ignore */ |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
49 |
} |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
50 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
51 |
err_t signals_create (struct signals **signals_ptr, struct event_base *ev_base) |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
52 |
{ |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
53 |
struct signals *signals; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
54 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
55 |
if ((signals = calloc(1, sizeof(*signals))) == NULL) |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
56 |
return ERR_CALLOC; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
57 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
58 |
// simple attributes |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
59 |
signals->ev_base = ev_base; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
60 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
61 |
// done |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
62 |
*signals_ptr = signals; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
63 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
64 |
return SUCCESS; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
65 |
} |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
66 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
67 |
err_t signals_add (struct signals *signals, int sigval, void (*sig_handler)(evutil_socket_t, short, void *), void *arg) |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
68 |
{ |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
69 |
struct signal *sig_info; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
70 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
71 |
// find our sig_info |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
72 |
assert(signals->sig_count < MAX_SIGNALS); |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
73 |
sig_info = signals->sig_list + (signals->sig_count++); |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
74 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
75 |
// set up the libevent signal events |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
76 |
if ((sig_info->ev = evsignal_new(signals->ev_base, sigval, sig_handler, arg)) == NULL) |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
77 |
return ERR_EVENT_NEW; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
78 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
79 |
if (evsignal_add(sig_info->ev, NULL)) |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
80 |
return ERR_EVENT_ADD; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
81 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
82 |
// ok |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
83 |
return SUCCESS; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
84 |
} |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
85 |
|
71
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
86 |
err_t signal_ignore (int signum, struct error_info *err) |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
87 |
{ |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
88 |
struct sigaction act = { |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
89 |
.sa_handler = SIG_IGN, |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
90 |
}; |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
91 |
|
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
92 |
// signall the handler |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
93 |
if (sigaction(signum, &act, NULL)) |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
94 |
RETURN_SET_ERROR_ERRNO(err, ERR_SIGACTION); |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
95 |
|
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
96 |
// ok |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
97 |
return SUCCESS; |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
98 |
} |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
99 |
|
48
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
100 |
struct signals *signals_default (struct event_base *ev_base) |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
101 |
{ |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
102 |
struct signals *signals = NULL; |
71
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
103 |
struct error_info err; |
48
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
104 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
105 |
// alloc signals |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
106 |
if (signals_create(&signals, ev_base)) |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
107 |
return NULL; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
108 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
109 |
// add the set of default signals |
71
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
110 |
if (signal_ignore(SIGPIPE, &err)) |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
111 |
log_err_info(&err, "signal_ignore(SIGPIPE)"); |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
112 |
|
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
113 |
if ((ERROR_CODE(&err) = signals_add(signals, SIGINT, &signals_loopexit, signals))) { |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
114 |
log_err_info(&err, "signals_add(SIGINT)"); |
48
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
115 |
goto error; |
71
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
116 |
} |
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
117 |
|
48
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
118 |
// ok |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
119 |
return signals; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
120 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
121 |
error: |
71
0a13030f795d
implement signal_ignore using sigaction directly, without any libevent in between
Tero Marttila <terom@fixme.fi>
parents:
48
diff
changeset
|
122 |
signals_free(signals); |
48
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
123 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
124 |
return NULL; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
125 |
} |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
126 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
127 |
void signals_free (struct signals *signals) |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
128 |
{ |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
129 |
int i; |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
130 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
131 |
// free all events |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
132 |
for (i = 0; i < signals->sig_count; i++) { |
109
bfe9b9a8fe5b
fix some more valgrind errors
Tero Marttila <terom@fixme.fi>
parents:
71
diff
changeset
|
133 |
event_free(signals->sig_list[i].ev); |
48
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
134 |
} |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
135 |
|
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
136 |
// free the info itself |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
137 |
free(signals); |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
138 |
} |
4841f4398fd2
add irc_net_quit and signal handling
Tero Marttila <terom@fixme.fi>
parents:
diff
changeset
|
139 |