RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-04-25 20:38:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

MEDIUM: protocols: use the generic I/O callback for accept callbacks

Browse Source 
This one is used only on read events, and it was easy to convert to
use the new I/O callback.
This commit is contained in:
Willy Tarreau 2012-07-06 12:25:58 +02:00 committed by Willy Tarreau
parent 20bea42a95
commit aece46a44d
3 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/proto_tcp.c
View File

@ -821,9 +821,9 @@ int tcp_bind_listener(struct listener *listener, char *errmsg, int errlen)
fdtab[fd].owner = listener; /* reference the listener instead of a task */ fdtab[fd].owner = listener; /* reference the listener instead of a task */
fdtab[fd].flags = FD_FL_TCP | ((listener->options & LI_O_NOLINGER) ? FD_FL_TCP_NOLING : 0); fdtab[fd].flags = FD_FL_TCP | ((listener->options & LI_O_NOLINGER) ? FD_FL_TCP_NOLING : 0);
fdtab[fd].cb[DIR_RD].f = listener->proto->accept; fdtab[fd].iocb = listener->proto->accept;
fdtab[fd].cb[DIR_RD].f = NULL; /* never called */
fdtab[fd].cb[DIR_WR].f = NULL; /* never called */ fdtab[fd].cb[DIR_WR].f = NULL; /* never called */
fdtab[fd].iocb = NULL;
fd_insert(fd); fd_insert(fd);
tcp_return: tcp_return:

4
src/proto_uxst.c
View File

