X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=ovsdb%2Fovsdb-client.c;h=da6a6d6d79f040ebde865a35992760f5e672bce6;hb=d650378e743b93ab070ffde978a7557aa522dcb1;hp=8a48e8b5d0a59fe6a133f1ce6de3f3a30d92df7e;hpb=9200fb9ef9a1c55a76e4c4aa789f3fb0a76f0ed1;p=openvswitch diff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c index 8a48e8b5..da6a6d6d 100644 --- a/ovsdb/ovsdb-client.c +++ b/ovsdb/ovsdb-client.c @@ -41,15 +41,16 @@ #include "table.h" #include "timeval.h" #include "util.h" - #include "vlog.h" -#define THIS_MODULE VLM_ovsdb_client + +VLOG_DEFINE_THIS_MODULE(ovsdb_client); /* --format: Output formatting. */ static enum { FMT_TABLE, /* Textual table. */ FMT_HTML, /* HTML table. */ - FMT_CSV /* Comma-separated lines. */ + FMT_CSV, /* Comma-separated lines. */ + FMT_JSON /* JSON. */ } output_format; /* --no-headings: Whether table output should include headings. */ @@ -119,6 +120,8 @@ parse_options(int argc, char *argv[]) output_format = FMT_HTML; } else if (!strcmp(optarg, "csv")) { output_format = FMT_CSV; + } else if (!strcmp(optarg, "json")) { + output_format = FMT_JSON; } else { ovs_fatal(0, "unknown output format \"%s\"", optarg); } @@ -179,6 +182,9 @@ usage(void) " list databases available on SERVER\n" "\n get-schema SERVER DATABASE\n" " retrieve schema for DATABASE from SERVER\n" + "\n get-schema-version SERVER DATABASE\n" + " retrieve schema for DATABASE from SERVER and report only its\n" + " version number on stdout\n" "\n list-tables SERVER DATABASE\n" " list tables for DATABASE on SERVER\n" "\n list-columns SERVER DATABASE [TABLE]\n" @@ -196,7 +202,8 @@ usage(void) stream_usage("SERVER", true, true, true); printf("\nOutput formatting options:\n" " -f, --format=FORMAT set output formatting to FORMAT\n" - " (\"table\", \"html\", or \"csv\"\n" + " (\"table\", \"html\", \"csv\", " + "or \"json\")\n" " --no-headings omit table heading row\n" " --pretty pretty-print JSON in output"); daemon_usage(); @@ -305,11 +312,60 @@ fetch_schema(const char *server, const char *database) struct column { char *heading; - int width; }; +struct cell { + /* Literal text. */ + char *text; + + /* JSON. */ + struct json *json; + const struct ovsdb_type *type; +}; + +static const char * +cell_to_text(const struct cell *cell_) +{ + struct cell *cell = (struct cell *) cell_; + if (!cell->text) { + if (cell->json) { + if (data_format == DF_JSON || !cell->type) { + cell->text = json_to_string(cell->json, JSSF_SORT); + } else if (data_format == DF_STRING) { + struct ovsdb_datum datum; + struct ovsdb_error *error; + struct ds s; + + error = ovsdb_datum_from_json(&datum, cell->type, cell->json, + NULL); + if (!error) { + ds_init(&s); + ovsdb_datum_to_string(&datum, cell->type, &s); + ovsdb_datum_destroy(&datum, cell->type); + cell->text = ds_steal_cstr(&s); + } else { + cell->text = json_to_string(cell->json, JSSF_SORT); + } + } else { + NOT_REACHED(); + } + } else { + cell->text = xstrdup(""); + } + } + + return cell->text; +} + +static void +cell_destroy(struct cell *cell) +{ + free(cell->text); + json_destroy(cell->json); +} + struct table { - char **cells; + struct cell *cells; struct column *columns; size_t n_columns, allocated_columns; size_t n_rows, allocated_rows; @@ -334,7 +390,7 @@ table_destroy(struct table *table) free(table->columns); for (i = 0; i < table->n_columns * table->n_rows; i++) { - free(table->cells[i]); + cell_destroy(&table->cells[i]); } free(table->cells); @@ -367,11 +423,10 @@ table_add_column(struct table *table, const char *heading, ...) va_start(args, heading); column->heading = xvasprintf(heading, args); - column->width = strlen(column->heading); va_end(args); } -static char ** +static struct cell * table_cell__(const struct table *table, size_t row, size_t column) { return &table->cells[column + row * table->n_columns]; @@ -390,37 +445,23 @@ table_add_row(struct table *table) y = table->n_rows++; table->current_column = 0; for (x = 0; x < table->n_columns; x++) { - *table_cell__(table, y, x) = NULL; + struct cell *cell = table_cell__(table, y, x); + memset(cell, 0, sizeof *cell); } } -static void -table_add_cell_nocopy(struct table *table, char *s) +static struct cell * +table_add_cell(struct table *table) { size_t x, y; - int length; assert(table->n_rows > 0); assert(table->current_column < table->n_columns); x = table->current_column++; y = table->n_rows - 1; - *table_cell__(table, y, x) = s; - length = strlen(s); - if (length > table->columns[x].width) { - table->columns[x].width = length; - } -} - -static void -table_add_cell(struct table *table, const char *format, ...) -{ - va_list args; - - va_start(args, format); - table_add_cell_nocopy(table, xvasprintf(format, args)); - va_end(args); + return table_cell__(table, y, x); } static void @@ -435,48 +476,63 @@ table_print_table__(const struct table *table) { static int n = 0; struct ds line = DS_EMPTY_INITIALIZER; + int *widths; size_t x, y; if (n++ > 0) { putchar('\n'); } + if (table->caption) { + puts(table->caption); + } + + widths = xmalloc(table->n_columns * sizeof *widths); + for (x = 0; x < table->n_columns; x++) { + const struct column *column = &table->columns[x]; + + widths[x] = strlen(column->heading); + for (y = 0; y < table->n_rows; y++) { + const char *text = cell_to_text(table_cell__(table, y, x)); + size_t length = strlen(text); + + if (length > widths[x]) + widths[x] = length; + } + } + if (output_headings) { for (x = 0; x < table->n_columns; x++) { const struct column *column = &table->columns[x]; if (x) { ds_put_char(&line, ' '); } - ds_put_format(&line, "%-*s", column->width, column->heading); + ds_put_format(&line, "%-*s", widths[x], column->heading); } table_print_table_line__(&line); for (x = 0; x < table->n_columns; x++) { - const struct column *column = &table->columns[x]; - int i; - if (x) { ds_put_char(&line, ' '); } - for (i = 0; i < column->width; i++) { - ds_put_char(&line, '-'); - } + ds_put_char_multiple(&line, '-', widths[x]); } table_print_table_line__(&line); } for (y = 0; y < table->n_rows; y++) { for (x = 0; x < table->n_columns; x++) { - const char *cell = *table_cell__(table, y, x); + const char *text = cell_to_text(table_cell__(table, y, x)); if (x) { ds_put_char(&line, ' '); } - ds_put_format(&line, "%-*s", table->columns[x].width, cell); + ds_put_format(&line, "%-*s", widths[x], text); } table_print_table_line__(&line); } ds_destroy(&line); + free(widths); } static void @@ -550,7 +606,7 @@ table_print_html__(const struct table *table) for (y = 0; y < table->n_rows; y++) { fputs("