[ovs-dev] [PATCH 15/20] ovsdb: rename jsonrpc_monitor_compose_table_update()

[Andy Zhou]

jsonrpc_monitor_compse_update() seems fit better than
jsonrpc_monitor_compose_table_update(), since it composes changes
from all tables.

Signed-off-by: Andy Zhou <az...@nicira.com>
---
 ovsdb/jsonrpc-server.c | 12 ++++++------
 ovsdb/ovsdb-monitor.c  |  4 ++--
 ovsdb/ovsdb-monitor.h  |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index bb19da0..ddcacbb 100644
--- a/ovsdb/jsonrpc-server.c
+++ b/ovsdb/jsonrpc-server.c
@@ -88,7 +88,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);
 
 
@@ -1234,7 +1234,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);
     return json ? json : json_object_create();
 
 error:
@@ -1280,11 +1280,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
@@ -1309,7 +1309,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/ovsdb-monitor.c b/ovsdb/ovsdb-monitor.c
index d336b12..397aa2a 100644
--- a/ovsdb/ovsdb-monitor.c
+++ b/ovsdb/ovsdb-monitor.c
@@ -380,8 +380,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/ovsdb-monitor.h b/ovsdb/ovsdb-monitor.h
index 5cb55dc..ea2a7aa 100644
--- a/ovsdb/ovsdb-monitor.h
+++ b/ovsdb/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

_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev