From 765b5a0e09353e58614c14cb980c389b614ae7ec Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Mon, 22 Feb 2016 00:31:03 -0800 Subject: [PATCH] ovsdb: rename variables in ovsdb_monitor_get_update() 'prev_txn' and 'next_txn" are more confusing than 'unflushed' and 'unflushed_next'. Rename them. Signed-off-by: Andy Zhou Acked-by: Liran Schour Acked-by: Ben Pfaff --- ovsdb/monitor.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ovsdb/monitor.c b/ovsdb/monitor.c index 0fe2bd63b..0d81d89b6 100644 --- a/ovsdb/monitor.c +++ b/ovsdb/monitor.c @@ -724,40 +724,40 @@ ovsdb_monitor_compose_update(struct ovsdb_monitor *dbmon, * going to be used as part of an "update" notification. */ struct json * ovsdb_monitor_get_update(struct ovsdb_monitor *dbmon, - bool initial, uint64_t *unflushed, + bool initial, uint64_t *unflushed_, enum ovsdb_monitor_version version) { struct ovsdb_monitor_json_cache_node *cache_node; struct shash_node *node; struct json *json; - uint64_t prev_txn = *unflushed; - uint64_t next_txn = dbmon->n_transactions + 1; + const uint64_t unflushed = *unflushed_; + const uint64_t next_unflushed = dbmon->n_transactions + 1; /* Return a clone of cached json if one exists. Otherwise, * generate a new one and add it to the cache. */ - cache_node = ovsdb_monitor_json_cache_search(dbmon, version, prev_txn); + cache_node = ovsdb_monitor_json_cache_search(dbmon, version, unflushed); if (cache_node) { json = cache_node->json ? json_clone(cache_node->json) : NULL; } else { if (version == OVSDB_MONITOR_V1) { - json = ovsdb_monitor_compose_update(dbmon, initial, prev_txn, + json = ovsdb_monitor_compose_update(dbmon, initial, unflushed, ovsdb_monitor_compose_row_update); } else { ovs_assert(version == OVSDB_MONITOR_V2); - json = ovsdb_monitor_compose_update(dbmon, initial, prev_txn, + json = ovsdb_monitor_compose_update(dbmon, initial, unflushed, ovsdb_monitor_compose_row_update2); } - ovsdb_monitor_json_cache_insert(dbmon, version, prev_txn, json); + ovsdb_monitor_json_cache_insert(dbmon, version, unflushed, json); } /* Maintain transaction id of 'changes'. */ SHASH_FOR_EACH (node, &dbmon->tables) { struct ovsdb_monitor_table *mt = node->data; - ovsdb_monitor_table_untrack_changes(mt, prev_txn); - ovsdb_monitor_table_track_changes(mt, next_txn); + ovsdb_monitor_table_untrack_changes(mt, unflushed); + ovsdb_monitor_table_track_changes(mt, next_unflushed); } - *unflushed = next_txn; + *unflushed_ = next_unflushed; return json; } -- 2.20.1