implement new main loop abstraction layer

[catta] / avahi-core / query-sched.c

diff --git a/avahi-core/query-sched.c b/avahi-core/query-sched.c
index 32d0e91dcd79ae498330199346876e7e44cba46e..9a26dba09879ad9e7e699e105362bff370ffd3d4 100644 (file)
--- a/avahi-core/query-sched.c
+++ b/avahi-core/query-sched.c
@@ -23,8 +23,8 @@
 #include <config.h>
 #endif
 
+#include <avahi-common/timeval.h>
 #include "query-sched.h"
-#include "util.h"
 
 #define AVAHI_QUERY_HISTORY_MSEC 100
 #define AVAHI_QUERY_DEFER_MSEC 100
@@ -37,7 +37,7 @@ struct AvahiQueryJob {
     AvahiTimeEvent *time_event;
     
     gboolean done;
-    GTimeVal delivery;
+    struct timeval delivery;
 
     AvahiKey *key;
 
@@ -98,7 +98,7 @@ static void job_free(AvahiQueryScheduler *s, AvahiQueryJob *qj) {
 static void elapse_callback(AvahiTimeEvent *e, gpointer data);
 
 static void job_set_elapse_time(AvahiQueryScheduler *s, AvahiQueryJob *qj, guint msec, guint jitter) {
-    GTimeVal tv;
+    struct timeval tv;
 
     g_assert(s);
     g_assert(qj);
@@ -123,7 +123,7 @@ static void job_mark_done(AvahiQueryScheduler *s, AvahiQueryJob *qj) {
     qj->done = TRUE;
 
     job_set_elapse_time(s, qj, AVAHI_QUERY_HISTORY_MSEC, 0);
-    g_get_current_time(&qj->delivery);
+    gettimeofday(&qj->delivery, NULL);
 }
 
 AvahiQueryScheduler *avahi_query_scheduler_new(AvahiInterface *i) {
@@ -319,14 +319,14 @@ static AvahiQueryJob* find_history_job(AvahiQueryScheduler *s, AvahiKey *key) {
 }
 
 gboolean avahi_query_scheduler_post(AvahiQueryScheduler *s, AvahiKey *key, gboolean immediately) {
-    GTimeVal tv;
+    struct timeval tv;
     AvahiQueryJob *qj;
     
     g_assert(s);
     g_assert(key);
 
     if ((qj = find_history_job(s, key))) {
-        g_message("Query suppressed by local duplicate suppression (history)");
+/*         avahi_log_debug("Query suppressed by local duplicate suppression (history)"); */
         return FALSE;
     }
     
@@ -335,7 +335,7 @@ gboolean avahi_query_scheduler_post(AvahiQueryScheduler *s, AvahiKey *key, gbool
     if ((qj = find_scheduled_job(s, key))) {
         /* Duplicate questions suppression */
 
-        g_message("Query suppressed by local duplicate suppression (scheduled)");
+/*         avahi_log_debug("Query suppressed by local duplicate suppression (scheduled)"); */
         
         if (avahi_timeval_compare(&tv, &qj->delivery) < 0) {
             /* If the new entry should be scheduled earlier,
@@ -346,7 +346,7 @@ gboolean avahi_query_scheduler_post(AvahiQueryScheduler *s, AvahiKey *key, gbool
 
         return TRUE;
     } else {
-        g_message("Accepted new query job.\n");
+/*         avahi_log_debug("Accepted new query job.\n"); */
 
         qj = job_new(s, key, FALSE);
         qj->delivery = tv;
@@ -367,13 +367,13 @@ void avahi_query_scheduler_incoming(AvahiQueryScheduler *s, AvahiKey *key) {
      * "DUPLICATE QUESTION SUPPRESION". */
 
     if ((qj = find_scheduled_job(s, key))) {
-        g_message("Query suppressed by distributed duplicate suppression");
+/*         avahi_log_debug("Query suppressed by distributed duplicate suppression"); */
         job_mark_done(s, qj);
         return;
     }
     
     qj = job_new(s, key, TRUE);
-    g_get_current_time(&qj->delivery);
+    gettimeofday(&qj->delivery, NULL);
     job_set_elapse_time(s, qj, AVAHI_QUERY_HISTORY_MSEC, 0);
 }