From patchwork Thu Jan 23 14:30:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Sutter X-Patchwork-Id: 1228070 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=nwl.cc Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 483Pp172dfz9sR1 for ; Fri, 24 Jan 2020 01:30:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728842AbgAWOat (ORCPT ); Thu, 23 Jan 2020 09:30:49 -0500 Received: from orbyte.nwl.cc ([151.80.46.58]:39894 "EHLO orbyte.nwl.cc" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728779AbgAWOat (ORCPT ); Thu, 23 Jan 2020 09:30:49 -0500 Received: from localhost ([::1]:52982 helo=tatos) by orbyte.nwl.cc with esmtp (Exim 4.91) (envelope-from ) id 1iudVP-0000nW-Uz; Thu, 23 Jan 2020 15:30:48 +0100 From: Phil Sutter To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org, Florian Westphal Subject: [nft PATCH 4/4] segtree: Refactor ei_insert() Date: Thu, 23 Jan 2020 15:30:49 +0100 Message-Id: <20200123143049.13888-5-phil@nwl.cc> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200123143049.13888-1-phil@nwl.cc> References: <20200123143049.13888-1-phil@nwl.cc> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org With all simplifications in place, reorder the code to streamline it further. Apart from making the second call to ei_lookup() conditional, debug output is slightly enhanced. Signed-off-by: Phil Sutter --- src/segtree.c | 63 +++++++++++++++++++++++---------------------------- 1 file changed, 28 insertions(+), 35 deletions(-) diff --git a/src/segtree.c b/src/segtree.c index 3c0989e76093a..edec9f4ebf174 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -192,48 +192,41 @@ static int ei_insert(struct list_head *msgs, struct seg_tree *tree, { struct elementary_interval *lei, *rei; - /* - * Lookup the intervals containing the left and right endpoints. - */ lei = ei_lookup(tree, new->left); - rei = ei_lookup(tree, new->right); - - if (segtree_debug(tree->debug_mask)) - pr_gmp_debug("insert: [%Zx %Zx]\n", new->left, new->right); - - if (lei != NULL && rei != NULL && lei == rei) { - if (!merge) - goto err; - - ei_destroy(new); + if (lei == NULL) { + /* no overlaps, just add the new interval */ + if (segtree_debug(tree->debug_mask)) + pr_gmp_debug("insert: [%Zx %Zx]\n", + new->left, new->right); + __ei_insert(tree, new); return 0; - } else { - if (lei != NULL) { - if (!merge) - goto err; - /* - * Left endpoint is within lei, adjust it so we have: - * - * [lei_left, new_right] - */ - if (segtree_debug(tree->debug_mask)) { - pr_gmp_debug("adjust left [%Zx %Zx]\n", - lei->left, lei->right); - } + } - mpz_set(lei->right, new->right); - ei_destroy(new); - return 0; - } + if (!merge) { + errno = EEXIST; + return expr_binary_error(msgs, lei->expr, new->expr, + "conflicting intervals specified"); } - __ei_insert(tree, new); + /* caller sorted intervals, so rei is either equal to lei or NULL */ + rei = ei_lookup(tree, new->right); + if (rei != lei) { + /* + * Left endpoint is within lei, adjust it so we have: + * + * [lei_left, new_right] + */ + if (segtree_debug(tree->debug_mask)) + pr_gmp_debug("adjust right: [%Zx %Zx]\n", + lei->left, lei->right); + mpz_set(lei->right, new->right); + } else if (segtree_debug(tree->debug_mask)) { + pr_gmp_debug("skip new: [%Zx %Zx] for old: [%Zx %Zx]\n", + new->left, new->right, lei->left, lei->right); + } + ei_destroy(new); return 0; -err: - errno = EEXIST; - return expr_binary_error(msgs, lei->expr, new->expr, - "conflicting intervals specified"); } /*