From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>, Anthony Liguori <aliguori@amazon.com>
Subject: [Qemu-devel] [PULL 26/38] input: trace events
Date: Fri, 28 Feb 2014 15:06:37 +0100 [thread overview]
Message-ID: <1393596409-28934-27-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1393596409-28934-1-git-send-email-kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
trace-events | 8 ++++++++
ui/input.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+)
diff --git a/trace-events b/trace-events
index 580281d..b1dd4d1 100644
--- a/trace-events
+++ b/trace-events
@@ -1020,6 +1020,14 @@ gd_switch(int width, int height) "width=%d, height=%d"
gd_update(int x, int y, int w, int h) "x=%d, y=%d, w=%d, h=%d"
gd_key_event(int gdk_keycode, int qemu_keycode, const char *action) "translated GDK keycode %d to QEMU keycode %d (%s)"
+# ui/input.c
+input_event_key_number(int conidx, int number, bool down) "con %d, key number 0x%d, down %d"
+input_event_key_qcode(int conidx, const char *qcode, bool down) "con %d, key qcode %s, down %d"
+input_event_btn(int conidx, const char *btn, bool down) "con %d, button %s, down %d"
+input_event_rel(int conidx, const char *axis, int value) "con %d, axis %s, value %d"
+input_event_abs(int conidx, const char *axis, int value) "con %d, axis %s, value 0x%x"
+input_event_sync(void) ""
+
# hw/display/vmware_vga.c
vmware_value_read(uint32_t index, uint32_t value) "index %d, value 0x%x"
vmware_value_write(uint32_t index, uint32_t value) "index %d, value 0x%x"
diff --git a/ui/input.c b/ui/input.c
index 30a5b70..00eef0f 100644
--- a/ui/input.c
+++ b/ui/input.c
@@ -1,6 +1,8 @@
#include "sysemu/sysemu.h"
#include "qapi-types.h"
+#include "trace.h"
#include "ui/input.h"
+#include "ui/console.h"
struct QemuInputHandlerState {
DeviceState *dev;
@@ -77,6 +79,48 @@ static void qemu_input_transform_abs_rotate(InputEvent *evt)
}
}
+static void qemu_input_event_trace(QemuConsole *src, InputEvent *evt)
+{
+ const char *name;
+ int idx = -1;
+
+ if (src) {
+ idx = qemu_console_get_index(src);
+ }
+ switch (evt->kind) {
+ case INPUT_EVENT_KIND_KEY:
+ switch (evt->key->key->kind) {
+ case KEY_VALUE_KIND_NUMBER:
+ trace_input_event_key_number(idx, evt->key->key->number,
+ evt->key->down);
+ break;
+ case KEY_VALUE_KIND_QCODE:
+ name = QKeyCode_lookup[evt->key->key->qcode];
+ trace_input_event_key_qcode(idx, name, evt->key->down);
+ break;
+ case KEY_VALUE_KIND_MAX:
+ /* keep gcc happy */
+ break;
+ }
+ break;
+ case INPUT_EVENT_KIND_BTN:
+ name = InputButton_lookup[evt->btn->button];
+ trace_input_event_btn(idx, name, evt->btn->down);
+ break;
+ case INPUT_EVENT_KIND_REL:
+ name = InputAxis_lookup[evt->rel->axis];
+ trace_input_event_rel(idx, name, evt->rel->value);
+ break;
+ case INPUT_EVENT_KIND_ABS:
+ name = InputAxis_lookup[evt->abs->axis];
+ trace_input_event_abs(idx, name, evt->abs->value);
+ break;
+ case INPUT_EVENT_KIND_MAX:
+ /* keep gcc happy */
+ break;
+ }
+}
+
void qemu_input_event_send(QemuConsole *src, InputEvent *evt)
{
QemuInputHandlerState *s;
@@ -85,6 +129,8 @@ void qemu_input_event_send(QemuConsole *src, InputEvent *evt)
return;
}
+ qemu_input_event_trace(src, evt);
+
/* pre processing */
if (graphic_rotate && (evt->kind == INPUT_EVENT_KIND_ABS)) {
qemu_input_transform_abs_rotate(evt);
@@ -104,6 +150,8 @@ void qemu_input_event_sync(void)
return;
}
+ trace_input_event_sync();
+
QTAILQ_FOREACH(s, &handlers, node) {
if (!s->events) {
continue;
--
1.8.3.1
next prev parent reply other threads:[~2014-02-28 14:07 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-28 14:06 [Qemu-devel] [PULL v3 00/38] rework input handling, sdl2 support Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 01/38] console: export QemuConsole index, width, height Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 02/38] input: rename file to legacy Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 03/38] input: qapi: define event types Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 04/38] input: qapi: add unmapped key Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 05/38] input: qapi: add pause key Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 06/38] input: add core bits of the new input layer Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 07/38] input: keyboard: add helper functions to core Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 08/38] input: keyboard: switch legacy handlers to new core Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 09/38] input: keyboard: switch qmp_send_key() " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 10/38] input: keyboard: switch gtk ui " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 11/38] input: keyboard: switch sdl " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 12/38] input: keyboard: switch vnc " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 13/38] input: keyboard: switch spice " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 14/38] input: keyboard: switch curses " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 15/38] input: mouse: add helpers functions to core Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 16/38] input: mouse: add graphic_rotate support Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 17/38] input: mouse: add qemu_input_is_absolute() Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 18/38] input: mouse: switch legacy handlers to new core Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 19/38] input: mouse: switch gtk ui " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 20/38] input: mouse: switch sdl " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 21/38] input: mouse: switch vnc " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 22/38] input: mouse: switch spice " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 23/38] input: mouse: switch monitor " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 24/38] input: keyboard: switch cocoa ui " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 25/38] input: mouse: " Gerd Hoffmann
2014-02-28 14:06 ` Gerd Hoffmann [this message]
2014-02-28 14:06 ` [Qemu-devel] [PULL 27/38] input-legacy: remove kbd_put_keycode Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 28/38] input-legacy: remove kbd_mouse_has_absolute Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 29/38] input-legacy: remove kbd_mouse_is_absolute Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 30/38] input-legacy: remove kbd_mouse_event Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 31/38] input: move mouse mode notifier to new core Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 32/38] input: add input_mouse_mode tracepoint Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 33/38] input: move qmp_query_mice to new core Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 34/38] input: move do_mouse_set " Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 35/38] input: remove index_from_keycode (no users) Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 36/38] console: add head to index to qemu consoles Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 37/38] console: add QemuUIInfo Gerd Hoffmann
2014-02-28 14:06 ` [Qemu-devel] [PULL 38/38] ui/sdl2 : initial port to SDL 2.0 (v2.0) Gerd Hoffmann
2014-03-04 15:54 ` [Qemu-devel] [PULL v3 00/38] rework input handling, sdl2 support Peter Maydell
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=1393596409-28934-27-git-send-email-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=aliguori@amazon.com \
--cc=qemu-devel@nongnu.org \
/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 NNTP newsgroup(s).