Adding upstream version 3.8.1.upstream/3.8.1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 111 insertions, 0 deletions

diff --git a/src/libutil/libev_helper.c b/src/libutil/libev_helper.c
new file mode 100644
index 0000000..770964b
--- /dev/null
+++ b/src/libutil/libev_helper.c
@@ -0,0 +1,111 @@
+/*-
+ * 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->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;
+
+	/*
+	 * We now call timeout callback in all the cases, as we assume that all
+	 * timeouts are final
+	 */
+	ev->cb(ev->io.fd, EV_TIMER, ev->ud);
+}
+
+
+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)
+{
+	g_assert(ev->cb != NULL);
+
+	ev_io_start(EV_A_ & ev->io);
+
+	if (timeout > 0) {
+		/* Update timestamp to avoid timers running early */
+		ev_now_update_if_cheap(loop);
+
+		ev->timeout = timeout;
+		ev_timer_set(&ev->tm, timeout, 0.0);
+		ev_timer_start(EV_A_ & ev->tm);
+	}
+}
+
+void rspamd_ev_watcher_stop(struct ev_loop *loop,
+							struct rspamd_io_ev *ev)
+{
+	if (ev_can_stop(&ev->io)) {
+		ev_io_stop(EV_A_ & ev->io);
+	}
+
+	if (ev->timeout > 0) {
+		ev_timer_stop(EV_A_ & ev->tm);
+	}
+}
+
+void rspamd_ev_watcher_reschedule(struct ev_loop *loop,
+								  struct rspamd_io_ev *ev,
+								  short what)
+{
+	g_assert(ev->cb != NULL);
+
+	if (ev_can_stop(&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.data = ev;
+		ev_io_init(&ev->io, rspamd_ev_watcher_io_cb, ev->io.fd, what);
+		ev_io_start(EV_A_ & ev->io);
+	}
+
+	if (ev->timeout > 0) {
+		if (!(ev_can_stop(&ev->tm))) {
+			/* Update timestamp to avoid timers running early */
+			ev_now_update_if_cheap(loop);
+
+			ev->tm.data = ev;
+			ev_timer_init(&ev->tm, rspamd_ev_watcher_timer_cb, ev->timeout, 0.0);
+			ev_timer_start(EV_A_ & ev->tm);
+		}
+	}
+}
\ No newline at end of file