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.11 by ats, Mon Nov 10 23:25:45 2003 UTC vs.
Revision 1.15 by tdb, Thu Feb 12 23:04:52 2004 UTC

#	Line 1 | Line 1
1	<	/*
1	>	/*
2		* i-scream central monitoring system
3		* http://www.i-scream.org
4	<	* Copyright (C) 2000-2003 i-scream
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 38 | Line 41
41		#include <sys/types.h>
42		#include <sys/sysctl.h>
43		#endif
44	+	#ifdef OPENBSD
45	+	#include <stdlib.h>
46	+	#include <sys/param.h>
47	+	#include <sys/sysctl.h>
48	+	#include <uvm/uvm.h>
49	+	#endif
50
51		static page_stat_t page_stats;
52		static int page_stats_uninit=1;
#	Line 55 | Line 64 | page_stat_t *get_page_stats(){
64		#ifdef FREEBSD
65		size_t size;
66		#endif
67	<	#ifdef NETBSD
67	>	#if defined(NETBSD) || defined(OPENBSD)
68		struct uvmexp *uvm;
69		#endif
70	+	#ifdef OPENBSD
71	+	int mib[2];
72	+	size_t size;
73	+	#endif
74
75		page_stats.systime = time(NULL);
76		page_stats.pages_pagein=0;
#	Line 103 | Line 116 | page_stat_t *get_page_stats(){
116		}
117
118		if (sscanf(line_ptr, "page %lld %lld", &page_stats.pages_pagein, &page_stats.pages_pageout) != 2) {
119	+	fclose(f);
120		return NULL;
121		}
122
#	Line 125 | Line 139 | page_stat_t *get_page_stats(){
139		if ((uvm = get_uvmexp()) == NULL) {
140		return NULL;
141		}
142	+	#endif
143	+	#ifdef OPENBSD
144	+	mib[0] = CTL_VM;
145	+	mib[1] = VM_UVMEXP;
146	+
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)
161		page_stats.pages_pagein = uvm->pgswapin;
162		page_stats.pages_pageout = uvm->pgswapout;
163	+	#endif
164	+
165	+	#ifdef OPENBSD
166	+	free(uvm);
167		#endif
168
169		return &page_stats;

Diff Legend

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