forgot to pull the publish_no_reverse change to the example.

[catta] / avahi-common / watch-test.c

diff --git a/avahi-common/watch-test.c b/avahi-common/watch-test.c
index f87a30301858f58e7529167dafd6db24bb4d3f96..6c178ba670081511b26b9d227d14001950a98287 100644 (file)
--- a/avahi-common/watch-test.c
+++ b/avahi-common/watch-test.c
@@ -1,18 +1,16 @@
-/* $Id$ */
-
 /***
   This file is part of avahi.
- 
+
   avahi is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as
   published by the Free Software Foundation; either version 2.1 of the
   License, or (at your option) any later version.
- 
+
   avahi is distributed in the hope that it will be useful, but WITHOUT
   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
   Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public
   License along with avahi; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
@@ -30,17 +28,25 @@
 #include <string.h>
 
 #include "watch.h"
-#include "simple-watch.h"
 #include "timeval.h"
+#include "gccmacro.h"
+
+static const AvahiPoll *api = NULL;
 
-static AvahiPoll *api = NULL;
+#ifndef USE_THREAD
+#include "simple-watch.h"
+static AvahiSimplePoll *simple_poll = NULL;
+#else
+#include "thread-watch.h"
+static AvahiThreadedPoll *threaded_poll = NULL;
+#endif
 
-static void callback(AvahiWatch *w, int fd, AvahiWatchEvent event, void *userdata) {
+static void callback(AvahiWatch *w, int fd, AvahiWatchEvent event, AVAHI_GCC_UNUSED void *userdata) {
 
     if (event & AVAHI_WATCH_IN) {
         ssize_t r;
         char c;
-        
+
         if ((r = read(fd, &c, 1)) <= 0) {
             fprintf(stderr, "read() failed: %s\n", r < 0 ? strerror(errno) : "EOF");
             api->watch_free(w);
@@ -51,31 +57,59 @@ static void callback(AvahiWatch *w, int fd, AvahiWatchEvent event, void *userdat
     }
 }
 
-int main(int argc, char *argv[]) {
-    int i = 0;
-    AvahiSimplePoll *s;
-    
-    s = avahi_simple_poll_new();
-    assert(s);
+static void wakeup(AvahiTimeout *t, AVAHI_GCC_UNUSED void *userdata) {
+    static int i = 0;
+    struct timeval tv;
+
+    printf("Wakeup #%i\n", i++);
+
+    if (i > 10) {
+#ifndef USE_THREAD
+        avahi_simple_poll_quit(simple_poll);
+#else
+        avahi_threaded_poll_quit(threaded_poll);
+#endif
+    } else {
+        avahi_elapse_time(&tv, 1000, 0);
+        api->timeout_update(t, &tv);
+    }
+}
+
+int main(AVAHI_GCC_UNUSED int argc, AVAHI_GCC_UNUSED char *argv[]) {
+    struct timeval tv;
 
-    api = avahi_simple_poll_get(s);
+#ifndef USE_THREAD
+    simple_poll = avahi_simple_poll_new();
+    assert(simple_poll);
+    api = avahi_simple_poll_get(simple_poll);
+    assert(api);
+#else
+    threaded_poll = avahi_threaded_poll_new();
+    assert(threaded_poll);
+    api = avahi_threaded_poll_get(threaded_poll);
+    assert(api);
+#endif
 
     api->watch_new(api, 0, AVAHI_WATCH_IN, callback, NULL);
 
-    for (;;) {
-        struct timeval tv;
-        printf("Iteration %i\n", i++);
+    avahi_elapse_time(&tv, 1000, 0);
+    api->timeout_new(api, &tv, wakeup, NULL);
 
-        if (i > 100)
-            avahi_simple_poll_quit(s);
+#ifndef USE_THREAD
+    /* Our main loop */
+    avahi_simple_poll_loop(simple_poll);
+    avahi_simple_poll_free(simple_poll);
+
+#else
+    avahi_threaded_poll_start(threaded_poll);
+
+    fprintf(stderr, "Now doing some stupid stuff ...\n");
+    sleep(20);
+    fprintf(stderr, "... stupid stuff is done.\n");
+
+    avahi_threaded_poll_free(threaded_poll);
+
+#endif
 
-        avahi_elapse_time(&tv, 1000, 0);
-        
-        api->set_wakeup_time(api, &tv);
-        
-        if (avahi_simple_poll_iterate(s, 1) != 0)
-            break;
-    }
-    
     return 0;
 }