split out per monitoring needs_flush() into ovsdb_monitor_needs_flush(). Signed-off-by: Andy Zhou <az...@nicira.com> --- ovsdb/jsonrpc-server.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c index a25a6f1..0630664 100644 --- a/ovsdb/jsonrpc-server.c +++ b/ovsdb/jsonrpc-server.c @@ -1738,19 +1738,28 @@ ovsdb_jsonrpc_monitor_compose_table_update( } static bool +ovsdb_monitor_needs_flush(struct ovsdb_monitor *dbmon) +{ + struct shash_node *node; + + SHASH_FOR_EACH (node, &dbmon->tables) { + struct ovsdb_monitor_table *mt = node->data; + + if (!hmap_is_empty(&mt->changes)) { + return true; + } + } + return false; +} + +static bool ovsdb_jsonrpc_monitor_needs_flush(struct ovsdb_jsonrpc_session *s) { struct ovsdb_jsonrpc_monitor *m; HMAP_FOR_EACH (m, node, &s->monitors) { - struct shash_node *node; - - SHASH_FOR_EACH (node, &m->dbmon->tables) { - struct ovsdb_monitor_table *mt = node->data; - - if (!hmap_is_empty(&mt->changes)) { - return true; - } + if (ovsdb_monitor_needs_flush(m->dbmon)) { + return true; } } -- 1.9.1 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev