From: Dodji Seketeli <dodji@seketeli.org>
To: "Guillermo E. Martinez via Libabigail" <libabigail@sourceware.org>
Subject: Re: [PATCH 2/3] ctf-reader: Use smart pointers in create_read_context
Date: Tue, 23 Nov 2021 15:35:55 +0100 [thread overview]
Message-ID: <87r1b7szw4.fsf@seketeli.org> (raw)
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")
Hello Guillermo,
"Guillermo E. Martinez via Libabigail" <libabigail@sourceware.org> a é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
> {
>
> class read_context;
> -read_context *create_read_context(const std::string& elf_path,
> - ir::environment *env);
> +typedef shared_ptr<read_context> 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 <guillermo.e.martinez@oracle.com>
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" <libabigail@sourceware.org>
Date: Thu, 18 Nov 2021 17:23:29 -0600
Subject: [PATCH] ctf-reader: Make create_read_context return a smart pointer.
* 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 <guillermo.e.martinez@oracle.com>
Signed-off-by: Dodji Seketeli <dodji@redhat.com>
---
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
{
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> 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);
+corpus_sptr
+read_corpus(const read_context_sptr &ctxt, elf_reader::status &status);
} // end namespace ctf_reader
} // end namespace abigail
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.
-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;
}
/// 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;
}
+/// 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
- = abigail::ctf_reader::create_read_context (opts.file1,
- env.get());
+ abigail::ctf_reader::read_context_sptr ctxt
+ = abigail::ctf_reader::create_read_context(opts.file1,
+ env.get());
assert (ctxt);
- c1 = abigail::ctf_reader::read_corpus (ctxt, c1_status);
+ c1 = 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
- = abigail::ctf_reader::create_read_context (opts.file2,
- env.get());
+ abigail::ctf_reader::read_context_sptr ctxt
+ = abigail::ctf_reader::create_read_context(opts.file2,
+ env.get());
assert (ctxt);
- c2 = abigail::ctf_reader::read_corpus (ctxt, c2_status);
+ c2 = 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
= abigail::ctf_reader::create_read_context (opts.in_file_path,
env.get());
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
- = abigail::ctf_reader::create_read_context (opts.file_path,
- env.get());
+ abigail::ctf_reader::read_context_sptr ctxt
+ = abigail::ctf_reader::create_read_context(opts.file_path,
+ env.get());
assert (ctxt);
- corp = abigail::ctf_reader::read_corpus (ctxt, s);
+ corp = abigail::ctf_reader::read_corpus (ctxt.get(), s);
}
else
#endif
--
2.33.1
--
Dodji
next prev parent reply other threads:[~2021-11-23 14:35 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 2:56 [PATCH 0/3] Some improvements in ctf-reader Guillermo E. Martinez
2021-11-18 2:56 ` [PATCH 1/3] ctf-reader: Use argument by reference reading the context Guillermo E. Martinez
2021-11-18 17:26 ` Dodji Seketeli
2021-11-18 23:09 ` Guillermo Martinez
2021-11-18 23:23 ` [PATCH v2 0/3] Some improvements in ctf-reader Guillermo E. Martinez
2021-11-18 23:23 ` [PATCH 1/3] ctf-reader: Use argument by reference reading the context Guillermo E. Martinez
2021-11-23 14:26 ` Dodji Seketeli
2021-11-18 23:23 ` [PATCH 2/3] ctf-reader: Use smart pointers in create_read_context Guillermo E. Martinez
2021-11-23 14:35 ` Dodji Seketeli [this message]
2021-11-23 15:42 ` Guillermo Martinez
2021-11-18 23:23 ` [PATCH 3/3] ctf-reader: Use ABG_ASSERT instead of assert Guillermo E. Martinez
2021-11-23 14:51 ` Dodji Seketeli
2021-11-18 3:01 [PATCH 0/3] Some improvements in ctf-reader Guillermo E. Martinez
2021-11-18 3:01 ` [PATCH 2/3] ctf-reader: Use smart pointers in create_read_context Guillermo E. Martinez
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r1b7szw4.fsf@seketeli.org \
--to=dodji@seketeli.org \
--cc=libabigail@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).