Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at 2013-12-19 12:51:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/procps (Old) and /work/SRC/openSUSE:Factory/.procps.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "procps" Changes: -------- --- /work/SRC/openSUSE:Factory/procps/procps.changes 2013-10-07 15:58:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.procps.new/procps.changes 2013-12-19 12:51:07.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Dec 17 13:17:36 UTC 2013 - wer...@suse.de + +- Change patch procps-ng-3.3.8-accuracy.dif to really use finally + jiffies to calculate %CPU output (bnc#855861) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps-ng-3.3.8-accuracy.dif ++++++ --- /var/tmp/diff_new_pack.7XxWzi/_old 2013-12-19 12:51:10.000000000 +0100 +++ /var/tmp/diff_new_pack.7XxWzi/_new 2013-12-19 12:51:10.000000000 +0100 @@ -42,7 +42,7 @@ #define cook_time(P) (P->utime + P->stime) / Hertz #define cook_etime(P) (((unsigned long long)seconds_since_boot >= (P->start_time / Hertz)) ? ((unsigned long long)seconds_since_boot - (P->start_time / Hertz)) : 0) -+#define cook_jtime(P) (((unsigned long long)jiffies_since_boot >= (P->start_time / Hertz)) ? ((unsigned long long)jiffies_since_boot - (P->start_time / Hertz)) : 0) ++#define cook_jtime(P) (((unsigned long long)jiffies_since_boot >= (P->start_time)) ? ((unsigned long long)jiffies_since_boot - (P->start_time)) : 0) #define CMP_COOKED_TIME(NAME) \ static int sr_ ## NAME (const proc_t* P, const proc_t* Q) { \ @@ -57,7 +57,7 @@ - seconds = cook_etime(pp); - if(seconds) pcpu = (total_time * 100ULL / Hertz) / seconds; + jiffies = cook_jtime(pp); -+ if(jiffies) pcpu = (total_time * 100ULL / Hertz) / jiffies; ++ if(jiffies) pcpu = (total_time * 100ULL) / jiffies; if (pcpu > 99U) pcpu = 99U; return snprintf(outbuf, COLWID, "%2u", pcpu); } @@ -72,7 +72,7 @@ - seconds = cook_etime(pp); - if(seconds) pcpu = (total_time * 1000ULL / Hertz) / seconds; + jiffies = cook_jtime(pp); -+ if(jiffies) pcpu = (total_time * 1000ULL / Hertz) / jiffies; ++ if(jiffies) pcpu = (total_time * 1000ULL) / jiffies; if (pcpu > 999U) return snprintf(outbuf, COLWID, "%u", pcpu/10U); return snprintf(outbuf, COLWID, "%u.%u", pcpu/10U, pcpu%10U); @@ -87,7 +87,7 @@ - seconds = cook_etime(pp); - if(seconds) pcpu = (total_time * 1000ULL / Hertz) / seconds; + jiffies = cook_jtime(pp); -+ if(jiffies) pcpu = (total_time * 1000ULL / Hertz) / jiffies; ++ if(jiffies) pcpu = (total_time * 1000ULL) / jiffies; if (pcpu > 999U) pcpu = 999U; return snprintf(outbuf, COLWID, "%3u", pcpu); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org