X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-common%2Fsimple-watch.c;h=68723896f2c79de846749d592efb00a1e81fcab8;hb=c75a6b480b047abc73ee7afd912aef249e9da8e3;hp=5e03fe44219d60921b347e99bd614356b037264d;hpb=fcc9b0efe1accdb0edcb3143a8e15782e69383db;p=catta

diff --git a/avahi-common/simple-watch.c b/avahi-common/simple-watch.c
index 5e03fe4..6872389 100644
--- a/avahi-common/simple-watch.c
+++ b/avahi-common/simple-watch.c
@@ -27,6 +27,8 @@
 #include <assert.h>
 #include <string.h>
 #include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
 
 #include <avahi-common/llist.h>
 #include <avahi-common/malloc.h>
@@ -36,14 +38,29 @@
 struct AvahiWatch {
     AvahiSimplePoll *simple_poll;
     int dead;
+
     int idx;
     struct pollfd pollfd;
+    
     AvahiWatchCallback callback;
     void *userdata;
 
     AVAHI_LLIST_FIELDS(AvahiWatch, watches);
 };
 
+struct AvahiTimeout {
+    AvahiSimplePoll *simple_poll;
+    int dead;
+
+    int enabled;
+    struct timeval expiry;
+    
+    AvahiTimeoutCallback callback;
+    void  *userdata;
+    
+    AVAHI_LLIST_FIELDS(AvahiTimeout, timeouts);
+};
+
 struct AvahiSimplePoll {
     AvahiPoll api;
     AvahiPollFunc poll_func;
@@ -51,18 +68,46 @@ struct AvahiSimplePoll {
     struct pollfd* pollfds;
     int n_pollfds, max_pollfds, rebuild_pollfds;
 
-    struct timeval wakeup;
-    AvahiWakeupCallback wakeup_callback;
-    void *wakeup_userdata;
-
-    int req_cleanup;
-    
+    int watch_req_cleanup, timeout_req_cleanup;
     int quit;
+    int events_valid;
 
     int n_watches;
     AVAHI_LLIST_HEAD(AvahiWatch, watches);
+    AVAHI_LLIST_HEAD(AvahiTimeout, timeouts);
+
+    int wakeup_pipe[2];
 };
 
+static void wakeup(AvahiSimplePoll *s) {
+    char c = 'x';
+    assert(s);
+
+    write(s->wakeup_pipe[1], &c, sizeof(c));
+}
+
+static void clear_wakeup(AvahiSimplePoll *s) {
+    char c[10]; /* Read ten at a time */
+
+    for(;;)
+        if (read(s->wakeup_pipe[0], &c, sizeof(c)) != sizeof(c))
+            break;
+}
+
+static int set_nonblock(int fd) {
+    int n;
+    
+    assert(fd >= 0);
+
+    if ((n = fcntl(fd, F_GETFL)) < 0)
+        return -1;
+
+    if (n & O_NONBLOCK)
+        return 0;
+
+    return fcntl(fd, F_SETFL, n|O_NONBLOCK);
+}
+
 static AvahiWatch* watch_new(const AvahiPoll *api, int fd, AvahiWatchEvent event, AvahiWatchCallback callback, void *userdata) {
     AvahiWatch *w;
     AvahiSimplePoll *s;
@@ -78,11 +123,13 @@ static AvahiWatch* watch_new(const AvahiPoll *api, int fd, AvahiWatchEvent event
         return NULL;
     
     w->simple_poll = s;
+    w->dead = 0;
+
     w->pollfd.fd = fd;
     w->pollfd.events = event;
+
     w->callback = callback;
     w->userdata = userdata;
-    w->dead = 0;
 
     if (s->n_pollfds < s->max_pollfds) {
         /* If there's space for this pollfd, go on and allocate it */
@@ -98,6 +145,8 @@ static AvahiWatch* watch_new(const AvahiPoll *api, int fd, AvahiWatchEvent event
     AVAHI_LLIST_PREPEND(AvahiWatch, watches, s->watches, w);
     s->n_watches++;
 
+    wakeup(w->simple_poll);
+
     return w;
 }
 
@@ -112,6 +161,18 @@ static void watch_update(AvahiWatch *w, AvahiWatchEvent events) {
         w->simple_poll->pollfds[w->idx] = w->pollfd;
     } else
         w->simple_poll->rebuild_pollfds = 1;
+
+    wakeup(w->simple_poll);
+}
+
+static AvahiWatchEvent watch_get_events(AvahiWatch *w) {
+    assert(w);
+    assert(!w->dead);
+
+    if (w->idx != -1 && w->simple_poll->events_valid)
+        return w->simple_poll->pollfds[w->idx].revents;
+
+    return 0;
 }
 
 static void remove_pollfd(AvahiWatch *w) {
@@ -134,33 +195,16 @@ static void remove_pollfd(AvahiWatch *w) {
 
 static void watch_free(AvahiWatch *w) {
     assert(w);
+
     assert(!w->dead);
 
     remove_pollfd(w);
     
     w->dead = 1;
     w->simple_poll->n_watches --;
-    w->simple_poll->req_cleanup = 1;
-}
-
-static void set_wakeup(const AvahiPoll *api, const struct timeval *tv, AvahiWakeupCallback callback, void *userdata) {
-    AvahiSimplePoll *s;
-
-    assert(api);
-    s = api->userdata;
+    w->simple_poll->watch_req_cleanup = 1;
 
-    if (callback) {
-        if (tv)
-            s->wakeup = *tv;
-        else {
-            s->wakeup.tv_sec = 0;
-            s->wakeup.tv_usec = 0;
-        }
-        
-        s->wakeup_callback = callback;
-        s->wakeup_userdata = userdata;
-    } else
-        s->wakeup_callback = NULL;
+    wakeup(w->simple_poll);
 }
 
 static void destroy_watch(AvahiWatch *w) {
@@ -175,7 +219,7 @@ static void destroy_watch(AvahiWatch *w) {
     avahi_free(w);
 }
 
-static void cleanup(AvahiSimplePoll *s, int all) {
+static void cleanup_watches(AvahiSimplePoll *s, int all) {
     AvahiWatch *w, *next;
     assert(s);
 
@@ -186,7 +230,78 @@ static void cleanup(AvahiSimplePoll *s, int all) {
             destroy_watch(w);
     }
 
-    s->req_cleanup = 0;
+    s->timeout_req_cleanup = 0;
+}
+
+static AvahiTimeout* timeout_new(const AvahiPoll *api, const struct timeval *tv, AvahiTimeoutCallback callback, void *userdata) {
+    AvahiTimeout *t;
+    AvahiSimplePoll *s;
+    
+    assert(api);
+    assert(callback);
+
+    s = api->userdata;
+    assert(s);
+
+    if (!(t = avahi_new(AvahiTimeout, 1)))
+        return NULL;
+    
+    t->simple_poll = s;
+    t->dead = 0;
+
+    if ((t->enabled = !!tv))
+        t->expiry = *tv;
+        
+    t->callback = callback;
+    t->userdata = userdata;
+
+    AVAHI_LLIST_PREPEND(AvahiTimeout, timeouts, s->timeouts, t);
+
+    wakeup(t->simple_poll);
+    return t;
+}
+
+static void timeout_update(AvahiTimeout *t, const struct timeval *tv) {
+    assert(t);
+    assert(!t->dead);
+    
+    if ((t->enabled = !!tv))
+        t->expiry = *tv;
+
+    wakeup(t->simple_poll);
+}
+
+static void timeout_free(AvahiTimeout *t) {
+    assert(t);
+    assert(!t->dead);
+
+    t->dead = 1;
+    t->simple_poll->timeout_req_cleanup = 1;
+
+    wakeup(t->simple_poll);
+}
+
+
+static void destroy_timeout(AvahiTimeout *t) {
+    assert(t);
+
+    AVAHI_LLIST_REMOVE(AvahiTimeout, timeouts, t->simple_poll->timeouts, t);
+
+    avahi_free(t);
+}
+
+static void cleanup_timeouts(AvahiSimplePoll *s, int all) {
+    AvahiTimeout *t, *next;
+    assert(s);
+
+    for (t = s->timeouts; t; t = next) {
+        next = t->timeouts_next;
+
+        if (all || t->dead)
+            destroy_timeout(t);
+    }
+
+    s->timeout_req_cleanup = 0;
 }
 
 AvahiSimplePoll *avahi_simple_poll_new(void) {
@@ -194,23 +309,40 @@ AvahiSimplePoll *avahi_simple_poll_new(void) {
 
     if (!(s = avahi_new(AvahiSimplePoll, 1)))
         return NULL;
+
+    if (pipe(s->wakeup_pipe) < 0) {
+        avahi_free(s);
+        return NULL;
+    }
+
+    set_nonblock(s->wakeup_pipe[0]);
+    set_nonblock(s->wakeup_pipe[1]);
     
     s->api.userdata = s;
+
     s->api.watch_new = watch_new;
     s->api.watch_free = watch_free;
     s->api.watch_update = watch_update;
-    s->api.set_wakeup = set_wakeup;
+    s->api.watch_get_events = watch_get_events;
+
+    s->api.timeout_new = timeout_new;
+    s->api.timeout_free = timeout_free;
+    s->api.timeout_update = timeout_update;
+    
     s->pollfds = NULL;
     s->max_pollfds = s->n_pollfds = 0;
-    s->wakeup_callback = NULL;
     s->rebuild_pollfds = 0;
     s->quit = 0;
     s->n_watches = 0;
-    s->req_cleanup = 0;
+    s->events_valid = 0;
+    
+    s->watch_req_cleanup = 0;
+    s->timeout_req_cleanup = 0;
 
     avahi_simple_poll_set_func(s, NULL);
 
     AVAHI_LLIST_HEAD_INIT(AvahiWatch, s->watches);
+    AVAHI_LLIST_HEAD_INIT(AvahiTimeout, s->timeouts);
 
     return s;
 }
@@ -218,11 +350,18 @@ AvahiSimplePoll *avahi_simple_poll_new(void) {
 void avahi_simple_poll_free(AvahiSimplePoll *s) {
     assert(s);
 
-    cleanup(s, 1);
-    
+    cleanup_timeouts(s, 1);
+    cleanup_watches(s, 1);
     assert(s->n_watches == 0);
     
     avahi_free(s->pollfds);
+
+    if (s->wakeup_pipe[0] >= 0)
+        close(s->wakeup_pipe[0]);
+
+    if (s->wakeup_pipe[1] >= 0)
+        close(s->wakeup_pipe[1]);
+        
     avahi_free(s);
 }
 
@@ -232,7 +371,7 @@ static int rebuild(AvahiSimplePoll *s) {
     
     assert(s);
 
-    if (s->n_watches > s->max_pollfds) {
+    if (s->n_watches+1 > s->max_pollfds) {
         struct pollfd *n;
 
         s->max_pollfds = s->n_watches + 10;
@@ -243,7 +382,12 @@ static int rebuild(AvahiSimplePoll *s) {
         s->pollfds = n;
     }
 
-    for (idx = 0, w = s->watches; w; w = w->watches_next) {
+    
+    s->pollfds[0].fd = s->wakeup_pipe[0];
+    s->pollfds[0].events = POLLIN;
+    s->pollfds[0].revents = 0;
+    
+    for (idx = 1, w = s->watches; w; w = w->watches_next) {
 
         if(w->dead)
             continue;
@@ -253,39 +397,52 @@ static int rebuild(AvahiSimplePoll *s) {
     }
 
     s->n_pollfds = idx;
-    
+    s->events_valid = 0;
     s->rebuild_pollfds = 0;
 
     return 0;
 }
 
-static int start_wakeup_callback(AvahiSimplePoll *s) {
-    AvahiWakeupCallback callback;
-    void *userdata;
-
+static AvahiTimeout* find_next_timeout(AvahiSimplePoll *s) {
+    AvahiTimeout *t, *n = NULL;
     assert(s);
 
-    /* Reset the wakeup functions, but allow changing of the two
-       values from the callback function */
+    for (t = s->timeouts; t; t = t->timeouts_next) {
+        
+        if (t->dead || !t->enabled)
+            continue;
+        
+        if (!n || avahi_timeval_compare(&t->expiry, &n->expiry) < 0)
+            n = t;
+    }
+
+    return n;
+}
 
-    callback = s->wakeup_callback;
-    userdata = s->wakeup_userdata;
-    s->wakeup_callback = NULL;
-    s->wakeup_userdata = NULL;
+static int start_timeout_callback(AvahiTimeout *t) {
+    assert(t);
+    assert(!t->dead);
+    assert(t->enabled);
 
-    assert(callback);
-    
-    callback(&s->api, userdata);
+    t->enabled = 0;
+    t->callback(t, t->userdata);
     return 0;
 }
 
 int avahi_simple_poll_iterate(AvahiSimplePoll *s, int timeout) {
     int r;
+    AvahiTimeout *next_timeout;
     assert(s);
 
+    /* Clear pending wakeup requests */
+    clear_wakeup(s);
+
     /* Cleanup things first */
-    if (s->req_cleanup)
-        cleanup(s, 0);
+    if (s->watch_req_cleanup)
+        cleanup_watches(s, 0);
+
+    if (s->timeout_req_cleanup)
+        cleanup_timeouts(s, 0);
 
     /* Check whether a quit was requested */
     if (s->quit)
@@ -297,18 +454,32 @@ int avahi_simple_poll_iterate(AvahiSimplePoll *s, int timeout) {
             return -1;
 
     /* Calculate the wakeup time */
-    if (s->wakeup_callback) {
+    if ((next_timeout = find_next_timeout(s))) {
         struct timeval now;
         int t;
         AvahiUsec usec;
 
+        if (next_timeout->expiry.tv_sec == 0 &&
+            next_timeout->expiry.tv_usec == 0) {
+
+            /* Just a shortcut so that we don't need to call gettimeofday() */
+            
+            /* The events poll() returned in the last call are now no longer valid */
+            s->events_valid = 0;
+            return start_timeout_callback(next_timeout);
+        }
+
+            
         gettimeofday(&now, NULL);
-        usec = avahi_timeval_diff(&s->wakeup, &now);
+        usec = avahi_timeval_diff(&next_timeout->expiry, &now);
 
-        if (usec <= 0)
+        if (usec <= 0) {
             /* Timeout elapsed */
 
-            return start_wakeup_callback(s);
+            /* The events poll() returned in the last call are now no longer valid */
+            s->events_valid = 0;
+            return start_timeout_callback(next_timeout);
+        }
 
         /* Calculate sleep time. We add 1ms because otherwise we'd
          * wake up too early most of the time */
@@ -321,15 +492,18 @@ int avahi_simple_poll_iterate(AvahiSimplePoll *s, int timeout) {
     if ((r = s->poll_func(s->pollfds, s->n_pollfds, timeout)) < 0)
         return -1;
 
+    /* The pollf events are now valid again */
+    s->events_valid = 1;
+
     /* Check whether the wakeup time has been reached now */
-    if (s->wakeup_callback) {
+    if ((next_timeout = find_next_timeout(s))) {
         struct timeval now;
         
         gettimeofday(&now, NULL);
 
-        if (avahi_timeval_compare(&s->wakeup, &now) <= 0)
+        if (avahi_timeval_compare(&next_timeout->expiry, &now) <= 0)
             /* Time elapsed */
-            return start_wakeup_callback(s);
+            return start_timeout_callback(next_timeout);
     }
     
     if (r > 0) {
@@ -356,10 +530,11 @@ int avahi_simple_poll_iterate(AvahiSimplePoll *s, int timeout) {
     return 0;
 }
 
-void avahi_simple_poll_quit(AvahiSimplePoll *w) {
-    assert(w);
+void avahi_simple_poll_quit(AvahiSimplePoll *s) {
+    assert(s);
 
-    w->quit = 1;
+    s->quit = 1;
+    wakeup(s);
 }
 
 const AvahiPoll* avahi_simple_poll_get(AvahiSimplePoll *s) {
@@ -372,4 +547,5 @@ void avahi_simple_poll_set_func(AvahiSimplePoll *s, AvahiPollFunc func) {
     assert(s);
 
     s->poll_func = func ? func : (AvahiPollFunc) poll;
+    wakeup(s);
 }