e36122e9d7
In C, we can forward declare static structure instances. That doesn't work in C++ though. C++ treats these as definitions. So then the compiler complains about symbol redefinition, like: src/gdb/elfread.c:1569:29: error: redefinition of ‘const sym_fns elf_sym_fns_lazy_psyms’ src/gdb/elfread.c:53:29: error: ‘const sym_fns elf_sym_fns_lazy_psyms’ previously declared here The intent of static here is naturally to avoid making these objects visible outside the compilation unit. The equivalent in C++ would be to instead define the objects in the anonymous namespace. But given that it's desirable to leave the codebase compiling as both C and C++ for a while, this just makes the objects extern. (base_breakpoint_ops is already declared in breakpoint.h, so we can just remove the forward declare from breakpoint.c) gdb/ChangeLog: 2015-02-11 Tom Tromey <tromey@redhat.com> Pedro Alves <palves@redhat.com> * breakpoint.c (base_breakpoint_ops): Delete. * dwarf2loc.c (dwarf_expr_ctx_funcs): Make extern. * elfread.c (elf_sym_fns_gdb_index, elf_sym_fns_lazy_psyms): Make extern. * guile/guile.c (guile_extension_script_ops, guile_extension_ops): Make extern. * ppcnbsd-tdep.c (ppcnbsd2_sigtramp): Make extern. * python/py-arch.c (arch_object_type): Make extern. * python/py-block.c (block_syms_iterator_object_type): Make extern. * python/py-bpevent.c (breakpoint_event_object_type): Make extern. * python/py-cmd.c (cmdpy_object_type): Make extern. * python/py-continueevent.c (continue_event_object_type) * python/py-event.h (GDBPY_NEW_EVENT_TYPE): Remove 'qual' parameter. Update all callers. * python/py-evtregistry.c (eventregistry_object_type): Make extern. * python/py-exitedevent.c (exited_event_object_type): Make extern. * python/py-finishbreakpoint.c (finish_breakpoint_object_type): Make extern. * python/py-function.c (fnpy_object_type): Make extern. * python/py-inferior.c (inferior_object_type, membuf_object_type): Make extern. * python/py-infevents.c (call_pre_event_object_type) (inferior_call_post_event_object_type). (memory_changed_event_object_type): Make extern. * python/py-infthread.c (thread_object_type): Make extern. * python/py-lazy-string.c (lazy_string_object_type): Make extern. * python/py-linetable.c (linetable_entry_object_type) (linetable_object_type, ltpy_iterator_object_type): Make extern. * python/py-newobjfileevent.c (new_objfile_event_object_type) (clear_objfiles_event_object_type): Make extern. * python/py-objfile.c (objfile_object_type): Make extern. * python/py-param.c (parmpy_object_type): Make extern. * python/py-progspace.c (pspace_object_type): Make extern. * python/py-signalevent.c (signal_event_object_type): Make extern. * python/py-symtab.c (symtab_object_type, sal_object_type): Make extern. * python/py-type.c (type_object_type, field_object_type) (type_iterator_object_type): Make extern. * python/python.c (python_extension_script_ops) (python_extension_ops): Make extern. * stap-probe.c (stap_probe_ops): Make extern.
175 lines
5.7 KiB
C
175 lines
5.7 KiB
C
/* Python interface to inferior thread event registries.
|
|
|
|
Copyright (C) 2009-2015 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 "command.h"
|
|
#include "py-events.h"
|
|
|
|
events_object gdb_py_events;
|
|
|
|
extern PyTypeObject eventregistry_object_type
|
|
CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("eventregistry_object");
|
|
|
|
/* Implementation of EventRegistry.connect () -> NULL.
|
|
Add FUNCTION to the list of listeners. */
|
|
|
|
static PyObject *
|
|
evregpy_connect (PyObject *self, PyObject *function)
|
|
{
|
|
PyObject *func;
|
|
PyObject *callback_list = (((eventregistry_object *) self)->callbacks);
|
|
|
|
if (!PyArg_ParseTuple (function, "O", &func))
|
|
return NULL;
|
|
|
|
if (!PyCallable_Check (func))
|
|
{
|
|
PyErr_SetString (PyExc_RuntimeError, "Function is not callable");
|
|
return NULL;
|
|
}
|
|
|
|
if (PyList_Append (callback_list, func) < 0)
|
|
return NULL;
|
|
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
/* Implementation of EventRegistry.disconnect () -> NULL.
|
|
Remove FUNCTION from the list of listeners. */
|
|
|
|
static PyObject *
|
|
evregpy_disconnect (PyObject *self, PyObject *function)
|
|
{
|
|
PyObject *func;
|
|
int index;
|
|
PyObject *callback_list = (((eventregistry_object *) self)->callbacks);
|
|
|
|
if (!PyArg_ParseTuple (function, "O", &func))
|
|
return NULL;
|
|
|
|
index = PySequence_Index (callback_list, func);
|
|
if (index < 0)
|
|
Py_RETURN_NONE;
|
|
|
|
if (PySequence_DelItem (callback_list, index) < 0)
|
|
return NULL;
|
|
|
|
Py_RETURN_NONE;
|
|
}
|
|
|
|
/* Create a new event registry. This function uses PyObject_New
|
|
and therefore returns a new reference that callers must handle. */
|
|
|
|
eventregistry_object *
|
|
create_eventregistry_object (void)
|
|
{
|
|
eventregistry_object *eventregistry_obj;
|
|
|
|
eventregistry_obj = PyObject_New (eventregistry_object,
|
|
&eventregistry_object_type);
|
|
|
|
if (!eventregistry_obj)
|
|
return NULL;
|
|
|
|
eventregistry_obj->callbacks = PyList_New (0);
|
|
if (!eventregistry_obj->callbacks)
|
|
{
|
|
Py_DECREF (eventregistry_obj);
|
|
return NULL;
|
|
}
|
|
|
|
return eventregistry_obj;
|
|
}
|
|
|
|
static void
|
|
evregpy_dealloc (PyObject *self)
|
|
{
|
|
Py_XDECREF (((eventregistry_object *) self)->callbacks);
|
|
Py_TYPE (self)->tp_free (self);
|
|
}
|
|
|
|
/* Initialize the Python event registry code. */
|
|
|
|
int
|
|
gdbpy_initialize_eventregistry (void)
|
|
{
|
|
if (PyType_Ready (&eventregistry_object_type) < 0)
|
|
return -1;
|
|
|
|
return gdb_pymodule_addobject (gdb_module, "EventRegistry",
|
|
(PyObject *) &eventregistry_object_type);
|
|
}
|
|
|
|
/* Retern the number of listeners currently connected to this
|
|
registry. */
|
|
|
|
int
|
|
evregpy_no_listeners_p (eventregistry_object *registry)
|
|
{
|
|
return PyList_Size (registry->callbacks) == 0;
|
|
}
|
|
|
|
static PyMethodDef eventregistry_object_methods[] =
|
|
{
|
|
{ "connect", evregpy_connect, METH_VARARGS, "Add function" },
|
|
{ "disconnect", evregpy_disconnect, METH_VARARGS, "Remove function" },
|
|
{ NULL } /* Sentinel. */
|
|
};
|
|
|
|
PyTypeObject eventregistry_object_type =
|
|
{
|
|
PyVarObject_HEAD_INIT (NULL, 0)
|
|
"gdb.EventRegistry", /* tp_name */
|
|
sizeof (eventregistry_object), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
evregpy_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, /* tp_flags */
|
|
"GDB event registry object", /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
eventregistry_object_methods, /* tp_methods */
|
|
0, /* tp_members */
|
|
0, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
0, /* tp_init */
|
|
0 /* tp_alloc */
|
|
};
|