From patchwork Thu Jul 17 11:05:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 371157 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id ED67014017A for ; Thu, 17 Jul 2014 23:53:03 +1000 (EST) Received: from localhost ([::1]:44430 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7m7K-0007On-3q for incoming@patchwork.ozlabs.org; Thu, 17 Jul 2014 09:53:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51902) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7jgC-0006kY-Tr for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:16:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X7jg6-0000Sm-3A for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:16:52 -0400 Received: from mail.ispras.ru ([83.149.199.45]:47613) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X7jVM-0005U6-GG for qemu-devel@nongnu.org; Thu, 17 Jul 2014 07:05:40 -0400 Received: from [10.10.150.172] (unknown [80.250.189.177]) by mail.ispras.ru (Postfix) with ESMTPSA id B8A7F540151; Thu, 17 Jul 2014 15:05:39 +0400 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Thu, 17 Jul 2014 15:05:43 +0400 Message-ID: <20140717110543.8352.6833.stgit@PASHA-ISP> In-Reply-To: <20140717110153.8352.80175.stgit@PASHA-ISP> References: <20140717110153.8352.80175.stgit@PASHA-ISP> User-Agent: StGit/0.16 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 83.149.199.45 X-Mailman-Approved-At: Thu, 17 Jul 2014 09:36:33 -0400 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, fred.konrad@greensocs.com Subject: [Qemu-devel] [RFC PATCH v2 40/49] replay: recording of the user input X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This records user input (keyboard and mouse events) in record mode and replays these input events in replay mode. Signed-off-by: Pavel Dovgalyuk --- include/ui/input.h | 2 + replay/Makefile.objs | 1 replay/replay-events.c | 48 +++++++++++++++++++++ replay/replay-input.c | 107 ++++++++++++++++++++++++++++++++++++++++++++++ replay/replay-internal.h | 11 ++++- replay/replay.h | 5 ++ ui/input.c | 79 ++++++++++++++++++++++++++-------- 7 files changed, 233 insertions(+), 20 deletions(-) create mode 100755 replay/replay-input.c diff --git a/include/ui/input.h b/include/ui/input.h index 5d5ac00..d06a12d 100644 --- a/include/ui/input.h +++ b/include/ui/input.h @@ -33,7 +33,9 @@ void qemu_input_handler_bind(QemuInputHandlerState *s, const char *device_id, int head, Error **errp); void qemu_input_event_send(QemuConsole *src, InputEvent *evt); +void qemu_input_event_send_impl(QemuConsole *src, InputEvent *evt); void qemu_input_event_sync(void); +void qemu_input_event_sync_impl(void); InputEvent *qemu_input_event_new_key(KeyValue *key, bool down); void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down); diff --git a/replay/Makefile.objs b/replay/Makefile.objs index 257c320..3936296 100755 --- a/replay/Makefile.objs +++ b/replay/Makefile.objs @@ -2,3 +2,4 @@ obj-y += replay.o obj-y += replay-internal.o obj-y += replay-events.o obj-y += replay-time.o +obj-y += replay-input.o diff --git a/replay/replay-events.c b/replay/replay-events.c index f39889d..d7ed0b2 100755 --- a/replay/replay-events.c +++ b/replay/replay-events.c @@ -12,6 +12,7 @@ #include "replay.h" #include "replay-internal.h" #include "block/thread-pool.h" +#include "ui/input.h" typedef struct Event { int event_kind; @@ -42,6 +43,16 @@ static void replay_run_event(Event *event) case REPLAY_ASYNC_EVENT_THREAD: thread_pool_work((ThreadPool *)event->opaque, event->opaque2); break; + case REPLAY_ASYNC_EVENT_INPUT: + qemu_input_event_send_impl(NULL, (InputEvent*)event->opaque); + /* Using local variables, when replaying. Do not free them. */ + if (replay_mode == REPLAY_SAVE) { + qapi_free_InputEvent((InputEvent*)event->opaque); + } + break; + case REPLAY_ASYNC_EVENT_INPUT_SYNC: + qemu_input_event_sync_impl(); + break; default: fprintf(stderr, "Replay: invalid async event ID (%d) in the queue\n", event->event_kind); @@ -134,6 +145,16 @@ void replay_add_thread_event(void *opaque, void *opaque2, uint64_t id) replay_add_event_internal(REPLAY_ASYNC_EVENT_THREAD, opaque, opaque2, id); } +void replay_add_input_event(struct InputEvent *event) +{ + replay_add_event_internal(REPLAY_ASYNC_EVENT_INPUT, event, NULL, 0); +} + +void replay_add_input_sync_event(void) +{ + replay_add_event_internal(REPLAY_ASYNC_EVENT_INPUT_SYNC, NULL, NULL, 0); +} + void replay_save_events(int opt) { qemu_mutex_lock(&lock); @@ -155,6 +176,9 @@ void replay_save_events(int opt) case REPLAY_ASYNC_EVENT_THREAD: replay_put_qword(event->id); break; + case REPLAY_ASYNC_EVENT_INPUT: + replay_save_input_event(event->opaque); + break; } } @@ -183,6 +207,7 @@ void replay_read_events(int opt) if (opt != read_opt) break; /* Execute some events without searching them in the queue */ + Event e; switch (read_event_kind) { case REPLAY_ASYNC_EVENT_BH: case REPLAY_ASYNC_EVENT_THREAD: @@ -190,6 +215,29 @@ void replay_read_events(int opt) read_id = replay_get_qword(); } break; + case REPLAY_ASYNC_EVENT_INPUT: + e.event_kind = read_event_kind; + e.opaque = replay_read_input_event(); + + replay_run_event(&e); + + replay_has_unread_data = 0; + read_event_kind = -1; + read_opt = -1; + replay_fetch_data_kind(); + /* continue with the next event */ + continue; + case REPLAY_ASYNC_EVENT_INPUT_SYNC: + e.event_kind = read_event_kind; + e.opaque = 0; + replay_run_event(&e); + + replay_has_unread_data = 0; + read_event_kind = -1; + read_opt = -1; + replay_fetch_data_kind(); + /* continue with the next event */ + continue; default: fprintf(stderr, "Unknown ID %d of replay event\n", read_event_kind); exit(1); diff --git a/replay/replay-input.c b/replay/replay-input.c new file mode 100755 index 0000000..b754caf --- /dev/null +++ b/replay/replay-input.c @@ -0,0 +1,107 @@ +/* + * replay-input.c + * + * Copyright (c) 2010-2014 Institute for System Programming + * of the Russian Academy of Sciences. + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#include "replay.h" +#include "replay-internal.h" +#include "ui/input.h" + +void replay_save_input_event(InputEvent *evt) +{ + replay_put_dword(evt->kind); + + switch (evt->kind) { + case INPUT_EVENT_KIND_KEY: + replay_put_dword(evt->key->key->kind); + + switch (evt->key->key->kind) { + case KEY_VALUE_KIND_NUMBER: + replay_put_qword(evt->key->key->number); + replay_put_byte(evt->key->down); + break; + case KEY_VALUE_KIND_QCODE: + replay_put_dword(evt->key->key->qcode); + replay_put_byte(evt->key->down); + break; + case KEY_VALUE_KIND_MAX: + /* keep gcc happy */ + break; + } + break; + case INPUT_EVENT_KIND_BTN: + replay_put_dword(evt->btn->button); + replay_put_byte(evt->btn->down); + break; + case INPUT_EVENT_KIND_REL: + replay_put_dword(evt->rel->axis); + replay_put_qword(evt->rel->value); + break; + case INPUT_EVENT_KIND_ABS: + replay_put_dword(evt->abs->axis); + replay_put_qword(evt->abs->value); + break; + case INPUT_EVENT_KIND_MAX: + /* keep gcc happy */ + break; + } +} + +InputEvent *replay_read_input_event(void) +{ + static InputEvent evt; + static KeyValue keyValue; + static InputKeyEvent key; + key.key = &keyValue; + static InputBtnEvent btn; + static InputMoveEvent rel; + static InputMoveEvent abs; + + evt.kind = replay_get_dword(); + switch (evt.kind) { + case INPUT_EVENT_KIND_KEY: + evt.key = &key; + evt.key->key->kind = replay_get_dword(); + + switch (evt.key->key->kind) { + case KEY_VALUE_KIND_NUMBER: + evt.key->key->number = replay_get_qword(); + evt.key->down = replay_get_byte(); + break; + case KEY_VALUE_KIND_QCODE: + evt.key->key->qcode = (QKeyCode)replay_get_dword(); + evt.key->down = replay_get_byte(); + break; + case KEY_VALUE_KIND_MAX: + /* keep gcc happy */ + break; + } + break; + case INPUT_EVENT_KIND_BTN: + evt.btn = &btn; + evt.btn->button = (InputButton)replay_get_dword(); + evt.btn->down = replay_get_byte(); + break; + case INPUT_EVENT_KIND_REL: + evt.rel = &rel; + evt.rel->axis = (InputAxis)replay_get_dword(); + evt.rel->value = replay_get_qword(); + break; + case INPUT_EVENT_KIND_ABS: + evt.abs = &abs; + evt.abs->axis = (InputAxis)replay_get_dword(); + evt.abs->value = replay_get_qword(); + break; + case INPUT_EVENT_KIND_MAX: + /* keep gcc happy */ + break; + } + + return &evt; +} diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 03a9cec..6aea0f0 100755 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -49,7 +49,9 @@ #define REPLAY_ASYNC_EVENT_BH 0 #define REPLAY_ASYNC_EVENT_THREAD 1 -#define REPLAY_ASYNC_COUNT 2 +#define REPLAY_ASYNC_EVENT_INPUT 2 +#define REPLAY_ASYNC_EVENT_INPUT_SYNC 3 +#define REPLAY_ASYNC_COUNT 4 typedef struct ReplayState { /*! Cached clock values. */ @@ -141,4 +143,11 @@ void replay_read_events(int opt); /*! Adds specified async event to the queue */ void replay_add_event(int event_id, void *opaque); +/* Input events */ + +/*! Saves input event to the log */ +void replay_save_input_event(InputEvent *evt); +/*! Reads input event from the log */ +InputEvent *replay_read_input_event(void); + #endif diff --git a/replay/replay.h b/replay/replay.h index e066cb2..cc0b4f4 100755 --- a/replay/replay.h +++ b/replay/replay.h @@ -17,6 +17,7 @@ #include struct QemuOpts; +struct InputEvent; /* replay modes */ #define REPLAY_NONE 0 @@ -113,5 +114,9 @@ void replay_disable_events(void); void replay_add_bh_event(void *bh, uint64_t id); /*! Adds thread event to the queue */ void replay_add_thread_event(void *pool, void *req, uint64_t id); +/*! Adds input event to the queue */ +void replay_add_input_event(struct InputEvent *event); +/*! Adds input sync event to the queue */ +void replay_add_input_sync_event(void); #endif diff --git a/ui/input.c b/ui/input.c index 89d9db7..b690a52 100644 --- a/ui/input.c +++ b/ui/input.c @@ -5,6 +5,7 @@ #include "trace.h" #include "ui/input.h" #include "ui/console.h" +#include "replay/replay.h" struct QemuInputHandlerState { DeviceState *dev; @@ -258,14 +259,10 @@ static void qemu_input_queue_sync(struct QemuInputEventQueueHead *queue) QTAILQ_INSERT_TAIL(queue, item, node); } -void qemu_input_event_send(QemuConsole *src, InputEvent *evt) +void qemu_input_event_send_impl(QemuConsole *src, InputEvent *evt) { QemuInputHandlerState *s; - if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) { - return; - } - qemu_input_event_trace(src, evt); /* pre processing */ @@ -282,14 +279,25 @@ void qemu_input_event_send(QemuConsole *src, InputEvent *evt) s->events++; } -void qemu_input_event_sync(void) +void qemu_input_event_send(QemuConsole *src, InputEvent *evt) { - QemuInputHandlerState *s; - if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) { return; } + if (replay_mode == REPLAY_PLAY) { + /* Nothing */ + } else if (replay_mode == REPLAY_SAVE) { + replay_add_input_event(evt); + } else { + qemu_input_event_send_impl(src, evt); + } +} + +void qemu_input_event_sync_impl(void) +{ + QemuInputHandlerState *s; + trace_input_event_sync(); QTAILQ_FOREACH(s, &handlers, node) { @@ -303,6 +311,21 @@ void qemu_input_event_sync(void) } } +void qemu_input_event_sync(void) +{ + if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) { + return; + } + + if (replay_mode == REPLAY_PLAY) { + /* Nothing */ + } else if (replay_mode == REPLAY_SAVE) { + replay_add_input_sync_event(); + } else { + qemu_input_event_sync_impl(); + } +} + InputEvent *qemu_input_event_new_key(KeyValue *key, bool down) { InputEvent *evt = g_new0(InputEvent, 1); @@ -316,14 +339,22 @@ InputEvent *qemu_input_event_new_key(KeyValue *key, bool down) void qemu_input_event_send_key(QemuConsole *src, KeyValue *key, bool down) { InputEvent *evt; - evt = qemu_input_event_new_key(key, down); - if (QTAILQ_EMPTY(&kbd_queue)) { - qemu_input_event_send(src, evt); - qemu_input_event_sync(); - qapi_free_InputEvent(evt); - } else { - qemu_input_queue_event(&kbd_queue, src, evt); - qemu_input_queue_sync(&kbd_queue); + if (replay_mode != REPLAY_PLAY) { + evt = qemu_input_event_new_key(key, down); + if (QTAILQ_EMPTY(&kbd_queue)) { + qemu_input_event_send(src, evt); + qemu_input_event_sync(); + if (replay_mode != REPLAY_SAVE) { + qapi_free_InputEvent(evt); + } + } else { + if (replay_mode != REPLAY_NONE) { + fprintf(stderr, "Input queue is not supported in record/replay mode\n"); + exit(1); + } + qemu_input_queue_event(&kbd_queue, src, evt); + qemu_input_queue_sync(&kbd_queue); + } } } @@ -349,6 +380,10 @@ void qemu_input_event_send_key_delay(uint32_t delay_ms) kbd_timer = timer_new_ms(QEMU_CLOCK_VIRTUAL, qemu_input_queue_process, &kbd_queue); } + if (replay_mode != REPLAY_NONE) { + fprintf(stderr, "Input queue is not supported in record/replay mode\n"); + exit(1); + } qemu_input_queue_delay(&kbd_queue, kbd_timer, delay_ms ? delay_ms : kbd_default_delay_ms); } @@ -368,7 +403,9 @@ void qemu_input_queue_btn(QemuConsole *src, InputButton btn, bool down) InputEvent *evt; evt = qemu_input_event_new_btn(btn, down); qemu_input_event_send(src, evt); - qapi_free_InputEvent(evt); + if (replay_mode != REPLAY_SAVE) { + qapi_free_InputEvent(evt); + } } void qemu_input_update_buttons(QemuConsole *src, uint32_t *button_map, @@ -421,7 +458,9 @@ void qemu_input_queue_rel(QemuConsole *src, InputAxis axis, int value) InputEvent *evt; evt = qemu_input_event_new_move(INPUT_EVENT_KIND_REL, axis, value); qemu_input_event_send(src, evt); - qapi_free_InputEvent(evt); + if (replay_mode != REPLAY_SAVE) { + qapi_free_InputEvent(evt); + } } void qemu_input_queue_abs(QemuConsole *src, InputAxis axis, int value, int size) @@ -430,7 +469,9 @@ void qemu_input_queue_abs(QemuConsole *src, InputAxis axis, int value, int size) int scaled = qemu_input_scale_axis(value, size, INPUT_EVENT_ABS_SIZE); evt = qemu_input_event_new_move(INPUT_EVENT_KIND_ABS, axis, scaled); qemu_input_event_send(src, evt); - qapi_free_InputEvent(evt); + if (replay_mode != REPLAY_SAVE) { + qapi_free_InputEvent(evt); + } } void qemu_input_check_mode_change(void)