frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/kdrive: Use NotifyFd for kdrive input devices 

This switches the kdrive code to use FD notification for input
devices, rather than the block and wakeup handlers.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Keith Packard 2015-11-11 22:02:09 -08:00 committed by Adam Jackson
parent 21c1680e83
commit 483c2a1adf
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
hw/kdrive/src/kinput.c
View File

@ -153,7 +153,16 @@ KdNonBlockFd(int fd)
} }
static void static void
KdAddFd(int fd) KdNotifyFd(int fd, int ready, void *data)
{
int i = (int) (intptr_t) data;
OsBlockSIGIO();
(*kdInputFds[i].read)(fd, kdInputFds[i].closure);
OsReleaseSIGIO();
}
static void
KdAddFd(int fd, int i)
{ {
struct sigaction act; struct sigaction act;
sigset_t set; sigset_t set;
@ -162,6 +171,7 @@ KdAddFd(int fd)
fcntl(fd, F_SETOWN, getpid()); fcntl(fd, F_SETOWN, getpid());
KdNonBlockFd(fd); KdNonBlockFd(fd);
AddEnabledDevice(fd); AddEnabledDevice(fd);
SetNotifyFd(fd, KdNotifyFd, X_NOTIFY_READ, (void *) (intptr_t) i);
memset(&act, '\0', sizeof act); memset(&act, '\0', sizeof act);
act.sa_handler = KdSigio; act.sa_handler = KdSigio;
sigemptyset(&act.sa_mask); sigemptyset(&act.sa_mask);
@ -181,6 +191,7 @@ KdRemoveFd(int fd)
kdnFds--; kdnFds--;
RemoveEnabledDevice(fd); RemoveEnabledDevice(fd);
RemoveNotifyFd(fd);
flags = fcntl(fd, F_GETFL); flags = fcntl(fd, F_GETFL);
flags &= ~(FASYNC | NOBLOCK); flags &= ~(FASYNC | NOBLOCK);
fcntl(fd, F_SETFL, flags); fcntl(fd, F_SETFL, flags);
@ -202,9 +213,9 @@ KdRegisterFd(int fd, void (*read) (int fd, void *closure), void *closure)
kdInputFds[kdNumInputFds].enable = 0; kdInputFds[kdNumInputFds].enable = 0;
kdInputFds[kdNumInputFds].disable = 0; kdInputFds[kdNumInputFds].disable = 0;
kdInputFds[kdNumInputFds].closure = closure; kdInputFds[kdNumInputFds].closure = closure;
kdNumInputFds++;
if (kdInputEnabled) if (kdInputEnabled)
KdAddFd(fd); KdAddFd(fd, kdNumInputFds);
kdNumInputFds++;
return TRUE; return TRUE;
} }
@ -1933,19 +1944,8 @@ KdBlockHandler(ScreenPtr pScreen, void *timeo, void *readmask)
void void
KdWakeupHandler(ScreenPtr pScreen, unsigned long lresult, void *readmask) KdWakeupHandler(ScreenPtr pScreen, unsigned long lresult, void *readmask)
{ {
int result = (int) lresult;
fd_set *pReadmask = (fd_set *) readmask;
int i;
KdPointerInfo *pi; KdPointerInfo *pi;
if (kdInputEnabled && result > 0) {
for (i = 0; i < kdNumInputFds; i++)
if (FD_ISSET(kdInputFds[i].fd, pReadmask)) {
OsBlockSIGIO();
(*kdInputFds[i].read) (kdInputFds[i].fd, kdInputFds[i].closure);
OsReleaseSIGIO();
}
}
for (pi = kdPointers; pi; pi = pi->next) { for (pi = kdPointers; pi; pi = pi->next) {
if (pi->timeoutPending) { if (pi->timeoutPending) {
if ((long) (GetTimeInMillis() - pi->emulationTimeout) >= 0) { if ((long) (GetTimeInMillis() - pi->emulationTimeout) >= 0) {