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-core/timeeventq-test.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) (limited to 'avahi-core/timeeventq-test.c') diff --git a/avahi-core/timeeventq-test.c b/avahi-core/timeeventq-test.c index 613d438..46a948a 100644 --- a/avahi-core/timeeventq-test.c +++ b/avahi-core/timeeventq-test.c @@ -23,37 +23,47 @@ #include #endif -#include +#include +#include #include +#include + #include "timeeventq.h" +#include "log.h" + +#define POINTER_TO_INT(p) ((int) (p)) +#define INT_TO_POINTER(i) ((void*) (i)) static AvahiTimeEventQueue *q = NULL; -static void callback(AvahiTimeEvent*e, gpointer userdata) { +static void callback(AvahiTimeEvent*e, void* userdata) { struct timeval tv = {0, 0}; - g_assert(e); - g_message("callback(%i)", GPOINTER_TO_INT(userdata)); + assert(e); + avahi_log_info("callback(%i)", POINTER_TO_INT(userdata)); avahi_elapse_time(&tv, 1000, 100); - avahi_time_event_queue_update(q, e, &tv); + avahi_time_event_update(e, &tv); } int main(int argc, char *argv[]) { - GMainLoop *loop = NULL; struct timeval tv; - - q = avahi_time_event_queue_new(NULL, 0); + AvahiSimplePoll *s; + + s = avahi_simple_poll_new(); + + q = avahi_time_event_queue_new(avahi_simple_poll_get(s)); + + avahi_time_event_new(q, avahi_elapse_time(&tv, 5000, 100), callback, INT_TO_POINTER(1)); + avahi_time_event_new(q, avahi_elapse_time(&tv, 5000, 100), callback, INT_TO_POINTER(2)); - avahi_time_event_queue_add(q, avahi_elapse_time(&tv, 5000, 100), callback, GINT_TO_POINTER(1)); - avahi_time_event_queue_add(q, avahi_elapse_time(&tv, 5000, 100), callback, GINT_TO_POINTER(2)); + avahi_log_info("starting"); - g_message("starting"); - - loop = g_main_loop_new(NULL, FALSE); - g_main_loop_run(loop); - g_main_loop_unref(loop); + for (;;) + if (avahi_simple_poll_iterate(s, -1) != 0) + break; avahi_time_event_queue_free(q); + avahi_simple_poll_free(s); return 0; } -- cgit