ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/libstatgrab/src/libstatgrab/cpu_stats.c
(Generate patch)

Comparing projects/libstatgrab/src/libstatgrab/cpu_stats.c (file contents):
Revision 1.15 by tdb, Tue Nov 11 10:27:04 2003 UTC vs.
Revision 1.18 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  02111-1307 USA
19 > *
20 > * $Id$
21   */
22  
23   #ifdef HAVE_CONFIG_H
# Line 42 | Line 44
44   #include <sys/sysctl.h>
45   #include <sys/sched.h>
46   #endif
47 + #ifdef OPENBSD
48 + #include <sys/param.h>
49 + #include <sys/sysctl.h>
50 + #include <sys/dkstat.h>
51 + #endif
52  
53   static cpu_states_t cpu_now;
54   static int cpu_now_uninit=1;
# Line 125 | Line 132 | cpu_states_t *get_cpu_totals(){
132          }
133   #else
134          mib[0] = CTL_KERN;
135 + #ifdef NETBSD
136          mib[1] = KERN_CP_TIME;
137 + #else
138 +        mib[1] = KERN_CPTIME;
139 + #endif
140          size = sizeof cp_time;
141          if (sysctl(mib, 2, &cp_time, &size, NULL, 0) < 0) {
142                  return NULL;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines