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
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index
9da2f49
..
ca76aef
100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-32,13
+32,12
@@
#include "dirs.h"
#include "dpif.h"
#include "dummy.h"
#include "dirs.h"
#include "dpif.h"
#include "dummy.h"
+#include "fatal-signal.h"
#include "memory.h"
#include "netdev.h"
#include "openflow/openflow.h"
#include "ovsdb-idl.h"
#include "poll-loop.h"
#include "memory.h"
#include "netdev.h"
#include "openflow/openflow.h"
#include "ovsdb-idl.h"
#include "poll-loop.h"
-#include "process.h"
-#include "signals.h"
#include "simap.h"
#include "stream-ssl.h"
#include "stream.h"
#include "simap.h"
#include "stream-ssl.h"
#include "stream.h"
@@
-66,7
+65,6
@@
main(int argc, char *argv[])
{
char *unixctl_path = NULL;
struct unixctl_server *unixctl;
{
char *unixctl_path = NULL;
struct unixctl_server *unixctl;
- struct signal *sighup;
char *remote;
bool exiting;
int retval;
char *remote;
bool exiting;
int retval;
@@
-75,9
+73,7
@@
main(int argc, char *argv[])
set_program_name(argv[0]);
service_start(&argc, &argv);
remote = parse_options(argc, argv, &unixctl_path);
set_program_name(argv[0]);
service_start(&argc, &argv);
remote = parse_options(argc, argv, &unixctl_path);
- signal(SIGPIPE, SIG_IGN);
- sighup = signal_register(SIGHUP);
- process_init();
+ fatal_ignore_sigpipe();
ovsrec_init();
daemonize_start();
ovsrec_init();
daemonize_start();
@@
-103,9
+99,6
@@
main(int argc, char *argv[])
exiting = false;
while (!exiting) {
exiting = false;
while (!exiting) {
- if (signal_poll(sighup)) {
- vlog_reopen_log_file();
- }
memory_run();
if (memory_should_report()) {
struct simap usage;
memory_run();
if (memory_should_report()) {
struct simap usage;
@@
-119,7
+112,6
@@
main(int argc, char *argv[])
unixctl_server_run(unixctl);
netdev_run();
unixctl_server_run(unixctl);
netdev_run();
- signal_wait(sighup);
memory_wait();
bridge_wait();
unixctl_server_wait(unixctl);
memory_wait();
bridge_wait();
unixctl_server_wait(unixctl);