gdb/python: introduce gdb.TargetConnection object type

This commit adds a new object type gdb.TargetConnection.  This new
type represents a connection within GDB (a connection as displayed by
'info connections').

There's three ways to find a gdb.TargetConnection, there's a new
'gdb.connections()' function, which returns a list of all currently
active connections.

Or you can read the new 'connection' property on the gdb.Inferior
object type, this contains the connection for that inferior (or None
if the inferior has no connection, for example, it is exited).

Finally, there's a new gdb.events.connection_removed event registry,
this emits a new gdb.ConnectionEvent whenever a connection is removed
from GDB (this can happen when all inferiors using a connection exit,
though this is not always the case, depending on the connection type).
The gdb.ConnectionEvent has a 'connection' property, which is the
gdb.TargetConnection being removed from GDB.

The gdb.TargetConnection has an 'is_valid()' method.  A connection
object becomes invalid when the underlying connection is removed from
GDB (as discussed above, this might be when all inferiors using a
connection exit, or it might be when the user explicitly replaces a
connection in GDB by issuing another 'target' command).

The gdb.TargetConnection has the following read-only properties:

  'num': The number for this connection,

  'type': e.g. 'native', 'remote', 'sim', etc

  'description': The longer description as seen in the 'info
                 connections' command output.

  'details': A string or None.  Extra details for the connection, for
             example, a remote connection's details might be
             'hostname:port'.
This commit is contained in:
Andrew Burgess 2021-09-01 15:33:19 +01:00
parent abfdb09f01
commit 0e3b7c25ee
17 changed files with 725 additions and 4 deletions

View file

@ -39,3 +39,4 @@ GDB_PY_DEFINE_EVENT(breakpoint_deleted)
GDB_PY_DEFINE_EVENT(breakpoint_modified)
GDB_PY_DEFINE_EVENT(before_prompt)
GDB_PY_DEFINE_EVENT(gdb_exiting)
GDB_PY_DEFINE_EVENT(connection_removed)

366
gdb/python/py-connection.c Normal file
View file

