Remove --with-tuning=small/large configuration option

The last remaining tuning value was RESOLVER_NTASKS and instead of
having variable number of the tasks per-cpu and in named and in
dns_client, set the number of the resolver tasks to 523 (number taken
from dns_client unit) to accomodate most of the recursive-clients
values.

diff --git a/bin/named/server.c b/bin/named/server.c
index a0a28c04a3705099c13ade9a2903a75203c1e1b5..8ce865f2c7b8fe6e7674f1c89a50f97bc7ae4078 100644 (file)
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -155,11 +155,7 @@
 #define SIZE_AS_PERCENT ((size_t)-2)
 #endif /* ifndef SIZE_AS_PERCENT */
 
-#ifdef TUNE_LARGE
-#define RESOLVER_NTASKS_PERCPU 32
-#else
-#define RESOLVER_NTASKS_PERCPU 8
-#endif /* TUNE_LARGE */
+#define RESOLVER_NTASKS 523
 
 /* RFC7828 defines timeout as 16-bit value specified in units of 100
  * milliseconds, so the maximum and minimum advertised and keepalive
@@ -4885,10 +4881,10 @@ configure_view(dns_view_t *view, dns_viewlist_t *viewlist, cfg_obj_t *config,
        dns_view_setresquerystats(view, resquerystats);
 
        ndisp = 4 * ISC_MIN(named_g_udpdisp, MAX_UDP_DISPATCH);
-       CHECK(dns_view_createresolver(
-               view, named_g_taskmgr, RESOLVER_NTASKS_PERCPU * named_g_cpus,
-               ndisp, named_g_netmgr, named_g_timermgr, resopts,
-               named_g_dispatchmgr, dispatch4, dispatch6));
+       CHECK(dns_view_createresolver(view, named_g_taskmgr, RESOLVER_NTASKS,
+                                     ndisp, named_g_netmgr, named_g_timermgr,
+                                     resopts, named_g_dispatchmgr, dispatch4,
+                                     dispatch6));
 
        /*
         * Set the ADB cache size to 1/8th of the max-cache-size or

diff --git a/configure.ac b/configure.ac
index 52da609c89d45f32f368feebf9c17cd49fcceece..9e61a670adca1c175546b19650720ef45918421e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1313,20 +1313,6 @@ AS_IF([test "$with_jemalloc" = "no"],
 
 AM_CONDITIONAL([HAVE_JEMALLOC], [test "$with_jemalloc" = "yes"])
 
-#
-# was --with-tuning specified?
-#
-# [pairwise: --with-tuning=small, --without-tuning]
-AC_ARG_WITH([tuning],
-           AS_HELP_STRING([--with-tuning=ARG],
-                          [Specify server tuning (default or small)]),
-           [],[with_tuning=no])
-
-AS_CASE([$with_tuning],
-       [small],[AC_MSG_NOTICE(using small system tuning)],
-       [AC_DEFINE(TUNE_LARGE, 1, [Define to use default system tuning.])
-        AC_MSG_NOTICE(using default system tuning)])
-
 #
 # was --enable-querytrace or --enable-singletrace specified?
 #
@@ -1576,7 +1562,6 @@ report() {
     if test "yes" = "$enable_full_report" -o "standard" = "$with_locktype"; then
        echo "    Mutex lock type: $with_locktype"
     fi
-    test "small" = "$with_tuning" && echo "    Small-system tuning (--with-tuning)"
     test "no" = "$enable_dnstap" || \
            echo "    Allow 'dnstap' packet logging (--enable-dnstap)"
     test -z "$MAXMINDDB_LIBS" || echo "    GeoIP2 access control (--enable-geoip)"
@@ -1621,7 +1606,6 @@ report() {
       echo "    +------------------------------------------+"
       echo
     fi
-    test "small" = "$with_tuning" || echo "    Small-system tuning (--with-tuning)"
 
     test "no" = "$enable_dnstap" && \
            echo "    Allow 'dnstap' packet logging (--enable-dnstap)"

diff --git a/lib/dns/client.c b/lib/dns/client.c
index 636dca712f7f3290a2e4358da9c7f9a1b6068a29..ed6bf0e0cbd1f3a9edfe43ff055f0aaea683b410 100644 (file)
--- a/lib/dns/client.c
+++ b/lib/dns/client.c
@@ -60,11 +60,7 @@
 #define UCTX_MAGIC    ISC_MAGIC('U', 'c', 't', 'x')
 #define UCTX_VALID(c) ISC_MAGIC_VALID(c, UCTX_MAGIC)
 
-#ifdef TUNE_LARGE
 #define RESOLVER_NTASKS 523
-#else /* ifdef TUNE_LARGE */
-#define RESOLVER_NTASKS 31
-#endif /* TUNE_LARGE */
 
 #define CHECK(r)                             \
        do {                                 \

diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c
index 909681009763e773314526fa98556a1aa11bd49f..22465b35c38d6408ce73977c42c7d5459d1cafb9 100644 (file)
--- a/lib/ns/interfacemgr.c
+++ b/lib/ns/interfacemgr.c
@@ -54,12 +54,6 @@
 
 #define LISTENING(ifp) (((ifp)->flags & NS_INTERFACEFLAG_LISTENING) != 0)
 
-#ifdef TUNE_LARGE
-#define UDPBUFFERS 32768
-#else /* ifdef TUNE_LARGE */
-#define UDPBUFFERS 1000
-#endif /* TUNE_LARGE */
-
 #define IFMGR_MAGIC             ISC_MAGIC('I', 'F', 'M', 'G')
 #define NS_INTERFACEMGR_VALID(t) ISC_MAGIC_VALID(t, IFMGR_MAGIC)