From: Libor Peltan <libor.peltan@nic.cz>
Date: Wed, 29 Apr 2020 16:10:10 +0000 (+0200)
Subject: adjust: no point in parallelizing this one
X-Git-Tag: v3.0.0~106^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8baec1ec4c01f70d29c8a3c03dfbe37c1c3bfb4c;p=thirdparty%2Fknot-dns.git

adjust: no point in parallelizing this one
---

diff --git a/src/knot/zone/zone-load.c b/src/knot/zone/zone-load.c
index 8db35e1bb3..5799c5a210 100644
--- a/src/knot/zone/zone-load.c
+++ b/src/knot/zone/zone-load.c
@@ -33,10 +33,9 @@ int zone_load_contents(conf_t *conf, const knot_dname_t *zone_name,
 
 	char *zonefile = conf_zonefile(conf, zone_name);
 	conf_val_t val = conf_zone_get(conf, C_SEM_CHECKS, zone_name);
-	conf_val_t thr = conf_zone_get(conf, C_ADJUST_THR, zone_name);
 
 	zloader_t zl;
-	int ret = zonefile_open(&zl, zonefile, zone_name, conf_bool(&val), conf_int(&thr), time(NULL));
+	int ret = zonefile_open(&zl, zonefile, zone_name, conf_bool(&val), time(NULL));
 	free(zonefile);
 	if (ret != KNOT_EOK) {
 		return ret;
diff --git a/src/knot/zone/zonefile.c b/src/knot/zone/zonefile.c
index ecff32d4db..5dd20abaa2 100644
--- a/src/knot/zone/zonefile.c
+++ b/src/knot/zone/zonefile.c
@@ -137,8 +137,7 @@ static void process_data(zs_scanner_t *scanner)
 }
 
 int zonefile_open(zloader_t *loader, const char *source,
-                  const knot_dname_t *origin, bool semantic_checks,
-                  unsigned adjusting_threads, time_t time)
+                  const knot_dname_t *origin, bool semantic_checks, time_t time)
 {
 	if (!loader) {
 		return KNOT_EINVAL;
@@ -186,7 +185,6 @@ int zonefile_open(zloader_t *loader, const char *source,
 	loader->source = strdup(source);
 	loader->creator = zc;
 	loader->semantic_checks = semantic_checks;
-	loader->adjust_threads = adjusting_threads;
 	loader->time = time;
 
 	return KNOT_EOK;
@@ -228,7 +226,8 @@ zone_contents_t *zonefile_load(zloader_t *loader)
 		goto fail;
 	}
 
-	ret = zone_adjust_contents(zc->z, adjust_cb_flags_and_nsec3, adjust_cb_nsec3_flags, true, true, 1, NULL);
+	ret = zone_adjust_contents(zc->z, adjust_cb_flags_and_nsec3, adjust_cb_nsec3_flags,
+	                           true, true, 1, NULL);
 	if (ret != KNOT_EOK) {
 		ERROR(zname, "failed to finalize zone contents (%s)",
 		      knot_strerror(ret));
@@ -246,7 +245,8 @@ zone_contents_t *zonefile_load(zloader_t *loader)
 
 	/* The contents will now change possibly messing up NSEC3 tree, it will
 	   be adjusted again at zone_update_commit. */
-	ret = zone_adjust_contents(zc->z, unadjust_cb_point_to_nsec3, NULL, false, false, loader->adjust_threads, NULL);
+	ret = zone_adjust_contents(zc->z, unadjust_cb_point_to_nsec3, NULL,
+	                           false, false, 1, NULL);
 	if (ret != KNOT_EOK) {
 		ERROR(zname, "failed to finalize zone contents (%s)",
 		      knot_strerror(ret));
diff --git a/src/knot/zone/zonefile.h b/src/knot/zone/zonefile.h
index 1b40e47fdb..df7c161fe7 100644
--- a/src/knot/zone/zonefile.h
+++ b/src/knot/zone/zonefile.h
@@ -37,7 +37,6 @@ typedef struct zcreator {
 typedef struct {
 	char *source;                /*!< Zone source file. */
 	bool semantic_checks;        /*!< Do semantic checks. */
-	unsigned adjust_threads;     /*!< Parallelize adjusting. */
 	sem_handler_t *err_handler;  /*!< Semantic checks error handler. */
 	zcreator_t *creator;         /*!< Loader context. */
 	zs_scanner_t scanner;        /*!< Zone scanner. */
@@ -54,15 +53,13 @@ void err_handler_logger(sem_handler_t *handler, const zone_contents_t *zone,
  * \param source Source file name.
  * \param origin Zone origin.
  * \param semantic_checks Perform semantic checks.
- * \param adjusting_threads Paralellize adjusting.
  * \param time Time for semantic check.
  *
  * \retval Initialized loader on success.
  * \retval NULL on error.
  */
 int zonefile_open(zloader_t *loader, const char *source,
-                  const knot_dname_t *origin, bool semantic_checks,
-                  unsigned adjusting_threads, time_t time);
+                  const knot_dname_t *origin, bool semantic_checks, time_t time);
 
 /*!
  * \brief Loads zone from a zone file.
diff --git a/src/utils/kzonecheck/zone_check.c b/src/utils/kzonecheck/zone_check.c
index 67618eebee..1b32736e0d 100644
--- a/src/utils/kzonecheck/zone_check.c
+++ b/src/utils/kzonecheck/zone_check.c
@@ -71,7 +71,7 @@ int zone_check(const char *zone_file, const knot_dname_t *zone_name,
 	};
 
 	zloader_t zl;
-	int ret = zonefile_open(&zl, zone_file, zone_name, true, 1, time);
+	int ret = zonefile_open(&zl, zone_file, zone_name, true, time);
 	if (ret != KNOT_EOK) {
 		return ret;
 	}