* [PATCH 0/3] Some improvements in ctf-reader.
@ 2021-11-18 3:01 Guillermo E. Martinez
2021-11-18 3:01 ` [PATCH 1/3] ctf-reader: Use argument by reference reading the context Guillermo E. Martinez
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Guillermo E. Martinez @ 2021-11-18 3:01 UTC (permalink / raw)
To: libabigail
Hello libabigail team,
These patches contains some possible improvements for
the ctf-reader.
I really appreciate your comments :-).
Kind regards,
Guillermo
Guillermo E. Martinez (3):
ctf-reader: Use argument by reference reading the context
ctf-reader: Use smart pointers in create_read_context
ctf-reader: Use ABG_ASSERT instead of assert
include/abg-ctf-reader.h | 11 +++++++----
src/abg-ctf-reader.cc | 10 ++++++----
tools/abidiff.cc | 22 ++++++++++++----------
tools/abilint.cc | 10 +++++-----
4 files changed, 30 insertions(+), 23 deletions(-)
--
2.33.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/3] ctf-reader: Use argument by reference reading the context
2021-11-18 3:01 [PATCH 0/3] Some improvements in ctf-reader Guillermo E. Martinez
@ 2021-11-18 3:01 ` Guillermo E. Martinez
2021-11-18 3:01 ` [PATCH 2/3] ctf-reader: Use smart pointers in create_read_context Guillermo E. Martinez
2021-11-18 3:01 ` [PATCH 3/3] ctf-reader: Use ABG_ASSERT instead of assert Guillermo E. Martinez
2 siblings, 0 replies; 7+ messages in thread
From: Guillermo E. Martinez @ 2021-11-18 3:01 UTC (permalink / raw)
To: libabigail
* src/abg-ctf-reader.cc (read_context): Use const argument
pass by reference.
(create_read_context): Likewise.
---
include/abg-ctf-reader.h | 8 ++++----
src/abg-ctf-reader.cc | 5 +++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/include/abg-ctf-reader.h b/include/abg-ctf-reader.h
index c0d8bb2b..56b2bf91 100644
--- a/include/abg-ctf-reader.h
+++ b/include/abg-ctf-reader.h
@@ -25,10 +25,10 @@ namespace ctf_reader
{
class read_context;
-read_context *create_read_context (std::string elf_path,
- ir::environment *env);
-corpus_sptr read_corpus (read_context *ctxt,
- elf_reader::status& status);
+read_context *create_read_context(const std::string& elf_path,
+ ir::environment *env);
+corpus_sptr read_corpus(read_context *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 0370c8aa..2c2c204d 100644
--- a/src/abg-ctf-reader.cc
+++ b/src/abg-ctf-reader.cc
@@ -102,7 +102,7 @@ public:
/// Constructor.
///
/// @param elf_path the path to the ELF file.
- read_context(string elf_path, ir::environment *env)
+ read_context(const string& elf_path, ir::environment *env)
{
types_map.clear();
filename = elf_path;
@@ -1060,7 +1060,8 @@ slurp_elf_info(read_context *ctxt, corpus_sptr corp)
/// @param env a libabigail IR environment.
read_context *
-create_read_context(std::string elf_path, ir::environment *env)
+create_read_context(const std::string& elf_path,
+ ir::environment *env)
{
return new read_context(elf_path, env);
}
--
2.33.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/3] ctf-reader: Use smart pointers in create_read_context
2021-11-18 3:01 [PATCH 0/3] Some improvements in ctf-reader Guillermo E. Martinez
2021-11-18 3:01 ` [PATCH 1/3] ctf-reader: Use argument by reference reading the context Guillermo E. Martinez
@ 2021-11-18 3:01 ` Guillermo E. Martinez
2021-11-18 3:01 ` [PATCH 3/3] ctf-reader: Use ABG_ASSERT instead of assert Guillermo E. Martinez
2 siblings, 0 replies; 7+ messages in thread
From: Guillermo E. Martinez @ 2021-11-18 3:01 UTC (permalink / raw)
To: libabigail
* include/abg-ctf-reader.h (read_context_sptr): New typedef.
(create_read_context): Use smart pointer as return value.
* src/abg-ctf-reader.cc: Likewise.
* tools/abidiff.cc (main): Use read_context_sptr.
* tools/abilint.cc: Likewise.
---
include/abg-ctf-reader.h | 7 +++++--
src/abg-ctf-reader.cc | 5 +++--
tools/abidiff.cc | 18 ++++++++++--------
tools/abilint.cc | 8 ++++----
4 files changed, 22 insertions(+), 16 deletions(-)
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);
diff --git a/src/abg-ctf-reader.cc b/src/abg-ctf-reader.cc
index 2c2c204d..3e17e049 100644
--- a/src/abg-ctf-reader.cc
+++ b/src/abg-ctf-reader.cc
@@ -1059,11 +1059,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
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/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.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 3/3] ctf-reader: Use ABG_ASSERT instead of assert
2021-11-18 3:01 [PATCH 0/3] Some improvements in ctf-reader Guillermo E. Martinez
2021-11-18 3:01 ` [PATCH 1/3] ctf-reader: Use argument by reference reading the context Guillermo E. Martinez
2021-11-18 3:01 ` [PATCH 2/3] ctf-reader: Use smart pointers in create_read_context Guillermo E. Martinez
@ 2021-11-18 3:01 ` Guillermo E. Martinez
2 siblings, 0 replies; 7+ messages in thread
From: Guillermo E. Martinez @ 2021-11-18 3:01 UTC (permalink / raw)
To: libabigail
* tools/abidiff.cc (main): Use ABG_ASSERT.
* tools/abilint.cc: Likewise.
---
tools/abidiff.cc | 4 ++--
tools/abilint.cc | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/abidiff.cc b/tools/abidiff.cc
index 30959616..7f766d16 100644
--- a/tools/abidiff.cc
+++ b/tools/abidiff.cc
@@ -1173,7 +1173,7 @@ main(int argc, char* argv[])
= abigail::ctf_reader::create_read_context(opts.file1,
env.get());
- assert (ctxt);
+ ABG_ASSERT(ctxt);
c1 = abigail::ctf_reader::read_corpus(ctxt.get(),
c1_status);
}
@@ -1257,7 +1257,7 @@ main(int argc, char* argv[])
= abigail::ctf_reader::create_read_context(opts.file2,
env.get());
- assert (ctxt);
+ ABG_ASSERT(ctxt);
c2 = abigail::ctf_reader::read_corpus (ctxt.get(),
c2_status);
}
diff --git a/tools/abilint.cc b/tools/abilint.cc
index 2e9bae49..e3e8b079 100644
--- a/tools/abilint.cc
+++ b/tools/abilint.cc
@@ -374,7 +374,7 @@ main(int argc, char* argv[])
= abigail::ctf_reader::create_read_context(opts.file_path,
env.get());
- assert (ctxt);
+ ABG_ASSERT(ctxt);
corp = abigail::ctf_reader::read_corpus (ctxt.get(), s);
}
else
--
2.33.0
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] ctf-reader: Use smart pointers in create_read_context
2021-11-23 14:35 ` Dodji Seketeli
@ 2021-11-23 15:42 ` Guillermo Martinez
0 siblings, 0 replies; 7+ messages in thread
From: Guillermo Martinez @ 2021-11-23 15:42 UTC (permalink / raw)
To: Guillermo E. Martinez via Libabigail, Dodji Seketeli
On Tuesday, November 23, 2021 8:35:55 AM CST Dodji Seketeli wrote:
> Hello Guillermo,
Hello Dodji
> "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.
Ok, I see, thanks for add it.
> 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.
Thanks,
> >
> > 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!
Great, 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
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/3] ctf-reader: Use smart pointers in create_read_context
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
2021-11-23 15:42 ` Guillermo Martinez
0 siblings, 1 reply; 7+ messages in thread
From: Dodji Seketeli @ 2021-11-23 14:35 UTC (permalink / raw)
To: Guillermo E. Martinez via Libabigail
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 2/3] ctf-reader: Use smart pointers in create_read_context
2021-11-18 23:23 ` [PATCH v2 " Guillermo E. Martinez
@ 2021-11-18 23:23 ` Guillermo E. Martinez
2021-11-23 14:35 ` Dodji Seketeli
0 siblings, 1 reply; 7+ messages in thread
From: Guillermo E. Martinez @ 2021-11-18 23:23 UTC (permalink / raw)
To: libabigail
* 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.
Signed-off-by: Guillermo E. Martinez <guillermo.e.martinez@oracle.com>
---
include/abg-ctf-reader.h | 7 +++++--
src/abg-ctf-reader.cc | 5 +++--
tools/abidiff.cc | 18 ++++++++++--------
tools/abilint.cc | 8 ++++----
4 files changed, 22 insertions(+), 16 deletions(-)
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);
diff --git a/src/abg-ctf-reader.cc b/src/abg-ctf-reader.cc
index 2c2c204d..3e17e049 100644
--- a/src/abg-ctf-reader.cc
+++ b/src/abg-ctf-reader.cc
@@ -1059,11 +1059,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
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/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.0
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-11-23 15:42 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-18 3:01 [PATCH 0/3] Some improvements in ctf-reader Guillermo E. Martinez
2021-11-18 3:01 ` [PATCH 1/3] ctf-reader: Use argument by reference reading the context Guillermo E. Martinez
2021-11-18 3:01 ` [PATCH 2/3] ctf-reader: Use smart pointers in create_read_context Guillermo E. Martinez
2021-11-18 3:01 ` [PATCH 3/3] ctf-reader: Use ABG_ASSERT instead of assert Guillermo E. Martinez
-- strict thread matches above, loose matches on Subject: below --
2021-11-18 2:56 [PATCH 0/3] Some improvements in ctf-reader Guillermo E. Martinez
2021-11-18 23:23 ` [PATCH v2 " Guillermo E. Martinez
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
2021-11-23 15:42 ` Guillermo Martinez
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).