X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2Fovsdb-tool.c;h=d506aae334dc56a11f5ca66cb22c78b83b318ebc;hb=0b0544d706d10516d3122fbcce8f1dc1dec6cb92;hp=d6e0ff94120fc856db1aa4bb47cffdbe7f6a2f82;hpb=8b681e6fdffe4ebd68dc259544abc87d4cccf0cb;p=openvswitch diff --git a/ovsdb/ovsdb-tool.c b/ovsdb/ovsdb-tool.c index d6e0ff94..d506aae3 100644 --- a/ovsdb/ovsdb-tool.c +++ b/ovsdb/ovsdb-tool.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Nicira Networks. + * Copyright (c) 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. @@ -25,6 +25,7 @@ #include "command-line.h" #include "compiler.h" #include "file.h" +#include "log.h" #include "json.h" #include "ovsdb.h" #include "ovsdb-error.h" @@ -35,6 +36,9 @@ #include "vlog.h" #define THIS_MODULE VLM_ovsdb_tool +/* -m, --more: Verbosity level for "show-log" command output. */ +static int show_log_verbosity; + static const struct command all_commands[]; static void usage(void) NO_RETURN; @@ -56,6 +60,7 @@ static void parse_options(int argc, char *argv[]) { static struct option long_options[] = { + {"more", no_argument, 0, 'm'}, {"verbose", optional_argument, 0, 'v'}, {"help", no_argument, 0, 'h'}, {"version", no_argument, 0, 'V'}, @@ -72,6 +77,10 @@ parse_options(int argc, char *argv[]) } switch (c) { + case 'm': + show_log_verbosity++; + break; + case 'h': usage(); @@ -102,10 +111,12 @@ usage(void) " compact DB [DST] compact DB in-place (or 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", + " transact DB TRNS execute read/write transaction on DB\n" + " show-log DB prints information about DB's log entries\n", program_name, program_name); vlog_usage(); printf("\nOther options:\n" + " -m, --more increase show-log verbosity\n" " -h, --help display this help message\n" " -V, --version display version information\n"); exit(EXIT_SUCCESS); @@ -144,7 +155,7 @@ do_create(int argc UNUSED, char *argv[]) const char *db_file_name = argv[1]; const char *schema_file_name = argv[2]; struct ovsdb_schema *schema; - struct ovsdb_file *db_file; + struct ovsdb_log *log; struct json *json; /* Read schema from file and convert to JSON. */ @@ -152,11 +163,11 @@ do_create(int argc UNUSED, char *argv[]) json = ovsdb_schema_to_json(schema); /* Create database file. */ - check_ovsdb_error(ovsdb_file_open(db_file_name, O_RDWR | O_CREAT | O_EXCL, - &db_file)); - check_ovsdb_error(ovsdb_file_write(db_file, json)); - check_ovsdb_error(ovsdb_file_commit(db_file)); - ovsdb_file_close(db_file); + check_ovsdb_error(ovsdb_log_open(db_file_name, O_RDWR | O_CREAT | O_EXCL, + &log)); + check_ovsdb_error(ovsdb_log_write(log, json)); + check_ovsdb_error(ovsdb_log_commit(log)); + ovsdb_log_close(log); json_destroy(json); } @@ -167,7 +178,7 @@ transact(bool read_only, const char *db_file_name, const char *transaction) struct json *request, *result; struct ovsdb *db; - check_ovsdb_error(ovsdb_open(db_file_name, read_only, &db)); + check_ovsdb_error(ovsdb_file_open(db_file_name, read_only, &db)); request = parse_json(transaction); result = ovsdb_execute(db, request, 0, NULL); @@ -189,6 +200,133 @@ do_transact(int argc UNUSED, char *argv[]) transact(false, argv[1], argv[2]); } +static void +print_db_changes(struct shash *tables, struct shash *names) +{ + struct shash_node *n1; + + SHASH_FOR_EACH (n1, tables) { + const char *table = n1->name; + struct json *rows = n1->data; + struct shash_node *n2; + + if (n1->name[0] == '_' || rows->type != JSON_OBJECT) { + continue; + } + + SHASH_FOR_EACH (n2, json_object(rows)) { + const char *row_uuid = n2->name; + struct json *columns = n2->data; + struct shash_node *n3; + char *old_name, *new_name; + bool free_new_name = false; + + old_name = new_name = shash_find_data(names, row_uuid); + if (columns->type == JSON_OBJECT) { + struct json *new_name_json; + + new_name_json = shash_find_data(json_object(columns), "name"); + if (new_name_json) { + new_name = json_to_string(new_name_json, JSSF_SORT); + free_new_name = true; + } + } + + printf("\ttable %s", table); + + if (!old_name) { + if (new_name) { + printf(" insert row %s:\n", new_name); + } else { + printf(" insert row %.8s:\n", row_uuid); + } + } else { + printf(" row %s:\n", old_name); + } + + if (columns->type == JSON_OBJECT) { + if (show_log_verbosity > 1) { + SHASH_FOR_EACH (n3, json_object(columns)) { + const char *column = n3->name; + struct json *value = n3->data; + char *value_string; + + value_string = json_to_string(value, JSSF_SORT); + printf("\t\t%s=%s\n", column, value_string); + free(value_string); + } + } + if (!old_name + || (new_name != old_name && strcmp(old_name, new_name))) { + if (old_name) { + shash_delete(names, shash_find(names, row_uuid)); + free(old_name); + } + shash_add(names, row_uuid, (new_name + ? xstrdup(new_name) + : xmemdup0(row_uuid, 8))); + } + } else if (columns->type == JSON_NULL) { + printf("\t\tdelete row\n"); + shash_delete(names, shash_find(names, row_uuid)); + free(old_name); + } + + if (free_new_name) { + free(new_name); + } + } + } +} + +static void +do_show_log(int argc UNUSED, char *argv[]) +{ + const char *db_file_name = argv[1]; + struct shash names; + struct ovsdb_log *log; + unsigned int i; + + check_ovsdb_error(ovsdb_log_open(db_file_name, O_RDONLY, &log)); + shash_init(&names); + for (i = 0; ; i++) { + struct json *json; + + check_ovsdb_error(ovsdb_log_read(log, &json)); + if (!json) { + break; + } + + printf("record %u:", i); + if (json->type == JSON_OBJECT) { + struct json *date, *comment; + + date = shash_find_data(json_object(json), "_date"); + if (date && date->type == JSON_INTEGER) { + time_t t = json_integer(date); + char s[128]; + + strftime(s, sizeof s, "%Y-%m-%d %H:%M:%S", localtime(&t)); + printf(" %s", s); + } + + comment = shash_find_data(json_object(json), "_comment"); + if (comment && comment->type == JSON_STRING) { + printf(" \"%s\"", json_string(comment)); + } + + if (i > 0 && show_log_verbosity > 0) { + putchar('\n'); + print_db_changes(json_object(json), &names); + } + } + json_destroy(json); + putchar('\n'); + } + + /* XXX free 'names'. */ +} + static void do_help(int argc UNUSED, char *argv[] UNUSED) { @@ -199,6 +337,7 @@ static const struct command all_commands[] = { { "create", 2, 2, do_create }, { "query", 2, 2, do_query }, { "transact", 2, 2, do_transact }, + { "show-log", 1, 1, do_show_log }, { "help", 0, INT_MAX, do_help }, { NULL, 0, 0, NULL }, };