Corrected computation on new queue-size parameters

Unidata · Nov 25, 2023 · f1d094f · f1d094f
1 parent fbc0afa
commit f1d094f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGE_LOG b/CHANGE_LOG
@@ -1,3 +1,7 @@
+6.15.0.14
+    ldmadmin(1):
+        * Corrected computation of new queue-size parameters.
+
 6.15.0.13       2023-11-14T13:13:01-0700
     ldmadmin(1):
         * Corrected syntax errors in vetQueueSize().

diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with automake to produce a configure script
 dnl Requires ./aclocal.m4
 dnl
 AC_PREREQ([2.69])
-AC_INIT([LDM],[6.15.0.13],[support-ldm@unidata.ucar.edu],[],[http://www.unidata.ucar.edu/software/ldm])
+AC_INIT([LDM],[6.15.0.14],[support-ldm@unidata.ucar.edu],[],[http://www.unidata.ucar.edu/software/ldm])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([config.h.in])

diff --git a/scripts/ldmadmin.pl.in b/scripts/ldmadmin.pl.in
@@ -1197,7 +1197,9 @@ sub computeNewQueueSize
     my $newSlotCount;
     if (0 < $minVirtResTime) {
         # Cap the increase at the Golden Ratio
-        my $ratio = min(1.618, double($max_latency)/double($minVirtResTime));
+        my $ratio = $max_latency/$minVirtResTime;
+        $ratio = $ratio < 1.618 ? $ratio : 1.618;
+
         $newByteCount = int($ratio*$mvrtSize);
         $newSlotCount = int($ratio*$mvrtSlots);
     }