From patchwork Thu Feb 28 02:32:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Buettner X-Patchwork-Id: 31681 Received: (qmail 7147 invoked by alias); 28 Feb 2019 02:32:19 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 7131 invoked by uid 89); 28 Feb 2019 02:32:18 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=7859, pyerr_setstring, py_buflen, UD:py_buf.len X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 28 Feb 2019 02:32:17 +0000 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6F43630A696E for ; Thu, 28 Feb 2019 02:32:16 +0000 (UTC) Received: from f29-4.lan (ovpn-117-11.phx2.redhat.com [10.3.117.11]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4BAAA2C25F for ; Thu, 28 Feb 2019 02:32:16 +0000 (UTC) Date: Wed, 27 Feb 2019 19:32:15 -0700 From: Kevin Buettner To: gdb-patches@sourceware.org Subject: [PATCH v2 3/5] Support buffer objects as handles in Inferior.thread_from_thread_handle() Message-ID: <20190227193215.263e4b1d@f29-4.lan> In-Reply-To: <20190227192416.613752c8@f29-4.lan> References: <20190227192416.613752c8@f29-4.lan> MIME-Version: 1.0 X-IsSubscribed: yes 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(-) diff --git a/gdb/gdbthread.h b/gdb/gdbthread.h index 7808569a8a..9a133eb45e 100644 --- a/gdb/gdbthread.h +++ b/gdb/gdbthread.h @@ -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. */ diff --git a/gdb/python/py-inferior.c b/gdb/python/py-inferior.c index 72fbf6d90b..7e20343cfd 100644 --- a/gdb/python/py-inferior.c +++ b/gdb/python/py-inferior.c @@ -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 (); } diff --git a/gdb/thread.c b/gdb/thread.c index 90999d3d0b..ac3d758c76 100644 --- a/gdb/thread.c +++ b/gdb/thread.c @@ -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); } /*