[Spice-devel,v2,06/12] spice: add unblock timer

Submitted by Gerd Hoffmann on Feb. 19, 2016, 9:14 a.m.

Details

Message ID 1455873289-349-7-git-send-email-kraxel@redhat.com
State New
Headers show
Series "spice: add opengl/virgl/dmabuf support" ( rev: 2 ) in Spice

Not browsing as part of any series.

Commit Message

Gerd Hoffmann Feb. 19, 2016, 9:14 a.m.
Pure debug aid, print a warning in case unblocking
doesn't happen within one second.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 include/ui/spice-display.h |  1 +
 ui/spice-display.c         | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

Patch hide | download patch | download mbox

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;

Comments

Hi

On Fri, Feb 19, 2016 at 10:14 AM, Gerd Hoffmann <kraxel@redhat.com> wrote:
> 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>

>  include/ui/spice-display.h |  1 +
>  ui/spice-display.c         | 16 ++++++++++++++++
>  2 files changed, 17 insertions(+)
>
> 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;
> --
> 1.8.3.1
>