Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932175AbVLTWCh (ORCPT ); Tue, 20 Dec 2005 17:02:37 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932167AbVLTWCg (ORCPT ); Tue, 20 Dec 2005 17:02:36 -0500 Received: from omx2-ext.sgi.com ([192.48.171.19]:22760 "EHLO omx2.sgi.com") by vger.kernel.org with ESMTP id S932169AbVLTWC1 (ORCPT ); Tue, 20 Dec 2005 17:02:27 -0500 Date: Tue, 20 Dec 2005 14:02:22 -0800 (PST) From: Christoph Lameter To: linux-kernel@vger.kernel.org Cc: Nick Piggin , linux-mm@kvack.org, Andi Kleen , Christoph Lameter , Marcelo Tosatti Message-Id: <20051220220222.30326.61615.sendpatchset@schroedinger.engr.sgi.com> In-Reply-To: <20051220220151.30326.98563.sendpatchset@schroedinger.engr.sgi.com> References: <20051220220151.30326.98563.sendpatchset@schroedinger.engr.sgi.com> Subject: Zoned counters V1 [ 6/14]: Expanded node and zone statistics Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2844 Lines: 77 - 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 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 from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/