From 4f0a5e7572a4257894b4bfede42c26d65152609e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 13 Aug 2005 21:25:09 +0000 Subject: * strip glib from avahi-core * implement glib memory allocator * add new documentation file MALLOC * initialize pseudo-RNG from /dev/urandom in avahi-daemon * remove some gcc 4.0 warnings * beef up watch system with real timeouts * move GCC __attribute__ macros into its own header avahi-common/gccmacro.h * make use of GCC's sentinel attribute where it make sense * add malloc() implementations that abort on OOM and enable them by default git-svn-id: file:///home/lennart/svn/public/avahi/trunk@308 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe --- avahi-glib/glib-watch-test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'avahi-glib/glib-watch-test.c') diff --git a/avahi-glib/glib-watch-test.c b/avahi-glib/glib-watch-test.c index 5072321..bd111dd 100644 --- a/avahi-glib/glib-watch-test.c +++ b/avahi-glib/glib-watch-test.c @@ -52,24 +52,24 @@ static void callback(AvahiWatch *w, int fd, AvahiWatchEvent event, void *userdat } } -static void iteration(AvahiGLibPoll *p, void *userdata) { +static void wakeup(AvahiPoll *_api, void *userdata) { struct timeval tv; static int i = 0; - printf("Iteration %i\n", i++); + printf("Wakeup #%i\n", i++); - if (i > 100) + if (i > 10) g_main_loop_quit(loop); avahi_elapse_time(&tv, 1000, 0); - api->set_wakeup_time(api, &tv); + api->set_wakeup(api, &tv, wakeup, NULL); } int main(int argc, char *argv[]) { AvahiGLibPoll *s; struct timeval tv; - s = avahi_glib_poll_new(NULL, iteration, NULL); + s = avahi_glib_poll_new(NULL); assert(s); api = avahi_glib_poll_get(s); @@ -77,7 +77,7 @@ int main(int argc, char *argv[]) { api->watch_new(api, 0, AVAHI_WATCH_IN, callback, NULL); avahi_elapse_time(&tv, 1000, 0); - api->set_wakeup_time(api, &tv); + api->set_wakeup(api, &tv, wakeup, NULL); loop = g_main_loop_new(NULL, FALSE); g_main_loop_run(loop); -- cgit