Commit 8e388e90 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

spice/gl: add unblock timer 



Pure debug aid, print a warning in case unblocking
doesn't happen within one second.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
parent 474114b7

include/ui/spice-display.h

+1 −0
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ struct SimpleSpiceDisplay { 
#ifdef HAVE_SPICE_GL

    /* opengl rendering */

    QEMUBH *gl_unblock_bh;

    QEMUTimer *gl_unblock_timer;

    int dmabuf_fd;

#endif

};

ui/spice-display.c

+16 −0
Original line number Diff line number Diff line
@@ -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;