CMakeLists.txt: bump minimum cmake version

[project/libubox.git] / uloop-epoll.c

diff --git a/uloop-epoll.c b/uloop-epoll.c
index 609ca6e77990ea1e2dbef7c38d3a2440fb06484b..d7b3acf095c467edbed832007e708617ef99108c 100644 (file)
--- a/uloop-epoll.c
+++ b/uloop-epoll.c
@@ -53,7 +53,6 @@ static int register_poll(struct uloop_fd *fd, unsigned int flags)
                ev.events |= EPOLLET;
 
        ev.data.ptr = fd;
-       fd->flags = flags;
 
        return epoll_ctl(poll_fd, op, fd->fd, &ev);
 }
@@ -105,3 +104,83 @@ static int uloop_fetch_events(int timeout)
 
        return nfds;
 }
+
+static void dispatch_timer(struct uloop_fd *u, unsigned int events)
+{
+       if (!(events & ULOOP_READ))
+               return;
+
+       uint64_t fired;
+
+       if (read(u->fd, &fired, sizeof(fired)) != sizeof(fired))
+               return;
+
+       struct uloop_interval *tm = container_of(u, struct uloop_interval, priv.ufd);
+
+       tm->expirations += fired;
+       tm->cb(tm);
+}
+
+static int timer_register(struct uloop_interval *tm, unsigned int msecs)
+{
+       if (!tm->priv.ufd.registered) {
+               int fd = timerfd_create(CLOCK_MONOTONIC, TFD_CLOEXEC|TFD_NONBLOCK);
+
+               if (fd == -1)
+                       return -1;
+
+               tm->priv.ufd.fd = fd;
+               tm->priv.ufd.cb = dispatch_timer;
+       }
+
+       struct itimerspec spec = {
+               .it_value = {
+                       .tv_sec = msecs / 1000,
+                       .tv_nsec = (msecs % 1000) * 1000000
+               },
+               .it_interval = {
+                       .tv_sec = msecs / 1000,
+                       .tv_nsec = (msecs % 1000) * 1000000
+               }
+       };
+
+       if (timerfd_settime(tm->priv.ufd.fd, 0, &spec, NULL) == -1)
+               goto err;
+
+       if (uloop_fd_add(&tm->priv.ufd, ULOOP_READ) == -1)
+               goto err;
+
+       return 0;
+
+err:
+       uloop_fd_delete(&tm->priv.ufd);
+       close(tm->priv.ufd.fd);
+       memset(&tm->priv.ufd, 0, sizeof(tm->priv.ufd));
+
+       return -1;
+}
+
+static int timer_remove(struct uloop_interval *tm)
+{
+       int ret = __uloop_fd_delete(&tm->priv.ufd);
+
+       if (ret == 0) {
+               close(tm->priv.ufd.fd);
+               memset(&tm->priv.ufd, 0, sizeof(tm->priv.ufd));
+       }
+
+       return ret;
+}
+
+static int64_t timer_next(struct uloop_interval *tm)
+{
+       struct itimerspec spec;
+
+       if (!tm->priv.ufd.registered)
+               return -1;
+
+       if (timerfd_gettime(tm->priv.ufd.fd, &spec) == -1)
+               return -1;
+
+       return spec.it_value.tv_sec * 1000 + spec.it_value.tv_nsec / 1000000;
+}