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

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.22 by ats, Sun Jul 18 21:30:11 2004 UTC

# Line 1 | Line 1
1   /*
2 < * i-scream central monitoring system
2 > * i-scream libstatgrab
3   * http://www.i-scream.org
4   * Copyright (C) 2000-2004 i-scream
5   *
# 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;
56 <        cpu_stat_t cs;
54 >        kstat_ctl_t *kc;
55 >        kstat_t *ksp;
56 >        cpu_stat_t cs;
57   #endif
58   #if defined(LINUX) || defined(CYGWIN)
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;
71 <        page_stats.pages_pageout=0;
70 >        page_stats.pages_pagein=0;
71 >        page_stats.pages_pageout=0;
72  
73   #ifdef SOLARIS
74 <        if ((kc = kstat_open()) == NULL) {
75 <                return NULL;
76 <        }
77 <        for (ksp = kc->kc_chain; ksp!=NULL; ksp = ksp->ks_next) {
78 <                if ((strcmp(ksp->ks_module, "cpu_stat")) != 0) continue;
79 <                if (kstat_read(kc, ksp, &cs) == -1) {
80 <                        continue;
81 <                }
74 >        if ((kc = kstat_open()) == NULL) {
75 >                sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
76 >                return NULL;
77 >        }
78 >        for (ksp = kc->kc_chain; ksp!=NULL; ksp = ksp->ks_next) {
79 >                if ((strcmp(ksp->ks_module, "cpu_stat")) != 0) continue;
80 >                if (kstat_read(kc, ksp, &cs) == -1) {
81 >                        continue;
82 >                }
83  
84                  page_stats.pages_pagein+=(long long)cs.cpu_vminfo.pgpgin;
85                  page_stats.pages_pageout+=(long long)cs.cpu_vminfo.pgpgout;
# Line 94 | Line 89 | page_stat_t *get_page_stats(){
89   #endif
90   #if defined(LINUX) || defined(CYGWIN)
91          if ((f = fopen("/proc/vmstat", "r")) != NULL) {
92 <                while ((line_ptr = f_read_line(f, "")) != NULL) {
92 >                while ((line_ptr = sg_f_read_line(f, "")) != NULL) {
93                          long long value;
94  
95                          if (sscanf(line_ptr, "%*s %lld", &value) != 1) {
# Line 110 | Line 105 | page_stat_t *get_page_stats(){
105  
106                  fclose(f);
107          } else if ((f = fopen("/proc/stat", "r")) != NULL) {
108 <                if ((line_ptr = f_read_line(f, "page")) == NULL) {
108 >                if ((line_ptr = sg_f_read_line(f, "page")) == NULL) {
109 >                        sg_set_error(SG_ERROR_PARSE, "page");
110                          fclose(f);
111                          return NULL;
112                  }
113  
114                  if (sscanf(line_ptr, "page %lld %lld", &page_stats.pages_pagein, &page_stats.pages_pageout) != 2) {
115 +                        sg_set_error(SG_ERROR_PARSE, "page");
116                          fclose(f);
117                          return NULL;
118                  }
119  
120                  fclose(f);
121          } else {
122 +                sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/stat");
123                  return NULL;
124          }
125   #endif
126 < #ifdef FREEBSD
126 > #if defined(FREEBSD) || defined(DFBSD)
127          size = sizeof page_stats.pages_pagein;
128 <        if (sysctlbyname("vm.stats.vm.v_swappgsin", &page_stats.pages_pagein, &size, NULL, 0) < 0){
129 <                return NULL;
130 <        }
133 <        size = sizeof page_stats.pages_pageout;
134 <        if (sysctlbyname("vm.stats.vm.v_swappgsout", &page_stats.pages_pageout, &size, NULL, 0) < 0){
135 <                return NULL;
136 <        }
137 < #endif
138 < #ifdef NETBSD
139 <        if ((uvm = get_uvmexp()) == NULL) {
128 >        if (sysctlbyname("vm.stats.vm.v_swappgsin", &page_stats.pages_pagein, &size, NULL, 0) < 0){
129 >                sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
130 >                                        "vm.stats.vm.v_swappgsin");
131                  return NULL;
132          }
133 < #endif
134 < #ifdef OPENBSD
135 <        mib[0] = CTL_VM;
136 <        mib[1] = VM_UVMEXP;
146 <
147 <        if (sysctl(mib, 2, NULL, &size, NULL, 0) < 0) {
133 >        size = sizeof page_stats.pages_pageout;
134 >        if (sysctlbyname("vm.stats.vm.v_swappgsout", &page_stats.pages_pageout, &size, NULL, 0) < 0){
135 >                sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
136 >                                        "vm.stats.vm.v_swappgsout");
137                  return NULL;
138          }
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 –        }
139   #endif
140   #if defined(NETBSD) || defined(OPENBSD)
141 +        if ((uvm = sg_get_uvmexp()) == NULL) {
142 +                return NULL;
143 +        }
144 +
145          page_stats.pages_pagein = uvm->pgswapin;
146          page_stats.pages_pageout = uvm->pgswapout;
147   #endif
148  
165 – #ifdef OPENBSD
166 –        free(uvm);
167 – #endif
168 –
149          return &page_stats;
150   }
151  
152 < page_stat_t *get_page_stats_diff(){
153 <        page_stat_t *page_ptr;
154 <        static page_stat_t page_stats_diff;
152 > sg_page_stats *sg_get_page_stats_diff(){
153 >        sg_page_stats *page_ptr;
154 >        static sg_page_stats page_stats_diff;
155  
156          if(page_stats_uninit){
157 <                page_ptr=get_page_stats();
157 >                page_ptr=sg_get_page_stats();
158                  if(page_ptr==NULL){
159                          return NULL;
160                  }
# Line 186 | Line 166 | page_stat_t *get_page_stats_diff(){
166          page_stats_diff.pages_pageout=page_stats.pages_pageout;
167          page_stats_diff.systime=page_stats.systime;
168  
169 <        page_ptr=get_page_stats();
169 >        page_ptr=sg_get_page_stats();
170          if(page_ptr==NULL){
171                  return NULL;
172          }
173  
174 <        page_stats_diff.pages_pagein=page_stats.pages_pagein-page_stats_diff.pages_pagein;
175 <        page_stats_diff.pages_pageout=page_stats.pages_pageout-page_stats_diff.pages_pageout;
176 <        page_stats_diff.systime=page_stats.systime-page_stats_diff.systime;
174 >        page_stats_diff.pages_pagein=page_stats.pages_pagein-page_stats_diff.pages_pagein;
175 >        page_stats_diff.pages_pageout=page_stats.pages_pageout-page_stats_diff.pages_pageout;
176 >        page_stats_diff.systime=page_stats.systime-page_stats_diff.systime;
177          
178          return &page_stats_diff;
179   }

Diff Legend

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