From 50a82723c446c556287dcabe22183bc5cedab566 Mon Sep 17 00:00:00 2001 From: Kevin Buettner Date: Wed, 27 Feb 2019 15:06:28 -0700 Subject: [PATCH] Support buffer objects as handles in Inferior.thread_from_thread_handle() InferiorThread.handle() returns a python bytes object. We'd like to be able to pass the output of this function, a 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::array_view object. (Thanks to Tom Tromey for suggesting this data structure over an earlier version which passed a gdb_byte 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/ChangeLog | 8 ++++++++ gdb/gdbthread.h | 4 ++-- gdb/python/py-inferior.c | 25 ++++++++++++++++++++++--- gdb/thread.c | 10 +++++----- 4 files changed, 37 insertions(+), 10 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7912f7d..65be341 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2019-04-08 Kevin Buettner + * 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. + +2019-04-08 Kevin Buettner + * python/py-infthread.c (thpy_thread_handle): New function. (thread_object_methods): Register thpy_thread_handle. diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 2d497d5..b9d8d7f 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -486,8 +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 inferior *inf); +struct thread_info *find_thread_by_handle + (gdb::array_view handle, struct inferior *inf); /* Finds the first thread of the specified inferior. */ extern struct thread_info *first_thread_of_inferior (inferior *inf); diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index 1bbca27..9109874 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -770,7 +770,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.")); @@ -781,9 +799,10 @@ 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 + (gdb::array_view (bytes, bytes_len), + inf_obj->inferior); if (thread_info != NULL) return thread_to_thread_object (thread_info).release (); } diff --git a/gdb/thread.c b/gdb/thread.c index 5b23b8c..dbcf8be 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -540,12 +540,12 @@ 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 (gdb::array_view handle, + 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 (handle.data (), + handle.size (), + inf); } /* -- 2.7.4