ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/cpu_stats.c

Comparing projects/libstatgrab/src/libstatgrab/cpu_stats.c (file contents):
Revision 1.19 by tdb, Mon Feb 16 14:55:32 2004 UTC vs.
Revision 1.20 by ats, Mon Apr 5 15:40:14 2004 UTC

#	Line 50 | Line 50
50		#include <sys/dkstat.h>
51		#endif
52
53	<	static cpu_states_t cpu_now;
53	>	static sg_cpu_stats cpu_now;
54		static int cpu_now_uninit=1;
55
56	<	cpu_states_t *get_cpu_totals(){
56	>	sg_cpu_stats *sg_get_cpu_stats(){
57
58		#ifdef SOLARIS
59		kstat_ctl_t *kc;
#	Line 159 | Line 159 | cpu_states_t *get_cpu_totals(){
159		return &cpu_now;
160		}
161
162	<	cpu_states_t *get_cpu_diff(){
163	<	static cpu_states_t cpu_diff;
164	<	cpu_states_t cpu_then, *cpu_tmp;
162	>	sg_cpu_stats *sg_get_cpu_stats_diff(){
163	>	static sg_cpu_stats cpu_diff;
164	>	sg_cpu_stats cpu_then, *cpu_tmp;
165
166		if (cpu_now_uninit){
167	<	if((cpu_tmp=get_cpu_totals())==NULL){
168	<	/* Should get_cpu_totals fail */
167	>	if((cpu_tmp=sg_get_cpu_stats())==NULL){
168	>	/* Should sg_get_cpu_stats fail */
169		return NULL;
170		}
171		return cpu_tmp;
#	Line 181 | Line 181 | cpu_states_t *get_cpu_diff(){
181		cpu_then.total=cpu_now.total;
182		cpu_then.systime=cpu_now.systime;
183
184	<	if((cpu_tmp=get_cpu_totals())==NULL){
184	>	if((cpu_tmp=sg_get_cpu_stats())==NULL){
185		return NULL;
186		}
187
#	Line 197 | Line 197 | cpu_states_t *get_cpu_diff(){
197		return &cpu_diff;
198		}
199
200	<	cpu_percent_t *cpu_percent_usage(){
201	<	static cpu_percent_t cpu_usage;
202	<	cpu_states_t *cs_ptr;
200	>	sg_cpu_percents *sg_get_cpu_percents(){
201	>	static sg_cpu_percents cpu_usage;
202	>	sg_cpu_stats *cs_ptr;
203
204	<	cs_ptr=get_cpu_diff();
204	>	cs_ptr=sg_get_cpu_stats_diff();
205		if(cs_ptr==NULL){
206		return NULL;
207		}

Diff Legend

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