ViewVC Help

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

root/i-scream/projects/cms/source/idar/idar.c

Comparing projects/cms/source/idar/idar.c (file contents):
Revision 1.14 by pajs, Wed Apr 9 21:55:10 2003 UTC vs.
Revision 1.18 by tdb, Thu Aug 21 14:00:55 2003 UTC

#	Line 32 | Line 32
32		#include <netinet/in.h>
33		#include <netdb.h>
34		#include <sys/termios.h>
35	+	#include <signal.h>
36	+	#include <errno.h>
37
38		#include <libxml/xmlmemory.h>
39		#include <libxml/parser.h>
#	Line 174 | Line 176 | typedef struct{
176		int pages_in;
177		int pages_out;
178
179	<	int processes_total;
178	<	int processes_sleeping;
179	<	int processes_cpu;
180	<	int processes_zombie;
181	<	int processes_stopped;
179	>	int processes;
180
181		int network_io_total_tx;
182		int network_io_total_rx;
#	Line 223 | Line 221 | MKCMP(swap_used_pecent)
221		#define DISKIOW "DiskIO writes"
222		#define DISKIO "Total DiskIO (reads+writes)"
223
224	+	int sig_winch=0;
225
227	–	/*
228	–	int cmp_cpu(machine_data_list_t *a, machine_data_list_t *b){
229	–
230	–	if(a->cpu_used == b->cpu_used){
231	–	if(a->load_1 == b->load_1) return 0;
232	–	if(a->load_1 > b->load_1){
233	–	return -1;
234	–	}else{
235	–	return 1;
236	–	}
237	–	}
238	–
239	–	if((a->cpu_used) > (b->cpu_used)){
240	–	return -1;
241	–	}else{
242	–	return 1;
243	–	}
244	–	}
245	–	*/
246	–
226		#ifndef HAVE_ATOLL
227		long long int atoll (const char *nptr){
228		return strtoll (nptr, (char **) NULL, 10);
#	Line 718 | Line 697 | void display(machine_data_list_t *machine_data_list, d
697		printw("%5s", "(1m)");
698		x+=6;
699		}
700	+
701		if(display_config->pages_in && (display_config->maxx > x+6)){
702		move(1,x);
703		printw("%5s", "Page");
#	Line 725 | Line 705 | void display(machine_data_list_t *machine_data_list, d
705		printw("%5s", "ins");
706		x+=6;
707		}
708	+
709		if(display_config->pages_out && (display_config->maxx > x+6)){
710		move(1,x);
711		printw("%5s", "Page");
#	Line 732 | Line 713 | void display(machine_data_list_t *machine_data_list, d
713		printw("%5s", "outs");
714		x+=6;
715		}
716	+
717		if(display_config->memory_used_pecent && (display_config->maxx > x+6)){
718		move(1,x);
719		printw("%5s", "Mem");
#	Line 739 | Line 721 | void display(machine_data_list_t *machine_data_list, d
721		printw("%5s", "used");
722		x+=6;
723		}
724	+
725		if(display_config->swap_used_pecent  && (display_config->maxx > x+6)){
726		move(1,x);
727		printw("%5s", "Swap");
#	Line 746 | Line 729 | void display(machine_data_list_t *machine_data_list, d
729		printw("%5s", "used");
730		x+=6;
731		}
732	+
733		if(display_config->network_io_total_rx){
734		if(display_config->units=='b' && (display_config->maxx > x+9)){
735		move(1,x);
#	Line 754 | Line 738 | void display(machine_data_list_t *machine_data_list, d
738		printw("%8s", "rx");
739		x+=9;
740		}
741	+
742		if(display_config->units=='k' && (display_config->maxx > x+6)){
743		move(1,x);
744		printw("%5s", "Net");
#	Line 761 | Line 746 | void display(machine_data_list_t *machine_data_list, d
746		printw("%5s", "rx");
747		x+=6;
748		}
749	<	if(display_config->units=='m' && (display_config->maxx > x+5)){
749	>
750	>	if(display_config->units=='m' && (display_config->maxx > x+6)){
751		move(1,x);
752	<	printw("%4s", "Net");
752	>	printw("%5s", "Net");
753		move(2,x);
754	<	printw("%4s", "rx");
755	<	x+=5;
754	>	printw("%5s", "rx");
755	>	x+=6;
756		}
757	+
758		}
759	+
760		if(display_config->network_io_total_tx){
761		if(display_config->units=='b' && (display_config->maxx > x+9)){
762		move(1,x);
#	Line 777 | Line 765 | void display(machine_data_list_t *machine_data_list, d
765		printw("%8s", "tx");
766		x+=9;
767		}
768	+
769		if(display_config->units=='k' && (display_config->maxx > x+6)){
770		move(1,x);
771		printw("%5s", "Net");
#	Line 784 | Line 773 | void display(machine_data_list_t *machine_data_list, d
773		printw("%5s", "tx");
774		x+=6;
775		}
776	<	if(display_config->units=='m' && (display_config->maxx > x+5)){
776	>
777	>	if(display_config->units=='m' && (display_config->maxx > x+6)){
778		move(1,x);
779	<	printw("%4s", "Net");
779	>	printw("%5s", "Net");
780		move(2,x);
781	<	printw("%4s", "tx");
782	<	x+=5;
781	>	printw("%5s", "tx");
782	>	x+=6;
783		}
784	+
785		}
786
787		if(display_config->disk_io_total_read){
#	Line 801 | Line 792 | void display(machine_data_list_t *machine_data_list, d
792		printw("%9s", "read");
793		x+=10;
794		}
795	+
796		if(display_config->units=='k' && (display_config->maxx > x+7)){
797		move(1,x);
798		printw("%6s", "Disk");
#	Line 808 | Line 800 | void display(machine_data_list_t *machine_data_list, d
800		printw("%6s", "read");
801		x+=7;
802		}
803	<	if(display_config->units=='m' && (display_config->maxx > x+6)){
803	>
804	>	if(display_config->units=='m' && (display_config->maxx > x+7)){
805		move(1,x);
806	<	printw("%5s", "Disk");
806	>	printw("%6s", "Disk");
807		move(2,x);
808	<	printw("%5s", "read");
809	<	x+=6;
808	>	printw("%6s", "read");
809	>	x+=7;
810		}
811	+
812		}
813
814		if(display_config->disk_io_total_read){
#	Line 825 | Line 819 | void display(machine_data_list_t *machine_data_list, d
819		printw("%9s", "write");
820		x+=10;
821		}
822	+
823		if(display_config->units=='k' && (display_config->maxx > x+7)){
824		move(1,x);
825		printw("%6s", "Disk");
#	Line 832 | Line 827 | void display(machine_data_list_t *machine_data_list, d
827		printw("%6s", "write");
828		x+=7;
829		}
830	<	if(display_config->units=='m' && (display_config->maxx > x+6)){
830	>
831	>	if(display_config->units=='m' && (display_config->maxx > x+7)){
832		move(1,x);
833	<	printw("%5s", "Disk");
833	>	printw("%6s", "Disk");
834		move(2,x);
835	<	printw("%5s", "write");
836	<	x+=6;
835	>	printw("%6s", "write");
836	>	x+=7;
837		}
838	+
839		}
840	<
840	>
841	>	if(display_config->processes && (display_config->maxx > x+25)){
842	>	move(1,x);
843	>	printw("%-24s", "   Number of Process");
844	>	move(2,x);
845	>	printw("%-24s", " Run Slep Zomb Stop  Tot");
846	>	x+=25;
847	>	}
848	>
849		*title=0;
850		}
851
#	Line 885 | Line 890 | void display(machine_data_list_t *machine_data_list, d
890		printw(" %5lld", machine_data_list->network_io_total_rx/1024);
891		x+=6;
892		}
893	<	if(display_config->units=='m' && (display_config->maxx > x+5)){
894	<	printw(" %4.1f", (double)(machine_data_list->network_io_total_rx/(1024.00*1024.00)));
895	<	x+=5;
893	>	if(display_config->units=='m' && (display_config->maxx > x+6)){
894	>	printw(" %5.2f", (double)(machine_data_list->network_io_total_rx/(1024.00*1024.00)));
895	>	x+=6;
896		}
897		}
898
#	Line 900 | Line 905 | void display(machine_data_list_t *machine_data_list, d
905		printw(" %5lld", machine_data_list->network_io_total_tx/1024);
906		x+=6;
907		}
908	<	if(display_config->units=='m' && (display_config->maxx > x+5)){
909	<	printw(" %4.1f", (double)(machine_data_list->network_io_total_tx/(1024.00*1024.00)));
910	<	x+=5;
908	>	if(display_config->units=='m' && (display_config->maxx > x+6)){
909	>	printw(" %5.2f", (double)(machine_data_list->network_io_total_tx/(1024.00*1024.00)));
910	>	x+=6;
911		}
912		}
913
#	Line 915 | Line 920 | void display(machine_data_list_t *machine_data_list, d
920		printw(" %6lld", machine_data_list->disk_io_total_read/1024);
921		x+=7;
922		}
923	<	if(display_config->units=='m' && (display_config->maxx > x+6)){
924	<	printw(" %5.1f", (double)(machine_data_list->disk_io_total_read/(1024.00*1024.00)));
925	<	x+=6;
923	>	if(display_config->units=='m' && (display_config->maxx > x+7)){
924	>	printw(" %6.2f", (double)(machine_data_list->disk_io_total_read/(1024.00*1024.00)));
925	>	x+=7;
926		}
927		}
928
#	Line 930 | Line 935 | void display(machine_data_list_t *machine_data_list, d
935		printw(" %6lld", machine_data_list->disk_io_total_write/1024);
936		x+=7;
937		}
938	<	if(display_config->units=='m' && (display_config->maxx > x+6)){
939	<	printw(" %5.1f", (double)(machine_data_list->disk_io_total_write/(1024.00*1024.00)));
940	<	x+=6;
938	>	if(display_config->units=='m' && (display_config->maxx > x+7)){
939	>	printw(" %6.2f", (double)(machine_data_list->disk_io_total_write/(1024.00*1024.00)));
940	>	x+=7;
941		}
942		}
943	+	if(display_config->processes && display_config->maxx > x+25){
944	+	printw(" %4d %4d %4d %4d %4d", machine_data_list->processes_cpu, \
945	+	machine_data_list->processes_sleeping, \
946	+	machine_data_list->processes_zombie, \
947	+	machine_data_list->processes_stopped, \
948	+	machine_data_list->processes_total);
949	+	x+=25;
950	+	}
951
952		machine_data_list=machine_data_list->next;
953		}
#	Line 944 | Line 957 | void display(machine_data_list_t *machine_data_list, d
957
958		}
959
960	+	void sig_winch_handler(int sig){
961	+
962	+	sig_winch=1;
963	+	signal(SIGWINCH, sig_winch_handler);
964	+	}
965	+
966	+	void usage() {
967	+	printf("Usage: idar [-o order] [-s server] [-p port] [-l list] [-h]\n\n");
968	+	printf("  -o    Sets the initial sort order. Accepted arguments are one of:\n");
969	+	printf("            cpu load mem swap net disk\n");
970	+	printf("  -s    Specifies the i-scream server to connect to.\n");
971	+	printf("            default: %s\n", DEF_SERVER_NAME);
972	+	printf("  -p    Specifies the i-scream server port.\n");
973	+	printf("            default: %d\n", DEF_SERVER_PORT);
974	+	printf("  -l    Sets the list of hosts to monitor in a semi-colon separated list.\n");
975	+	printf("  -h    Displays this help information.\n");
976	+	printf("\nReport bugs to <%s>.\n", PACKAGE_BUGREPORT);
977	+	exit(1);
978	+	}
979	+
980		int main(int argc, char **argv){
981		WINDOW *window;
982		fd_set infds;
#	Line 955 | Line 988 | int main(int argc, char **argv){
988		char *machine_list=NULL;
989		char *response=NULL;
990
991	<	char *servername;
991	>	char *server_name;
992		int server_control_port;
993		int server_data_port;
994
#	Line 967 | Line 1000 | int main(int argc, char **argv){
1000		int cmdopt;
1001		extern int optind;
1002		extern char *optarg;
1003	+
1004	+	extern int errno;
1005
1006		display_config_t display_config;
1007		char ch;
#	Line 1002 | Line 1037 | int main(int argc, char **argv){
1037		display_config.pages_in=1;
1038		display_config.pages_out=1;
1039
1040	<	display_config.processes_total=0;
1006	<	display_config.processes_sleeping=0;
1007	<	display_config.processes_cpu=0;
1008	<	display_config.processes_zombie=0;
1009	<	display_config.processes_stopped=0;
1040	>	display_config.processes=1;
1041
1042		display_config.network_io_total_tx=1;
1043		display_config.network_io_total_rx=1;
#	Line 1017 | Line 1048 | int main(int argc, char **argv){
1048		display_config.disk_io_all_stats=0;
1049
1050		display_config.disk_total_used=0;
1051	<	display_config.disk_all_stats=0;
1051	>	display_config.disk_all_stats=0;
1052
1053	<	while((cmdopt=getopt(argc, argv, "s:"))  != -1){
1053	>	signal(SIGWINCH, sig_winch_handler);
1054	>
1055	>	server_name=DEF_SERVER_NAME;
1056	>	server_control_port=DEF_SERVER_PORT;
1057	>
1058	>	while((cmdopt=getopt(argc, argv, "o:s:p:l:h"))  != -1){
1059		switch(cmdopt){
1060	<	case 's':
1060	>	case 'o':
1061		if(!strcmp(optarg, "cpu")){
1062		sortby_ptr=cmp_cpu_used;
1063		strlcpy(display_config.sortby, CPU_USED, SORTBYMAXNAME);
#	Line 1035 | Line 1071 | int main(int argc, char **argv){
1071		strlcpy(display_config.sortby, MEM, SORTBYMAXNAME);
1072		}
1073		if(!strcmp(optarg, "swap")){
1074	<	sortby_ptr=cmp_swap_used_pecent;
1075	<	strlcpy(display_config.sortby, SWAP, SORTBYMAXNAME);
1076	<	}
1074	>	sortby_ptr=cmp_swap_used_pecent;
1075	>	strlcpy(display_config.sortby, SWAP, SORTBYMAXNAME);
1076	>	}
1077	>	if(!strcmp(optarg, "net")){
1078	>	sortby_ptr=cmp_network_io_total;
1079	>	strlcpy(display_config.sortby, NETIO, SORTBYMAXNAME);
1080	>	}
1081	>	if(!strcmp(optarg, "disk")){
1082	>	sortby_ptr=cmp_disk_io_total;
1083	>	strlcpy(display_config.sortby, DISKIO, SORTBYMAXNAME);
1084	>	}
1085		if(sortby_ptr==NULL){
1086	<	errf("Invalid sort type");
1087	<	exit(1);
1086	>	errf("Invalid order given.");
1087	>	usage();
1088		}
1089	<	break;
1089	>	break;
1090	>	case 's':
1091	>	server_name=optarg;
1092	>	break;
1093	>	case 'p':
1094	>	server_control_port=atoi(optarg);
1095	>	break;
1096	>	case 'l':
1097	>	/* We've been passed a machine list */
1098	>	/* list currently needs to be ; seperated */
1099	>	machine_list=strdup(optarg);
1100	>	break;
1101	>	case 'h':
1102	>	usage();
1103	>	break;
1104		}
1105		}
1106
1107	+	/* Don't take any other arguments */
1108	+	if(argc>optind){
1109	+	usage();
1110	+	}
1111	+
1112		if(sortby_ptr==NULL){
1113		sortby_ptr=cmp_cpu_used;
1114		strlcpy(display_config.sortby, "CPU Used", SORTBYMAXNAME);
1115		}
1116
1117	<	if(argc<(optind+2)){
1055	<	printf("Usage is %s <-d lines> hostname port <machine list>\n", argv[0]);
1056	<	exit(1);
1057	<	}
1058	<
1059	<	servername=argv[optind];
1060	<	server_control_port=atoi(argv[optind+1]);
1061	<
1062	<	control=create_tcp_connection(servername, server_control_port);
1117	>	control=create_tcp_connection(server_name, server_control_port);
1118		if(control==NULL){
1119		errf("Failed to connect (%m)");
1120		exit(1);
1121		}
1122
1068	–	if(argc==4){
1069	–	/* We've been passed a machine list */
1070	–	/* list currently needs to be ; seperated */
1071	–	machine_list=strdup(argv[3]);
1072	–	}
1073	–
1123		if((tcp_comm(control, NULL, &response, "PROTOCOL 1.1"))!=0){
1124		errf("Incorrect version number (%s)", response);
1125		exit(1);
#	Line 1103 | Line 1152 | int main(int argc, char **argv){
1152		exit(1);
1153		}
1154
1155	<	data=create_tcp_connection(servername, server_data_port);
1155	>	data=create_tcp_connection(server_name, server_data_port);
1156		if(data==NULL){
1157	<	errf("Failed to connect to host %s on port %d (%m)",servername, server_data_port);
1157	>	errf("Failed to connect to host %s on port %d (%m)",server_name, server_data_port);
1158		exit(1);
1159		}
1160
1112	–	/*
1113	–	printf("\033[2J");
1114	–	printf("\033[1;1HHostname     CPU   Load  Page  Page  Mem   Swap      Net      Net      Disk     Disk");
1115	–	printf("\033[2;1H             used%% (1m)  ins   outs  used  used      rx       tx       read     write");
1116	–	*/
1117	–
1161		initscr();
1162		nonl();
1163		cbreak();
1164	<	echo();
1164	>	noecho();
1165		window=newwin(0, 0, 0, 0);
1166		getmaxyx(window, display_config.maxy, display_config.maxx);
1167
#	Line 1131 | Line 1174 | int main(int argc, char **argv){
1174		FD_SET(stdin_fileno, &infds);
1175		FD_SET(data_fileno, &infds);
1176		if((select(biggest_fileno, &infds, NULL, NULL, NULL))==-1){
1177	+	if(errno!=EINTR){
1178	+	errf("select failed with (%m)");
1179	+	exit(1);
1180	+	}
1181	+	}
1182	+
1183	+	if(sig_winch){
1184		if (ioctl(fileno(stdout), TIOCGWINSZ, &size) == 0) {
1185		resizeterm(size.ws_row, size.ws_col);
1186		wrefresh(curscr);
#	Line 1139 | Line 1189 | int main(int argc, char **argv){
1189		title=1;
1190		display(machine_data_list, &display_config, &title);
1191		refresh();
1192	+	sig_winch=0;
1193		continue;
1194		}
1195
1196		if(FD_ISSET(stdin_fileno, &infds)){
1197
1198	<	ch=getc(stdin);
1198	>	ch=getch();
1199		switch(ch){
1200	+	case KEY_RESIZE:
1201	+	sig_winch=1;
1202	+	break;
1203
1204		/* Quit */
1205		case 'Q':
#	Line 1269 | Line 1323 | int main(int argc, char **argv){
1323		display_config.cpu_used=1;
1324		}
1325		break;
1326	+	case 'r':
1327	+	if(display_config.processes){
1328	+	display_config.processes=0;
1329	+	}else{
1330	+	display_config.processes=1;
1331	+	}
1332	+	break;
1333
1334		default:
1335	<	/* Invalid key.. Ignore.. Set Title to -1, as the
1275	<	* title++ will then make that "0" (false) so a
1276	<	* screen redraw will not happen */
1277	<	title=-1;
1278	<	break;
1335	>	continue;
1336		}
1337
1338		/* Increment title so it becomes true (and making the screen update */

Diff Legend

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