ovs-vsctl: Fix performance problem.

diff --git a/lib/ovsdb-idl.c b/lib/ovsdb-idl.c
index 9bb1201404e217c0fb5541fac87aaf4ea286d5a2..e0c540641d95821875172f9fcfd3b1de9c30b4c7 100644 (file)
--- a/lib/ovsdb-idl.c
+++ b/lib/ovsdb-idl.c
@@ -28,6 +28,7 @@
 #include "ovsdb-data.h"
 #include "ovsdb-error.h"
 #include "ovsdb-idl-provider.h"
+#include "poll-loop.h"
 #include "shash.h"
 #include "util.h"
 
@@ -800,6 +801,14 @@ ovsdb_idl_txn_destroy(struct ovsdb_idl_txn *txn)
     free(txn);
 }
 
+void
+ovsdb_idl_txn_wait(const struct ovsdb_idl_txn *txn)
+{
+    if (txn->status != TXN_INCOMPLETE) {
+        poll_immediate_wake();
+    }
+}
+
 static struct json *
 where_uuid_equals(const struct uuid *uuid)
 {

diff --git a/lib/ovsdb-idl.h b/lib/ovsdb-idl.h
index cfc729ef7594195ca789c9d065e10f70e212896f..5915a1bb94d4dc1467bf36632ab5f5d817183b11 100644 (file)
--- a/lib/ovsdb-idl.h
+++ b/lib/ovsdb-idl.h
@@ -42,6 +42,7 @@ const char *ovsdb_idl_txn_status_to_string(enum ovsdb_idl_txn_status);
 
 struct ovsdb_idl_txn *ovsdb_idl_txn_create(struct ovsdb_idl *);
 void ovsdb_idl_txn_destroy(struct ovsdb_idl_txn *);
+void ovsdb_idl_txn_wait(const struct ovsdb_idl_txn *);
 enum ovsdb_idl_txn_status ovsdb_idl_txn_commit(struct ovsdb_idl_txn *);
 void ovsdb_idl_txn_abort(struct ovsdb_idl_txn *);
 

diff --git a/tests/test-ovsdb.c b/tests/test-ovsdb.c
index 1f697b4fc5f41b3db7117415145e9c82535ff254..4f44afe86979436cf0ccb193e2e2e274eb3aadfb 100644 (file)
--- a/tests/test-ovsdb.c
+++ b/tests/test-ovsdb.c
@@ -1479,6 +1479,7 @@ idl_set(struct ovsdb_idl *idl, char *commands, int step)
     while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) {
         ovsdb_idl_run(idl);
         ovsdb_idl_wait(idl);
+        ovsdb_idl_txn_wait(txn);
         poll_block();
     }
     printf("%03d: commit, status=%s\n",

diff --git a/utilities/ovs-vsctl.c b/utilities/ovs-vsctl.c
index d94308ca640582dbbe102331d8c4d80d4bae914e..0f6abf3216a0b4c24fbabf0b018a838e7ee22530 100644 (file)
--- a/utilities/ovs-vsctl.c
+++ b/utilities/ovs-vsctl.c
@@ -954,6 +954,7 @@ do_vsctl(int argc, char *argv[], struct ovsdb_idl *idl)
     while ((status = ovsdb_idl_txn_commit(txn)) == TXN_INCOMPLETE) {
         ovsdb_idl_run(idl);
         ovsdb_idl_wait(idl);
+        ovsdb_idl_txn_wait(txn);
         poll_block();
     }
     ovsdb_idl_txn_destroy(txn);