diff options
author | Martin Schanzenbach <schanzen@gnunet.org> | 2022-11-22 15:14:59 +0900 |
---|---|---|
committer | Martin Schanzenbach <schanzen@gnunet.org> | 2022-11-22 15:14:59 +0900 |
commit | 10c6ab25158571ea5224c88df66ec9b0177ea9b5 (patch) | |
tree | 079c632f0cac22985e52db043edea1dcd4f78e36 /src/zonemaster/gnunet-service-zonemaster.c | |
parent | e0aa0e3768090f600d476ba0b4c3a78446f42886 (diff) | |
download | gnunet-10c6ab25158571ea5224c88df66ec9b0177ea9b5.tar.gz gnunet-10c6ab25158571ea5224c88df66ec9b0177ea9b5.zip |
-only use check zone iterator function
Diffstat (limited to 'src/zonemaster/gnunet-service-zonemaster.c')
-rw-r--r-- | src/zonemaster/gnunet-service-zonemaster.c | 14 |
1 files 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 | |||
@@ -117,11 +117,6 @@ static pthread_cond_t sign_jobs_cond; | |||
117 | static int in_shutdown = GNUNET_NO; | 117 | static int in_shutdown = GNUNET_NO; |
118 | 118 | ||
119 | /** | 119 | /** |
120 | * Iterator halted? | ||
121 | */ | ||
122 | static int iterator_halted = GNUNET_NO; | ||
123 | |||
124 | /** | ||
125 | * Monitor halted? | 120 | * Monitor halted? |
126 | */ | 121 | */ |
127 | static int monitor_halted = GNUNET_NO; | 122 | static int monitor_halted = GNUNET_NO; |
@@ -746,7 +741,6 @@ check_zone_namestore_next () | |||
746 | "Job queue length exceeded (%u/%u). Pausing namestore iteration.\n", | 741 | "Job queue length exceeded (%u/%u). Pausing namestore iteration.\n", |
747 | job_queue_length, | 742 | job_queue_length, |
748 | JOB_QUEUE_LIMIT); | 743 | JOB_QUEUE_LIMIT); |
749 | iterator_halted = GNUNET_YES; | ||
750 | return; | 744 | return; |
751 | } | 745 | } |
752 | update_velocity (put_cnt); | 746 | update_velocity (put_cnt); |
@@ -787,14 +781,10 @@ dht_put_continuation (void *cls) | |||
787 | "PUT complete; Pending jobs: %u\n", job_queue_length - 1); | 781 | "PUT complete; Pending jobs: %u\n", job_queue_length - 1); |
788 | /* When we just fall under the limit, trigger monitor/iterator again | 782 | /* When we just fall under the limit, trigger monitor/iterator again |
789 | * if halted. We can only safely trigger one, prefer iterator. */ | 783 | * if halted. We can only safely trigger one, prefer iterator. */ |
784 | check_zone_namestore_next (); | ||
790 | if (job_queue_length <= JOB_QUEUE_LIMIT) | 785 | if (job_queue_length <= JOB_QUEUE_LIMIT) |
791 | { | 786 | { |
792 | if (GNUNET_YES == iterator_halted) | 787 | if (GNUNET_YES == monitor_halted) |
793 | { | ||
794 | check_zone_namestore_next (); | ||
795 | iterator_halted = GNUNET_NO; | ||
796 | } | ||
797 | else if (GNUNET_YES == monitor_halted) | ||
798 | { | 788 | { |
799 | GNUNET_NAMESTORE_zone_monitor_next (zmon, 1); | 789 | GNUNET_NAMESTORE_zone_monitor_next (zmon, 1); |
800 | monitor_halted = GNUNET_NO; | 790 | monitor_halted = GNUNET_NO; |