mirror/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git synced 2026-02-22 10:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

[MAJOR] modularize the polling mechanisms

Browse Source 
select, poll and epoll now have their dedicated functions and have
been split into distinct files. Several FD manipulation primitives
have been provided with each poller.

The rest of the code needs to be cleaned to remove traces of
StaticReadEvent/StaticWriteEvent. A trick involving a macro has
temporarily been used right now. Some work needs to be done to
factorize tests and sets everywhere.
This commit is contained in:
Willy Tarreau
2007-04-08 16:39:58 +02:00
parent b3107b9383
commit 4f60f16dd3
11 changed files with 1088 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
src/haproxy.c
View File

@@ -507,18 +507,34 @@ void init(int argc, char **argv)
if (global.nbproc < 1)
global.nbproc = 1;
StaticReadEvent = (fd_set *)calloc(1,
sizeof(fd_set) *
(global.maxsock + FD_SETSIZE - 1) / FD_SETSIZE);
StaticWriteEvent = (fd_set *)calloc(1,
sizeof(fd_set) *
(global.maxsock + FD_SETSIZE - 1) / FD_SETSIZE);
fdtab = (struct fdtab *)calloc(1,
sizeof(struct fdtab) * (global.maxsock));
for (i = 0; i < global.maxsock; i++) {
fdtab[i].state = FD_STCLOSE;
}
register_pollers();
/* Note: we could register external pollers here */
if (!(cfg_polling_mechanism & POLL_USE_EPOLL))
disable_poller("epoll");
if (!(cfg_polling_mechanism & POLL_USE_POLL))
disable_poller("poll");
if (!(cfg_polling_mechanism & POLL_USE_SELECT))
disable_poller("select");
/* Note: we could disable any poller by name here */
if (!init_pollers()) {
Alert("No polling mechanism available\n");
exit(1);
}
if (global.mode & MODE_DEBUG) {
printf("Note: using %s() as the polling mechanism.\n", cur_poller.name);
}
}
void deinit(void)
@@ -603,8 +619,6 @@ void deinit(void)
if (global.chroot) free(global.chroot);
if (global.pidfile) free(global.pidfile);
if (StaticReadEvent) free(StaticReadEvent);
if (StaticWriteEvent) free(StaticWriteEvent);
if (fdtab) free(fdtab);
pool_destroy(pool_session);
@@ -628,6 +642,30 @@ static void tell_old_pids(int sig)
kill(oldpids[p], sig);
}
/*
* Runs the polling loop
*
* FIXME:
* - we still use 'listeners' to check whether we want to stop or not.
*
*/
void run_poll_loop()
{
int next_time;
tv_now(&now);
while (1) {
next_time = process_runnable_tasks();
/* stop when there's no connection left and we don't allow them anymore */
if (!actconn && listeners == 0)
break;
cur_poller.poll(&cur_poller, next_time);
}
}
int main(int argc, char **argv)
{
int err, retry;
@@ -860,41 +898,10 @@ int main(int argc, char **argv)
setsid();
}
#if defined(ENABLE_EPOLL)
if (cfg_polling_mechanism & POLL_USE_EPOLL) {
if (epoll_loop(POLL_LOOP_ACTION_INIT)) {
epoll_loop(POLL_LOOP_ACTION_RUN);
epoll_loop(POLL_LOOP_ACTION_CLEAN);
cfg_polling_mechanism &= POLL_USE_EPOLL;
}
else {
Warning("epoll() is not available. Using poll()/select() instead.\n");
cfg_polling_mechanism &= ~POLL_USE_EPOLL;
}
}
#endif
#if defined(ENABLE_POLL)
if (cfg_polling_mechanism & POLL_USE_POLL) {
if (poll_loop(POLL_LOOP_ACTION_INIT)) {
poll_loop(POLL_LOOP_ACTION_RUN);
poll_loop(POLL_LOOP_ACTION_CLEAN);
cfg_polling_mechanism &= POLL_USE_POLL;
}
else {
Warning("poll() is not available. Using select() instead.\n");
cfg_polling_mechanism &= ~POLL_USE_POLL;
}
}
#endif
if (cfg_polling_mechanism & POLL_USE_SELECT) {
if (select_loop(POLL_LOOP_ACTION_INIT)) {
select_loop(POLL_LOOP_ACTION_RUN);
select_loop(POLL_LOOP_ACTION_CLEAN);
cfg_polling_mechanism &= POLL_USE_SELECT;
}
}
/*
* That's it : the central polling loop. Run until we stop.
*/
run_poll_loop();
/* Free all Hash Keys and all Hash elements */
appsession_cleanup();