From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay9-d.mail.gandi.net (relay9-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::229]) by sourceware.org (Postfix) with ESMTPS id 043243838027 for ; Mon, 16 May 2022 14:34:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 043243838027 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=seketeli.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=seketeli.org Received: (Authenticated sender: dodji@seketeli.org) by mail.gandi.net (Postfix) with ESMTPSA id B7133FF816; Mon, 16 May 2022 14:34:27 +0000 (UTC) Received: by localhost (Postfix, from userid 1000) id 251B45800FC; Thu, 12 May 2022 11:59:02 +0200 (CEST) From: Dodji Seketeli To: Ben Woodard via Libabigail Subject: Re: [PATCH] V2 Add an option ignore SONAME differences in libraries Organization: Me, myself and I References: <20220504174229.1789759-1-woodard@redhat.com> X-Operating-System: Fedora 36 X-URL: http://www.seketeli.net/~dodji Date: Thu, 12 May 2022 11:59:02 +0200 In-Reply-To: <20220504174229.1789759-1-woodard@redhat.com> (Ben Woodard via Libabigail's message of "Wed, 4 May 2022 10:42:29 -0700") Message-ID: <87h75vvzq1.fsf@seketeli.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, DATE_IN_PAST_96_XX, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-List-Received-Date: Mon, 16 May 2022 14:34:32 -0000 Hello, Thanks a lot for the patch! I have amended it a little bit for cosmetics and applied it to master. Please find below my comments about the changes. Ben Woodard via Libabigail a =C3=A9crit: [...] > --- a/tools/abicompat.cc > +++ b/tools/abicompat.cc > @@ -74,6 +74,7 @@ public: > bool redundant_opt_set; > bool no_redundant_opt_set; > bool show_locs; > + bool ignore_soname; The spacing of the other data member of this struct is done using tabs, so I have updated the spaces before the new ignore_soname data member to use tabs as well. > diff --git a/tools/abidiff.cc b/tools/abidiff.cc > index adec742a..8f53f81f 100644 > --- a/tools/abidiff.cc > +++ b/tools/abidiff.cc > @@ -78,6 +78,7 @@ struct options > bool no_default_supprs; > bool no_arch; > bool no_corpus; > + bool ignore_soname; > bool leaf_changes_only; > bool fail_no_debug_info; > bool show_hexadecimal_values; Likewise. [...] > * doc/manuals/abicompat.rst - added new option > * doc/manuals/abidiff.rst - added new option to manpage > * tools/abicompat.cc - added new command line option and passed it > to the diff_context. > * tools/abidiff.cc - added new command line option and passed it > to the diff_context. > * src/abg-comparison.cc - don't bother comparing the sonames if > you aren't going to print them. The format of this ChangeLog part (that is used to automatically generate a ChangeLog file shipped in the tarball) is described in detail at https://sourceware.org/git/?p=3Dlibabigail.git;a=3Dblob_plain;f=3DCOMMIT-LO= G-GUIDELINES;hb=3DHEAD. I have thus amended this ChangeLog part accordingly. [...] Please find below the patch that I have applied to master. Thanks! >From c7a71ba2d146d4253d96d27150a741bc3290d275 Mon Sep 17 00:00:00 2001 From: Ben Woodard Date: Wed, 4 May 2022 10:42:29 -0700 Subject: [PATCH] Add an option ignore SONAME differences in libraries There are rare use cases where we do not want to compare the SONAME when testing libraries for compatiblity or diffing libraries. This adds an option to ignore the SONAME when doing the comparison. In these cases, we will edit the application's DT_NEEDED to point to the other library. This reuses the show_soname_change() function and slightly changes its meaning to not only control if the sonames are printed but also if they are compared. There didn't seem to be any other users of this function and slight semantic change seemed harmless. * doc/manuals/abicompat.rst - added new option * doc/manuals/abidiff.rst - added new option to manpage * src/abg-comparison.cc (compute_diff): don't bother comparing the sonames if you aren't going to print them. * tools/abicompat.cc (options::ignore_soname): Add new data member. (parse_command_line): Support the new --ignore-soname command line option. (display_usage): Add a description string for the new --ignore-soname command line option. (create_diff_context): Set the diff_context::show_soname_change from the new options::ignore_soname data member. * tools/abidiff.cc (options::ignore_soname): Add new data member. (display_usage): Add a description string for the new --ignore-soname command line option. (parse_command_line): Support the new --ignore-soname command line option. (set_diff_context_from_opts): Set the diff_context::show_soname_change from the new options::ignore_soname. Signed-off-by: Ben Woodard Signed-off-by: Dodji Seketeli --- doc/manuals/abicompat.rst | 4 ++++ doc/manuals/abidiff.rst | 4 ++++ src/abg-comparison.cc | 5 ++++- tools/abicompat.cc | 9 ++++++++- tools/abidiff.cc | 7 +++++++ 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/doc/manuals/abicompat.rst b/doc/manuals/abicompat.rst index acb2ab06..6bc56388 100644 --- a/doc/manuals/abicompat.rst +++ b/doc/manuals/abicompat.rst @@ -77,6 +77,10 @@ Options Do not show information about where in the *second shared library* the respective type was changed. =20 + * ``--ignore-soname`` + + Ignore differences in the SONAME when doing a comparison + * ``--weak-mode`` =20 This triggers the weak mode of ``abicompat``. In this mode, only diff --git a/doc/manuals/abidiff.rst b/doc/manuals/abidiff.rst index b37ed17e..f17fed2f 100644 --- a/doc/manuals/abidiff.rst +++ b/doc/manuals/abidiff.rst @@ -310,6 +310,10 @@ Options Show sizes and offsets in decimal base. This option is activated by default. =20 + * ``--ignore-soname`` + + Ignore differences in the SONAME when doing a comparison + * ``--no-show-relative-offset-changes`` =20 Without this option, when the offset of a data member changes, diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc index 193af52f..525605cb 100644 --- a/src/abg-comparison.cc +++ b/src/abg-comparison.cc @@ -10921,7 +10921,10 @@ compute_diff(const corpus_sptr f, =20 ctxt->set_corpus_diff(r); =20 - r->priv_->sonames_equal_ =3D f->get_soname() =3D=3D s->get_soname(); + if(ctxt->show_soname_change()) + r->priv_->sonames_equal_ =3D f->get_soname() =3D=3D s->get_soname(); + else + r->priv_->sonames_equal_ =3D true; =20 r->priv_->architectures_equal_ =3D f->get_architecture_name() =3D=3D s->get_architecture_name(); diff --git a/tools/abicompat.cc b/tools/abicompat.cc index a7f701fc..f4bc384d 100644 --- a/tools/abicompat.cc +++ b/tools/abicompat.cc @@ -74,6 +74,7 @@ public: bool redundant_opt_set; bool no_redundant_opt_set; bool show_locs; + bool ignore_soname; =20 options(const char* program_name) :prog_name(program_name), @@ -85,7 +86,8 @@ public: show_redundant(true), redundant_opt_set(), no_redundant_opt_set(), - show_locs(true) + show_locs(true), + ignore_soname(false) {} }; // end struct options =20 @@ -112,6 +114,7 @@ display_usage(const string& prog_name, ostream& out) << " --suppressions|--suppr specify a suppression file\n" << " --no-redundant do not display redundant changes\n" << " --no-show-locs do now show location information\n" + << " --ignore-soname do not take the SONAMEs into account\n" << " --redundant display redundant changes (this is the default)\n" << " --weak-mode check compatibility between the application and " "just one version of the library.\n" @@ -206,6 +209,8 @@ parse_command_line(int argc, char* argv[], options& opt= s) } else if (!strcmp(argv[i], "--no-show-locs")) opts.show_locs =3D false; + else if (!strcmp(argv[i], "--ignore-soname")) + opts.ignore_soname=3Dtrue; else if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h")) { @@ -277,6 +282,8 @@ create_diff_context(const options& opts) ctxt->show_linkage_names(true); ctxt->show_redundant_changes(opts.show_redundant); ctxt->show_locs(opts.show_locs); + // Intentional logic flip of ignore_soname + ctxt->show_soname_change(!opts.ignore_soname); ctxt->switch_categories_off (abigail::comparison::ACCESS_CHANGE_CATEGORY | abigail::comparison::COMPATIBLE_TYPE_CHANGE_CATEGORY diff --git a/tools/abidiff.cc b/tools/abidiff.cc index adec742a..763f084e 100644 --- a/tools/abidiff.cc +++ b/tools/abidiff.cc @@ -78,6 +78,7 @@ struct options bool no_default_supprs; bool no_arch; bool no_corpus; + bool ignore_soname; bool leaf_changes_only; bool fail_no_debug_info; bool show_hexadecimal_values; @@ -125,6 +126,7 @@ struct options no_default_supprs(), no_arch(), no_corpus(), + ignore_soname(false), leaf_changes_only(), fail_no_debug_info(), show_hexadecimal_values(), @@ -205,6 +207,7 @@ display_usage(const string& prog_name, ostream& out) "default suppression specification\n" << " --no-architecture do not take architecture in account\n" << " --no-corpus-path do not take the path to the corpora into accoun= t\n" + << " --ignore-soname do not take the SONAMEs into account\n" << " --fail-no-debug-info bail out if no debug info was found\n" << " --leaf-changes-only|-l only show leaf changes, " "so no change impact analysis (implies --redundant)\n" @@ -404,6 +407,8 @@ parse_command_line(int argc, char* argv[], options& opt= s) opts.no_arch =3D true; else if (!strcmp(argv[i], "--no-corpus-path")) opts.no_corpus =3D true; + else if (!strcmp(argv[i], "--ignore-soname")) + opts.ignore_soname =3D true; else if (!strcmp(argv[i], "--fail-no-debug-info")) opts.fail_no_debug_info =3D true; else if (!strcmp(argv[i], "--leaf-changes-only") @@ -699,6 +704,8 @@ set_diff_context_from_opts(diff_context_sptr ctxt, ctxt->show_added_vars(opts.show_all_vars || opts.show_added_vars); ctxt->show_linkage_names(opts.show_linkage_names); ctxt->show_locs(opts.show_locs); + // Intentional logic flip of ignore_soname + ctxt->show_soname_change(!opts.ignore_soname); // So when we are showing only leaf changes, we want to show // redundant changes because of this: Suppose several functions have // their return type changed from void* to int*. We want them all --=20 2.35.0.rc2 Cheers, --=20 Dodji