--- projects/cms/source/ihost/ihost.c	2004/01/07 11:37:10	1.48
+++ projects/cms/source/ihost/ihost.c	2004/05/30 17:13:05	1.50
@@ -241,7 +241,7 @@ int tcp_comm(FILE *f, char *send, char **response, cha
 	*response=fpgetline(f);
 	fseek(f, 0, SEEK_CUR);
 
-	if(*response!=NULL) log_msg(LOG_DEBUG, "Recieved %s", *response);
+	if(*response!=NULL) log_msg(LOG_DEBUG, "Received %s", *response);
 
 	if( (*response==NULL) || (strcmp(*response, "ERROR")==0) ) return -1;
 	
@@ -432,17 +432,17 @@ error:
 
 int get_system_stats(int seq_no, ihost_state_t *ihost_state, char *xml, int size){
 	char tmp[size];
-	cpu_percent_t *cpu_percent;	
-	mem_stat_t *mem_stats;
-	load_stat_t *load_stats;
-	user_stat_t *user_stats;
-	swap_stat_t *swap_stats;
-	general_stat_t *general_stats;
-	disk_stat_t *disk_stats;
-	diskio_stat_t *diskio_stats;
-	process_stat_t *process_stats;
-	network_stat_t *network_stats;
-	page_stat_t *page_stats;
+	sg_cpu_percents *cpu_percent;	
+	sg_mem_stats *mem_stats;
+	sg_load_stats *load_stats;
+	sg_user_stats *user_stats;
+	sg_swap_stats *swap_stats;
+	sg_host_info *general_stats;
+	sg_fs_stats *disk_stats;
+	sg_disk_io_stats *diskio_stats;
+	sg_process_count *process_stats;
+	sg_network_io_stats *network_stats;
+	sg_page_stats *page_stats;
 	int disk_entries=0;
 	int diskio_entries=0;
 	int network_entries=0;
@@ -456,7 +456,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 		 seq_no, ihost_state->host_fqdn, time(NULL), ihost_state->host_ip);
 
 	/* Get cpu stats, check it is correct, then fill in its entry for the xml */
-	if((cpu_percent=cpu_percent_usage())==NULL){
+	if((cpu_percent=sg_get_cpu_percents())==NULL){
 		log_msg(LOG_CRIT, "Failed to get cpu statistics");
 	}else{
 		snprintf(tmp, size, \
@@ -472,7 +472,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 	
 	/*Get mem stats, and fill in xml */	
-	if((mem_stats=get_memory_stats())==NULL){
+	if((mem_stats=sg_get_mem_stats())==NULL){
 		log_msg(LOG_CRIT, "Failed to get memory statistics");
 	}else{
 		snprintf(tmp, size, \
@@ -487,7 +487,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 
 	/* Get load stats */	
-	if((load_stats=get_load_stats())==NULL){
+	if((load_stats=sg_get_load_stats())==NULL){
 		log_msg(LOG_CRIT, "Failed to get load statistics");
 	}else{
 		snprintf(tmp, size, \
@@ -501,7 +501,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 	/* get user stats */
 	
-	if((user_stats=get_user_stats())==NULL){
+	if((user_stats=sg_get_user_stats())==NULL){
 		log_msg(LOG_CRIT, "Failed to get user statistics");
 	}else{
 
@@ -515,7 +515,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 
 	/* swap stats */
-	if((swap_stats=get_swap_stats())==NULL){
+	if((swap_stats=sg_get_swap_stats())==NULL){
 		log_msg(LOG_CRIT, "Failed to get swap statistics");	
 	}else{
 		snprintf(tmp, size, \
@@ -530,7 +530,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 	/* general stats */
 	
-	if((general_stats=get_general_stats())==NULL){
+	if((general_stats=sg_get_host_info())==NULL){
 		log_msg(LOG_CRIT, "Failed to get general statistics");
 	}else{
 		snprintf(tmp, size, \
@@ -548,7 +548,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 	
 	/* process stats */
-	if((process_stats=get_process_stats())==NULL){	
+	if((process_stats=sg_get_process_count())==NULL){	
 		log_msg(LOG_CRIT, "Failed to get general statistics");
 	}else{
 		snprintf(tmp, size, \
@@ -565,7 +565,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 
 	/* Get paging stats */
-	if((page_stats=get_page_stats_diff())==NULL){
+	if((page_stats=sg_get_page_stats_diff())==NULL){
 		log_msg(LOG_CRIT, "Failed to get paging statistics");
 	}else{
 		if(page_stats->systime!=0){
@@ -586,7 +586,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 	/* get diskio stats */
 	
-	if((diskio_stats=get_diskio_stats_diff(&diskio_entries))==NULL){
+	if((diskio_stats=sg_get_disk_io_stats_diff(&diskio_entries))==NULL){
 		log_msg(LOG_CRIT, "Failed to get diskio statistics");
 	}else{
 		strlcat(xml, "<diskio>", size);
@@ -619,7 +619,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 	
 	/* get networks stats */
 	
-	if((network_stats=get_network_stats_diff(&network_entries))==NULL){
+	if((network_stats=sg_get_network_io_stats_diff(&network_entries))==NULL){
 		log_msg(LOG_CRIT, "Failed to get network statistics");
 	}else{
 		strlcat(xml, "<net>", size);
@@ -651,7 +651,7 @@ int get_system_stats(int seq_no, ihost_state_t *ihost_
 
 	/* get disk stats */
 	
-	if((disk_stats=get_disk_stats(&disk_entries))==NULL){
+	if((disk_stats=sg_get_fs_stats(&disk_entries))==NULL){
 		log_msg(LOG_CRIT, "Failed to get disk statistics");
 	}else{
 		strlcat(xml, "<disk>", size);