upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-04-22 06:37:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

CLEANUP: epoll: place the struct epoll_event in the stack

Browse source 
Historically we used to have a global epoll_event for various
manipulations involving epoll_ctl() and when threads were added,
this was turned to a thread_local, which is needlessly expensive
since it's just a temporary variable. Let's move it to a local
variable wherever it's called instead.
This commit is contained in:
Willy Tarreau 2020-02-20 11:23:43 +01:00
parent 7c9d0e1b20
commit 902871dd07
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/ev_epoll.c
View file

@ -34,11 +34,6 @@
static THREAD_LOCAL struct epoll_event *epoll_events = NULL;
static int epoll_fd[MAX_THREADS]; // per-thread epoll_fd
/* This structure may be used for any purpose. Warning! do not use it in
* recursive functions !
*/
static THREAD_LOCAL struct epoll_event ev;
#ifndef EPOLLRDHUP
/* EPOLLRDHUP was defined late in libc, and it appeared in kernel 2.6.17 */
#define EPOLLRDHUP 0x2000
@ -54,6 +49,7 @@ REGPRM1 static void __fd_clo(int fd)
{
if (unlikely(fdtab[fd].cloned)) {
unsigned long m = polled_mask[fd].poll_recv | polled_mask[fd].poll_send;
struct epoll_event ev;
int i;
for (i = global.nbthread - 1; i >= 0; i--)
@ -65,6 +61,7 @@ REGPRM1 static void __fd_clo(int fd)
static void _update_fd(int fd)
{
int en, opcode;
struct epoll_event ev;
en = fdtab[fd].state;
@ -209,8 +206,10 @@ REGPRM3 static void _do_poll(struct poller *p, int exp, int wake)
/* process polled events */
for (count = 0; count < status; count++) {
unsigned int n;
unsigned int e = epoll_events[count].events;
struct epoll_event ev;
unsigned int n, e;
e = epoll_events[count].events;
fd = epoll_events[count].data.fd;
if (!fdtab[fd].owner) {