[v2,3/5] Support buffer objects as handles in Inferior.thread_from_thread_handle()
Commit Message
InferiorThread.thread_handle() returns a python bytes object. We'd
like to be able to pass the output of thread_handle() to
Inferior.thread_from_thread_handle(). Up to now,
thread_from_thread_handle() expects to receive a gdb.Value input.
This commit adds support to also allow a python buffer object to be
passed as the handle.
infpy_thread_from_thread_handle() calls find_thread_by_handle() which
has the obvious functionality. It used to pass the thread handle via
a struct value pointer. I've revised this interface to instead pass a
gdb_byte pointer and length. I considered using a vector, but it
seemed more straightforward to just pass a pointer and length.
gdb/ChangeLog:
* gdbthread.h (find_thread_by_handle): Revise declaration.
* thread.c (find_thread_by_handle): Likewise. Adjust
implementation too.
* python/py-inferior.c (infpy_thread_from_thread_handle): Add
support for buffer objects as handles.
---
gdb/gdbthread.h | 3 ++-
gdb/python/py-inferior.c | 23 ++++++++++++++++++++---
gdb/thread.c | 8 +++-----
3 files changed, 25 insertions(+), 9 deletions(-)
Comments
>>>>> "Kevin" == Kevin Buettner <kevinb@redhat.com> writes:
Kevin> I've revised this interface to instead pass a gdb_byte pointer
Kevin> and length. I considered using a vector, but it seemed more
Kevin> straightforward to just pass a pointer and length.
How about a gdb::array_view instead?
The rest seems fine to me, thanks.
Tom
@@ -486,7 +486,8 @@ extern struct thread_info *find_thread_ptid (inferior *inf, ptid_t ptid);
struct thread_info *find_thread_global_id (int global_id);
/* Find thread by thread library specific handle in inferior INF. */
-struct thread_info *find_thread_by_handle (struct value *thread_handle,
+struct thread_info *find_thread_by_handle (const gdb_byte *thread_handle,
+ size_t handle_len,
struct inferior *inf);
/* Finds the first thread of the specified inferior. */
@@ -774,7 +774,25 @@ infpy_thread_from_thread_handle (PyObject *self, PyObject *args, PyObject *kw)
if (! gdb_PyArg_ParseTupleAndKeywords (args, kw, "O", keywords, &handle_obj))
return NULL;
- if (!gdbpy_is_value_object (handle_obj))
+ const gdb_byte *bytes;
+ size_t bytes_len;
+ Py_buffer_up buffer_up;
+ Py_buffer py_buf;
+
+ if (PyObject_CheckBuffer (handle_obj)
+ && PyObject_GetBuffer (handle_obj, &py_buf, PyBUF_SIMPLE) == 0)
+ {
+ buffer_up.reset (&py_buf);
+ bytes = (const gdb_byte *) py_buf.buf;
+ bytes_len = py_buf.len;
+ }
+ else if (gdbpy_is_value_object (handle_obj))
+ {
+ struct value *val = value_object_to_value (handle_obj);
+ bytes = value_contents_all (val);
+ bytes_len = TYPE_LENGTH (value_type (val));
+ }
+ else
{
PyErr_SetString (PyExc_TypeError,
_("Argument 'handle_obj' must be a thread handle object."));
@@ -785,9 +803,8 @@ infpy_thread_from_thread_handle (PyObject *self, PyObject *args, PyObject *kw)
TRY
{
struct thread_info *thread_info;
- struct value *val = value_object_to_value (handle_obj);
- thread_info = find_thread_by_handle (val, inf_obj->inferior);
+ thread_info = find_thread_by_handle (bytes, bytes_len, inf_obj->inferior);
if (thread_info != NULL)
return thread_to_thread_object (thread_info).release ();
}
@@ -541,12 +541,10 @@ find_thread_ptid (inferior *inf, ptid_t ptid)
/* See gdbthread.h. */
struct thread_info *
-find_thread_by_handle (struct value *thread_handle, struct inferior *inf)
+find_thread_by_handle (const gdb_byte *thread_handle, size_t handle_len,
+ struct inferior *inf)
{
- return target_thread_handle_to_thread_info
- (value_contents_all (thread_handle),
- TYPE_LENGTH (value_type (thread_handle)),
- inf);
+ return target_thread_handle_to_thread_info (thread_handle, handle_len, inf);
}
/*