projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rhel: Don't delete bridges on boot.
[openvswitch]
/
lib
/
fatal-signal.c
diff --git
a/lib/fatal-signal.c
b/lib/fatal-signal.c
index ed82173a4ad1cd2727c361b09777e1977e21bb84..c7e87dbe9fbca7bfb976f0bc921620efcaf508c5 100644
(file)
--- a/
lib/fatal-signal.c
+++ b/
lib/fatal-signal.c
@@
-27,6
+27,7
@@
#include "poll-loop.h"
#include "shash.h"
#include "sset.h"
#include "poll-loop.h"
#include "shash.h"
#include "sset.h"
+#include "signals.h"
#include "socket-util.h"
#include "util.h"
#include "vlog.h"
#include "socket-util.h"
#include "util.h"
#include "vlog.h"
@@
-67,9
+68,7
@@
fatal_signal_init(void)
inited = true;
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]);
set_nonblocking(signal_fds[0]);
set_nonblocking(signal_fds[1]);
@@
-79,12
+78,10
@@
fatal_signal_init(void)
struct sigaction old_sa;
sigaddset(&fatal_signal_set, sig_nr);
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) {
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);
}
}
atexit(atexit_handler);