[Project] First refactoring step libevent->libev

21 files changed, 73 insertions, 72 deletions

diff --git a/src/libserver/dkim.h b/src/libserver/dkim.h
index fe2b4cc4e..57f761895 100644
--- a/src/libserver/dkim.h
+++ b/src/libserver/dkim.h
@@ -17,7 +17,7 @@
 #define DKIM_H_
 
 #include "config.h"
-#include "event.h"
+#include "contrib/libev/ev.h"
 #include "dns.h"
 #include "ref.h"
 
diff --git a/src/libserver/dns.c b/src/libserver/dns.c
index 54b97d06a..5277e2f6c 100644
--- a/src/libserver/dns.c
+++ b/src/libserver/dns.c
@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-#include <contrib/librdns/rdns.h>
-#include <contrib/librdns/dns_private.h>
+
 #include "config.h"
 #include "dns.h"
 #include "rspamd.h"
 #include "utlist.h"
-#include "rdns_event.h"
+#include "contrib/librdns/rdns.h"
+#include "contrib/librdns/dns_private.h"
+#include "contrib/librdns/rdns_ev.h"
 #include "unix-std.h"
 
 static const gchar *M = "rspamd dns";
@@ -532,13 +533,13 @@ rspamd_dns_resolver_config_ucl (struct rspamd_config *cfg,
 
 struct rspamd_dns_resolver *
 rspamd_dns_resolver_init (rspamd_logger_t *logger,
-						  struct event_base *ev_base,
+						  struct ev_loop *ev_base,
 						  struct rspamd_config *cfg)
 {
 	struct rspamd_dns_resolver *dns_resolver;
 
 	dns_resolver = g_malloc0 (sizeof (struct rspamd_dns_resolver));
-	dns_resolver->ev_base = ev_base;
+	dns_resolver->event_loop = ev_base;
 	if (cfg != NULL) {
 		dns_resolver->request_timeout = cfg->dns_timeout;
 		dns_resolver->max_retransmits = cfg->dns_retransmits;
@@ -549,7 +550,7 @@ rspamd_dns_resolver_init (rspamd_logger_t *logger,
 	}
 
 	dns_resolver->r = rdns_resolver_new ();
-	rdns_bind_libevent (dns_resolver->r, dns_resolver->ev_base);
+	rdns_bind_libev (dns_resolver->r, dns_resolver->event_loop);
 
 	if (cfg != NULL) {
 		rdns_resolver_set_log_level (dns_resolver->r, cfg->log_level);
diff --git a/src/libserver/dns.h b/src/libserver/dns.h
index 158ac504e..c744ac42e 100644
--- a/src/libserver/dns.h
+++ b/src/libserver/dns.h
@@ -28,7 +28,7 @@ struct rspamd_config;
 
 struct rspamd_dns_resolver {
 	struct rdns_resolver *r;
-	struct event_base *ev_base;
+	struct ev_loop *event_loop;
 	struct upstream_list *ups;
 	struct rspamd_config *cfg;
 	gdouble request_timeout;
@@ -41,7 +41,7 @@ struct rspamd_dns_resolver {
  * Init DNS resolver, params are obtained from a config file or system file /etc/resolv.conf
  */
 struct rspamd_dns_resolver * rspamd_dns_resolver_init (rspamd_logger_t *logger,
-													   struct event_base *ev_base, struct rspamd_config *cfg);
+													   struct ev_loop *ev_base, struct rspamd_config *cfg);
 
 struct rspamd_dns_request_ud;
 /**
diff --git a/src/libserver/fuzzy_backend.c b/src/libserver/fuzzy_backend.c
index 6de977ff6..f52fcca99 100644
--- a/src/libserver/fuzzy_backend.c
+++ b/src/libserver/fuzzy_backend.c
@@ -105,7 +105,7 @@ struct rspamd_fuzzy_backend {
 	enum rspamd_fuzzy_backend_type type;
 	gdouble expire;
 	gdouble sync;
-	struct event_base *ev_base;
+	struct ev_loop *ev_base;
 	rspamd_fuzzy_periodic_cb periodic_cb;
 	void *periodic_ud;
 	const struct rspamd_fuzzy_backend_subr *subr;
@@ -271,7 +271,7 @@ rspamd_fuzzy_backend_close_sqlite (struct rspamd_fuzzy_backend *bk,
 
 
 struct rspamd_fuzzy_backend *
-rspamd_fuzzy_backend_create (struct event_base *ev_base,
+rspamd_fuzzy_backend_create (struct ev_loop *ev_base,
 		const ucl_object_t *config,
 		struct rspamd_config *cfg,
 		GError **err)
@@ -559,7 +559,7 @@ rspamd_fuzzy_backend_close (struct rspamd_fuzzy_backend *bk)
 	g_free (bk);
 }
 
-struct event_base*
+struct ev_loop*
 rspamd_fuzzy_backend_event_base (struct rspamd_fuzzy_backend *backend)
 {
 	return backend->ev_base;
diff --git a/src/libserver/fuzzy_backend.h b/src/libserver/fuzzy_backend.h
index f26f3a582..1519761e0 100644
--- a/src/libserver/fuzzy_backend.h
+++ b/src/libserver/fuzzy_backend.h
@@ -17,7 +17,7 @@
 #define SRC_LIBSERVER_FUZZY_BACKEND_H_
 
 #include "config.h"
-#include <event.h>
+#include "contrib/libev/ev.h"
 #include "fuzzy_wire.h"
 
 struct rspamd_fuzzy_backend;
@@ -44,7 +44,7 @@ typedef gboolean (*rspamd_fuzzy_periodic_cb) (void *ud);
  * @param err
  * @return
  */
-struct rspamd_fuzzy_backend * rspamd_fuzzy_backend_create (struct event_base *ev_base,
+struct rspamd_fuzzy_backend * rspamd_fuzzy_backend_create (struct ev_loop *ev_base,
 		const ucl_object_t *config,
 		struct rspamd_config *cfg,
 		GError **err);
@@ -106,7 +106,7 @@ void rspamd_fuzzy_backend_start_update (struct rspamd_fuzzy_backend *backend,
 		rspamd_fuzzy_periodic_cb cb,
 		void *ud);
 
-struct event_base* rspamd_fuzzy_backend_event_base (struct rspamd_fuzzy_backend *backend);
+struct ev_loop* rspamd_fuzzy_backend_event_base (struct rspamd_fuzzy_backend *backend);
 gdouble rspamd_fuzzy_backend_get_expire (struct rspamd_fuzzy_backend *backend);
 
 /**
diff --git a/src/libserver/fuzzy_backend_redis.c b/src/libserver/fuzzy_backend_redis.c
index 956979d42..df9103e30 100644
--- a/src/libserver/fuzzy_backend_redis.c
+++ b/src/libserver/fuzzy_backend_redis.c
@@ -73,7 +73,7 @@ struct rspamd_fuzzy_redis_session {
 	redisAsyncContext *ctx;
 	struct event timeout;
 	const struct rspamd_fuzzy_cmd *cmd;
-	struct event_base *ev_base;
+	struct ev_loop *ev_base;
 	float prob;
 	gboolean shingles_checked;
 
diff --git a/src/libserver/milter.c b/src/libserver/milter.c
index 188ff42d9..ecd66cfe6 100644
--- a/src/libserver/milter.c
+++ b/src/libserver/milter.c
@@ -1085,7 +1085,7 @@ rspamd_milter_handle_session (struct rspamd_milter_session *session,
 gboolean
 rspamd_milter_handle_socket (gint fd, const struct timeval *tv,
 		rspamd_mempool_t *pool,
-		struct event_base *ev_base, rspamd_milter_finish finish_cb,
+		struct ev_loop *ev_base, rspamd_milter_finish finish_cb,
 		rspamd_milter_error error_cb, void *ud)
 {
 	struct rspamd_milter_session *session;
diff --git a/src/libserver/milter.h b/src/libserver/milter.h
index 10bf34d52..c01538f75 100644
--- a/src/libserver/milter.h
+++ b/src/libserver/milter.h
@@ -41,7 +41,7 @@ enum rspamd_milter_reply {
 };
 
 struct rspamd_email_address;
-struct event_base;
+struct ev_loop;
 struct rspamd_http_message;
 struct rspamd_config;
 
@@ -83,7 +83,7 @@ typedef void (*rspamd_milter_error) (gint fd,
  */
 gboolean rspamd_milter_handle_socket (gint fd, const struct timeval *tv,
 		rspamd_mempool_t *pool,
-		struct event_base *ev_base, rspamd_milter_finish finish_cb,
+		struct ev_loop *ev_base, rspamd_milter_finish finish_cb,
 		rspamd_milter_error error_cb, void *ud);
 
 /**
diff --git a/src/libserver/milter_internal.h b/src/libserver/milter_internal.h
index 1e4b7b187..7da696b36 100644
--- a/src/libserver/milter_internal.h
+++ b/src/libserver/milter_internal.h
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "libutil/mem_pool.h"
-#include <event.h>
+#include "contrib/libev/ev.h"
 #include "khash.h"
 #include "libutil/str_util.h"
 
@@ -63,7 +63,7 @@ struct rspamd_milter_private {
 	struct timeval tv;
 	struct rspamd_milter_outbuf *out_chain;
 	struct timeval *ptv;
-	struct event_base *ev_base;
+	struct ev_loop *ev_base;
 	rspamd_mempool_t *pool;
 	khash_t(milter_headers_hash_t) *headers;
 	gint cur_hdr;
diff --git a/src/libserver/monitored.c b/src/libserver/monitored.c
index ddef9ffe3..2e876242b 100644
--- a/src/libserver/monitored.c
+++ b/src/libserver/monitored.c
@@ -39,7 +39,7 @@ struct rspamd_monitored_methods {
 struct rspamd_monitored_ctx {
 	struct rspamd_config *cfg;
 	struct rdns_resolver *resolver;
-	struct event_base *ev_base;
+	struct ev_loop *ev_base;
 	GPtrArray *elts;
 	GHashTable *helts;
 	mon_change_cb change_cb;
@@ -427,7 +427,7 @@ rspamd_monitored_ctx_init (void)
 void
 rspamd_monitored_ctx_config (struct rspamd_monitored_ctx *ctx,
 		struct rspamd_config *cfg,
-		struct event_base *ev_base,
+		struct ev_loop *ev_base,
 		struct rdns_resolver *resolver,
 		mon_change_cb change_cb,
 		gpointer ud)
@@ -457,7 +457,7 @@ rspamd_monitored_ctx_config (struct rspamd_monitored_ctx *ctx,
 }
 
 
-struct event_base *
+struct ev_loop *
 rspamd_monitored_ctx_get_ev_base (struct rspamd_monitored_ctx *ctx)
 {
 	return ctx->ev_base;
diff --git a/src/libserver/monitored.h b/src/libserver/monitored.h
index 4db41f9c2..0189e0e6c 100644
--- a/src/libserver/monitored.h
+++ b/src/libserver/monitored.h
@@ -52,12 +52,12 @@ typedef void (*mon_change_cb) (struct rspamd_monitored_ctx *ctx,
  */
 void rspamd_monitored_ctx_config (struct rspamd_monitored_ctx *ctx,
 		struct rspamd_config *cfg,
-		struct event_base *ev_base,
+		struct ev_loop *ev_base,
 		struct rdns_resolver *resolver,
 		mon_change_cb change_cb,
 		gpointer ud);
 
-struct event_base *rspamd_monitored_ctx_get_ev_base (struct rspamd_monitored_ctx *ctx);
+struct ev_loop *rspamd_monitored_ctx_get_ev_base (struct rspamd_monitored_ctx *ctx);
 
 /**
  * Create monitored object
diff --git a/src/libserver/redis_pool.c b/src/libserver/redis_pool.c
index 528a990a1..d7e8015e5 100644
--- a/src/libserver/redis_pool.c
+++ b/src/libserver/redis_pool.c
@@ -15,12 +15,12 @@
  */
 
 #include "config.h"
-#include <event.h>
+#include "contrib/libev/ev.h"
 #include "redis_pool.h"
 #include "cfg_file.h"
 #include "contrib/hiredis/hiredis.h"
 #include "contrib/hiredis/async.h"
-#include "contrib/hiredis/adapters/libevent.h"
+#include "contrib/hiredis/adapters/libev.h"
 #include "cryptobox.h"
 #include "logger.h"
 
@@ -44,7 +44,7 @@ struct rspamd_redis_pool_elt {
 };
 
 struct rspamd_redis_pool {
-	struct event_base *ev_base;
+	struct ev_loop *event_loop;
 	struct rspamd_config *cfg;
 	GHashTable *elts_by_key;
 	GHashTable *elts_by_ctx;
@@ -205,7 +205,7 @@ rspamd_redis_pool_schedule_timeout (struct rspamd_redis_pool_connection *conn)
 			conn->ctx, real_timeout);
 	double_to_tv (real_timeout, &tv);
 	event_set (&conn->timeout, -1, EV_TIMEOUT, rspamd_redis_conn_timeout, conn);
-	event_base_set (conn->elt->pool->ev_base, &conn->timeout);
+	event_base_set (conn->elt->pool->event_loop, &conn->timeout);
 	event_add (&conn->timeout, &tv);
 }
 
@@ -270,7 +270,7 @@ rspamd_redis_pool_new_connection (struct rspamd_redis_pool *pool,
 			REF_INIT_RETAIN (conn, rspamd_redis_pool_conn_dtor);
 			msg_debug_rpool ("created new connection to %s:%d: %p", ip, port, ctx);
 
-			redisLibeventAttach (ctx, pool->ev_base);
+			redisLibevAttach (pool->event_loop, ctx);
 			redisAsyncSetDisconnectCallback (ctx, rspamd_redis_pool_on_disconnect,
 					conn);
 
@@ -317,11 +317,11 @@ rspamd_redis_pool_init (void)
 void
 rspamd_redis_pool_config (struct rspamd_redis_pool *pool,
 		struct rspamd_config *cfg,
-		struct event_base *ev_base)
+		struct ev_loop *ev_base)
 {
 	g_assert (pool != NULL);
 
-	pool->ev_base = ev_base;
+	pool->event_loop = ev_base;
 	pool->cfg = cfg;
 	pool->timeout = default_timeout;
 	pool->max_conns = default_max_conns;
@@ -339,7 +339,7 @@ rspamd_redis_pool_connect (struct rspamd_redis_pool *pool,
 	struct rspamd_redis_pool_connection *conn;
 
 	g_assert (pool != NULL);
-	g_assert (pool->ev_base != NULL);
+	g_assert (pool->event_loop != NULL);
 	g_assert (ip != NULL);
 
 	key = rspamd_redis_pool_get_key (db, password, ip, port);
diff --git a/src/libserver/redis_pool.h b/src/libserver/redis_pool.h
index a43b6d7e2..a881a0a38 100644
--- a/src/libserver/redis_pool.h
+++ b/src/libserver/redis_pool.h
@@ -21,7 +21,7 @@
 struct rspamd_redis_pool;
 struct rspamd_config;
 struct redisAsyncContext;
-struct event_base;
+struct ev_loop;
 
 /**
  * Creates new redis pool
@@ -36,7 +36,7 @@ struct rspamd_redis_pool *rspamd_redis_pool_init (void);
  */
 void rspamd_redis_pool_config (struct rspamd_redis_pool *pool,
 		struct rspamd_config *cfg,
-		struct event_base *ev_base);
+		struct ev_loop *ev_base);
 
 
 /**
diff --git a/src/libserver/rspamd_control.c b/src/libserver/rspamd_control.c
index 12d37cdbc..9788d47ed 100644
--- a/src/libserver/rspamd_control.c
+++ b/src/libserver/rspamd_control.c
@@ -437,7 +437,7 @@ rspamd_control_broadcast_cmd (struct rspamd_main *rspamd_main,
 			event_set (&rep_elt->io_ev, wrk->control_pipe[0],
 					EV_READ | EV_PERSIST, handler,
 					rep_elt);
-			event_base_set (rspamd_main->ev_base,
+			event_base_set (rspamd_main->event_loop,
 					&rep_elt->io_ev);
 			event_add (&rep_elt->io_ev, &worker_io_timeout);
 
@@ -533,7 +533,7 @@ rspamd_control_process_client_socket (struct rspamd_main *rspamd_main,
 struct rspamd_worker_control_data {
 	struct event io_ev;
 	struct rspamd_worker *worker;
-	struct event_base *ev_base;
+	struct ev_loop *ev_base;
 	struct {
 		rspamd_worker_control_handler handler;
 		gpointer ud;
@@ -676,7 +676,7 @@ rspamd_control_default_worker_handler (gint fd, short what, gpointer ud)
 
 void
 rspamd_control_worker_add_default_handler (struct rspamd_worker *worker,
-		struct event_base *ev_base)
+		struct ev_loop *ev_base)
 {
 	struct rspamd_worker_control_data *cd;
 
@@ -974,7 +974,7 @@ rspamd_srv_handler (gint fd, short what, gpointer ud)
 void
 rspamd_srv_start_watching (struct rspamd_main *srv,
 		struct rspamd_worker *worker,
-		struct event_base *ev_base)
+		struct ev_loop *ev_base)
 {
 	g_assert (worker != NULL);
 
@@ -1081,7 +1081,7 @@ cleanup:
 
 void
 rspamd_srv_send_command (struct rspamd_worker *worker,
-		struct event_base *ev_base,
+		struct ev_loop *ev_base,
 		struct rspamd_srv_command *cmd,
 		gint attached_fd,
 		rspamd_srv_reply_handler handler,
diff --git a/src/libserver/rspamd_control.h b/src/libserver/rspamd_control.h
index ec3962c64..1928ab00f 100644
--- a/src/libserver/rspamd_control.h
+++ b/src/libserver/rspamd_control.h
@@ -18,7 +18,7 @@
 
 #include "config.h"
 #include "mem_pool.h"
-#include <event.h>
+#include "contrib/libev/ev.h"
 
 struct rspamd_main;
 struct rspamd_worker;
@@ -199,7 +199,7 @@ void rspamd_control_process_client_socket (struct rspamd_main *rspamd_main,
  * Register default handlers for a worker
  */
 void rspamd_control_worker_add_default_handler (struct rspamd_worker *worker,
-		struct event_base *ev_base);
+		struct ev_loop *ev_base);
 
 /**
  * Register custom handler for a specific control command for this worker
@@ -214,7 +214,7 @@ void rspamd_control_worker_add_cmd_handler (struct rspamd_worker *worker,
  */
 void rspamd_srv_start_watching (struct rspamd_main *srv,
 		struct rspamd_worker *worker,
-		struct event_base *ev_base);
+		struct ev_loop *ev_base);
 
 
 /**
@@ -222,7 +222,7 @@ void rspamd_srv_start_watching (struct rspamd_main *srv,
  * end
  */
 void rspamd_srv_send_command (struct rspamd_worker *worker,
-		struct event_base *ev_base,
+		struct ev_loop *ev_base,
 		struct rspamd_srv_command *cmd,
 		gint attached_fd,
 		rspamd_srv_reply_handler handler,
diff --git a/src/libserver/rspamd_symcache.c b/src/libserver/rspamd_symcache.c
index 5a4a002c3..43a916f3a 100644
--- a/src/libserver/rspamd_symcache.c
+++ b/src/libserver/rspamd_symcache.c
@@ -232,7 +232,7 @@ struct rspamd_cache_refresh_cbdata {
 	struct event resort_ev;
 	struct rspamd_symcache *cache;
 	struct rspamd_worker *w;
-	struct event_base *ev_base;
+	struct ev_loop *ev_base;
 };
 
 /* weight, frequency, time */
@@ -2173,14 +2173,14 @@ rspamd_symcache_counters (struct rspamd_symcache *cache)
 }
 
 static void
-rspamd_symcache_call_peak_cb (struct event_base *ev_base,
+rspamd_symcache_call_peak_cb (struct ev_loop *ev_base,
 		struct rspamd_symcache *cache,
 		struct rspamd_symcache_item *item,
 		gdouble cur_value,
 		gdouble cur_err)
 {
 	lua_State *L = cache->cfg->lua_state;
-	struct event_base **pbase;
+	struct ev_loop **pbase;
 
 	lua_rawgeti (L, LUA_REGISTRYINDEX, cache->peak_cb);
 	pbase = lua_newuserdata (L, sizeof (*pbase));
@@ -2291,7 +2291,7 @@ rspamd_symcache_resort_cb (gint fd, short what, gpointer ud)
 
 void
 rspamd_symcache_start_refresh (struct rspamd_symcache *cache,
-							   struct event_base *ev_base, struct rspamd_worker *w)
+							   struct ev_loop *ev_base, struct rspamd_worker *w)
 {
 	struct timeval tv;
 	gdouble tm;
diff --git a/src/libserver/rspamd_symcache.h b/src/libserver/rspamd_symcache.h
index ef022b730..7bfb1d093 100644
--- a/src/libserver/rspamd_symcache.h
+++ b/src/libserver/rspamd_symcache.h
@@ -20,7 +20,7 @@
 #include "ucl.h"
 #include "cfg_file.h"
 #include <lua.h>
-#include <event.h>
+#include "contrib/libev/ev.h"
 
 struct rspamd_task;
 struct rspamd_config;
@@ -198,7 +198,7 @@ ucl_object_t *rspamd_symcache_counters (struct rspamd_symcache *cache);
  * @param ev_base
  */
 void rspamd_symcache_start_refresh (struct rspamd_symcache *cache,
-									struct event_base *ev_base,
+									struct ev_loop *ev_base,
 									struct rspamd_worker *w);
 
 /**
diff --git a/src/libserver/task.c b/src/libserver/task.c
index 16b33294e..62b8725c3 100644
--- a/src/libserver/task.c
+++ b/src/libserver/task.c
@@ -75,7 +75,7 @@ struct rspamd_task *
 rspamd_task_new (struct rspamd_worker *worker, struct rspamd_config *cfg,
 				 rspamd_mempool_t *pool,
 				 struct rspamd_lang_detector *lang_det,
-				 struct event_base *ev_base)
+				 struct ev_loop *ev_base)
 {
 	struct rspamd_task *new_task;
 
@@ -101,7 +101,7 @@ rspamd_task_new (struct rspamd_worker *worker, struct rspamd_config *cfg,
 		}
 	}
 
-	new_task->ev_base = ev_base;
+	new_task->event_loop = ev_base;
 
 #ifdef HAVE_EVENT_NO_CACHE_TIME_FUNC
 	if (ev_base) {
diff --git a/src/libserver/task.h b/src/libserver/task.h
index 6aa1422bc..736644126 100644
--- a/src/libserver/task.h
+++ b/src/libserver/task.h
@@ -199,7 +199,7 @@ struct rspamd_task {
 	void *fin_arg;									/**< argument for fin callback						*/
 
 	struct rspamd_dns_resolver *resolver;			/**< DNS resolver									*/
-	struct event_base *ev_base;						/**< Event base										*/
+	struct ev_loop *event_loop;						/**< Event base										*/
 	struct event timeout_ev;						/**< Global task timeout							*/
 	struct event *guard_ev;							/**< Event for input sanity guard 					*/
 
@@ -220,7 +220,7 @@ struct rspamd_task *rspamd_task_new (struct rspamd_worker *worker,
 									 struct rspamd_config *cfg,
 									 rspamd_mempool_t *pool,
 									 struct rspamd_lang_detector *lang_det,
-									 struct event_base *ev_base);
+									 struct ev_loop *ev_base);
 /**
  * Destroy task object and remove its IO dispatcher if it exists
  */
diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index a3601621f..59698be32 100644
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -229,7 +229,7 @@ rspamd_sigh_free (void *p)
 
 void
 rspamd_worker_set_signal_handler (int signo, struct rspamd_worker *worker,
-		struct event_base *base,
+		struct ev_loop *base,
 		rspamd_worker_signal_handler handler,
 		void *handler_data)
 {
@@ -261,7 +261,7 @@ rspamd_worker_set_signal_handler (int signo, struct rspamd_worker *worker,
 }
 
 void
-rspamd_worker_init_signals (struct rspamd_worker *worker, struct event_base *base)
+rspamd_worker_init_signals (struct rspamd_worker *worker, struct ev_loop *base)
 {
 	struct sigaction signals;
 	/* We ignore these signals in the worker */
@@ -297,11 +297,11 @@ rspamd_worker_init_signals (struct rspamd_worker *worker, struct event_base *bas
 	sigprocmask (SIG_UNBLOCK, &signals.sa_mask, NULL);
 }
 
-struct event_base *
+struct ev_loop *
 rspamd_prepare_worker (struct rspamd_worker *worker, const char *name,
 	void (*accept_handler)(int, short, void *))
 {
-	struct event_base *ev_base;
+	struct ev_loop *ev_base;
 	struct event *accept_events;
 	GList *cur;
 	struct rspamd_worker_listen_socket *ls;
@@ -633,7 +633,7 @@ struct rspamd_worker *
 rspamd_fork_worker (struct rspamd_main *rspamd_main,
 		struct rspamd_worker_conf *cf,
 		guint index,
-		struct event_base *ev_base)
+		struct ev_loop *ev_base)
 {
 	struct rspamd_worker *wrk;
 	gint rc;
@@ -683,8 +683,8 @@ rspamd_fork_worker (struct rspamd_main *rspamd_main,
 #endif
 
 		/* Remove the inherited event base */
-		event_reinit (rspamd_main->ev_base);
-		event_base_free (rspamd_main->ev_base);
+		event_reinit (rspamd_main->event_loop);
+		event_base_free (rspamd_main->event_loop);
 
 		/* Drop privileges */
 		rspamd_worker_drop_priv (rspamd_main);
@@ -867,7 +867,7 @@ struct rspamd_worker_session_elt {
 };
 
 struct rspamd_worker_session_cache {
-	struct event_base *ev_base;
+	struct ev_loop *ev_base;
 	GHashTable *cache;
 	struct rspamd_config *cfg;
 	struct timeval tv;
@@ -923,7 +923,7 @@ rspamd_sessions_cache_periodic (gint fd, short what, gpointer p)
 
 void *
 rspamd_worker_session_cache_new (struct rspamd_worker *w,
-		struct event_base *ev_base)
+		struct ev_loop *ev_base)
 {
 	struct rspamd_worker_session_cache *c;
 	static const gdouble periodic_interval = 60.0;
@@ -975,7 +975,7 @@ rspamd_worker_monitored_on_change (struct rspamd_monitored_ctx *ctx,
 {
 	struct rspamd_worker *worker = ud;
 	struct rspamd_config *cfg = worker->srv->cfg;
-	struct event_base *ev_base;
+	struct ev_loop *ev_base;
 	guchar tag[RSPAMD_MONITORED_TAG_LEN];
 	static struct rspamd_srv_command srv_cmd;
 
@@ -995,7 +995,7 @@ rspamd_worker_monitored_on_change (struct rspamd_monitored_ctx *ctx,
 
 void
 rspamd_worker_init_monitored (struct rspamd_worker *worker,
-		struct event_base *ev_base,
+		struct ev_loop *ev_base,
 		struct rspamd_dns_resolver *resolver)
 {
 	rspamd_monitored_ctx_config (worker->srv->cfg->monitored_ctx,
diff --git a/src/libserver/worker_util.h b/src/libserver/worker_util.h
index 3186025b3..2dc78dfc7 100644
--- a/src/libserver/worker_util.h
+++ b/src/libserver/worker_util.h
@@ -35,7 +35,7 @@ struct rspamd_worker_signal_handler;
  * @param worker
  * @param base
  */
-void rspamd_worker_init_signals (struct rspamd_worker *worker, struct event_base *base);
+void rspamd_worker_init_signals (struct rspamd_worker *worker, struct ev_loop *base);
 /**
  * Prepare worker's startup
  * @param worker worker structure
@@ -44,7 +44,7 @@ void rspamd_worker_init_signals (struct rspamd_worker *worker, struct event_base
  * @param accept_handler handler of accept event for listen sockets
  * @return event base suitable for a worker
  */
-struct event_base *
+struct ev_loop *
 rspamd_prepare_worker (struct rspamd_worker *worker, const char *name,
 	void (*accept_handler)(int, short, void *));
 
@@ -53,7 +53,7 @@ rspamd_prepare_worker (struct rspamd_worker *worker, const char *name,
  */
 void rspamd_worker_set_signal_handler (int signo,
 		struct rspamd_worker *worker,
-		struct event_base *base,
+		struct ev_loop *base,
 		rspamd_worker_signal_handler handler,
 		void *handler_data);
 
@@ -162,7 +162,7 @@ gboolean rspamd_worker_is_primary_controller (struct rspamd_worker *w);
  * @return
  */
 void * rspamd_worker_session_cache_new (struct rspamd_worker *w,
-		struct event_base *ev_base);
+		struct ev_loop *ev_base);
 
 /**
  * Adds a new session identified by pointer
@@ -185,7 +185,7 @@ void rspamd_worker_session_cache_remove (void *cache, void *ptr);
  * Fork new worker with the specified configuration
  */
 struct rspamd_worker *rspamd_fork_worker (struct rspamd_main *,
-		struct rspamd_worker_conf *, guint idx, struct event_base *ev_base);
+		struct rspamd_worker_conf *, guint idx, struct ev_loop *ev_base);
 
 /**
  * Sets crash signals handlers if compiled with libunwind
@@ -199,7 +199,7 @@ void rspamd_set_crash_handler (struct rspamd_main *);
  * @param resolver
  */
 void rspamd_worker_init_monitored (struct rspamd_worker *worker,
-		struct event_base *ev_base,
+		struct ev_loop *ev_base,
 		struct rspamd_dns_resolver *resolver);
 
 #define msg_err_main(...) rspamd_default_log_function (G_LOG_LEVEL_CRITICAL, \