[Project] Add small helpers for migration simplifications

src/libutil/libev_helper.c

@@ -0,0 +1,94 @@
+/*-
+ * Copyright 2019 Vsevolod Stakhov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "libev_helper.h"
+
+static void
+rspamd_ev_watcher_io_cb (EV_P_ struct ev_io *w, int revents)
+{
+	struct rspamd_io_ev *ev = (struct rspamd_io_ev *)w->data;
+
+	ev->last_activity = ev_now (EV_A);
+	ev->cb (ev->io.fd, revents, ev->ud);
+}
+
+static void
+rspamd_ev_watcher_timer_cb (EV_P_ struct ev_timer *w, int revents)
+{
+	struct rspamd_io_ev *ev = (struct rspamd_io_ev *)w->data;
+
+	ev_tstamp after = ev->last_activity - ev_now (EV_A) + ev->timeout;
+
+	if (after < 0.) {
+		/* Real timeout */
+		ev->cb (ev->io.fd, EV_TIMER, ev->ud);
+	}
+	else {
+		/* Start another cycle as there was some activity */
+		ev_timer_set (w, after, 0.);
+		ev_timer_start (EV_A_ w);
+	}
+}
+
+
+void
+rspamd_ev_watcher_init (struct rspamd_io_ev *ev,
+						int fd,
+						short what,
+						rspamd_ev_cb cb,
+						void *ud)
+{
+	ev_io_init (&ev->io, rspamd_ev_watcher_io_cb, fd, what);
+	ev->io.data = ev;
+	ev_init (&ev->tm, rspamd_ev_watcher_timer_cb);
+	ev->tm.data = ev;
+	ev->ud = ud;
+	ev->cb = cb;
+}
+
+void
+rspamd_ev_watcher_start (struct ev_loop *loop,
+						 struct rspamd_io_ev *ev,
+						 ev_tstamp timeout)
+{
+	ev->last_activity = ev_now (EV_A);
+	ev_timer_set (&ev->tm, timeout, 0.0);
+	ev_io_start (EV_A_ &ev->io);
+	ev_timer_start (EV_A_ &ev->tm);
+}
+
+void
+rspamd_ev_watcher_stop (struct ev_loop *loop,
+						struct rspamd_io_ev *ev)
+{
+	ev_io_stop (EV_A_ &ev->io);
+}
+
+void
+rspamd_ev_watcher_reschedule (struct ev_loop *loop,
+							  struct rspamd_io_ev *ev,
+							  short what)
+{
+	if (ev_is_pending (&ev->io) || ev_is_active (&ev->io)) {
+		ev_io_stop (EV_A_ &ev->io);
+		ev_io_set (&ev->io, ev->io.fd, what);
+		ev_io_start (EV_A_ &ev->io);
+	}
+	else {
+		ev_io_set (&ev->io, ev->io.fd, what);
+		ev_io_start (EV_A_ &ev->io);
+	}
+}

src/libutil/libev_helper.h

@@ -0,0 +1,78 @@
+/*-
+ * Copyright 2019 Vsevolod Stakhov
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef RSPAMD_LIBEV_HELPER_H
+#define RSPAMD_LIBEV_HELPER_H
+
+#include "config.h"
+#include "contrib/libev/ev.h"
+
+/*
+ * This module is a little helper to simplify libevent->libev transition
+ * It allows to create timed IO watchers utilising both
+ */
+
+typedef void (*rspamd_ev_cb)(int fd, short what, void *ud);
+
+struct rspamd_io_ev {
+	ev_io io;
+	ev_timer tm;
+	rspamd_ev_cb cb;
+	void *ud;
+	ev_tstamp last_activity;
+	ev_tstamp timeout;
+};
+
+/**
+ * Initialize watcher similar to event_init
+ * @param ev
+ * @param fd
+ * @param what
+ * @param cb
+ * @param ud
+ */
+void rspamd_ev_watcher_init (struct rspamd_io_ev *ev,
+		int fd, short what, rspamd_ev_cb cb, void *ud);
+
+/**
+ * Start watcher with the specific timeout
+ * @param loop
+ * @param ev
+ * @param timeout
+ */
+void rspamd_ev_watcher_start (struct ev_loop *loop,
+							  struct rspamd_io_ev *ev,
+							  ev_tstamp timeout);
+
+/**
+ * Stops watcher and clean it up
+ * @param loop
+ * @param ev
+ */
+void rspamd_ev_watcher_stop (struct ev_loop *loop,
+							 struct rspamd_io_ev *ev);
+
+/**
+ * Convenience function to reschedule watcher with different events
+ * @param loop
+ * @param ev
+ * @param what
+ */
+void rspamd_ev_watcher_reschedule (struct ev_loop *loop,
+								   struct rspamd_io_ev *ev,
+								   short what);
+
+#endif