@ -0,0 +1,366 @@
/* Python interface to inferiors.
Copyright (C) 2009-2021 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 "python-internal.h"
#include "process-stratum-target.h"
#include "inferior.h"
#include "observable.h"
#include "target-connection.h"
#include "py-events.h"
#include "py-event.h"
#include "arch-utils.h"
#include <map>
/* The Python object that represents a connection. */
struct connection_object
{
PyObject_HEAD
/* The process target that represents this connection. When a
connection_object is created this field will always point at a valid
target. Later, if GDB stops using this target (the target is popped
from all target stacks) then this field is set to nullptr, which
indicates that this Python object is now in the invalid state (see
the is_valid() method below). */
struct process_stratum_target *target;
};
extern PyTypeObject connection_object_type
CPYCHECKER_TYPE_OBJECT_FOR_TYPEDEF ("connection_object");
/* Require that CONNECTION be valid. */
#define CONNPY_REQUIRE_VALID(connection) \
do { \
if (connection->target == nullptr) \
{ \
PyErr_SetString (PyExc_RuntimeError, \
_("Connection no longer exists.")); \
return nullptr; \
} \
} while (0)
/* A map between process_stratum targets and the Python object representing
them. We actually hold a gdbpy_ref around the Python object so that
reference counts are handled correctly when entries are deleted. */
static std::map<process_stratum_target *,
gdbpy_ref<connection_object>> all_connection_objects;
/* Return a reference to a gdb.TargetConnection object for TARGET. If
TARGET is nullptr then a reference to None is returned.
Previously created gdb.TargetConnection objects are cached, and
additional references to the same connection object can be returned with
later calls to this function. */
gdbpy_ref<>
target_to_connection_object (process_stratum_target *target)
{
if (target == nullptr)
return gdbpy_ref<>::new_reference (Py_None);
gdbpy_ref <connection_object> conn_obj;
auto conn_obj_iter = all_connection_objects.find (target);
if (conn_obj_iter == all_connection_objects.end ())
{
conn_obj.reset (PyObject_New (connection_object,
&connection_object_type));
if (conn_obj == nullptr)
return nullptr;
conn_obj->target = target;
all_connection_objects.emplace (target, conn_obj);
}
else
conn_obj = conn_obj_iter->second;
gdb_assert (conn_obj != nullptr);
/* Repackage the result as a PyObject reference. */
return gdbpy_ref<> ((PyObject *) conn_obj.release ());
}
/* Return a list of gdb.TargetConnection objects, one for each currently
active connection. The returned list is in no particular order. */
PyObject *
gdbpy_connections (PyObject *self, PyObject *args)
{
gdbpy_ref<> list (PyList_New (0));
if (list == nullptr)
return nullptr;
for (process_stratum_target *target : all_non_exited_process_targets ())
{
gdb_assert (target != nullptr);
gdbpy_ref<> conn = target_to_connection_object (target);
if (conn == nullptr)
return nullptr;
gdb_assert (conn.get () != Py_None);
if (PyList_Append (list.get (), conn.get ()) < 0)
return nullptr;
}
return list.release ();
}
/* Emit a connection event for TARGET to REGISTRY. Return 0 on success, or
a negative value on error. */
static int
emit_connection_event (process_stratum_target *target,
eventregistry_object *registry)
{
gdbpy_ref<> event_obj
= create_event_object (&connection_event_object_type);
if (event_obj == nullptr)
return -1;
gdbpy_ref<> conn = target_to_connection_object (target);
if (evpy_add_attribute (event_obj.get (), "connection", conn.get ()) < 0)
return -1;
return evpy_emit_event (event_obj.get (), registry);
}
/* Callback for the connection_removed observer. */
static void
connpy_connection_removed (process_stratum_target *target)
{
if (!gdb_python_initialized)
return;
gdbpy_enter enter_py (get_current_arch (), current_language);
if (!evregpy_no_listeners_p (gdb_py_events.connection_removed))
if (emit_connection_event (target, gdb_py_events.connection_removed) < 0)
gdbpy_print_stack ();
auto conn_obj_iter = all_connection_objects.find (target);
if (conn_obj_iter != all_connection_objects.end ())
{
gdbpy_ref <connection_object> conn_obj = conn_obj_iter->second;
conn_obj->target = nullptr;
all_connection_objects.erase (target);
}
}
/* Called when a gdb.TargetConnection object is deallocated. */
static void
connpy_connection_dealloc (PyObject *obj)
{
connection_object *conn_obj = (connection_object *) obj;
/* As the all_connection_objects map holds a reference to each connection
object we can only enter the dealloc function when the reference in
all_connection_objects has been erased.
As we always set the target pointer back to nullptr before we erase
items from all_connection_objects then, when we get here, the target
pointer must be nullptr. */
gdb_assert (conn_obj->target == nullptr);
Py_TYPE (obj)->tp_free (obj);
}
/* Implement repr() for gdb.TargetConnection. */
static PyObject *
connpy_repr (PyObject *obj)
{
connection_object *self = (connection_object *) obj;
process_stratum_target *target = self->target;
if (target == nullptr)
return PyString_FromFormat ("<%s (invalid)>", Py_TYPE (obj)->tp_name);
return PyString_FromFormat ("<%s num=%d, what=\"%s\">",
Py_TYPE (obj)->tp_name,
target->connection_number,
make_target_connection_string (target).c_str ());
}
/* Implementation of gdb.TargetConnection.is_valid() -> Boolean. Returns
True if this connection object is still associated with a
process_stratum_target, otherwise, returns False. */
static PyObject *
connpy_is_valid (PyObject *self, PyObject *args)
{
connection_object *conn = (connection_object *) self;
if (conn->target == nullptr)
Py_RETURN_FALSE;
Py_RETURN_TRUE;
}
/* Return the id number of this connection. */
static PyObject *
connpy_get_connection_num (PyObject *self, void *closure)
{
connection_object *conn = (connection_object *) self;
CONNPY_REQUIRE_VALID (conn);
auto num = conn->target->connection_number;
return gdb_py_object_from_longest (num).release ();
}
/* Return a string that gives the short name for this connection type. */
static PyObject *
connpy_get_connection_type (PyObject *self, void *closure)
{
connection_object *conn = (connection_object *) self;
CONNPY_REQUIRE_VALID (conn);
const char *shortname = conn->target->shortname ();
return host_string_to_python_string (shortname).release ();
}
/* Return a string that gives a longer description of this connection type. */
static PyObject *
connpy_get_description (PyObject *self, void *closure)
{
connection_object *conn = (connection_object *) self;
CONNPY_REQUIRE_VALID (conn);
const char *longname = conn->target->longname ();
return host_string_to_python_string (longname).release ();
}
/* Return a string that gives additional details about this connection, or
None, if there are no additional details for this connection type. */
static PyObject *
connpy_get_connection_details (PyObject *self, void *closure)
{
connection_object *conn = (connection_object *) self;
CONNPY_REQUIRE_VALID (conn);
const char *details = conn->target->connection_string ();
if (details != nullptr)
return host_string_to_python_string (details).release ();
else
Py_RETURN_NONE;
}
/* Python specific initialization for this file. */
int
gdbpy_initialize_connection (void)
{
if (PyType_Ready (&connection_object_type) < 0)
return -1;
if (gdb_pymodule_addobject (gdb_module, "TargetConnection",
(PyObject *) &connection_object_type) < 0)
return -1;
return 0;
}
/* Global initialization for this file. */
void _initialize_py_connection ();
void
_initialize_py_connection ()
{
gdb::observers::connection_removed.attach (connpy_connection_removed,
"py-connection");
}
/* Methods for the gdb.TargetConnection object type. */
static PyMethodDef connection_object_methods[] =
{
{ "is_valid", connpy_is_valid, METH_NOARGS,
"is_valid () -> Boolean.\n\
Return true if this TargetConnection is valid, false if not." },
{ NULL }
};
/* Attributes for the gdb.TargetConnection object type. */
static gdb_PyGetSetDef connection_object_getset[] =
{
{ "num", connpy_get_connection_num, NULL,
"ID number of this connection, as assigned by GDB.", NULL },
{ "type", connpy_get_connection_type, NULL,
"A short string that is the name for this connection type.", NULL },
{ "description", connpy_get_description, NULL,
"A longer string describing this connection type.", NULL },
{ "details", connpy_get_connection_details, NULL,
"A string containing additional connection details.", NULL },
{ NULL }
};
/* Define the gdb.TargetConnection object type. */
PyTypeObject connection_object_type =
{
PyVarObject_HEAD_INIT (NULL, 0)
"gdb.TargetConnection", /* tp_name */
sizeof (connection_object), /* tp_basicsize */
0, /* tp_itemsize */
connpy_connection_dealloc, /* tp_dealloc */
0, /* tp_print */
0, /* tp_getattr */
0, /* tp_setattr */
0, /* tp_compare */
connpy_repr, /* 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 target connection object", /* tp_doc */
0, /* tp_traverse */
0, /* tp_clear */
0, /* tp_richcompare */
0, /* tp_weaklistoffset */
0, /* tp_iter */
0, /* tp_iternext */
connection_object_methods, /* tp_methods */
0, /* tp_members */
connection_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 */
};

