From: Vsevolod Stakhov Date: Tue, 12 Apr 2016 10:00:42 +0000 (+0100) Subject: [Minor] Properly place timers calculations X-Git-Tag: 1.2.3~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b79037baae40fec378c98d9e89c11798adf5691f;p=thirdparty%2Frspamd.git [Minor] Properly place timers calculations --- diff --git a/src/libserver/re_cache.c b/src/libserver/re_cache.c index 67dd58b23c..c2e628206d 100644 --- a/src/libserver/re_cache.c +++ b/src/libserver/re_cache.c @@ -481,9 +481,9 @@ rspamd_re_cache_process_pcre (struct rspamd_re_runtime *rt, r = rt->results[id]; - t1 = rspamd_get_ticks (); - if (max_hits == 0 || r < max_hits) { + t1 = rspamd_get_ticks (); + while (rspamd_regexp_search (re, in, len, @@ -505,13 +505,13 @@ rspamd_re_cache_process_pcre (struct rspamd_re_runtime *rt, if (r > 0) { rt->stat.regexp_matched += r; } - } - t2 = rspamd_get_ticks (); + t2 = rspamd_get_ticks (); - if (t2 - t1 > slow_time) { - msg_info_pool ("regexp '%16s' took %.2f seconds to execute", - rspamd_regexp_get_pattern (re), t2 - t1); + if (t2 - t1 > slow_time) { + msg_info_pool ("regexp '%16s' took %.2f seconds to execute", + rspamd_regexp_get_pattern (re), t2 - t1); + } } return r;