]> source.dussan.org Git - rspamd.git/commitdiff
Add special case for valgrind to avoid early children termination.
authorVsevolod Stakhov <vsevolod@highsecure.ru>
Wed, 1 Apr 2015 15:56:05 +0000 (16:56 +0100)
committerVsevolod Stakhov <vsevolod@highsecure.ru>
Wed, 1 Apr 2015 15:56:05 +0000 (16:56 +0100)
src/main.c

index 904a9b1e1f3f53ab76bb78158bba156ebf6afad7..b77b4d63d7eb88ba1dfa4d90b4133c4e518d8aec 100644 (file)
@@ -1494,7 +1494,14 @@ main (gint argc, gchar **argv, gchar **env)
        sigaction (SIGINT,      &signals, NULL);
        sigprocmask (SIG_UNBLOCK, &signals.sa_mask, NULL);
        /* Set alarm for hard termination */
-       set_alarm (HARD_TERMINATION_TIME);
+       if (getenv ("G_SLICE") != NULL) {
+               /* Special case if we are likely running with valgrind */
+               set_alarm (HARD_TERMINATION_TIME * 10);
+       }
+       else {
+               set_alarm (HARD_TERMINATION_TIME);
+       }
+
        /* Wait for workers termination */
        g_hash_table_foreach_remove (rspamd_main->workers, wait_for_workers, NULL);