/* Support for complaint handling during symbol reading in GDB.
- Copyright (C) 1990-2018 Free Software Foundation, Inc.
+ Copyright (C) 1990-2020 Free Software Foundation, Inc.
This file is part of GDB.
#include "complaints.h"
#include "command.h"
#include "gdbcmd.h"
+#include <unordered_map>
-/* Should each complaint message be self explanatory, or should we
- assume that a series of complaints is being produced? */
-
-enum complaint_series {
- /* Isolated self explanatory message. */
- ISOLATED_MESSAGE,
-
- /* First message of a series, but does not need to include any sort
- of explanation. */
- SHORT_FIRST_MESSAGE,
-};
-
-/* Structure to manage complaints about symbol file contents. */
-
-struct complain
-{
- const char *file;
- int line;
- const char *fmt;
- int counter;
- struct complain *next;
-};
-
-struct complaints
-{
- struct complain *root;
-
- enum complaint_series series;
-};
-
-static struct complain complaint_sentinel;
-
-static struct complaints symfile_complaint_book = {
- &complaint_sentinel,
- ISOLATED_MESSAGE
-};
-
-static struct complain * ATTRIBUTE_PRINTF (4, 0)
-find_complaint (struct complaints *complaints, const char *file,
- int line, const char *fmt)
-{
- struct complain *complaint;
-
- /* Find the complaint in the table. A more efficient search
- algorithm (based on hash table or something) could be used. But
- that can wait until someone shows evidence that this lookup is
- a real bottle neck. */
- for (complaint = complaints->root;
- complaint != NULL;
- complaint = complaint->next)
- {
- if (complaint->fmt == fmt
- && complaint->file == file
- && complaint->line == line)
- return complaint;
- }
-
- /* Oops not seen before, fill in a new complaint. */
- complaint = XNEW (struct complain);
- complaint->fmt = fmt;
- complaint->file = file;
- complaint->line = line;
- complaint->counter = 0;
- complaint->next = NULL;
-
- /* File it, return it. */
- complaint->next = complaints->root;
- complaints->root = complaint;
- return complaint;
-}
+/* Map format strings to counters. */
+static std::unordered_map<const char *, int> counters;
/* How many complaints about a particular thing should be printed
before we stop whining about it? Default is no whining at all,
{
va_list args;
- struct complain *complaint = find_complaint (&symfile_complaint_book, NULL,
- 0, fmt);
- enum complaint_series series;
-
- complaint->counter++;
- if (complaint->counter > stop_whining)
+ if (++counters[fmt] > stop_whining)
return;
va_start (args, fmt);
- series = symfile_complaint_book.series;
-
- /* Pass 'fmt' instead of 'complaint->fmt' to printf-like callees
- from here on, to avoid "format string is not a string literal"
- warnings. 'fmt' is this function's printf-format parameter, so
- the compiler can assume the passed in argument is a literal
- string somewhere up the call chain. */
- gdb_assert (complaint->fmt == fmt);
-
- if (complaint->file != NULL)
- internal_vwarning (complaint->file, complaint->line, fmt, args);
- else if (deprecated_warning_hook)
+
+ if (deprecated_warning_hook)
(*deprecated_warning_hook) (fmt, args);
else
{
- std::string msg = string_vprintf (fmt, args);
- wrap_here ("");
- begin_line ();
- if (series == ISOLATED_MESSAGE)
- fprintf_filtered (gdb_stderr, "During symbol reading, %s.\n",
- msg.c_str ());
- else
- fprintf_filtered (gdb_stderr, "%s...", msg.c_str ());
+ fputs_filtered (_("During symbol reading: "), gdb_stderr);
+ vfprintf_filtered (gdb_stderr, fmt, args);
+ fputs_filtered ("\n", gdb_stderr);
}
- /* If GDB dumps core, we'd like to see the complaints first.
- Presumably GDB will not be sending so many complaints that this
- becomes a performance hog. */
-
- gdb_flush (gdb_stderr);
va_end (args);
}
-/* Clear out / initialize all complaint counters that have ever been
- incremented. If LESS_VERBOSE is 1, be less verbose about
- successive complaints, since the messages are appearing all
- together during a command that is reporting a contiguous block of
- complaints (rather than being interleaved with other messages). */
+/* See complaints.h. */
void
-clear_complaints (int less_verbose)
+clear_complaints ()
{
- struct complain *p;
-
- for (p = symfile_complaint_book.root; p != NULL; p = p->next)
- {
- p->counter = 0;
- }
-
- if (!less_verbose)
- symfile_complaint_book.series = ISOLATED_MESSAGE;
- else
- symfile_complaint_book.series = SHORT_FIRST_MESSAGE;
+ counters.clear ();
}
static void