mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

util.poll: Restructure to make adding additional system APIs easier

Browse source
This commit is contained in:
Kim Alvefur 2022-02-23 20:30:22 +01:00
parent 7f254b0e72
commit 22d734e305
1 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
util-src/poll.c
View file

@ -12,8 +12,10 @@
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#ifdef __linux__ #if defined(__linux__)
#define USE_EPOLL #define USE_EPOLL
#else
#define USE_SELECT
#endif #endif
#ifdef USE_EPOLL #ifdef USE_EPOLL
@ -21,7 +23,8 @@
#ifndef MAX_EVENTS #ifndef MAX_EVENTS
#define MAX_EVENTS 64 #define MAX_EVENTS 64
#endif #endif
#else #endif
#ifdef USE_SELECT
#include <sys/select.h> #include <sys/select.h>
#endif #endif
@ -30,7 +33,8 @@
#ifdef USE_EPOLL #ifdef USE_EPOLL
#define STATE_MT "util.poll<epoll>" #define STATE_MT "util.poll<epoll>"
#else #endif
#ifdef USE_SELECT
#define STATE_MT "util.poll<select>" #define STATE_MT "util.poll<select>"
#endif #endif
@ -49,7 +53,8 @@ typedef struct Lpoll_state {
#ifdef USE_EPOLL #ifdef USE_EPOLL
int epoll_fd; int epoll_fd;
struct epoll_event events[MAX_EVENTS]; struct epoll_event events[MAX_EVENTS];
#else #endif
#ifdef USE_SELECT
fd_set wantread; fd_set wantread;
fd_set wantwrite; fd_set wantwrite;
fd_set readable; fd_set readable;
@ -96,7 +101,8 @@ static int Ladd(lua_State *L) {
lua_pushboolean(L, 1); lua_pushboolean(L, 1);
return 1; return 1;
#else #endif
#ifdef USE_SELECT
if(fd > FD_SETSIZE) { if(fd > FD_SETSIZE) {
luaL_pushfail(L); luaL_pushfail(L);
@ -169,7 +175,8 @@ static int Lset(lua_State *L) {
return 3; return 3;
} }
#else #endif
#ifdef USE_SELECT
if(!FD_ISSET(fd, &state->all)) { if(!FD_ISSET(fd, &state->all)) {
luaL_pushfail(L); luaL_pushfail(L);
@ -227,7 +234,8 @@ static int Ldel(lua_State *L) {
return 3; return 3;
} }
#else #endif
#ifdef USE_SELECT
if(!FD_ISSET(fd, &state->all)) { if(!FD_ISSET(fd, &state->all)) {
luaL_pushfail(L); luaL_pushfail(L);
@ -264,7 +272,8 @@ static int Lpushevent(lua_State *L, struct Lpoll_state *state) {
return 3; return 3;
} }
#else #endif
#ifdef USE_SELECT
for(int fd = state->processed + 1; fd < FD_SETSIZE; fd++) { for(int fd = state->processed + 1; fd < FD_SETSIZE; fd++) {
if(FD_ISSET(fd, &state->readable) || FD_ISSET(fd, &state->writable) || FD_ISSET(fd, &state->err)) { if(FD_ISSET(fd, &state->readable) || FD_ISSET(fd, &state->writable) || FD_ISSET(fd, &state->err)) {
@ -300,7 +309,8 @@ static int Lwait(lua_State *L) {
#ifdef USE_EPOLL #ifdef USE_EPOLL
ret = epoll_wait(state->epoll_fd, state->events, MAX_EVENTS, timeout * 1000); ret = epoll_wait(state->epoll_fd, state->events, MAX_EVENTS, timeout * 1000);
#else #endif
#ifdef USE_SELECT
/* /*
* select(2) mutates the fd_sets passed to it so in order to not * select(2) mutates the fd_sets passed to it so in order to not
* have to recreate it manually every time a copy is made. * have to recreate it manually every time a copy is made.
@ -341,7 +351,8 @@ static int Lwait(lua_State *L) {
*/ */
#ifdef USE_EPOLL #ifdef USE_EPOLL
state->processed = ret; state->processed = ret;
#else #endif
#ifdef USE_SELECT
state->processed = -1; state->processed = -1;
#endif #endif
return Lpushevent(L, state); return Lpushevent(L, state);
@ -411,7 +422,8 @@ static int Lnew(lua_State *L) {
} }
state->epoll_fd = epoll_fd; state->epoll_fd = epoll_fd;
#else #endif
#ifdef USE_SELECT
FD_ZERO(&state->wantread); FD_ZERO(&state->wantread);
FD_ZERO(&state->wantwrite); FD_ZERO(&state->wantwrite);
FD_ZERO(&state->readable); FD_ZERO(&state->readable);