This syncs up Unix with Win32 (wow!) as far as having APR_INT64_T_FMT.
include/apr.hw has it defined, but include/apr.h doesn't. This is a
first pass at getting the logic right.
Does anyone have any ideas for mimicing LLONG_MAX on machines that
don't have limits.h? I dread using the 999999 that was there before in
ab - I'd like to replace this with something more sane. We could do:
#ifndef LLONG_MAX
#define APR_INT64_MAX 0x7fffffffffffffffLL
#else
#define APR_INT64_MAX LLONG_MAX
#endif
This LLONG_MAX values come from /usr/include/machine/limits.h on FreeBSD
(is this accurate?). That seems like cheese though...
This should allow this modified httpd-2.0/support/ab.c (based on my earlier
patch to new-httpd but modified to use APR_TIME_T_FMT) to compile without
warnings on both Solaris/Sparc and Win32.
Since I don't have a Win32 compiler available, if someone can let me know
how this works on there. Shouldn't get much different than Solaris/Sparc
and Win32/Intel. =-) -- justin
Index: configure.in
===================================================================
RCS file: /home/cvspublic/apr/configure.in,v
retrieving revision 1.288
diff -u -r1.288 configure.in
--- configure.in 2001/04/09 16:40:19 1.288
+++ configure.in 2001/04/11 23:25:24
@@ -646,6 +646,14 @@
socklen_t_value="int"
fi
+if test "$ac_cv_sizeof_long_long" = "$ac_cv_sizeof_int"; then
+ int64_t_fmt='#define APR_INT64_T_FMT "d"'
+elif test "$ac_cv_sizeof_long_long" = "$ac_cv_sizeof_long"; then
+ int64_t_fmt='#define APR_INT64_T_FMT "ld"'
+else
+ int64_t_fmt='#define APR_INT64_T_FMT "lld"'
+fi
+
APR_CHECK_SIZEOF_EXTENDED([#include <sys/types.h>], ssize_t, 8)
if test "$ac_cv_sizeof_ssize_t" = "$ac_cv_sizeof_int"; then
@@ -720,6 +728,7 @@
AC_SUBST(size_t_value)
AC_SUBST(ssize_t_value)
AC_SUBST(socklen_t_value)
+AC_SUBST(int64_t_fmt)
AC_SUBST(ssize_t_fmt)
AC_SUBST(size_t_fmt)
AC_SUBST(off_t_fmt)
Index: include/apr.h.in
===================================================================
RCS file: /home/cvspublic/apr/include/apr.h.in,v
retrieving revision 1.78
diff -u -r1.78 apr.h.in
--- include/apr.h.in 2001/04/05 18:56:07 1.78
+++ include/apr.h.in 2001/04/11 23:25:24
@@ -243,6 +243,9 @@
/* And APR_OS_PROC_T_FMT */
@os_proc_t_fmt@
+/* And APR_INT64_T_FMT */
[EMAIL PROTECTED]@
+
/* Local machine definition for console and log output. */
#define APR_EOL_STR "@eolstr@"
Index: include/apr.hw
===================================================================
RCS file: /home/cvspublic/apr/include/apr.hw,v
retrieving revision 1.59
diff -u -r1.59 apr.hw
--- include/apr.hw 2001/04/08 08:01:38 1.59
+++ include/apr.hw 2001/04/11 23:25:24
@@ -294,8 +294,6 @@
#define APR_INT64_T_FMT "I64d"
-#define APR_TIME_T_FMT APR_INT64_T_FMT
-
/* Local machine definition for console and log output. */
#define APR_EOL_STR "\r\n"
Index: include/apr_time.h
===================================================================
RCS file: /home/cvspublic/apr/include/apr_time.h,v
retrieving revision 1.34
diff -u -r1.34 apr_time.h
--- include/apr_time.h 2001/04/02 19:00:32 1.34
+++ include/apr_time.h 2001/04/11 23:25:24
@@ -74,6 +74,8 @@
/* number of microseconds since 00:00:00 january 1, 1970 UTC */
typedef apr_int64_t apr_time_t;
+/* printf format key */
+#define APR_TIME_T_FMT APR_INT64_T_FMT
/* mechanism to properly type apr_time_t literals */
#define APR_TIME_C(val) APR_INT64_C(val)
Index: support/ab.c
===================================================================
RCS file: /home/cvspublic/httpd-2.0/support/ab.c,v
retrieving revision 1.69
diff -u -r1.69 ab.c
--- support/ab.c 2001/04/03 16:49:25 1.69
+++ support/ab.c 2001/04/11 23:28:59
@@ -226,13 +226,13 @@
#ifdef USE_SSL
/* XXXX insert SSL timings */
#endif
- int read; /* number of bytes read */
- long starttime; /* start time of connection in seconds since
- * Jan. 1, 1970 */
- long waittime; /* Between writing request and reading
- * response */
- long ctime; /* time in ms to connect */
- long time; /* time in ms for connection */
+ int read; /* number of bytes read */
+ apr_time_t starttime; /* start time of connection in seconds since
+ * Jan. 1, 1970 */
+ apr_interval_time_t waittime; /* Between writing request and reading
+ * response */
+ apr_interval_time_t ctime; /* time in ms to connect */
+ apr_interval_time_t time; /* time in ms for connection */
};
#define ap_min(a,b) ((a)<(b))?(a):(b)
@@ -324,8 +324,6 @@
#endif
static void close_connection(struct connection * c);
-
-static void close_connection(struct connection * c);
/* --------------------------------------------------------- */
/* simple little function to write an error string and exit */
@@ -430,8 +428,8 @@
static int compri(struct data * a, struct data * b)
{
- int p = a->time - a->ctime;
- int q = b->time - b->ctime;
+ apr_interval_time_t p = a->time - a->ctime;
+ apr_interval_time_t q = b->time - b->ctime;
if (p < q)
return -1;
if (p > q)
@@ -450,11 +448,13 @@
static void output_results(void)
{
- long timetaken;
+ apr_interval_time_t timetakenusec;
+ float timetaken;
endtime = apr_time_now();
- timetaken = (endtime - start) / 1000;
-
+ timetakenusec = endtime - start;
+ timetaken = (float) timetakenusec / APR_USEC_PER_SEC;
+
printf("\r
\r");
printf("Server Software: %s\n", servername);
printf("Server Hostname: %s\n", hostname);
@@ -464,8 +464,9 @@
printf("Document Length: %d bytes\n", doclen);
printf("\n");
printf("Concurrency Level: %d\n", concurrency);
- printf("Time taken for tests: %qd.%03qd seconds\n",
- timetaken / APR_USEC_PER_SEC, timetaken % APR_USEC_PER_SEC);
+ printf("Time taken for tests: %" APR_TIME_T_FMT ".%03" APR_TIME_T_FMT "
seconds\n",
+ (apr_interval_time_t) timetakenusec / APR_USEC_PER_SEC,
+ (apr_interval_time_t) timetakenusec % APR_USEC_PER_SEC);
printf("Complete requests: %ld\n", done);
printf("Failed requests: %ld\n", bad);
if (bad)
@@ -483,17 +484,17 @@
/* avoid divide by zero */
if (timetaken) {
- printf("Requests per second: %.2f [#/sec] (mean)\n", 1000 * (float)
(done) / timetaken);
- printf("Time per request: %.2f [ms] (mean)\n", concurrency *
timetaken / (float) done);
- printf("Time per request: %.2f [ms] (mean, across all concurent
requests)\n",
- timetaken / (float) done);
+ printf("Requests per second: %.2f [#/sec] (mean)\n", done /
timetaken);
+ printf("Time per request: %.3f [ms] (mean)\n", concurrency *
timetaken / done);
+ printf("Time per request: %.3f [ms] (mean, across all concurent
requests)\n",
+ timetaken / done);
printf("Transfer rate: %.2f [Kbytes/sec] received\n",
- (float) (totalread) / timetaken);
+ totalread / 1024 / timetaken);
if (posting > 0) {
printf(" %.2f kb/s sent\n",
- (float) (totalposted) / timetaken);
+ (float) totalposted / timetaken / 1024);
printf(" %.2f kb/s total\n",
- (float) (totalread + totalposted) / timetaken);
+ (float) (totalread + totalposted) / timetaken / 1024);
}
}
@@ -501,19 +502,19 @@
/* work out connection times */
long i;
double totalcon = 0, total = 0, totald = 0, totalwait = 0;
- long mincon = 9999999, mintot = 999999, mind = 99999, minwait = 99999;
- long maxcon = 0, maxtot = 0, maxd = 0, maxwait = 0;
- long meancon = 0, meantot = 0, meand = 0, meanwait = 0;
- double sdtot = 0, sdcon = 0, sdd = 0, sdwait = 0;
+ apr_interval_time_t mincon = LLONG_MAX, mintot = LLONG_MAX,
+ mind = LLONG_MAX, minwait = LLONG_MAX;
+ apr_interval_time_t maxcon = 0, maxtot = 0, maxd = 0, maxwait = 0;
+ apr_interval_time_t meancon = 0, meantot = 0, meand = 0, meanwait = 0;
+ double sdtot = 0, sdcon = 0, sdd = 0, sdwait = 0;
for (i = 0; i < requests; i++) {
struct data s = stats[i];
mincon = ap_min(mincon, s.ctime);
mintot = ap_min(mintot, s.time);
- mind = ap_min(mintot, s.time - s.ctime);
+ mind = ap_min(mind, s.time - s.ctime);
minwait = ap_min(minwait, s.waittime);
- maxtot = ap_max(maxtot, s.time);
maxcon = ap_max(maxcon, s.ctime);
maxtot = ap_max(maxtot, s.time);
maxd = ap_max(maxd, s.time - s.ctime);
@@ -531,7 +532,7 @@
for (i = 0; i < requests; i++) {
struct data s = stats[i];
- int a;
+ apr_interval_time_t a;
a = (s.time - total);
sdtot += a * a;
a = (s.ctime - totalcon);
@@ -550,7 +551,7 @@
if (gnuplot) {
FILE *out = fopen(gnuplot, "w");
long i;
- long sttime;
+ apr_time_t sttime;
char tmstring[1024];/* XXXX */
if (!out) {
perror("Cannot open gnuplot output file");
@@ -563,7 +564,7 @@
tmstring[strlen(tmstring) - 1] = '\0'; /* ctime returns a
* string with a
* trailing newline */
- fprintf(out, "%s\t%ld\t%ld\t%ld\t%ld\t%ld\n",
+ fprintf(out, "%s\t%" APR_TIME_T_FMT "\t%" APR_TIME_T_FMT "\t%"
APR_TIME_T_FMT "\t%" APR_TIME_T_FMT "\t%" APR_TIME_T_FMT "\n",
tmstring,
sttime,
stats[i].ctime,
@@ -573,11 +574,11 @@
}
fclose(out);
};
- /*
- * XXX: what is better; this hideous cast of the copare function; or
- * the four warnings during compile ? dirkx just does not know and
- * hates both/
- */
+ /*
+ * XXX: what is better; this hideous cast of the copare function; or
+ * the four warnings during compile ? dirkx just does not know and
+ * hates both/
+ */
qsort(stats, requests, sizeof(struct data),
(int (*) (const void *, const void *)) compradre);
if ((requests > 1) && (requests % 2))
@@ -606,20 +607,21 @@
meantot = (stats[requests / 2].time + stats[requests / 2 + 1].time)
/ 2;
else
meantot = stats[requests / 2].time;
-
- printf("\nConnnection Times (ms)\n");
+ printf("\nConnection Times (ms)\n");
if (confidence) {
- printf(" min mean[+/-sd] median max\n");
- printf("Connect: %5ld %5d %6.1f %5ld %5ld\n",
- mincon, (int) (totalcon + 0.5), sdcon, meancon, maxcon);
- printf("Processing: %5ld %5d %6.1f %5ld %5ld\n",
+#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");
+ printf("Connect: " CONF_FMT_STRING,
+ mincon, (int) (totalcon + 0.5), sdcon, meancon, maxcon);
+ printf("Processing: " CONF_FMT_STRING,
mind, (int) (totald + 0.5), sdd, meand, maxd);
- printf("Waiting: %5ld %5d %6.1f %5ld %5ld\n",
+ printf("Waiting: " CONF_FMT_STRING,
minwait, (int) (totalwait + 0.5), sdwait, meanwait, maxwait);
- printf("Total: %5ld %5d %6.1f %5ld %5ld\n",
+ printf("Total: " CONF_FMT_STRING,
mintot, (int) (total + 0.5), sdtot, meantot, maxtot);
+#undef CONF_FMT_STRING
#define SANE(what,avg,mean,sd) \
{ \
@@ -639,11 +641,14 @@
}
else {
printf(" min avg max\n");
- printf("Connect: %5ld %5e %5ld\n", mincon, totalcon / requests,
maxcon);
- printf("Processing: %5ld %5e %5ld\n",
- mintot - mincon, (total / requests) - (totalcon / requests),
- maxtot - maxcon);
- printf("Total: %5ld %5e %5ld\n", mintot, total / requests,
maxtot);
+#define CONF_FMT_STRING "%5" APR_TIME_T_FMT " %5e %5" APR_TIME_T_FMT "\n"
+ printf("Connect: " CONF_FMT_STRING, mincon, totalcon / requests,
+ maxcon);
+ printf("Processing: " CONF_FMT_STRING, mintot - mincon,
+ (total / requests) - (totalcon / requests), maxtot - maxcon);
+ printf("Total: " CONF_FMT_STRING, mintot, total / requests,
+ maxtot);
+#undef CONF_FMT_STRING
}
@@ -654,9 +659,10 @@
if (percs[i] <= 0)
printf(" 0%% <0> (never)\n");
else if (percs[i] >= 100)
- printf(" 100%% %5ld (last request)\n", stats[(int)
(requests - 1)].time);
+ printf(" 100%% %5" APR_TIME_T_FMT " (longest request)\n",
+ stats[requests - 1].time);
else
- printf(" %d%% %5ld\n",
+ printf(" %d%% %5" APR_TIME_T_FMT "\n",
percs[i], stats[(int) (requests * percs[i] / 100)].time);
};
if (csvperc) {
