From patchwork Fri Feb 27 13:12:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 444284 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 CD6531400D5 for ; Sat, 28 Feb 2015 00:27:15 +1100 (AEDT) Received: from localhost ([::1]:35993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRKwj-00084Q-OU for incoming@patchwork.ozlabs.org; Fri, 27 Feb 2015 08:27:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54051) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRKi4-00047R-6y for qemu-devel@nongnu.org; Fri, 27 Feb 2015 08:12:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRKi2-0005ZV-Ii for qemu-devel@nongnu.org; Fri, 27 Feb 2015 08:12:04 -0500 Received: from mail.ispras.ru ([83.149.199.45]:34767) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRKi2-0005ZN-7m for qemu-devel@nongnu.org; Fri, 27 Feb 2015 08:12:02 -0500 Received: from [10.10.150.93] (unknown [85.142.117.224]) by mail.ispras.ru (Postfix) with ESMTPSA id 7C39754006F; Fri, 27 Feb 2015 16:12:01 +0300 (MSK) To: qemu-devel@nongnu.org From: Pavel Dovgalyuk Date: Fri, 27 Feb 2015 16:12:06 +0300 Message-ID: <20150227131206.11912.9630.stgit@PASHA-ISP> In-Reply-To: <20150227130939.11912.50660.stgit@PASHA-ISP> References: <20150227130939.11912.50660.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 Cc: peter.maydell@linaro.org, peter.crosthwaite@xilinx.com, alex.bennee@linaro.org, mark.burton@greensocs.com, real@ispras.ru, batuzovk@ispras.ru, maria.klimushenkova@ispras.ru, pavel.dovgaluk@ispras.ru, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [RFC PATCH v10 24/24] 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 | 31 +++++++++ replay/replay-input.c | 159 ++++++++++++++++++++++++++++++++++++++++++++++ replay/replay-internal.h | 13 ++++ replay/replay.h | 4 + ui/input.c | 27 +++++--- 7 files changed, 229 insertions(+), 8 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 485a440..ecda545 100755 --- a/replay/replay-events.c +++ b/replay/replay-events.c @@ -14,6 +14,7 @@ #include "replay.h" #include "replay-internal.h" #include "block/thread-pool.h" +#include "ui/input.h" typedef struct Event { ReplayAsyncEventKind event_kind; @@ -42,6 +43,13 @@ 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); + qapi_free_InputEvent((InputEvent *)event->opaque); + break; + case REPLAY_ASYNC_EVENT_INPUT_SYNC: + qemu_input_event_sync_impl(); + break; default: error_report("Replay: invalid async event ID (%d) in the queue", event->event_kind); @@ -144,6 +152,9 @@ static void replay_save_event(Event *event, int checkpoint) case REPLAY_ASYNC_EVENT_THREAD: replay_put_qword(event->id); break; + case REPLAY_ASYNC_EVENT_INPUT: + replay_save_input_event(event->opaque); + break; } } } @@ -158,6 +169,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); +} + /* Called with replay mutex locked */ void replay_save_events(int checkpoint) { @@ -195,6 +216,16 @@ static Event *replay_read_event(int checkpoint) read_id = replay_get_qword(); } break; + case REPLAY_ASYNC_EVENT_INPUT: + event = g_malloc0(sizeof(Event)); + event->event_kind = read_event_kind; + event->opaque = replay_read_input_event(); + return event; + case REPLAY_ASYNC_EVENT_INPUT_SYNC: + event = g_malloc0(sizeof(Event)); + event->event_kind = read_event_kind; + event->opaque = 0; + return event; default: error_report("Unknown ID %d of replay event", read_event_kind); exit(1); diff --git a/replay/replay-input.c b/replay/replay-input.c new file mode 100755 index 0000000..54923b9 --- /dev/null +++ b/replay/replay-input.c @@ -0,0 +1,159 @@ +/* + * replay-input.c + * + * Copyright (c) 2010-2015 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 "qemu-common.h" +#include "replay.h" +#include "replay-internal.h" +#include "ui/input.h" +#include "qapi/qmp-output-visitor.h" +#include "qapi/qmp-input-visitor.h" +#include "qapi-visit.h" + +static InputEvent *qapi_clone_InputEvent(InputEvent *src) +{ + QmpOutputVisitor *qov; + QmpInputVisitor *qiv; + Visitor *ov, *iv; + QObject *obj; + InputEvent *dst = NULL; + + qov = qmp_output_visitor_new(); + ov = qmp_output_get_visitor(qov); + visit_type_InputEvent(ov, &src, NULL, &error_abort); + obj = qmp_output_get_qobject(qov); + qmp_output_visitor_cleanup(qov); + if (!obj) { + return NULL; + } + + qiv = qmp_input_visitor_new(obj); + iv = qmp_input_get_visitor(qiv); + visit_type_InputEvent(iv, &dst, NULL, &error_abort); + qmp_input_visitor_cleanup(qiv); + qobject_decref(obj); + + return dst; +} + +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) +{ + InputEvent evt; + KeyValue keyValue; + InputKeyEvent key; + key.key = &keyValue; + InputBtnEvent btn; + InputMoveEvent rel; + 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 qapi_clone_InputEvent(&evt); +} + +void replay_input_event(QemuConsole *src, InputEvent *evt) +{ + if (replay_mode == REPLAY_MODE_PLAY) { + /* Nothing */ + } else if (replay_mode == REPLAY_MODE_RECORD) { + replay_add_input_event(qapi_clone_InputEvent(evt)); + } else { + qemu_input_event_send_impl(src, evt); + } +} + +void replay_input_sync_event(void) +{ + if (replay_mode == REPLAY_MODE_PLAY) { + /* Nothing */ + } else if (replay_mode == REPLAY_MODE_RECORD) { + replay_add_input_sync_event(); + } else { + qemu_input_event_sync_impl(); + } +} diff --git a/replay/replay-internal.h b/replay/replay-internal.h index 776a30c..31d7cfd 100755 --- a/replay/replay-internal.h +++ b/replay/replay-internal.h @@ -43,6 +43,8 @@ enum ReplayEvents { enum ReplayAsyncEventKind { REPLAY_ASYNC_EVENT_BH, REPLAY_ASYNC_EVENT_THREAD, + REPLAY_ASYNC_EVENT_INPUT, + REPLAY_ASYNC_EVENT_INPUT_SYNC, REPLAY_ASYNC_COUNT }; @@ -127,4 +129,15 @@ void replay_read_events(int checkpoint); /*! Adds specified async event to the queue */ void replay_add_event(ReplayAsyncEventKind 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); +/*! 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/replay/replay.h b/replay/replay.h index 1bded8a..367f738 100755 --- a/replay/replay.h +++ b/replay/replay.h @@ -111,5 +111,9 @@ bool replay_events_enabled(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_input_event(QemuConsole *src, InputEvent *evt); +/*! Adds input sync event to the queue */ +void replay_input_sync_event(void); #endif diff --git a/ui/input.c b/ui/input.c index 7ba99e5..85cb819 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; @@ -298,14 +299,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 */ @@ -322,14 +319,19 @@ 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; } + replay_input_event(src, evt); +} + +void qemu_input_event_sync_impl(void) +{ + QemuInputHandlerState *s; + trace_input_event_sync(); QTAILQ_FOREACH(s, &handlers, node) { @@ -343,6 +345,15 @@ void qemu_input_event_sync(void) } } +void qemu_input_event_sync(void) +{ + if (!runstate_is_running() && !runstate_check(RUN_STATE_SUSPENDED)) { + return; + } + + replay_input_sync_event(); +} + InputEvent *qemu_input_event_new_key(KeyValue *key, bool down) { InputEvent *evt = g_new0(InputEvent, 1);