1999-04-16 09:35:26 +08:00
|
|
|
/* Include file cached obstack implementation.
|
1999-12-07 11:56:43 +08:00
|
|
|
Written by Fred Fish <fnf@cygnus.com>
|
|
|
|
Rewritten by Jim Blandy <jimb@cygnus.com>
|
2002-07-12 23:23:10 +08:00
|
|
|
|
2024-01-12 23:30:44 +08:00
|
|
|
Copyright (C) 1999-2024 Free Software Foundation, Inc.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
This file is part of GDB.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
|
|
it under the terms of the GNU General Public License as published by
|
2007-08-24 02:08:50 +08:00
|
|
|
the Free Software Foundation; either version 3 of the License, or
|
1999-07-08 04:19:36 +08:00
|
|
|
(at your option) any later version.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
GNU General Public License for more details.
|
1999-04-16 09:35:26 +08:00
|
|
|
|
1999-07-08 04:19:36 +08:00
|
|
|
You should have received a copy of the GNU General Public License
|
2007-08-24 02:08:50 +08:00
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
1999-04-16 09:35:26 +08:00
|
|
|
|
|
|
|
#ifndef BCACHE_H
|
|
|
|
#define BCACHE_H 1
|
|
|
|
|
1999-12-07 11:56:43 +08:00
|
|
|
/* A bcache is a data structure for factoring out duplication in
|
|
|
|
read-only structures. You give the bcache some string of bytes S.
|
|
|
|
If the bcache already contains a copy of S, it hands you back a
|
|
|
|
pointer to its copy. Otherwise, it makes a fresh copy of S, and
|
|
|
|
hands you back a pointer to that. In either case, you can throw
|
|
|
|
away your copy of S, and use the bcache's.
|
|
|
|
|
|
|
|
The "strings" in question are arbitrary strings of bytes --- they
|
|
|
|
can contain zero bytes. You pass in the length explicitly when you
|
|
|
|
call the bcache function.
|
|
|
|
|
|
|
|
This means that you can put ordinary C objects in a bcache.
|
|
|
|
However, if you do this, remember that structs can contain `holes'
|
|
|
|
between members, added for alignment. These bytes usually contain
|
|
|
|
garbage. If you try to bcache two objects which are identical from
|
|
|
|
your code's point of view, but have different garbage values in the
|
|
|
|
structure's holes, then the bcache will treat them as separate
|
|
|
|
strings, and you won't get the nice elimination of duplicates you
|
|
|
|
were hoping for. So, remember to memset your structures full of
|
|
|
|
zeros before bcaching them!
|
|
|
|
|
|
|
|
You shouldn't modify the strings you get from a bcache, because:
|
|
|
|
|
|
|
|
- You don't necessarily know who you're sharing space with. If I
|
2003-11-08 06:04:39 +08:00
|
|
|
stick eight bytes of text in a bcache, and then stick an eight-byte
|
|
|
|
structure in the same bcache, there's no guarantee those two
|
|
|
|
objects don't actually comprise the same sequence of bytes. If
|
|
|
|
they happen to, the bcache will use a single byte string for both
|
|
|
|
of them. Then, modifying the structure will change the string. In
|
|
|
|
bizarre ways.
|
1999-12-07 11:56:43 +08:00
|
|
|
|
|
|
|
- Even if you know for some other reason that all that's okay,
|
2003-11-08 06:04:39 +08:00
|
|
|
there's another problem. A bcache stores all its strings in a hash
|
|
|
|
table. If you modify a string's contents, you will probably change
|
|
|
|
its hash value. This means that the modified string is now in the
|
|
|
|
wrong place in the hash table, and future bcache probes will never
|
|
|
|
find it. So by mutating a string, you give up any chance of
|
|
|
|
sharing its space with future duplicates.
|
|
|
|
|
|
|
|
|
|
|
|
Size of bcache VS hashtab:
|
|
|
|
|
|
|
|
For bcache, the most critical cost is size (or more exactly the
|
|
|
|
overhead added by the bcache). It turns out that the bcache is
|
|
|
|
remarkably efficient.
|
|
|
|
|
|
|
|
Assuming a 32-bit system (the hash table slots are 4 bytes),
|
|
|
|
ignoring alignment, and limit strings to 255 bytes (1 byte length)
|
|
|
|
we get ...
|
|
|
|
|
|
|
|
bcache: This uses a separate linked list to track the hash chain.
|
|
|
|
The numbers show roughly 100% occupancy of the hash table and an
|
|
|
|
average chain length of 4. Spreading the slot cost over the 4
|
|
|
|
chain elements:
|
|
|
|
|
|
|
|
4 (slot) / 4 (chain length) + 1 (length) + 4 (chain) = 6 bytes
|
|
|
|
|
|
|
|
hashtab: This uses a more traditional re-hash algorithm where the
|
|
|
|
chain is maintained within the hash table. The table occupancy is
|
|
|
|
kept below 75% but we'll assume its perfect:
|
|
|
|
|
|
|
|
4 (slot) x 4/3 (occupancy) + 1 (length) = 6 1/3 bytes
|
|
|
|
|
|
|
|
So a perfect hashtab has just slightly larger than an average
|
|
|
|
bcache.
|
|
|
|
|
|
|
|
It turns out that an average hashtab is far worse. Two things
|
|
|
|
hurt:
|
|
|
|
|
|
|
|
- Hashtab's occupancy is more like 50% (it ranges between 38% and
|
|
|
|
75%) giving a per slot cost of 4x2 vs 4x4/3.
|
|
|
|
|
|
|
|
- the string structure needs to be aligned to 8 bytes which for
|
|
|
|
hashtab wastes 7 bytes, while for bcache wastes only 3.
|
|
|
|
|
|
|
|
This gives:
|
|
|
|
|
|
|
|
hashtab: 4 x 2 + 1 + 7 = 16 bytes
|
|
|
|
|
|
|
|
bcache 4 / 4 + 1 + 4 + 3 = 9 bytes
|
|
|
|
|
|
|
|
The numbers of GDB debugging GDB support this. ~40% vs ~70% overhead.
|
|
|
|
|
|
|
|
|
|
|
|
Speed of bcache VS hashtab (the half hash hack):
|
|
|
|
|
|
|
|
While hashtab has a typical chain length of 1, bcache has a chain
|
|
|
|
length of round 4. This means that the bcache will require
|
|
|
|
something like double the number of compares after that initial
|
|
|
|
hash. In both cases the comparison takes the form:
|
|
|
|
|
|
|
|
a.length == b.length && memcmp (a.data, b.data, a.length) == 0
|
|
|
|
|
|
|
|
That is lengths are checked before doing the memcmp.
|
|
|
|
|
|
|
|
For GDB debugging GDB, it turned out that all lengths were 24 bytes
|
|
|
|
(no C++ so only psymbols were cached) and hence, all compares
|
|
|
|
required a call to memcmp. As a hack, two bytes of padding
|
|
|
|
(mentioned above) are used to store the upper 16 bits of the
|
|
|
|
string's hash value and then that is used in the comparison vis:
|
|
|
|
|
|
|
|
a.half_hash == b.half_hash && a.length == b.length && memcmp
|
|
|
|
(a.data, b.data, a.length)
|
|
|
|
|
|
|
|
The numbers from GDB debugging GDB show this to be a remarkable
|
|
|
|
100% effective (only necessary length and memcmp tests being
|
|
|
|
performed).
|
|
|
|
|
|
|
|
Mind you, looking at the wall clock, the same GDB debugging GDB
|
|
|
|
showed only marginal speed up (0.780 vs 0.773s). Seems GDB is too
|
|
|
|
busy doing something else :-(
|
|
|
|
|
|
|
|
*/
|
1999-12-07 11:56:43 +08:00
|
|
|
|
2019-12-03 05:05:54 +08:00
|
|
|
namespace gdb {
|
|
|
|
|
C++-ify bcache
This somewhat C++-ifies bcache. It replaces bcache_xmalloc and
bcache_xfree with constructors; changes some functions into methods;
and changes various structures to include a bcache directly (as
opposed to a pointer to a bcache).
Tested by the buildbot.
gdb/ChangeLog
2019-03-07 Tom Tromey <tom@tromey.com>
* symmisc.c (print_symbol_bcache_statistics): Update.
(print_objfile_statistics): Update.
* symfile.c (allocate_symtab): Update.
* stabsread.c: Don't include bcache.h.
* psymtab.h (struct psymbol_bcache): Don't declare.
(class psymtab_storage) <psymbol_cache>: Now a bcache.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache): Don't declare.
* psymtab.c (struct psymbol_bcache): Remove.
(psymtab_storage::psymtab_storage): Update.
(psymtab_storage::~psymtab_storage): Update.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache, psymbol_bcache_full): Remove.
(add_psymbol_to_bcache): Update.
(allocate_psymtab): Update.
* objfiles.h (struct objfile_per_bfd_storage) <filename_cache,
macro_cache>: No longer pointers.
* objfiles.c (get_objfile_bfd_data): Don't call bcache_xmalloc.
(free_objfile_per_bfd_storage): Don't call bcache_xfree.
* macrotab.c (macro_bcache): Update.
* macroexp.c: Don't include bcache.h.
* gdbtypes.c (check_types_worklist): Update.
(types_deeply_equal): Remove TRY/CATCH. Update.
* elfread.c (elf_symtab_read): Update.
* dwarf2read.c: Don't include bcache.h.
* buildsym.c (buildsym_compunit::get_macro_table): Update.
* bcache.h (bcache, bcache_full, bcache_xffree, bcache_xmalloc)
(print_bcache_statistics, bcache_memory_used): Don't declare.
(struct bcache): Move from bcache.c. Add constructor, destructor,
methods. Rename all data members.
* bcache.c (struct bcache): Move to bcache.h.
(bcache::expand_hash_table): Rename from expand_hash_table.
(bcache): Remove.
(bcache::insert): Rename from bcache_full.
(bcache::compare): Rename from bcache_compare.
(bcache_xmalloc): Remove.
(bcache::~bcache): Rename from bcache_xfree.
(bcache::print_statistics): Rename from print_bcache_statistics.
(bcache::memory_used): Rename from bcache_memory_used.
2019-03-07 19:20:19 +08:00
|
|
|
struct bstring;
|
2002-07-12 23:23:10 +08:00
|
|
|
|
C++-ify bcache
This somewhat C++-ifies bcache. It replaces bcache_xmalloc and
bcache_xfree with constructors; changes some functions into methods;
and changes various structures to include a bcache directly (as
opposed to a pointer to a bcache).
Tested by the buildbot.
gdb/ChangeLog
2019-03-07 Tom Tromey <tom@tromey.com>
* symmisc.c (print_symbol_bcache_statistics): Update.
(print_objfile_statistics): Update.
* symfile.c (allocate_symtab): Update.
* stabsread.c: Don't include bcache.h.
* psymtab.h (struct psymbol_bcache): Don't declare.
(class psymtab_storage) <psymbol_cache>: Now a bcache.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache): Don't declare.
* psymtab.c (struct psymbol_bcache): Remove.
(psymtab_storage::psymtab_storage): Update.
(psymtab_storage::~psymtab_storage): Update.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache, psymbol_bcache_full): Remove.
(add_psymbol_to_bcache): Update.
(allocate_psymtab): Update.
* objfiles.h (struct objfile_per_bfd_storage) <filename_cache,
macro_cache>: No longer pointers.
* objfiles.c (get_objfile_bfd_data): Don't call bcache_xmalloc.
(free_objfile_per_bfd_storage): Don't call bcache_xfree.
* macrotab.c (macro_bcache): Update.
* macroexp.c: Don't include bcache.h.
* gdbtypes.c (check_types_worklist): Update.
(types_deeply_equal): Remove TRY/CATCH. Update.
* elfread.c (elf_symtab_read): Update.
* dwarf2read.c: Don't include bcache.h.
* buildsym.c (buildsym_compunit::get_macro_table): Update.
* bcache.h (bcache, bcache_full, bcache_xffree, bcache_xmalloc)
(print_bcache_statistics, bcache_memory_used): Don't declare.
(struct bcache): Move from bcache.c. Add constructor, destructor,
methods. Rename all data members.
* bcache.c (struct bcache): Move to bcache.h.
(bcache::expand_hash_table): Rename from expand_hash_table.
(bcache): Remove.
(bcache::insert): Rename from bcache_full.
(bcache::compare): Rename from bcache_compare.
(bcache_xmalloc): Remove.
(bcache::~bcache): Rename from bcache_xfree.
(bcache::print_statistics): Rename from print_bcache_statistics.
(bcache::memory_used): Rename from bcache_memory_used.
2019-03-07 19:20:19 +08:00
|
|
|
struct bcache
|
|
|
|
{
|
2020-09-15 02:02:30 +08:00
|
|
|
virtual ~bcache ();
|
C++-ify bcache
This somewhat C++-ifies bcache. It replaces bcache_xmalloc and
bcache_xfree with constructors; changes some functions into methods;
and changes various structures to include a bcache directly (as
opposed to a pointer to a bcache).
Tested by the buildbot.
gdb/ChangeLog
2019-03-07 Tom Tromey <tom@tromey.com>
* symmisc.c (print_symbol_bcache_statistics): Update.
(print_objfile_statistics): Update.
* symfile.c (allocate_symtab): Update.
* stabsread.c: Don't include bcache.h.
* psymtab.h (struct psymbol_bcache): Don't declare.
(class psymtab_storage) <psymbol_cache>: Now a bcache.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache): Don't declare.
* psymtab.c (struct psymbol_bcache): Remove.
(psymtab_storage::psymtab_storage): Update.
(psymtab_storage::~psymtab_storage): Update.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache, psymbol_bcache_full): Remove.
(add_psymbol_to_bcache): Update.
(allocate_psymtab): Update.
* objfiles.h (struct objfile_per_bfd_storage) <filename_cache,
macro_cache>: No longer pointers.
* objfiles.c (get_objfile_bfd_data): Don't call bcache_xmalloc.
(free_objfile_per_bfd_storage): Don't call bcache_xfree.
* macrotab.c (macro_bcache): Update.
* macroexp.c: Don't include bcache.h.
* gdbtypes.c (check_types_worklist): Update.
(types_deeply_equal): Remove TRY/CATCH. Update.
* elfread.c (elf_symtab_read): Update.
* dwarf2read.c: Don't include bcache.h.
* buildsym.c (buildsym_compunit::get_macro_table): Update.
* bcache.h (bcache, bcache_full, bcache_xffree, bcache_xmalloc)
(print_bcache_statistics, bcache_memory_used): Don't declare.
(struct bcache): Move from bcache.c. Add constructor, destructor,
methods. Rename all data members.
* bcache.c (struct bcache): Move to bcache.h.
(bcache::expand_hash_table): Rename from expand_hash_table.
(bcache): Remove.
(bcache::insert): Rename from bcache_full.
(bcache::compare): Rename from bcache_compare.
(bcache_xmalloc): Remove.
(bcache::~bcache): Rename from bcache_xfree.
(bcache::print_statistics): Rename from print_bcache_statistics.
(bcache::memory_used): Rename from bcache_memory_used.
2019-03-07 19:20:19 +08:00
|
|
|
|
|
|
|
/* Find a copy of the LENGTH bytes at ADDR in BCACHE. If BCACHE has
|
|
|
|
never seen those bytes before, add a copy of them to BCACHE. In
|
|
|
|
either case, return a pointer to BCACHE's copy of that string.
|
2020-09-02 00:54:38 +08:00
|
|
|
Since the cached value is meant to be read-only, return a const
|
C++-ify bcache
This somewhat C++-ifies bcache. It replaces bcache_xmalloc and
bcache_xfree with constructors; changes some functions into methods;
and changes various structures to include a bcache directly (as
opposed to a pointer to a bcache).
Tested by the buildbot.
gdb/ChangeLog
2019-03-07 Tom Tromey <tom@tromey.com>
* symmisc.c (print_symbol_bcache_statistics): Update.
(print_objfile_statistics): Update.
* symfile.c (allocate_symtab): Update.
* stabsread.c: Don't include bcache.h.
* psymtab.h (struct psymbol_bcache): Don't declare.
(class psymtab_storage) <psymbol_cache>: Now a bcache.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache): Don't declare.
* psymtab.c (struct psymbol_bcache): Remove.
(psymtab_storage::psymtab_storage): Update.
(psymtab_storage::~psymtab_storage): Update.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache, psymbol_bcache_full): Remove.
(add_psymbol_to_bcache): Update.
(allocate_psymtab): Update.
* objfiles.h (struct objfile_per_bfd_storage) <filename_cache,
macro_cache>: No longer pointers.
* objfiles.c (get_objfile_bfd_data): Don't call bcache_xmalloc.
(free_objfile_per_bfd_storage): Don't call bcache_xfree.
* macrotab.c (macro_bcache): Update.
* macroexp.c: Don't include bcache.h.
* gdbtypes.c (check_types_worklist): Update.
(types_deeply_equal): Remove TRY/CATCH. Update.
* elfread.c (elf_symtab_read): Update.
* dwarf2read.c: Don't include bcache.h.
* buildsym.c (buildsym_compunit::get_macro_table): Update.
* bcache.h (bcache, bcache_full, bcache_xffree, bcache_xmalloc)
(print_bcache_statistics, bcache_memory_used): Don't declare.
(struct bcache): Move from bcache.c. Add constructor, destructor,
methods. Rename all data members.
* bcache.c (struct bcache): Move to bcache.h.
(bcache::expand_hash_table): Rename from expand_hash_table.
(bcache): Remove.
(bcache::insert): Rename from bcache_full.
(bcache::compare): Rename from bcache_compare.
(bcache_xmalloc): Remove.
(bcache::~bcache): Rename from bcache_xfree.
(bcache::print_statistics): Rename from print_bcache_statistics.
(bcache::memory_used): Rename from bcache_memory_used.
2019-03-07 19:20:19 +08:00
|
|
|
buffer. If ADDED is not NULL, set *ADDED to true if the bytes
|
|
|
|
were newly added to the cache, or to false if the bytes were
|
|
|
|
found in the cache. */
|
|
|
|
|
2024-03-21 03:24:33 +08:00
|
|
|
template<typename T, typename = gdb::Requires<std::is_trivially_copyable<T>>>
|
|
|
|
const T *insert (const T *addr, int length, bool *added = nullptr)
|
|
|
|
{
|
|
|
|
return (const T *) this->insert ((const void *) addr, length, added);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find a copy of OBJECT in this bcache. If BCACHE has never seen
|
|
|
|
those bytes before, add a copy of them to BCACHE. In either
|
|
|
|
case, return a pointer to BCACHE's copy of that string. Since
|
|
|
|
the cached value is meant to be read-only, return a const buffer.
|
|
|
|
If ADDED is not NULL, set *ADDED to true if the bytes were newly
|
|
|
|
added to the cache, or to false if the bytes were found in the
|
|
|
|
cache. */
|
|
|
|
|
|
|
|
template<typename T, typename = gdb::Requires<std::is_trivially_copyable<T>>>
|
|
|
|
const T *insert (const T &object, bool *added = nullptr)
|
|
|
|
{
|
|
|
|
return (const T *) this->insert ((const void *) &object, sizeof (object),
|
|
|
|
added);
|
|
|
|
}
|
C++-ify bcache
This somewhat C++-ifies bcache. It replaces bcache_xmalloc and
bcache_xfree with constructors; changes some functions into methods;
and changes various structures to include a bcache directly (as
opposed to a pointer to a bcache).
Tested by the buildbot.
gdb/ChangeLog
2019-03-07 Tom Tromey <tom@tromey.com>
* symmisc.c (print_symbol_bcache_statistics): Update.
(print_objfile_statistics): Update.
* symfile.c (allocate_symtab): Update.
* stabsread.c: Don't include bcache.h.
* psymtab.h (struct psymbol_bcache): Don't declare.
(class psymtab_storage) <psymbol_cache>: Now a bcache.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache): Don't declare.
* psymtab.c (struct psymbol_bcache): Remove.
(psymtab_storage::psymtab_storage): Update.
(psymtab_storage::~psymtab_storage): Update.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache, psymbol_bcache_full): Remove.
(add_psymbol_to_bcache): Update.
(allocate_psymtab): Update.
* objfiles.h (struct objfile_per_bfd_storage) <filename_cache,
macro_cache>: No longer pointers.
* objfiles.c (get_objfile_bfd_data): Don't call bcache_xmalloc.
(free_objfile_per_bfd_storage): Don't call bcache_xfree.
* macrotab.c (macro_bcache): Update.
* macroexp.c: Don't include bcache.h.
* gdbtypes.c (check_types_worklist): Update.
(types_deeply_equal): Remove TRY/CATCH. Update.
* elfread.c (elf_symtab_read): Update.
* dwarf2read.c: Don't include bcache.h.
* buildsym.c (buildsym_compunit::get_macro_table): Update.
* bcache.h (bcache, bcache_full, bcache_xffree, bcache_xmalloc)
(print_bcache_statistics, bcache_memory_used): Don't declare.
(struct bcache): Move from bcache.c. Add constructor, destructor,
methods. Rename all data members.
* bcache.c (struct bcache): Move to bcache.h.
(bcache::expand_hash_table): Rename from expand_hash_table.
(bcache): Remove.
(bcache::insert): Rename from bcache_full.
(bcache::compare): Rename from bcache_compare.
(bcache_xmalloc): Remove.
(bcache::~bcache): Rename from bcache_xfree.
(bcache::print_statistics): Rename from print_bcache_statistics.
(bcache::memory_used): Rename from bcache_memory_used.
2019-03-07 19:20:19 +08:00
|
|
|
|
|
|
|
/* Print statistics on this bcache's memory usage and efficacity at
|
|
|
|
eliminating duplication. TYPE should be a string describing the
|
|
|
|
kind of data this bcache holds. Statistics are printed using
|
2022-01-03 02:46:15 +08:00
|
|
|
`gdb_printf' and its ilk. */
|
C++-ify bcache
This somewhat C++-ifies bcache. It replaces bcache_xmalloc and
bcache_xfree with constructors; changes some functions into methods;
and changes various structures to include a bcache directly (as
opposed to a pointer to a bcache).
Tested by the buildbot.
gdb/ChangeLog
2019-03-07 Tom Tromey <tom@tromey.com>
* symmisc.c (print_symbol_bcache_statistics): Update.
(print_objfile_statistics): Update.
* symfile.c (allocate_symtab): Update.
* stabsread.c: Don't include bcache.h.
* psymtab.h (struct psymbol_bcache): Don't declare.
(class psymtab_storage) <psymbol_cache>: Now a bcache.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache): Don't declare.
* psymtab.c (struct psymbol_bcache): Remove.
(psymtab_storage::psymtab_storage): Update.
(psymtab_storage::~psymtab_storage): Update.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache, psymbol_bcache_full): Remove.
(add_psymbol_to_bcache): Update.
(allocate_psymtab): Update.
* objfiles.h (struct objfile_per_bfd_storage) <filename_cache,
macro_cache>: No longer pointers.
* objfiles.c (get_objfile_bfd_data): Don't call bcache_xmalloc.
(free_objfile_per_bfd_storage): Don't call bcache_xfree.
* macrotab.c (macro_bcache): Update.
* macroexp.c: Don't include bcache.h.
* gdbtypes.c (check_types_worklist): Update.
(types_deeply_equal): Remove TRY/CATCH. Update.
* elfread.c (elf_symtab_read): Update.
* dwarf2read.c: Don't include bcache.h.
* buildsym.c (buildsym_compunit::get_macro_table): Update.
* bcache.h (bcache, bcache_full, bcache_xffree, bcache_xmalloc)
(print_bcache_statistics, bcache_memory_used): Don't declare.
(struct bcache): Move from bcache.c. Add constructor, destructor,
methods. Rename all data members.
* bcache.c (struct bcache): Move to bcache.h.
(bcache::expand_hash_table): Rename from expand_hash_table.
(bcache): Remove.
(bcache::insert): Rename from bcache_full.
(bcache::compare): Rename from bcache_compare.
(bcache_xmalloc): Remove.
(bcache::~bcache): Rename from bcache_xfree.
(bcache::print_statistics): Rename from print_bcache_statistics.
(bcache::memory_used): Rename from bcache_memory_used.
2019-03-07 19:20:19 +08:00
|
|
|
void print_statistics (const char *type);
|
|
|
|
int memory_used ();
|
|
|
|
|
2020-09-15 02:02:30 +08:00
|
|
|
protected:
|
|
|
|
|
|
|
|
/* Hash function to be used for this bcache object. Defaults to
|
|
|
|
fast_hash. */
|
|
|
|
virtual unsigned long hash (const void *addr, int length);
|
|
|
|
|
|
|
|
/* Compare function to be used for this bcache object. Defaults to
|
|
|
|
memcmp. */
|
|
|
|
virtual int compare (const void *left, const void *right, int length);
|
|
|
|
|
C++-ify bcache
This somewhat C++-ifies bcache. It replaces bcache_xmalloc and
bcache_xfree with constructors; changes some functions into methods;
and changes various structures to include a bcache directly (as
opposed to a pointer to a bcache).
Tested by the buildbot.
gdb/ChangeLog
2019-03-07 Tom Tromey <tom@tromey.com>
* symmisc.c (print_symbol_bcache_statistics): Update.
(print_objfile_statistics): Update.
* symfile.c (allocate_symtab): Update.
* stabsread.c: Don't include bcache.h.
* psymtab.h (struct psymbol_bcache): Don't declare.
(class psymtab_storage) <psymbol_cache>: Now a bcache.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache): Don't declare.
* psymtab.c (struct psymbol_bcache): Remove.
(psymtab_storage::psymtab_storage): Update.
(psymtab_storage::~psymtab_storage): Update.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache, psymbol_bcache_full): Remove.
(add_psymbol_to_bcache): Update.
(allocate_psymtab): Update.
* objfiles.h (struct objfile_per_bfd_storage) <filename_cache,
macro_cache>: No longer pointers.
* objfiles.c (get_objfile_bfd_data): Don't call bcache_xmalloc.
(free_objfile_per_bfd_storage): Don't call bcache_xfree.
* macrotab.c (macro_bcache): Update.
* macroexp.c: Don't include bcache.h.
* gdbtypes.c (check_types_worklist): Update.
(types_deeply_equal): Remove TRY/CATCH. Update.
* elfread.c (elf_symtab_read): Update.
* dwarf2read.c: Don't include bcache.h.
* buildsym.c (buildsym_compunit::get_macro_table): Update.
* bcache.h (bcache, bcache_full, bcache_xffree, bcache_xmalloc)
(print_bcache_statistics, bcache_memory_used): Don't declare.
(struct bcache): Move from bcache.c. Add constructor, destructor,
methods. Rename all data members.
* bcache.c (struct bcache): Move to bcache.h.
(bcache::expand_hash_table): Rename from expand_hash_table.
(bcache): Remove.
(bcache::insert): Rename from bcache_full.
(bcache::compare): Rename from bcache_compare.
(bcache_xmalloc): Remove.
(bcache::~bcache): Rename from bcache_xfree.
(bcache::print_statistics): Rename from print_bcache_statistics.
(bcache::memory_used): Rename from bcache_memory_used.
2019-03-07 19:20:19 +08:00
|
|
|
private:
|
|
|
|
|
2024-03-21 03:24:33 +08:00
|
|
|
/* Implementation of the templated 'insert' methods. */
|
|
|
|
|
|
|
|
const void *insert (const void *addr, int length, bool *added);
|
|
|
|
|
C++-ify bcache
This somewhat C++-ifies bcache. It replaces bcache_xmalloc and
bcache_xfree with constructors; changes some functions into methods;
and changes various structures to include a bcache directly (as
opposed to a pointer to a bcache).
Tested by the buildbot.
gdb/ChangeLog
2019-03-07 Tom Tromey <tom@tromey.com>
* symmisc.c (print_symbol_bcache_statistics): Update.
(print_objfile_statistics): Update.
* symfile.c (allocate_symtab): Update.
* stabsread.c: Don't include bcache.h.
* psymtab.h (struct psymbol_bcache): Don't declare.
(class psymtab_storage) <psymbol_cache>: Now a bcache.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache): Don't declare.
* psymtab.c (struct psymbol_bcache): Remove.
(psymtab_storage::psymtab_storage): Update.
(psymtab_storage::~psymtab_storage): Update.
(psymbol_bcache_init, psymbol_bcache_free)
(psymbol_bcache_get_bcache, psymbol_bcache_full): Remove.
(add_psymbol_to_bcache): Update.
(allocate_psymtab): Update.
* objfiles.h (struct objfile_per_bfd_storage) <filename_cache,
macro_cache>: No longer pointers.
* objfiles.c (get_objfile_bfd_data): Don't call bcache_xmalloc.
(free_objfile_per_bfd_storage): Don't call bcache_xfree.
* macrotab.c (macro_bcache): Update.
* macroexp.c: Don't include bcache.h.
* gdbtypes.c (check_types_worklist): Update.
(types_deeply_equal): Remove TRY/CATCH. Update.
* elfread.c (elf_symtab_read): Update.
* dwarf2read.c: Don't include bcache.h.
* buildsym.c (buildsym_compunit::get_macro_table): Update.
* bcache.h (bcache, bcache_full, bcache_xffree, bcache_xmalloc)
(print_bcache_statistics, bcache_memory_used): Don't declare.
(struct bcache): Move from bcache.c. Add constructor, destructor,
methods. Rename all data members.
* bcache.c (struct bcache): Move to bcache.h.
(bcache::expand_hash_table): Rename from expand_hash_table.
(bcache): Remove.
(bcache::insert): Rename from bcache_full.
(bcache::compare): Rename from bcache_compare.
(bcache_xmalloc): Remove.
(bcache::~bcache): Rename from bcache_xfree.
(bcache::print_statistics): Rename from print_bcache_statistics.
(bcache::memory_used): Rename from bcache_memory_used.
2019-03-07 19:20:19 +08:00
|
|
|
/* All the bstrings are allocated here. */
|
|
|
|
struct obstack m_cache {};
|
|
|
|
|
|
|
|
/* How many hash buckets we're using. */
|
|
|
|
unsigned int m_num_buckets = 0;
|
|
|
|
|
|
|
|
/* Hash buckets. This table is allocated using malloc, so when we
|
|
|
|
grow the table we can return the old table to the system. */
|
|
|
|
struct bstring **m_bucket = nullptr;
|
|
|
|
|
|
|
|
/* Statistics. */
|
|
|
|
unsigned long m_unique_count = 0; /* number of unique strings */
|
|
|
|
long m_total_count = 0; /* total number of strings cached, including dups */
|
|
|
|
long m_unique_size = 0; /* size of unique strings, in bytes */
|
|
|
|
long m_total_size = 0; /* total number of bytes cached, including dups */
|
|
|
|
long m_structure_size = 0; /* total size of bcache, including infrastructure */
|
|
|
|
/* Number of times that the hash table is expanded and hence
|
|
|
|
re-built, and the corresponding number of times that a string is
|
|
|
|
[re]hashed as part of entering it into the expanded table. The
|
|
|
|
total number of hashes can be computed by adding TOTAL_COUNT to
|
|
|
|
expand_hash_count. */
|
|
|
|
unsigned long m_expand_count = 0;
|
|
|
|
unsigned long m_expand_hash_count = 0;
|
|
|
|
/* Number of times that the half-hash compare hit (compare the upper
|
|
|
|
16 bits of hash values) hit, but the corresponding combined
|
|
|
|
length/data compare missed. */
|
|
|
|
unsigned long m_half_hash_miss_count = 0;
|
|
|
|
|
|
|
|
/* Expand the hash table. */
|
|
|
|
void expand_hash_table ();
|
|
|
|
};
|
|
|
|
|
2019-12-03 05:05:54 +08:00
|
|
|
} /* namespace gdb */
|
|
|
|
|
1999-04-16 09:35:26 +08:00
|
|
|
#endif /* BCACHE_H */
|