View file

@ -110,3 +110,8 @@ GDB_PY_DEFINE_EVENT_TYPE (gdb_exiting,
"GdbExitingEvent",
"GDB is about to exit",
event_object_type);
GDB_PY_DEFINE_EVENT_TYPE (connection,
"ConnectionEvent",
"GDB connection added or removed object",
event_object_type);

View file

@ -415,6 +415,20 @@ infpy_get_num (PyObject *self, void *closure)
return gdb_py_object_from_longest (inf->inferior->num).release ();
}
/* Return the gdb.TargetConnection object for this inferior, or None if a
connection does not exist. */
static PyObject *
infpy_get_connection (PyObject *self, void *closure)
{
inferior_object *inf = (inferior_object *) self;
INFPY_REQUIRE_VALID (inf);
process_stratum_target *target = inf->inferior->process_target ();
return target_to_connection_object (target).release ();
}
/* Return the connection number of the given inferior, or None if a
connection does not exist. */
@ -849,6 +863,8 @@ gdbpy_initialize_inferior (void)
static gdb_PyGetSetDef inferior_object_getset[] =
{
{ "num", infpy_get_num, NULL, "ID of inferior, as assigned by GDB.", NULL },
{ "connection", infpy_get_connection, NULL,
"The gdb.TargetConnection for this inferior.", NULL },
{ "connection_num", infpy_get_connection_num, NULL,
"ID of inferior's connection, as assigned by GDB.", NULL },
{ "pid", infpy_get_pid, NULL, "PID of inferior, as assigned by the OS.",

View file

@ -482,6 +482,10 @@ gdbpy_ref<inferior_object> inferior_to_inferior_object (inferior *inf);
PyObject *gdbpy_buffer_to_membuf (gdb::unique_xmalloc_ptr<gdb_byte> buffer,
CORE_ADDR address, ULONGEST length);
struct process_stratum_target;
gdbpy_ref<> target_to_connection_object (process_stratum_target *target);
PyObject *gdbpy_connections (PyObject *self, PyObject *args);
const struct block *block_object_to_block (PyObject *obj);
struct symbol *symbol_object_to_symbol (PyObject *obj);
struct value *value_object_to_value (PyObject *self);
@ -555,6 +559,8 @@ int gdbpy_initialize_tui ()
CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION;
int gdbpy_initialize_membuf ()
CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION;
int gdbpy_initialize_connection ()
CPYCHECKER_NEGATIVE_RESULT_SETS_EXCEPTION;
/* A wrapper for PyErr_Fetch that handles reference counting for the
caller. */

View file

@ -1876,6 +1876,7 @@ do_start_initialization ()
|| gdbpy_initialize_xmethods () < 0
|| gdbpy_initialize_unwind () < 0
|| gdbpy_initialize_membuf () < 0
|| gdbpy_initialize_connection () < 0
|| gdbpy_initialize_tui () < 0)
return false;
@ -2326,6 +2327,10 @@ Register a TUI window constructor." },
"architecture_names () -> List.\n\
Return a list of all the architecture names GDB understands." },
{ "connections", gdbpy_connections, METH_NOARGS,
"connections () -> List.\n\
Return a list of gdb.TargetConnection objects." },
{NULL, NULL, 0, NULL}
};