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.19 by tdb, Tue Apr 6 14:52:58 2004 UTC vs.
Revision 1.20 by tdb, Wed Apr 7 14:53:40 2004 UTC

# Line 51 | Line 51 | static int page_stats_uninit=1;
51  
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;
# Line 67 | Line 67 | sg_page_stats *sg_get_page_stats(){
67   #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 >                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 >                }
82  
83                  page_stats.pages_pagein+=(long long)cs.cpu_vminfo.pgpgin;
84                  page_stats.pages_pageout+=(long long)cs.cpu_vminfo.pgpgout;
# Line 121 | Line 121 | sg_page_stats *sg_get_page_stats(){
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 <        }
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 <        }
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) {
# Line 163 | Line 163 | sg_page_stats *sg_get_page_stats_diff(){
163                  return NULL;
164          }
165  
166 <        page_stats_diff.pages_pagein=page_stats.pages_pagein-page_stats_diff.pages_pagein;
167 <        page_stats_diff.pages_pageout=page_stats.pages_pageout-page_stats_diff.pages_pageout;
168 <        page_stats_diff.systime=page_stats.systime-page_stats_diff.systime;
166 >        page_stats_diff.pages_pagein=page_stats.pages_pagein-page_stats_diff.pages_pagein;
167 >        page_stats_diff.pages_pageout=page_stats.pages_pageout-page_stats_diff.pages_pageout;
168 >        page_stats_diff.systime=page_stats.systime-page_stats_diff.systime;
169          
170          return &page_stats_diff;
171   }

Diff Legend

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