XLibre/xf86-video-intel
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-intel.git synced 2026-03-24 01:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools/intel-virtual-output: Check for pending events before blocking

Browse Source 
If the xlib/xcb library has pulled events from the fd, then a poll on
that fd will block until new events arrive. If none do, we fail to
process the currently waiting events in a timely fashion.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
2016-11-30 23:40:14 +00:00
parent bde946054e
commit cdd0671764
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
tools/virtual.c
View File

@@ -3392,6 +3392,7 @@ int main(int argc, char **argv)
uint64_t count;
int daemonize = 1, bumblebee = 0, siblings = 0, singleton = 1;
int i, ret, open, fail;
int idle;
signal(SIGPIPE, SIG_IGN);
@@ -3572,21 +3573,30 @@ int main(int argc, char **argv)
ctx.command_continuation = 0;
update_cursor_image(&ctx);
idle = 0;
while (!done) {
XEvent e;
int reconfigure = 0;
int rr_update = 0;
DBG(POLL, ("polling - enable timer? %d, nfd=%d, ndisplay=%d\n", ctx.timer_active, ctx.nfd, ctx.ndisplay));
ret = poll(ctx.pfd + !ctx.timer_active, ctx.nfd - !ctx.timer_active, -1);
if (ret <= 0)
break;
if (idle) {
DBG(POLL, ("polling - enable timer? %d, nfd=%d, ndisplay=%d\n", ctx.timer_active, ctx.nfd, ctx.ndisplay));
ret = poll(ctx.pfd + !ctx.timer_active, ctx.nfd - !ctx.timer_active, -1);
if (ret <= 0)
break;
DBG(POLL, ("poll reports %d fd awake\n", ret));
}
idle = 1;
/* pfd[0] is the timer, pfd[1] is the local display, pfd[2] is the mouse, pfd[3+] are the remotes */
DBG(POLL, ("poll reports %d fd awake\n", ret));
if (ctx.pfd[1].revents || XPending(ctx.display[0].dpy)) {
DBG(POLL,("%s woken up\n", DisplayString(ctx.display[0].dpy)));
ctx.pfd[1].revents = 0;
idle = 0;
do {
XNextEvent(ctx.display->dpy, &e);
@@ -3663,6 +3673,9 @@ int main(int argc, char **argv)
if (ctx.pfd[i+2].revents == 0 && !XPending(ctx.display[i].dpy))
continue;
ctx.pfd[i+2].revents = 0;
idle = 0;
DBG(POLL, ("%s woken up\n", DisplayString(ctx.display[i].dpy)));
do {
XNextEvent(ctx.display[i].dpy, &e);
@@ -3742,6 +3755,7 @@ int main(int argc, char **argv)
DBG(TIMER, ("%s timer still active? %d\n", DisplayString(ctx.display->dpy), ret != 0));
ctx.timer_active = ret != 0;
idle = 0;
}
}