2011-12-16 Phil Muldoon <pmuldoon@redhat.com>
* testsuite/gdb.python/py-function.exp: Change "on" to "full" for python print-stack. Add set/show python print-stack off|full|message tests. 2011-12-16 Phil Muldoon <pmuldoon@redhat.com> * python/python.c: Define python_excp_enums. (eval_python_from_control_command): Do not call gdbpy_print_stack. (python_command): Ditto. (gdbpy_print_stack): Rewrite to use new enum constants. (maint_set_python): Remove function. (maint_show_python): Ditto. (_initialize_python): Do not add "maint" commands. Add "set/show python print-stack commands". * NEWS: Update to reflect removal for "maint set/show print-stack" 2011-12-16 Phil Muldoon <pmuldoon@redhat.com> * doc/gdb.texinfo (Python Commands): Remove "maint set/show print stack". Add documentation for "set/show python print-stack".
This commit is contained in:
Phil Muldoon
parent
b93a1992f4
commit
80b6e7564f
9 changed files with 168 additions and 100 deletions
|
|
@ -35,9 +35,25 @@
|
|||
|
||||
#include <ctype.h>
|
||||
|
||||
/* True if we should print the stack when catching a Python error,
|
||||
false otherwise. */
|
||||
static int gdbpy_should_print_stack = 0;
|
||||
/* Declared constants and enum for python stack printing. */
|
||||
static const char python_excp_none[] = "none";
|
||||
static const char python_excp_full[] = "full";
|
||||
static const char python_excp_message[] = "message";
|
||||
|
||||
/* "set python print-stack" choices. */
|
||||
static const char *python_excp_enums[] =
|
||||
{
|
||||
python_excp_none,
|
||||
python_excp_full,
|
||||
python_excp_message,
|
||||
NULL
|
||||
};
|
||||
|
||||
/* The exception printing variable. 'full' if we want to print the
|
||||
error message and stack, 'none' if we want to print nothing, and
|
||||
'message' if we only want to print the error message. 'message' is
|
||||
the default. */
|
||||
static const char *gdbpy_should_print_stack = python_excp_message;
|
||||
|
||||
#ifdef HAVE_PYTHON
|
||||
|
||||
|
|
@ -233,10 +249,7 @@ eval_python_from_control_command (struct command_line *cmd)
|
|||
ret = PyRun_SimpleString (script);
|
||||
xfree (script);
|
||||
if (ret)
|
||||
{
|
||||
gdbpy_print_stack ();
|
||||
error (_("Error while executing Python code."));
|
||||
}
|
||||
error (_("Error while executing Python code."));
|
||||
|
||||
do_cleanups (cleanup);
|
||||
}
|
||||
|
|
@ -258,10 +271,7 @@ python_command (char *arg, int from_tty)
|
|||
if (arg && *arg)
|
||||
{
|
||||
if (PyRun_SimpleString (arg))
|
||||
{
|
||||
gdbpy_print_stack ();
|
||||
error (_("Error while executing Python code."));
|
||||
}
|
||||
error (_("Error while executing Python code."));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -881,13 +891,20 @@ gdbpy_flush (PyObject *self, PyObject *args, PyObject *kw)
|
|||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
/* Print a python exception trace, or print nothing and clear the
|
||||
python exception, depending on gdbpy_should_print_stack. Only call
|
||||
this if a python exception is set. */
|
||||
/* Print a python exception trace, print just a message, or print
|
||||
nothing and clear the python exception, depending on
|
||||
gdbpy_should_print_stack. Only call this if a python exception is
|
||||
set. */
|
||||
void
|
||||
gdbpy_print_stack (void)
|
||||
{
|
||||
if (gdbpy_should_print_stack)
|
||||
/* Print "none", just clear exception. */
|
||||
if (gdbpy_should_print_stack == python_excp_none)
|
||||
{
|
||||
PyErr_Clear ();
|
||||
}
|
||||
/* Print "full" message and backtrace. */
|
||||
else if (gdbpy_should_print_stack == python_excp_full)
|
||||
{
|
||||
PyErr_Print ();
|
||||
/* PyErr_Print doesn't necessarily end output with a newline.
|
||||
|
|
@ -895,8 +912,34 @@ gdbpy_print_stack (void)
|
|||
printf_filtered. */
|
||||
begin_line ();
|
||||
}
|
||||
/* Print "message", just error print message. */
|
||||
else
|
||||
PyErr_Clear ();
|
||||
{
|
||||
PyObject *ptype, *pvalue, *ptraceback;
|
||||
char *msg = NULL, *type = NULL;
|
||||
|
||||
PyErr_Fetch (&ptype, &pvalue, &ptraceback);
|
||||
|
||||
/* Fetch the error message contained within ptype, pvalue. */
|
||||
msg = gdbpy_exception_to_string (ptype, pvalue);
|
||||
type = gdbpy_obj_to_string (ptype);
|
||||
if (msg == NULL)
|
||||
{
|
||||
/* An error occurred computing the string representation of the
|
||||
error message. */
|
||||
fprintf_filtered (gdb_stderr,
|
||||
_("Error occurred computing Python error" \
|
||||
"message.\n"));
|
||||
}
|
||||
else
|
||||
fprintf_filtered (gdb_stderr, "Python Exception %s %s: \n",
|
||||
type, msg);
|
||||
|
||||
Py_XDECREF (ptype);
|
||||
Py_XDECREF (pvalue);
|
||||
Py_XDECREF (ptraceback);
|
||||
xfree (msg);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -1062,33 +1105,11 @@ gdbpy_breakpoint_has_py_cond (struct breakpoint_object *bp_obj)
|
|||
|
||||
|
||||
|
||||
/* Lists for 'maint set python' commands. */
|
||||
|
||||
static struct cmd_list_element *maint_set_python_list;
|
||||
static struct cmd_list_element *maint_show_python_list;
|
||||
|
||||
/* Lists for 'set python' commands. */
|
||||
|
||||
static struct cmd_list_element *user_set_python_list;
|
||||
static struct cmd_list_element *user_show_python_list;
|
||||
|
||||
/* Function for use by 'maint set python' prefix command. */
|
||||
|
||||
static void
|
||||
maint_set_python (char *args, int from_tty)
|
||||
{
|
||||
help_list (maint_set_python_list, "maintenance set python ",
|
||||
class_deprecated, gdb_stdout);
|
||||
}
|
||||
|
||||
/* Function for use by 'maint show python' prefix command. */
|
||||
|
||||
static void
|
||||
maint_show_python (char *args, int from_tty)
|
||||
{
|
||||
cmd_show_list (maint_show_python_list, from_tty, "");
|
||||
}
|
||||
|
||||
/* Function for use by 'set python' prefix command. */
|
||||
|
||||
static void
|
||||
|
|
@ -1138,33 +1159,6 @@ This command is only a placeholder.")
|
|||
#endif /* HAVE_PYTHON */
|
||||
);
|
||||
|
||||
add_prefix_cmd ("python", no_class, maint_show_python,
|
||||
_("Prefix command for python maintenance settings."),
|
||||
&maint_show_python_list, "maintenance show python ", 0,
|
||||
&maintenance_show_cmdlist);
|
||||
add_prefix_cmd ("python", no_class, maint_set_python,
|
||||
_("Prefix command for python maintenance settings."),
|
||||
&maint_set_python_list, "maintenance set python ", 0,
|
||||
&maintenance_set_cmdlist);
|
||||
|
||||
add_setshow_boolean_cmd ("print-stack", class_maintenance,
|
||||
&gdbpy_should_print_stack, _("\
|
||||
Enable or disable printing of Python stack dump on error."), _("\
|
||||
Show whether Python stack will be printed on error."), _("\
|
||||
Enables or disables printing of Python stack traces."),
|
||||
NULL, NULL,
|
||||
&maint_set_python_list,
|
||||
&maint_show_python_list);
|
||||
|
||||
/* Deprecate maint set/show python print-stack in favour of
|
||||
non-maintenance alternatives. */
|
||||
cmd_name = "print-stack";
|
||||
cmd = lookup_cmd (&cmd_name, maint_set_python_list, "", -1, 0);
|
||||
deprecate_cmd (cmd, "set python print-stack");
|
||||
cmd_name = "print-stack"; /* Reset name. */
|
||||
cmd = lookup_cmd (&cmd_name, maint_show_python_list, "", -1, 0);
|
||||
deprecate_cmd (cmd, "show python print-stack");
|
||||
|
||||
/* Add set/show python print-stack. */
|
||||
add_prefix_cmd ("python", no_class, user_show_python,
|
||||
_("Prefix command for python preference settings."),
|
||||
|
|
@ -1176,14 +1170,16 @@ Enables or disables printing of Python stack traces."),
|
|||
&user_set_python_list, "set python ", 0,
|
||||
&setlist);
|
||||
|
||||
add_setshow_boolean_cmd ("print-stack", no_class,
|
||||
&gdbpy_should_print_stack, _("\
|
||||
Enable or disable printing of Python stack dump on error."), _("\
|
||||
Show whether Python stack will be printed on error."), _("\
|
||||
Enables or disables printing of Python stack traces."),
|
||||
NULL, NULL,
|
||||
&user_set_python_list,
|
||||
&user_show_python_list);
|
||||
add_setshow_enum_cmd ("print-stack", no_class, python_excp_enums,
|
||||
&gdbpy_should_print_stack, _("\
|
||||
Set mode for Python stack dump on error."), _("\
|
||||
Show the mode of Python stack printing on error."), _("\
|
||||
none == no stack or message will be printed.\n\
|
||||
full == a message and a stack will be printed.\n\
|
||||
message == an error message without a stack will be printed."),
|
||||
NULL, NULL,
|
||||
&user_set_python_list,
|
||||
&user_show_python_list);
|
||||
|
||||
#ifdef HAVE_PYTHON
|
||||
#ifdef WITH_PYTHON_PATH
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue