EV_SET accepts an uintptr_t as ident. Directly use src.

Author: FedeDP

Lib/ctx.c

@@ -175,7 +175,6 @@ static int recv_events(m_ctx_t *c, int timeout) {
                 case M_SRC_TYPE_THRESH:
                     msg->thresh_evt = m_mem_new(sizeof(*msg->thresh_evt), NULL);
                     if (poll_consume_thresh(&c->ppriv, i, p, msg->thresh_evt) == 0) {
-                        msg->thresh_evt->id = p->thresh_src.thr.id;
                         msg->thresh_evt->inactive_ms = p->thresh_src.alarm.inactive_ms;
                         msg->thresh_evt->activity_freq = p->thresh_src.alarm.activity_freq;
                     }

Lib/mod.c

@@ -140,7 +140,7 @@ int evaluate_module(void *data, const char *key, void *value) {
                 }
             }
             if (alarm->activity_freq != 0 || alarm->inactive_ms != 0) {
-                poll_notify_thresh(&mod->ctx->ppriv, src);
+                poll_notify_userevent(&mod->ctx->ppriv, src);
             }
         })
     }

Lib/poll/cmn_linux.c

@@ -56,19 +56,15 @@ static void create_eventfd(ev_src_t *tmp) {
     tmp->task_src.f.fd = eventfd(0, EFD_CLOEXEC | EFD_NONBLOCK);
 }
 
-int poll_notify_task(poll_priv_t *priv, ev_src_t *src) {
+int poll_notify_userevent(poll_priv_t *priv, ev_src_t *src) {
     uint64_t u = 1;
+    /* task_src and thresh_src share memory layout, thus using task_src.f.fd is ok */
     if (write(src->task_src.f.fd, &u, sizeof(uint64_t)) == sizeof(uint64_t)) {
         return 0;
     }
     return -errno;
 }
 
-int poll_notify_thresh(poll_priv_t *priv, ev_src_t *src) {
-    // Inside an union: src->task_src.f.fd and src->thresh_src.f.fd share same memory
-    return poll_notify_task(priv, src);
-}
-
 void create_priv_fd(ev_src_t *tmp) {
     switch (tmp->type) {
         case M_SRC_TYPE_TMR:

Lib/poll/kqueue_priv.c

@@ -71,10 +71,8 @@ int poll_set_new_evt(poll_priv_t *priv, ev_src_t *tmp, const enum op_type flag)
         EV_SET(_ev, tmp->pid_src.pid.pid, EVFILT_PROC, f, tmp->pid_src.pid.events, 0, tmp);
         break;
     case M_SRC_TYPE_TASK:
-        EV_SET(_ev, tmp->task_src.tid.tid, EVFILT_USER, f, NOTE_FFNOP, 0, tmp);
-        break;
     case M_SRC_TYPE_THRESH:
-        EV_SET(_ev, tmp->thresh_src.thr.id, EVFILT_USER, f, NOTE_FFNOP, 0, tmp);
+        EV_SET(_ev, (uintptr_t)tmp, EVFILT_USER, f, NOTE_FFNOP, 0, tmp);
         break;
     default: 
         break;
@@ -171,16 +169,9 @@ int poll_destroy(poll_priv_t *priv) {
     return 0;
 }
 
-int poll_notify_task(poll_priv_t *priv, ev_src_t *src) {
-    GET_PRIV_DATA();
-    struct kevent *_ev = (struct kevent *)src->ev;
-    EV_SET(_ev, src->task_src.tid.tid, EVFILT_USER, 0, NOTE_FFNOP | NOTE_TRIGGER, 0, src);
-    return kevent(kp->fd, _ev, 1, NULL, 0, NULL);
-}
-
-int poll_notify_thresh(poll_priv_t *priv, ev_src_t *src) {
+int poll_notify_userevent(poll_priv_t *priv, ev_src_t *src) {
     GET_PRIV_DATA();
     struct kevent *_ev = (struct kevent *)src->ev;
-    EV_SET(_ev, src->thresh_src.thr.id, EVFILT_USER, 0, NOTE_FFNOP | NOTE_TRIGGER, 0, src);
+    EV_SET(_ev, (uintptr_t)src, EVFILT_USER, 0, NOTE_FFNOP | NOTE_TRIGGER, 0, src);
     return kevent(kp->fd, _ev, 1, NULL, 0, NULL);
 }

Lib/poll/poll_priv.h

@@ -22,5 +22,4 @@ int poll_consume_pid(poll_priv_t *priv, const int idx, ev_src_t *src, m_evt_pid_
 int poll_consume_task(poll_priv_t *priv, const int idx, ev_src_t *src, m_evt_task_t *task_msg);
 int poll_consume_thresh(poll_priv_t *priv, const int idx, ev_src_t *src, m_evt_thresh_t *thresh_msg);
 
-int poll_notify_task(poll_priv_t *priv, ev_src_t *src);
-int poll_notify_thresh(poll_priv_t *priv, ev_src_t *src);
+int poll_notify_userevent(poll_priv_t *priv, ev_src_t *src);

Lib/public/module/cmn.h.in

@@ -114,13 +114,12 @@ typedef struct {
 } m_src_pid_t;
 
 typedef struct {
-    unsigned int tid;       // Unique id
+    int tid;                // Unique task id
     int (*fn)(void *);      // Function to be run on thread
     m_thpool_t *thpool;     // optional threadpool on which job should run
 } m_src_task_t;
 
 typedef struct {
-    unsigned int id;        // Unique id
     uint64_t inactive_ms;   // if != 0 -> if module is inactive for longer than this, an alarm will be received
     double activity_freq;   // if != 0 -> if module's activity is higher than this, an alarm will be received
 } m_src_thresh_t;

Lib/src.c

@@ -85,7 +85,7 @@ static void *task_thread(void *data) {
     ev_src_t *src = (ev_src_t *)data;
     M_MOD_CTX(src->mod);
     src->task_src.retval = src->task_src.tid.fn((void *)src->userptr);
-    poll_notify_task(&c->ppriv, src);
+    poll_notify_userevent(&c->ppriv, src);
     pthread_exit(NULL);
 }
 
@@ -135,7 +135,11 @@ static int threshcmp(void *my_data, void *node_data) {
     ev_src_t *src = (ev_src_t *)node_data;
     const m_src_thresh_t *thr = (const m_src_thresh_t *)my_data;
 
-    return thr->id - src->thresh_src.thr.id;
+    long double my_val = (long double)thr->activity_freq
+                         + (long double)thr->inactive_ms;
+    long double their_val = (long double)src->thresh_src.thr.activity_freq
+                            + (long double)src->thresh_src.thr.inactive_ms;
+    return my_val - their_val;
 }
 
 /** Private API **/