Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at Wed Aug 24 14:37:19 CEST 2011. -------- --- procps/procps.changes 2011-07-22 17:45:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/procps/procps.changes 2011-08-24 12:15:32.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 24 10:09:36 UTC 2011 - werner@suse.de + +- Add large (p)cpu patch from Tony Ernst (bnc#713482) +- Add petabytes patch from Tony Ernst (bnc#713482) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- procps-3.2.7-large_pcpu.patch procps-3.2.7-petabytes.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.hQYZ6x/_old 2011-08-24 14:36:54.000000000 +0200 +++ /var/tmp/diff_new_pack.hQYZ6x/_new 2011-08-24 14:36:54.000000000 +0200 @@ -27,7 +27,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 3.2.8 -Release: 35 +Release: 37 Summary: ps utilities for /proc Provides: ps Obsoletes: ps @@ -76,6 +76,8 @@ Patch38: procps-3.2.8-add-system-switch.diff Patch39: procps-3.2.8-implement-pattern-option.diff Patch40: procps-3.2.8-read-sysctls-also-from-boot-sysctl.conf-kernelversion.diff +Patch41: procps-3.2.7-petabytes.patch +Patch42: procps-3.2.7-large_pcpu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -144,6 +146,8 @@ %patch38 -p1 %patch39 -p1 %patch40 -p1 +%patch41 -p1 +%patch42 -p1 %build make %{?_smp_mflags} CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \ ++++++ procps-3.2.7-large_pcpu.patch ++++++ Fix %CPU in Irix mode to support higher cpu counts. Signed-off-by: Tony Ernst <tee@sgi.com> --- --- procps-3.2.7/top.c 2011-08-19 10:24:11.000000000 -0500 +++ procps-3.2.7/top.c 2011-08-19 10:24:18.000000000 -0500 @@ -1836,8 +1836,9 @@ if(Rc.mode_irixps && smp_num_cpus()>1){ // good for 100 CPUs per process - pcpu_max_value = 9999.0; - Fieldstab[P_CPU].fmts = " %4.0f"; + pcpu_max_value = 999999.0; + Fieldstab[P_CPU].fmts = " %6.0f"; + Fieldstab[P_CPU].head = " %CPU"; } // lastly, establish the true runtime secure mode and delay time @@ -2682,11 +2683,13 @@ #endif if(Rc.mode_irixps && smp_num_cpus()>1){ // good for 100 CPUs per process - pcpu_max_value = 9999.0; - Fieldstab[P_CPU].fmts = " %4.0f"; + pcpu_max_value = 999999.0; + Fieldstab[P_CPU].fmts = " %6.0f"; + Fieldstab[P_CPU].head = " %CPU"; } else { pcpu_max_value = 99.9; Fieldstab[P_CPU].fmts = " %#4.1f"; + Fieldstab[P_CPU].head = " %CPU"; } break; ++++++ procps-3.2.7-petabytes.patch ++++++ Add support for displaying petabyte and exabyte values. Signed-off-by: Tony Ernst <tee@sgi.com> --- --- procps-3.2.7/top.c 2011-05-31 10:12:53.000000000 -0500 +++ procps-3.2.7/top.c 2011-05-31 10:33:54.000000000 -0500 @@ -761,16 +761,19 @@ * SK_Kb (1) it's kilobytes * SK_Mb (2) it's megabytes * SK_Gb (3) it's gigabytes - * SK_Tb (4) it's terabytes */ + * SK_Tb (4) it's terabytes + * SK_Pb (5) it's petabytes + * SK_Eb (6) it's exabytes */ static const char *scale_num (unsigned long num, const int width, const unsigned type) { - /* kilobytes, megabytes, gigabytes, terabytes, duh! */ - static double scale[] = { 1024.0, 1024.0*1024, 1024.0*1024*1024, 1024.0*1024*1024*1024, 0 }; - /* kilo, mega, giga, tera, none */ + /* kilobytes, megabytes, gigabytes, terabytes, petabytes, exabytes, duh! */ + static double scale[] = { 1024.0, 1024.0*1024, 1024.0*1024*1024, 1024.0*1024*1024*1024, + 1024.0*1024*1024*1024*1024, 1024.0*1024*1024*1024*1024*1024, 0 }; + /* kilo, mega, giga, tera, peta, exa, none */ #ifdef CASEUP_SCALE - static char nextup[] = { 'K', 'M', 'G', 'T', 0 }; + static char nextup[] = { 'K', 'M', 'G', 'T', 'P', 'E', 0 }; #else - static char nextup[] = { 'k', 'm', 'g', 't', 0 }; + static char nextup[] = { 'k', 'm', 'g', 't', 'p', 'e', 0 }; #endif static char buf[TNYBUFSIZ]; double *dp; --- procps-3.2.7/top.h 2011-05-31 10:38:13.554790767 -0500 +++ procps-3.2.7/top.h 2011-05-31 10:38:43.670693506 -0500 @@ -241,7 +241,7 @@ // The scaling 'type' used with scale_num() -- this is how // the passed number is interpreted should scaling be necessary enum scale_num { - SK_no, SK_Kb, SK_Mb, SK_Gb, SK_Tb + SK_no, SK_Kb, SK_Mb, SK_Gb, SK_Tb, SK_Pb, SK_Eb }; // Flags for each possible field ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org