From: Anton Ivanov <[email protected]>

can_parallelise_hashes() was explicitly using the local OVN specific
copy with the ovn_ prefix instead of the define.

This prevents any work on migrating the parallelisation to the ovs
tree.

Signed-off-by: Anton Ivanov <[email protected]>
---
 lib/ovn-parallel-hmap.h | 2 +-
 northd/ovn-northd.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ovn-parallel-hmap.h b/lib/ovn-parallel-hmap.h
index 0af8914c4..2df132ea8 100644
--- a/lib/ovn-parallel-hmap.h
+++ b/lib/ovn-parallel-hmap.h
@@ -275,7 +275,7 @@ bool ovn_can_parallelize_hashes(bool force_parallel);
 
 #define hmap_merge(dest, inc) ovn_hmap_merge(dest, inc)
 
-#define ovn_run_pool(pool) ovn_run_pool(pool)
+#define run_pool(pool) ovn_run_pool(pool)
 
 #define run_pool_hash(pool, result, result_frags) \
     ovn_run_pool_hash(pool, result, result_frags)
diff --git a/northd/ovn-northd.c b/northd/ovn-northd.c
index 83746f4ab..bc01a05ca 100644
--- a/northd/ovn-northd.c
+++ b/northd/ovn-northd.c
@@ -13332,7 +13332,7 @@ ovnnb_db_run(struct northd_context *ctx,
 
     use_parallel_build =
         (smap_get_bool(&nb->options, "use_parallel_build", false) &&
-         ovn_can_parallelize_hashes(false));
+         can_parallelize_hashes(false));
 
     use_logical_dp_groups = smap_get_bool(&nb->options,
                                           "use_logical_dp_groups", false);
-- 
2.20.1

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to