From 1e15fcac9425190648b10407d82bd305ac97e336 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 21 Jan 2021 14:05:54 -0500 Subject: [PATCH] gdb: convert bfd-cache to new-style debug macros gdb/ChangeLog: * gdb_bfd.c (bfd_cache_debug_printf): New, use throughout file. Change-Id: Ie29948d82adfae7edb3cdcbd61f59a66892fcc99 --- gdb/ChangeLog | 4 ++++ gdb/gdb_bfd.c | 50 +++++++++++++++++++++----------------------------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a0fb3cf9950..ea92bcbf4dd 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2021-01-21 Simon Marchi + + * gdb_bfd.c (bfd_cache_debug_printf): New, use throughout file. + 2021-01-21 Simon Marchi * ser-tcp.c (wait_for_connect): Use interruptible_select instead diff --git a/gdb/gdb_bfd.c b/gdb/gdb_bfd.c index 98921660f00..3312197acd5 100644 --- a/gdb/gdb_bfd.c +++ b/gdb/gdb_bfd.c @@ -138,6 +138,11 @@ show_bfd_sharing (struct ui_file *file, int from_tty, static bool debug_bfd_cache; +/* Print an "bfd-cache" debug statement. */ + +#define bfd_cache_debug_printf(fmt, ...) \ + debug_prefixed_printf_cond (debug_bfd_cache, "bfd-cache", fmt, ##__VA_ARGS__) + static void show_bfd_cache_debug (struct ui_file *file, int from_tty, struct cmd_list_element *c, const char *value) @@ -529,10 +534,7 @@ gdb_bfd_open (const char *name, const char *target, int fd, if (fstat (fd, &st) < 0) { /* Weird situation here -- don't cache if we can't stat. */ - if (debug_bfd_cache) - fprintf_unfiltered (gdb_stdlog, - "Could not stat %s - not caching\n", - name); + bfd_cache_debug_printf ("Could not stat %s - not caching", name); abfd = bfd_fopen (name, target, FOPEN_RB, fd); if (abfd == nullptr) return nullptr; @@ -553,11 +555,9 @@ gdb_bfd_open (const char *name, const char *target, int fd, abfd = (struct bfd *) htab_find_with_hash (gdb_bfd_cache, &search, hash); if (bfd_sharing && abfd != NULL) { - if (debug_bfd_cache) - fprintf_unfiltered (gdb_stdlog, - "Reusing cached bfd %s for %s\n", - host_address_to_string (abfd), - bfd_get_filename (abfd)); + bfd_cache_debug_printf ("Reusing cached bfd %s for %s", + host_address_to_string (abfd), + bfd_get_filename (abfd)); close (fd); return gdb_bfd_ref_ptr::new_reference (abfd); } @@ -566,11 +566,9 @@ gdb_bfd_open (const char *name, const char *target, int fd, if (abfd == NULL) return NULL; - if (debug_bfd_cache) - fprintf_unfiltered (gdb_stdlog, - "Creating new bfd %s for %s\n", - host_address_to_string (abfd), - bfd_get_filename (abfd)); + bfd_cache_debug_printf ("Creating new bfd %s for %s", + host_address_to_string (abfd), + bfd_get_filename (abfd)); if (bfd_sharing) { @@ -646,11 +644,9 @@ gdb_bfd_ref (struct bfd *abfd) gdata = (struct gdb_bfd_data *) bfd_usrdata (abfd); - if (debug_bfd_cache) - fprintf_unfiltered (gdb_stdlog, - "Increase reference count on bfd %s (%s)\n", - host_address_to_string (abfd), - bfd_get_filename (abfd)); + bfd_cache_debug_printf ("Increase reference count on bfd %s (%s)", + host_address_to_string (abfd), + bfd_get_filename (abfd)); if (gdata != NULL) { @@ -681,19 +677,15 @@ gdb_bfd_unref (struct bfd *abfd) gdata->refc -= 1; if (gdata->refc > 0) { - if (debug_bfd_cache) - fprintf_unfiltered (gdb_stdlog, - "Decrease reference count on bfd %s (%s)\n", - host_address_to_string (abfd), - bfd_get_filename (abfd)); + bfd_cache_debug_printf ("Decrease reference count on bfd %s (%s)", + host_address_to_string (abfd), + bfd_get_filename (abfd)); return; } - if (debug_bfd_cache) - fprintf_unfiltered (gdb_stdlog, - "Delete final reference count on bfd %s (%s)\n", - host_address_to_string (abfd), - bfd_get_filename (abfd)); + bfd_cache_debug_printf ("Delete final reference count on bfd %s (%s)", + host_address_to_string (abfd), + bfd_get_filename (abfd)); archive_bfd = gdata->archive_bfd; search.filename = bfd_get_filename (abfd); -- 2.30.2