From patchwork Thu May 27 08:53:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Giuliano Procida X-Patchwork-Id: 43605 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BEB0E385040E; Thu, 27 May 2021 08:53:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BEB0E385040E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1622105611; bh=z2hWfHWnmmymHKpHuYFwk9vNR+vVvMRN0fWixJm3iYY=; h=Date:In-Reply-To:References:Subject:To:List-Id:List-Unsubscribe: List-Archive:List-Help:List-Subscribe:From:Reply-To:Cc:From; b=IkvFsRCb9NPddCpctm+qejFASEP4XG1l4+8Y3TbU51AjZjce30TyTq9ZF1QFm5xfQ SjdGRd4qZHoFgv7thjJVsbO6ELuVL58/YYCxTKJq27JQQZFXqsAjE8cibLOwVUT9t+ IWeOTGdfC0FG89Y1mtLRD5B3i7x7DLVG7HmFjW94= X-Original-To: libabigail@sourceware.org Delivered-To: libabigail@sourceware.org Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by sourceware.org (Postfix) with ESMTPS id C53CD39540BA for ; Thu, 27 May 2021 08:53:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C53CD39540BA Received: by mail-qk1-x749.google.com with SMTP id d15-20020a05620a136fb02902e9e93c69c8so2905911qkl.23 for ; Thu, 27 May 2021 01:53:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=z2hWfHWnmmymHKpHuYFwk9vNR+vVvMRN0fWixJm3iYY=; b=HKgBfdjJfFMa9ha40lhvvL8YuYti68lfndEB/gKnHK3xsQNZl7eTXI7AMRc5XB2Y8W U1p+Jbhw3K2YO5RF13M3hTpu8R5vjSVXSePxBK3a3Kw21jwVsJOyJCjnocdMViGgLtAu eSg3sgECLqkXLQj7lAyjfT86NzEg5EDSWnN+MGrFzSejg9o9jG1JqAqzz2BRmZcd6i1n 6Uszlbz4OQUwGLNPoIOQusVVkStr5IHBw8nZthDsGEcvfnFDceRDkbOvNk/ZsgygV18V 881ETHrOnkAHiuKcQIAUVv9rP3Kgb7fgKwKBPqPehqDhKaUTxuQZNOI7Th66f8hGOq2z QIeA== X-Gm-Message-State: AOAM531udTZ9CmstSmms+grelvTVmK9+3wi2pHev8IIcpkkFXh0HkSnc MMiboukWheyGP8/aqt1iI/awQc4P4acfkZ2UPQaS+arlnvenfqEuRJ6DnXeKAZZR306Q+KViupu hf9C6C2XEwkGG59V3tzqpTrfxqtj5u0jyqVZA8iQoRCSJKYVYBhjnVV2ILqpG7ND5dUO0qBo= X-Google-Smtp-Source: ABdhPJxpImznJcxCZCNCRKk4y/RuUzKF5DVWjwcsvAjsNKGwRMD+f6P+dmgzrbIrDsBGHgvKAH/B9jUbKR6Kvw== X-Received: from tef.lon.corp.google.com ([2a00:79e0:d:210:959c:f576:7f09:4ab3]) (user=gprocida job=sendgmr) by 2002:a0c:f4ca:: with SMTP id o10mr276093qvm.9.1622105608334; Thu, 27 May 2021 01:53:28 -0700 (PDT) Date: Thu, 27 May 2021 09:53:05 +0100 In-Reply-To: <20210527085305.1400592-1-gprocida@google.com> Message-Id: <20210527085305.1400592-4-gprocida@google.com> Mime-Version: 1.0 References: <20210427112853.1338240-1-gprocida@google.com> <20210527085305.1400592-1-gprocida@google.com> X-Mailer: git-send-email 2.31.1.818.g46aad6cb9e-goog Subject: [PATCH v2 3/3] abg-reader: create a fresh corpus object per corpus To: libabigail@sourceware.org X-Spam-Status: No, score=-22.4 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libabigail@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Mailing list of the Libabigail project List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-Patchwork-Original-From: Giuliano Procida via Libabigail From: Giuliano Procida Reply-To: Giuliano Procida Cc: maennich@google.com, kernel-team@android.com Errors-To: libabigail-bounces@sourceware.org Sender: "Libabigail" Currently the XML reader reuses the same corpus object for all corpora in a corpus group. This has an unwanted side-effect: any abi-instr with the same path in different corpora will collide and parts of the ABI will be lost. Creating a new corpus object for every abi-corpus element seems like the right thing to do. Testing with large ABIs containing many corpora also shows a modest (~10%) abidiff speed improvement. * src/abg-reader.cc (read_corpus_from_input): Always create a fresh corpus object for each abi-corpus XML element. Signed-off-by: Giuliano Procida --- src/abg-reader.cc | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/abg-reader.cc b/src/abg-reader.cc index 9bc43bbf..febd6ca4 100644 --- a/src/abg-reader.cc +++ b/src/abg-reader.cc @@ -1889,16 +1889,12 @@ read_corpus_from_input(read_context& ctxt) BAD_CAST("abi-corpus"))) return nil; - if (!ctxt.get_corpus()) - { - corpus_sptr c(new corpus(ctxt.get_environment(), "")); - ctxt.set_corpus(c); + ctxt.set_corpus(std::make_shared(ctxt.get_environment(), "")); #ifdef WITH_DEBUG_SELF_COMPARISON - if (ctxt.get_environment()->self_comparison_debug_is_on()) - ctxt.get_environment()-> - set_self_comparison_debug_input(ctxt.get_corpus()); + if (ctxt.get_environment()->self_comparison_debug_is_on()) + ctxt.get_environment()-> + set_self_comparison_debug_input(ctxt.get_corpus()); #endif - } if (!ctxt.get_corpus_group()) ctxt.clear_per_corpus_data(); @@ -1952,16 +1948,12 @@ read_corpus_from_input(read_context& ctxt) } else { - if (!ctxt.get_corpus()) - { - corpus_sptr c(new corpus(ctxt.get_environment(), "")); - ctxt.set_corpus(c); + ctxt.set_corpus(std::make_shared(ctxt.get_environment(), "")); #ifdef WITH_DEBUG_SELF_COMPARISON - if (ctxt.get_environment()->self_comparison_debug_is_on()) - ctxt.get_environment()-> - set_self_comparison_debug_input(ctxt.get_corpus()); + if (ctxt.get_environment()->self_comparison_debug_is_on()) + ctxt.get_environment()-> + set_self_comparison_debug_input(ctxt.get_corpus()); #endif - } if (!ctxt.get_corpus_group()) ctxt.clear_per_corpus_data();