[ovs-dev] [PATCH 14/19] ovsdb-monitor: rename jsonrpc_monitor_compose_table_update()
Andy Zhou
azhou at nicira.com
Fri Apr 10 00:11:33 UTC 2015
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 at nicira.com>
Acked-by: Ben Pfaff <blp at nicira.com>
--
v1->v2: Fix typos
---
ovsdb/jsonrpc-server.c | 12 ++++++------
ovsdb/monitor.c | 4 ++--
ovsdb/monitor.h | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index 9809a8f..164661a 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 ff7ffa4..b90a7cb 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 5cb55dc..ea2a7aa 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_set_select(struct ovsdb_monitor *dbmon,
const struct ovsdb_table *table,
--
1.9.1
More information about the dev
mailing list