[PATCH xf86-video-qxl 2/4 v3] Only watch the uinput channel when an agent is connected.

[Jeremy White <jwhite@xxxxxxxxxxxxxxx>]

Otherwise, you constantly spin loop, getting a return code of 0,
and pegging CPU usage at 100%.

Signed-off-by: Jeremy White <jwhite@xxxxxxxxxxxxxxx>
---
This differs from v2 in that it groups the static handle with the
other static variables in the file.  It also now always disables
any existing watch, even if a new watch is being set.
---
 src/spiceqxl_uinput.c  | 14 +++++++++++++-
 src/spiceqxl_uinput.h  |  1 +
 src/spiceqxl_vdagent.c |  2 ++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/spiceqxl_uinput.c b/src/spiceqxl_uinput.c
index 1e61907..bb96a37 100644
--- a/src/spiceqxl_uinput.c
+++ b/src/spiceqxl_uinput.c
@@ -20,6 +20,7 @@
 
 static const char *uinput_filename;
 static int uinput_fd;
+static SpiceWatch *uinput_watch;
 static struct input_event inp_event;
 static int offset;
 
@@ -121,6 +122,17 @@ void spiceqxl_uinput_init(qxl_screen_t *qxl)
                uinput_filename, strerror(errno));
         return;
     }
-    qxl->core->watch_add(uinput_fd, SPICE_WATCH_EVENT_READ, spiceqxl_uinput_read_cb, qxl);
     spice_server_set_agent_mouse(qxl->spice_server, 1);
 }
+
+void spiceqxl_uinput_watch(qxl_screen_t *qxl, Bool on)
+{
+    if (uinput_watch) {
+        qxl->core->watch_remove(uinput_watch);
+        uinput_watch = NULL;
+    }
+
+    if (on)
+        uinput_watch = qxl->core->watch_add(uinput_fd, SPICE_WATCH_EVENT_READ,
+                            spiceqxl_uinput_read_cb, qxl);
+}
diff --git a/src/spiceqxl_uinput.h b/src/spiceqxl_uinput.h
index 59c704c..33715a0 100644
--- a/src/spiceqxl_uinput.h
+++ b/src/spiceqxl_uinput.h
@@ -4,5 +4,6 @@
 #include "qxl.h"
 
 void spiceqxl_uinput_init(qxl_screen_t *qxl);
+void spiceqxl_uinput_watch(qxl_screen_t *qxl, Bool on);
 
 #endif
diff --git a/src/spiceqxl_vdagent.c b/src/spiceqxl_vdagent.c
index 315ae53..a62c1e6 100644
--- a/src/spiceqxl_vdagent.c
+++ b/src/spiceqxl_vdagent.c
@@ -62,6 +62,7 @@ static int vmc_read(SpiceCharDeviceInstance *sin, uint8_t *buf, int len)
         vdagent_sin.qxl->core->watch_remove(virtio_client_watch);
         virtio_client_watch = NULL;
         spice_server_remove_interface(&vdagent_sin.base.base);
+        spiceqxl_uinput_watch(vdagent_sin.qxl, FALSE);
     }
     return nbytes;
 }
@@ -123,6 +124,7 @@ static void on_accept(int fd, int event, void *opaque)
         /* TODO - SPICE_WATCH_EVENT_WRITE */, on_read_available, qxl);
 
     spice_server_add_interface(qxl->spice_server, &vdagent_sin.base.base);
+    spiceqxl_uinput_watch(qxl, TRUE);
 
     return;
 
-- 
2.1.4

_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/spice-devel