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

Merge branch 'fix-99d71ad' into 'master'

Browse Source 
Fix 99d71ad

My previous patch has a regression. Please merge the fix of regression.

This is based on the following post.
http://www.freelists.org/post/procps/fix-regression-created-by-99d71ad

See merge request !29
This commit is contained in:
Jan Rybar 2016-12-20 15:01:18 +00:00
commit 19649938ec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
proc/slab.c
View File

@ -179,7 +179,7 @@ static int parse_slabinfo20(struct slab_info **list, struct slab_stat *stats,
curr->cache_size = (unsigned long)curr->nr_slabs * curr->pages_per_slab * page_size; curr->cache_size = (unsigned long)curr->nr_slabs * curr->pages_per_slab * page_size;
if (curr->nr_objs) { if (curr->nr_objs) {
curr->use = 100 * (curr->nr_active_objs / curr->nr_objs); curr->use = 100 * (float)curr->nr_active_objs / curr->nr_objs;
stats->nr_active_caches++; stats->nr_active_caches++;
} else } else
curr->use = 0; curr->use = 0;
@ -258,7 +258,7 @@ static int parse_slabinfo11(struct slab_info **list, struct slab_stat *stats,
curr->cache_size = (unsigned long)curr->nr_slabs * curr->pages_per_slab * page_size; curr->cache_size = (unsigned long)curr->nr_slabs * curr->pages_per_slab * page_size;
if (curr->nr_objs) { if (curr->nr_objs) {
curr->use = 100 * curr->nr_active_objs / curr->nr_objs; curr->use = 100 * (float)curr->nr_active_objs / curr->nr_objs;
stats->nr_active_caches++; stats->nr_active_caches++;
} else } else
curr->use = 0; curr->use = 0;