|
Lines 996-1004
Link Here
|
| 996 |
|
996 |
|
| 997 |
/* calculate and output results in HTML */ |
997 |
/* calculate and output results in HTML */ |
| 998 |
|
998 |
|
| 999 |
static void output_html_results(void) |
999 |
static void output_html_results(int sig) |
| 1000 |
{ |
1000 |
{ |
| 1001 |
double timetaken = (double) (lasttime - start) / APR_USEC_PER_SEC; |
1001 |
double timetaken; |
|
|
1002 |
|
| 1003 |
if (sig) { |
| 1004 |
lasttime = apr_time_now(); /* record final time if interrupted */ |
| 1005 |
} |
| 1006 |
timetaken = (double) (lasttime - start) / APR_USEC_PER_SEC; |
| 1002 |
|
1007 |
|
| 1003 |
printf("\n\n<table %s>\n", tablestring); |
1008 |
printf("\n\n<table %s>\n", tablestring); |
| 1004 |
printf("<tr %s><th colspan=2 %s>Server Software:</th>" |
1009 |
printf("<tr %s><th colspan=2 %s>Server Software:</th>" |
|
Lines 1151-1156
Link Here
|
| 1151 |
} |
1156 |
} |
| 1152 |
printf("</table>\n"); |
1157 |
printf("</table>\n"); |
| 1153 |
} |
1158 |
} |
|
|
1159 |
if (sig) { |
| 1160 |
exit(1); |
| 1161 |
} |
| 1154 |
} |
1162 |
} |
| 1155 |
|
1163 |
|
| 1156 |
/* --------------------------------------------------------- */ |
1164 |
/* --------------------------------------------------------- */ |
|
Lines 1694-1700
Link Here
|
| 1694 |
|
1702 |
|
| 1695 |
#ifdef SIGINT |
1703 |
#ifdef SIGINT |
| 1696 |
/* Output the results if the user terminates the run early. */ |
1704 |
/* Output the results if the user terminates the run early. */ |
| 1697 |
apr_signal(SIGINT, output_results); |
1705 |
if (use_html) |
|
|
1706 |
apr_signal(SIGINT, output_html_results); |
| 1707 |
else |
| 1708 |
apr_signal(SIGINT, output_results); |
| 1698 |
#endif |
1709 |
#endif |
| 1699 |
|
1710 |
|
| 1700 |
/* initialise lots of requests */ |
1711 |
/* initialise lots of requests */ |
|
Lines 1816-1822
Link Here
|
| 1816 |
printf("..done\n"); |
1827 |
printf("..done\n"); |
| 1817 |
|
1828 |
|
| 1818 |
if (use_html) |
1829 |
if (use_html) |
| 1819 |
output_html_results(); |
1830 |
output_html_results(0); |
| 1820 |
else |
1831 |
else |
| 1821 |
output_results(0); |
1832 |
output_results(0); |
| 1822 |
} |
1833 |
} |