projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xenserver: Rename monitor-external-ids -> ovs-external-ids
[openvswitch]
/
ovsdb
/
ovsdb-tool.c
diff --git
a/ovsdb/ovsdb-tool.c
b/ovsdb/ovsdb-tool.c
index 1c9e9206a154afb130e976c0fa6e10c71b7d4d60..f4bb701d17786290bf3ea67513bfeb84a4c9165f 100644
(file)
--- a/
ovsdb/ovsdb-tool.c
+++ b/
ovsdb/ovsdb-tool.c
@@
-34,9
+34,9
@@
#include "table.h"
#include "timeval.h"
#include "util.h"
#include "table.h"
#include "timeval.h"
#include "util.h"
-
#include "vlog.h"
#include "vlog.h"
-#define THIS_MODULE VLM_ovsdb_tool
+
+VLOG_DEFINE_THIS_MODULE(ovsdb_tool)
/* -m, --more: Verbosity level for "show-log" command output. */
static int show_log_verbosity;
/* -m, --more: Verbosity level for "show-log" command output. */
static int show_log_verbosity;
@@
-50,8
+50,6
@@
int
main(int argc, char *argv[])
{
set_program_name(argv[0]);
main(int argc, char *argv[])
{
set_program_name(argv[0]);
- time_init();
- vlog_init();
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
run_command(argc - optind, argv + optind, all_commands);
parse_options(argc, argv);
signal(SIGPIPE, SIG_IGN);
run_command(argc - optind, argv + optind, all_commands);
@@
-112,7
+110,6
@@
usage(void)
" create DB SCHEMA create DB with the given SCHEMA\n"
" compact DB [DST] compact DB in-place (or to DST)\n"
" convert DB SCHEMA [DST] convert DB to SCHEMA (to DST)\n"
" create DB SCHEMA create DB with the given SCHEMA\n"
" compact DB [DST] compact DB in-place (or to DST)\n"
" convert DB SCHEMA [DST] convert DB to SCHEMA (to DST)\n"
- " extract-schema DB print DB's schema on stdout\n"
" query DB TRNS execute read-only transaction on DB\n"
" transact DB TRNS execute read/write transaction on DB\n"
" show-log DB prints information about DB's log entries\n",
" query DB TRNS execute read-only transaction on DB\n"
" transact DB TRNS execute read/write transaction on DB\n"
" show-log DB prints information about DB's log entries\n",
@@
-189,7
+186,7
@@
compact_or_convert(const char *src_name, const char *dst_name,
/* Lock the source, if we will be replacing it. */
if (in_place) {
/* Lock the source, if we will be replacing it. */
if (in_place) {
- retval = lockfile_lock(src_name,
INT_MAX
, &src_lock);
+ retval = lockfile_lock(src_name,
0
, &src_lock);
if (retval) {
ovs_fatal(retval, "%s: failed to lock lockfile", src_name);
}
if (retval) {
ovs_fatal(retval, "%s: failed to lock lockfile", src_name);
}
@@
-199,7
+196,7
@@
compact_or_convert(const char *src_name, const char *dst_name,
if (in_place) {
dst_name = xasprintf("%s.tmp", src_name);
}
if (in_place) {
dst_name = xasprintf("%s.tmp", src_name);
}
- retval = lockfile_lock(dst_name,
INT_MAX
, &dst_lock);
+ retval = lockfile_lock(dst_name,
0
, &dst_lock);
if (retval) {
ovs_fatal(retval, "%s: failed to lock lockfile", dst_name);
}
if (retval) {
ovs_fatal(retval, "%s: failed to lock lockfile", dst_name);
}