diff --git a/ChangeLog b/ChangeLog index 5d0a9cf..54a5d68 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2021-01-10 (0.6.3) Volker Gropp + + * remove outdated copyright and email + * Merge pull request #25 from fweimer/patch-1 AC_QEF_C_NORETURN: Include for exit + * Merge pull request #27 from ofalk/master Fix potential write to unallocated memory. + * Merge pull request #28 from vgropp/#2-fix-csv-bits feat: #2 output bits in csv + * Merge pull request #29 from vgropp/#2-fix-csv-bits fix(doc): #2 output bits in csv + * Merge pull request #32 from vgropp/new-netstat-#5 feat: add support for newer (2016+) linux netstat #5 + 2019-01-01 14:50 (0.6.2) Volker Gropp * Merge pull request #22 from vgropp/issue-#13 to fix windows build diff --git a/NEWS b/NEWS index 58a2d6c..76d4766 100644 --- a/NEWS +++ b/NEWS @@ -1,13 +1,8 @@ -Changes in 0.6.2: - -- Merge pull request #22 from vgropp/issue-#13 to fix windows build -- Merge pull request #20 from dreibh/master CSV file output: fix for timestamp inaccuracy and Y-2038 problem -- Merge pull request #21 from vgropp/travisci add travisci -- Merge pull request #17 from Himura2la/master Add the started time in "sum" mode -- Merge pull request #18 from Himura2la/fix-dynamic Fix DYNAMIC and ANSIOUT in config -- Merge pull request #10 from SoapGentoo/fixes Use `static inline` instead of `inline` -- Merge pull request #9 from adventureloop/master Always fflush the pipe -- Merge pull request #7 from samueloph/fsf_address_clean Update FSF address -- Merge pull request #6 from samueloph/master Fix typos -- fix nan and inf values on fast refresh (fixes debian bug #532331) +Changes in 0.6.3: + * remove outdated copyright and email + * Merge pull request #25 from fweimer/patch-1 AC_QEF_C_NORETURN: Include for exit + * Merge pull request #27 from ofalk/master Fix potential write to unallocated memory. + * Merge pull request #28 from vgropp/#2-fix-csv-bits feat: #2 output bits in csv + * Merge pull request #29 from vgropp/#2-fix-csv-bits fix(doc): #2 output bits in csv + * Merge pull request #32 from vgropp/new-netstat-#5 feat: add support for newer (2016+) linux netstat #5 diff --git a/README b/README index 70046fc..b0aadf6 100644 --- a/README +++ b/README @@ -1,5 +1,5 @@ -bwm-ng v0.6.2 -Copyright (C) 2004-2019 Volker Gropp (bwmng@gropp.org) +bwm-ng v0.6.3 +Copyright (C) 2004-2021 Volker Gropp (bwmng@gropp.org) http://www.gropp.org/?id=projects&sub=bwm-ng What is this? diff --git a/configure.in b/configure.in index c449363..2b2b81f 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([bwm-ng],[0.6.2],[bwmng@gropp.org],[bwm-ng]) +AC_INIT([bwm-ng],[0.6.3],[bwmng@gropp.org],[bwm-ng]) AC_CONFIG_SRCDIR(src/bwm-ng.c) AM_INIT_AUTOMAKE([gnu]) AC_CONFIG_HEADERS(config.h) diff --git a/src/output.c b/src/output.c index 4cf677e..f5f01cd 100644 --- a/src/output.c +++ b/src/output.c @@ -560,6 +560,9 @@ void print_values(unsigned int y,unsigned int x,const char *if_name,t_iface_spee fprintf(tmp_out_file,"%.2f%c%.2f%c%llu%c%llu%c",stats_csv->errors.out*multiplier,csv_char,stats_csv->errors.in*multiplier,csv_char,stats_csv->errors.in, csv_char,stats_csv->errors.out,csv_char); /* show bits/s */ +#if !NETSTAT_BSD_BYTES && !NETSTAT_NETBSD && NETSTAT + if (input_method!=NETSTAT_IN) +#endif fprintf(tmp_out_file,"%.2f%c%.2f%c%.2f%c%llu%c%llu\n",(double)(stats_csv->bytes.out*multiplier*8),csv_char,(double)(stats_csv->bytes.in*multiplier*8), csv_char,(double)((stats_csv->bytes.out+stats_csv->bytes.in)*multiplier*8),csv_char,stats_csv->bytes.in*8,csv_char,stats_csv->bytes.out*8); fflush(tmp_out_file);