for (i = 0; i < len; i++) {
usage.vss += map->proc->ker->pagesize;
- if (!PM_PAGEMAP_PRESENT(pagemap[i]) ||
- PM_PAGEMAP_SWAPPED(pagemap[i]))
+ if (!PM_PAGEMAP_PRESENT(pagemap[i]))
continue;
- if (flags_mask) {
- uint64_t flags;
- error = pm_kernel_flags(map->proc->ker, PM_PAGEMAP_PFN(pagemap[i]),
- &flags);
- if (error) goto out;
+ if (!PM_PAGEMAP_SWAPPED(pagemap[i])) {
+ if (flags_mask) {
+ uint64_t flags;
+ error = pm_kernel_flags(map->proc->ker, PM_PAGEMAP_PFN(pagemap[i]),
+ &flags);
+ if (error) goto out;
- if ((flags & flags_mask) != required_flags)
- continue;
- }
+ if ((flags & flags_mask) != required_flags)
+ continue;
+ }
- error = pm_kernel_count(map->proc->ker, PM_PAGEMAP_PFN(pagemap[i]),
- &count);
- if (error) goto out;
+ error = pm_kernel_count(map->proc->ker, PM_PAGEMAP_PFN(pagemap[i]),
+ &count);
+ if (error) goto out;
- usage.rss += (count >= 1) ? (map->proc->ker->pagesize) : (0);
- usage.pss += (count >= 1) ? (map->proc->ker->pagesize / count) : (0);
- usage.uss += (count == 1) ? (map->proc->ker->pagesize) : (0);
+ usage.rss += (count >= 1) ? map->proc->ker->pagesize : (0);
+ usage.pss += (count >= 1) ? (map->proc->ker->pagesize / count) : (0);
+ usage.uss += (count == 1) ? (map->proc->ker->pagesize) : (0);
+ } else {
+ usage.swap += map->proc->ker->pagesize;
+ }
}
memcpy(usage_out, &usage, sizeof(usage));
#include <pagemap/pagemap.h>
void pm_memusage_zero(pm_memusage_t *mu) {
- mu->vss = mu->rss = mu->pss = mu->uss = 0;
+ mu->vss = mu->rss = mu->pss = mu->uss = mu->swap = 0;
}
void pm_memusage_add(pm_memusage_t *a, pm_memusage_t *b) {
a->rss += b->rss;
a->pss += b->pss;
a->uss += b->uss;
+ a->swap += b->swap;
}