From: Christoph Lameter <clameter@sgi.com>
To: linux-kernel@vger.kernel.org
Cc: Nick Piggin <nickpiggin@yahoo.com.au>,
linux-mm@kvack.org, Andi Kleen <ak@suse.de>,
Christoph Lameter <clameter@sgi.com>,
Marcelo Tosatti <marcelo.tosatti@cyclades.com>
Subject: Zoned counters V1 [ 6/14]: Expanded node and zone statistics
Date: Tue, 20 Dec 2005 14:02:22 -0800 (PST) [thread overview]
Message-ID: <20051220220222.30326.61615.sendpatchset@schroedinger.engr.sgi.com> (raw)
In-Reply-To: <20051220220151.30326.98563.sendpatchset@schroedinger.engr.sgi.com>
- Extend zone, node and global statistics by printing all counters from
the vmstats arrays.
- Provide an array describing zoned VM counters
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Index: linux-2.6.15-rc5-mm3/drivers/base/node.c
===================================================================
--- linux-2.6.15-rc5-mm3.orig/drivers/base/node.c 2005-12-20 12:19:10.000000000 -0800
+++ linux-2.6.15-rc5-mm3/drivers/base/node.c 2005-12-20 12:28:48.000000000 -0800
@@ -43,12 +43,14 @@ static ssize_t node_read_meminfo(struct
unsigned long inactive;
unsigned long active;
unsigned long free;
- unsigned long nr_mapped;
+ int j;
+ unsigned long nr[NR_STAT_ITEMS];
si_meminfo_node(&i, nid);
get_page_state_node(&ps, nid);
__get_zone_counts(&active, &inactive, &free, NODE_DATA(nid));
- nr_mapped = node_page_state(nid, NR_MAPPED);
+ for (j = 0; j < NR_STAT_ITEMS; j++)
+ nr[j] = node_page_state(nid, j);
/* Check for negative values in these approximate counters */
if ((long)ps.nr_dirty < 0)
@@ -71,6 +73,7 @@ static ssize_t node_read_meminfo(struct
"Node %d Dirty: %8lu kB\n"
"Node %d Writeback: %8lu kB\n"
"Node %d Mapped: %8lu kB\n"
+ "Node %d Pagecache: %8lu kB\n"
"Node %d Slab: %8lu kB\n",
nid, K(i.totalram),
nid, K(i.freeram),
@@ -83,7 +86,8 @@ static ssize_t node_read_meminfo(struct
nid, K(i.freeram - i.freehigh),
nid, K(ps.nr_dirty),
nid, K(ps.nr_writeback),
- nid, K(nr_mapped),
+ nid, K(nr[NR_MAPPED]),
+ nid, K(nr[NR_PAGECACHE]),
nid, K(ps.nr_slab));
n += hugetlb_report_node_meminfo(nid, buf + n);
return n;
Index: linux-2.6.15-rc5-mm3/mm/page_alloc.c
===================================================================
--- linux-2.6.15-rc5-mm3.orig/mm/page_alloc.c 2005-12-20 12:23:47.000000000 -0800
+++ linux-2.6.15-rc5-mm3/mm/page_alloc.c 2005-12-20 12:28:48.000000000 -0800
@@ -597,6 +597,8 @@ static int rmqueue_bulk(struct zone *zon
return i;
}
+char *stat_item_descr[NR_STAT_ITEMS] = { "mapped","pagecache" };
+
/*
* Manage combined zone based / global counters
*/
@@ -2597,6 +2599,11 @@ static int zoneinfo_show(struct seq_file
zone->nr_scan_active, zone->nr_scan_inactive,
zone->spanned_pages,
zone->present_pages);
+ for(i = 0; i < NR_STAT_ITEMS; i++)
+ seq_printf(m, "\n %-8s %lu",
+ stat_item_descr[i],
+ zone_page_state(zone, i));
+
seq_printf(m,
"\n protection: (%lu",
zone->lowmem_reserve[0]);
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2005-12-20 22:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-20 22:01 Zoned counters V1 [ 0/14]: Overview Christoph Lameter
2005-12-20 22:01 ` Zoned counters V1 [ 1/14]: Add some consts for inlines in mm.h Christoph Lameter
2005-12-20 22:02 ` Zoned counters V1 [ 2/14]: Basic counter functionality Christoph Lameter
2005-12-20 22:02 ` Zoned counters V1 [ 3/14]: Include zoned counters in /proc/vmstat Christoph Lameter
2005-12-20 22:02 ` Zoned counters V1 [ 4/14]: Convert nr_mapped Christoph Lameter
2005-12-20 22:02 ` Zoned counters V1 [ 5/14]: Convert nr_pagecache Christoph Lameter
2005-12-20 22:02 ` Christoph Lameter [this message]
2005-12-20 22:02 ` Zoned counters V1 [ 7/14]: Convert nr_slab Christoph Lameter
2005-12-20 22:02 ` Zoned counters V1 [ 8/14]: Convert nr_page_table Christoph Lameter
2005-12-20 22:02 ` Zoned counters V1 [ 9/14]: Convert nr_dirty Christoph Lameter
2005-12-20 22:02 ` Zoned counters V1 [10/14]: Convert nr_writeback Christoph Lameter
2005-12-20 22:02 ` Zoned counters V1 [11/14]: Convert nr_unstable Christoph Lameter
2005-12-20 22:02 ` Zoned counters V1 [12/14]: Convert nr_bounce Christoph Lameter
2005-12-20 22:02 ` Zoned counters V1 [13/14]: Remove get_page_state functions Christoph Lameter
2005-12-20 22:03 ` Zoned counters V1 [14/14]: Remove wbs Christoph Lameter
2005-12-23 11:57 ` Coywolf Qi Hunt
2005-12-23 17:27 ` Christoph Lameter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051220220222.30326.61615.sendpatchset@schroedinger.engr.sgi.com \
--to=clameter@sgi.com \
--cc=ak@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=marcelo.tosatti@cyclades.com \
--cc=nickpiggin@yahoo.com.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox