800. [bug] dnssec-signzone produced incorrect statistics for

			large zones.  [RT #1133]

diff --git a/CHANGES b/CHANGES
index ae372f73580b37fa14d8b153bd1787b0b8cc59a8..0729a14727411099fe784c7c25ce4c7b416098db 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 800.  [bug]           dnssec-signzone produced incorrect statistics for
+                       large zones.  [RT #1133]
+
  799.  [bug]           The ADB didn't find AAAA glue in a zone unless A6
                        glue was also present.
 

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index c26299c764f9fa2b539dbbb573075e0b719b00e1..95307b214065bb225ee650b055324c229d0e0370 100644 (file)
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dnssec-signzone.c,v 1.133 2001/03/27 23:43:13 bwelling Exp $ */
+/* $Id: dnssec-signzone.c,v 1.134 2001/03/30 18:02:34 bwelling Exp $ */
 
 #include <config.h>
 
@@ -1795,8 +1795,8 @@ main(int argc, char *argv[]) {
 
        if (printstats) {
                isc_uint64_t runtime_us;   /* Runtime in microseconds */
-               isc_uint64_t runtime_100s; /* Same in hundredths of seconds */
-               isc_uint64_t sigs_100s;    /* Signatures per 100 seconds */
+               isc_uint64_t runtime_ms;   /* Runtime in milliseconds */
+               isc_uint64_t sig_ms;       /* Signatures per millisecond */
 
                isc_time_now(&timer_finish);
 
@@ -1812,16 +1812,16 @@ main(int argc, char *argv[]) {
                       nverified);
                printf("Signatures unsuccessfully verified: %10d\n",
                       nverifyfailed);
-#define MICROSECONDS 1000000
-               runtime_100s = 100 * runtime_us / MICROSECONDS;
-               printf("Runtime in seconds:                 %7u.%02u\n", 
-                      (unsigned int) (runtime_100s / 100), 
-                      (unsigned int) (runtime_100s % 100));
+               runtime_ms = runtime_us / 1000;
+               printf("Runtime in seconds:                %7u.%03u\n", 
+                      (unsigned int) (runtime_ms / 1000), 
+                      (unsigned int) (runtime_ms % 1000));
                if (runtime_us > 0) {
-                       sigs_100s = nsigned * 100 * MICROSECONDS / runtime_us;
-                       printf("Signatures per second:              %7u.%02u\n", 
-                              (unsigned int) sigs_100s / 100, 
-                              (unsigned int) sigs_100s % 100);
+                       sig_ms = ((isc_uint64_t)nsigned * 1000000000) /
+                                runtime_us;
+                       printf("Signatures per second:             %7u.%03u\n",
+                              (unsigned int) sig_ms / 1000, 
+                              (unsigned int) sig_ms % 1000);
                }
        }