commit 0e1e511: [Minor] Do not use signalfd - it is totally broken in libev

Vsevolod Stakhov vsevolod at highsecure.ru
Thu Mar 26 18:00:07 UTC 2020


Author: Vsevolod Stakhov
Date: 2020-03-26 17:59:23 +0000
URL: https://github.com/rspamd/rspamd/commit/0e1e5111e3aea32e6e001c0b55d43493bac04738 (HEAD -> master)

[Minor] Do not use signalfd - it is totally broken in libev

---
 src/client/rspamc.c         | 2 +-
 src/libserver/worker_util.c | 3 +--
 src/rspamd.c                | 3 +--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/client/rspamc.c b/src/client/rspamc.c
index 6947d5604..5af3c8951 100644
--- a/src/client/rspamc.c
+++ b/src/client/rspamc.c
@@ -1933,7 +1933,7 @@ main (gint argc, gchar **argv, gchar **env)
 	}
 
 	rspamd_init_libs ();
-	event_loop = ev_loop_new (EVFLAG_SIGNALFD|EVBACKEND_ALL);
+	event_loop = ev_loop_new (EVBACKEND_ALL);
 
 	struct rspamd_http_context_cfg http_config;
 
diff --git a/src/libserver/worker_util.c b/src/libserver/worker_util.c
index 5a2234f29..e0d7d6bc7 100644
--- a/src/libserver/worker_util.c
+++ b/src/libserver/worker_util.c
@@ -479,8 +479,7 @@ rspamd_prepare_worker (struct rspamd_worker *worker, const char *name,
 	worker->signal_events = g_hash_table_new_full (g_direct_hash, g_direct_equal,
 			NULL, rspamd_sigh_free);
 
-	event_loop = ev_loop_new (rspamd_config_ev_backend_get (worker->srv->cfg) |
-			EVFLAG_SIGNALFD);
+	event_loop = ev_loop_new (rspamd_config_ev_backend_get (worker->srv->cfg));
 
 	worker->srv->event_loop = event_loop;
 
diff --git a/src/rspamd.c b/src/rspamd.c
index fb3b93e36..70aed4331 100644
--- a/src/rspamd.c
+++ b/src/rspamd.c
@@ -1449,8 +1449,7 @@ main (gint argc, gchar **argv, gchar **env)
 	rspamd_main->workers = g_hash_table_new (g_direct_hash, g_direct_equal);
 
 	/* Init event base */
-	event_loop = ev_default_loop (EVFLAG_SIGNALFD|
-			rspamd_config_ev_backend_get (rspamd_main->cfg));
+	event_loop = ev_default_loop (rspamd_config_ev_backend_get (rspamd_main->cfg));
 	rspamd_main->event_loop = event_loop;
 
 	if (event_loop) {


More information about the Commits mailing list