X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=lib%2Ftable.c;h=f24ddc62e5cde843334c9dd117e37000157b78b1;hb=e78b61f6e5068c959b7b2e0903f17f4e77a595f1;hp=86366d0dca90cdaf2bf3e6f1e5771901f585a01b;hpb=c6a4125250b97d41d18dbeeea13043a86e9b8f55;p=openvswitch diff --git a/lib/table.c b/lib/table.c index 86366d0d..f24ddc62 100644 --- a/lib/table.c +++ b/lib/table.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,8 @@ #include "dynamic-string.h" #include "json.h" #include "ovsdb-data.h" +#include "ovsdb-error.h" +#include "timeval.h" #include "util.h" struct column { @@ -54,6 +56,7 @@ cell_to_text(struct cell *cell, const struct table_style *style) cell->text = ds_steal_cstr(&s); } else { cell->text = json_to_string(cell->json, JSSF_SORT); + ovsdb_error_destroy(error); } } } else { @@ -121,6 +124,14 @@ table_set_caption(struct table *table, char *caption) table->caption = caption; } +/* Turns printing a timestamp along with 'table' on or off, according to + * 'timestamp'. */ +void +table_set_timestamp(struct table *table, bool timestamp) +{ + table->timestamp = timestamp; +} + /* Adds a new column to 'table' just to the right of any existing column, with * 'heading' as a title for the column. 'heading' must be a valid printf() * format specifier. @@ -209,6 +220,24 @@ table_print_table_line__(struct ds *line) ds_clear(line); } +static void +table_format_timestamp__(char *s, size_t size) +{ + time_t now = time_wall(); + strftime(s, size, "%Y-%m-%d %H:%M:%S", gmtime(&now)); +} + +static void +table_print_timestamp__(const struct table *table) +{ + if (table->timestamp) { + char s[32]; + + table_format_timestamp__(s, sizeof s); + puts(s); + } +} + static void table_print_table__(const struct table *table, const struct table_style *style) { @@ -221,6 +250,8 @@ table_print_table__(const struct table *table, const struct table_style *style) putchar('\n'); } + table_print_timestamp__(table); + if (table->caption) { puts(table->caption); } @@ -284,6 +315,8 @@ table_print_list__(const struct table *table, const struct table_style *style) putchar('\n'); } + table_print_timestamp__(table); + if (table->caption) { puts(table->caption); } @@ -355,6 +388,8 @@ table_print_html__(const struct table *table, const struct table_style *style) { size_t x, y; + table_print_timestamp__(table); + fputs("