From: Luis Machado <luis.machado@linaro.org>
To: Tom Tromey <tom@tromey.com>, gdb-patches@sourceware.org
Subject: Re: [PATCH 07/14] Add dwarf2_per_cu_data::index
Date: Tue, 18 Feb 2020 11:39:00 -0000 [thread overview]
Message-ID: <467b34b2-5fea-95a0-6557-b08e64338bd0@linaro.org> (raw)
In-Reply-To: <20200215165444.32653-8-tom@tromey.com>
On 2/15/20 1:54 PM, Tom Tromey wrote:
> Currently a dwarf2_per_cu_data can hold a link to the corresponding
> compunit_symtab. However, once these objects are shared across
> objfiles, a simple pointer won't work.
>
> Instead, this link will be stored in the dwarf2_unshareable object.
> To enable this, we add an index to each dwarf2_per_cu_data and
> signatured_type.
>
> 2020-02-15 Tom Tromey <tom@tromey.com>
>
> * dwarf2/read.h (struct dwarf2_per_objfile) <allocate_per_cu,
> allocate_signatured_type>: Declare new methods.
> (struct dwarf2_per_cu_data) <index>: New member.
> (struct dwarf2_per_objfile) <num_psymtabs>: New member.
> * dwarf2/read.c (dwarf2_per_objfile::allocate_per_cu)
> (dwarf2_per_objfile::allocate_signatured_type): New methods.
> (create_cu_from_index_list): Use allocate_per_cu.
> (create_signatured_type_table_from_index)
> (create_signatured_type_table_from_debug_names)
> (create_debug_type_hash_table, add_type_unit)
> (read_comp_units_from_section): Use allocate_signatured_type.
> ---
> gdb/ChangeLog | 14 +++++++++++++
> gdb/dwarf2/read.c | 52 +++++++++++++++++++++++++++--------------------
> gdb/dwarf2/read.h | 18 ++++++++++++++++
> 3 files changed, 62 insertions(+), 22 deletions(-)
>
> diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
> index cb04eb19beb..281d39ad271 100644
> --- a/gdb/dwarf2/read.c
> +++ b/gdb/dwarf2/read.c
> @@ -2415,18 +2415,36 @@ dwarf2_per_objfile::get_tu (int index)
> return this->all_type_units[index];
> }
>
> +/* See read.h. */
> +
> +dwarf2_per_cu_data *
> +dwarf2_per_objfile::allocate_per_cu ()
> +{
> + dwarf2_per_cu_data *result = OBSTACK_ZALLOC (&obstack, dwarf2_per_cu_data);
> + result->index = num_psymtabs++;
> + return result;
> +}
> +
> +/* See read.h. */
> +
> +signatured_type *
> +dwarf2_per_objfile::allocate_signatured_type ()
> +{
> + signatured_type *result = OBSTACK_ZALLOC (&obstack, signatured_type);
> + result->per_cu.index = num_psymtabs++;
> + return result;
> +}
> +
> /* Return a new dwarf2_per_cu_data allocated on the dwarf2_per_objfile
> obstack, and constructed with the specified field values. */
>
> static dwarf2_per_cu_data *
> create_cu_from_index_list (struct dwarf2_per_objfile *dwarf2_per_objfile,
> - struct dwarf2_section_info *section,
> - int is_dwz,
> - sect_offset sect_off, ULONGEST length)
> + struct dwarf2_section_info *section,
> + int is_dwz,
> + sect_offset sect_off, ULONGEST length)
Did only formatting change above?
> {
> - dwarf2_per_cu_data *the_cu
> - = OBSTACK_ZALLOC (&dwarf2_per_objfile->obstack,
> - struct dwarf2_per_cu_data);
> + dwarf2_per_cu_data *the_cu = dwarf2_per_objfile->allocate_per_cu ();
> the_cu->sect_off = sect_off;
> the_cu->length = length;
> the_cu->dwarf2_per_objfile = dwarf2_per_objfile;
> @@ -2517,8 +2535,7 @@ create_signatured_type_table_from_index
> signature = extract_unsigned_integer (bytes + 16, 8, BFD_ENDIAN_LITTLE);
> bytes += 3 * 8;
>
> - sig_type = OBSTACK_ZALLOC (&dwarf2_per_objfile->obstack,
> - struct signatured_type);
> + sig_type = dwarf2_per_objfile->allocate_signatured_type ();
> sig_type->signature = signature;
> sig_type->type_offset_in_tu = type_offset_in_tu;
> sig_type->per_cu.is_debug_types = 1;
> @@ -2574,8 +2591,7 @@ create_signatured_type_table_from_debug_names
> section->buffer + to_underlying (sect_off),
> rcuh_kind::TYPE);
>
> - sig_type = OBSTACK_ZALLOC (&dwarf2_per_objfile->obstack,
> - struct signatured_type);
> + sig_type = dwarf2_per_objfile->allocate_signatured_type ();
> sig_type->signature = cu_header.signature;
> sig_type->type_offset_in_tu = cu_header.type_cu_offset_in_tu;
> sig_type->per_cu.is_debug_types = 1;
> @@ -6091,8 +6107,7 @@ create_debug_type_hash_table (struct dwarf2_per_objfile *dwarf2_per_objfile,
> /* N.B.: type_offset is not usable if this type uses a DWO file.
> The real type_offset is in the DWO file. */
> dwo_tu = NULL;
> - sig_type = OBSTACK_ZALLOC (&dwarf2_per_objfile->obstack,
> - struct signatured_type);
> + sig_type = dwarf2_per_objfile->allocate_signatured_type ();
> sig_type->signature = header.signature;
> sig_type->type_offset_in_tu = header.type_cu_offset_in_tu;
> sig_type->per_cu.dwarf2_per_objfile = dwarf2_per_objfile;
> @@ -6207,8 +6222,7 @@ add_type_unit (struct dwarf2_per_objfile *dwarf2_per_objfile, ULONGEST sig,
> == dwarf2_per_objfile->all_type_units.capacity ())
> ++dwarf2_per_objfile->tu_stats.nr_all_type_units_reallocs;
>
> - signatured_type *sig_type = OBSTACK_ZALLOC (&dwarf2_per_objfile->obstack,
> - struct signatured_type);
> + signatured_type *sig_type = dwarf2_per_objfile->allocate_signatured_type ();
>
> dwarf2_per_objfile->all_type_units.push_back (sig_type);
> sig_type->signature = sig;
> @@ -7835,16 +7849,10 @@ read_comp_units_from_section (struct dwarf2_per_objfile *dwarf2_per_objfile,
>
> /* Save the compilation unit for later lookup. */
> if (cu_header.unit_type != DW_UT_type)
> - {
> - this_cu = XOBNEW (&dwarf2_per_objfile->obstack,
> - struct dwarf2_per_cu_data);
> - memset (this_cu, 0, sizeof (*this_cu));
> - }
> + this_cu = dwarf2_per_objfile->allocate_per_cu ();
> else
> {
> - auto sig_type = XOBNEW (&dwarf2_per_objfile->obstack,
> - struct signatured_type);
> - memset (sig_type, 0, sizeof (*sig_type));
> + auto sig_type = dwarf2_per_objfile->allocate_signatured_type ();
> sig_type->signature = cu_header.signature;
> sig_type->type_offset_in_tu = cu_header.type_cu_offset_in_tu;
> this_cu = &sig_type->per_cu;
> diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
> index 06a0fa3a19a..5fc7f7f72e5 100644
> --- a/gdb/dwarf2/read.h
> +++ b/gdb/dwarf2/read.h
> @@ -128,6 +128,17 @@ struct dwarf2_per_objfile
>
> /* Free all cached compilation units. */
> void free_cached_comp_units ();
> +
> + /* A convenience function to allocate a dwarf2_per_cu_data (or
> + object holding one, using C-style derivation). The returned
> + object has its "index" field set properly. The object is
> + allocated on the dwarf2_per_objfile obstack. FIXME the index
> + here is weird since it may not (!?!?) be the same as the other
> + index */
I'm a bit lost on the above comment. Instead of having a FIXME here, is
there something we can do better at this point? Or maybe it will be
addressed later in the series?
I couldn't quite understand the problems with the indexes, but you're
more familiar with the DWARF reading code than i am.
> + dwarf2_per_cu_data *allocate_per_cu ();
> +
> + signatured_type *allocate_signatured_type ();
> +
> private:
> /* This function is mapped across the sections and remembers the
> offset and size of each of the debugging sections we are
> @@ -255,6 +266,10 @@ public:
> /* CUs that are queued to be read. */
> std::queue<dwarf2_queue_item> queue;
>
> + /* The total number of per_cu and signatured_type objects that have
> + been created for this reader. */
> + size_t num_psymtabs = 0;
> +
> /* State that cannot be shared across objfiles. This is normally
> nullptr and is temporarily set to the correct value at the entry
> points of the reader. */
> @@ -336,6 +351,9 @@ struct dwarf2_per_cu_data
> This flag is only valid if is_debug_types is true. */
> unsigned int tu_read : 1;
>
> + /* Our index in the unshared "all_cutus" vector. */
> + unsigned index;
> +
What is the all_cutus vector? I don't see it being added later in the
series. Should we make it more clear? Maybe you meant "all CU's/TU's"?
> /* The section this CU/TU lives in.
> If the DIE refers to a DWO file, this is always the original die,
> not the DWO file. */
>
next prev parent reply other threads:[~2020-02-18 11:39 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-15 16:54 [PATCH 00/14] Share DWARF partial symtabs between objfiles Tom Tromey
2020-02-15 16:55 ` [PATCH 12/14] Fix a memory leak and remove an unused member Tom Tromey
2020-02-15 16:55 ` [PATCH 02/14] Simplify setting of reading_partial_symbols Tom Tromey
2020-02-15 16:55 ` [PATCH 14/14] Share DWARF partial symtabs Tom Tromey
2020-02-18 12:26 ` Luis Machado
2020-02-21 23:03 ` Tom Tromey
2020-02-15 16:55 ` [PATCH 05/14] Introduce dwarf2_unshareable and move die_type_hash Tom Tromey
2020-02-18 11:23 ` Luis Machado
2020-02-19 4:20 ` Simon Marchi
2020-02-21 22:43 ` Tom Tromey
2020-02-15 16:55 ` [PATCH 11/14] Split type_unit_group Tom Tromey
2020-02-18 12:08 ` Luis Machado
2020-02-22 0:40 ` Tom Tromey
2020-02-15 16:55 ` [PATCH 03/14] Introduce dwarf2_per_objfile::obstack Tom Tromey
2020-02-19 4:13 ` Simon Marchi
2020-02-22 0:44 ` Tom Tromey
2020-02-15 16:55 ` [PATCH 10/14] Introduce dwarf2_enter_objfile and use it Tom Tromey
2020-02-18 11:58 ` Luis Machado
2020-02-21 22:54 ` Tom Tromey
2020-02-15 16:55 ` [PATCH 06/14] Add "objfile" parameter to two partial_symtab methods Tom Tromey
2020-02-18 11:26 ` Luis Machado
2020-02-15 16:55 ` [PATCH 07/14] Add dwarf2_per_cu_data::index Tom Tromey
2020-02-18 11:39 ` Luis Machado [this message]
2020-02-21 23:36 ` Tom Tromey
2020-02-19 4:36 ` Simon Marchi
2020-02-19 5:31 ` Simon Marchi
2020-02-21 23:41 ` Tom Tromey
2020-02-21 23:41 ` Tom Tromey
2020-02-15 16:55 ` [PATCH 08/14] Remove symtab links from dwarf2_psymtab and dwarf2_per_cu_quick_data Tom Tromey
2020-02-18 11:50 ` Luis Machado
2020-02-19 4:47 ` Simon Marchi
2020-02-22 0:38 ` Tom Tromey
2020-02-22 0:36 ` Tom Tromey
2020-02-15 16:55 ` [PATCH 04/14] Convert IS_TYPE_UNIT_GROUP to method Tom Tromey
2020-02-15 16:55 ` [PATCH 09/14] Add objfile member to DWARF batons Tom Tromey
2020-02-15 16:55 ` [PATCH 13/14] Move signatured_type::type to unshareable object Tom Tromey
2020-02-15 16:55 ` [PATCH 01/14] Fix latent bug in dwarf2_find_containing_comp_unit Tom Tromey
2020-02-19 3:42 ` Simon Marchi
2020-02-19 14:08 ` Tom Tromey
2020-02-20 0:11 ` Tom Tromey
2020-02-20 0:12 ` Tom Tromey
[not found] ` <3a3f1f39-c715-58ba-06a8-2980afb82c53@simark.ca>
2020-02-20 16:50 ` Tom Tromey
2020-03-07 19:12 ` Christian Biesinger
2020-02-17 12:31 ` [PATCH 00/14] Share DWARF partial symtabs between objfiles Luis Machado
2020-02-17 16:59 ` Tom Tromey
2020-02-22 21:50 ` Tom de Vries
2020-02-22 22:01 ` Tom Tromey
2020-02-23 2:37 ` Simon Marchi
2020-02-23 23:58 ` Tom Tromey
2020-02-24 2:52 ` Simon Marchi
2020-02-24 3:07 ` Tom Tromey
2020-02-24 3:22 ` Tom Tromey
2020-02-24 13:42 ` Tom de Vries
2020-02-24 16:00 ` Tom de Vries
2020-02-24 17:29 ` Tom Tromey
2020-02-24 23:15 ` Tom Tromey
2020-02-24 19:18 ` Simon Marchi
2020-02-24 23:20 ` Tom Tromey
2020-02-24 22:48 ` Tom Tromey
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=467b34b2-5fea-95a0-6557-b08e64338bd0@linaro.org \
--to=luis.machado@linaro.org \
--cc=gdb-patches@sourceware.org \
--cc=tom@tromey.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