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.8 by pajs, Mon Mar 31 11:30:54 2003 UTC vs.
Revision 1.19 by tdb, Mon Feb 16 14:55:32 2004 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * i-scream central monitoring system
3 < * http://www.i-scream.org.uk
4 < * Copyright (C) 2000-2002 i-scream
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  02111-1307 USA
19 > *
20 > * $Id$
21   */
22  
23   #ifdef HAVE_CONFIG_H
# Line 29 | Line 31
31   #include <sys/sysinfo.h>
32   #include <string.h>
33   #endif
34 < #ifdef LINUX
34 > #if defined(LINUX) || defined(CYGWIN)
35   #include <stdio.h>
36   #endif
37 + #if defined(FREEBSD) || defined(DFBSD)
38 + #include <sys/sysctl.h>
39 + #include <sys/dkstat.h>
40 + #endif
41 + #ifdef NETBSD
42 + #include <sys/types.h>
43 + #include <sys/param.h>
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 43 | Line 60 | cpu_states_t *get_cpu_totals(){
60          kstat_t *ksp;
61          cpu_stat_t cs;
62   #endif
63 < #ifdef LINUX
63 > #if defined(LINUX) || defined(CYGWIN)
64          FILE *f;
65   #endif
66 + #ifdef ALLBSD
67 + #if defined(NETBSD) || defined(OPENBSD)
68 +        int mib[2];
69 + #endif
70 + #ifdef NETBSD
71 +        u_int64_t cp_time[CPUSTATES];
72 + #else
73 +        long cp_time[CPUSTATES];
74 + #endif
75 +        size_t size;
76 + #endif
77          
78          cpu_now.user=0;
79 <        /* Not stored in linux */
79 >        /* Not stored in linux or freebsd */
80          cpu_now.iowait=0;
81          cpu_now.kernel=0;
82          cpu_now.idle=0;
83 <        /* Not stored in linux */
83 >        /* Not stored in linux or freebsd */
84          cpu_now.swap=0;
85          cpu_now.total=0;
86          /* Not stored in solaris */
# Line 78 | Line 106 | cpu_states_t *get_cpu_totals(){
106          
107          kstat_close(kc);
108   #endif
109 < #ifdef LINUX
109 > #if defined(LINUX) || defined(CYGWIN)
110          if ((f=fopen("/proc/stat", "r" ))==NULL) {
111                  return NULL;
112          }
# Line 95 | Line 123 | cpu_states_t *get_cpu_totals(){
123          fclose(f);
124  
125          cpu_now.total=cpu_now.user+cpu_now.nice+cpu_now.kernel+cpu_now.idle;
126 + #endif
127 + #ifdef ALLBSD
128 + #if defined(FREEBSD) || defined(DFBSD)
129 +        size = sizeof cp_time;
130 +        if (sysctlbyname("kern.cp_time", &cp_time, &size, NULL, 0) < 0){
131 +                return NULL;
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;
143 +        }
144 + #endif
145 +
146 +        cpu_now.user=cp_time[CP_USER];
147 +        cpu_now.nice=cp_time[CP_NICE];
148 +        cpu_now.kernel=cp_time[CP_SYS];
149 +        cpu_now.idle=cp_time[CP_IDLE];
150 +        
151 +        cpu_now.total=cpu_now.user+cpu_now.nice+cpu_now.kernel+cpu_now.idle;
152 +
153   #endif
154  
155          cpu_now.systime=time(NULL);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines