Implement async timered events for statistics

diff --git a/src/libstat/stat_config.c b/src/libstat/stat_config.c
index 319eebaeb615bb30a9f345e42cee722bcdd84a85..9cdf6af8e7ee690a559cb89414cb97defb23fc4d 100644 (file)
--- a/src/libstat/stat_config.c
+++ b/src/libstat/stat_config.c
@@ -228,11 +228,7 @@ rspamd_stat_close (void)
 
        while (cur) {
                aelt = cur->data;
-
-               if (aelt->cleanup) {
-                       aelt->cleanup (aelt, aelt->ud);
-               }
-
+               REF_RELEASE (aelt);
                cur = g_list_next (cur);
        }
 
@@ -323,3 +319,64 @@ rspamd_stat_get_cache (const gchar *name)
 
        return NULL;
 }
+
+static void
+rspamd_async_elt_dtor (struct rspamd_stat_async_elt *elt)
+{
+       if (elt->cleanup) {
+               elt->cleanup (elt, elt->ud);
+       }
+
+       event_del (&elt->timer_ev);
+       g_slice_free1 (sizeof (*elt), elt);
+}
+
+static void
+rspamd_async_elt_on_timer (gint fd, short what, gpointer d)
+{
+       struct rspamd_stat_async_elt *elt = d;
+       gdouble jittered_time;
+
+       event_del (&elt->timer_ev);
+
+       if (elt->enabled) {
+               elt->handler (elt, elt->ud);
+       }
+
+       jittered_time = rspamd_time_jitter (elt->timeout, 0);
+       double_to_tv (jittered_time, &elt->tv);
+       event_add (&elt->timer_ev, &elt->tv);
+}
+
+struct rspamd_stat_async_elt*
+rspamd_stat_ctx_register_async (rspamd_stat_async_handler handler,
+               rspamd_stat_async_cleanup cleanup,
+               gpointer d,
+               gdouble timeout)
+{
+       struct rspamd_stat_async_elt *elt;
+       struct rspamd_stat_ctx *st_ctx;
+       gdouble jittered_time;
+
+       st_ctx = rspamd_stat_get_ctx ();
+       g_assert (st_ctx != NULL);
+
+       elt = g_slice_alloc (sizeof (*elt));
+       REF_INIT_RETAIN (elt, rspamd_async_elt_dtor);
+       elt->handler = handler;
+       elt->cleanup = cleanup;
+       elt->ud = d;
+       elt->timeout = timeout;
+       /* Enabled by default */
+       elt->enabled = TRUE;
+
+       event_set (&elt->timer_ev, -1, EV_TIMEOUT, rspamd_async_elt_on_timer, elt);
+       event_base_set (st_ctx->ev_base, &elt->timer_ev);
+       jittered_time = rspamd_time_jitter (elt->timeout, 0);
+       double_to_tv (jittered_time, &elt->tv);
+       event_add (&elt->timer_ev, &elt->tv);
+
+       g_queue_push_tail (st_ctx->async_elts, elt);
+
+       return elt;
+}

diff --git a/src/libstat/stat_internal.h b/src/libstat/stat_internal.h
index 787323fbc02244396aca69365120ef685d2cb7b1..7a3951a0e58f422416a751227f7e01de35b7a6bd 100644 (file)
--- a/src/libstat/stat_internal.h
+++ b/src/libstat/stat_internal.h
@@ -25,6 +25,7 @@
 
 #include "config.h"
 #include "task.h"
+#include "ref.h"
 #include "classifiers/classifiers.h"
 #include "tokenizers/tokenizers.h"
 #include "backends/backends.h"
@@ -65,11 +66,22 @@ typedef struct token_node_s {
        gdouble values[];
 } rspamd_token_t;
 
+struct rspamd_stat_async_elt;
+
+typedef void (*rspamd_stat_async_handler)(struct rspamd_stat_async_elt *elt,
+               gpointer ud);
+typedef void (*rspamd_stat_async_cleanup)(struct rspamd_stat_async_elt *elt,
+               gpointer ud);
+
 struct rspamd_stat_async_elt {
-       void (*handler)(struct rspamd_stat_async_elt *elt, gpointer ud);
-       void (*cleanup)(struct rspamd_stat_async_elt *elt, gpointer ud);
-       struct event ev;
+       rspamd_stat_async_handler handler;
+       rspamd_stat_async_cleanup cleanup;
+       struct event timer_ev;
+       struct timeval tv;
+       gdouble timeout;
+       gboolean enabled;
        gpointer ud;
+       ref_entry_t ref;
 };
 
 struct rspamd_stat_ctx {
@@ -106,6 +118,9 @@ struct rspamd_stat_classifier * rspamd_stat_get_classifier (const gchar *name);
 struct rspamd_stat_backend * rspamd_stat_get_backend (const gchar *name);
 struct rspamd_stat_tokenizer * rspamd_stat_get_tokenizer (const gchar *name);
 struct rspamd_stat_cache * rspamd_stat_get_cache (const gchar *name);
+struct rspamd_stat_async_elt* rspamd_stat_ctx_register_async (
+               rspamd_stat_async_handler handler, rspamd_stat_async_cleanup cleanup,
+               gpointer d, gdouble timeout);
 
 static GQuark rspamd_stat_quark (void)
 {