X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcomplaints.c;h=c5b5471ee181a5980265fdc0d83a7fdf1819e8be;hb=ff8577f64987a898e1dc5eb6afb66a404fb7bb16;hp=95ded4c4a8a982c1e5599cb47635c3cf86e4dba0;hpb=b9caf5053f5684f063a33357b6483cd2b62de0ec;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/complaints.c b/gdb/complaints.c
index 95ded4c4a8..c5b5471ee1 100644
--- a/gdb/complaints.c
+++ b/gdb/complaints.c
@@ -1,13 +1,12 @@
/* Support for complaint handling during symbol reading in GDB.
- Copyright 1990, 1991, 1992, 1993, 1995, 1998, 1999, 2000, 2002 Free
- Software Foundation, Inc.
+ Copyright (C) 1990-2019 Free Software Foundation, Inc.
This file is part of GDB.
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
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -16,279 +15,72 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
#include "defs.h"
#include "complaints.h"
-#include "gdb_assert.h"
#include "command.h"
#include "gdbcmd.h"
+#include
-extern void _initialize_complaints (void);
-
-/* Should each complaint message be self explanatory, or should we assume that
- a series of complaints is being produced? */
-
-/* case 1: First message of a series that must
- start off with explanation. case 2: Subsequent message of a series
- that needs no explanation (the user already knows we have a problem
- so we can just state our piece). */
-enum complaint_series {
- /* Isolated self explanatory message. */
- ISOLATED_MESSAGE,
- /* First message of a series, includes an explanation. */
- FIRST_MESSAGE,
- /* First message of a series, but does not need to include any sort
- of explanation. */
- SHORT_FIRST_MESSAGE,
- /* Subsequent message of a series that needs no explanation (the
- user already knows we have a problem so we can just state our
- piece). */
- SUBSEQUENT_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;
-
- /* Should each complaint be self explanatory, or should we assume
- that a series of complaints is being produced? case 0: Isolated
- self explanatory message. case 1: First message of a series that
- must start off with explanation. case 2: Subsequent message of a
- series that needs no explanation (the user already knows we have
- a problem so we can just state our piece). */
- int 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,
- EXPLANATION[SERIES] is used to wrap the message. */
- const char **explanation;
-};
-
-static struct complain complaint_sentinel;
-
-/* The symbol table complaint table. */
-
-static const char *symfile_explanations[] = {
- "During symbol reading, %s.\n",
- "During symbol reading...%s...",
- "%s...",
- "%s...",
- NULL
-};
-
-static struct complaints symfile_complaint_book = {
- &complaint_sentinel,
- 0,
- symfile_explanations
-};
-struct complaints *symfile_complaints = &symfile_complaint_book;
-
-/* Wrapper function to, on-demand, fill in a complaints object. */
-
-static struct complaints *
-get_complaints (struct complaints **c)
-{
- if ((*c) != NULL)
- return (*c);
- (*c) = XMALLOC (struct complaints);
- (*c)->root = &complaint_sentinel;
- (*c)->series = ISOLATED_MESSAGE;
- (*c)->explanation = NULL;
- return (*c);
-}
-
-static struct complain *
-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 = XMALLOC (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 counters;
/* How many complaints about a particular thing should be printed
before we stop whining about it? Default is no whining at all,
since so many systems have ill-constructed symbol files. */
-static unsigned int stop_whining = 0;
+int stop_whining = 0;
-/* Print a complaint, and link the complaint block into a chain for
- later handling. */
+/* See complaints.h. */
-static void
-vcomplaint (struct complaints **c, const char *file, int line, const char *fmt,
- va_list args)
+void
+complaint_internal (const char *fmt, ...)
{
- struct complaints *complaints = get_complaints (c);
- struct complain *complaint = find_complaint (complaints, file, line, fmt);
- enum complaint_series series;
- gdb_assert (complaints != NULL);
+ va_list args;
- complaint->counter++;
- if (complaint->counter > stop_whining)
+ if (++counters[fmt] > stop_whining)
return;
- if (info_verbose)
- series = SUBSEQUENT_MESSAGE;
- else
- series = complaints->series;
+ va_start (args, fmt);
- if (complaint->file != NULL)
- internal_vwarning (complaint->file, complaint->line, complaint->fmt, args);
- else if (warning_hook)
- (*warning_hook) (complaint->fmt, args);
+ if (deprecated_warning_hook)
+ (*deprecated_warning_hook) (fmt, args);
else
{
- if (complaints->explanation == NULL)
- vwarning (complaint->fmt, args);
- else
- {
- char *msg;
- struct cleanup *cleanups;
- xvasprintf (&msg, complaint->fmt, args);
- cleanups = make_cleanup (xfree, msg);
- wrap_here ("");
- if (series != SUBSEQUENT_MESSAGE)
- begin_line ();
- fprintf_filtered (gdb_stderr,
- complaints->explanation[series],
- msg);
- wrap_here ("");
- do_cleanups (cleanups);
- }
+ fputs_filtered (_("During symbol reading: "), gdb_stderr);
+ vfprintf_filtered (gdb_stderr, fmt, args);
+ fputs_filtered ("\n", gdb_stderr);
}
- switch (series)
- {
- case ISOLATED_MESSAGE:
- break;
- case FIRST_MESSAGE:
- complaints->series = SUBSEQUENT_MESSAGE;
- break;
- case SUBSEQUENT_MESSAGE:
- case SHORT_FIRST_MESSAGE:
- complaints->series = SUBSEQUENT_MESSAGE;
- break;
- }
-
- /* 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);
-}
-
-void
-complaint (struct complaints **complaints, const char *fmt, ...)
-{
- va_list args;
- va_start (args, fmt);
- vcomplaint (complaints, NULL/*file*/, 0/*line*/, fmt, args);
va_end (args);
}
-void
-internal_complaint (struct complaints **complaints, const char *file,
- int line, const char *fmt, ...)
-{
- va_list args;
- va_start (args, fmt);
- vcomplaint (complaints, file, line, fmt, args);
- va_end (args);
-}
+/* See complaints.h. */
void
-complain (struct complaint *complaint, ...)
+clear_complaints ()
{
- va_list args;
- va_start (args, complaint);
- vcomplaint (&symfile_complaints, NULL/*file*/, 0/*line*/,
- complaint->message, args);
- va_end (args);
+ counters.clear ();
}
-/* 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). If
- noisy is 1, we are in a noisy command, and our caller will print
- enough context for the user to figure it out. */
-
-void
-clear_complaints (struct complaints **c, int less_verbose, int noisy)
+static void
+complaints_show_value (struct ui_file *file, int from_tty,
+ struct cmd_list_element *cmd, const char *value)
{
- struct complaints *complaints = get_complaints (c);
- struct complain *p;
-
- for (p = complaints->root; p != NULL; p = p->next)
- {
- p->counter = 0;
- }
-
- if (complaints->series > 1 && !warning_hook)
- {
- /* Terminate previous series, since caller won't. */
- puts_filtered ("\n");
- }
-
- if (!less_verbose)
- complaints->series = ISOLATED_MESSAGE;
- else if (!noisy)
- complaints->series = FIRST_MESSAGE;
- else
- complaints->series = SHORT_FIRST_MESSAGE;
+ fprintf_filtered (file, _("Max number of complaints about incorrect"
+ " symbols is %s.\n"),
+ value);
}
void
_initialize_complaints (void)
{
- add_setshow_cmd ("complaints", class_support, var_zinteger,
- &stop_whining,
- "Set max number of complaints about incorrect symbols.",
- "Show max number of complaints about incorrect symbols.",
- NULL, NULL,
- &setlist, &showlist);
-
+ add_setshow_zinteger_cmd ("complaints", class_support,
+ &stop_whining, _("\
+Set max number of complaints about incorrect symbols."), _("\
+Show max number of complaints about incorrect symbols."), NULL,
+ NULL, complaints_show_value,
+ &setlist, &showlist);
}