projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb-server, ovs-vswitchd: Log version after daemonize_complete().
[openvswitch]
/
vswitchd
/
ovs-vswitchd.c
diff --git
a/vswitchd/ovs-vswitchd.c
b/vswitchd/ovs-vswitchd.c
index 76dc52bb531b9278cd86273c2d3f823a4cca30fb..6062a40a63261c44b977ceeca355e1e6920c2b05 100644
(file)
--- a/
vswitchd/ovs-vswitchd.c
+++ b/
vswitchd/ovs-vswitchd.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira
Networks
+/* Copyright (c) 2008, 2009, 2010, 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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-34,12
+34,14
@@
#include "dpif.h"
#include "dummy.h"
#include "leak-checker.h"
#include "dpif.h"
#include "dummy.h"
#include "leak-checker.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 "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 "stress.h"
#include "stream-ssl.h"
#include "stream.h"
#include "stress.h"
@@
-49,10
+51,14
@@
#include "util.h"
#include "vconn.h"
#include "vlog.h"
#include "util.h"
#include "vconn.h"
#include "vlog.h"
-#include "
vswitchd
/vswitch-idl.h"
+#include "
lib
/vswitch-idl.h"
VLOG_DEFINE_THIS_MODULE(vswitchd);
VLOG_DEFINE_THIS_MODULE(vswitchd);
+/* --mlockall: If set, locks all process memory into physical RAM, preventing
+ * the kernel from paging any of its memory to disk. */
+static bool want_mlockall;
+
static unixctl_cb_func ovs_vswitchd_exit;
static char *parse_options(int argc, char *argv[], char **unixctl_path);
static unixctl_cb_func ovs_vswitchd_exit;
static char *parse_options(int argc, char *argv[], char **unixctl_path);
@@
-79,6
+85,16
@@
main(int argc, char *argv[])
daemonize_start();
daemonize_start();
+ if (want_mlockall) {
+#ifdef HAVE_MLOCKALL
+ if (mlockall(MCL_CURRENT | MCL_FUTURE)) {
+ VLOG_ERR("mlockall failed: %s", strerror(errno));
+ }
+#else
+ VLOG_ERR("mlockall not supported on this system");
+#endif
+ }
+
retval = unixctl_server_create(unixctl_path, &unixctl);
if (retval) {
exit(EXIT_FAILURE);
retval = unixctl_server_create(unixctl_path, &unixctl);
if (retval) {
exit(EXIT_FAILURE);
@@
-93,6
+109,15
@@
main(int argc, char *argv[])
if (signal_poll(sighup)) {
vlog_reopen_log_file();
}
if (signal_poll(sighup)) {
vlog_reopen_log_file();
}
+ memory_run();
+ if (memory_should_report()) {
+ struct simap usage;
+
+ simap_init(&usage);
+ bridge_get_memory_usage(&usage);
+ memory_report(&usage);
+ simap_destroy(&usage);
+ }
bridge_run_fast();
bridge_run();
bridge_run_fast();
bridge_run_fast();
bridge_run();
bridge_run_fast();
@@
-100,6
+125,7
@@
main(int argc, char *argv[])
netdev_run();
signal_wait(sighup);
netdev_run();
signal_wait(sighup);
+ memory_wait();
bridge_wait();
unixctl_server_wait(unixctl);
netdev_wait();
bridge_wait();
unixctl_server_wait(unixctl);
netdev_wait();
@@
-159,17
+185,11
@@
parse_options(int argc, char *argv[], char **unixctl_pathp)
usage();
case 'V':
usage();
case 'V':
- ovs_print_version(OFP
_VERSION, OFP
_VERSION);
+ ovs_print_version(OFP
10_VERSION, OFP10
_VERSION);
exit(EXIT_SUCCESS);
case OPT_MLOCKALL:
exit(EXIT_SUCCESS);
case OPT_MLOCKALL:
-#ifdef HAVE_MLOCKALL
- if (mlockall(MCL_CURRENT | MCL_FUTURE)) {
- VLOG_ERR("mlockall failed: %s", strerror(errno));
- }
-#else
- VLOG_ERR("mlockall not supported on this system");
-#endif
+ want_mlockall = true;
break;
case OPT_UNIXCTL:
break;
case OPT_UNIXCTL: