diff --git a/contrib/halog/halog.c b/contrib/halog/halog.c index 448e5c0a8..08444fe22 100644 --- a/contrib/halog/halog.c +++ b/contrib/halog/halog.c @@ -29,6 +29,7 @@ #define SERVER_FIELD 8 #define TIME_FIELD 9 #define STATUS_FIELD 10 +#define BYTES_SENT_FIELD 11 #define TERM_CODES_FIELD 14 #define CONN_FIELD 15 #define QUEUE_LEN_FIELD 16 @@ -67,6 +68,7 @@ struct url_stat { char *url; unsigned long long total_time; /* sum(all reqs' times) */ unsigned long long total_time_ok; /* sum(all OK reqs' times) */ + unsigned long long total_bytes_sent; /* sum(all bytes sent) */ unsigned int nb_err, nb_req; }; @@ -94,8 +96,6 @@ struct url_stat { #define FILT_COUNT_URL_TAVG 0x040000 #define FILT_COUNT_URL_TTOTO 0x080000 #define FILT_COUNT_URL_TAVGO 0x100000 -#define FILT_COUNT_URL_ANY (FILT_COUNT_URL_ONLY|FILT_COUNT_URL_COUNT|FILT_COUNT_URL_ERR| \ - FILT_COUNT_URL_TTOT|FILT_COUNT_URL_TAVG|FILT_COUNT_URL_TTOTO|FILT_COUNT_URL_TAVGO) #define FILT_HTTP_ONLY 0x200000 #define FILT_TERM_CODE_NAME 0x400000 @@ -106,6 +106,13 @@ struct url_stat { #define FILT_QUEUE_ONLY 0x4000000 #define FILT_QUEUE_SRV_ONLY 0x8000000 +#define FILT_COUNT_URL_BAVG 0x10000000 +#define FILT_COUNT_URL_BTOT 0x20000000 + +#define FILT_COUNT_URL_ANY (FILT_COUNT_URL_ONLY|FILT_COUNT_URL_COUNT|FILT_COUNT_URL_ERR| \ + FILT_COUNT_URL_TTOT|FILT_COUNT_URL_TAVG|FILT_COUNT_URL_TTOTO|FILT_COUNT_URL_TAVGO| \ + FILT_COUNT_URL_BAVG|FILT_COUNT_URL_BTOT) + unsigned int filter = 0; unsigned int filter_invert = 0; const char *line; @@ -128,9 +135,10 @@ void usage(FILE *output, const char *msg) fprintf(output, "%s" "Usage: halog [-h|--help] for long help\n" - " halog [-q] [-c] [-v] {-gt|-pct|-st|-tc|-srv|-u|-uc|-ue|-ua|-ut|-uao|-uto}\n" + " halog [-q] [-c]\n" + " {-gt|-pct|-st|-tc|-srv|-u|-uc|-ue|-ua|-ut|-uao|-uto|-uba|-ubt}\n" " [-s ] [-e|-E] [-H] [-rt|-RT