diff --git a/procps-3.2.7-slab.patch b/procps-3.2.7-slab.patch new file mode 100644 index 0000000..93dc6e1 --- /dev/null +++ b/procps-3.2.7-slab.patch @@ -0,0 +1,94 @@ +| On Tue, Feb 19, 2008 at 7:53 PM, Albert Cahalan wrote: +| > On Feb 18, 2008 10:55 AM, Bart Van Assche wrote: +| > +| > > This leads me to the question: if the layout of /proc/meminfo changes, +| > > who communicates these changes to the procps maintainers ? +| > +| > Nobody ever informs me. :-( +| +| Albert, can you please review the patch below ? +| +| Thanks, +| +| Bart. +| +| +--- procps-3.2.7/proc/library.map ++++ procps-3.2.7/proc/library.map 2008-03-08 10:17:01.000000000 +0100 +@@ -18,6 +18,8 @@ + kb_main_free; kb_main_total; kb_main_used; kb_swap_free; + kb_swap_total; kb_swap_used; kb_main_shared; + kb_low_total; kb_low_free; kb_high_total; kb_high_free; ++ kb_swap_cached; kb_anon_pages; kb_bounce; kb_nfs_unstable; ++ kb_slab_reclaimable; kb_slab_unreclaimable; + vm_pgpgin; vm_pgpgout; vm_pswpin; vm_pswpout; + free_slabinfo; put_slabinfo; get_slabinfo; get_proc_stats; + local: *; +--- procps-3.2.7/proc/sysinfo.c ++++ procps-3.2.7/proc/sysinfo.c 2008-03-08 10:30:14.000000000 +0100 +@@ -8,6 +8,8 @@ + // File for parsing top-level /proc entities. */ + // + // June 2003, Fabian Frederick, disk and slab info ++// Copyright (c) 2003 Fabian Frederick. ++// Copyright (c) 2008 Bart Van Assche. + + #include + #include +@@ -503,6 +505,11 @@ + unsigned long kb_swap_free; + unsigned long kb_swap_total; + /* recently introduced */ ++unsigned long kb_anon_pages; ++unsigned long kb_bounce; ++unsigned long kb_nfs_unstable; ++unsigned long kb_slab_reclaimable; ++unsigned long kb_slab_unreclaimable; + unsigned long kb_high_free; + unsigned long kb_high_total; + unsigned long kb_low_free; +@@ -539,6 +546,8 @@ + char *tail; + static const mem_table_struct mem_table[] = { + {"Active", &kb_active}, // important ++ {"AnonPages", &kb_anon_pages}, ++ {"Bounce", &kb_bounce}, + {"Buffers", &kb_main_buffers}, // important + {"Cached", &kb_main_cached}, // important + {"Committed_AS", &kb_committed_as}, +@@ -556,10 +565,13 @@ + {"MemFree", &kb_main_free}, // important + {"MemShared", &kb_main_shared}, // important, but now gone! + {"MemTotal", &kb_main_total}, // important ++ {"NFS_Unstable", &kb_nfs_unstable}, + {"PageTables", &kb_pagetables}, // kB version of vmstat nr_page_table_pages + {"ReverseMaps", &nr_reversemaps}, // same as vmstat nr_page_table_pages + {"Slab", &kb_slab}, // kB version of vmstat nr_slab + {"SwapCached", &kb_swap_cached}, ++ {"SReclaimable", &kb_slab_reclaimable}, ++ {"SUnreclaim", &kb_slab_unreclaimable}, + {"SwapFree", &kb_swap_free}, // important + {"SwapTotal", &kb_swap_total}, // important + {"VmallocChunk", &kb_vmalloc_chunk}, +@@ -603,6 +615,7 @@ + } + kb_swap_used = kb_swap_total - kb_swap_free; + kb_main_used = kb_main_total - kb_main_free; ++ kb_main_cached += kb_slab_reclaimable + kb_swap_cached + kb_nfs_unstable; + } + + /*****************************************************************/ +--- procps-3.2.7/proc/sysinfo.h ++++ procps-3.2.7/proc/sysinfo.h 2008-03-08 10:15:41.000000000 +0100 +@@ -30,6 +30,11 @@ + extern unsigned long kb_swap_free; + extern unsigned long kb_swap_total; + /* recently introduced */ ++extern unsigned long kb_anon_pages; ++extern unsigned long kb_bounce; ++extern unsigned long kb_nfs_unstable; ++extern unsigned long kb_slab_reclaimable; ++extern unsigned long kb_slab_unreclaimable; + extern unsigned long kb_high_free; + extern unsigned long kb_high_total; + extern unsigned long kb_low_free; diff --git a/procps.changes b/procps.changes index 22e1183..9c4c948 100644 --- a/procps.changes +++ b/procps.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 10 18:24:14 CEST 2008 - werner@suse.de + +- Annoying change in /proc/meminfo makes info about free memory + useless ... thanks Bart Van Assche for spotting (bnc#405246) + ------------------------------------------------------------------- Fri Mar 28 11:42:02 CET 2008 - werner@suse.de diff --git a/procps.spec b/procps.spec index 695c057..1fa0d05 100644 --- a/procps.spec +++ b/procps.spec @@ -19,7 +19,7 @@ Group: System/Monitoring PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 3.2.7 -Release: 102 +Release: 117 Summary: ps utilities for /proc Provides: ps Obsoletes: ps @@ -46,6 +46,7 @@ Patch17: procps-3.2.5-CPU-states.patch Patch18: procps-3.2.7-readeof.patch Patch19: procps-3.2.7-btime-from-proc-stat.patch Patch20: procps-3.2.7-glibc-2.6.1.dif +Patch21: procps-3.2.7-slab.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -94,6 +95,7 @@ Authors: %patch18 %patch19 -p1 %patch20 +%patch21 -p1 %build make CFLAGS="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $RPM_OPT_FLAGS -pipe" \ @@ -159,6 +161,9 @@ rm -rf $RPM_BUILD_ROOT %_mandir/man8/sysctl.8.gz %changelog +* Thu Jul 10 2008 werner@suse.de +- Annoying change in /proc/meminfo makes info about free memory + useless ... thanks Bart Van Assche for spotting (bnc#405246) * Fri Mar 28 2008 werner@suse.de - Handle new Pss entry in smaps (bnc#374236) * Thu Feb 14 2008 werner@suse.de @@ -273,7 +278,7 @@ rm -rf $RPM_BUILD_ROOT * ps: STAT shows l for multi-threaded processes * vmstat: some overflow problems fixed -- thanks Holger Kiehl - Use ps manpage from from the package. -* Tue Aug 03 2004 garloff@suse.de +* Wed Aug 04 2004 garloff@suse.de - Update to procps-3.2.2: * build tweaks and docu updates * ps: k option and personality-specific -x support @@ -362,7 +367,7 @@ rm -rf $RPM_BUILD_ROOT * Fri Sep 05 2003 stepan@suse.de - top: fix 4G overflow on 64bit platforms (bug #28539) (procps-3.1.11-bigproc.diff) -* Fri Aug 08 2003 stepan@suse.de +* Sat Aug 09 2003 stepan@suse.de - update procps to version 3.1.11: * compile with gcc 2.95 again (C99 issue) - fix sysctl insertion (bug #28593) @@ -599,7 +604,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Apr 14 1997 florian@suse.de - update to new version 1.11.3 - update to psmisc 12a -* Wed Jan 22 1997 florian@suse.de +* Thu Jan 23 1997 florian@suse.de - update to version 1.11.1 * Thu Jan 02 1997 florian@suse.de new version 1.01