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: Rename things to clarify poll(2) limits

Browse source 
With epoll(7), MAX_EVENTS controls how many events can be retrieved in one
epoll_wait call, while with poll(2) this MAX_WATCHED controls how many
sockets or other FDs can be watched at once.
This commit is contained in:
Kim Alvefur 2023-11-27 08:19:52 +01:00
parent 97332bf56f
commit 8a2e65d5b7
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
util-src/poll.c
View file

@ -26,13 +26,15 @@
#include <unistd.h> #include <unistd.h>
#include <sys/epoll.h> #include <sys/epoll.h>
#ifndef MAX_EVENTS #ifndef MAX_EVENTS
/* Maximum number of returned events, retrieved into Lpoll_state */
#define MAX_EVENTS 256 #define MAX_EVENTS 256
#endif #endif
#endif #endif
#ifdef USE_POLL #ifdef USE_POLL
#include <poll.h> #include <poll.h>
#ifndef MAX_EVENTS #ifndef MAX_WATCHED
#define MAX_EVENTS 10000 /* Maximum number of watched sockets, kept in Lpoll_state */
#define MAX_WATCHED 10000
#endif #endif
#endif #endif
#ifdef USE_SELECT #ifdef USE_SELECT
@ -59,7 +61,7 @@ typedef struct Lpoll_state {
#endif #endif
#ifdef USE_POLL #ifdef USE_POLL
nfds_t count; nfds_t count;
struct pollfd events[MAX_EVENTS]; struct pollfd events[MAX_WATCHED];
#endif #endif
#ifdef USE_SELECT #ifdef USE_SELECT
fd_set wantread; fd_set wantread;
@ -120,7 +122,7 @@ static int Ladd(lua_State *L) {
} }
} }
if(state->count >= MAX_EVENTS) { if(state->count >= MAX_WATCHED) {
luaL_pushfail(L); luaL_pushfail(L);
lua_pushstring(L, strerror(EMFILE)); lua_pushstring(L, strerror(EMFILE));
lua_pushinteger(L, EMFILE); lua_pushinteger(L, EMFILE);
@ -543,7 +545,7 @@ static int Lnew(lua_State *L) {
state->processed = -1; state->processed = -1;
state->count = 0; state->count = 0;
for(nfds_t i = 0; i < MAX_EVENTS; i++) { for(nfds_t i = 0; i < MAX_WATCHED; i++) {
state->events[i].fd = -1; state->events[i].fd = -1;
state->events[i].events = 0; state->events[i].events = 0;
state->events[i].revents = 0; state->events[i].revents = 0;