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.4 by pajs, Sun Mar 30 01:14:49 2003 UTC vs.
Revision 1.17 by tdb, Thu Aug 21 13:51:19 2003 UTC

#	Line 29 | Line 29
29		#include <unistd.h>
30		#include <stdlib.h>
31		#include <ukcprog.h>
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>
40		#include "genmergesort.h"
41	+
42	+	#ifdef HAVE_NCURSES_H
43	+	#include <ncurses.h>
44	+	#else
45		#include <curses.h>
46	+	#endif
47
48		struct host_line_t{
49		char *hostname;
#	Line 117 | Line 127 | struct machine_data_t{
127		network_data_list_t *network_data_list;
128		long long network_io_total_tx;
129		long long network_io_total_rx;
130	+	long long network_io_total;
131
132		diskio_data_list_t *diskio_data_list;
133		long long disk_io_total_write;
134		long long disk_io_total_read;
135	+	long long disk_io_total;
136
137		/* Maybe in the future */
138		/*
#	Line 133 | Line 145 | struct machine_data_t{
145
146		typedef struct machine_data_t machine_data_list_t;
147
148	+	#define SORTBYMAXNAME 128
149		typedef struct{
150	+	int maxx;
151	+	int maxy;
152	+
153	+	char units;
154	+
155		int cpu_user;
156		int cpu_idle;
157		int cpu_iowait;
#	Line 158 | Line 176 | typedef struct{
176		int pages_in;
177		int pages_out;
178
179	<	int processes_total;
162	<	int processes_sleeping;
163	<	int processes_cpu;
164	<	int processes_zombie;
165	<	int processes_stopped;
179	>	int processes;
180
181		int network_io_total_tx;
182		int network_io_total_rx;
#	Line 174 | Line 188 | typedef struct{
188
189		int disk_total_used;
190		int disk_all_stats;
191	+
192	+	char sortby[SORTBYMAXNAME];
193		}display_config_t;
194
195		GENERIC_MERGE_SORT(static, sort_machine_stats, machine_data_list_t, next)
#	Line 185 | Line 201 | int (*sortby_ptr)(machine_data_list_t *a, machine_data
201
202		MKCMP(cpu_used)
203		MKCMP(load_1)
204	+	MKCMP(network_io_total)
205		MKCMP(network_io_total_tx)
206		MKCMP(network_io_total_rx)
207	+	MKCMP(disk_io_total)
208		MKCMP(disk_io_total_write)
209		MKCMP(disk_io_total_read)
210		MKCMP(memory_used_pecent)
211		MKCMP(swap_used_pecent)
212
213	+	#define CPU_USED "CPU used"
214	+	#define LOAD "Load (1)"
215	+	#define NETIORX "total Network RX for all interfaces"
216	+	#define NETIOTX "total Network TX for all interfaces"
217	+	#define NETIO "total Network IO for all interfaces (rx+tx)"
218	+	#define MEM "Memory usage"
219	+	#define SWAP "Swap usage"
220	+	#define DISKIOR "DiskIO reads"
221	+	#define DISKIOW "DiskIO writes"
222	+	#define DISKIO "Total DiskIO (reads+writes)"
223	+
224	+	int sig_winch=0;
225	+
226	+	#ifndef HAVE_ATOLL
227	+	long long int atoll (const char *nptr){
228	+	return strtoll (nptr, (char **) NULL, 10);
229	+	}
230	+	#endif
231	+
232	+	#ifndef HAVE_STRLCPY
233		/*
234	<	int cmp_cpu(machine_data_list_t *a, machine_data_list_t *b){
234	>	* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
235	>	* All rights reserved.
236	>	*
237	>	* Redistribution and use in source and binary forms, with or without
238	>	* modification, are permitted provided that the following conditions
239	>	* are met:
240	>	* 1. Redistributions of source code must retain the above copyright
241	>	*    notice, this list of conditions and the following disclaimer.
242	>	* 2. Redistributions in binary form must reproduce the above copyright
243	>	*    notice, this list of conditions and the following disclaimer in the
244	>	*    documentation and/or other materials provided with the distribution.
245	>	* 3. The name of the author may not be used to endorse or promote products
246	>	*    derived from this software without specific prior written permission.
247	>	*
248	>	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
249	>	* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
250	>	* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
251	>	* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
252	>	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
253	>	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
254	>	* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
255	>	* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
256	>	* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
257	>	* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
258	>	*/
259
260	<	if(a->cpu_used == b->cpu_used){
261	<	if(a->load_1 == b->load_1) return 0;
262	<	if(a->load_1 > b->load_1){
263	<	return -1;
264	<	}else{
265	<	return 1;
266	<	}
267	<	}
260	>	/*
261	>	* Copy src to string dst of size siz.  At most siz-1 characters
262	>	* will be copied.  Always NUL terminates (unless siz == 0).
263	>	* Returns strlen(src); if retval >= siz, truncation occurred.
264	>	*/
265	>	size_t
266	>	strlcpy(dst, src, siz)
267	>	char *dst;
268	>	const char *src;
269	>	size_t siz;
270	>	{
271	>	register char *d = dst;
272	>	register const char *s = src;
273	>	register size_t n = siz;
274
275	<	if((a->cpu_used) > (b->cpu_used)){
276	<	return -1;
277	<	}else{
278	<	return 1;
279	<	}
275	>	/* Copy as many bytes as will fit */
276	>	if (n != 0 && --n != 0) {
277	>	do {
278	>	if ((*d++ = *s++) == 0)
279	>	break;
280	>	} while (--n != 0);
281	>	}
282	>
283	>	/* Not enough room in dst, add NUL and traverse rest of src */
284	>	if (n == 0) {
285	>	if (siz != 0)
286	>	*d = '\0';              /* NUL-terminate dst */
287	>	while (*s++)
288	>	;
289	>	}
290	>
291	>	return(s - src - 1);    /* count does not include NUL */
292		}
293	<	*/
293	>
294	>	#endif
295	>
296
297		FILE *create_tcp_connection(char *hostname, int port){
298		int sock;
#	Line 559 | Line 641 | int parse_xml(char *xml, machine_data_list_t **md){
641		machine_data_list->network_io_total_rx+=ndl_ptr->rx;
642		ndl_ptr=ndl_ptr->next;
643		}
644	+	machine_data_list->network_io_total=machine_data_list->network_io_total_rx+machine_data_list->network_io_total_tx;
645
646		didl_ptr=machine_data_list->diskio_data_list;
647		machine_data_list->disk_io_total_read=0;
#	Line 568 | Line 651 | int parse_xml(char *xml, machine_data_list_t **md){
651		machine_data_list->disk_io_total_write+=didl_ptr->write;
652		didl_ptr=didl_ptr->next;
653		}
654	+	machine_data_list->disk_io_total=machine_data_list->disk_io_total_read+machine_data_list->disk_io_total_write;
655
656		xmlFreeDoc(doc);
657
#	Line 576 | Line 660 | int parse_xml(char *xml, machine_data_list_t **md){
660
661		}
662
663	<	void display(machine_data_list_t *machine_data_list, display_config_t *display_config, int num_lines, int *title){
663	>	void display(machine_data_list_t *machine_data_list, display_config_t *display_config, int *title){
664		int line_num=4;
665	+	int counter;
666		int x=1;
667
668		if(*title){
669	<	//              printf("\033[2J");
670	<	//      printf("\033[1;1HHostname     CPU   Load  Page  Page  Mem   Swap      Net      Net      Disk     Disk");
671	<	//       printw("\033[2;1H             used%% (1m)  ins   outs  used  used      rx       tx       read     write");
669	>	clear();
670	>	move (display_config->maxy-3, 1);
671	>	printw("Sorting by %-64s", display_config->sortby);
672	>	move (display_config->maxy-2, 1);
673	>	if(display_config->units == 'b'){
674	>	printw("Units are measured in bytes/sec");
675	>	}
676	>	if(display_config->units == 'k'){
677	>	printw("Units are measured in kilobytes/sec");
678	>	}
679	>	if(display_config->units == 'm'){
680	>	printw("Units are measured in megabytes/sec");
681	>	}
682	>
683		move(1,1);
684		printw("%-11s", "Hostname");
685		x=x+11+1;
686	<	if(display_config->cpu_used){
686	>	if(display_config->cpu_used && (display_config->maxx > x+6)){
687		move(1,x);
688		printw("%5s", "CPU");
689		move(2,x);
690		printw("%5s", "used%");
691		x+=6;
692		}
693	<	if(display_config->load_1){
693	>	if(display_config->load_1 && (display_config->maxx > x+6)){
694		move(1,x);
695		printw("%5s", "Load");
696		move(2,x);
697		printw("%5s", "(1m)");
698		x+=6;
699		}
700	<	if(display_config->pages_in){
700	>
701	>	if(display_config->pages_in && (display_config->maxx > x+6)){
702		move(1,x);
703		printw("%5s", "Page");
704		move(2,x);
705		printw("%5s", "ins");
706		x+=6;
707		}
708	<	if(display_config->pages_out){
708	>
709	>	if(display_config->pages_out && (display_config->maxx > x+6)){
710		move(1,x);
711		printw("%5s", "Page");
712		move(2,x);
713		printw("%5s", "outs");
714		x+=6;
715		}
716	<	if(display_config->memory_used_pecent){
716	>
717	>	if(display_config->memory_used_pecent && (display_config->maxx > x+6)){
718		move(1,x);
719		printw("%5s", "Mem");
720		move(2,x);
721		printw("%5s", "used");
722		x+=6;
723		}
724	<	if(display_config->swap_used_pecent){
724	>
725	>	if(display_config->swap_used_pecent  && (display_config->maxx > x+6)){
726		move(1,x);
727		printw("%5s", "Swap");
728		move(2,x);
729		printw("%5s", "used");
730		x+=6;
731		}
732	<	if(display_config->network_io_total_rx){
733	<	move(1,x);
734	<	printw("%8s", "Net");
735	<	move(2,x);
736	<	printw("%8s", "rx");
737	<	x+=9;
732	>
733	>	if(display_config->network_io_total_rx){
734	>	if(display_config->units=='b' && (display_config->maxx > x+9)){
735	>	move(1,x);
736	>	printw("%8s", "Net");
737	>	move(2,x);
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");
745	>	move(2,x);
746	>	printw("%5s", "rx");
747	>	x+=6;
748	>	}
749	>
750	>	if(display_config->units=='m' && (display_config->maxx > x+6)){
751	>	move(1,x);
752	>	printw("%5s", "Net");
753	>	move(2,x);
754	>	printw("%5s", "rx");
755	>	x+=6;
756	>	}
757	>
758		}
759	+
760		if(display_config->network_io_total_tx){
761	<	move(1,x);
762	<	printw("%8s", "Net");
763	<	move(2,x);
764	<	printw("%8s", "tx");
765	<	x+=9;
761	>	if(display_config->units=='b' && (display_config->maxx > x+9)){
762	>	move(1,x);
763	>	printw("%8s", "Net");
764	>	move(2,x);
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");
772	>	move(2,x);
773	>	printw("%5s", "tx");
774	>	x+=6;
775	>	}
776	>
777	>	if(display_config->units=='m' && (display_config->maxx > x+6)){
778	>	move(1,x);
779	>	printw("%5s", "Net");
780	>	move(2,x);
781	>	printw("%5s", "tx");
782	>	x+=6;
783	>	}
784	>
785		}
786	+
787		if(display_config->disk_io_total_read){
788	<	move(1,x);
789	<	printw("%9s", "Disk");
790	<	move(2,x);
791	<	printw("%9s", "read");
792	<	x+=10;
788	>	if(display_config->units=='b' && (display_config->maxx > x+10)){
789	>	move(1,x);
790	>	printw("%9s", "Disk");
791	>	move(2,x);
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");
799	>	move(2,x);
800	>	printw("%6s", "read");
801	>	x+=7;
802	>	}
803	>
804	>	if(display_config->units=='m' && (display_config->maxx > x+7)){
805	>	move(1,x);
806	>	printw("%6s", "Disk");
807	>	move(2,x);
808	>	printw("%6s", "read");
809	>	x+=7;
810	>	}
811	>
812		}
813	+
814		if(display_config->disk_io_total_read){
815	+	if(display_config->units=='b' && (display_config->maxx > x+10)){
816	+	move(1,x);
817	+	printw("%9s", "Disk");
818	+	move(2,x);
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");
826	+	move(2,x);
827	+	printw("%6s", "write");
828	+	x+=7;
829	+	}
830	+
831	+	if(display_config->units=='m' && (display_config->maxx > x+7)){
832	+	move(1,x);
833	+	printw("%6s", "Disk");
834	+	move(2,x);
835	+	printw("%6s", "write");
836	+	x+=7;
837	+	}
838	+
839	+	}
840	+
841	+	if(display_config->processes && (display_config->maxx > x+25)){
842		move(1,x);
843	<	printw("%9s", "Disk");
843	>	printw("%-24s", "   Number of Process");
844		move(2,x);
845	<	printw("%9s", "write");
846	<	x+=10;
847	<	}
848	<
845	>	printw("%-24s", " Run Slep Zomb Stop  Tot");
846	>	x+=25;
847	>	}
848	>
849		*title=0;
850		}
851
852	<	for(;num_lines;num_lines--){
852	>	/* Counter starts at 8, for padding (eg, headers, borders etc) */
853	>	for(counter=8;counter<display_config->maxy;counter++){
854		if(machine_data_list==NULL) break;
855		move(line_num++, 1);
856		printw("%-11s", machine_data_list->sysname);
857	+	x=13;
858
859	<	if(display_config->cpu_used)            printw(" %5.1f", machine_data_list->cpu_used);
860	<	if(display_config->load_1)              printw(" %5.1f", machine_data_list->load_1);
861	<	if(display_config->pages_in)            printw(" %5d", machine_data_list->pages_in);
862	<	if(display_config->pages_out)           printw(" %5d", machine_data_list->pages_out);
863	<	if(display_config->memory_used_pecent)  printw(" %5.1f", machine_data_list->memory_used_pecent);
864	<	if(display_config->swap_used_pecent)    printw(" %5.1f", machine_data_list->swap_used_pecent);
865	<	if(display_config->network_io_total_rx) printw(" %8lld", machine_data_list->network_io_total_rx);
866	<	if(display_config->network_io_total_tx) printw(" %8lld", machine_data_list->network_io_total_tx);
867	<	if(display_config->disk_io_total_read)  printw(" %9lld", machine_data_list->disk_io_total_read);
868	<	if(display_config->disk_io_total_write) printw(" %9lld", machine_data_list->disk_io_total_write);
859	>	if(display_config->cpu_used && (display_config->maxx > x+6)){
860	>	printw(" %5.1f", machine_data_list->cpu_used);
861	>	x+=6;
862	>	}
863	>	if(display_config->load_1 && (display_config->maxx > x+6)){
864	>	printw(" %5.1f", machine_data_list->load_1);
865	>	x+=6;
866	>	}
867	>	if(display_config->pages_in && (display_config->maxx > x+6)){
868	>	printw(" %5d", machine_data_list->pages_in);
869	>	x+=6;
870	>	}
871	>	if(display_config->pages_out && (display_config->maxx > x+6)){
872	>	printw(" %5d", machine_data_list->pages_out);
873	>	x+=6;
874	>	}
875	>	if(display_config->memory_used_pecent && (display_config->maxx > x+6)){
876	>	printw(" %5.1f", machine_data_list->memory_used_pecent);
877	>	x+=6;
878	>	}
879	>	if(display_config->swap_used_pecent && (display_config->maxx > x+6)){
880	>	printw(" %5.1f", machine_data_list->swap_used_pecent);
881	>	x+=6;
882	>	}
883
884	+	if(display_config->network_io_total_rx){
885	+	if(display_config->units=='b' && (display_config->maxx > x+9)){
886	+	printw(" %8lld", machine_data_list->network_io_total_rx);
887	+	x+=9;
888	+	}
889	+	if(display_config->units=='k' && (display_config->maxx > x+6)){
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+6)){
894	+	printw(" %5.2f", (double)(machine_data_list->network_io_total_rx/(1024.00*1024.00)));
895	+	x+=6;
896	+	}
897	+	}
898	+
899	+	if(display_config->network_io_total_tx){
900	+	if(display_config->units=='b' && (display_config->maxx > x+9)){
901	+	printw(" %8lld", machine_data_list->network_io_total_tx);
902	+	x+=9;
903	+	}
904	+	if(display_config->units=='k' && (display_config->maxx > x+6)){
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+6)){
909	+	printw(" %5.2f", (double)(machine_data_list->network_io_total_tx/(1024.00*1024.00)));
910	+	x+=6;
911	+	}
912	+	}
913	+
914	+	if(display_config->disk_io_total_read){
915	+	if(display_config->units=='b' && (display_config->maxx > x+10)){
916	+	printw(" %9lld", machine_data_list->disk_io_total_read);
917	+	x+=10;
918	+	}
919	+	if(display_config->units=='k' && (display_config->maxx > x+7)){
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+7)){
924	+	printw(" %6.2f", (double)(machine_data_list->disk_io_total_read/(1024.00*1024.00)));
925	+	x+=7;
926	+	}
927	+	}
928	+
929	+	if(display_config->disk_io_total_write){
930	+	if(display_config->units=='b' && (display_config->maxx > x+10)){
931	+	printw(" %9lld", machine_data_list->disk_io_total_write);
932	+	x+=10;
933	+	}
934	+	if(display_config->units=='k' && (display_config->maxx > x+7)){
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+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		}
954
#	Line 685 | 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 seperated 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;
983	+	struct winsize size;
984
985		FILE *control;
986		FILE *data;
#	Line 694 | 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
995		machine_data_list_t *machine_data_list=NULL;
996
997		int num_hosts;
998	<	int max_display=0;
705	<	int title;
998	>	int title=1;
999
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;
1008
1009	+	int data_fileno, stdin_fileno, biggest_fileno;
1010	+
1011		sortby_ptr=NULL;
1012
1013		/* What to display defaults */
1014	+	display_config.units='b';
1015	+
1016		display_config.cpu_user=0;
1017		display_config.cpu_idle=0;
1018		display_config.cpu_iowait=0;
#	Line 738 | 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;
742	<	display_config.processes_sleeping=0;
743	<	display_config.processes_cpu=0;
744	<	display_config.processes_zombie=0;
745	<	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;
1044	<	display_config.network_all_stats=1;
1044	>	display_config.network_all_stats=0;
1045
1046	<	display_config.disk_io_total_write=0;
1047	<	display_config.disk_io_total_read=0;
1046	>	display_config.disk_io_total_write=1;
1047	>	display_config.disk_io_total_read=1;
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, "d: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 'd':
761	<	max_display=atoi(optarg);
762	<	break;
763	<	case 's':
1060	>	case 'o':
1061		if(!strcmp(optarg, "cpu")){
1062		sortby_ptr=cmp_cpu_used;
1063	+	strlcpy(display_config.sortby, CPU_USED, SORTBYMAXNAME);
1064		}
1065		if(!strcmp(optarg, "load")){
1066		sortby_ptr=cmp_load_1;
1067	+	strlcpy(display_config.sortby, LOAD, SORTBYMAXNAME);
1068		}
1069		if(!strcmp(optarg, "mem")){
1070		sortby_ptr=cmp_memory_used_pecent;
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	+	}
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	<	if(sortby_ptr==NULL) sortby_ptr=cmp_cpu_used;
1107	>	/* Don't take any other arguments */
1108	>	if(argc>optind){
1109	>	usage();
1110	>	}
1111
1112	<	if(argc<(optind+2)){
1113	<	printf("Usage is %s <-d lines> hostname port <machine list>\n", argv[0]);
1114	<	exit(1);
1112	>	if(sortby_ptr==NULL){
1113	>	sortby_ptr=cmp_cpu_used;
1114	>	strlcpy(display_config.sortby, "CPU Used", SORTBYMAXNAME);
1115		}
1116
1117	<	servername=argv[optind];
789	<	server_control_port=atoi(argv[optind+1]);
790	<
791	<	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
796	–	if(argc==4){
797	–	/* We've been passed a machine list */
798	–	/* list currently needs to be ; seperated */
799	–	machine_list=strdup(argv[3]);
800	–	}
801	–
1123		if((tcp_comm(control, NULL, &response, "PROTOCOL 1.1"))!=0){
1124		errf("Incorrect version number (%s)", response);
1125		exit(1);
#	Line 831 | 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
839	–	/*
840	–	printf("\033[2J");
841	–	printf("\033[1;1HHostname     CPU   Load  Page  Page  Mem   Swap      Net      Net      Disk     Disk");
842	–	printf("\033[2;1H             used%% (1m)  ins   outs  used  used      rx       tx       read     write");
843	–	*/
844	–
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
1168	+	stdin_fileno=fileno(stdin);
1169	+	data_fileno=fileno(data);
1170	+	biggest_fileno=(data_fileno>stdin_fileno) ? (data_fileno+1) : (stdin_fileno+1);
1171	+
1172		for(;;){
1173	<	response=fpgetline(data);
1174	<	if (response==NULL){
1175	<	errf("Failed to read data (%m)");
1176	<	exit(1);
1173	>	FD_ZERO(&infds);
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	<	/*              ch=getc(stdin);
1183	>	if(sig_winch){
1184	>	if (ioctl(fileno(stdout), TIOCGWINSZ, &size) == 0) {
1185	>	resizeterm(size.ws_row, size.ws_col);
1186	>	wrefresh(curscr);
1187	>	}
1188	>	getmaxyx(window, display_config.maxy, display_config.maxx);
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=getch();
1199	>	switch(ch){
1200	>	case KEY_RESIZE:
1201	>	sig_winch=1;
1202	>	break;
1203
1204	<	if(ch=='q'){
1205	<	endwin();
1206	<	exit(0);
1204	>	/* Quit */
1205	>	case 'Q':
1206	>	case 'q':
1207	>	endwin();
1208	>	exit(0);
1209	>	break;
1210	>	/* Units */
1211	>	case 'U':
1212	>	case 'u':
1213	>	if(display_config.units == 'b'){
1214	>	display_config.units = 'k';
1215	>	}else if(display_config.units == 'k'){
1216	>	display_config.units = 'm';
1217	>	}else{
1218	>	display_config.units = 'b';
1219	>	}
1220	>	break;
1221	>
1222	>	/* Sort by */
1223	>	case 'C':
1224	>	sortby_ptr=cmp_cpu_used;
1225	>	strlcpy(display_config.sortby, CPU_USED, SORTBYMAXNAME);
1226	>	break;
1227	>
1228	>	case 'M':
1229	>	sortby_ptr=cmp_memory_used_pecent;
1230	>	strlcpy(display_config.sortby, MEM, SORTBYMAXNAME);
1231	>	break;
1232	>
1233	>	case 'L':
1234	>	sortby_ptr=cmp_load_1;
1235	>	strlcpy(display_config.sortby, LOAD, SORTBYMAXNAME);
1236	>	break;
1237	>
1238	>	case 'S':
1239	>	sortby_ptr=cmp_swap_used_pecent;
1240	>	strlcpy(display_config.sortby, SWAP, SORTBYMAXNAME);
1241	>	break;
1242	>
1243	>	case 'N':
1244	>	if(sortby_ptr==cmp_network_io_total){
1245	>	strlcpy(display_config.sortby, NETIORX, SORTBYMAXNAME);
1246	>	sortby_ptr=cmp_network_io_total_rx;
1247	>	}else if(sortby_ptr==cmp_network_io_total_rx){
1248	>	strlcpy(display_config.sortby, NETIOTX, SORTBYMAXNAME);
1249	>	sortby_ptr=cmp_network_io_total_tx;
1250	>	}else{
1251	>	strlcpy(display_config.sortby, NETIO, SORTBYMAXNAME);
1252	>	sortby_ptr=cmp_network_io_total;
1253	>	}
1254	>	break;
1255	>	case 'D':
1256	>	if(sortby_ptr==cmp_disk_io_total){
1257	>	strlcpy(display_config.sortby, DISKIOR, SORTBYMAXNAME);
1258	>	sortby_ptr=cmp_disk_io_total_read;
1259	>	}else if(sortby_ptr==cmp_disk_io_total_read){
1260	>	strlcpy(display_config.sortby, DISKIOW, SORTBYMAXNAME);
1261	>	sortby_ptr=cmp_disk_io_total_write;
1262	>	}else{
1263	>	strlcpy(display_config.sortby, DISKIO, SORTBYMAXNAME);
1264	>	sortby_ptr=cmp_disk_io_total;
1265	>	}
1266	>	break;
1267	>
1268	>	/* Display */
1269	>
1270	>	case 'd':
1271	>	if(display_config.disk_io_total_read){
1272	>	display_config.disk_io_total_read=0;
1273	>	display_config.disk_io_total_write=0;
1274	>	}else{
1275	>	display_config.disk_io_total_read=1;
1276	>	display_config.disk_io_total_write=1;
1277	>	}
1278	>	break;
1279	>	case 'n':
1280	>	if(display_config.network_io_total_rx){
1281	>	display_config.network_io_total_rx=0;
1282	>	display_config.network_io_total_tx=0;
1283	>	}else{
1284	>	display_config.network_io_total_rx=1;
1285	>	display_config.network_io_total_tx=1;
1286	>	}
1287	>	break;
1288	>	case 'm':
1289	>	if(display_config.memory_used_pecent){
1290	>	display_config.memory_used_pecent=0;
1291	>	}else{
1292	>	display_config.memory_used_pecent=1;
1293	>	}
1294	>	break;
1295	>
1296	>	case 's':
1297	>	if(display_config.swap_used_pecent){
1298	>	display_config.swap_used_pecent=0;
1299	>	}else{
1300	>	display_config.swap_used_pecent=1;
1301	>	}
1302	>	break;
1303	>	case 'l':
1304	>	if(display_config.load_1){
1305	>	display_config.load_1=0;
1306	>	}else{
1307	>	display_config.load_1=1;
1308	>	}
1309	>	break;
1310	>	case 'p':
1311	>	if(display_config.pages_in){
1312	>	display_config.pages_in=0;
1313	>	display_config.pages_out=0;
1314	>	}else{
1315	>	display_config.pages_in=1;
1316	>	display_config.pages_out=1;
1317	>	}
1318	>	break;
1319	>	case 'c':
1320	>	if(display_config.cpu_used){
1321	>	display_config.cpu_used=0;
1322	>	}else{
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	>	continue;
1336	>	}
1337	>
1338	>	/* Increment title so it becomes true (and making the screen update */
1339	>	title++;
1340	>
1341		}
1342	<	*/
1342	>	if(FD_ISSET(data_fileno, &infds)){
1343	>	response=fpgetline(data);
1344	>	if (response==NULL){
1345	>	errf("Failed to read data (%m)");
1346	>	exit(1);
1347	>	}
1348	>	}
1349	>
1350	>
1351		num_hosts=parse_xml(response, &machine_data_list);
1352		if(num_hosts==-1) continue;
1353		machine_data_list=sort_machine_stats(machine_data_list, num_hosts, sortby_ptr);
1354	<	if(max_display==0){
869	<	display(machine_data_list, &display_config, num_hosts, &title);
870	<	}else{
871	<	display(machine_data_list, &display_config, max_display, &title);
872	<	}
1354	>	display(machine_data_list, &display_config, &title);
1355
1356		}
1357		exit(0);

Diff Legend

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