#include "table.h"
#include "timeval.h"
#include "util.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;
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);
" 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",
/* 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 (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);
}
/* Save a copy. */
check_ovsdb_error(new_schema
? ovsdb_file_open_as_schema(src_name, new_schema, &db)
- : ovsdb_file_open(src_name, true, &db));
+ : ovsdb_file_open(src_name, true, &db, NULL));
check_ovsdb_error(ovsdb_file_save_copy(dst_name, false, comment, db));
ovsdb_destroy(db);
struct json *request, *result;
struct ovsdb *db;
- check_ovsdb_error(ovsdb_file_open(db_file_name, read_only, &db));
+ check_ovsdb_error(ovsdb_file_open(db_file_name, read_only, &db, NULL));
request = parse_json(transaction);
result = ovsdb_execute(db, request, 0, NULL);