[gnunet] branch master updated: -only use check zone iterator function

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

The following commit(s) were added to refs/heads/master by this push:
     new 10c6ab251 -only use check zone iterator function
10c6ab251 is described below

commit 10c6ab25158571ea5224c88df66ec9b0177ea9b5
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Tue Nov 22 15:14:59 2022 +0900

    -only use check zone iterator function
---
 src/zonemaster/gnunet-service-zonemaster.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/zonemaster/gnunet-service-zonemaster.c 
b/src/zonemaster/gnunet-service-zonemaster.c
index 33415c6f9..6492fed80 100644
--- a/src/zonemaster/gnunet-service-zonemaster.c
+++ b/src/zonemaster/gnunet-service-zonemaster.c
@@ -116,11 +116,6 @@ static pthread_cond_t sign_jobs_cond;
  */
 static int in_shutdown = GNUNET_NO;
 
-/**
- * Iterator halted?
- */
-static int iterator_halted = GNUNET_NO;
-
 /**
  * Monitor halted?
  */
@@ -746,7 +741,6 @@ check_zone_namestore_next ()
                 "Job queue length exceeded (%u/%u). Pausing namestore 
iteration.\n",
                 job_queue_length,
                 JOB_QUEUE_LIMIT);
-    iterator_halted = GNUNET_YES;
     return;
   }
   update_velocity (put_cnt);
@@ -787,14 +781,10 @@ dht_put_continuation (void *cls)
               "PUT complete; Pending jobs: %u\n", job_queue_length - 1);
   /* When we just fall under the limit, trigger monitor/iterator again
    * if halted. We can only safely trigger one, prefer iterator. */
+  check_zone_namestore_next ();
   if (job_queue_length <= JOB_QUEUE_LIMIT)
   {
-    if (GNUNET_YES == iterator_halted)
-    {
-      check_zone_namestore_next ();
-      iterator_halted = GNUNET_NO;
-    }
-    else if (GNUNET_YES == monitor_halted)
+    if (GNUNET_YES == monitor_halted)
     {
       GNUNET_NAMESTORE_zone_monitor_next (zmon, 1);
       monitor_halted = GNUNET_NO;

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.