- For dnstap, do not wakeupnow right there. Instead zero the timer to

  force the wakeup callback asap.

diff --git a/dnstap/dtstream.c b/dnstap/dtstream.c
index 14aacaef567b7bad95fe60ee8c468737d19a46f8..a1dd9703ea95e927dc3326be07369108d212b0ee 100644 (file)
--- a/dnstap/dtstream.c
+++ b/dnstap/dtstream.c
@@ -188,9 +188,9 @@ mq_wakeup_cb(void* arg)
 
 /** start timer to wakeup dtio because there is content in the queue */
 static void
-dt_msg_queue_start_timer(struct dt_msg_queue* mq)
+dt_msg_queue_start_timer(struct dt_msg_queue* mq, int wakeupnow)
 {
-       struct timeval tv;
+       struct timeval tv = {0};
        /* Start a timer to process messages to be logged.
         * If we woke up the dtio thread for every message, the wakeup
         * messages take up too much processing power.  If the queue
@@ -204,19 +204,26 @@ dt_msg_queue_start_timer(struct dt_msg_queue* mq)
 
        /* do not start the timer if a timer already exists, perhaps
         * in another worker.  So this variable is protected by a lock in
-        * dtio */
+        * dtio. */
+
+       /* If we need to wakeupnow, 0 the timer to force the callback. */
        lock_basic_lock(&mq->dtio->wakeup_timer_lock);
        if(mq->dtio->wakeup_timer_enabled) {
+               if(wakeupnow) {
+                       comm_timer_set(mq->wakeup_timer, &tv);
+               }
                lock_basic_unlock(&mq->dtio->wakeup_timer_lock);
                return;
        }
        mq->dtio->wakeup_timer_enabled = 1; /* we are going to start one */
-       lock_basic_unlock(&mq->dtio->wakeup_timer_lock);
 
        /* start the timer, in mq, in the event base of our worker */
-       tv.tv_sec = 1;
-       tv.tv_usec = 0;
+       if(!wakeupnow) {
+               tv.tv_sec = 1;
+               tv.tv_usec = 0;
+       }
        comm_timer_set(mq->wakeup_timer, &tv);
+       lock_basic_unlock(&mq->dtio->wakeup_timer_lock);
 }
 
 void
@@ -283,10 +290,8 @@ dt_msg_queue_submit(struct dt_msg_queue* mq, void* buf, size_t len)
        /* release lock */
        lock_basic_unlock(&mq->lock);
 
-       if(wakeupnow) {
-               dtio_wakeup(mq->dtio);
-       } else if(wakeupstarttimer) {
-               dt_msg_queue_start_timer(mq);
+       if(wakeupnow || wakeupstarttimer) {
+               dt_msg_queue_start_timer(mq, wakeupnow);
        }
 }
 

diff --git a/doc/Changelog b/doc/Changelog
index be52208c841274aa048ff973ebcdafb9f4c750ad..db7ce1f279458ad56b9309025d12f2c3fa2a5c6b 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+19 January 2022: George
+       - For dnstap, do not wakeupnow right there. Instead zero the timer to
+         force the wakeup callback asap.
+
 14 January 2022: George
        - Merge PR #605:
          - Fix EDNS to upstream where the same option could be attached