You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by re...@apache.org on 2002/05/01 23:17:18 UTC
cvs commit: httpd-2.0/support ab.c
rederpj 02/05/01 14:17:18
Modified: . CHANGES
support ab.c
Log:
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
Revision Changes Path
1.754 +4 -0 httpd-2.0/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/httpd-2.0/CHANGES,v
retrieving revision 1.753
retrieving revision 1.754
diff -u -r1.753 -r1.754
--- CHANGES 1 May 2002 20:03:14 -0000 1.753
+++ CHANGES 1 May 2002 21:17:18 -0000 1.754
@@ -2,6 +2,10 @@
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]
1.100 +6 -6 httpd-2.0/support/ab.c
Index: ab.c
===================================================================
RCS file: /home/cvs/httpd-2.0/support/ab.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- ab.c 30 Apr 2002 01:29:11 -0000 1.99
+++ ab.c 1 May 2002 21:17:18 -0000 1.100
@@ -517,9 +517,9 @@
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 @@
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 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><%s></i> apache-2.0<br>\n", AP_AB_BASEREVISION, "$Revision: 1.99 $");
+ printf(" This is ApacheBench, Version %s <i><%s></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");