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.4 by pajs, Fri Mar 7 14:44:38 2003 UTC vs.
Revision 1.19 by tdb, Tue Apr 6 14:52:58 2004 UTC

#	Line 1 | Line 1
1	<	/*
2	<	* i-scream central monitoring system
3	<	* http://www.i-scream.org.uk
4	<	* Copyright (C) 2000-2002 i-scream
1	>	/*
2	>	* i-scream libstatgrab
3	>	* http://www.i-scream.org
4	>	* Copyright (C) 2000-2004 i-scream
5		*
6	<	* This program is free software; you can redistribute it and/or
7	<	* modify it under the terms of the GNU General Public License
8	<	* as published by the Free Software Foundation; either version 2
9	<	* of the License, or (at your option) any later version.
6	>	* This library is free software; you can redistribute it and/or
7	>	* modify it under the terms of the GNU Lesser General Public
8	>	* License as published by the Free Software Foundation; either
9	>	* version 2.1 of the License, or (at your option) any later version.
10		*
11	<	* This program is distributed in the hope that it will be useful,
11	>	* This library is distributed in the hope that it will be useful,
12		* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	<	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	<	* GNU General Public License for more details.
13	>	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14	>	* Lesser General Public License for more details.
15		*
16	<	* You should have received a copy of the GNU General Public License
17	<	* along with this program; if not, write to the Free Software
18	<	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16	>	* You should have received a copy of the GNU Lesser General Public
17	>	* License along with this library; if not, write to the Free Software
18	>	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
19	>	* 02111-1307 USA
20	>	*
21	>	* $Id$
22		*/
23
24		#ifdef HAVE_CONFIG_H
#	Line 23 | Line 26
26		#endif
27
28		#include "statgrab.h"
29	+	#include "tools.h"
30		#include <time.h>
31		#ifdef SOLARIS
32		#include <kstat.h>
33		#include <sys/sysinfo.h>
34		#include <string.h>
35		#endif
36	<	#ifdef LINUX
36	>	#if defined(LINUX) || defined(CYGWIN)
37		#include <stdio.h>
38	<	#include "tools.h"
38	>	#include <string.h>
39		#endif
40	+	#if defined(FREEBSD) || defined(DFBSD)
41	+	#include <sys/types.h>
42	+	#include <sys/sysctl.h>
43	+	#endif
44	+	#if defined(NETBSD) || defined(OPENBSD)
45	+	#include <sys/param.h>
46	+	#include <uvm/uvm.h>
47	+	#endif
48
49	<
38	<	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;
56		cpu_stat_t cs;
57		#endif
58	<	#ifdef LINUX
58	>	#if defined(LINUX) || defined(CYGWIN)
59		FILE *f;
60		char *line_ptr;
61		#endif
62	+	#if defined(FREEBSD) || defined(DFBSD)
63	+	size_t size;
64	+	#endif
65	+	#if defined(NETBSD) || defined(OPENBSD)
66	+	struct uvmexp *uvm;
67	+	#endif
68
69	+	page_stats.systime = time(NULL);
70		page_stats.pages_pagein=0;
71		page_stats.pages_pageout=0;
72
#	Line 66 | Line 84 | page_stat_t *get_page_stats(){
84		page_stats.pages_pageout+=(long long)cs.cpu_vminfo.pgpgout;
85		}
86
69	–	page_stats.systime=time(NULL);
70	–
87		kstat_close(kc);
88		#endif
89	<	#ifdef LINUX
90	<	if((f=fopen("/proc/stat", "r"))==NULL){
91	<	return NULL;
92	<	}
93	<	if((line_ptr=f_read_line(f, "page"))==NULL){
89	>	#if defined(LINUX) || defined(CYGWIN)
90	>	if ((f = fopen("/proc/vmstat", "r")) != 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) {
95	>	continue;
96	>	}
97	>
98	>	if (strncmp(line_ptr, "pgpgin ", 7) == 0) {
99	>	page_stats.pages_pagein = value;
100	>	} else if (strncmp(line_ptr, "pgpgout ", 8) == 0) {
101	>	page_stats.pages_pageout = value;
102	>	}
103	>	}
104	>
105		fclose(f);
106	+	} else if ((f = fopen("/proc/stat", "r")) != NULL) {
107	+	if ((line_ptr = sg_f_read_line(f, "page")) == NULL) {
108	+	fclose(f);
109	+	return NULL;
110	+	}
111	+
112	+	if (sscanf(line_ptr, "page %lld %lld", &page_stats.pages_pagein, &page_stats.pages_pageout) != 2) {
113	+	fclose(f);
114	+	return NULL;
115	+	}
116	+
117	+	fclose(f);
118	+	} else {
119		return NULL;
120		}
121	<	if((sscanf(line_ptr, "page %lld %lld", &page_stats.pages_pagein, &page_stats.pages_pageout))!=2){
121	>	#endif
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;
126	>	}
127	>	size = sizeof page_stats.pages_pageout;
128	>	if (sysctlbyname("vm.stats.vm.v_swappgsout", &page_stats.pages_pageout, &size, NULL, 0) < 0){
129	>	return NULL;
130	>	}
131	>	#endif
132	>	#if defined(NETBSD) || defined(OPENBSD)
133	>	if ((uvm = sg_get_uvmexp()) == NULL) {
134		return NULL;
135		}
84	–	page_stats.systime=time(NULL);
85	–	fclose(f);
136
137	+	page_stats.pages_pagein = uvm->pgswapin;
138	+	page_stats.pages_pageout = uvm->pgswapout;
139		#endif
140
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 106 | 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