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.6 by tdb, Sun Aug 24 20:24:09 2003 UTC vs.
Revision 1.10 by ats, Fri Oct 24 17:26:43 2003 UTC

#	Line 23 | Line 23
23		#endif
24
25		#include "statgrab.h"
26	+	#include "tools.h"
27		#include <time.h>
28		#ifdef SOLARIS
29		#include <kstat.h>
#	Line 31 | Line 32
32		#endif
33		#ifdef LINUX
34		#include <stdio.h>
35	<	#include "tools.h"
35	>	#include <string.h>
36		#endif
37		#ifdef FREEBSD
38		#include <sys/types.h>
#	Line 54 | Line 55 | page_stat_t *get_page_stats(){
55		#ifdef FREEBSD
56		size_t size;
57		#endif
58	+	#ifdef NETBSD
59	+	struct uvmexp *uvm;
60	+	#endif
61
62	+	page_stats.systime = time(NULL);
63		page_stats.pages_pagein=0;
64		page_stats.pages_pageout=0;
65
#	Line 72 | Line 77 | page_stat_t *get_page_stats(){
77		page_stats.pages_pageout+=(long long)cs.cpu_vminfo.pgpgout;
78		}
79
75	–	page_stats.systime=time(NULL);
76	–
80		kstat_close(kc);
81		#endif
82		#ifdef LINUX
83	<	if((f=fopen("/proc/stat", "r"))==NULL){
84	<	return NULL;
85	<	}
86	<	if((line_ptr=f_read_line(f, "page"))==NULL){
83	>	if ((f = fopen("/proc/vmstat", "r")) != NULL) {
84	>	while ((line_ptr = f_read_line(f, "")) != NULL) {
85	>	long long value;
86	>
87	>	if (sscanf(line_ptr, "%*s %lld", &value) != 1) {
88	>	continue;
89	>	}
90	>
91	>	if (strncmp(line_ptr, "pgpgin ", 7) == 0) {
92	>	page_stats.pages_pagein = value;
93	>	} else if (strncmp(line_ptr, "pgpgout ", 8) == 0) {
94	>	page_stats.pages_pageout = value;
95	>	}
96	>	}
97	>
98		fclose(f);
99	+	} else if ((f = fopen("/proc/stat", "r")) != NULL) {
100	+	if ((line_ptr = f_read_line(f, "page")) == NULL) {
101	+	fclose(f);
102	+	return NULL;
103	+	}
104	+
105	+	if (sscanf(line_ptr, "page %lld %lld", &page_stats.pages_pagein, &page_stats.pages_pageout) != 2) {
106	+	return NULL;
107	+	}
108	+
109	+	fclose(f);
110	+	} else {
111		return NULL;
112		}
87	–	if((sscanf(line_ptr, "page %lld %lld", &page_stats.pages_pagein, &page_stats.pages_pageout))!=2){
88	–	return NULL;
89	–	}
90	–	page_stats.systime=time(NULL);
91	–	fclose(f);
92	–
113		#endif
114		#ifdef FREEBSD
115	<	if (sysctlbyname("vm.stats.vm.v_swappgsin", NULL, &size, NULL, NULL) < 0){
115	>	size = sizeof page_stats.pages_pagein;
116	>	if (sysctlbyname("vm.stats.vm.v_swappgsin", &page_stats.pages_pagein, &size, NULL, 0) < 0){
117		return NULL;
118		}
119	<	if (sysctlbyname("vm.stats.vm.v_swappgsin", &page_stats.pages_pagein, &size, NULL, NULL) < 0){
119	>	size = sizeof page_stats.pages_pageout;
120	>	if (sysctlbyname("vm.stats.vm.v_swappgsout", &page_stats.pages_pageout, &size, NULL, 0) < 0){
121		return NULL;
122		}
123	<	if (sysctlbyname("vm.stats.vm.v_swappgsout", NULL, &size, NULL, NULL) < 0){
124	<	return NULL;
125	<	}
126	<	if (sysctlbyname("vm.stats.vm.v_swappgsout", &page_stats.pages_pageout, &size, NULL, NULL) < 0){
127	<	return NULL;
128	<	}
129	<
123	>	#endif
124	>	#ifdef NETBSD
125	>	if ((uvm = get_uvmexp()) == NULL) {
126	>	return NULL;
127	>	}
128	>	page_stats.pages_pagein = uvm->pgswapin;
129	>	page_stats.pages_pageout = uvm->pgswapout;
130		#endif
131
132		return &page_stats;

Diff Legend

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