avahi-test \
conformance-test \
avahi-reflector \
- dns-test
+ dns-test \
+ timeeventq-test
libavahi_core_la_SOURCES = \
timeeventq.c timeeventq.h\
dns_test_CFLAGS = $(AM_CFLAGS)
dns_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+timeeventq_test_SOURCES = \
+ timeeventq-test.c \
+ timeeventq.h timeeventq.c \
+ prioq.h prioq.c
+timeeventq_test_CFLAGS = $(AM_CFLAGS)
+timeeventq_test_LDADD = $(AM_LDADD) $(STATIC_COMMON_LDADD)
+
valgrind: avahi-test
libtool --mode=execute valgrind ./avahi-test
dsb = avahi_dns_server_browser_new(server, AVAHI_IF_UNSPEC, AVAHI_PROTO_UNSPEC, "local", AVAHI_DNS_SERVER_RESOLVE, AVAHI_PROTO_UNSPEC, dsb_callback, NULL);
- loop = g_main_loop_new(NULL, FALSE);
g_timeout_add(1000*5, dump_timeout, server);
g_timeout_add(1000*60, quit_timeout, loop);
+ loop = g_main_loop_new(NULL, FALSE);
g_main_loop_run(loop);
g_main_loop_unref(loop);
--- /dev/null
+/* $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
+ USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+
+#include "util.h"
+#include "timeeventq.h"
+
+static AvahiTimeEventQueue *q = NULL;
+
+void callback(AvahiTimeEvent*e, gpointer userdata) {
+ GTimeVal tv = {0, 0};
+ g_assert(e);
+ g_message("callback(%i)", GPOINTER_TO_INT(userdata));
+ avahi_elapse_time(&tv, 1000, 100);
+ avahi_time_event_queue_update(q, e, &tv);
+}
+
+int main(int argc, char *argv[]) {
+ GMainLoop *loop = NULL;
+ GTimeVal tv;
+
+ q = avahi_time_event_queue_new(NULL, 0);
+
+ 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));
+
+ g_message("starting");
+
+ loop = g_main_loop_new(NULL, FALSE);
+ g_main_loop_run(loop);
+ g_main_loop_unref(loop);
+
+ avahi_time_event_queue_free(q);
+
+ return 0;
+}
static gint compare(gconstpointer _a, gconstpointer _b) {
const AvahiTimeEvent *a = _a, *b = _b;
+ gint ret;
- return avahi_timeval_compare(&a->expiry, &b->expiry);
+ if ((ret = avahi_timeval_compare(&a->expiry, &b->expiry)) != 0)
+ return ret;
+
+ /* If both exevents are scheduled for the same time, put the entry
+ * that has been run earlier the last time first. */
+ return avahi_timeval_compare(&a->last_run, &b->last_run);
}
static gboolean prepare_func(GSource *source, gint *timeout) {
g_source_get_current_time(source, &now);
- if (avahi_timeval_compare(&now, &e->expiry) >= 0) {
+ if (avahi_timeval_compare(&now, &e->expiry) >= 0 && /* Time elapsed */
+ avahi_timeval_compare(&now, &e->last_run) != 0 /* Not yet run */) {
*timeout = -1;
return TRUE;
}
*timeout = (gint) (avahi_timeval_diff(&e->expiry, &now)/1000);
+
+ /* Wait at least 1 msec */
+ if (*timeout <= 0)
+ *timeout = 1;
return FALSE;
}
g_source_get_current_time(source, &now);
- return avahi_timeval_compare(&now, &e->expiry) >= 0;
+ return
+ avahi_timeval_compare(&now, &e->expiry) >= 0 && /* Time elapsed */
+ avahi_timeval_compare(&now, &e->last_run) != 0; /* Not yet run */
}
static gboolean dispatch_func(GSource *source, GSourceFunc callback, gpointer user_data) {
while (q->prioq->root) {
AvahiTimeEvent *e = q->prioq->root->data;
+ /* Not yet expired */
if (avahi_timeval_compare(&now, &e->expiry) < 0)
break;
+ /* Already ran */
+ if (avahi_timeval_compare(&now, &e->last_run) == 0)
+ break;
+
+ /* Make sure to move the entry away from the front */
+ e->last_run = now;
+ avahi_prio_queue_shuffle(q->prioq, e->node);
+
+ /* Run it */
g_assert(e->callback);
e->callback(e, e->userdata);
}
return TRUE;
}
+static void fix_expiry_time(AvahiTimeEvent *e) {
+ GTimeVal now;
+ g_assert(e);
+
+ g_source_get_current_time(&e->queue->source, &now);
+
+ if (avahi_timeval_compare(&now, &e->expiry) > 0)
+ e->expiry = now;
+
+}
+
AvahiTimeEventQueue* avahi_time_event_queue_new(GMainContext *context, gint priority) {
AvahiTimeEventQueue *q;
g_source_unref(&q->source);
}
-AvahiTimeEvent* avahi_time_event_queue_add(AvahiTimeEventQueue *q, const GTimeVal *timeval, void (*callback)(AvahiTimeEvent *e, void *userdata), void *userdata) {
+AvahiTimeEvent* avahi_time_event_queue_add(AvahiTimeEventQueue *q, const GTimeVal *timeval, AvahiTimeEventCallback callback, gpointer userdata) {
AvahiTimeEvent *e;
g_assert(q);
e = g_new(AvahiTimeEvent, 1);
e->queue = q;
- e->expiry = *timeval;
e->callback = callback;
e->userdata = userdata;
+ e->expiry = *timeval;
+ fix_expiry_time(e);
+
+ e->last_run.tv_sec = 0;
+ e->last_run.tv_usec = 0;
+
e->node = avahi_prio_queue_put(q->prioq, e);
return e;
g_assert(q);
g_assert(e);
g_assert(e->queue == q);
+ g_assert(timeval);
e->expiry = *timeval;
+ fix_expiry_time(e);
avahi_prio_queue_shuffle(q->prioq, e->node);
}
#include "prioq.h"
+typedef void (*AvahiTimeEventCallback)(AvahiTimeEvent *e, gpointer userdata);
+
struct AvahiTimeEvent {
AvahiTimeEventQueue *queue;
AvahiPrioQueueNode *node;
GTimeVal expiry;
- void (*callback)(AvahiTimeEvent *e, void *userdata);
- void *userdata;
+ GTimeVal last_run;
+ AvahiTimeEventCallback callback;
+ gpointer userdata;
};
struct AvahiTimeEventQueue {
AvahiTimeEventQueue* avahi_time_event_queue_new(GMainContext *context, gint priority);
void avahi_time_event_queue_free(AvahiTimeEventQueue *q);
-AvahiTimeEvent* avahi_time_event_queue_add(AvahiTimeEventQueue *q, const GTimeVal *timeval, void (*callback)(AvahiTimeEvent *e, void *userdata), void *userdata);
+AvahiTimeEvent* avahi_time_event_queue_add(AvahiTimeEventQueue *q, const GTimeVal *timeval, AvahiTimeEventCallback callback, gpointer userdata);
void avahi_time_event_queue_remove(AvahiTimeEventQueue *q, AvahiTimeEvent *e);
void avahi_time_event_queue_update(AvahiTimeEventQueue *q, AvahiTimeEvent *e, const GTimeVal *timeval);
projects / catta / commitdiff