X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2Ffile.c;h=d09395c4cfc37207a3fbeeb842a7b79b95e9e0ff;hb=71ce92352cbcb96f179f8ec19dd1e843d91d8828;hp=cf5bb41d4b10a7f84397dd77ef7abfe900cba0ec;hpb=ada496b5cc123fca2913be8b73097934f528cec8;p=openvswitch diff --git a/ovsdb/file.c b/ovsdb/file.c index cf5bb41d..d09395c4 100644 --- a/ovsdb/file.c +++ b/ovsdb/file.c @@ -36,10 +36,10 @@ #include "transaction.h" #include "uuid.h" #include "util.h" - -#define THIS_MODULE VLM_ovsdb_file #include "vlog.h" +VLOG_DEFINE_THIS_MODULE(ovsdb_file); + /* Minimum number of milliseconds between database compactions. */ #define COMPACT_MIN_MSEC (10 * 60 * 1000) /* 10 minutes. */ @@ -427,7 +427,7 @@ ovsdb_file_save_copy__(const char *file_name, int locking, const struct ovsdb_table *table = node->data; const struct ovsdb_row *row; - HMAP_FOR_EACH (row, struct ovsdb_row, hmap_node, &table->rows) { + HMAP_FOR_EACH (row, hmap_node, &table->rows) { ovsdb_file_txn_add_row(&ftxn, NULL, row, NULL); } } @@ -737,7 +737,7 @@ ovsdb_file_txn_commit(struct json *json, const char *comment, if (comment) { json_object_put_string(json, "_comment", comment); } - json_object_put(json, "_date", json_integer_create(time_now())); + json_object_put(json, "_date", json_integer_create(time_wall())); error = ovsdb_log_write(log, json); json_destroy(json);