]> git.ipfire.org Git - thirdparty/rspamd.git/commitdiff
[Minor] Remove unused struct timeval
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Fri, 4 Oct 2019 11:51:12 +0000 (12:51 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Fri, 4 Oct 2019 11:51:12 +0000 (12:51 +0100)
src/libserver/monitored.c
src/libserver/worker_util.c
src/rspamd.c

index 821e128d66d23affd04251b326a4499de7cd73fd..2566511294e5756e19c19b0f9b6eda0795d0dd0d 100644 (file)
@@ -172,13 +172,11 @@ static void
 rspamd_monitored_periodic (EV_P_ ev_timer *w, int revents)
 {
        struct rspamd_monitored *m = (struct rspamd_monitored *)w->data;
-       struct timeval tv;
        gdouble jittered;
        gboolean ret = FALSE;
 
        jittered = rspamd_time_jitter (m->ctx->monitoring_interval * m->monitoring_mult,
                        0.0);
-       double_to_tv (jittered, &tv);
 
        if (m->proc.monitored_update) {
                ret = m->proc.monitored_update (m, m->ctx, m->proc.ud);
index 0007fbe35086c07b2faad63d9ab6450ffd8725ad..4779fd57a6831a43c3cba07578aa8094226335f9 100644 (file)
@@ -172,15 +172,10 @@ static gboolean
 rspamd_worker_usr2_handler (struct rspamd_worker_signal_handler *sigh, void *arg)
 {
        /* Do not accept new connections, preparing to end worker's process */
-       struct timeval tv;
-
        if (!sigh->worker->wanna_die) {
                static ev_timer shutdown_ev;
 
                rspamd_worker_ignore_signal (sigh);
-
-               tv.tv_sec = SOFT_SHUTDOWN_TIME;
-               tv.tv_usec = 0;
                sigh->worker->wanna_die = TRUE;
                rspamd_worker_terminate_handlers (sigh->worker);
                rspamd_default_log_function (G_LOG_LEVEL_INFO,
index 108a8454f983ad9909dd966e2db2d2c13f390532..10baf2050a9b6d76d7b31508c41764884fa028a7 100644 (file)
@@ -359,14 +359,11 @@ rspamd_fork_delayed (struct rspamd_worker_conf *cf,
                struct rspamd_main *rspamd_main)
 {
        struct waiting_worker *nw;
-       struct timeval tv;
 
        nw = g_malloc0 (sizeof (*nw));
        nw->cf = cf;
        nw->oldindex = index;
        nw->rspamd_main = rspamd_main;
-       tv.tv_sec = SOFT_FORK_TIME;
-       tv.tv_usec = 0;
        REF_RETAIN (cf);
        nw->wait_ev.data = nw;
        ev_timer_init (&nw->wait_ev, rspamd_fork_delayed_cb, SOFT_FORK_TIME, 0.0);