Fix some minor formatting issues with ab. Part of this is

     in reference to PR 8544, the rest I noticed while testing
     the PR fix. [Paul J. Reder]

Submitted By: Carlo Marcelo Arenas Belon
Reviewed By:  Paul J. Reder

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94898 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 37bc580df5f5522dbaf2b84ae8f98eb166f9e58b..e6f034b0262d0a727ef4384db1229f186ce94b08 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@ Changes with Apache 2.0.37
 
 Changes with Apache 2.0.36
 
+  *) Fix some minor formatting issues with ab. Part of this is
+     in reference to PR 8544, the rest I noticed while testing
+     the PR fix. [Paul J. Reder]
+
   *) Fix a case where an invalid pass phrase is entered and an
      error message is given, but the prompt is not shown again.
      This left the user in an ambiguous state. PR 8320 [Paul J. Reder]

diff --git a/support/ab.c b/support/ab.c
index fdcc49300745edf634c2d83044ccc82f06f20467..82b2b997fc4a8896ec9dc5ea15010d4ba200621a 100644 (file)
--- a/support/ab.c
+++ b/support/ab.c
@@ -517,9 +517,9 @@ static void output_results(void)
        printf("Requests per second:    %.2f [#/sec] (mean)\n", 
                (float) (done / timetaken));
        printf("Time per request:       %.3f [ms] (mean)\n", 
-               (float) (concurrency * timetaken / done));
+               (float) (1000 * concurrency * timetaken / done));
        printf("Time per request:       %.3f [ms] (mean, across all concurrent requests)\n",
-              (float) (timetaken / done));
+              (float) (1000 * timetaken / done));
        printf("Transfer rate:          %.2f [Kbytes/sec] received\n",
               (float) (totalread / 1024 / timetaken));
        if (posting > 0) {
@@ -645,8 +645,8 @@ static void output_results(void)
        printf("\nConnection Times (ms)\n");
 
        if (confidence) {
-#define CONF_FMT_STRING "%" APR_TIME_T_FMT " %5d %6.1f %" APR_TIME_T_FMT " %" APR_TIME_T_FMT "\n"
-           printf("            min  mean[+/-sd] median   max\n");
+#define CONF_FMT_STRING "%5" APR_TIME_T_FMT " %4d %5.1f %6" APR_TIME_T_FMT " %7" APR_TIME_T_FMT "\n"
+           printf("              min  mean[+/-sd] median   max\n");
            printf("Connect:    " CONF_FMT_STRING, 
                    mincon, (int) (totalcon + 0.5), sdcon, meancon, maxcon);
            printf("Processing: " CONF_FMT_STRING,
@@ -1329,14 +1329,14 @@ static void test(void)
 static void copyright(void)
 {
     if (!use_html) {
-       printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.99 $> apache-2.0");
+       printf("This is ApacheBench, Version %s\n", AP_AB_BASEREVISION " <$Revision: 1.100 $> apache-2.0");
        printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
        printf("Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/\n");
        printf("\n");
     }
     else {
        printf("<p>\n");
-       printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.99 $");
+       printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.100 $");
        printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
        printf(" Copyright (c) 1998-2002 The Apache Software Foundation, http://www.apache.org/<br>\n");
        printf("</p>\n<p>\n");