Now it simply calls ovsdb_monitor_compose_table_update(), which
is actually creates the json object.
Signed-off-by: Andy Zhou <az...@nicira.com>
---
ovsdb/jsonrpc-server.c | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index 973cc46..a25a6f1 100644
--- a/ovsdb/jsonrpc-server.c
+++ b/ovsdb/jsonrpc-server.c
@@ -1674,8 +1674,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. */
static struct json *
-ovsdb_jsonrpc_monitor_compose_table_update(
- const struct ovsdb_jsonrpc_monitor *monitor, bool initial)
+ovsdb_monitor_compose_table_update(
+ const struct ovsdb_monitor *dbmon, bool initial)
{
struct shash_node *node;
unsigned long int *changed;
@@ -1683,7 +1683,7 @@ ovsdb_jsonrpc_monitor_compose_table_update(
size_t max_columns;
max_columns = 0;
- SHASH_FOR_EACH (node, &monitor->dbmon->tables) {
+ SHASH_FOR_EACH (node, &dbmon->tables) {
struct ovsdb_monitor_table *mt = node->data;
max_columns = MAX(max_columns, mt->n_columns);
@@ -1691,7 +1691,7 @@ ovsdb_jsonrpc_monitor_compose_table_update(
changed = xmalloc(bitmap_n_bytes(max_columns));
json = NULL;
- SHASH_FOR_EACH (node, &monitor->dbmon->tables) {
+ SHASH_FOR_EACH (node, &dbmon->tables) {
struct ovsdb_monitor_table *mt = node->data;
struct ovsdb_monitor_row *row, *next;
struct json *table_json = NULL;
@@ -1730,6 +1730,13 @@ ovsdb_jsonrpc_monitor_compose_table_update(
return json;
}
+static struct json *
+ovsdb_jsonrpc_monitor_compose_table_update(
+ const struct ovsdb_jsonrpc_monitor *monitor, bool initial)
+{
+ return ovsdb_monitor_compose_table_update(monitor->dbmon, initial);
+}
+
static bool
ovsdb_jsonrpc_monitor_needs_flush(struct ovsdb_jsonrpc_session *s)
{
--
1.9.1
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
