kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=a620fd47dc9fb4cf84cd446219a974fc3bbecfa6
commit a620fd47dc9fb4cf84cd446219a974fc3bbecfa6 Author: Kim Woelders <[email protected]> Date: Wed May 27 16:36:51 2020 +0200 Use poll() for event handling by default (if available) Might be more efficient, mostly just playing around. --- configure.ac | 24 ++++++++++++++++++++++-- src/events.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 78 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index fbdda296..7f6480c3 100644 --- a/configure.ac +++ b/configure.ac @@ -83,6 +83,23 @@ if test "x$enable_hints_gnome" = "xyes"; then fi AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_hints_gnome" = "xyes") +AC_ARG_WITH(evhan, + AS_HELP_STRING([--with-evhan], + [select event handling api (poll/select)@<:@default=auto@:>@]),, + AC_CHECK_HEADERS(poll.h, with_evhan=poll, with_evhan=select)) +case "$with_evhan" in +poll) + AC_CHECK_HEADERS(poll.h,, AC_MSG_ERROR([Need poll.h])) + AC_DEFINE(USE_EVHAN_POLL, 1, [Use poll as event handler api]) + ;; +select) + AC_DEFINE(USE_EVHAN_SELECT, 1, [Use select as event handler api]) + ;; +*) + AC_MSG_ERROR([Invalid option: --with-evhan=$with_evhan]) + ;; +esac + AC_ARG_ENABLE(sound, AS_HELP_STRING([--enable-sound], [compile with sound support (pulseaudio/esound/sndio/alsa/player/no)@<:@default=pulseaudio@:>@]),, @@ -516,11 +533,14 @@ echo " Render ....................... $enable_xrender" echo " Sync ......................... $enable_xsync" echo " Composite .................... $enable_composite" echo " GNOME session support ........ $with_gnome" -echo " Modules ...................... $enable_modules" -echo " Visibility hiding ............ $enable_visibility_hiding (only useful with modules)" echo " Window mode helper library ... $enable_libhack" echo " Dialogs ...................... $enable_dialogs" echo +echo "Miscellaneous options" +echo " Event handler API ............ $with_evhan" +echo " Use Modules .................. $enable_modules" +echo " Visibility hiding ............ $enable_visibility_hiding (only useful with modules)" +echo echo "Experimental options - DO NOT USE unless you know what you are doing" echo " GLX .......................... $enable_glx" echo " ScreenSaver .................. $enable_xscrnsaver" diff --git a/src/events.c b/src/events.c index 37fe48c9..0cb891ce 100644 --- a/src/events.c +++ b/src/events.c @@ -1,6 +1,6 @@ /* * Copyright (C) 2000-2007 Carsten Haitzler, Geoff Harrison and various contributors - * Copyright (C) 2004-2019 Kim Woelders + * Copyright (C) 2004-2020 Kim Woelders * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to @@ -23,7 +23,11 @@ */ #include "config.h" +#if USE_EVHAN_POLL +#include <poll.h> +#elif USE_EVHAN_SELECT #include <sys/select.h> +#endif #include <sys/time.h> #include <X11/Xlib.h> #include <X11/Xutil.h> @@ -347,11 +351,16 @@ struct _EventFdDesc { #if 0 /* Unused */ const char *name; #endif +#if USE_EVHAN_SELECT int fd; +#endif void (*handler)(void); }; static int nfds = 0; +#if USE_EVHAN_POLL +static struct pollfd *pfdl = NULL; +#endif static EventFdDesc *pfds = NULL; EventFdDesc * @@ -359,7 +368,14 @@ EventFdRegister(int fd, EventFdHandler * handler) { nfds++; pfds = EREALLOC(EventFdDesc, pfds, nfds); + +#if USE_EVHAN_POLL + pfdl = EREALLOC(struct pollfd, pfdl, nfds); + pfdl[nfds - 1].fd = fd; +#elif USE_EVHAN_SELECT pfds[nfds - 1].fd = fd; +#endif + pfds[nfds - 1].handler = handler; return pfds + (nfds - 1); @@ -368,7 +384,14 @@ EventFdRegister(int fd, EventFdHandler * handler) void EventFdUnregister(EventFdDesc * efd) { - efd->fd = -1; + int ix = efd - pfds; + +#if USE_EVHAN_POLL + if (pfdl[ix].fd > 0) + pfdl[ix].fd = -pfdl[ix].fd; +#elif USE_EVHAN_SELECT + pfds[ix].fd = -1; +#endif } /* @@ -1072,12 +1095,15 @@ EventsMain(void) static int evq_alloc = 0; static int evq_fetch = 0; static XEvent *evq_ptr = NULL; +#if USE_EVHAN_SELECT fd_set fdset; + int fdsize, fd; struct timeval tval; +#endif unsigned int time1, time2; int dtl, dt; int count, pfetch; - int fdsize, fd, i; + int i; time1 = GetTimeMs(); @@ -1128,6 +1154,32 @@ EventsMain(void) else if (XPending(disp)) continue; +#if USE_EVHAN_POLL + for (i = 0; i < nfds; i++) + pfdl[i].events = (i == 0 && Mode.events.block) ? 0 : POLLIN; + + if (dt < 0.) + dt = 0.; + count = poll(pfdl, nfds, (int)dt); + + if (EDebug(EDBUG_TYPE_EVENTS)) + Eprintf("%s: count=%d xfd=%d:%d dtl=%.6lf dt=%.6lf\n", __func__, + count, pfdl[0].fd, pfdl[0].revents, dtl * 1e-3, dt * 1e-3); + + if (count <= 0) + continue; /* Timeout (or error) */ + + /* Excluding X fd */ + for (i = 1; i < nfds; i++) + { + if (pfdl[i].fd >= 0 && pfdl[i].revents & POLLIN) + { + if (EDebug(EDBUG_TYPE_EVENTS) > 1) + Eprintf("Event fd %d\n", i); + pfds[i].handler(); + } + } +#elif USE_EVHAN_SELECT FD_ZERO(&fdset); fdsize = -1; for (i = 0; i < nfds; i++) @@ -1173,6 +1225,7 @@ EventsMain(void) pfds[i].handler(); } } +#endif } } --
