From: Andy Zhou <azhou@nicira.com>
Date: Thu, 12 Mar 2015 02:33:46 +0000 (-0700)
Subject: jsonrpc-server: refactoring ovsdb_jsonrpc_monitor_needs_flush
X-Git-Tag: v2.4.0~166
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=dbc1cfbb2818b4ead18716d41e452a1b0742c70e

jsonrpc-server: refactoring ovsdb_jsonrpc_monitor_needs_flush

split out per monitoring needs_flush() into
ovsdb_monitor_needs_flush().

Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/ovsdb/jsonrpc-server.c b/ovsdb/jsonrpc-server.c
index 93773885f..23aa3fd69 100644
--- a/ovsdb/jsonrpc-server.c
+++ b/ovsdb/jsonrpc-server.c
@@ -1739,20 +1739,29 @@ ovsdb_jsonrpc_monitor_compose_table_update(
     return ovsdb_monitor_compose_table_update(monitor->dbmon, initial);
 }
 
+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;
         }
     }