From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 4/9] Use htab_up in filename_seen_cache
Date: Sat, 18 Jul 2020 11:29:10 -0600 [thread overview]
Message-ID: <20200718172915.6811-5-tom@tromey.com> (raw)
In-Reply-To: <20200718172915.6811-1-tom@tromey.com>
This changes filename_seen_cache to use htab_up, rather than explicit
calls to htab_delete.
gdb/ChangeLog
2020-07-18 Tom Tromey <tom@tromey.com>
* filename-seen-cache.c (filename_seen_cache::filename_seen_cache)
(filename_seen_cache::clear): Update.
(~filename_seen_cache): Remove.
(filename_seen_cache::seen): Update.
* filename-seen-cache.h (class filename_seen_cache) <m_tab>: Now
htab_up.
<~filename_seen_cache>: Default.
<traverse>: Update.
---
gdb/ChangeLog | 11 +++++++++++
gdb/filename-seen-cache.c | 17 +++++------------
gdb/filename-seen-cache.h | 6 +++---
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/gdb/filename-seen-cache.c b/gdb/filename-seen-cache.c
index f3905c0fb12..b0cda087cc0 100644
--- a/gdb/filename-seen-cache.c
+++ b/gdb/filename-seen-cache.c
@@ -27,10 +27,10 @@
/* filename_seen_cache constructor. */
filename_seen_cache::filename_seen_cache ()
+ : m_tab (htab_create_alloc (INITIAL_FILENAME_SEEN_CACHE_SIZE,
+ filename_hash, filename_eq,
+ NULL, xcalloc, xfree))
{
- m_tab = htab_create_alloc (INITIAL_FILENAME_SEEN_CACHE_SIZE,
- filename_hash, filename_eq,
- NULL, xcalloc, xfree);
}
/* See filename-seen-cache.h. */
@@ -38,14 +38,7 @@ filename_seen_cache::filename_seen_cache ()
void
filename_seen_cache::clear ()
{
- htab_empty (m_tab);
-}
-
-/* See filename-seen-cache.h. */
-
-filename_seen_cache::~filename_seen_cache ()
-{
- htab_delete (m_tab);
+ htab_empty (m_tab.get ());
}
/* See filename-seen-cache.h. */
@@ -56,7 +49,7 @@ filename_seen_cache::seen (const char *file)
void **slot;
/* Is FILE in tab? */
- slot = htab_find_slot (m_tab, file, INSERT);
+ slot = htab_find_slot (m_tab.get (), file, INSERT);
if (*slot != NULL)
return true;
diff --git a/gdb/filename-seen-cache.h b/gdb/filename-seen-cache.h
index ee064c32565..ccc47694fff 100644
--- a/gdb/filename-seen-cache.h
+++ b/gdb/filename-seen-cache.h
@@ -29,7 +29,7 @@ class filename_seen_cache
{
public:
filename_seen_cache ();
- ~filename_seen_cache ();
+ ~filename_seen_cache () = default;
DISABLE_COPY_AND_ASSIGN (filename_seen_cache);
@@ -55,12 +55,12 @@ class filename_seen_cache
return 1;
};
- htab_traverse_noresize (m_tab, erased_cb, &callback);
+ htab_traverse_noresize (m_tab.get (), erased_cb, &callback);
}
private:
/* Table of files seen so far. */
- htab_t m_tab;
+ htab_up m_tab;
};
#endif /* FILENAME_SEEN_CACHE_H */
--
2.17.2
next prev parent reply other threads:[~2020-07-18 17:29 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-18 17:29 [PATCH 0/9] Use htab_up in more places Tom Tromey
2020-07-18 17:29 ` [PATCH 1/9] Use htab_up in auto-load.c Tom Tromey
2020-07-20 1:38 ` Simon Marchi
2020-09-17 17:48 ` Tom Tromey
2020-07-18 17:29 ` [PATCH 2/9] Use htab_up in breakpoint.c Tom Tromey
2020-07-18 17:29 ` [PATCH 3/9] Use htab_up in completion_tracker Tom Tromey
2020-07-18 17:29 ` Tom Tromey [this message]
2020-07-20 1:41 ` [PATCH 4/9] Use htab_up in filename_seen_cache Simon Marchi
2020-07-18 17:29 ` [PATCH 5/9] Use htab_up in linespec.c Tom Tromey
2020-07-20 1:47 ` Simon Marchi
2020-07-21 0:55 ` Tom Tromey
2020-07-18 17:29 ` [PATCH 6/9] Use htab_up in target-descriptions.c Tom Tromey
2020-07-18 17:29 ` [PATCH 7/9] Use htab_up in typedef_hash_table Tom Tromey
2020-07-18 17:29 ` [PATCH 8/9] Use htab_up in type copying Tom Tromey
2020-09-18 17:32 ` Andrew Burgess
2020-09-18 18:03 ` Tom Tromey
2020-09-18 18:20 ` Andrew Burgess
2020-07-18 17:29 ` [PATCH 9/9] Use htab_up in dwarf2/read.c Tom Tromey
2020-09-17 17:58 ` [PATCH 0/9] Use htab_up in more places 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=20200718172915.6811-5-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).