#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? */
SHORT_FIRST_MESSAGE,
};
-/* Structure to manage complaints about symbol file contents. */
+/* Map format strings to counters. */
-struct complain
-{
- const char *file;
- int line;
- const char *fmt;
- int counter;
- struct complain *next;
-};
-
-/* The explanatory message that should accompany the complaint. The
- message is in two parts - pre and post - that are printed around
- the complaint text. */
-struct explanation
-{
- const char *prefix;
- const char *postfix;
-};
-
-struct complaints
-{
- struct complain *root;
-
- enum complaint_series series;
-
- /* The explanatory messages that should accompany the complaint.
- NOTE: cagney/2002-08-14: In a desperate attempt at being vaguely
- i18n friendly, this is an array of two messages. When present,
- the PRE and POST EXPLANATION[SERIES] are used to wrap the
- message. */
- const struct explanation *explanation;
-};
+static std::unordered_map<const char *, int> counters;
-static struct complain complaint_sentinel;
-
-/* The symbol table complaint table. */
-
-static struct explanation symfile_explanations[] = {
- { "During symbol reading, ", "." },
- { "", "..."},
- { NULL, NULL }
-};
-
-static struct complaints symfile_complaint_book = {
- &complaint_sentinel,
- ISOLATED_MESSAGE,
- symfile_explanations
-};
-
-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;
-}
+/* How to print the next complaint. */
+static complaint_series series;
/* How many complaints about a particular thing should be printed
before we stop whining about it? Default is no whining at all,
int stop_whining = 0;
-/* Print a complaint, and link the complaint block into a chain for
- later handling. */
+/* See complaints.h. */
-static void ATTRIBUTE_PRINTF (3, 0)
-vcomplaint (const char *file,
- int line, const char *fmt,
- va_list args)
+void
+complaint_internal (const char *fmt, ...)
{
- struct complain *complaint = find_complaint (&symfile_complaint_book, file,
- line, fmt);
- enum complaint_series series;
+ va_list args;
- complaint->counter++;
- if (complaint->counter > stop_whining)
+ if (counters[fmt]++ > stop_whining)
return;
- 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);
+ va_start (args, 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
{
- if (symfile_complaint_book.explanation == NULL)
- /* A [v]warning() call always appends a newline. */
- vwarning (fmt, args);
+ 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
- {
- std::string msg = string_vprintf (fmt, args);
- wrap_here ("");
- begin_line ();
- /* XXX: i18n */
- fprintf_filtered (gdb_stderr, "%s%s%s",
- symfile_complaint_book.explanation[series].prefix,
- msg.c_str (),
- symfile_complaint_book.explanation[series].postfix);
- /* Force a line-break after any isolated message. */
- if (series == ISOLATED_MESSAGE)
- /* It would be really nice to use begin_line() here.
- Unfortunately that function doesn't track GDB_STDERR and
- consequently will sometimes supress a line when it
- shouldn't. */
- fputs_filtered ("\n", gdb_stderr);
- else
- wrap_here ("");
- }
+ fprintf_filtered (gdb_stderr, "%s...", msg.c_str ());
}
/* If GDB dumps core, we'd like to see the complaints first.
becomes a performance hog. */
gdb_flush (gdb_stderr);
-}
-
-void
-complaint_internal (const char *fmt, ...)
-{
- va_list args;
-
- va_start (args, fmt);
- vcomplaint (NULL/*file*/, 0/*line*/, fmt, args);
va_end (args);
}
{
struct complain *p;
- for (p = symfile_complaint_book.root; p != NULL; p = p->next)
- {
- p->counter = 0;
- }
+ counters.clear ();
if (!less_verbose)
- symfile_complaint_book.series = ISOLATED_MESSAGE;
+ series = ISOLATED_MESSAGE;
else
- symfile_complaint_book.series = SHORT_FIRST_MESSAGE;
+ series = SHORT_FIRST_MESSAGE;
}
static void
projects / deliverable / binutils-gdb.git / blobdiff