/*
- * Copyright (c) 2008, 2009, 2011 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2011, 2012 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
#include <config.h>
#include "signals.h"
-#include <assert.h>
#include <errno.h>
#include <limits.h>
#include <signal.h>
+#include <stdlib.h>
#include <unistd.h>
#include "poll-loop.h"
#include "socket-util.h"
#endif
struct signal {
+ struct sigaction saved_sa;
int signr;
};
static bool inited;
if (!inited) {
inited = true;
- xpipe(fds);
- set_nonblocking(fds[0]);
- set_nonblocking(fds[1]);
+ xpipe_nonblocking(fds);
}
}
signal_init();
+ s = xmalloc(sizeof *s);
+ s->signr = signr;
+
/* Set up signal handler. */
- assert(signr >= 1 && signr < N_SIGNALS);
+ ovs_assert(signr >= 1 && signr < N_SIGNALS);
memset(&sa, 0, sizeof sa);
sa.sa_handler = signal_handler;
sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_RESTART;
- xsigaction(signr, &sa, NULL);
+ xsigaction(signr, &sa, &s->saved_sa);
- /* Return structure. */
- s = xmalloc(sizeof *s);
- s->signr = signr;
return s;
}
+/* Unregisters the handler for 's', restores the signal handler that was in
+ * effect before signal_register() was called, and frees 's'. */
+void
+signal_unregister(struct signal *s)
+{
+ if (s) {
+ xsigaction(s->signr, &s->saved_sa, NULL);
+ free(s);
+ }
+}
+
/* Returns true if signal 's' has been received since the last call to this
* function with argument 's'. */
bool