2010-06-28 21:16:04 +00:00
|
|
|
/* Python interface to inferior threads.
|
|
|
|
|
2015-01-01 09:32:14 +00:00
|
|
|
Copyright (C) 2009-2015 Free Software Foundation, Inc.
|
2010-06-28 21:16:04 +00:00
|
|
|
|
|
|
|
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 "gdbthread.h"
|
|
|
|
#include "inferior.h"
|
|
|
|
#include "python-internal.h"
|
|
|
|
|
Fix redefinition errors in C++ mode
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.
2015-02-11 11:20:21 +00:00
|
|
|
extern PyTypeObject thread_object_type
|
2013-05-20 20:09:01 +00:00
|
|
|
CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("thread_object");
|
2010-06-28 21:16:04 +00:00
|
|
|
|
|
|
|
/* Require that INFERIOR be a valid inferior ID. */
|
|
|
|
#define THPY_REQUIRE_VALID(Thread) \
|
|
|
|
do { \
|
|
|
|
if (!Thread->thread) \
|
|
|
|
{ \
|
|
|
|
PyErr_SetString (PyExc_RuntimeError, \
|
|
|
|
_("Thread no longer exists.")); \
|
|
|
|
return NULL; \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
thread_object *
|
|
|
|
create_thread_object (struct thread_info *tp)
|
|
|
|
{
|
|
|
|
thread_object *thread_obj;
|
|
|
|
|
|
|
|
thread_obj = PyObject_New (thread_object, &thread_object_type);
|
|
|
|
if (!thread_obj)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
thread_obj->thread = tp;
|
2013-09-30 11:50:12 +00:00
|
|
|
thread_obj->inf_obj = find_inferior_object (ptid_get_pid (tp->ptid));
|
2010-06-28 21:16:04 +00:00
|
|
|
|
|
|
|
return thread_obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
thpy_dealloc (PyObject *self)
|
|
|
|
{
|
|
|
|
Py_DECREF (((thread_object *) self)->inf_obj);
|
2012-12-12 16:47:30 +00:00
|
|
|
Py_TYPE (self)->tp_free (self);
|
2010-06-28 21:16:04 +00:00
|
|
|
}
|
|
|
|
|
2011-01-19 17:21:39 +00:00
|
|
|
static PyObject *
|
|
|
|
thpy_get_name (PyObject *self, void *ignore)
|
|
|
|
{
|
|
|
|
thread_object *thread_obj = (thread_object *) self;
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
THPY_REQUIRE_VALID (thread_obj);
|
|
|
|
|
|
|
|
name = thread_obj->thread->name;
|
|
|
|
if (name == NULL)
|
|
|
|
name = target_thread_name (thread_obj->thread);
|
|
|
|
|
|
|
|
if (name == NULL)
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
|
|
|
|
return PyString_FromString (name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
thpy_set_name (PyObject *self, PyObject *newvalue, void *ignore)
|
|
|
|
{
|
|
|
|
thread_object *thread_obj = (thread_object *) self;
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
if (! thread_obj->thread)
|
|
|
|
{
|
|
|
|
PyErr_SetString (PyExc_RuntimeError, _("Thread no longer exists."));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (newvalue == NULL)
|
|
|
|
{
|
2013-11-29 20:00:47 +00:00
|
|
|
PyErr_SetString (PyExc_TypeError,
|
2011-01-19 17:21:39 +00:00
|
|
|
_("Cannot delete `name' attribute."));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else if (newvalue == Py_None)
|
|
|
|
name = NULL;
|
|
|
|
else if (! gdbpy_is_string (newvalue))
|
|
|
|
{
|
|
|
|
PyErr_SetString (PyExc_TypeError,
|
|
|
|
_("The value of `name' must be a string."));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
name = python_string_to_host_string (newvalue);
|
|
|
|
if (! name)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
xfree (thread_obj->thread->name);
|
|
|
|
thread_obj->thread->name = name;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-06-28 21:16:04 +00:00
|
|
|
static PyObject *
|
|
|
|
thpy_get_num (PyObject *self, void *closure)
|
|
|
|
{
|
|
|
|
thread_object *thread_obj = (thread_object *) self;
|
|
|
|
|
|
|
|
THPY_REQUIRE_VALID (thread_obj);
|
|
|
|
|
|
|
|
return PyLong_FromLong (thread_obj->thread->num);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Getter for InferiorThread.ptid -> (pid, lwp, tid).
|
|
|
|
Returns a tuple with the thread's ptid components. */
|
2014-12-02 18:01:07 +00:00
|
|
|
|
2010-06-28 21:16:04 +00:00
|
|
|
static PyObject *
|
|
|
|
thpy_get_ptid (PyObject *self, void *closure)
|
|
|
|
{
|
|
|
|
int pid;
|
|
|
|
long tid, lwp;
|
|
|
|
thread_object *thread_obj = (thread_object *) self;
|
|
|
|
|
|
|
|
THPY_REQUIRE_VALID (thread_obj);
|
|
|
|
|
New python events: inferior call, register/memory changed.
gdb/ChangeLog:
* NEWS: Mention new Python events.
* Makefile.in (SUBDIR_PYTHON_OBS): Add py-infevents.o.
(SUBDIR_PYTHON_SRCS): Add py-infevents.c.
(py-infevents.o): New rule.
* doc/observer.texi (inferior_call_pre, inferior_call_post)
(memory_changed, register_changed): New observers.
* infcall.c (call_function_by_hand): Notify observer before and
after inferior call.
* python/py-event.h (inferior_call_kind): New enum.
(emit_inferior_call_event): New prototype.
(emit_register_changed_event): New prototype.
(emit_memory_changed_event): New prototype.
* python/py-events.h (events_object): New registries
inferior_call, memory_changed and register_changed.
* python/py-evts.c (gdbpy_initialize_py_events): Add the
inferior_call, memory_changed and register_changed registries.
* python/py-infevents.c: New.
* python/py-inferior.c (python_on_inferior_call_pre)
(python_on_inferior_call_post, python_on_register_change)
(python_on_memory_change): New functions.
(gdbpy_initialize_inferior): Attach python handler to new
observers.
* python/py-infthread.c(gdbpy_create_ptid_object): New.
(thpy_get_ptid) Use gdbpy_create_ptid_object.
* python/python-internal.h:
(gdbpy_create_ptid_object)
(gdbpy_initialize_inferior_call_pre_event)
(gdbpy_initialize_inferior_call_post_event)
(gdbpy_initialize_register_changed_event)
(gdbpy_initialize_memory_changed_event): New prototypes.
* python/python.c (_initialize_python): Initialize new events.
* valops.c (value_assign): Notify register_changed observer.
gdb/doc/ChangeLog:
* python.texi (Events In Python): Document new events
InferiorCallPreEvent, InferiorCallPostEvent, MemoryChangedEvent
and RegisterChangedEvent.
gdb/testsuite/ChangeLog:
* gdb.python/py-events.py (inferior_call_handler): New.
(register_changed_handler, memory_changed_handler): New.
(test_events.invoke): Register new handlers.
* gdb.python/py-events.exp: Add tests for inferior call,
memory_changed and register_changed events.
2014-12-02 19:15:29 +00:00
|
|
|
return gdbpy_create_ptid_object (thread_obj->thread->ptid);
|
2010-06-28 21:16:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Implementation of InferiorThread.switch ().
|
|
|
|
Makes this the GDB selected thread. */
|
2014-12-02 18:01:07 +00:00
|
|
|
|
2010-06-28 21:16:04 +00:00
|
|
|
static PyObject *
|
|
|
|
thpy_switch (PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
thread_object *thread_obj = (thread_object *) self;
|
|
|
|
|
|
|
|
THPY_REQUIRE_VALID (thread_obj);
|
|
|
|
|
Split TRY_CATCH into TRY + CATCH
This patch splits the TRY_CATCH macro into three, so that we go from
this:
~~~
volatile gdb_exception ex;
TRY_CATCH (ex, RETURN_MASK_ERROR)
{
}
if (ex.reason < 0)
{
}
~~~
to this:
~~~
TRY
{
}
CATCH (ex, RETURN_MASK_ERROR)
{
}
END_CATCH
~~~
Thus, we'll be getting rid of the local volatile exception object, and
declaring the caught exception in the catch block.
This allows reimplementing TRY/CATCH in terms of C++ exceptions when
building in C++ mode, while still allowing to build GDB in C mode
(using setjmp/longjmp), as a transition step.
TBC, after this patch, is it _not_ valid to have code between the TRY
and the CATCH blocks, like:
TRY
{
}
// some code here.
CATCH (ex, RETURN_MASK_ERROR)
{
}
END_CATCH
Just like it isn't valid to do that with C++'s native try/catch.
By switching to creating the exception object inside the CATCH block
scope, we can get rid of all the explicitly allocated volatile
exception objects all over the tree, and map the CATCH block more
directly to C++'s catch blocks.
The majority of the TRY_CATCH -> TRY+CATCH+END_CATCH conversion was
done with a script, rerun from scratch at every rebase, no manual
editing involved. After the mechanical conversion, a few places
needed manual intervention, to fix preexisting cases where we were
using the exception object outside of the TRY_CATCH block, and cases
where we were using "else" after a 'if (ex.reason) < 0)' [a CATCH
after this patch]. The result was folded into this patch so that GDB
still builds at each incremental step.
END_CATCH is necessary for two reasons:
First, because we name the exception object in the CATCH block, which
requires creating a scope, which in turn must be closed somewhere.
Declaring the exception variable in the initializer field of a for
block, like:
#define CATCH(EXCEPTION, mask) \
for (struct gdb_exception EXCEPTION; \
exceptions_state_mc_catch (&EXCEPTION, MASK); \
EXCEPTION = exception_none)
would avoid needing END_CATCH, but alas, in C mode, we build with C90,
which doesn't allow mixed declarations and code.
Second, because when TRY/CATCH are wired to real C++ try/catch, as
long as we need to handle cleanup chains, even if there's no CATCH
block that wants to catch the exception, we need for stop at every
frame in the unwind chain and run cleanups, then rethrow. That will
be done in END_CATCH.
After we require C++, we'll still need TRY/CATCH/END_CATCH until
cleanups are completely phased out -- TRY/CATCH in C++ mode will
save/restore the current cleanup chain, like in C mode, and END_CATCH
catches otherwise uncaugh exceptions, runs cleanups and rethrows, so
that C++ cleanups and exceptions can coexist.
IMO, this still makes the TRY/CATCH code look a bit more like a
newcomer would expect, so IMO worth it even if we weren't considering
C++.
gdb/ChangeLog.
2015-03-07 Pedro Alves <palves@redhat.com>
* common/common-exceptions.c (struct catcher) <exception>: No
longer a pointer to volatile exception. Now an exception value.
<mask>: Delete field.
(exceptions_state_mc_init): Remove all parameters. Adjust.
(exceptions_state_mc): No longer pop the catcher here.
(exceptions_state_mc_catch): New function.
(throw_exception): Adjust.
* common/common-exceptions.h (exceptions_state_mc_init): Remove
all parameters.
(exceptions_state_mc_catch): Declare.
(TRY_CATCH): Rename to ...
(TRY): ... this. Remove EXCEPTION and MASK parameters.
(CATCH, END_CATCH): New.
All callers adjusted.
gdb/gdbserver/ChangeLog:
2015-03-07 Pedro Alves <palves@redhat.com>
Adjust all callers of TRY_CATCH to use TRY/CATCH/END_CATCH
instead.
2015-03-07 15:14:14 +00:00
|
|
|
TRY
|
2010-06-28 21:16:04 +00:00
|
|
|
{
|
|
|
|
switch_to_thread (thread_obj->thread->ptid);
|
|
|
|
}
|
Split TRY_CATCH into TRY + CATCH
This patch splits the TRY_CATCH macro into three, so that we go from
this:
~~~
volatile gdb_exception ex;
TRY_CATCH (ex, RETURN_MASK_ERROR)
{
}
if (ex.reason < 0)
{
}
~~~
to this:
~~~
TRY
{
}
CATCH (ex, RETURN_MASK_ERROR)
{
}
END_CATCH
~~~
Thus, we'll be getting rid of the local volatile exception object, and
declaring the caught exception in the catch block.
This allows reimplementing TRY/CATCH in terms of C++ exceptions when
building in C++ mode, while still allowing to build GDB in C mode
(using setjmp/longjmp), as a transition step.
TBC, after this patch, is it _not_ valid to have code between the TRY
and the CATCH blocks, like:
TRY
{
}
// some code here.
CATCH (ex, RETURN_MASK_ERROR)
{
}
END_CATCH
Just like it isn't valid to do that with C++'s native try/catch.
By switching to creating the exception object inside the CATCH block
scope, we can get rid of all the explicitly allocated volatile
exception objects all over the tree, and map the CATCH block more
directly to C++'s catch blocks.
The majority of the TRY_CATCH -> TRY+CATCH+END_CATCH conversion was
done with a script, rerun from scratch at every rebase, no manual
editing involved. After the mechanical conversion, a few places
needed manual intervention, to fix preexisting cases where we were
using the exception object outside of the TRY_CATCH block, and cases
where we were using "else" after a 'if (ex.reason) < 0)' [a CATCH
after this patch]. The result was folded into this patch so that GDB
still builds at each incremental step.
END_CATCH is necessary for two reasons:
First, because we name the exception object in the CATCH block, which
requires creating a scope, which in turn must be closed somewhere.
Declaring the exception variable in the initializer field of a for
block, like:
#define CATCH(EXCEPTION, mask) \
for (struct gdb_exception EXCEPTION; \
exceptions_state_mc_catch (&EXCEPTION, MASK); \
EXCEPTION = exception_none)
would avoid needing END_CATCH, but alas, in C mode, we build with C90,
which doesn't allow mixed declarations and code.
Second, because when TRY/CATCH are wired to real C++ try/catch, as
long as we need to handle cleanup chains, even if there's no CATCH
block that wants to catch the exception, we need for stop at every
frame in the unwind chain and run cleanups, then rethrow. That will
be done in END_CATCH.
After we require C++, we'll still need TRY/CATCH/END_CATCH until
cleanups are completely phased out -- TRY/CATCH in C++ mode will
save/restore the current cleanup chain, like in C mode, and END_CATCH
catches otherwise uncaugh exceptions, runs cleanups and rethrows, so
that C++ cleanups and exceptions can coexist.
IMO, this still makes the TRY/CATCH code look a bit more like a
newcomer would expect, so IMO worth it even if we weren't considering
C++.
gdb/ChangeLog.
2015-03-07 Pedro Alves <palves@redhat.com>
* common/common-exceptions.c (struct catcher) <exception>: No
longer a pointer to volatile exception. Now an exception value.
<mask>: Delete field.
(exceptions_state_mc_init): Remove all parameters. Adjust.
(exceptions_state_mc): No longer pop the catcher here.
(exceptions_state_mc_catch): New function.
(throw_exception): Adjust.
* common/common-exceptions.h (exceptions_state_mc_init): Remove
all parameters.
(exceptions_state_mc_catch): Declare.
(TRY_CATCH): Rename to ...
(TRY): ... this. Remove EXCEPTION and MASK parameters.
(CATCH, END_CATCH): New.
All callers adjusted.
gdb/gdbserver/ChangeLog:
2015-03-07 Pedro Alves <palves@redhat.com>
Adjust all callers of TRY_CATCH to use TRY/CATCH/END_CATCH
instead.
2015-03-07 15:14:14 +00:00
|
|
|
CATCH (except, RETURN_MASK_ALL)
|
|
|
|
{
|
|
|
|
GDB_PY_HANDLE_EXCEPTION (except);
|
|
|
|
}
|
|
|
|
END_CATCH
|
2010-06-28 21:16:04 +00:00
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Implementation of InferiorThread.is_stopped () -> Boolean.
|
|
|
|
Return whether the thread is stopped. */
|
2014-12-02 18:01:07 +00:00
|
|
|
|
2010-06-28 21:16:04 +00:00
|
|
|
static PyObject *
|
|
|
|
thpy_is_stopped (PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
thread_object *thread_obj = (thread_object *) self;
|
|
|
|
|
|
|
|
THPY_REQUIRE_VALID (thread_obj);
|
|
|
|
|
|
|
|
if (is_stopped (thread_obj->thread->ptid))
|
|
|
|
Py_RETURN_TRUE;
|
|
|
|
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Implementation of InferiorThread.is_running () -> Boolean.
|
|
|
|
Return whether the thread is running. */
|
2014-12-02 18:01:07 +00:00
|
|
|
|
2010-06-28 21:16:04 +00:00
|
|
|
static PyObject *
|
|
|
|
thpy_is_running (PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
thread_object *thread_obj = (thread_object *) self;
|
|
|
|
|
|
|
|
THPY_REQUIRE_VALID (thread_obj);
|
|
|
|
|
|
|
|
if (is_running (thread_obj->thread->ptid))
|
|
|
|
Py_RETURN_TRUE;
|
|
|
|
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Implementation of InferiorThread.is_exited () -> Boolean.
|
|
|
|
Return whether the thread is exited. */
|
2014-12-02 18:01:07 +00:00
|
|
|
|
2010-06-28 21:16:04 +00:00
|
|
|
static PyObject *
|
|
|
|
thpy_is_exited (PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
thread_object *thread_obj = (thread_object *) self;
|
|
|
|
|
|
|
|
THPY_REQUIRE_VALID (thread_obj);
|
|
|
|
|
|
|
|
if (is_exited (thread_obj->thread->ptid))
|
|
|
|
Py_RETURN_TRUE;
|
|
|
|
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
}
|
|
|
|
|
2011-03-17 09:36:17 +00:00
|
|
|
/* Implementation of gdb.InfThread.is_valid (self) -> Boolean.
|
|
|
|
Returns True if this inferior Thread object still exists
|
|
|
|
in GDB. */
|
2010-06-28 21:16:04 +00:00
|
|
|
|
2011-03-17 09:36:17 +00:00
|
|
|
static PyObject *
|
|
|
|
thpy_is_valid (PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
thread_object *thread_obj = (thread_object *) self;
|
|
|
|
|
|
|
|
if (! thread_obj->thread)
|
|
|
|
Py_RETURN_FALSE;
|
|
|
|
|
|
|
|
Py_RETURN_TRUE;
|
|
|
|
}
|
2010-06-28 21:16:04 +00:00
|
|
|
|
New python events: inferior call, register/memory changed.
gdb/ChangeLog:
* NEWS: Mention new Python events.
* Makefile.in (SUBDIR_PYTHON_OBS): Add py-infevents.o.
(SUBDIR_PYTHON_SRCS): Add py-infevents.c.
(py-infevents.o): New rule.
* doc/observer.texi (inferior_call_pre, inferior_call_post)
(memory_changed, register_changed): New observers.
* infcall.c (call_function_by_hand): Notify observer before and
after inferior call.
* python/py-event.h (inferior_call_kind): New enum.
(emit_inferior_call_event): New prototype.
(emit_register_changed_event): New prototype.
(emit_memory_changed_event): New prototype.
* python/py-events.h (events_object): New registries
inferior_call, memory_changed and register_changed.
* python/py-evts.c (gdbpy_initialize_py_events): Add the
inferior_call, memory_changed and register_changed registries.
* python/py-infevents.c: New.
* python/py-inferior.c (python_on_inferior_call_pre)
(python_on_inferior_call_post, python_on_register_change)
(python_on_memory_change): New functions.
(gdbpy_initialize_inferior): Attach python handler to new
observers.
* python/py-infthread.c(gdbpy_create_ptid_object): New.
(thpy_get_ptid) Use gdbpy_create_ptid_object.
* python/python-internal.h:
(gdbpy_create_ptid_object)
(gdbpy_initialize_inferior_call_pre_event)
(gdbpy_initialize_inferior_call_post_event)
(gdbpy_initialize_register_changed_event)
(gdbpy_initialize_memory_changed_event): New prototypes.
* python/python.c (_initialize_python): Initialize new events.
* valops.c (value_assign): Notify register_changed observer.
gdb/doc/ChangeLog:
* python.texi (Events In Python): Document new events
InferiorCallPreEvent, InferiorCallPostEvent, MemoryChangedEvent
and RegisterChangedEvent.
gdb/testsuite/ChangeLog:
* gdb.python/py-events.py (inferior_call_handler): New.
(register_changed_handler, memory_changed_handler): New.
(test_events.invoke): Register new handlers.
* gdb.python/py-events.exp: Add tests for inferior call,
memory_changed and register_changed events.
2014-12-02 19:15:29 +00:00
|
|
|
/* Return a reference to a new Python object representing a ptid_t.
|
|
|
|
The object is a tuple containing (pid, lwp, tid). */
|
|
|
|
PyObject *
|
|
|
|
gdbpy_create_ptid_object (ptid_t ptid)
|
|
|
|
{
|
|
|
|
int pid;
|
|
|
|
long tid, lwp;
|
|
|
|
PyObject *ret;
|
|
|
|
|
|
|
|
ret = PyTuple_New (3);
|
|
|
|
if (!ret)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
pid = ptid_get_pid (ptid);
|
|
|
|
lwp = ptid_get_lwp (ptid);
|
|
|
|
tid = ptid_get_tid (ptid);
|
|
|
|
|
|
|
|
PyTuple_SET_ITEM (ret, 0, PyInt_FromLong (pid));
|
|
|
|
PyTuple_SET_ITEM (ret, 1, PyInt_FromLong (lwp));
|
|
|
|
PyTuple_SET_ITEM (ret, 2, PyInt_FromLong (tid));
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-06-28 21:16:04 +00:00
|
|
|
/* Implementation of gdb.selected_thread () -> gdb.InferiorThread.
|
|
|
|
Returns the selected thread object. */
|
2014-12-02 18:01:07 +00:00
|
|
|
|
2010-06-28 21:16:04 +00:00
|
|
|
PyObject *
|
|
|
|
gdbpy_selected_thread (PyObject *self, PyObject *args)
|
|
|
|
{
|
|
|
|
PyObject *thread_obj;
|
|
|
|
|
|
|
|
thread_obj = (PyObject *) find_thread_object (inferior_ptid);
|
|
|
|
if (thread_obj)
|
|
|
|
{
|
|
|
|
Py_INCREF (thread_obj);
|
|
|
|
return thread_obj;
|
|
|
|
}
|
|
|
|
|
|
|
|
Py_RETURN_NONE;
|
|
|
|
}
|
|
|
|
|
* python/py-arch.c (gdbpy_initialize_arch): Return 'int'.
Check errors.
* python/py-auto-load.c (gdbpy_initialize_auto_load): Return 'int'.
* python/py-block.c (gdbpy_initialize_blocks): Return 'int'.
Check errors.
* python/py-breakpoint.c (gdbpy_initialize_breakpoints): Return 'int'.
Check errors.
* python/py-cmd.c (gdbpy_initialize_commands): Return 'int'.
Check errors.
* python/py-event.c (gdbpy_initialize_event): Return 'int'.
Check errors.
* python/py-event.h (GDBPY_NEW_EVENT_TYPE): Change generated
init function to return 'int'.
* python/py-evtregistry.c (gdbpy_initialize_eventregistry):
Return 'int'. Check errors.
* python/py-evts.c (gdbpy_initialize_py_events): Return 'int'.
Check errors.
* python/py-finishbreakpoint.c (gdbpy_initialize_finishbreakpoints):
Return 'int'. Check errors.
* python/py-frame.c (gdbpy_initialize_frames): Return 'int'.
Check errors.
* python/py-function.c (gdbpy_initialize_functions): Return 'int'.
Check errors.
* python/py-gdb-readline.c (gdbpy_initialize_gdb_readline):
Check errors.
* python/py-inferior.c (gdbpy_initialize_inferior): Return 'int'.
Check errors.
* python/py-infthread.c (gdbpy_initialize_thread): Return 'int'.
Check errors.
* python/py-lazy-string.c (gdbpy_initialize_lazy_string): Return 'int'.
Check errors.
* python/py-objfile.c (gdbpy_initialize_objfile): Return 'int'.
Check errors.
* python/py-param.c (gdbpy_initialize_parameters): Return 'int'.
Check errors.
* python/py-progspace.c (gdbpy_initialize_pspace): Return 'int'.
Check errors.
* python/py-symbol.c (gdbpy_initialize_symbols): Return 'int'.
Check errors.
* python/py-symtab.c (gdbpy_initialize_symtabs): Return 'int'.
Check errors.
* python/py-type.c (gdbpy_initialize_types): Return 'int'.
Check errors.
* python/py-value.c (gdbpy_initialize_values): Return 'int'.
Check errors.
* python/python-internal.h (gdbpy_initialize_auto_load,
gdbpy_initialize_values, gdbpy_initialize_frames,
gdbpy_initialize_symtabs, gdbpy_initialize_commands,
gdbpy_initialize_symbols, gdbpy_initialize_symtabs,
gdbpy_initialize_blocks, gdbpy_initialize_types,
gdbpy_initialize_functions, gdbpy_initialize_pspace,
gdbpy_initialize_objfile, gdbpy_initialize_breakpoints,
gdbpy_initialize_finishbreakpoints,
gdbpy_initialize_lazy_string, gdbpy_initialize_parameters,
gdbpy_initialize_thread, gdbpy_initialize_inferior,
gdbpy_initialize_eventregistry, gdbpy_initialize_event,
gdbpy_initialize_py_events, gdbpy_initialize_stop_event,
gdbpy_initialize_signal_event,
gdbpy_initialize_breakpoint_event,
gdbpy_initialize_continue_event,
gdbpy_initialize_exited_event, gdbpy_initialize_thread_event,
gdbpy_initialize_new_objfile_event, gdbpy_initialize_arch):
Update. Use CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION.
* python/python.c (gdb_python_initialized): New global.
(gdbpy_initialize_events): Return 'int'. Check errors.
(_initialize_python): Check errors. Set
gdb_python_initialized.
2013-05-20 20:28:52 +00:00
|
|
|
int
|
2010-06-28 21:16:04 +00:00
|
|
|
gdbpy_initialize_thread (void)
|
|
|
|
{
|
|
|
|
if (PyType_Ready (&thread_object_type) < 0)
|
* python/py-arch.c (gdbpy_initialize_arch): Return 'int'.
Check errors.
* python/py-auto-load.c (gdbpy_initialize_auto_load): Return 'int'.
* python/py-block.c (gdbpy_initialize_blocks): Return 'int'.
Check errors.
* python/py-breakpoint.c (gdbpy_initialize_breakpoints): Return 'int'.
Check errors.
* python/py-cmd.c (gdbpy_initialize_commands): Return 'int'.
Check errors.
* python/py-event.c (gdbpy_initialize_event): Return 'int'.
Check errors.
* python/py-event.h (GDBPY_NEW_EVENT_TYPE): Change generated
init function to return 'int'.
* python/py-evtregistry.c (gdbpy_initialize_eventregistry):
Return 'int'. Check errors.
* python/py-evts.c (gdbpy_initialize_py_events): Return 'int'.
Check errors.
* python/py-finishbreakpoint.c (gdbpy_initialize_finishbreakpoints):
Return 'int'. Check errors.
* python/py-frame.c (gdbpy_initialize_frames): Return 'int'.
Check errors.
* python/py-function.c (gdbpy_initialize_functions): Return 'int'.
Check errors.
* python/py-gdb-readline.c (gdbpy_initialize_gdb_readline):
Check errors.
* python/py-inferior.c (gdbpy_initialize_inferior): Return 'int'.
Check errors.
* python/py-infthread.c (gdbpy_initialize_thread): Return 'int'.
Check errors.
* python/py-lazy-string.c (gdbpy_initialize_lazy_string): Return 'int'.
Check errors.
* python/py-objfile.c (gdbpy_initialize_objfile): Return 'int'.
Check errors.
* python/py-param.c (gdbpy_initialize_parameters): Return 'int'.
Check errors.
* python/py-progspace.c (gdbpy_initialize_pspace): Return 'int'.
Check errors.
* python/py-symbol.c (gdbpy_initialize_symbols): Return 'int'.
Check errors.
* python/py-symtab.c (gdbpy_initialize_symtabs): Return 'int'.
Check errors.
* python/py-type.c (gdbpy_initialize_types): Return 'int'.
Check errors.
* python/py-value.c (gdbpy_initialize_values): Return 'int'.
Check errors.
* python/python-internal.h (gdbpy_initialize_auto_load,
gdbpy_initialize_values, gdbpy_initialize_frames,
gdbpy_initialize_symtabs, gdbpy_initialize_commands,
gdbpy_initialize_symbols, gdbpy_initialize_symtabs,
gdbpy_initialize_blocks, gdbpy_initialize_types,
gdbpy_initialize_functions, gdbpy_initialize_pspace,
gdbpy_initialize_objfile, gdbpy_initialize_breakpoints,
gdbpy_initialize_finishbreakpoints,
gdbpy_initialize_lazy_string, gdbpy_initialize_parameters,
gdbpy_initialize_thread, gdbpy_initialize_inferior,
gdbpy_initialize_eventregistry, gdbpy_initialize_event,
gdbpy_initialize_py_events, gdbpy_initialize_stop_event,
gdbpy_initialize_signal_event,
gdbpy_initialize_breakpoint_event,
gdbpy_initialize_continue_event,
gdbpy_initialize_exited_event, gdbpy_initialize_thread_event,
gdbpy_initialize_new_objfile_event, gdbpy_initialize_arch):
Update. Use CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION.
* python/python.c (gdb_python_initialized): New global.
(gdbpy_initialize_events): Return 'int'. Check errors.
(_initialize_python): Check errors. Set
gdb_python_initialized.
2013-05-20 20:28:52 +00:00
|
|
|
return -1;
|
2010-06-28 21:16:04 +00:00
|
|
|
|
2013-05-20 20:36:19 +00:00
|
|
|
return gdb_pymodule_addobject (gdb_module, "InferiorThread",
|
|
|
|
(PyObject *) &thread_object_type);
|
2010-06-28 21:16:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static PyGetSetDef thread_object_getset[] =
|
|
|
|
{
|
2011-01-19 17:21:39 +00:00
|
|
|
{ "name", thpy_get_name, thpy_set_name,
|
|
|
|
"The name of the thread, as set by the user or the OS.", NULL },
|
2010-06-28 21:16:04 +00:00
|
|
|
{ "num", thpy_get_num, NULL, "ID of the thread, as assigned by GDB.", NULL },
|
|
|
|
{ "ptid", thpy_get_ptid, NULL, "ID of the thread, as assigned by the OS.",
|
|
|
|
NULL },
|
|
|
|
|
|
|
|
{ NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
static PyMethodDef thread_object_methods[] =
|
|
|
|
{
|
2011-03-17 09:36:17 +00:00
|
|
|
{ "is_valid", thpy_is_valid, METH_NOARGS,
|
|
|
|
"is_valid () -> Boolean.\n\
|
|
|
|
Return true if this inferior thread is valid, false if not." },
|
2010-06-28 21:16:04 +00:00
|
|
|
{ "switch", thpy_switch, METH_NOARGS,
|
|
|
|
"switch ()\n\
|
|
|
|
Makes this the GDB selected thread." },
|
|
|
|
{ "is_stopped", thpy_is_stopped, METH_NOARGS,
|
|
|
|
"is_stopped () -> Boolean\n\
|
|
|
|
Return whether the thread is stopped." },
|
|
|
|
{ "is_running", thpy_is_running, METH_NOARGS,
|
|
|
|
"is_running () -> Boolean\n\
|
|
|
|
Return whether the thread is running." },
|
|
|
|
{ "is_exited", thpy_is_exited, METH_NOARGS,
|
|
|
|
"is_exited () -> Boolean\n\
|
|
|
|
Return whether the thread is exited." },
|
|
|
|
|
|
|
|
{ NULL }
|
|
|
|
};
|
|
|
|
|
Fix redefinition errors in C++ mode
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.
2015-02-11 11:20:21 +00:00
|
|
|
PyTypeObject thread_object_type =
|
2010-06-28 21:16:04 +00:00
|
|
|
{
|
2012-12-12 16:47:30 +00:00
|
|
|
PyVarObject_HEAD_INIT (NULL, 0)
|
2010-06-28 21:16:04 +00:00
|
|
|
"gdb.InferiorThread", /*tp_name*/
|
|
|
|
sizeof (thread_object), /*tp_basicsize*/
|
|
|
|
0, /*tp_itemsize*/
|
|
|
|
thpy_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_HAVE_ITER, /*tp_flags*/
|
|
|
|
"GDB thread object", /* tp_doc */
|
|
|
|
0, /* tp_traverse */
|
|
|
|
0, /* tp_clear */
|
|
|
|
0, /* tp_richcompare */
|
|
|
|
0, /* tp_weaklistoffset */
|
|
|
|
0, /* tp_iter */
|
|
|
|
0, /* tp_iternext */
|
|
|
|
thread_object_methods, /* tp_methods */
|
|
|
|
0, /* tp_members */
|
|
|
|
thread_object_getset, /* 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 */
|
|
|
|
};
|