Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/810746/?format=api
{ "id": 810746, "url": "http://patchwork.ozlabs.org/api/patches/810746/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/150472098452.24907.17299050957814650497.stgit@frigg.lan/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<150472098452.24907.17299050957814650497.stgit@frigg.lan>", "list_archive_url": null, "date": "2017-09-06T18:03:04", "name": "[v4,10/20] instrument: Add support for tracing events", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "e5d5004a46173b01304796765b9bc2df6878c847", "submitter": { "id": 9099, "url": "http://patchwork.ozlabs.org/api/people/9099/?format=api", "name": "Lluís Vilanova", "email": "vilanova@ac.upc.edu" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/150472098452.24907.17299050957814650497.stgit@frigg.lan/mbox/", "series": [ { "id": 1859, "url": "http://patchwork.ozlabs.org/api/series/1859/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=1859", "date": "2017-09-06T17:22:41", "name": "instrument: Add basic event instrumentation", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/1859/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/810746/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/810746/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@bilbo.ozlabs.org", "Authentication-Results": "ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=<UNKNOWN>)", "Received": [ "from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xnWfw0CRnz9sBW\n\tfor <incoming@patchwork.ozlabs.org>;\n\tThu, 7 Sep 2017 04:03:52 +1000 (AEST)", "from localhost ([::1]:37358 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dpeg2-0004ne-3o\n\tfor incoming@patchwork.ozlabs.org; Wed, 06 Sep 2017 14:03:50 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:45593)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <vilanova@ac.upc.edu>) id 1dpefZ-0004mF-4P\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 14:03:31 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <vilanova@ac.upc.edu>) id 1dpefT-0003yd-Ur\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 14:03:21 -0400", "from roura.ac.upc.es ([147.83.33.10]:56110)\n\tby eggs.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <vilanova@ac.upc.edu>) id 1dpefT-0003xz-E4\n\tfor qemu-devel@nongnu.org; Wed, 06 Sep 2017 14:03:15 -0400", "from correu-2.ac.upc.es (correu-2.ac.upc.es [147.83.30.92])\n\tby roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id v86I3BWA004672;\n\tWed, 6 Sep 2017 20:03:11 +0200", "from localhost (unknown [31.210.187.58])\n\tby correu-2.ac.upc.es (Postfix) with ESMTPSA id 0FED51DF;\n\tWed, 6 Sep 2017 20:03:05 +0200 (CEST)" ], "From": "=?utf-8?b?TGx1w61z?= Vilanova <vilanova@ac.upc.edu>", "To": "qemu-devel@nongnu.org", "Date": "Wed, 6 Sep 2017 21:03:04 +0300", "Message-Id": "<150472098452.24907.17299050957814650497.stgit@frigg.lan>", "X-Mailer": "git-send-email 2.14.1", "In-Reply-To": "<150471856141.24907.274176769201097378.stgit@frigg.lan>", "References": "<150471856141.24907.274176769201097378.stgit@frigg.lan>", "User-Agent": "StGit/0.17.1-dirty", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=\"utf-8\"", "Content-Transfer-Encoding": "quoted-printable", "X-MIME-Autoconverted": "from 8bit to quoted-printable by roura.ac.upc.es id\n\tv86I3BWA004672", "X-detected-operating-system": "by eggs.gnu.org: GNU/Linux 2.6.x [fuzzy]", "X-Received-From": "147.83.33.10", "Subject": "[Qemu-devel] [PATCH v4 10/20] instrument: Add support for tracing\n\tevents", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "\"Emilio G. Cota\" <cota@braap.org>, =?utf-8?q?Llu=C3=ADs_Vilanova?=\n\t<vilanova@ac.upc.edu>, \tStefan Hajnoczi <stefanha@redhat.com>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>\n---\n .gitignore | 1 \n Makefile | 3 +\n instrument/Makefile.objs | 1 \n instrument/error.h | 6 ++\n instrument/qemu-instr/types.h | 51 +++++++++++++++\n instrument/qemu-instr/types.inc.h | 15 ++++\n instrument/trace.c | 125 +++++++++++++++++++++++++++++++++++++\n trace/control.h | 1 \n 8 files changed, 203 insertions(+)\n create mode 100644 instrument/qemu-instr/types.h\n create mode 100644 instrument/qemu-instr/types.inc.h\n create mode 100644 instrument/trace.c", "diff": "diff --git a/.gitignore b/.gitignore\nindex cf65316863..5ffcb9a091 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -134,3 +134,4 @@ trace-dtrace-root.h\n trace-dtrace-root.dtrace\n trace-ust-all.h\n trace-ust-all.c\n+!/instrument/*\ndiff --git a/Makefile b/Makefile\nindex 6171661458..6f4de75f79 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -592,6 +592,9 @@ endif\n ifdef CONFIG_INSTRUMENT\n \t$(INSTALL_DIR) \"$(DESTDIR)$(includedir)/qemu-instr/\"\n \t$(INSTALL_DATA) $(SRC_PATH)/instrument/qemu-instr/control.h \"$(DESTDIR)$(includedir)/qemu-instr/\"\n+\t$(INSTALL_DATA) $(SRC_PATH)/instrument/qemu-instr/trace.h \"$(DESTDIR)$(includedir)/qemu-instr/\"\n+\t$(INSTALL_DATA) $(SRC_PATH)/instrument/qemu-instr/types.h \"$(DESTDIR)$(includedir)/qemu-instr/\"\n+\t$(INSTALL_DATA) $(SRC_PATH)/instrument/qemu-instr/types.inc.h \"$(DESTDIR)$(includedir)/qemu-instr/\"\n \t$(INSTALL_DATA) $(SRC_PATH)/instrument/qemu-instr/visibility.h \"$(DESTDIR)$(includedir)/qemu-instr/\"\n endif\n \ndiff --git a/instrument/Makefile.objs b/instrument/Makefile.objs\nindex 9b7e1c03aa..8258dbfa79 100644\n--- a/instrument/Makefile.objs\n+++ b/instrument/Makefile.objs\n@@ -5,3 +5,4 @@ target-obj-$(CONFIG_INSTRUMENT) += load.o\n target-obj-y += qmp.o\n \n target-obj-$(CONFIG_INSTRUMENT) += control.o\n+target-obj-$(CONFIG_INSTRUMENT) += trace.o\ndiff --git a/instrument/error.h b/instrument/error.h\nindex f8d1dd4b16..7a51d62fdb 100644\n--- a/instrument/error.h\n+++ b/instrument/error.h\n@@ -25,4 +25,10 @@\n return; \\\n }\n \n+#define ERROR_IF_RET(cond, ret, msg, args...) \\\n+ if (unlikely(cond)) { \\\n+ _ERROR(msg, ##args); \\\n+ return ret; \\\n+ } \\\n+\n #endif /* INSTRUMENT_ERROR_H */\ndiff --git a/instrument/qemu-instr/types.h b/instrument/qemu-instr/types.h\nnew file mode 100644\nindex 0000000000..ea3a032b4f\n--- /dev/null\n+++ b/instrument/qemu-instr/types.h\n@@ -0,0 +1,51 @@\n+/*\n+ * QEMU-specific types for instrumentation clients.\n+ *\n+ * Copyright (C) 2012-2017 Lluís Vilanova <vilanova@ac.upc.edu>\n+ *\n+ * This work is licensed under the terms of the GNU GPL, version 2 or later.\n+ * See the COPYING file in the top-level directory.\n+ */\n+\n+#ifndef QI__TYPES_H\n+#define QI__TYPES_H\n+\n+#ifdef __cplusplus\n+extern \"C\" {\n+#endif\n+\n+/**\n+ * SECTION: types\n+ * @section_id: qi-types\n+ * @title: Common types\n+ */\n+\n+/**\n+ * QITraceEvent:\n+ *\n+ * Opaque structure defining a tracing event.\n+ */\n+typedef struct QITraceEvent QITraceEvent;\n+\n+/**\n+ * QITraceEventIter:\n+ *\n+ * Opaque structure defining a tracing event iterator.\n+ */\n+typedef struct QITraceEventIter QITraceEventIter;\n+\n+/**\n+ * QICPU:\n+ *\n+ * Opaque guest CPU pointer.\n+ */\n+typedef struct QICPU_d *QICPU;\n+\n+\n+#include <qemu-instr/types.inc.h>\n+\n+#ifdef __cplusplus\n+}\n+#endif\n+\n+#endif /* QI__TYPES_H */\ndiff --git a/instrument/qemu-instr/types.inc.h b/instrument/qemu-instr/types.inc.h\nnew file mode 100644\nindex 0000000000..0d99ea59a2\n--- /dev/null\n+++ b/instrument/qemu-instr/types.inc.h\n@@ -0,0 +1,15 @@\n+/*\n+ * QEMU-specific types for instrumentation clients.\n+ *\n+ * Copyright (C) 2012-2017 Lluís Vilanova <vilanova@ac.upc.edu>\n+ *\n+ * This work is licensed under the terms of the GNU GPL, version 2 or later.\n+ * See the COPYING file in the top-level directory.\n+ */\n+\n+#include <stdlib.h>\n+\n+\n+struct QITraceEventIter {\n+ char buffer[(sizeof(size_t) * 2) + sizeof(char *)];\n+};\ndiff --git a/instrument/trace.c b/instrument/trace.c\nnew file mode 100644\nindex 0000000000..a73fcdf50a\n--- /dev/null\n+++ b/instrument/trace.c\n@@ -0,0 +1,125 @@\n+/*\n+ * API for QEMU's tracing events.\n+ *\n+ * Copyright (C) 2012-2017 Lluís Vilanova <vilanova@ac.upc.edu>\n+ *\n+ * This work is licensed under the terms of the GNU GPL, version 2 or later.\n+ * See the COPYING file in the top-level directory.\n+ */\n+\n+#include \"qemu/osdep.h\"\n+#include \"instrument/error.h\"\n+#include \"qemu-instr/trace.h\"\n+#include \"qemu-instr/visibility.h\"\n+#include \"trace/control.h\"\n+\n+\n+QI_VPUBLIC\n+QITraceEvent *qi_trace_event_name(const char *name)\n+{\n+ ERROR_IF_RET(!name, NULL, \"must provide a name\");\n+ return (QITraceEvent *)trace_event_name(name);\n+}\n+\n+QI_VPUBLIC\n+void qi_trace_event_iter_init(QITraceEventIter *iter, const char *pattern)\n+{\n+ TraceEventIter *iter_ = (TraceEventIter *)iter;\n+ ERROR_IF(!iter_, \"must provide an iterator\");\n+ trace_event_iter_init(iter_, pattern);\n+}\n+\n+QI_VPUBLIC\n+QITraceEvent *qi_trace_event_iter_next(QITraceEventIter *iter)\n+{\n+ TraceEventIter *iter_ = (TraceEventIter *)iter;\n+ ERROR_IF_RET(!iter_, NULL, \"must provide an iterator\");\n+ return (QITraceEvent *)trace_event_iter_next(iter_);\n+}\n+\n+\n+QI_VPUBLIC\n+bool qi_trace_event_is_vcpu(QITraceEvent *ev)\n+{\n+ TraceEvent *ev_ = (TraceEvent *)ev;\n+ ERROR_IF_RET(!ev_, false, \"must provide an event\");\n+ return trace_event_is_vcpu(ev_);\n+}\n+\n+QI_VPUBLIC\n+const char * qi_trace_event_get_name(QITraceEvent *ev)\n+{\n+ TraceEvent *ev_ = (TraceEvent *)ev;\n+ ERROR_IF_RET(!ev_, false, \"must provide an event\");\n+ return trace_event_get_name(ev_);\n+}\n+\n+\n+QI_VPUBLIC\n+bool qi_trace_event_get_state(QITraceEvent *ev)\n+{\n+ TraceEvent *ev_ = (TraceEvent *)ev;\n+ ERROR_IF_RET(!ev_, false, \"must provide an event\");\n+ return trace_event_get_state_static(ev_) &&\n+ trace_event_get_state_dynamic(ev_);\n+}\n+\n+QI_VPUBLIC\n+bool qi_trace_event_get_vcpu_state(QICPU *vcpu, QITraceEvent *ev)\n+{\n+ CPUState *vcpu_ = (CPUState *)vcpu;\n+ TraceEvent *ev_ = (TraceEvent *)ev;\n+ ERROR_IF_RET(!vcpu_, false, \"must provide a vCPU\");\n+ ERROR_IF_RET(!ev_, false, \"must provide an event\");\n+ return trace_event_get_state_static(ev_) &&\n+ trace_event_get_vcpu_state_dynamic(vcpu_, ev_);\n+}\n+\n+QI_VPUBLIC\n+bool qi_trace_event_get_state_static(QITraceEvent *ev)\n+{\n+ TraceEvent *ev_ = (TraceEvent *)ev;\n+ ERROR_IF_RET(!ev_, false, \"must provide an event\");\n+ return trace_event_get_state_static(ev_);\n+}\n+\n+QI_VPUBLIC\n+bool qi_trace_event_get_state_dynamic(QITraceEvent *ev)\n+{\n+ TraceEvent *ev_ = (TraceEvent *)ev;\n+ ERROR_IF_RET(!ev_, false, \"must provide an event\");\n+ return trace_event_get_state_dynamic(ev_);\n+}\n+\n+QI_VPUBLIC\n+bool qi_trace_event_get_vcpu_state_dynamic(QICPU *vcpu, QITraceEvent *ev)\n+{\n+ CPUState *vcpu_ = (CPUState *)vcpu;\n+ TraceEvent *ev_ = (TraceEvent *)ev;\n+ ERROR_IF_RET(!vcpu_, false, \"must provide a vCPU\");\n+ ERROR_IF_RET(!ev_, false, \"must provide an event\");\n+ return trace_event_get_vcpu_state_dynamic(vcpu_, ev_);\n+}\n+\n+QI_VPUBLIC\n+void qi_trace_event_set_state_dynamic(QITraceEvent *ev, bool state)\n+{\n+ TraceEvent *ev_ = (TraceEvent *)ev;\n+ ERROR_IF(!ev_, \"must provide an event\");\n+ ERROR_IF(!trace_event_get_state_static(ev_),\n+ \"event must be statically enabled\");\n+ trace_event_set_state_dynamic(ev_, state);\n+}\n+\n+QI_VPUBLIC\n+void qi_trace_event_set_vcpu_state_dynamic(QICPU *vcpu,\n+ QITraceEvent *ev, bool state)\n+{\n+ CPUState *vcpu_ = (CPUState *)vcpu;\n+ TraceEvent *ev_ = (TraceEvent *)ev;\n+ ERROR_IF(!vcpu_, \"must provide a vCPU\");\n+ ERROR_IF(!ev_, \"must provide an event\");\n+ ERROR_IF(!trace_event_get_state_static(ev_),\n+ \"event must be statically enabled\");\n+ trace_event_set_vcpu_state_dynamic(vcpu_, ev_, state);\n+}\ndiff --git a/trace/control.h b/trace/control.h\nindex 1903e22975..3e6da24c98 100644\n--- a/trace/control.h\n+++ b/trace/control.h\n@@ -13,6 +13,7 @@\n #include \"qemu-common.h\"\n #include \"event-internal.h\"\n \n+/* NOTE: Keep in sync with size of QITraceEventIter */\n typedef struct TraceEventIter {\n size_t event;\n size_t group;\n", "prefixes": [ "v4", "10/20" ] }