Hello community, here is the log from the commit of package procps for openSUSE:Factory checked in at Sat Jul 23 11:39:54 CEST 2011.
-------- --- procps/procps.changes 2011-05-18 11:44:39.000000000 +0200 +++ /mounts/work_src_done/STABLE/procps/procps.changes 2011-07-22 17:45:53.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 22 15:43:44 UTC 2011 - [email protected] + +- Ignore new smaps entries AnonHugePages and Locked (bnc#706942) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ procps.spec ++++++ --- /var/tmp/diff_new_pack.sPEGfH/_old 2011-07-23 11:39:38.000000000 +0200 +++ /var/tmp/diff_new_pack.sPEGfH/_new 2011-07-23 11:39:38.000000000 +0200 @@ -27,7 +27,7 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 3.2.8 -Release: 33 +Release: 35 Summary: ps utilities for /proc Provides: ps Obsoletes: ps ++++++ procps-3.2.8-pmap-smaps-rml-2.patch ++++++ --- /var/tmp/diff_new_pack.sPEGfH/_old 2011-07-23 11:39:38.000000000 +0200 +++ /var/tmp/diff_new_pack.sPEGfH/_new 2011-07-23 11:39:38.000000000 +0200 @@ -91,8 +91,8 @@ +The procps package is maintained by Albert Calahan. Please send +bug reports to <[email protected]>. --- pmap.c -+++ pmap.c 2010-12-03 16:55:52.268426585 +0000 -@@ -1,372 +1,428 @@ ++++ pmap.c 2011-07-22 17:38:48.219926168 +0200 +@@ -1,372 +1,440 @@ /* - * Copyright 2002 by Albert Cahalan; all rights reserved. - * This file may be used subject to the terms and conditions of the @@ -201,6 +201,9 @@ +#define OBJECTSIZE 1024 - if(shmdt(addr)) perror("shmdt"); +- +-out_destroy: +- if(shmctl(shmid, IPC_RMID, NULL)) perror("IPC_RMID"); +struct smap { + unsigned long size; + unsigned long rss; @@ -246,8 +249,7 @@ + "display this help\n"); +} --out_destroy: -- if(shmctl(shmid, IPC_RMID, NULL)) perror("IPC_RMID"); +- return; +static int get_smap_data(struct smap *smap) +{ + unsigned long long data; @@ -353,7 +355,13 @@ + + assigned = sscanf(buff, "Anonymous: %lld", &data); + -+ /* get swap */ ++ /* get swap or get and ignore huge anonymous pages */ ++ if (assigned == 1) ++ if(!fgets(buff, BUFFERSIZE, smaps_fp)) ++ return 1; ++ ++ assigned = sscanf(buff, "AnonHugePages: %lld", &data); ++ + if (assigned == 1) + if(!fgets(buff, BUFFERSIZE, smaps_fp)) + return 1; @@ -384,8 +392,13 @@ + if (assigned != 1) + return 1; + smap->mmupagesize = data; - -- return; ++ ++ /* get and ignore locked */ ++ if (assigned == 1) ++ if(!fgets(buff, BUFFERSIZE, smaps_fp)) ++ return 0; ++ ++ assigned = sscanf(buff, "Locked: %lld", &data); +out: + return 0; } @@ -441,7 +454,8 @@ -static const char *mapping_name(proc_t *p, unsigned KLONG addr, unsigned KLONG len, const char *mapbuf, unsigned showpath, unsigned dev_major, unsigned dev_minor, unsigned long long inode){ - const char *cp; -- ++ printf("%c%c%c%c ", read_perm, write_perm, exec_perm, access_type); + - if(!dev_major && dev_minor==shm_minor && strstr(mapbuf,"/SYSV")){ - static char shmbuf[64]; - snprintf(shmbuf, sizeof shmbuf, " [ shmid=0x%Lx ]", inode); @@ -464,7 +478,8 @@ - if( (p->start_stack >= addr) && (p->start_stack <= addr+len) ) cp = " [ stack ]"; - return cp; -} -+ printf("%c%c%c%c ", read_perm, write_perm, exec_perm, access_type); ++ if (show_devices) ++ printf("%0*llx %02lx:%02lx ", WDT, offset, major, minor); -static int one_proc(proc_t *p){ - char buf[32]; @@ -602,9 +617,7 @@ - else printf(" total %8ldK\n", (total_shared + total_private_writeable + total_private_readonly) >> 10); - } - } -+ if (show_devices) -+ printf("%0*llx %02lx:%02lx ", WDT, offset, major, minor); - +- - return 0; + printf("%s\n", obj_buff); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
