diff options
author | Gerd Hoffmann <kraxel@redhat.com> | 2016-02-19 07:46:47 +0100 |
---|---|---|
committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-11-29 19:45:30 -0600 |
commit | e8ac825d231feb5147f52601cc21a54d7f6dbc94 (patch) | |
tree | b4e3f2ec54670b32a424319bab0ac5885f9b3094 | |
parent | d1d883bf6b416a028f75c1a46e49adf462b67a91 (diff) | |
download | hqemu-e8ac825d231feb5147f52601cc21a54d7f6dbc94.zip hqemu-e8ac825d231feb5147f52601cc21a54d7f6dbc94.tar.gz |
spice/gl: add unblock timer
Pure debug aid, print a warning in case unblocking
doesn't happen within one second.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
-rw-r--r-- | include/ui/spice-display.h | 1 | ||||
-rw-r--r-- | ui/spice-display.c | 16 |
2 files changed, 17 insertions, 0 deletions
diff --git a/include/ui/spice-display.h b/include/ui/spice-display.h index 48dc8c4..69a222b 100644 --- a/include/ui/spice-display.h +++ b/include/ui/spice-display.h @@ -117,6 +117,7 @@ struct SimpleSpiceDisplay { #ifdef HAVE_SPICE_GL /* opengl rendering */ QEMUBH *gl_unblock_bh; + QEMUTimer *gl_unblock_timer; int dmabuf_fd; #endif }; diff --git a/ui/spice-display.c b/ui/spice-display.c index 904fb33..d6e31e4 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -797,6 +797,15 @@ static const DisplayChangeListenerOps display_listener_ops = { static void qemu_spice_gl_block(SimpleSpiceDisplay *ssd, bool block) { + uint64_t timeout; + + if (block) { + timeout = qemu_clock_get_ms(QEMU_CLOCK_REALTIME); + timeout += 1000; /* one sec */ + timer_mod(ssd->gl_unblock_timer, timeout); + } else { + timer_del(ssd->gl_unblock_timer); + } graphic_hw_gl_block(ssd->dcl.con, block); } @@ -807,6 +816,11 @@ static void qemu_spice_gl_unblock_bh(void *opaque) qemu_spice_gl_block(ssd, false); } +static void qemu_spice_gl_block_timer(void *opaque) +{ + fprintf(stderr, "WARNING: spice: no gl-draw-done within one second\n"); +} + static QEMUGLContext qemu_spice_gl_create_context(DisplayChangeListener *dcl, QEMUGLParams *params) { @@ -888,6 +902,8 @@ static void qemu_spice_display_init_one(QemuConsole *con) ssd->dcl.ops = &display_listener_gl_ops; ssd->dmabuf_fd = -1; ssd->gl_unblock_bh = qemu_bh_new(qemu_spice_gl_unblock_bh, ssd); + ssd->gl_unblock_timer = timer_new_ms(QEMU_CLOCK_REALTIME, + qemu_spice_gl_block_timer, ssd); } #endif ssd->dcl.con = con; |