[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 13/36] ui: add a gl-unblock warning timer
From: |
marcandre . lureau |
Subject: |
[PULL v2 13/36] ui: add a gl-unblock warning timer |
Date: |
Tue, 21 Dec 2021 10:58:32 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Similar to the one that exists for Spice, so we can investigate if
something is locked.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/console.c | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/ui/console.c b/ui/console.c
index 39f7b66baf54..fcc4fe6a0aa0 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -80,6 +80,7 @@ struct QemuConsole {
int dcls;
DisplayChangeListener *gl;
int gl_block;
+ QEMUTimer *gl_unblock_timer;
int window_id;
/* Graphic console state. */
@@ -233,8 +234,14 @@ void graphic_hw_update(QemuConsole *con)
}
}
+static void graphic_hw_gl_unblock_timer(void *opaque)
+{
+ warn_report("console: no gl-unblock within one second");
+}
+
void graphic_hw_gl_block(QemuConsole *con, bool block)
{
+ uint64_t timeout;
assert(con != NULL);
if (block) {
@@ -250,6 +257,14 @@ void graphic_hw_gl_block(QemuConsole *con, bool block)
return;
}
con->hw_ops->gl_block(con->hw, block);
+
+ if (block) {
+ timeout = qemu_clock_get_ms(QEMU_CLOCK_REALTIME);
+ timeout += 1000; /* one sec */
+ timer_mod(con->gl_unblock_timer, timeout);
+ } else {
+ timer_del(con->gl_unblock_timer);
+ }
}
void graphic_hw_gl_flushed(QemuConsole *con)
@@ -1966,6 +1981,8 @@ QemuConsole *graphic_console_init(DeviceState *dev,
uint32_t head,
surface = qemu_create_placeholder_surface(width, height, noinit);
dpy_gfx_replace_surface(s, surface);
+ s->gl_unblock_timer = timer_new_ms(QEMU_CLOCK_REALTIME,
+ graphic_hw_gl_unblock_timer, s);
return s;
}
--
2.34.1.8.g35151cf07204
- [PULL v2 03/36] ui: generalize clipboard notifier, (continued)
- [PULL v2 03/36] ui: generalize clipboard notifier, marcandre . lureau, 2021/12/21
- [PULL v2 04/36] ui/vdagent: add serial capability support, marcandre . lureau, 2021/12/21
- [PULL v2 05/36] ui/clipboard: add qemu_clipboard_check_serial(), marcandre . lureau, 2021/12/21
- [PULL v2 06/36] ui/clipboard: add a clipboard reset serial event, marcandre . lureau, 2021/12/21
- [PULL v2 07/36] hw/display: report an error if virgl initialization failed, marcandre . lureau, 2021/12/21
- [PULL v2 08/36] virtio-gpu: use VIRTIO_GPU_RESOURCE_FLAG_Y_0_TOP, marcandre . lureau, 2021/12/21
- [PULL v2 09/36] ui: do not delay further remote resize, marcandre . lureau, 2021/12/21
- [PULL v2 10/36] ui: factor out qemu_console_set_display_gl_ctx(), marcandre . lureau, 2021/12/21
- [PULL v2 11/36] ui: associate GL context outside of display listener registration, marcandre . lureau, 2021/12/21
- [PULL v2 12/36] ui: make gl_block use a counter, marcandre . lureau, 2021/12/21
- [PULL v2 13/36] ui: add a gl-unblock warning timer,
marcandre . lureau <=
- [PULL v2 14/36] ui: simplify gl unblock & flush, marcandre . lureau, 2021/12/21
- [PULL v2 15/36] ui: dispatch GL events to all listeners, marcandre . lureau, 2021/12/21
- [PULL v2 16/36] ui: split the GL context in a different object, marcandre . lureau, 2021/12/21
- [PULL v2 17/36] ui: move qemu_spice_fill_device_address to ui/util.c, marcandre . lureau, 2021/12/21
- [PULL v2 18/36] console: save current scanout details, marcandre . lureau, 2021/12/21
- [PULL v2 19/36] scripts: teach modinfo to skip non-C sources, marcandre . lureau, 2021/12/21
- [PULL v2 20/36] docs/sphinx: add sphinx modules to include D-Bus documentation, marcandre . lureau, 2021/12/21
- [PULL v2 21/36] backends: move dbus-vmstate1.xml to backends/, marcandre . lureau, 2021/12/21
- [PULL v2 22/36] docs: move D-Bus VMState documentation to source XML, marcandre . lureau, 2021/12/21
- [PULL v2 23/36] docs: add dbus-display documentation, marcandre . lureau, 2021/12/21