ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/page_stats.c

Comparing projects/libstatgrab/src/libstatgrab/page_stats.c (file contents):
Revision 1.17 by tdb, Mon Feb 16 14:55:32 2004 UTC vs.
Revision 1.18 by ats, Mon Apr 5 15:40:15 2004 UTC

#	Line 46 | Line 46
46		#include <uvm/uvm.h>
47		#endif
48
49	<	static page_stat_t page_stats;
49	>	static sg_page_stats page_stats;
50		static int page_stats_uninit=1;
51
52	<	page_stat_t *get_page_stats(){
52	>	sg_page_stats *sg_get_page_stats(){
53		#ifdef SOLARIS
54		kstat_ctl_t *kc;
55		kstat_t *ksp;
#	Line 88 | Line 88 | page_stat_t *get_page_stats(){
88		#endif
89		#if defined(LINUX) || defined(CYGWIN)
90		if ((f = fopen("/proc/vmstat", "r")) != NULL) {
91	<	while ((line_ptr = f_read_line(f, "")) != NULL) {
91	>	while ((line_ptr = sg_f_read_line(f, "")) != NULL) {
92		long long value;
93
94		if (sscanf(line_ptr, "%*s %lld", &value) != 1) {
#	Line 104 | Line 104 | page_stat_t *get_page_stats(){
104
105		fclose(f);
106		} else if ((f = fopen("/proc/stat", "r")) != NULL) {
107	<	if ((line_ptr = f_read_line(f, "page")) == NULL) {
107	>	if ((line_ptr = sg_f_read_line(f, "page")) == NULL) {
108		fclose(f);
109		return NULL;
110		}
#	Line 130 | Line 130 | page_stat_t *get_page_stats(){
130		}
131		#endif
132		#if defined(NETBSD) || defined(OPENBSD)
133	<	if ((uvm = get_uvmexp()) == NULL) {
133	>	if ((uvm = sg_get_uvmexp()) == NULL) {
134		return NULL;
135		}
136
#	Line 141 | Line 141 | page_stat_t *get_page_stats(){
141		return &page_stats;
142		}
143
144	<	page_stat_t *get_page_stats_diff(){
145	<	page_stat_t *page_ptr;
146	<	static page_stat_t page_stats_diff;
144	>	sg_page_stats *sg_get_page_stats_diff(){
145	>	sg_page_stats *page_ptr;
146	>	static sg_page_stats page_stats_diff;
147
148		if(page_stats_uninit){
149	<	page_ptr=get_page_stats();
149	>	page_ptr=sg_get_page_stats();
150		if(page_ptr==NULL){
151		return NULL;
152		}
#	Line 158 | Line 158 | page_stat_t *get_page_stats_diff(){
158		page_stats_diff.pages_pageout=page_stats.pages_pageout;
159		page_stats_diff.systime=page_stats.systime;
160
161	<	page_ptr=get_page_stats();
161	>	page_ptr=sg_get_page_stats();
162		if(page_ptr==NULL){
163		return NULL;
164		}

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines