From: Ben Pfaff <blp@nicira.com>
Date: Wed, 21 Jul 2010 22:42:22 +0000 (-0700)
Subject: timeval: Make time_init() static and remove calls to it.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff8bb7e76b2cdcbcf88cd2fac663ba517e4a659c;p=openvswitch

timeval: Make time_init() static and remove calls to it.

Since the timeval module now initializes itself on-demand, there is no
longer any need to initialize it explicitly, or to provide an interface to
do so.
---

diff --git a/extras/ezio/ezio-term.c b/extras/ezio/ezio-term.c
index d96122bc..bf8716a9 100644
--- a/extras/ezio/ezio-term.c
+++ b/extras/ezio/ezio-term.c
@@ -98,7 +98,6 @@ main(int argc, char *argv[])
 
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     parse_options(argc, argv);
     signal(SIGPIPE, SIG_IGN);
diff --git a/extras/ezio/ovs-switchui.c b/extras/ezio/ovs-switchui.c
index 36fa3761..ea477042 100644
--- a/extras/ezio/ovs-switchui.c
+++ b/extras/ezio/ovs-switchui.c
@@ -147,7 +147,6 @@ main(int argc, char *argv[])
 
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     parse_options(argc, argv);
     signal(SIGPIPE, SIG_IGN);
