Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 3 Apr 2001 01:43:18 -0000
Message-ID: <20010403014318.33097.qmail@apache.org>
From: dirkx@apache.org
To: apache-1.3-cvs@apache.org
Subject: cvs commit: apache-1.3/src/support ab.c

dirkx       01/04/02 18:43:17

  Modified:    src/support ab.c
  Log:
  Doing last minute alphabettically sorting things to look nice is not always a good idea.
  
  Revision  Changes    Path
  1.48      +9 -8      apache-1.3/src/support/ab.c
  
  Index: ab.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/support/ab.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -u -r1.47 -r1.48
  --- ab.c	2001/04/02 06:25:42	1.47
  +++ ab.c	2001/04/03 01:43:09	1.48
  @@ -627,18 +627,19 @@
   	    meand = stats[requests / 2].time - stats[requests / 2].ctime;
   
   	qsort(stats, requests, sizeof(struct data),
  -	      (int (*) (const void *, const void *)) comprando);
  +	      (int (*) (const void *, const void *)) compwait);
   	if ((requests > 1) && (requests % 2))
  -	    meantot = (stats[requests / 2].time + stats[requests / 2 + 1].time) / 2;
  +	    meanwait = (stats[requests / 2].waittime + stats[requests / 2 + 1].waittime) / 2;
   	else
  -	    meantot = stats[requests / 2].time;
  +	    meanwait = stats[requests / 2].waittime;
   
   	qsort(stats, requests, sizeof(struct data),
  -	      (int (*) (const void *, const void *)) compwait);
  +	      (int (*) (const void *, const void *)) comprando);
   	if ((requests > 1) && (requests % 2))
  -	    meanwait = (stats[requests / 2].waittime + stats[requests / 2 + 1].waittime) / 2;
  +	    meantot = (stats[requests / 2].time + stats[requests / 2 + 1].time) / 2;
   	else
  -	    meanwait = stats[requests / 2].waittime;
  +	    meantot = stats[requests / 2].time;
  +
   
   	printf("\nConnnection Times (ms)\n");
   
  @@ -1322,14 +1323,14 @@
   static void copyright(void)
   {
       if (!use_html) {
  -	printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.47 $> apache-1.3");
  +	printf("This is ApacheBench, Version %s\n", VERSION " <$Revision: 1.48 $> apache-1.3");
   	printf("Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/\n");
   	printf("Copyright (c) 1998-1999 The Apache Group, http://www.apache.org/\n");
   	printf("\n");
       }
       else {
   	printf("<p>\n");
  -	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-1.3<br>\n", VERSION, "$Revision: 1.47 $");
  +	printf(" This is ApacheBench, Version %s <i>&lt;%s&gt;</i> apache-1.3<br>\n", VERSION, "$Revision: 1.48 $");
   	printf(" Copyright (c) 1996 Adam Twiss, Zeus Technology Ltd, http://www.zeustech.net/<br>\n");
   	printf(" Copyright (c) 1998-1999 The Apache Group, http://www.apache.org/<br>\n");
   	printf("</p>\n<p>\n");