From: Sebastien GODARD Date: Tue, 5 May 2015 20:12:08 +0000 (+0200) Subject: Merge branch 'pschiffe-master' X-Git-Tag: 11.1.5~14 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66000ace72ff1a573d733d716613c0799e20e5d3;p=sysstat Merge branch 'pschiffe-master' Signed-off-by: Sebastien GODARD --- 66000ace72ff1a573d733d716613c0799e20e5d3 diff --cc pr_stats.c index 7e52927,ffd4bf3..9b6540b --- a/pr_stats.c +++ b/pr_stats.c @@@ -563,15 -563,14 +563,14 @@@ void stub_print_memory_stats(struct act (double) avg_frskb / avg_count, ((double) avg_tlskb / avg_count) - ((double) avg_frskb / avg_count), - ((double) (avg_tlskb / avg_count)) ? - SP_VALUE((double) (avg_frskb / avg_count), - (double) (avg_tlskb / avg_count), - (double) (avg_tlskb / avg_count)) : - (avg_tlskb >= avg_count) ? ++ avg_tlskb ? + SP_VALUE((double) avg_frskb / avg_count, + (double) avg_tlskb / avg_count, + (double) avg_tlskb / avg_count) : 0.0, - (double) (avg_caskb / avg_count), - (((double) avg_tlskb / avg_count) - - ((double) avg_frskb / avg_count)) ? - SP_VALUE(0.0, (double) (avg_caskb / avg_count), + (double) avg_caskb / avg_count, + (avg_tlskb != avg_frskb) ? + SP_VALUE(0.0, (double) avg_caskb / avg_count, ((double) avg_tlskb / avg_count) - ((double) avg_frskb / avg_count)) : 0.0); @@@ -2249,10 -2248,10 +2248,10 @@@ void stub_print_huge_stats(struct activ (double) avg_frhkb / avg_count, ((double) avg_tlhkb / avg_count) - ((double) avg_frhkb / avg_count), - ((double) (avg_tlhkb / avg_count)) ? - SP_VALUE((double) (avg_frhkb / avg_count), - (double) (avg_tlhkb / avg_count), - (double) (avg_tlhkb / avg_count)) : - (avg_tlhkb >= avg_count) ? ++ avg_tlhkb ? + SP_VALUE((double) avg_frhkb / avg_count, + (double) avg_tlhkb / avg_count, + (double) avg_tlhkb / avg_count) : 0.0); /* Reset average counters */