Fixed tests on osx.

Author: FedeDP

Lib/module.c

@@ -2,7 +2,6 @@
 #include "poll_priv.h"
 #include <string.h>
 #include <stdarg.h>
-#include <errno.h>
 
 static module_ret_code init_ctx(const char *ctx_name, m_context **context);
 static void destroy_ctx(const char *ctx_name, m_context *context);
@@ -13,7 +12,6 @@ static int tell_if(void *data, void *m);
 static pubsub_msg_t *create_pubsub_msg(const unsigned char *message, const self_t *sender, const char *topic, enum msg_type type, const size_t size);
 static module_ret_code tell_pubsub_msg(pubsub_msg_t *m, module *mod, m_context *c);
 static int manage_fds(module *mod, m_context *c, int flag, int stop);
-static int _poll_set_new_evt(module_poll_t *t, m_context *c, int flag);
 static module_ret_code start(const self_t *self, const enum module_states mask, const char *err_str);
 static module_ret_code stop(const self_t *self, const enum module_states mask, const char *err_str, int stop);
 
@@ -198,7 +196,7 @@ module_ret_code module_register_fd(const self_t *self, const int fd, const bool
 
     /* If a fd is registered at runtime, start polling on it */
     if (module_is(self, RUNNING)) {
-        int ret = _poll_set_new_evt(tmp, c, ADD);
+        int ret = poll_set_new_evt(tmp, c, ADD);
         return !ret ? MOD_OK : MOD_ERR;
     }
     return MOD_OK;
@@ -218,7 +216,7 @@ module_ret_code module_deregister_fd(const self_t *self, const int fd) {
             *tmp = (*tmp)->prev;
             /* If a fd is deregistered for a RUNNING module, stop polling on it */
             if (module_is(self, RUNNING)) {
-                ret = _poll_set_new_evt(t, c, RM);
+                ret = poll_set_new_evt(t, c, RM);
             }
             if (t->autoclose) {
                 close(t->fd);
@@ -447,26 +445,12 @@ static int manage_fds(module *mod, m_context *c, int flag, int stop) {
         if (flag == RM && stop) {
             ret = module_deregister_fd(&mod->self, t->fd);
         } else {
-            ret = _poll_set_new_evt(t, c, flag);
+            ret = poll_set_new_evt(t, c, flag);
         }
     }
     return ret;
 }
 
-/* 
- * Just a call to poll_set_new_evt + some filtering:
- * STDIN_FILENO returns EPERM but it is actually pollable
- */
-static int _poll_set_new_evt(module_poll_t *t, m_context *c, int flag) {
-    int ret = poll_set_new_evt(t, c, flag);
-    printf("Ret: %d, errno: %d\n", ret, errno);
-    /* Workaround for STDIN_FILENO */
-    if (ret == -1 && t->fd == STDIN_FILENO && errno == EPERM) {
-        ret = 0;
-    }
-    return ret;
-}
-
 static module_ret_code start(const self_t *self, const enum module_states mask, const char *err_str) {
     GET_MOD_IN_STATE(self, mask);
 

Lib/poll_plugins/epoll_priv.c

@@ -16,7 +16,12 @@ int poll_set_new_evt(module_poll_t *tmp, m_context *c, enum op_type flag) {
     struct epoll_event *ev = (struct epoll_event *)tmp->ev;
     ev->data.ptr = tmp;
     ev->events = EPOLLIN;
-    return epoll_ctl(c->fd, f, tmp->fd, (struct epoll_event *)tmp->ev);
+    int ret = epoll_ctl(c->fd, f, tmp->fd, (struct epoll_event *)tmp->ev);
+    /* Workaround for STDIN_FILENO: it returns EPERM but it is actually pollable */
+    if (ret == -1 && tmp->fd == STDIN_FILENO && errno == EPERM) {
+        ret = 0;
+    }
+    return ret;
 }
 
 int poll_init_pevents(void **pevents, int max_events) {

Lib/poll_plugins/kqueue_priv.c

@@ -24,7 +24,12 @@ int poll_set_new_evt(module_poll_t *tmp, m_context *c, enum op_type flag) {
     int f = flag == ADD ? EV_ADD : EV_DELETE;
     struct kevent *_ev = (struct kevent *)tmp->ev;
     EV_SET(_ev, tmp->fd, EVFILT_READ, f, 0, 0, (void *)tmp);
-    return kevent(c->fd, _ev, 1, NULL, 0, NULL);
+    int ret = kevent(c->fd, _ev, 1, NULL, 0, NULL);
+    /* Workaround for STDIN_FILENO: it returns EINVAL but it is actually pollable */
+    if (ret == -1 && tmp->fd == STDIN_FILENO && errno == EINVAL) {
+        ret = 0;
+    }
+    return ret;
 }
 
 int poll_init_pevents(void **pevents, int max_events) {

Lib/poll_priv.h

@@ -3,6 +3,7 @@
 #include "module_cmn.h"
 #include "module_priv.h"
 #include <fcntl.h>
+#include <errno.h>
 
 /* Useful macros to smooth away differences between supported OS */
 enum op_type { ADD, RM };

TODO.md

@@ -10,7 +10,7 @@
 
 - [x] Fix CMakeLists to runt tests even if valgrind could not be found
 
-- [ ] Fix tests on osx? module_register_fd fails
+- [x] Fix tests on osx? module_register_fd fails
 - [x] Special handling of STDIN_FILENO in poll_set_new_evt: it returns EPERM but it is actually pollable.
 
 ## 3.1.0