X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Ffatal-signal.c;h=a6ce1b78c9a3eb949851c7f6cf9404a8bcbcf873;hb=6c0386119d614d5e26ca08cc3d8e527806b87ef9;hp=ed82173a4ad1cd2727c361b09777e1977e21bb84;hpb=b3c01ed3308e7899e98e981bf465f74be86f5f12;p=openvswitch diff --git a/lib/fatal-signal.c b/lib/fatal-signal.c index ed82173a..a6ce1b78 100644 --- a/lib/fatal-signal.c +++ b/lib/fatal-signal.c @@ -27,10 +27,17 @@ #include "poll-loop.h" #include "shash.h" #include "sset.h" +#include "signals.h" #include "socket-util.h" #include "util.h" #include "vlog.h" +#include "type-props.h" + +#ifndef SIG_ATOMIC_MAX +#define SIG_ATOMIC_MAX TYPE_MAXIMUM(sig_atomic_t) +#endif + VLOG_DEFINE_THIS_MODULE(fatal_signal); /* Signals to catch. */ @@ -67,9 +74,7 @@ fatal_signal_init(void) inited = true; - if (pipe(signal_fds)) { - ovs_fatal(errno, "could not create pipe"); - } + xpipe(signal_fds); set_nonblocking(signal_fds[0]); set_nonblocking(signal_fds[1]); @@ -79,12 +84,10 @@ fatal_signal_init(void) struct sigaction old_sa; sigaddset(&fatal_signal_set, sig_nr); - if (sigaction(sig_nr, NULL, &old_sa)) { - ovs_fatal(errno, "sigaction"); - } + xsigaction(sig_nr, NULL, &old_sa); if (old_sa.sa_handler == SIG_DFL && signal(sig_nr, fatal_signal_handler) == SIG_ERR) { - ovs_fatal(errno, "signal"); + VLOG_FATAL("signal failed (%s)", strerror(errno)); } } atexit(atexit_handler);