emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

library: don't strip off prefixes from the wchan names

Browse Source 
This commit will resolve the RedHat Bugzilla #1322111.

[ import from identical commit against master branch ]
[ but without trailing whitespace, thank you so much ]

Imported by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jan Rybar 2016-12-04 14:14:14 +01:00 committed by Craig Small
parent 1c0d54e963
commit 5602dd04e1
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -6,6 +6,7 @@ procps-ng-NEXT
* pmap: fix duplicate output line under '-x' option Redhat #1374061 * pmap: fix duplicate output line under '-x' option Redhat #1374061
* top: eliminated minor libnuma memory leak * top: eliminated minor libnuma memory leak
* ps: avoid eip/esp address truncations Debain #846361 * ps: avoid eip/esp address truncations Debain #846361
* library: don't strip off wchan prefixes (ps & top) Redhat #1322111
procps-ng-3.3.12 procps-ng-3.3.12
---------------- ----------------

8
proc/wchan.c
View File

@ -46,11 +46,7 @@ const char * lookup_wchan (int pid) {
// lame ppc64 has a '.' in front of every name // lame ppc64 has a '.' in front of every name
if (*ret=='.') ret++; if (*ret=='.') ret++;
switch (*ret){ while(*ret=='_') ret++;
case 's': if(!strncmp(ret, "sys_", 4)) ret += 4; break;
case 'd': if(!strncmp(ret, "do_", 3)) ret += 3; break;
case '_': while(*ret=='_') ret++; break;
default : break;
}
return ret; return ret;
} }