diff --git a/lib/timeval.c b/lib/timeval.c
index 42b706fb..e83f5737 100644
--- a/lib/timeval.c
+++ b/lib/timeval.c
@@ -65,7 +65,7 @@ static void log_poll_interval(long long int last_wakeup,
  *
  * It is not necessary to call this function directly, because other time
  * functions will call it automatically, but it doesn't hurt. */
-void
+static void
 time_init(void)
 {
     static bool inited;
diff --git a/lib/timeval.h b/lib/timeval.h
index cc50cb3c..90402330 100644
--- a/lib/timeval.h
+++ b/lib/timeval.h
@@ -44,7 +44,6 @@ BUILD_ASSERT_DECL(TYPE_IS_SIGNED(time_t));
  * much time will be wasted in signal handlers and calls to clock_gettime(). */
 #define TIME_UPDATE_INTERVAL 100
 
-void time_init(void);
 void time_disable_restart(void);
 void time_enable_restart(void);
 void time_postfork(void);
diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c
index fef87d1a..a601209d 100644
--- a/ovsdb/ovsdb-client.c
+++ b/ovsdb/ovsdb-client.c
@@ -74,7 +74,6 @@ main(int argc, char *argv[])
 {
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     parse_options(argc, argv);
     signal(SIGPIPE, SIG_IGN);
diff --git a/ovsdb/ovsdb-server.c b/ovsdb/ovsdb-server.c
index 3b71442d..df523b03 100644
--- a/ovsdb/ovsdb-server.c
+++ b/ovsdb/ovsdb-server.c
@@ -87,7 +87,6 @@ main(int argc, char *argv[])
 
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     signal(SIGPIPE, SIG_IGN);
     process_init();
diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c
index a68e0f98..256e5689 100644
--- a/ovsdb/ovsdb-tool.c
+++ b/ovsdb/ovsdb-tool.c
@@ -50,7 +50,6 @@ int
 main(int argc, char *argv[])
 {
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     parse_options(argc, argv);
     signal(SIGPIPE, SIG_IGN);
diff --git a/tests/test-flows.c b/tests/test-flows.c
index 424dd7b0..279de64f 100644
--- a/tests/test-flows.c
+++ b/tests/test-flows.c
@@ -39,7 +39,6 @@ main(int argc OVS_UNUSED, char *argv[])
     int n = 0, errors = 0;
 
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
 
     flows = stdin;
diff --git a/tests/test-jsonrpc.c b/tests/test-jsonrpc.c
index d02a65f1..95697aa1 100644
--- a/tests/test-jsonrpc.c
+++ b/tests/test-jsonrpc.c
@@ -44,7 +44,6 @@ main(int argc, char *argv[])
 {
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     parse_options(argc, argv);
     run_command(argc - optind, argv + optind, all_commands);
diff --git a/tests/test-lockfile.c b/tests/test-lockfile.c
index f0f4b010..81a9e9f1 100644
--- a/tests/test-lockfile.c
+++ b/tests/test-lockfile.c
@@ -240,7 +240,6 @@ main(int argc, char *argv[])
     size_t i;
 
     set_program_name(argv[0]);
-    time_init();
 
     if (argc != 2) {
         ovs_fatal(0, "exactly one argument required; use \"%s help\" for help",
diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c
index 0d7e8c58..99a4b357 100644
--- a/tests/test-ovsdb.c
+++ b/tests/test-ovsdb.c
@@ -59,7 +59,6 @@ int
 main(int argc, char *argv[])
 {
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     parse_options(argc, argv);
     run_command(argc - optind, argv + optind, all_commands);
diff --git a/tests/test-timeval.c b/tests/test-timeval.c
index b336f395..99a600b2 100644
--- a/tests/test-timeval.c
+++ b/tests/test-timeval.c
@@ -93,7 +93,6 @@ main(int argc, char *argv[])
 {
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    time_init();
 
     if (argc != 2) {
         usage();
diff --git a/tests/test-vconn.c b/tests/test-vconn.c
index adddc682..3ab667ec 100644
--- a/tests/test-vconn.c
+++ b/tests/test-vconn.c
@@ -401,7 +401,6 @@ int
 main(int argc, char *argv[])
 {
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     vlog_set_levels(VLM_ANY_MODULE, VLF_ANY_FACILITY, VLL_EMER);
     vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_DBG);
diff --git a/utilities/nlmon.c b/utilities/nlmon.c
index d5e743f7..addee1ff 100644
--- a/utilities/nlmon.c
+++ b/utilities/nlmon.c
@@ -42,7 +42,6 @@ main(int argc OVS_UNUSED, char *argv[])
     int error;
 
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     vlog_set_levels(VLM_ANY_MODULE, VLF_ANY_FACILITY, VLL_DBG);
 
diff --git a/utilities/ovs-appctl.c b/utilities/ovs-appctl.c
index 7a3d91e5..021ac84e 100644
--- a/utilities/ovs-appctl.c
+++ b/utilities/ovs-appctl.c
@@ -45,7 +45,6 @@ main(int argc, char *argv[])
     int i;
 
     set_program_name(argv[0]);
-    time_init();
 
     /* Parse command line and connect to target. */
     target = parse_command_line(argc, argv);
diff --git a/utilities/ovs-controller.c b/utilities/ovs-controller.c
index 2ae68ac6..87383e1b 100644
--- a/utilities/ovs-controller.c
+++ b/utilities/ovs-controller.c
@@ -90,7 +90,6 @@ main(int argc, char *argv[])
 
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     parse_options(argc, argv);
     signal(SIGPIPE, SIG_IGN);
diff --git a/utilities/ovs-discover.c b/utilities/ovs-discover.c
index 3830e073..d1706526 100644
--- a/utilities/ovs-discover.c
+++ b/utilities/ovs-discover.c
@@ -77,7 +77,6 @@ main(int argc, char *argv[])
 
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     parse_options(argc, argv);
 
diff --git a/utilities/ovs-dpctl.c b/utilities/ovs-dpctl.c
index df76e86e..dbdd2e6f 100644
--- a/utilities/ovs-dpctl.c
+++ b/utilities/ovs-dpctl.c
@@ -53,7 +53,6 @@ int
 main(int argc, char *argv[])
 {
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     parse_options(argc, argv);
     signal(SIGPIPE, SIG_IGN);
diff --git a/utilities/ovs-kill.c b/utilities/ovs-kill.c
index f145641b..cf634372 100644
--- a/utilities/ovs-kill.c
+++ b/utilities/ovs-kill.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,6 @@ main(int argc, char *argv[])
     int i;
 
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     parse_options(argc, argv);
 
diff --git a/utilities/ovs-ofctl.c b/utilities/ovs-ofctl.c
index c0b7628f..2853c0e8 100644
--- a/utilities/ovs-ofctl.c
+++ b/utilities/ovs-ofctl.c
@@ -74,7 +74,6 @@ int
 main(int argc, char *argv[])
 {
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     parse_options(argc, argv);
     signal(SIGPIPE, SIG_IGN);
diff --git a/utilities/ovs-openflowd.c b/utilities/ovs-openflowd.c
index ebfc3c33..b30695f4 100644
--- a/utilities/ovs-openflowd.c
+++ b/utilities/ovs-openflowd.c
@@ -96,7 +96,6 @@ main(int argc, char *argv[])
 
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     parse_options(argc, argv, &s);
     signal(SIGPIPE, SIG_IGN);
diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
index 1ff21360..fc1ba3da 100644
--- a/utilities/ovs-vsctl.c
+++ b/utilities/ovs-vsctl.c
@@ -125,7 +125,6 @@ main(int argc, char *argv[])
 
     set_program_name(argv[0]);
     signal(SIGPIPE, SIG_IGN);
-    time_init();
     vlog_init();
     vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_WARN);
     vlog_set_levels(VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN);
diff --git a/vswitchd/ovs-brcompatd.c b/vswitchd/ovs-brcompatd.c
index 7f960288..06ec9e7a 100644
--- a/vswitchd/ovs-brcompatd.c
+++ b/vswitchd/ovs-brcompatd.c
@@ -1294,7 +1294,6 @@ main(int argc, char *argv[])
 
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     vlog_set_levels(VLM_ANY_MODULE, VLF_CONSOLE, VLL_WARN);
     vlog_set_levels(VLM_reconnect, VLF_ANY_FACILITY, VLL_WARN);
diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c
index e2473dcf..2e15ff01 100644
--- a/vswitchd/ovs-vswitchd.c
+++ b/vswitchd/ovs-vswitchd.c
@@ -66,7 +66,6 @@ main(int argc, char *argv[])
 
     proctitle_init(argc, argv);
     set_program_name(argv[0]);
-    time_init();
     vlog_init();
     remote = parse_options(argc, argv);
     signal(SIGPIPE, SIG_IGN);