1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLEANUP: task: remove all initializations to TICK_ETERNITY after task_new()

Browse Source 
This is now guaranteed by design, simply remove these unneeded parts to
avoid confusion.
This commit is contained in:
Willy Tarreau 2017-07-24 17:55:20 +02:00
parent f42199975c
commit f1d33db10a
7 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cfgparse.c
View File

@ -9058,10 +9058,6 @@ out_uri_auth_compat:
if (curproxy->task) {
curproxy->task->context = curproxy;
curproxy->task->process = manage_proxy;
/* no need to queue, it will be done automatically if some
* listener gets limited.
*/
curproxy->task->expire = TICK_ETERNITY;
} else {
Alert("Proxy '%s': no more memory when trying to allocate the management task\n",
curproxy->id);

1
src/checks.c
View File

@ -2275,7 +2275,6 @@ static int start_checks()
s->warmup = t;
t->process = server_warmup;
t->context = s;
t->expire = TICK_ETERNITY;
/* server can be in this state only because of */
if (s->state == SRV_ST_STARTING)
task_schedule(s->warmup, tick_add(now_ms, MS_TO_TICKS(MAX(1000, (now.tv_sec - s->last_change)) / 20)));

1
src/dns.c
View File

@ -1421,7 +1421,6 @@ int dns_init_resolvers(int close_socket)
/* update task's parameters */
t->process = dns_process_resolve;
t->context = curr_resolvers;
t->expire = 0;
/* no need to keep the new task if one is already affected to our resolvers
* section */

1
src/flt_spoe.c
View File

@ -1918,7 +1918,6 @@ spoe_create_appctx(struct spoe_config *conf)
SPOE_APPCTX(appctx)->owner = appctx;
SPOE_APPCTX(appctx)->task->process = spoe_process_appctx;
SPOE_APPCTX(appctx)->task->expire = TICK_ETERNITY;
SPOE_APPCTX(appctx)->task->context = appctx;
SPOE_APPCTX(appctx)->agent = conf->agent;
SPOE_APPCTX(appctx)->version = 0;

1
src/haproxy.c
View File

@ -1474,7 +1474,6 @@ static void init(int argc, char **argv)
/* very simple initialization, users will queue the task if needed */
global_listener_queue_task->context = NULL; /* not even a context! */
global_listener_queue_task->process = manage_global_listener_queue;
global_listener_queue_task->expire = TICK_ETERNITY;
/* now we know the buffer size, we can initialize the channels and buffers */
init_buffer();

1
src/peers.c
View File

@ -2074,7 +2074,6 @@ void peers_init_sync(struct peers *peers)
listener->maxconn = peers->peers_fe->maxconn;
peers->sync_task = task_new();
peers->sync_task->process = process_peer_sync;
peers->sync_task->expire = TICK_ETERNITY;
peers->sync_task->context = (void *)peers;
peers->sighandler = signal_register_task(0, peers->sync_task, 0);
task_wakeup(peers->sync_task, TASK_WOKEN_INIT);

1
src/stick_table.c
View File

@ -437,7 +437,6 @@ int stktable_init(struct stktable *t)
if ( t->expire ) {
t->exp_task = task_new();
t->exp_task->process = process_table_expire;
t->exp_task->expire = TICK_ETERNITY;
t->exp_task->context = (void *)t;
}
if (t->peers.p && t->peers.p->peers_fe && t->peers.p->peers_fe->state != PR_STSTOPPED) {