
Unfortunately, PyGetSetDef's 'name' and 'doc' members are 'char *' instead of 'const char *', meaning that in order to list-initialize PyGetSetDef arrays using string literals requires writing explicit 'char *' casts. For example: static PyGetSetDef value_object_getset[] = { - { "address", valpy_get_address, NULL, "The address of the value.", + { (char *) "address", valpy_get_address, NULL, + (char *) "The address of the value.", NULL }, - { "is_optimized_out", valpy_get_is_optimized_out, NULL, - "Boolean telling whether the value is optimized " + { (char *) "is_optimized_out", valpy_get_is_optimized_out, NULL, + (char *) "Boolean telling whether the value is optimized " "out (i.e., not available).", NULL }, - { "type", valpy_get_type, NULL, "Type of the value.", NULL }, - { "dynamic_type", valpy_get_dynamic_type, NULL, - "Dynamic type of the value.", NULL }, - { "is_lazy", valpy_get_is_lazy, NULL, - "Boolean telling whether the value is lazy (not fetched yet\n\ + { (char *) "type", valpy_get_type, NULL, + (char *) "Type of the value.", NULL }, + { (char *) "dynamic_type", valpy_get_dynamic_type, NULL, + (char *) "Dynamic type of the value.", NULL }, + { (char *) "is_lazy", valpy_get_is_lazy, NULL, + (char *) "Boolean telling whether the value is lazy (not fetched yet\n\ from the inferior). A lazy value is fetched when needed, or when\n\ the \"fetch_lazy()\" method is called.", NULL }, {NULL} /* Sentinel */ We have ~20 such arrays, and I first wrote a patch that fixed all of them like that... It's not pretty... One way to make these a bit less ugly would be add a new macro that hides the casts, like: #define GDBPY_GSDEF(NAME, GET, SET, DOC, CLOSURE) \ { (char *) NAME, GET, SET, (char *) DOC, CLOSURE } and then use it like: static PyGetSetDef value_object_getset[] = { GDBPY_GSDEF ("address", valpy_get_address, NULL, "The address of the value.", NULL), GDBPY_GSDEF ("is_optimized_out", valpy_get_is_optimized_out, NULL, "Boolean telling whether the value is optimized ", NULL), {NULL} /* Sentinel */ }; But since we have C++11, which gives us constexpr and list initialization, I thought of a way that requires no changes where the arrays are initialized: We add a new type that extends PyGetSetDef (called gdb_PyGetSetDef), and add constexpr constructors that accept const 'name' and 'doc', and then list/aggregate initialization simply "calls" these matching constructors instead. I put "calls" in quotes, because given "constexpr", it's all done at compile time, and there's no overhead either in binary size or at run time. In fact, we get identical binaries, before/after this change. Unlike the fixes that fix some old Python API to match the API of more recent Python, this switches to using explicit "gdb_PyGetSetDef" everywhere, just to be clear that we are using our own version of it. gdb/ChangeLog: 2017-04-05 Pedro Alves <palves@redhat.com> * python/python-internal.h (gdb_PyGetSetDef): New type. * python/py-block.c (block_object_getset) (breakpoint_object_getset): Now a gdb_PyGetSetDef array. * python/py-event.c (event_object_getset) (finish_breakpoint_object_getset): Likewise. * python/py-inferior.c (inferior_object_getset): Likewise. * python/py-infthread.c (thread_object_getset): Likewise. * python/py-lazy-string.c (lazy_string_object_getset): Likewise. * python/py-linetable.c (linetable_entry_object_getset): Likewise. * python/py-objfile.c (objfile_getset): Likewise. * python/py-progspace.c (pspace_getset): Likewise. * python/py-record-btrace.c (btpy_insn_getset, btpy_call_getset): Likewise. * python/py-record.c (recpy_record_getset): Likewise. * python/py-symbol.c (symbol_object_getset): Likewise. * python/py-symtab.c (symtab_object_getset, sal_object_getset): Likewise. * python/py-type.c (type_object_getset, field_object_getset): Likewise. * python/py-value.c (value_object_getset): Likewise.
163 lines
5.5 KiB
C
163 lines
5.5 KiB
C
/* Python interface to inferior events.
|
|
|
|
Copyright (C) 2009-2017 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 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
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, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#include "defs.h"
|
|
#include "py-event.h"
|
|
|
|
void
|
|
evpy_dealloc (PyObject *self)
|
|
{
|
|
Py_XDECREF (((event_object *) self)->dict);
|
|
Py_TYPE (self)->tp_free (self);
|
|
}
|
|
|
|
PyObject *
|
|
create_event_object (PyTypeObject *py_type)
|
|
{
|
|
gdbpy_ref<event_object> event_obj (PyObject_New (event_object, py_type));
|
|
if (event_obj == NULL)
|
|
return NULL;
|
|
|
|
event_obj->dict = PyDict_New ();
|
|
if (!event_obj->dict)
|
|
return NULL;
|
|
|
|
return (PyObject*) event_obj.release ();
|
|
}
|
|
|
|
/* Add the attribute ATTR to the event object EVENT. In
|
|
python this attribute will be accessible by the name NAME.
|
|
returns 0 if the operation succeeds and -1 otherwise. This
|
|
function acquires a new reference to ATTR. */
|
|
|
|
int
|
|
evpy_add_attribute (PyObject *event, char *name, PyObject *attr)
|
|
{
|
|
return PyObject_SetAttrString (event, name, attr);
|
|
}
|
|
|
|
/* Initialize the Python event code. */
|
|
|
|
int
|
|
gdbpy_initialize_event (void)
|
|
{
|
|
return gdbpy_initialize_event_generic (&event_object_type,
|
|
"Event");
|
|
}
|
|
|
|
/* Initialize the given event type. If BASE is not NULL it will
|
|
be set as the types base.
|
|
Returns 0 if initialization was successful -1 otherwise. */
|
|
|
|
int
|
|
gdbpy_initialize_event_generic (PyTypeObject *type,
|
|
char *name)
|
|
{
|
|
if (PyType_Ready (type) < 0)
|
|
return -1;
|
|
|
|
return gdb_pymodule_addobject (gdb_module, name, (PyObject *) type);
|
|
}
|
|
|
|
|
|
/* Notify the list of listens that the given EVENT has occurred.
|
|
returns 0 if emit is successful -1 otherwise. */
|
|
|
|
int
|
|
evpy_emit_event (PyObject *event,
|
|
eventregistry_object *registry)
|
|
{
|
|
Py_ssize_t i;
|
|
|
|
/* Create a copy of call back list and use that for
|
|
notifying listeners to avoid skipping callbacks
|
|
in the case of a callback being disconnected during
|
|
a notification. */
|
|
gdbpy_ref<> callback_list_copy (PySequence_List (registry->callbacks));
|
|
if (callback_list_copy == NULL)
|
|
return -1;
|
|
|
|
for (i = 0; i < PyList_Size (callback_list_copy.get ()); i++)
|
|
{
|
|
PyObject *func = PyList_GetItem (callback_list_copy.get (), i);
|
|
|
|
if (func == NULL)
|
|
return -1;
|
|
|
|
gdbpy_ref<> func_result (PyObject_CallFunctionObjArgs (func, event,
|
|
NULL));
|
|
|
|
if (func_result == NULL)
|
|
{
|
|
/* Print the trace here, but keep going -- we want to try to
|
|
call all of the callbacks even if one is broken. */
|
|
gdbpy_print_stack ();
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static gdb_PyGetSetDef event_object_getset[] =
|
|
{
|
|
{ "__dict__", gdb_py_generic_dict, NULL,
|
|
"The __dict__ for this event.", &event_object_type },
|
|
{ NULL }
|
|
};
|
|
|
|
PyTypeObject event_object_type =
|
|
{
|
|
PyVarObject_HEAD_INIT (NULL, 0)
|
|
"gdb.Event", /* tp_name */
|
|
sizeof (event_object), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
evpy_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
0, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
0, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
"GDB event object", /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
0, /* tp_methods */
|
|
0, /* tp_members */
|
|
event_object_getset, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
offsetof (event_object, dict), /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
0 /* tp_alloc */
|
|
};
|