ui: add a gl-unblock warning timer

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>
This commit is contained in:
Marc-André Lureau 2021-03-11 11:56:58 +04:00
parent a4ddc31417
commit a9b1e471e1
1 changed files with 17 additions and 0 deletions

View File

@ -80,6 +80,7 @@ struct QemuConsole {
int dcls; int dcls;
DisplayChangeListener *gl; DisplayChangeListener *gl;
int gl_block; int gl_block;
QEMUTimer *gl_unblock_timer;
int window_id; int window_id;
/* Graphic console state. */ /* 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) void graphic_hw_gl_block(QemuConsole *con, bool block)
{ {
uint64_t timeout;
assert(con != NULL); assert(con != NULL);
if (block) { if (block) {
@ -250,6 +257,14 @@ void graphic_hw_gl_block(QemuConsole *con, bool block)
return; return;
} }
con->hw_ops->gl_block(con->hw, block); 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) 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); surface = qemu_create_placeholder_surface(width, height, noinit);
dpy_gfx_replace_surface(s, surface); dpy_gfx_replace_surface(s, surface);
s->gl_unblock_timer = timer_new_ms(QEMU_CLOCK_REALTIME,
graphic_hw_gl_unblock_timer, s);
return s; return s;
} }