From: Felix Willgerodt <felix.willgerodt@intel.com>
To: markus.t.metzger@intel.com, gdb-patches@sourceware.org
Subject: [PATCH v3 10/12] btrace, python: Enable calling the ptwrite listener.
Date: Wed, 16 Jun 2021 09:42:03 +0200 [thread overview]
Message-ID: <20210616074205.1129553-11-felix.willgerodt@intel.com> (raw)
In-Reply-To: <20210616074205.1129553-1-felix.willgerodt@intel.com>
Adding a new function to btinfo that allows to call the python ptwrite listener
from inside GDB.
gdb/ChangeLog:
2021-06-14 Felix Willgerodt <felix.willgerodt@intel.com>
* btrace.h (btrace_thread_info): New member ptw_callback_fun.
* python/py-record-btrace.c (recpy_call_listener): New function.
(recpy_initialize_listener): Save recpy_call_listener in btinfo.
---
gdb/btrace.h | 8 +++++
gdb/python/py-record-btrace.c | 67 +++++++++++++++++++++++++++++++++++
gdb/python/py-record-btrace.h | 5 +++
3 files changed, 80 insertions(+)
diff --git a/gdb/btrace.h b/gdb/btrace.h
index b15efcd147c..7ca71277372 100644
--- a/gdb/btrace.h
+++ b/gdb/btrace.h
@@ -352,6 +352,14 @@ struct btrace_thread_info
stepping through the execution history. */
std::vector<std::string> aux_data;
+ /* Function pointer to the ptwrite callback. Returns the string returned
+ by the ptwrite listener function or nullptr if no string is supposed to
+ be printed. */
+ gdb::unique_xmalloc_ptr<char> (*ptw_callback_fun) (
+ const uint64_t *payload,
+ const uint64_t *ip,
+ const void *ptw_listener);
+
/* PyObject pointer to the ptwrite listener function. */
void *ptw_listener = nullptr;
diff --git a/gdb/python/py-record-btrace.c b/gdb/python/py-record-btrace.c
index 82f0e00d675..6ca94168655 100644
--- a/gdb/python/py-record-btrace.c
+++ b/gdb/python/py-record-btrace.c
@@ -776,6 +776,72 @@ recpy_bt_function_call_history (PyObject *self, void *closure)
return btpy_list_new (tinfo, first, last, 1, &recpy_func_type);
}
+/* Helper function that calls the ptwrite listener PTW_LISTENER with
+ PAYLOAD and IP as arguments. Returns a pointer to the string that will
+ be printed or nullptr if nothing should be printed. IP can be nullptr,
+ PAYLOAD must point to a valid integer. */
+gdb::unique_xmalloc_ptr<char>
+recpy_call_listener (const uint64_t *payload, const uint64_t *ip,
+ const void *ptw_listener)
+{
+ if ((PyObject *) ptw_listener == Py_None)
+ return nullptr;
+ else if ((PyObject *) ptw_listener == nullptr)
+ error (_("No valid ptwrite listener."));
+
+ /* As Python is started as a seperate thread, we need to
+ acquire the GIL to safely call the listener function. */
+ PyGILState_STATE gstate = PyGILState_Ensure ();
+
+ PyObject *py_payload = PyLong_FromUnsignedLongLong (*payload);
+ PyObject *py_ip;
+
+ if (ip == nullptr)
+ {
+ py_ip = Py_None;
+ Py_INCREF (Py_None);
+ }
+ else
+ py_ip = PyLong_FromUnsignedLongLong (*ip);
+
+ PyObject *py_result = PyObject_CallFunctionObjArgs ((PyObject *) ptw_listener,
+ py_payload, py_ip, NULL);
+
+ if (PyErr_Occurred ())
+ {
+ gdbpy_print_stack ();
+ gdb_Py_DECREF (py_ip);
+ gdb_Py_DECREF (py_payload);
+ PyGILState_Release (gstate);
+ error (_("Error while executing Python code."));
+ }
+
+ gdb_Py_DECREF (py_ip);
+ gdb_Py_DECREF (py_payload);
+
+ if (py_result == Py_None)
+ {
+ gdb_Py_DECREF (py_result);
+ PyGILState_Release (gstate);
+ return nullptr;
+ }
+
+ gdb::unique_xmalloc_ptr<char> resultstring = gdbpy_obj_to_string (py_result);
+
+ if (PyErr_Occurred ())
+ {
+ gdbpy_print_stack ();
+ gdb_Py_DECREF (py_result);
+ PyGILState_Release (gstate);
+ error (_("Error while executing Python code."));
+ }
+
+ gdb_Py_DECREF (py_result);
+ PyGILState_Release (gstate);
+
+ return resultstring;
+}
+
/* Helper function returning the current ptwrite listener. Returns nullptr
in case of errors. */
@@ -810,6 +876,7 @@ recpy_initialize_listener (ptid_t inferior_ptid)
process_stratum_target *proc_target = current_inferior ()->process_target ();
struct thread_info * const tinfo = find_thread_ptid (proc_target, inferior_ptid);
+ tinfo->btrace.ptw_callback_fun = &recpy_call_listener;
tinfo->btrace.ptw_listener = get_ptwrite_listener ();
return (PyObject *) tinfo->btrace.ptw_listener;
diff --git a/gdb/python/py-record-btrace.h b/gdb/python/py-record-btrace.h
index 36389e99ab8..098d6701e97 100644
--- a/gdb/python/py-record-btrace.h
+++ b/gdb/python/py-record-btrace.h
@@ -97,4 +97,9 @@ extern PyObject *recpy_initialize_listener (ptid_t inferior_ptid);
/* Helper function returning the current ptwrite listener. */
extern PyObject *get_ptwrite_listener ();
+/* Callback function for the ptwrite listener. */
+extern gdb::unique_xmalloc_ptr<char>
+recpy_call_listener (const uint64_t *payload, const uint64_t *ip,
+ const void *ptw_listener);
+
#endif /* PYTHON_PY_RECORD_BTRACE_H */
--
2.25.4
Intel Deutschland GmbH
Registered Address: Am Campeon 10, 85579 Neubiberg, Germany
Tel: +49 89 99 8853-0, www.intel.de <http://www.intel.de>
Managing Directors: Christin Eisenschmid, Sharon Heck, Tiffany Doon Silva
Chairperson of the Supervisory Board: Nicole Lau
Registered Office: Munich
Commercial Register: Amtsgericht Muenchen HRB 186928
next prev parent reply other threads:[~2021-06-16 7:46 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 7:41 [PATCH v3 00/12] Extensions for PTWRITE Felix Willgerodt
2021-06-16 7:41 ` [PATCH v3 01/12] btrace: Introduce auxiliary instructions Felix Willgerodt
2021-08-12 11:06 ` Metzger, Markus T
2022-05-06 11:26 ` Willgerodt, Felix
2021-06-16 7:41 ` [PATCH v3 02/12] btrace: Enable auxiliary instructions in record instruction-history Felix Willgerodt
2021-08-12 11:06 ` Metzger, Markus T
2022-05-06 11:26 ` Willgerodt, Felix
2021-06-16 7:41 ` [PATCH v3 03/12] btrace: Enable auxiliary instructions in record function-call-history Felix Willgerodt
2021-08-12 11:14 ` Metzger, Markus T
2022-05-06 11:26 ` Willgerodt, Felix
2021-06-16 7:41 ` [PATCH v3 04/12] btrace: Handle stepping and goto for auxiliary instructions Felix Willgerodt
2021-08-12 11:07 ` Metzger, Markus T
2022-05-06 11:26 ` Willgerodt, Felix
2021-06-16 7:41 ` [PATCH v3 05/12] python: Introduce gdb.RecordAuxiliary class Felix Willgerodt
2021-08-12 11:07 ` Metzger, Markus T
2022-05-06 11:26 ` Willgerodt, Felix
2021-06-16 7:41 ` [PATCH v3 06/12] python: Add clear() to gdb.Record Felix Willgerodt
2021-08-12 11:07 ` Metzger, Markus T
2021-06-16 7:42 ` [PATCH v3 07/12] btrace, gdbserver: Add ptwrite to btrace_config_pt Felix Willgerodt
2021-08-12 11:07 ` Metzger, Markus T
2022-05-06 11:26 ` Willgerodt, Felix
2022-05-10 13:59 ` Metzger, Markus T
2022-06-24 6:57 ` Willgerodt, Felix
2021-06-16 7:42 ` [PATCH v3 08/12] btrace, linux: Enable ptwrite packets Felix Willgerodt
2021-08-12 11:07 ` Metzger, Markus T
2021-06-16 7:42 ` [PATCH v3 09/12] btrace, python: Enable ptwrite listener registration Felix Willgerodt
2021-08-13 10:36 ` Metzger, Markus T
2022-05-06 11:26 ` Willgerodt, Felix
2022-05-30 14:55 ` Metzger, Markus T
2022-05-31 11:26 ` Willgerodt, Felix
2022-05-31 11:50 ` Eli Zaretskii
2021-06-16 7:42 ` Felix Willgerodt [this message]
2021-08-13 10:36 ` [PATCH v3 10/12] btrace, python: Enable calling the ptwrite listener Metzger, Markus T
2022-05-06 11:26 ` Willgerodt, Felix
2022-05-30 15:01 ` Metzger, Markus T
2021-06-16 7:42 ` [PATCH v3 11/12] gdb, testsuite, lib: Add libipt version check Felix Willgerodt
2021-08-13 10:36 ` Metzger, Markus T
2022-05-02 9:55 ` Willgerodt, Felix
2021-06-16 7:42 ` [PATCH v3 12/12] btrace: Extend ptwrite event decoding Felix Willgerodt
2021-06-17 7:00 ` Eli Zaretskii
2021-06-17 11:51 ` Willgerodt, Felix
2021-08-13 13:36 ` Metzger, Markus T
2022-05-06 11:26 ` Willgerodt, Felix
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210616074205.1129553-11-felix.willgerodt@intel.com \
--to=felix.willgerodt@intel.com \
--cc=gdb-patches@sourceware.org \
--cc=markus.t.metzger@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).