git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-xapi-sync: Retry getting bridge-ids in case xapi is not ready.
[sliver-openvswitch.git]
/
lib
/
fatal-signal.c
diff --git
a/lib/fatal-signal.c
b/lib/fatal-signal.c
index
7cfbd05
..
8c66ef5
100644
(file)
--- a/
lib/fatal-signal.c
+++ b/
lib/fatal-signal.c
@@
-15,7
+15,6
@@
*/
#include <config.h>
#include "fatal-signal.h"
*/
#include <config.h>
#include "fatal-signal.h"
-#include <assert.h>
#include <errno.h>
#include <signal.h>
#include <stdbool.h>
#include <errno.h>
#include <signal.h>
#include <stdbool.h>
@@
-112,7
+111,7
@@
fatal_signal_add_hook(void (*hook_cb)(void *aux), void (*cancel_cb)(void *aux),
{
fatal_signal_init();
{
fatal_signal_init();
- assert(n_hooks < MAX_HOOKS);
+
ovs_
assert(n_hooks < MAX_HOOKS);
hooks[n_hooks].hook_cb = hook_cb;
hooks[n_hooks].cancel_cb = cancel_cb;
hooks[n_hooks].aux = aux;
hooks[n_hooks].hook_cb = hook_cb;
hooks[n_hooks].cancel_cb = cancel_cb;
hooks[n_hooks].aux = aux;
@@
-156,8
+155,10
@@
fatal_signal_run(void)
sig_nr = stored_sig_nr;
if (sig_nr != SIG_ATOMIC_MAX) {
sig_nr = stored_sig_nr;
if (sig_nr != SIG_ATOMIC_MAX) {
+ char namebuf[SIGNAL_NAME_BUFSIZE];
+
VLOG_WARN("terminating with signal %d (%s)",
VLOG_WARN("terminating with signal %d (%s)",
- (int)sig_nr, signal_name(sig_nr));
+ (int)sig_nr, signal_name(sig_nr
, namebuf, sizeof namebuf
));
call_hooks(sig_nr);
/* Re-raise the signal with the default handling so that the program
call_hooks(sig_nr);
/* Re-raise the signal with the default handling so that the program