leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

maps4: simplify interdependence of maps and smaps

Browse Source 
This pulls the shared map display code out of show_map and puts it in
show_smap where it belongs.

Signed-off-by: Matt Mackall <mpm@selenic.com>
Cc: Jeremy Fitzhardinge <jeremy@goop.org>
Acked-by: David Rientjes <rientjes@google.com>
Cc: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Matt Mackall 2008-02-04 22:29:02 -08:00 committed by Linus Torvalds
parent b3ae5acbbb
commit 4752c36978
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fs/proc/task_mmu.c
View File

@ -145,7 +145,7 @@ struct mem_size_stats
u64 pss; u64 pss;
}; };
static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats *mss) static int show_map(struct seq_file *m, void *v)
{ {
struct proc_maps_private *priv = m->private; struct proc_maps_private *priv = m->private;
struct task_struct *task = priv->task; struct task_struct *task = priv->task;
@ -205,35 +205,11 @@ static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats
} }
seq_putc(m, '\n'); seq_putc(m, '\n');
if (mss)
seq_printf(m,
"Size: %8lu kB\n"
"Rss: %8lu kB\n"
"Pss: %8lu kB\n"
"Shared_Clean: %8lu kB\n"
"Shared_Dirty: %8lu kB\n"
"Private_Clean: %8lu kB\n"
"Private_Dirty: %8lu kB\n"
"Referenced: %8lu kB\n",
(vma->vm_end - vma->vm_start) >> 10,
mss->resident >> 10,
(unsigned long)(mss->pss >> (10 + PSS_SHIFT)),
mss->shared_clean >> 10,
mss->shared_dirty >> 10,
mss->private_clean >> 10,
mss->private_dirty >> 10,
mss->referenced >> 10);
if (m->count < m->size) /* vma is copied successfully */ if (m->count < m->size) /* vma is copied successfully */
m->version = (vma != get_gate_vma(task))? vma->vm_start: 0; m->version = (vma != get_gate_vma(task))? vma->vm_start: 0;
return 0; return 0;
} }
static int show_map(struct seq_file *m, void *v)
{
return show_map_internal(m, v, NULL);
}
static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
void *private) void *private)
{ {
@ -312,13 +288,37 @@ static int show_smap(struct seq_file *m, void *v)
{ {
struct vm_area_struct *vma = v; struct vm_area_struct *vma = v;
struct mem_size_stats mss; struct mem_size_stats mss;
int ret;
memset(&mss, 0, sizeof mss); memset(&mss, 0, sizeof mss);
mss.vma = vma; mss.vma = vma;
if (vma->vm_mm && !is_vm_hugetlb_page(vma)) if (vma->vm_mm && !is_vm_hugetlb_page(vma))
walk_page_range(vma->vm_mm, vma->vm_start, vma->vm_end, walk_page_range(vma->vm_mm, vma->vm_start, vma->vm_end,
&smaps_walk, &mss); &smaps_walk, &mss);
return show_map_internal(m, v, &mss);
ret = show_map(m, v);
if (ret)
return ret;
seq_printf(m,
"Size: %8lu kB\n"
"Rss: %8lu kB\n"
"Pss: %8lu kB\n"
"Shared_Clean: %8lu kB\n"
"Shared_Dirty: %8lu kB\n"
"Private_Clean: %8lu kB\n"
"Private_Dirty: %8lu kB\n"
"Referenced: %8lu kB\n",
(vma->vm_end - vma->vm_start) >> 10,
mss.resident >> 10,
(unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
mss.shared_clean >> 10,
mss.shared_dirty >> 10,
mss.private_clean >> 10,
mss.private_dirty >> 10,
mss.referenced >> 10);
return ret;
} }
static struct mm_walk clear_refs_walk = { .pmd_entry = clear_refs_pte_range }; static struct mm_walk clear_refs_walk = { .pmd_entry = clear_refs_pte_range };