From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by sourceware.org (Postfix) with ESMTPS id 555773858D28 for ; Tue, 23 Nov 2021 14:35:58 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 555773858D28 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 relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 9BBD724000D; Tue, 23 Nov 2021 14:35:56 +0000 (UTC) Received: by localhost (Postfix, from userid 1000) id E128658010A; Tue, 23 Nov 2021 15:35:55 +0100 (CET) From: Dodji Seketeli To: "Guillermo E. Martinez via Libabigail" Subject: Re: [PATCH 2/3] ctf-reader: Use smart pointers in create_read_context Organization: Me, myself and I References: <20211118025606.554809-1-guillermo.e.martinez@oracle.com> <20211118232330.16310-1-guillermo.e.martinez@oracle.com> <20211118232330.16310-3-guillermo.e.martinez@oracle.com> X-Operating-System: Fedora 36 X-URL: http://www.seketeli.net/~dodji Date: Tue, 23 Nov 2021 15:35:55 +0100 In-Reply-To: <20211118232330.16310-3-guillermo.e.martinez@oracle.com> (Guillermo E. Martinez via Libabigail's message of "Thu, 18 Nov 2021 17:23:29 -0600") Message-ID: <87r1b7szw4.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=-9.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Tue, 23 Nov 2021 14:36:00 -0000 Hello Guillermo, "Guillermo E. Martinez via Libabigail" a =C3=A9= crit: [...] > diff --git a/include/abg-ctf-reader.h b/include/abg-ctf-reader.h > index 56b2bf91..c527c2ff 100644 > --- a/include/abg-ctf-reader.h > +++ b/include/abg-ctf-reader.h > @@ -25,8 +25,11 @@ namespace ctf_reader > { >=20=20 > class read_context; > -read_context *create_read_context(const std::string& elf_path, > - ir::environment *env); > +typedef shared_ptr read_context_sptr; > + > +read_context_sptr > +create_read_context(const std::string& elf_path, > + ir::environment *env); > corpus_sptr read_corpus(read_context *ctxt, > elf_reader::status& status); I appears that read_corpus that takes a read_context* now needs an overload function that takes a "const read_context&" too. That is needed in abidw, at least, where read_corpus is used in that capacity. I amended abg-ctf-reader.{h,cc} to declare and define that new overload. abidw.cc doesn't need any adjustment in that regard. [...] > * include/abg-ctf-reader.h (read_context_sptr): New typedef. > (create_read_context): Use read_context_sptr as return value. > * src/abg-ctf-reader.cc (create_read_context): Likewise. > * tools/abidiff.cc (main): Use read_context_sptr. > * tools/abilint.cc: Likewise. I have updated the ChangeLog accordingly. > > Signed-off-by: Guillermo E. Martinez I have applied the amended patch to the master branch of the git repository and am providing it below. Thanks! >From 7f60fbc96b16507a4097a0c1a86c27279d9cab5d Mon Sep 17 00:00:00 2001 From: "Guillermo E. Martinez via Libabigail" Date: Thu, 18 Nov 2021 17:23:29 -0600 Subject: [PATCH] ctf-reader: Make create_read_context return a smart pointe= r. * include/abg-ctf-reader.h (read_context_sptr): New typedef. (create_read_context): Use read_context_sptr as return value. (read_corpus): New overload that takes a read_context_sptr. * src/abg-ctf-reader.cc (create_read_context): Use read_context_sptr as return value. (read_corpus): New overload that takes a read_context_sptr. * tools/abidiff.cc (main): Use read_context_sptr. * tools/abidw.cc (load_corpus_and_write_abixml): Adjust call to create_read_context. * tools/abilint.cc: Likewise. Signed-off-by: Guillermo E. Martinez Signed-off-by: Dodji Seketeli --- include/abg-ctf-reader.h | 12 ++++++++---- src/abg-ctf-reader.cc | 19 +++++++++++++++++-- tools/abidiff.cc | 18 ++++++++++-------- tools/abidw.cc | 2 +- tools/abilint.cc | 8 ++++---- 5 files changed, 40 insertions(+), 19 deletions(-) diff --git a/include/abg-ctf-reader.h b/include/abg-ctf-reader.h index 56b2bf91..3343f0d8 100644 --- a/include/abg-ctf-reader.h +++ b/include/abg-ctf-reader.h @@ -25,11 +25,15 @@ namespace ctf_reader { =20 class read_context; -read_context *create_read_context(const std::string& elf_path, - ir::environment *env); -corpus_sptr read_corpus(read_context *ctxt, - elf_reader::status& status); +typedef shared_ptr read_context_sptr; =20 +read_context_sptr +create_read_context(const std::string& elf_path, + ir::environment *env); +corpus_sptr +read_corpus(read_context *ctxt, elf_reader::status& status); +corpus_sptr +read_corpus(const read_context_sptr &ctxt, elf_reader::status &status); } // end namespace ctf_reader } // end namespace abigail =20 diff --git a/src/abg-ctf-reader.cc b/src/abg-ctf-reader.cc index fd53f8a1..6829e4c0 100644 --- a/src/abg-ctf-reader.cc +++ b/src/abg-ctf-reader.cc @@ -1058,11 +1058,12 @@ slurp_elf_info(read_context *ctxt, corpus_sptr corp) /// @param elf_path the patch of some ELF file. /// @param env a libabigail IR environment. =20 -read_context * +read_context_sptr create_read_context(const std::string& elf_path, ir::environment *env) { - return new read_context(elf_path, env); + read_context_sptr result(new read_context(elf_path, env)); + return result; } =20 /// Read the CTF information from some source described by a given @@ -1116,5 +1117,19 @@ read_corpus(read_context *ctxt, elf_reader::status &= status) return corp; } =20 +/// Read the CTF information from some source described by a given +/// read context and process it to create a libabigail IR corpus. +/// Store the corpus in the same read context. +/// +/// @param ctxt the read context to use. +/// +/// @param status the resulting status of the corpus read. +/// +/// @return a shared pointer to the read corpus. + +corpus_sptr +read_corpus(const read_context_sptr &ctxt, elf_reader::status &status) +{return read_corpus(ctxt.get(), status);} + } // End of namespace ctf_reader } // End of namespace abigail diff --git a/tools/abidiff.cc b/tools/abidiff.cc index f145f4f1..30959616 100644 --- a/tools/abidiff.cc +++ b/tools/abidiff.cc @@ -1169,12 +1169,13 @@ main(int argc, char* argv[]) #ifdef WITH_CTF if (opts.use_ctf) { - abigail::ctf_reader::read_context *ctxt - =3D abigail::ctf_reader::create_read_context (opts.file1, - env.get()); + abigail::ctf_reader::read_context_sptr ctxt + =3D abigail::ctf_reader::create_read_context(opts.file1, + env.get()); =20 assert (ctxt); - c1 =3D abigail::ctf_reader::read_corpus (ctxt, c1_status); + c1 =3D abigail::ctf_reader::read_corpus(ctxt.get(), + c1_status); } else #endif @@ -1252,12 +1253,13 @@ main(int argc, char* argv[]) #ifdef WITH_CTF if (opts.use_ctf) { - abigail::ctf_reader::read_context *ctxt - =3D abigail::ctf_reader::create_read_context (opts.file2, - env.get()); + abigail::ctf_reader::read_context_sptr ctxt + =3D abigail::ctf_reader::create_read_context(opts.file2, + env.get()); =20 assert (ctxt); - c2 =3D abigail::ctf_reader::read_corpus (ctxt, c2_status); + c2 =3D abigail::ctf_reader::read_corpus (ctxt.get(), + c2_status); } else #endif diff --git a/tools/abidw.cc b/tools/abidw.cc index d2bc029b..f7a8937d 100644 --- a/tools/abidw.cc +++ b/tools/abidw.cc @@ -539,7 +539,7 @@ load_corpus_and_write_abixml(char* argv[], #ifdef WITH_CTF if (opts.use_ctf) { - abigail::ctf_reader::read_context *ctxt + abigail::ctf_reader::read_context_sptr ctxt =3D abigail::ctf_reader::create_read_context (opts.in_file_path, env.get()); =20 diff --git a/tools/abilint.cc b/tools/abilint.cc index 49643b66..2e9bae49 100644 --- a/tools/abilint.cc +++ b/tools/abilint.cc @@ -370,12 +370,12 @@ main(int argc, char* argv[]) #ifdef WITH_CTF if (opts.use_ctf) { - abigail::ctf_reader::read_context *ctxt - =3D abigail::ctf_reader::create_read_context (opts.file_= path, - env.get()); + abigail::ctf_reader::read_context_sptr ctxt + =3D abigail::ctf_reader::create_read_context(opts.file_p= ath, + env.get()); =20 assert (ctxt); - corp =3D abigail::ctf_reader::read_corpus (ctxt, s); + corp =3D abigail::ctf_reader::read_corpus (ctxt.get(), s); } else #endif --=20 2.33.1 --=20 Dodji