From: Dodji Seketeli <dodji@seketeli.org>
To: Matthias Maennich <maennich@google.com>
Cc: libabigail@sourceware.org, gprocida@google.com,
kernel-team@android.com
Subject: Re: [PATCH 14/20] abg-corpus: remove symbol maps and their setters
Date: Tue, 16 Mar 2021 19:08:12 +0100 [thread overview]
Message-ID: <87ft0vx983.fsf@seketeli.org> (raw)
In-Reply-To: <20210127125853.886677-15-maennich@google.com> (Matthias Maennich's message of "Wed, 27 Jan 2021 12:58:47 +0000")
Hello,
Matthias Maennich <maennich@google.com> a écrit:
[...]
> diff --git a/src/abg-corpus.cc b/src/abg-corpus.cc
> index f9f51a360707..94615bc727ff 100644
> --- a/src/abg-corpus.cc
> +++ b/src/abg-corpus.cc
> @@ -331,6 +331,18 @@ corpus::priv::get_sorted_fun_symbols() const
> return *sorted_fun_symbols;
> }
>
> +const string_elf_symbols_map_type&
> +corpus::priv::get_fun_symbol_map() const
Please add a comment for this function.
> +{
> + if (!fun_symbol_map)
> + {
> + fun_symbol_map = string_elf_symbols_map_type();
> + for (const auto& symbol : get_sorted_fun_symbols())
> + (*fun_symbol_map)[symbol->get_name()].push_back(symbol);
> + }
> + return *fun_symbol_map;
> +}
> +
[...]
> +const string_elf_symbols_map_type&
> +corpus::priv::get_undefined_fun_symbol_map() const
Likewise.
> +{
> + if (!undefined_fun_symbol_map)
> + {
> + undefined_fun_symbol_map = string_elf_symbols_map_type();
> + for (const auto& symbol : get_sorted_undefined_fun_symbols())
> + (*undefined_fun_symbol_map)[symbol->get_name()].push_back(symbol);
> + }
> + return *undefined_fun_symbol_map;
> +}
> +
> /// Return a list of symbols that are not referenced by any function of
> /// corpus::get_functions().
> ///
> @@ -425,6 +449,18 @@ corpus::priv::get_sorted_var_symbols() const
> return *sorted_var_symbols;
> }
>
> +const string_elf_symbols_map_type&
> +corpus::priv::get_var_symbol_map() const
Likewise.
> +{
> + if (!var_symbol_map)
> + {
> + var_symbol_map = string_elf_symbols_map_type();
> + for (const auto& symbol : get_sorted_var_symbols())
> + (*var_symbol_map)[symbol->get_name()].push_back(symbol);
> + }
> + return *var_symbol_map;
> +}
> +
> /// Getter for a sorted vector of the variable symbols undefined in
> /// this corpus.
> ///
> @@ -446,6 +482,18 @@ corpus::priv::get_sorted_undefined_var_symbols() const
> return *sorted_undefined_var_symbols;
> }
>
> +const string_elf_symbols_map_type&
> +corpus::priv::get_undefined_var_symbol_map() const
Likewise.
> +{
> + if (!undefined_var_symbol_map)
> + {
> + undefined_var_symbol_map = string_elf_symbols_map_type();
> + for (const auto& symbol : get_sorted_undefined_var_symbols())
> + (*undefined_var_symbol_map)[symbol->get_name()].push_back(symbol);
> + }
> + return *undefined_var_symbol_map;
> +}
> +
[...]
> With the prework in previous commits, we are now able to drop the
> public symbols maps in corpus::priv and replace them by private members
> with access through getters. The getters use the new symtab
> implementation to generate the maps on the fly. Setters are not required
> anymore and are removed. Also remove redundant getters.
>
> We could also remove the getters for the symbol maps and the local
> caching variable and leave it all to lookup_symbol, but this is left for
> a later change.
>
> * include/abg-corpus.h (corpus::set_fun_symbol_map): Remove
> method declaration.
> (corpus::set_undefined_fun_symbol_map): Likewise.
> (corpus::set_var_symbol_map): Likewise.
> (corpus::set_undefined_var_symbol_map): Likewise.
> (corpus::get_fun_symbol_map_sptr): Likewise.
> (corpus::get_undefined_fun_symbol_map_sptr): Likewise.
> (corpus::get_var_symbol_map_sptr): Likewise.
> (corpus::get_undefined_var_symbol_map_sptr): Likewise.
> * src/abg-corpus-priv.h (corpus::priv::var_symbol_map): make
> private and mutable
> (corpus::priv::undefined_var_symbol_map): Likewise.
> (corpus::priv::fun_symbol_map): Likewise.
> (corpus::priv::undefined_fun_symbol_map): Likewise.
> (corpus::priv::get_fun_symbol_map): New method declaration.
> (corpus::priv::get_undefined_fun_symbol_map): Likewise.
> (corpus::priv::get_var_symbol_map): Likewise.
> (corpus::priv::get_undefined_var_symbol_map): Likewise.
> * src/abg-corpus.cc (corpus::priv::get_fun_symbol_map): New
> method implementation.
> (corpus::priv::get_undefined_fun_symbol_map): Likewise.
> (corpus::priv::get_var_symbol_map): Likewise.
> (corpus::priv::get_undefined_var_symbol_map): Likewise.
> (corpus::is_empty): depend on symtab only.
> (corpus::set_fun_symbol_map): Remove method.
> (corpus::set_undefined_fun_symbol_map): Likewise.
> (corpus::set_var_symbol_map): Likewise.
> (corpus::set_undefined_var_symbol_map): Likewise.
> (corpus::get_fun_symbol_map_sptr): Likewise.
> (corpus::get_undefined_fun_symbol_map_sptr): Likewise.
> (corpus::get_var_symbol_map_sptr): Likewise.
> (corpus::get_undefined_var_symbol_map_sptr): Likewise.
> (corpus::get_fun_symbol_map): Use corpus::priv proxy method.
> (corpus::get_undefined_fun_symbol_map): Likewise.
> (corpus::get_var_symbol_map): Likewise.
> (corpus::get_undefined_var_symbol_map): Likewise.
> * src/abg-dwarf-reader.cc (read_debug_info_into_corpus): Do not
> set corpus symbol maps anymore.
> * src/abg-reader.cc (read_corpus_from_input): Likewise.
> * tests/test-symtab.cc (assert_symbol_count): Do not access the
> corpus symbol maps through sptr anymore.
> * tests/data/test-read-dwarf/PR25007-sdhci.ko.abi: Adjust
> expected test output.
>
> Reviewed-by: Giuliano Procida <gprocida@google.com>
> Signed-off-by: Matthias Maennich <maennich@google.com>
OK to apply to master with the changes above once the prerequisite
patches have been applied.
Thanks!
[...]
Cheers,
--
Dodji
next prev parent reply other threads:[~2021-03-16 18:08 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-19 21:42 [PATCH v1 00/16] Refactor (k)symtab reader Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 01/16] abg-cxx-compat: add simplified version of std::optional Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 02/16] abg-cxx-compat: more <functional> support: std::bind and friends Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 03/16] abg-ir: elf_symbol: add is_in_ksymtab field Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 04/16] abg-ir: elf_symbol: add is_suppressed field Matthias Maennich
2020-06-22 9:46 ` Giuliano Procida
2020-06-19 21:42 ` [PATCH v1 05/16] dwarf-reader split: create abg-symtab-reader.{h, cc} and test case Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 06/16] Refactor ELF symbol table reading by adding a new symtab reader Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 07/16] Integrate new symtab reader into corpus and read_context Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 08/16] corpus: make get_(undefined_)?_(var|fun)_symbols use the new symtab Matthias Maennich
2020-06-22 9:53 ` Giuliano Procida
2020-06-19 21:42 ` [PATCH v1 09/16] corpus: make get_unreferenced_(function|variable)_symbols " Matthias Maennich
2020-06-19 21:42 ` [PATCH v1 10/16] abg-reader: avoid using the (var|function)_symbol_map Matthias Maennich
2020-06-19 21:43 ` [PATCH v1 11/16] dwarf-reader: read_context: use new symtab in *_symbols_is_exported Matthias Maennich
2020-06-19 21:43 ` [PATCH v1 12/16] Switch kernel stuff over to new symtab and drop unused code Matthias Maennich
2020-06-19 21:43 ` [PATCH v1 13/16] abg-elf-helpers: migrate ppc64 specific helpers Matthias Maennich
2020-06-19 21:43 ` [PATCH v1 14/16] symtab_reader: add support for ppc64 ELFv1 binaries Matthias Maennich
2020-06-19 21:43 ` [PATCH v1 15/16] abg-corpus: remove symbol maps and their setters Matthias Maennich
2020-06-19 21:43 ` [PATCH v1 16/16] dwarf reader: drop (now) unused code related symbol table reading Matthias Maennich
2020-06-22 9:56 ` Giuliano Procida
2020-07-03 16:46 ` [PATCH v2 00/21] Refactor (k)symtab reader Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 01/21] abg-cxx-compat: add simplified version of std::optional Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 02/21] abg-cxx-compat: more <functional> support: std::bind and friends Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 03/21] abg-ir: elf_symbol: add is_in_ksymtab field Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 04/21] abg-ir: elf_symbol: add is_suppressed field Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 05/21] dwarf-reader split: create abg-symtab-reader.{h, cc} and test case Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 06/21] Refactor ELF symbol table reading by adding a new symtab reader Matthias Maennich
2020-07-20 15:39 ` Dodji Seketeli
2020-07-03 16:46 ` [PATCH v2 07/21] Integrate new symtab reader into corpus and read_context Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 08/21] corpus: make get_(undefined_)?_(var|fun)_symbols use the new symtab Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 09/21] corpus: make get_unreferenced_(function|variable)_symbols " Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 10/21] abg-reader: avoid using the (var|function)_symbol_map Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 11/21] dwarf-reader: read_context: use new symtab in *_symbols_is_exported Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 12/21] Switch kernel stuff over to new symtab and drop unused code Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 13/21] abg-elf-helpers: migrate ppc64 specific helpers Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 14/21] symtab_reader: add support for ppc64 ELFv1 binaries Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 15/21] abg-corpus: remove symbol maps and their setters Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 16/21] dwarf reader: drop now-unused code related to symbol table reading Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 17/21] test-symtab: add tests for whitelisted functions Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 18/21] symtab/dwarf-reader: allow hinting of main symbols for aliases Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 19/21] dwarf-reader/writer: consider aliases when dealing with suppressions Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 20/21] symtab: Add support for MODVERSIONS (CRC checksums) Matthias Maennich
2020-07-03 16:46 ` [PATCH v2 21/21] reader/symtab: Improve handling for suppressed aliases Matthias Maennich
2020-07-20 14:27 ` [PATCH v2 00/21] Refactor (k)symtab reader Dodji Seketeli
2021-01-27 12:58 ` [PATCH 00/20] " Matthias Maennich
2021-01-27 12:58 ` [PATCH 01/20] abg-cxx-compat: add simplified version of std::optional Matthias Maennich
2021-03-09 9:43 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 02/20] abg-ir: elf_symbol: add is_in_ksymtab field Matthias Maennich
2021-03-09 14:05 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 03/20] abg-ir: elf_symbol: add is_suppressed field Matthias Maennich
2021-03-09 18:03 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 04/20] dwarf-reader split: create abg-symtab-reader.{h, cc} and test case Matthias Maennich
2021-03-10 18:00 ` [PATCH 04/20] dwarf-reader split: create abg-symtab-reader.{h,cc} " Dodji Seketeli
2021-01-27 12:58 ` [PATCH 05/20] Refactor ELF symbol table reading by adding a new symtab reader Matthias Maennich
2021-03-12 11:18 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 06/20] Integrate new symtab reader into corpus and read_context Matthias Maennich
2021-03-12 15:04 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 07/20] corpus: make get_(undefined_)?_(var|fun)_symbols use the new symtab Matthias Maennich
2021-03-15 10:05 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 08/20] corpus: make get_unreferenced_(function|variable)_symbols " Matthias Maennich
2021-03-15 12:06 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 09/20] abg-reader: avoid using the (var|function)_symbol_map Matthias Maennich
2021-03-15 14:23 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 10/20] dwarf-reader: read_context: use new symtab in *_symbols_is_exported Matthias Maennich
2021-03-15 18:13 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 11/20] Switch kernel stuff over to new symtab and drop unused code Matthias Maennich
2021-03-16 10:38 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 12/20] abg-elf-helpers: migrate ppc64 specific helpers Matthias Maennich
2021-03-16 10:59 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 13/20] symtab_reader: add support for ppc64 ELFv1 binaries Matthias Maennich
2021-03-16 11:39 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 14/20] abg-corpus: remove symbol maps and their setters Matthias Maennich
2021-03-16 18:08 ` Dodji Seketeli [this message]
2021-01-27 12:58 ` [PATCH 15/20] dwarf reader: drop (now) unused code related to symbol table reading Matthias Maennich
2021-03-16 18:42 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 16/20] test-symtab: add tests for whitelisted functions Matthias Maennich
2021-03-17 11:07 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 17/20] symtab/dwarf-reader: allow hinting of main symbols for aliases Matthias Maennich
2021-03-17 13:40 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 18/20] dwarf-reader/writer: consider aliases when dealing with suppressions Matthias Maennich
2021-03-17 15:44 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 19/20] abg-writer.cc: fix write_elf_symbol_reference loop Matthias Maennich
2021-03-17 16:11 ` Dodji Seketeli
2021-01-27 12:58 ` [PATCH 20/20] symtab: Add support for MODVERSIONS (CRC checksums) Matthias Maennich
2021-03-17 17:13 ` Dodji Seketeli
2021-03-17 23:29 ` Giuliano Procida
2021-03-18 22:10 ` Matthias Maennich
2021-03-19 16:55 ` Dodji Seketeli
2021-03-19 18:15 ` Dodji Seketeli
2021-03-29 13:19 ` [GIT PULL] Refactor (k)symtab reader Matthias Maennich
2021-04-02 14:28 ` Dodji Seketeli
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=87ft0vx983.fsf@seketeli.org \
--to=dodji@seketeli.org \
--cc=gprocida@google.com \
--cc=kernel-team@android.com \
--cc=libabigail@sourceware.org \
--cc=maennich@google.com \
/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).