diff options
| author | Andy Zhou <azhou@nicira.com> | 2015-03-13 13:41:38 -0700 |
|---|---|---|
| committer | Andy Zhou <azhou@nicira.com> | 2015-05-29 17:39:50 -0700 |
| commit | f1de87bb2f568ad126e77e85746ce63376ff0bd5 (patch) | |
| tree | 486c30c90d7f8832852f60c82e731ffe984d90d8 | |
| parent | 59c35e1198ee42887649297bb4fd8687c5005ac8 (diff) | |
| download | openvswitch-f1de87bb2f568ad126e77e85746ce63376ff0bd5.tar.gz | |
ovsdb-monitor: rename jsonrpc_monitor_compose_table_update()
jsonrpc_monitor_compose_update() seems to fit better than
jsonrpc_monitor_compose_table_update(), since it composes changes
from all tables. Albeit the original one is named after the
<table-updates> object described in RFC 7047.
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
| -rw-r--r-- | ovsdb/jsonrpc-server.c | 12 | ||||
| -rw-r--r-- | ovsdb/monitor.c | 4 | ||||
| -rw-r--r-- | ovsdb/monitor.h | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index 84e1bb487..05aaf8718 100644 --- a/ovsdb/jsonrpc-server.c +++ b/ovsdb/jsonrpc-server.c @@ -89,7 +89,7 @@ static struct jsonrpc_msg *ovsdb_jsonrpc_monitor_cancel( static void ovsdb_jsonrpc_monitor_remove_all(struct ovsdb_jsonrpc_session *); static void ovsdb_jsonrpc_monitor_flush_all(struct ovsdb_jsonrpc_session *); static bool ovsdb_jsonrpc_monitor_needs_flush(struct ovsdb_jsonrpc_session *); -static struct json *ovsdb_jsonrpc_monitor_compose_table_update( +static struct json *ovsdb_jsonrpc_monitor_compose_update( struct ovsdb_jsonrpc_monitor *monitor, bool initial); @@ -1235,7 +1235,7 @@ ovsdb_jsonrpc_monitor_create(struct ovsdb_jsonrpc_session *s, struct ovsdb *db, } ovsdb_monitor_get_initial(m->dbmon); - json = ovsdb_jsonrpc_monitor_compose_table_update(m, true); + json = ovsdb_jsonrpc_monitor_compose_update(m, true); json = json ? json : json_object_create(); return jsonrpc_create_reply(json, request_id); @@ -1282,11 +1282,11 @@ ovsdb_jsonrpc_monitor_remove_all(struct ovsdb_jsonrpc_session *s) } static struct json * -ovsdb_jsonrpc_monitor_compose_table_update( +ovsdb_jsonrpc_monitor_compose_update( struct ovsdb_jsonrpc_monitor *monitor, bool initial) { - return ovsdb_monitor_compose_table_update(monitor->dbmon, initial, - &monitor->unflushed); + return ovsdb_monitor_compose_update(monitor->dbmon, initial, + &monitor->unflushed); } static bool @@ -1320,7 +1320,7 @@ ovsdb_jsonrpc_monitor_flush_all(struct ovsdb_jsonrpc_session *s) HMAP_FOR_EACH (m, node, &s->monitors) { struct json *json; - json = ovsdb_jsonrpc_monitor_compose_table_update(m, false); + json = ovsdb_jsonrpc_monitor_compose_update(m, false); if (json) { struct jsonrpc_msg *msg; struct json *params; diff --git a/ovsdb/monitor.c b/ovsdb/monitor.c index 769ea3622..0898808b4 100644 --- a/ovsdb/monitor.c +++ b/ovsdb/monitor.c @@ -378,8 +378,8 @@ ovsdb_monitor_compose_row_update( * be used as part of the initial reply to a "monitor" request, false if it is * going to be used as part of an "update" notification. */ struct json * -ovsdb_monitor_compose_table_update(const struct ovsdb_monitor *dbmon, - bool initial, uint64_t *unflushed) +ovsdb_monitor_compose_update(const struct ovsdb_monitor *dbmon, + bool initial, uint64_t *unflushed) { struct shash_node *node; unsigned long int *changed; diff --git a/ovsdb/monitor.h b/ovsdb/monitor.h index 4db36b2fd..5fcb346e0 100644 --- a/ovsdb/monitor.h +++ b/ovsdb/monitor.h @@ -46,8 +46,8 @@ const char * OVS_WARN_UNUSED_RESULT ovsdb_monitor_table_check_duplicates(struct ovsdb_monitor *, const struct ovsdb_table *); -struct json *ovsdb_monitor_compose_table_update(const struct ovsdb_monitor *dbmon, - bool initial, uint64_t *unflushed_transaction); +struct json *ovsdb_monitor_compose_update(const struct ovsdb_monitor *dbmon, + bool initial, uint64_t *unflushed_transaction); void ovsdb_monitor_table_add_select(struct ovsdb_monitor *dbmon, const struct ovsdb_table *table, |