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 d96122bc8d86d343492af4d207d259239529b013..bf8716a9e524c4d0ebe4c2357d2f3c04a502e1ce 100644 (file)
--- 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 36fa3761e9580337747795104a79f6f623e3b051..ea477042bcaeeed0426b5d73ede41169aa055527 100644 (file)
--- 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 42b706fb265a6aa0e7f662678afe9c1797b01783..e83f5737e9bbf487399c30d13df1eab2b8491fbc 100644 (file)
--- 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 cc50cb3c440e87f72687fb942039ba5196e7ca3e..904023302560d94a52a495310d2a648e38d6e869 100644 (file)
--- 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 fef87d1a59332f5a8a37a6b4a3b70c366111fe02..a601209d236b4de08b197a19294a992ffcbdbb32 100644 (file)
--- 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 3b71442dab0ff6e6da059d768ace7fc98c47a695..df523b03ba164f9bfca00fa5b8963bc1f3d6f6d2 100644 (file)
--- 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 a68e0f987ffc83e80e45bb1ae703526fa01643a7..256e5689f00e84c36b741bfc562e62876eb00684 100644 (file)
--- 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 424dd7b01cd425ac9dc9b14dee1fb4f1011bd848..279de64fcf7926ec3696be9b244850dd6283cef0 100644 (file)
--- 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 d02a65f15238eabda721d2330dd026c1c18ebff6..95697aa1a183c5e7e5073e214f8f678e7e8c1cf7 100644 (file)
--- 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 f0f4b010a112852c673900f61f15d851c940bb5b..81a9e9f16cfe3120a2fddb4120ba0deef6a8a4a3 100644 (file)
--- 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 0d7e8c5800a91214ec71d80ab9efe4a71d6b717e..99a4b357b3fcd3d0b9f04f2d8d8c9feae1fcdfab 100644 (file)
--- 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 b336f3957e63467a75f33e82a1e505ee5ade8d73..99a600b21baf8b1304a26341cdc0c54ec64bcdfc 100644 (file)
--- 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 adddc682d1770af602901f386e2a618f5e0658a4..3ab667ec7762626adeca0b304924d5bf65c9cac1 100644 (file)
--- 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 d5e743f75206f418d19502e0e9977c8579bee3de..addee1ffa90545b06eae704bde7d9cb05fef2c7c 100644 (file)
--- 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 7a3d91e5a01425e12501fa27882a1093ead502d0..021ac84efd233aadb6b28e8e4ceece7299e0c2da 100644 (file)
--- 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 2ae68ac6511c95c0eb37e1d33cdd1aa52bb4b7ec..87383e1befe307c028922960889a1779ed066873 100644 (file)
--- 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 3830e0739929decf44bde819efc22b5f436ff1d0..d17065269287e7cc50f462528a23cc485ab3a9fa 100644 (file)
--- 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 df76e86e87d37af5abd8c0bdd98a7a16a100f0d2..dbdd2e6f63a140ebf8c771fe17532f88cdc73f0e 100644 (file)
--- 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 f145641b87dfdd96946e6b70708d80bc144aac67..cf634372d74d12316b619a612abf74c7c7a46002 100644 (file)
--- 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 c0b7628f66956827f73d75cc974c96ed3b09d5b4..2853c0e891e0e3e431de99c06ae93752a245b18f 100644 (file)
--- 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 ebfc3c33efc84e9fe7af5873f2894f803104d6d3..b30695f49bd5f0e34fcb643d0ba372581d50898c 100644 (file)
--- 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 1ff2136089c66d2800629115c654344ce5fdde0f..fc1ba3daa83b746d08c4e91c64e90d9abb7dd562 100644 (file)
--- 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 7f9602882dfa1e1a2b902461a4ffa798a4f9735e..06ec9e7a7469b9bd88f6337db45aaa74b8b77013 100644 (file)
--- 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 e2473dcfe958c2cdcf39fed18e48e85556fac4af..2e15ff0158d297e3eb8465fee8a842e1bbbccdeb 100644 (file)
--- 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);