@ -262,9 +262,9 @@ static int uxst_bind_listener(struct listener *listener, char *errmsg, int errle
/* the function for the accept() event */ /* the function for the accept() event */
fd_insert(fd); fd_insert(fd);
fdtab[fd].cb[DIR_RD].f = listener->proto->accept; fdtab[fd].iocb = listener->proto->accept;
fdtab[fd].cb[DIR_RD].f = NULL; /* never called */
fdtab[fd].cb[DIR_WR].f = NULL; /* never called */ fdtab[fd].cb[DIR_WR].f = NULL; /* never called */
fdtab[fd].iocb = NULL;
fdtab[fd].owner = listener; /* reference the listener instead of a task */ fdtab[fd].owner = listener; /* reference the listener instead of a task */
return ERR_NONE; return ERR_NONE;
err_rename: err_rename:

30
src/protocols.c
View File

@ -240,6 +240,7 @@ void delete_listener(struct listener *listener)
/* This function is called on a read event from a listening socket, corresponding /* This function is called on a read event from a listening socket, corresponding
* to an accept. It tries to accept as many connections as possible, and for each * to an accept. It tries to accept as many connections as possible, and for each
* calls the listener's accept handler (generally the frontend's accept handler). * calls the listener's accept handler (generally the frontend's accept handler).
* It returns FD_WAIT_READ or zero.
*/ */
int listener_accept(int fd) int listener_accept(int fd)
{ {
@ -251,7 +252,7 @@ int listener_accept(int fd)
if (unlikely(l->nbconn >= l->maxconn)) { if (unlikely(l->nbconn >= l->maxconn)) {
listener_full(l); listener_full(l);
return 0; return FD_WAIT_READ;
} }
if (global.cps_lim && !(l->options & LI_O_UNLIMITED)) { if (global.cps_lim && !(l->options & LI_O_UNLIMITED)) {
@ -261,7 +262,7 @@ int listener_accept(int fd)
/* frontend accept rate limit was reached */ /* frontend accept rate limit was reached */
limit_listener(l, &global_listener_queue); limit_listener(l, &global_listener_queue);
task_schedule(global_listener_queue_task, tick_add(now_ms, next_event_delay(&global.conn_per_sec, global.cps_lim, 0))); task_schedule(global_listener_queue_task, tick_add(now_ms, next_event_delay(&global.conn_per_sec, global.cps_lim, 0)));
return 0; return FD_WAIT_READ;
} }
if (max_accept > max) if (max_accept > max)
@ -275,7 +276,7 @@ int listener_accept(int fd)
/* frontend accept rate limit was reached */ /* frontend accept rate limit was reached */
limit_listener(l, &p->listener_queue); limit_listener(l, &p->listener_queue);
task_schedule(p->task, tick_add(now_ms, next_event_delay(&p->fe_sess_per_sec, p->fe_sps_lim, 0))); task_schedule(p->task, tick_add(now_ms, next_event_delay(&p->fe_sess_per_sec, p->fe_sps_lim, 0)));
return 0; return FD_WAIT_READ;
} }
if (max_accept > max) if (max_accept > max)
@ -294,12 +295,12 @@ int listener_accept(int fd)
if (unlikely(actconn >= global.maxconn) && !(l->options & LI_O_UNLIMITED)) { if (unlikely(actconn >= global.maxconn) && !(l->options & LI_O_UNLIMITED)) {
limit_listener(l, &global_listener_queue); limit_listener(l, &global_listener_queue);
task_schedule(global_listener_queue_task, tick_add(now_ms, 1000)); /* try again in 1 second */ task_schedule(global_listener_queue_task, tick_add(now_ms, 1000)); /* try again in 1 second */
return 0; return FD_WAIT_READ;
} }
if (unlikely(p && p->feconn >= p->maxconn)) { if (unlikely(p && p->feconn >= p->maxconn)) {
limit_listener(l, &p->listener_queue); limit_listener(l, &p->listener_queue);
return 0; return FD_WAIT_READ;
} }
cfd = accept(fd, (struct sockaddr *)&addr, &laddr); cfd = accept(fd, (struct sockaddr *)&addr, &laddr);
@ -308,7 +309,7 @@ int listener_accept(int fd)
case EAGAIN: case EAGAIN:
case EINTR: case EINTR:
case ECONNABORTED: case ECONNABORTED:
return 0; /* nothing more to accept */ return FD_WAIT_READ; /* nothing more to accept */
case ENFILE: case ENFILE:
if (p) if (p)
send_log(p, LOG_EMERG, send_log(p, LOG_EMERG,
@ -316,7 +317,7 @@ int listener_accept(int fd)
p->id, maxfd); p->id, maxfd);
limit_listener(l, &global_listener_queue); limit_listener(l, &global_listener_queue);
task_schedule(global_listener_queue_task, tick_add(now_ms, 100)); /* try again in 100 ms */ task_schedule(global_listener_queue_task, tick_add(now_ms, 100)); /* try again in 100 ms */
return 0; return FD_WAIT_READ;
case EMFILE: case EMFILE:
if (p) if (p)
send_log(p, LOG_EMERG, send_log(p, LOG_EMERG,
@ -324,7 +325,7 @@ int listener_accept(int fd)
p->id, maxfd); p->id, maxfd);
limit_listener(l, &global_listener_queue); limit_listener(l, &global_listener_queue);
task_schedule(global_listener_queue_task, tick_add(now_ms, 100)); /* try again in 100 ms */ task_schedule(global_listener_queue_task, tick_add(now_ms, 100)); /* try again in 100 ms */
return 0; return FD_WAIT_READ;
case ENOBUFS: case ENOBUFS:
case ENOMEM: case ENOMEM:
if (p) if (p)
@ -333,9 +334,9 @@ int listener_accept(int fd)
p->id, maxfd); p->id, maxfd);
limit_listener(l, &global_listener_queue); limit_listener(l, &global_listener_queue);
task_schedule(global_listener_queue_task, tick_add(now_ms, 100)); /* try again in 100 ms */ task_schedule(global_listener_queue_task, tick_add(now_ms, 100)); /* try again in 100 ms */
return 0; return FD_WAIT_READ;
default: default:
return 0; return FD_WAIT_READ;
} }
} }
@ -358,7 +359,7 @@ int listener_accept(int fd)
close(cfd); close(cfd);
limit_listener(l, &global_listener_queue); limit_listener(l, &global_listener_queue);
task_schedule(global_listener_queue_task, tick_add(now_ms, 1000)); /* try again in 1 second */ task_schedule(global_listener_queue_task, tick_add(now_ms, 1000)); /* try again in 1 second */
return 0; return FD_WAIT_READ;
} }
/* increase the per-process number of cumulated connections */ /* increase the per-process number of cumulated connections */
@ -394,16 +395,17 @@ int listener_accept(int fd)
limit_listener(l, &global_listener_queue); limit_listener(l, &global_listener_queue);
task_schedule(global_listener_queue_task, tick_add(now_ms, 100)); /* try again in 100 ms */ task_schedule(global_listener_queue_task, tick_add(now_ms, 100)); /* try again in 100 ms */
return 0; return FD_WAIT_READ;
} }
if (l->nbconn >= l->maxconn) { if (l->nbconn >= l->maxconn) {
listener_full(l); listener_full(l);
return 0; return FD_WAIT_READ;
} }
} /* end of while (p->feconn < p->maxconn) */ } /* end of while (max_accept--) */
/* we've exhausted max_accept, so there is no need to poll again */
return 0; return 0;
} }