From patchwork Thu Jul 8 15:51:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Ivanov X-Patchwork-Id: 1502459 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=openvswitch.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GLLPn6RGCz9sS8 for ; Fri, 9 Jul 2021 01:51:41 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5174860BDB; Thu, 8 Jul 2021 15:51:39 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tSM9OAF5-7kr; Thu, 8 Jul 2021 15:51:38 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 921F5605A2; Thu, 8 Jul 2021 15:51:37 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 64290C001C; Thu, 8 Jul 2021 15:51:37 +0000 (UTC) X-Original-To: ovs-dev@openvswitch.org Delivered-To: ovs-dev@lists.linuxfoundation.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7A772C000E for ; Thu, 8 Jul 2021 15:51:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 678B341641 for ; Thu, 8 Jul 2021 15:51:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QH1AVEyFpHEP for ; Thu, 8 Jul 2021 15:51:35 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from www.kot-begemot.co.uk (ivanoab7.miniserver.com [37.128.132.42]) by smtp4.osuosl.org (Postfix) with ESMTPS id 3172A415BE for ; Thu, 8 Jul 2021 15:51:34 +0000 (UTC) Received: from tun252.jain.kot-begemot.co.uk ([192.168.18.6] helo=jain.kot-begemot.co.uk) by www.kot-begemot.co.uk with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1m1WJH-0000oy-Qp for ovs-dev@openvswitch.org; Thu, 08 Jul 2021 15:51:32 +0000 Received: from jain.kot-begemot.co.uk ([192.168.3.3]) by jain.kot-begemot.co.uk with esmtp (Exim 4.92) (envelope-from ) id 1m1WJD-0000ws-V9; Thu, 08 Jul 2021 16:51:29 +0100 From: anton.ivanov@cambridgegreys.com To: ovs-dev@openvswitch.org Date: Thu, 8 Jul 2021 16:51:25 +0100 Message-Id: <20210708155125.3601-1-anton.ivanov@cambridgegreys.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett Cc: Anton Ivanov Subject: [ovs-dev] [OVN Patch v2] Fix the naming of can_parallelise_hashes X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ovs-dev-bounces@openvswitch.org Sender: "dev" From: Anton Ivanov 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 Acked-by: Dumitru Ceara --- 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);