
Making each output visitor provide its own output collection function was the only remaining reason for exposing visitor sub-types to the rest of the code base. Add a polymorphic visit_complete() function which is a no-op for input visitors, and which populates an opaque pointer for output visitors. For maximum type-safety, also add a parameter to the output visitor constructors with a type-correct version of the output pointer, and assert that the two uses match. This approach was considered superior to either passing the output parameter only during construction (action at a distance during visit_free() feels awkward) or only during visit_complete() (defeating type safety makes it easier to use incorrectly). Most callers were function-local, and therefore a mechanical conversion; the testsuite was a bit trickier, but the previous cleanup patch minimized the churn here. The visit_complete() function may be called at most once; doing so lets us use transfer semantics rather than duplication or ref-count semantics to get the just-built output back to the caller, even though it means our behavior is not idempotent. Generated code is simplified as follows for events: |@@ -26,7 +26,7 @@ void qapi_event_send_acpi_device_ost(ACP | QDict *qmp; | Error *err = NULL; | QMPEventFuncEmit emit; |- QmpOutputVisitor *qov; |+ QObject *obj; | Visitor *v; | q_obj_ACPI_DEVICE_OST_arg param = { | info |@@ -39,8 +39,7 @@ void qapi_event_send_acpi_device_ost(ACP | | qmp = qmp_event_build_dict("ACPI_DEVICE_OST"); | |- qov = qmp_output_visitor_new(); |- v = qmp_output_get_visitor(qov); |+ v = qmp_output_visitor_new(&obj); | | visit_start_struct(v, "ACPI_DEVICE_OST", NULL, 0, &err); | if (err) { |@@ -55,7 +54,8 @@ void qapi_event_send_acpi_device_ost(ACP | goto out; | } | |- qdict_put_obj(qmp, "data", qmp_output_get_qobject(qov)); |+ visit_complete(v, &obj); |+ qdict_put_obj(qmp, "data", obj); | emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err); and for commands: | { | Error *err = NULL; |- QmpOutputVisitor *qov = qmp_output_visitor_new(); | Visitor *v; | |- v = qmp_output_get_visitor(qov); |+ v = qmp_output_visitor_new(ret_out); | visit_type_AddfdInfo(v, "unused", &ret_in, &err); |- if (err) { |- goto out; |+ if (!err) { |+ visit_complete(v, ret_out); | } |- *ret_out = qmp_output_get_qobject(qov); |- |-out: | error_propagate(errp, err); Signed-off-by: Eric Blake <eblake@redhat.com> Message-Id: <1465490926-28625-13-git-send-email-eblake@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com>
166 lines
4.4 KiB
C
166 lines
4.4 KiB
C
/*
|
|
* 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/osdep.h"
|
|
#include "qapi/error.h"
|
|
#include "qemu-common.h"
|
|
#include "sysemu/replay.h"
|
|
#include "replay-internal.h"
|
|
#include "qemu/notify.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)
|
|
{
|
|
Visitor *ov, *iv;
|
|
QObject *obj;
|
|
InputEvent *dst = NULL;
|
|
|
|
ov = qmp_output_visitor_new(&obj);
|
|
visit_type_InputEvent(ov, NULL, &src, &error_abort);
|
|
visit_complete(ov, &obj);
|
|
visit_free(ov);
|
|
if (!obj) {
|
|
return NULL;
|
|
}
|
|
|
|
iv = qmp_input_visitor_new(obj, true);
|
|
visit_type_InputEvent(iv, NULL, &dst, &error_abort);
|
|
visit_free(iv);
|
|
qobject_decref(obj);
|
|
|
|
return dst;
|
|
}
|
|
|
|
void replay_save_input_event(InputEvent *evt)
|
|
{
|
|
InputKeyEvent *key;
|
|
InputBtnEvent *btn;
|
|
InputMoveEvent *move;
|
|
replay_put_dword(evt->type);
|
|
|
|
switch (evt->type) {
|
|
case INPUT_EVENT_KIND_KEY:
|
|
key = evt->u.key.data;
|
|
replay_put_dword(key->key->type);
|
|
|
|
switch (key->key->type) {
|
|
case KEY_VALUE_KIND_NUMBER:
|
|
replay_put_qword(key->key->u.number.data);
|
|
replay_put_byte(key->down);
|
|
break;
|
|
case KEY_VALUE_KIND_QCODE:
|
|
replay_put_dword(key->key->u.qcode.data);
|
|
replay_put_byte(key->down);
|
|
break;
|
|
case KEY_VALUE_KIND__MAX:
|
|
/* keep gcc happy */
|
|
break;
|
|
}
|
|
break;
|
|
case INPUT_EVENT_KIND_BTN:
|
|
btn = evt->u.btn.data;
|
|
replay_put_dword(btn->button);
|
|
replay_put_byte(btn->down);
|
|
break;
|
|
case INPUT_EVENT_KIND_REL:
|
|
move = evt->u.rel.data;
|
|
replay_put_dword(move->axis);
|
|
replay_put_qword(move->value);
|
|
break;
|
|
case INPUT_EVENT_KIND_ABS:
|
|
move = evt->u.abs.data;
|
|
replay_put_dword(move->axis);
|
|
replay_put_qword(move->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.type = replay_get_dword();
|
|
switch (evt.type) {
|
|
case INPUT_EVENT_KIND_KEY:
|
|
evt.u.key.data = &key;
|
|
evt.u.key.data->key->type = replay_get_dword();
|
|
|
|
switch (evt.u.key.data->key->type) {
|
|
case KEY_VALUE_KIND_NUMBER:
|
|
evt.u.key.data->key->u.number.data = replay_get_qword();
|
|
evt.u.key.data->down = replay_get_byte();
|
|
break;
|
|
case KEY_VALUE_KIND_QCODE:
|
|
evt.u.key.data->key->u.qcode.data = (QKeyCode)replay_get_dword();
|
|
evt.u.key.data->down = replay_get_byte();
|
|
break;
|
|
case KEY_VALUE_KIND__MAX:
|
|
/* keep gcc happy */
|
|
break;
|
|
}
|
|
break;
|
|
case INPUT_EVENT_KIND_BTN:
|
|
evt.u.btn.data = &btn;
|
|
evt.u.btn.data->button = (InputButton)replay_get_dword();
|
|
evt.u.btn.data->down = replay_get_byte();
|
|
break;
|
|
case INPUT_EVENT_KIND_REL:
|
|
evt.u.rel.data = &rel;
|
|
evt.u.rel.data->axis = (InputAxis)replay_get_dword();
|
|
evt.u.rel.data->value = replay_get_qword();
|
|
break;
|
|
case INPUT_EVENT_KIND_ABS:
|
|
evt.u.abs.data = &abs;
|
|
evt.u.abs.data->axis = (InputAxis)replay_get_dword();
|
|
evt.u.abs.data->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();
|
|
}
|
|
}
|