--- projects/cms/source/idar/idar.c 2003/03/30 10:58:21 1.5 +++ projects/cms/source/idar/idar.c 2003/03/30 22:16:20 1.7 @@ -33,7 +33,12 @@ #include #include #include "genmergesort.h" + +#ifdef HAVE_NCURSES_H +#include +#else #include +#endif struct host_line_t{ char *hostname; @@ -117,10 +122,12 @@ struct machine_data_t{ network_data_list_t *network_data_list; long long network_io_total_tx; long long network_io_total_rx; + long long network_io_total; diskio_data_list_t *diskio_data_list; long long disk_io_total_write; long long disk_io_total_read; + long long disk_io_total; /* Maybe in the future */ /* @@ -133,6 +140,7 @@ struct machine_data_t{ typedef struct machine_data_t machine_data_list_t; +#define SORTBYMAXNAME 128 typedef struct{ int cpu_user; int cpu_idle; @@ -174,6 +182,8 @@ typedef struct{ int disk_total_used; int disk_all_stats; + + char sortby[SORTBYMAXNAME]; }display_config_t; GENERIC_MERGE_SORT(static, sort_machine_stats, machine_data_list_t, next) @@ -185,13 +195,27 @@ int (*sortby_ptr)(machine_data_list_t *a, machine_data MKCMP(cpu_used) MKCMP(load_1) +MKCMP(network_io_total) MKCMP(network_io_total_tx) MKCMP(network_io_total_rx) +MKCMP(disk_io_total) MKCMP(disk_io_total_write) MKCMP(disk_io_total_read) MKCMP(memory_used_pecent) MKCMP(swap_used_pecent) +#define CPU_USED "CPU used" +#define LOAD "Load (1)" +#define NETIORX "total Network RX for all interfaces" +#define NETIOTX "total Network TX for all interfaces" +#define NETIO "total Network IO for all interfaces (rx+tx)" +#define MEM "Memory usage" +#define SWAP "Swap usage" +#define DISKIOR "DiskIO reads" +#define DISKIOW "DiskIO writes" +#define DISKIO "Total DiskIO (reads+writes)" + + /* int cmp_cpu(machine_data_list_t *a, machine_data_list_t *b){ @@ -559,6 +583,7 @@ int parse_xml(char *xml, machine_data_list_t **md){ machine_data_list->network_io_total_rx+=ndl_ptr->rx; ndl_ptr=ndl_ptr->next; } + machine_data_list->network_io_total=machine_data_list->network_io_total_rx+machine_data_list->network_io_total_tx; didl_ptr=machine_data_list->diskio_data_list; machine_data_list->disk_io_total_read=0; @@ -568,6 +593,7 @@ int parse_xml(char *xml, machine_data_list_t **md){ machine_data_list->disk_io_total_write+=didl_ptr->write; didl_ptr=didl_ptr->next; } + machine_data_list->disk_io_total=machine_data_list->disk_io_total_read+machine_data_list->disk_io_total_write; xmlFreeDoc(doc); @@ -578,12 +604,13 @@ int parse_xml(char *xml, machine_data_list_t **md){ void display(machine_data_list_t *machine_data_list, display_config_t *display_config, int num_lines, int *title){ int line_num=4; + int counter; int x=1; if(*title){ -// printf("\033[2J"); - // printf("\033[1;1HHostname CPU Load Page Page Mem Swap Net Net Disk Disk"); - // printw("\033[2;1H used%% (1m) ins outs used used rx tx read write"); + move (num_lines-3, 1); + printw("Sorting by %-64s", display_config->sortby); + move(1,1); printw("%-11s", "Hostname"); x=x+11+1; @@ -661,7 +688,8 @@ void display(machine_data_list_t *machine_data_list, d *title=0; } - for(;num_lines;num_lines--){ + /* Counter starts at 8, for padding (eg, headers, borders etc) */ + for(counter=8;countersysname); @@ -688,6 +716,7 @@ void display(machine_data_list_t *machine_data_list, d int main(int argc, char **argv){ WINDOW *window; fd_set infds; + int maxx, maxy; FILE *control; FILE *data; @@ -703,7 +732,7 @@ int main(int argc, char **argv){ int num_hosts; int max_display=0; - int title; + int title=1; int cmdopt; extern int optind; @@ -766,13 +795,20 @@ int main(int argc, char **argv){ case 's': if(!strcmp(optarg, "cpu")){ sortby_ptr=cmp_cpu_used; + strlcpy(display_config.sortby, CPU_USED, SORTBYMAXNAME); } if(!strcmp(optarg, "load")){ sortby_ptr=cmp_load_1; + strlcpy(display_config.sortby, LOAD, SORTBYMAXNAME); } if(!strcmp(optarg, "mem")){ sortby_ptr=cmp_memory_used_pecent; + strlcpy(display_config.sortby, MEM, SORTBYMAXNAME); } + if(!strcmp(optarg, "swap")){ + sortby_ptr=cmp_swap_used_pecent; + strlcpy(display_config.sortby, SWAP, SORTBYMAXNAME); + } if(sortby_ptr==NULL){ errf("Invalid sort type"); exit(1); @@ -781,7 +817,10 @@ int main(int argc, char **argv){ } } - if(sortby_ptr==NULL) sortby_ptr=cmp_cpu_used; + if(sortby_ptr==NULL){ + sortby_ptr=cmp_cpu_used; + strlcpy(display_config.sortby, "CPU Used", SORTBYMAXNAME); + } if(argc<(optind+2)){ printf("Usage is %s <-d lines> hostname port \n", argv[0]); @@ -850,11 +889,12 @@ int main(int argc, char **argv){ cbreak(); echo(); window=newwin(0, 0, 0, 0); + getmaxyx(window, maxy, maxx); stdin_fileno=fileno(stdin); data_fileno=fileno(data); biggest_fileno=(data_fileno>stdin_fileno) ? (data_fileno+1) : (stdin_fileno+1); - + for(;;){ FD_ZERO(&infds); FD_SET(stdin_fileno, &infds); @@ -864,11 +904,50 @@ int main(int argc, char **argv){ if(FD_ISSET(stdin_fileno, &infds)){ ch=getc(stdin); + switch(ch){ + case 'Q': + case 'q': + endwin(); + exit(0); + break; - if(ch=='q'){ - endwin(); - exit(0); + case 'C': + sortby_ptr=cmp_cpu_used; + strlcpy(display_config.sortby, CPU_USED, SORTBYMAXNAME); + break; + + case 'M': + sortby_ptr=cmp_memory_used_pecent; + strlcpy(display_config.sortby, MEM, SORTBYMAXNAME); + break; + + case 'L': + sortby_ptr=cmp_load_1; + strlcpy(display_config.sortby, LOAD, SORTBYMAXNAME); + break; + + case 'S': + sortby_ptr=cmp_swap_used_pecent; + strlcpy(display_config.sortby, SWAP, SORTBYMAXNAME); + break; + + case 'N': + if(sortby_ptr==cmp_network_io_total){ + strlcpy(display_config.sortby, NETIORX, SORTBYMAXNAME); + sortby_ptr=cmp_network_io_total_rx; + }else if(sortby_ptr==cmp_network_io_total_rx){ + strlcpy(display_config.sortby, NETIOTX, SORTBYMAXNAME); + sortby_ptr=cmp_network_io_total_tx; + }else{ + strlcpy(display_config.sortby, NETIO, SORTBYMAXNAME); + sortby_ptr=cmp_network_io_total; + } + break; + } + + title=1; + } if(FD_ISSET(data_fileno, &infds)){ response=fpgetline(data); @@ -883,7 +962,7 @@ int main(int argc, char **argv){ if(num_hosts==-1) continue; machine_data_list=sort_machine_stats(machine_data_list, num_hosts, sortby_ptr); if(max_display==0){ - display(machine_data_list, &display_config, num_hosts, &title); + display(machine_data_list, &display_config, maxy, &title); }else{ display(machine_data_list, &display_config, max_display, &title); }