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.15 by tdb, Thu Feb 12 23:04:52 2004 UTC vs.
Revision 1.18 by ats, Mon Apr 5 15:40:15 2004 UTC

#	Line 37 | Line 37
37		#include <stdio.h>
38		#include <string.h>
39		#endif
40	<	#ifdef FREEBSD
40	>	#if defined(FREEBSD) || defined(DFBSD)
41		#include <sys/types.h>
42		#include <sys/sysctl.h>
43		#endif
44	<	#ifdef OPENBSD
45	<	#include <stdlib.h>
44	>	#if defined(NETBSD) || defined(OPENBSD)
45		#include <sys/param.h>
47	–	#include <sys/sysctl.h>
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 61 | Line 59 | page_stat_t *get_page_stats(){
59		FILE *f;
60		char *line_ptr;
61		#endif
62	<	#ifdef FREEBSD
62	>	#if defined(FREEBSD) || defined(DFBSD)
63		size_t size;
64		#endif
65		#if defined(NETBSD) || defined(OPENBSD)
66		struct uvmexp *uvm;
67		#endif
70	–	#ifdef OPENBSD
71	–	int mib[2];
72	–	size_t size;
73	–	#endif
68
69		page_stats.systime = time(NULL);
70		page_stats.pages_pagein=0;
#	Line 94 | 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 110 | 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 125 | Line 119 | page_stat_t *get_page_stats(){
119		return NULL;
120		}
121		#endif
122	<	#ifdef FREEBSD
122	>	#if defined(FREEBSD) || defined(DFBSD)
123		size = sizeof page_stats.pages_pagein;
124		if (sysctlbyname("vm.stats.vm.v_swappgsin", &page_stats.pages_pagein, &size, NULL, 0) < 0){
125		return NULL;
#	Line 135 | Line 129 | page_stat_t *get_page_stats(){
129		return NULL;
130		}
131		#endif
132	<	#ifdef NETBSD
133	<	if ((uvm = get_uvmexp()) == NULL) {
132	>	#if defined(NETBSD) || defined(OPENBSD)
133	>	if ((uvm = sg_get_uvmexp()) == NULL) {
134		return NULL;
135		}
142	–	#endif
143	–	#ifdef OPENBSD
144	–	mib[0] = CTL_VM;
145	–	mib[1] = VM_UVMEXP;
136
147	–	if (sysctl(mib, 2, NULL, &size, NULL, 0) < 0) {
148	–	return NULL;
149	–	}
150	–
151	–	uvm = malloc(size);
152	–	if (uvm == NULL) {
153	–	return NULL;
154	–	}
155	–
156	–	if (sysctl(mib, 2, uvm, &size, NULL, 0) < 0) {
157	–	return NULL;
158	–	}
159	–	#endif
160	–	#if defined(NETBSD) || defined(OPENBSD)
137		page_stats.pages_pagein = uvm->pgswapin;
138		page_stats.pages_pageout = uvm->pgswapout;
139		#endif
140
165	–	#ifdef OPENBSD
166	–	free(uvm);
167	–	#endif
168	–
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 186 | 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