From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 18/38] Change dwp_file to use htab_up
Date: Thu, 23 Jan 2020 00:57:00 -0000 [thread overview]
Message-ID: <20200123005710.7978-19-tom@tromey.com> (raw)
In-Reply-To: <20200123005710.7978-1-tom@tromey.com>
This changes dwp_file to use htab_up for the loaded_cus and loaded_tus
members. This lets us avoid allocating the contents of these hash
tables on the objfile obstack.
gdb/ChangeLog
2020-01-22 Tom Tromey <tom@tromey.com>
* dwarf2/read.c (struct dwp_file) <loaded_cus, loaded_tus>: Now
htab_up.
(lookup_dwo_unit_in_dwp): Update.
(allocate_dwp_loaded_cutus_table): Return htab_up. Don't allocate
on obstack.
Change-Id: Id61209bf5c6c6faa0c067195af31fbcf26813a3a
---
gdb/ChangeLog | 8 ++++++++
gdb/dwarf2/read.c | 21 +++++++++------------
2 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 2f87b9d2a50..5becbd5ef9b 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -868,8 +868,8 @@ struct dwp_file
const struct dwp_hash_table *tus = nullptr;
/* Tables of loaded CUs/TUs. Each entry is a struct dwo_unit *. */
- htab_t loaded_cus {};
- htab_t loaded_tus {};
+ htab_up loaded_cus;
+ htab_up loaded_tus;
/* Table to map ELF section numbers to their sections.
This is only needed for the DWP V1 file format. */
@@ -12395,8 +12395,8 @@ lookup_dwo_unit_in_dwp (struct dwarf2_per_objfile *dwarf2_per_objfile,
memset (&find_dwo_cu, 0, sizeof (find_dwo_cu));
find_dwo_cu.signature = signature;
slot = htab_find_slot (is_debug_types
- ? dwp_file->loaded_tus
- : dwp_file->loaded_cus,
+ ? dwp_file->loaded_tus.get ()
+ : dwp_file->loaded_cus.get (),
&find_dwo_cu, INSERT);
if (*slot != NULL)
@@ -12767,16 +12767,13 @@ eq_dwp_loaded_cutus (const void *a, const void *b)
/* Allocate a hash table for dwp_file loaded CUs/TUs. */
-static htab_t
+static htab_up
allocate_dwp_loaded_cutus_table (struct objfile *objfile)
{
- return htab_create_alloc_ex (3,
- hash_dwp_loaded_cutus,
- eq_dwp_loaded_cutus,
- NULL,
- &objfile->objfile_obstack,
- hashtab_obstack_allocate,
- dummy_obstack_deallocate);
+ return htab_up (htab_create_alloc (3,
+ hash_dwp_loaded_cutus,
+ eq_dwp_loaded_cutus,
+ NULL, xcalloc, xfree));
}
/* Try to open DWP file FILE_NAME.
--
2.17.2
next prev parent reply other threads:[~2020-01-23 0:57 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-23 0:57 [PATCH 00/38] Start reorganization of DWARF code Tom Tromey
2020-01-23 0:57 ` [PATCH 30/38] Unify read_initial_length implementations Tom Tromey
2020-01-27 13:31 ` Christian Biesinger via gdb-patches
2020-01-28 0:54 ` Tom Tromey
2020-01-23 0:57 ` [PATCH 20/38] Minor cleanups in abbrev_table Tom Tromey
2020-01-23 0:57 ` [PATCH 17/38] Don't allocate DWO file hash on obstack Tom Tromey
2020-01-23 0:57 ` [PATCH 24/38] Move dwarf_always_disassemble to dwarf2/loc.c Tom Tromey
2020-01-23 0:57 ` [PATCH 09/38] Don't declare die_info in dwarf2read.h Tom Tromey
2020-01-23 0:57 ` Tom Tromey [this message]
2020-01-23 0:57 ` [PATCH 25/38] Change file_full_name and file_file_name methods Tom Tromey
2020-01-27 13:31 ` Christian Biesinger via gdb-patches
2020-01-23 0:57 ` [PATCH 14/38] Change dwarf2_per_objfile::signatured_types to be htab_up Tom Tromey
2020-02-08 16:55 ` Simon Marchi
2020-01-23 0:57 ` [PATCH 28/38] Move dwarf2_per_cu_data::imported_symtabs earlier Tom Tromey
2020-01-23 0:57 ` [PATCH 10/38] Remove die_reader_specs::comp_dir Tom Tromey
2020-01-23 0:57 ` [PATCH 12/38] Introduce die_info::has_children Tom Tromey
2020-01-23 0:57 ` [PATCH 04/38] Create dwarf2/abbrev.[ch] Tom Tromey
2020-01-23 0:57 ` [PATCH 33/38] Create dwarf2/comp-unit.[ch] Tom Tromey
2020-01-23 0:57 ` [PATCH 23/38] Change dwarf2_per_objfile::quick_file_names_table to htab_up Tom Tromey
2020-01-23 0:57 ` [PATCH 15/38] Change dwarf2_per_objfile::type_unit_groups " Tom Tromey
2020-01-23 0:57 ` [PATCH 36/38] Move two more functions to dwarf2/leb.h Tom Tromey
2020-01-23 0:57 ` [PATCH 34/38] Convert read_offset to method on comp_unit_head Tom Tromey
2020-01-23 0:57 ` [PATCH 21/38] Use htab_up in abbrev_table Tom Tromey
2020-01-23 0:57 ` [PATCH 02/38] Create dwarf2/section.[ch] Tom Tromey
2020-01-23 0:57 ` [PATCH 11/38] Move DWARF code to dwarf2/ subdirectory Tom Tromey
2020-01-27 13:41 ` Christian Biesinger via gdb-patches
2020-01-28 3:12 ` Tom Tromey
2020-01-23 0:57 ` [PATCH 06/38] Change some attribute functions to be methods Tom Tromey
2020-01-23 0:57 ` [PATCH 26/38] Change line_table methods to return unique_xmalloc_ptr Tom Tromey
2020-01-23 0:57 ` [PATCH 01/38] Create dwarf2/leb.[ch] Tom Tromey
2020-01-23 0:57 ` [PATCH 08/38] Remove die_info_ptr typedef Tom Tromey
2020-01-23 0:57 ` [PATCH 19/38] Change dwarf2_per_objfile::die_type_hash to htab_up Tom Tromey
2020-01-23 0:57 ` [PATCH 31/38] Convert dwarf2_section_size to a method Tom Tromey
2020-01-23 0:57 ` [PATCH 16/38] Change dwarf2_per_objfile::line_header_hash to htab_up Tom Tromey
2020-01-23 0:57 ` [PATCH 07/38] Change attr_form_is_block to be a method Tom Tromey
2020-01-23 0:57 ` [PATCH 35/38] Convert read_address to a method on comp_unit_head Tom Tromey
2020-01-23 0:57 ` [PATCH 13/38] Remove DWARF queue-related globals Tom Tromey
2020-01-23 0:57 ` [PATCH 22/38] Minor simplification in abbrev_table::read Tom Tromey
2020-01-23 0:57 ` [PATCH 32/38] Move read_offset_1 to leb.c Tom Tromey
2020-01-23 0:57 ` [PATCH 38/38] Remove "keep" parameter from cutu_reader constructor Tom Tromey
2020-02-08 17:36 ` Simon Marchi
2020-01-23 0:57 ` [PATCH 05/38] Create dwarf2/attribute.[ch] Tom Tromey
2020-01-23 0:57 ` [PATCH 27/38] Move DWARF line_header to new file Tom Tromey
2020-01-23 1:12 ` [PATCH 03/38] Change section functions to be methods of dwarf2_section_info Tom Tromey
2020-01-23 1:21 ` [PATCH 29/38] Add some methods to dwarf2_per_cu_data Tom Tromey
2020-01-23 2:34 ` [PATCH 37/38] Simplify "want_partial_unit" handling Tom Tromey
2020-02-08 17:38 ` [PATCH 00/38] Start reorganization of DWARF code Simon Marchi
2020-02-08 20:45 ` 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=20200123005710.7978-19-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@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).