From be1e3d3eab0af2a140463757a1ba3977167551af Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 4 Mar 2020 16:34:49 -0700 Subject: [PATCH] Introduce objfile::intern This introduces a string cache on the per-BFD object, replacing the macro and filename caches. Both of these caches just store strings, so this consolidation by itself saves a little memory (about the size of a bcache per objfile). Then this patch switches some allocations on the objfile obstack to use this bcache instead. This saves more space; and turns out to be a bit faster as well. Here are the before and after "maint time" + "maint space" results of "file ./gdb": Command execution time: 4.664021 (cpu), 4.728518 (wall) Space used: 39190528 (+29212672 for this command) Command execution time: 4.216209 (cpu), 4.107023 (wall) Space used: 36667392 (+26689536 for this command) The main interface to the string cache is a new pair of overloaded methods, objfile::intern. gdb/ChangeLog 2020-03-04 Tom Tromey * symmisc.c (print_symbol_bcache_statistics) (print_objfile_statistics): Update. * symfile.c (allocate_symtab): Use intern. * psymtab.c (partial_symtab::partial_symtab): Use intern. * objfiles.h (struct objfile_per_bfd_storage) : Remove. : New member. (struct objfile) : New methods. * elfread.c (elf_symtab_read): Use intern. * dwarf2/read.c (fixup_go_packaging): Intern package name. (dwarf2_compute_name, dwarf2_physname) (create_dwo_unit_in_dwp_v1, create_dwo_unit_in_dwp_v2): Intern names. (guess_partial_die_structure_name): Update. (partial_die_info::fixup): Intern name. (dwarf2_canonicalize_name): Change parameter to objfile. Intern name. (dwarf2_name): Intern name. Update. * buildsym.c (buildsym_compunit::get_macro_table): Use string_cache. --- gdb/ChangeLog | 23 +++++++++++++++++++++++ gdb/buildsym.c | 2 +- gdb/dwarf2/read.c | 43 ++++++++++++++++--------------------------- gdb/elfread.c | 6 +----- gdb/objfiles.h | 24 ++++++++++++++++++------ gdb/psymtab.c | 4 +--- gdb/symfile.c | 4 +--- gdb/symmisc.c | 10 +++------- 8 files changed, 64 insertions(+), 52 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a8c0027001..22e500c1b3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,26 @@ +2020-03-04 Tom Tromey + + * symmisc.c (print_symbol_bcache_statistics) + (print_objfile_statistics): Update. + * symfile.c (allocate_symtab): Use intern. + * psymtab.c (partial_symtab::partial_symtab): Use intern. + * objfiles.h (struct objfile_per_bfd_storage) : Remove. + : New member. + (struct objfile) : New methods. + * elfread.c (elf_symtab_read): Use intern. + * dwarf2/read.c (fixup_go_packaging): Intern package name. + (dwarf2_compute_name, dwarf2_physname) + (create_dwo_unit_in_dwp_v1, create_dwo_unit_in_dwp_v2): Intern + names. + (guess_partial_die_structure_name): Update. + (partial_die_info::fixup): Intern name. + (dwarf2_canonicalize_name): Change parameter to objfile. Intern + name. + (dwarf2_name): Intern name. Update. + * buildsym.c (buildsym_compunit::get_macro_table): Use + string_cache. + 2020-03-04 Tom Tromey * jit.c (bfd_open_from_target_memory): Make "target" const. diff --git a/gdb/buildsym.c b/gdb/buildsym.c index 4965b552b3..84cb44277a 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -120,7 +120,7 @@ buildsym_compunit::get_macro_table () { if (m_pending_macros == nullptr) m_pending_macros = new_macro_table (&m_objfile->per_bfd->storage_obstack, - &m_objfile->per_bfd->macro_cache, + &m_objfile->per_bfd->string_cache, m_compunit_symtab); return m_pending_macros; } diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 07cee58c1f..3556908cf5 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1447,7 +1447,7 @@ static const gdb_byte *read_full_die (const struct die_reader_specs *, static void process_die (struct die_info *, struct dwarf2_cu *); static const char *dwarf2_canonicalize_name (const char *, struct dwarf2_cu *, - struct obstack *); + struct objfile *); static const char *dwarf2_name (struct die_info *die, struct dwarf2_cu *); @@ -9098,8 +9098,7 @@ fixup_go_packaging (struct dwarf2_cu *cu) if (package_name != NULL) { struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile; - const char *saved_package_name - = obstack_strdup (&objfile->per_bfd->storage_obstack, package_name.get ()); + const char *saved_package_name = objfile->intern (package_name.get ()); struct type *type = init_type (objfile, TYPE_CODE_MODULE, 0, saved_package_name); struct symbol *sym; @@ -10225,14 +10224,13 @@ dwarf2_compute_name (const char *name, if (cu->language == language_cplus) canonical_name = dwarf2_canonicalize_name (intermediate_name.c_str (), cu, - &objfile->per_bfd->storage_obstack); + objfile); /* If we only computed INTERMEDIATE_NAME, or if INTERMEDIATE_NAME is already canonical, then we need to - copy it to the appropriate obstack. */ + intern it. */ if (canonical_name == NULL || canonical_name == intermediate_name.c_str ()) - name = obstack_strdup (&objfile->per_bfd->storage_obstack, - intermediate_name); + name = objfile->intern (intermediate_name); else name = canonical_name; } @@ -10352,7 +10350,7 @@ dwarf2_physname (const char *name, struct die_info *die, struct dwarf2_cu *cu) retval = canon; if (need_copy) - retval = obstack_strdup (&objfile->per_bfd->storage_obstack, retval); + retval = objfile->intern (retval); return retval; } @@ -11678,8 +11676,7 @@ create_dwo_unit_in_dwp_v1 (struct dwarf2_per_objfile *dwarf2_per_objfile, virtual_dwo_name.c_str ()); } dwo_file = new struct dwo_file; - dwo_file->dwo_name = obstack_strdup (&objfile->objfile_obstack, - virtual_dwo_name); + dwo_file->dwo_name = objfile->intern (virtual_dwo_name); dwo_file->comp_dir = comp_dir; dwo_file->sections.abbrev = sections.abbrev; dwo_file->sections.line = sections.line; @@ -11874,8 +11871,7 @@ create_dwo_unit_in_dwp_v2 (struct dwarf2_per_objfile *dwarf2_per_objfile, virtual_dwo_name.c_str ()); } dwo_file = new struct dwo_file; - dwo_file->dwo_name = obstack_strdup (&objfile->objfile_obstack, - virtual_dwo_name); + dwo_file->dwo_name = objfile->intern (virtual_dwo_name); dwo_file->comp_dir = comp_dir; dwo_file->sections.abbrev = create_dwp_v2_section (dwarf2_per_objfile, &dwp_file->sections.abbrev, @@ -17993,8 +17989,7 @@ partial_die_info::read (const struct die_reader_specs *reader, struct objfile *objfile = dwarf2_per_objfile->objfile; name - = dwarf2_canonicalize_name (DW_STRING (&attr), cu, - &objfile->per_bfd->storage_obstack); + = dwarf2_canonicalize_name (DW_STRING (&attr), cu, objfile); } break; } @@ -18319,9 +18314,7 @@ guess_partial_die_structure_name (struct partial_die_info *struct_pdi, if (actual_class_name != NULL) { struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile; - struct_pdi->name - = obstack_strdup (&objfile->per_bfd->storage_obstack, - actual_class_name.get ()); + struct_pdi->name = objfile->intern (actual_class_name.get ()); } break; } @@ -18401,7 +18394,7 @@ partial_die_info::fixup (struct dwarf2_cu *cu) base = demangled.get (); struct objfile *objfile = cu->per_cu->dwarf2_per_objfile->objfile; - name = obstack_strdup (&objfile->per_bfd->storage_obstack, base); + name = objfile->intern (base); } } @@ -21714,7 +21707,7 @@ sibling_die (struct die_info *die) static const char * dwarf2_canonicalize_name (const char *name, struct dwarf2_cu *cu, - struct obstack *obstack) + struct objfile *objfile) { if (name && cu->language == language_cplus) { @@ -21723,7 +21716,7 @@ dwarf2_canonicalize_name (const char *name, struct dwarf2_cu *cu, if (!canon_name.empty ()) { if (canon_name != name) - name = obstack_strdup (obstack, canon_name); + name = objfile->intern (canon_name); } } @@ -21797,10 +21790,7 @@ dwarf2_name (struct die_info *die, struct dwarf2_cu *cu) const char *base; - /* FIXME: we already did this for the partial symbol... */ - DW_STRING (attr) - = obstack_strdup (&objfile->per_bfd->storage_obstack, - demangled.get ()); + DW_STRING (attr) = objfile->intern (demangled.get ()); DW_STRING_IS_CANONICAL (attr) = 1; /* Strip any leading namespaces/classes, keep only the base name. @@ -21820,9 +21810,8 @@ dwarf2_name (struct die_info *die, struct dwarf2_cu *cu) if (!DW_STRING_IS_CANONICAL (attr)) { - DW_STRING (attr) - = dwarf2_canonicalize_name (DW_STRING (attr), cu, - &objfile->per_bfd->storage_obstack); + DW_STRING (attr) = dwarf2_canonicalize_name (DW_STRING (attr), cu, + objfile); DW_STRING_IS_CANONICAL (attr) = 1; } return DW_STRING (attr); diff --git a/gdb/elfread.c b/gdb/elfread.c index d842d5b573..42c4e77785 100644 --- a/gdb/elfread.c +++ b/gdb/elfread.c @@ -355,11 +355,7 @@ elf_symtab_read (minimal_symbol_reader &reader, if (type == ST_DYNAMIC && !stripped) continue; if (sym->flags & BSF_FILE) - { - filesymname - = ((const char *) objfile->per_bfd->filename_cache.insert - (sym->name, strlen (sym->name) + 1)); - } + filesymname = objfile->intern (sym->name); else if (sym->flags & BSF_SECTION_SYM) continue; else if (sym->flags & (BSF_GLOBAL | BSF_LOCAL | BSF_WEAK diff --git a/gdb/objfiles.h b/gdb/objfiles.h index b71a8a9edb..a568fa4bcd 100644 --- a/gdb/objfiles.h +++ b/gdb/objfiles.h @@ -275,13 +275,9 @@ struct objfile_per_bfd_storage auto_obstack storage_obstack; - /* Byte cache for file names. */ + /* String cache. */ - gdb::bcache filename_cache; - - /* Byte cache for macros. */ - - gdb::bcache macro_cache; + gdb::bcache string_cache; /* The gdbarch associated with the BFD. Note that this gdbarch is determined solely from BFD information, without looking at target @@ -533,6 +529,22 @@ public: return section_offsets[SECT_OFF_DATA (this)]; } + /* Intern STRING and return the unique copy. The copy has the same + lifetime as the per-BFD object. */ + const char *intern (const char *str) + { + return (const char *) per_bfd->string_cache.insert (str, strlen (str) + 1); + } + + /* Intern STRING and return the unique copy. The copy has the same + lifetime as the per-BFD object. */ + const char *intern (const std::string &str) + { + return (const char *) per_bfd->string_cache.insert (str.c_str (), + str.size () + 1); + } + + /* The object file's original name as specified by the user, made absolute, and tilde-expanded. However, it is not canonicalized (i.e., it has not been passed through gdb_realpath). diff --git a/gdb/psymtab.c b/gdb/psymtab.c index fd7fc8feff..69176dbee4 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -1656,9 +1656,7 @@ partial_symtab::partial_symtab (const char *filename_, struct objfile *objfile) { objfile->partial_symtabs->install_psymtab (this); - filename - = ((const char *) objfile->per_bfd->filename_cache.insert - (filename_, strlen (filename_) + 1)); + filename = objfile->intern (filename_); if (symtab_create_debug) { diff --git a/gdb/symfile.c b/gdb/symfile.c index 01c3f5af12..3b63887ce1 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -2783,9 +2783,7 @@ allocate_symtab (struct compunit_symtab *cust, const char *filename) struct symtab *symtab = OBSTACK_ZALLOC (&objfile->objfile_obstack, struct symtab); - symtab->filename - = ((const char *) objfile->per_bfd->filename_cache.insert - (filename, strlen (filename) + 1)); + symtab->filename = objfile->intern (filename); symtab->fullname = NULL; symtab->language = deduce_language_from_filename (filename); diff --git a/gdb/symmisc.c b/gdb/symmisc.c index a6a7e728c4..1d7c381667 100644 --- a/gdb/symmisc.c +++ b/gdb/symmisc.c @@ -71,9 +71,7 @@ print_symbol_bcache_statistics (void) objfile_name (objfile)); objfile->partial_symtabs->psymbol_cache.print_statistics ("partial symbol cache"); - objfile->per_bfd->macro_cache.print_statistics - ("preprocessor macro cache"); - objfile->per_bfd->filename_cache.print_statistics ("file name cache"); + objfile->per_bfd->string_cache.print_statistics ("string cache"); } } @@ -135,10 +133,8 @@ print_objfile_statistics (void) printf_filtered (_(" Total memory used for psymbol cache: %d\n"), objfile->partial_symtabs->psymbol_cache.memory_used ()); - printf_filtered (_(" Total memory used for macro cache: %d\n"), - objfile->per_bfd->macro_cache.memory_used ()); - printf_filtered (_(" Total memory used for file name cache: %d\n"), - objfile->per_bfd->filename_cache.memory_used ()); + printf_filtered (_(" Total memory used for string cache: %d\n"), + objfile->per_bfd->string_cache.memory_used ()); } } -- 2.34.1