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.2 by pajs, Fri Mar 28 18:42:57 2003 UTC vs.
Revision 1.14 by pajs, Wed Apr 9 21:55:10 2003 UTC

#	Line 1 | Line 1
1	+	/*
2	+	* i-scream central monitoring system
3	+	* http://www.i-scream.org.uk
4	+	* Copyright (C) 2000-2002 i-scream
5	+	*
6	+	* This program is free software; you can redistribute it and/or
7	+	* modify it under the terms of the GNU General Public License
8	+	* as published by the Free Software Foundation; either version 2
9	+	* of the License, or (at your option) any later version.
10	+	*
11	+	* This program is distributed in the hope that it will be useful,
12	+	* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	+	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	+	* GNU General Public License for more details.
15	+	*
16	+	* You should have received a copy of the GNU General Public License
17	+	* along with this program; if not, write to the Free Software
18	+	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
19	+	*/
20	+
21	+	#ifdef HAVE_CONFIG_H
22	+	#include "config.h"
23	+	#endif
24	+
25		#include <stdio.h>
26		#include <string.h>
27		#include <sys/types.h>
#	Line 5 | 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
36		#include <libxml/xmlmemory.h>
37		#include <libxml/parser.h>
38		#include "genmergesort.h"
39
40	+	#ifdef HAVE_NCURSES_H
41	+	#include <ncurses.h>
42	+	#else
43	+	#include <curses.h>
44	+	#endif
45	+
46		struct host_line_t{
47		char *hostname;
48		int line;
#	Line 92 | Line 125 | struct machine_data_t{
125		network_data_list_t *network_data_list;
126		long long network_io_total_tx;
127		long long network_io_total_rx;
128	+	long long network_io_total;
129
130		diskio_data_list_t *diskio_data_list;
131		long long disk_io_total_write;
132		long long disk_io_total_read;
133	+	long long disk_io_total;
134
135		/* Maybe in the future */
136		/*
#	Line 108 | Line 143 | struct machine_data_t{
143
144		typedef struct machine_data_t machine_data_list_t;
145
146	+	#define SORTBYMAXNAME 128
147		typedef struct{
148	+	int maxx;
149	+	int maxy;
150	+
151	+	char units;
152	+
153		int cpu_user;
154		int cpu_idle;
155		int cpu_iowait;
#	Line 149 | Line 190 | typedef struct{
190
191		int disk_total_used;
192		int disk_all_stats;
193	+
194	+	char sortby[SORTBYMAXNAME];
195		}display_config_t;
196
197		GENERIC_MERGE_SORT(static, sort_machine_stats, machine_data_list_t, next)
#	Line 160 | Line 203 | int (*sortby_ptr)(machine_data_list_t *a, machine_data
203
204		MKCMP(cpu_used)
205		MKCMP(load_1)
206	+	MKCMP(network_io_total)
207		MKCMP(network_io_total_tx)
208		MKCMP(network_io_total_rx)
209	+	MKCMP(disk_io_total)
210		MKCMP(disk_io_total_write)
211		MKCMP(disk_io_total_read)
212		MKCMP(memory_used_pecent)
213		MKCMP(swap_used_pecent)
214
215	+	#define CPU_USED "CPU used"
216	+	#define LOAD "Load (1)"
217	+	#define NETIORX "total Network RX for all interfaces"
218	+	#define NETIOTX "total Network TX for all interfaces"
219	+	#define NETIO "total Network IO for all interfaces (rx+tx)"
220	+	#define MEM "Memory usage"
221	+	#define SWAP "Swap usage"
222	+	#define DISKIOR "DiskIO reads"
223	+	#define DISKIOW "DiskIO writes"
224	+	#define DISKIO "Total DiskIO (reads+writes)"
225	+
226	+
227		/*
228		int cmp_cpu(machine_data_list_t *a, machine_data_list_t *b){
229
#	Line 186 | Line 243 | int cmp_cpu(machine_data_list_t *a, machine_data_list_
243		}
244		}
245		*/
246	+
247	+	#ifndef HAVE_ATOLL
248	+	long long int atoll (const char *nptr){
249	+	return strtoll (nptr, (char **) NULL, 10);
250	+	}
251	+	#endif
252	+
253	+	#ifndef HAVE_STRLCPY
254	+	/*
255	+	* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
256	+	* All rights reserved.
257	+	*
258	+	* Redistribution and use in source and binary forms, with or without
259	+	* modification, are permitted provided that the following conditions
260	+	* are met:
261	+	* 1. Redistributions of source code must retain the above copyright
262	+	*    notice, this list of conditions and the following disclaimer.
263	+	* 2. Redistributions in binary form must reproduce the above copyright
264	+	*    notice, this list of conditions and the following disclaimer in the
265	+	*    documentation and/or other materials provided with the distribution.
266	+	* 3. The name of the author may not be used to endorse or promote products
267	+	*    derived from this software without specific prior written permission.
268	+	*
269	+	* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
270	+	* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
271	+	* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
272	+	* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
273	+	* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
274	+	* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
275	+	* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
276	+	* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
277	+	* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
278	+	* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
279	+	*/
280	+
281	+	/*
282	+	* Copy src to string dst of size siz.  At most siz-1 characters
283	+	* will be copied.  Always NUL terminates (unless siz == 0).
284	+	* Returns strlen(src); if retval >= siz, truncation occurred.
285	+	*/
286	+	size_t
287	+	strlcpy(dst, src, siz)
288	+	char *dst;
289	+	const char *src;
290	+	size_t siz;
291	+	{
292	+	register char *d = dst;
293	+	register const char *s = src;
294	+	register size_t n = siz;
295	+
296	+	/* Copy as many bytes as will fit */
297	+	if (n != 0 && --n != 0) {
298	+	do {
299	+	if ((*d++ = *s++) == 0)
300	+	break;
301	+	} while (--n != 0);
302	+	}
303	+
304	+	/* Not enough room in dst, add NUL and traverse rest of src */
305	+	if (n == 0) {
306	+	if (siz != 0)
307	+	*d = '\0';              /* NUL-terminate dst */
308	+	while (*s++)
309	+	;
310	+	}
311	+
312	+	return(s - src - 1);    /* count does not include NUL */
313	+	}
314	+
315	+	#endif
316	+
317
318		FILE *create_tcp_connection(char *hostname, int port){
319		int sock;
#	Line 534 | Line 662 | int parse_xml(char *xml, machine_data_list_t **md){
662		machine_data_list->network_io_total_rx+=ndl_ptr->rx;
663		ndl_ptr=ndl_ptr->next;
664		}
665	+	machine_data_list->network_io_total=machine_data_list->network_io_total_rx+machine_data_list->network_io_total_tx;
666
667		didl_ptr=machine_data_list->diskio_data_list;
668		machine_data_list->disk_io_total_read=0;
#	Line 543 | Line 672 | int parse_xml(char *xml, machine_data_list_t **md){
672		machine_data_list->disk_io_total_write+=didl_ptr->write;
673		didl_ptr=didl_ptr->next;
674		}
675	+	machine_data_list->disk_io_total=machine_data_list->disk_io_total_read+machine_data_list->disk_io_total_write;
676
677		xmlFreeDoc(doc);
678
#	Line 551 | Line 681 | int parse_xml(char *xml, machine_data_list_t **md){
681
682		}
683
684	<	void display(machine_data_list_t *machine_data_list, display_config_t *display_config, int num_lines, int *title){
684	>	void display(machine_data_list_t *machine_data_list, display_config_t *display_config, int *title){
685		int line_num=4;
686	+	int counter;
687		int x=1;
688
689		if(*title){
690	<	printf("\033[2J");
691	<	//      printf("\033[1;1HHostname     CPU   Load  Page  Page  Mem   Swap      Net      Net      Disk     Disk");
692	<	//       printf("\033[2;1H             used%% (1m)  ins   outs  used  used      rx       tx       read     write");
693	<	printf("\033[1;1H%-11s", "Hostname");
690	>	clear();
691	>	move (display_config->maxy-3, 1);
692	>	printw("Sorting by %-64s", display_config->sortby);
693	>	move (display_config->maxy-2, 1);
694	>	if(display_config->units == 'b'){
695	>	printw("Units are measured in bytes/sec");
696	>	}
697	>	if(display_config->units == 'k'){
698	>	printw("Units are measured in kilobytes/sec");
699	>	}
700	>	if(display_config->units == 'm'){
701	>	printw("Units are measured in megabytes/sec");
702	>	}
703	>
704	>	move(1,1);
705	>	printw("%-11s", "Hostname");
706		x=x+11+1;
707	<	if(display_config->cpu_used){
708	<	printf("\033[1;%dH%5s", x, "CPU");
709	<	printf("\033[2;%dH%5s", x, "used%");
707	>	if(display_config->cpu_used && (display_config->maxx > x+6)){
708	>	move(1,x);
709	>	printw("%5s", "CPU");
710	>	move(2,x);
711	>	printw("%5s", "used%");
712		x+=6;
713		}
714	<	if(display_config->load_1){
715	<	printf("\033[1;%dH%5s", x, "Load");
716	<	printf("\033[2;%dH%5s", x, "(1m)");
714	>	if(display_config->load_1 && (display_config->maxx > x+6)){
715	>	move(1,x);
716	>	printw("%5s", "Load");
717	>	move(2,x);
718	>	printw("%5s", "(1m)");
719		x+=6;
720		}
721	<	if(display_config->pages_in){
722	<	printf("\033[1;%dH%5s", x, "Page");
723	<	printf("\033[2;%dH%5s", x, "ins");
721	>	if(display_config->pages_in && (display_config->maxx > x+6)){
722	>	move(1,x);
723	>	printw("%5s", "Page");
724	>	move(2,x);
725	>	printw("%5s", "ins");
726		x+=6;
727		}
728	<	if(display_config->pages_out){
729	<	printf("\033[1;%dH%5s", x, "Page");
730	<	printf("\033[2;%dH%5s", x, "outs");
728	>	if(display_config->pages_out && (display_config->maxx > x+6)){
729	>	move(1,x);
730	>	printw("%5s", "Page");
731	>	move(2,x);
732	>	printw("%5s", "outs");
733		x+=6;
734		}
735	<	if(display_config->memory_used_pecent){
736	<	printf("\033[1;%dH%5s", x, "Mem");
737	<	printf("\033[2;%dH%5s", x, "used");
735	>	if(display_config->memory_used_pecent && (display_config->maxx > x+6)){
736	>	move(1,x);
737	>	printw("%5s", "Mem");
738	>	move(2,x);
739	>	printw("%5s", "used");
740		x+=6;
741		}
742	<	if(display_config->swap_used_pecent){
743	<	printf("\033[1;%dH%5s", x, "Swap");
744	<	printf("\033[2;%dH%5s", x, "used");
742	>	if(display_config->swap_used_pecent  && (display_config->maxx > x+6)){
743	>	move(1,x);
744	>	printw("%5s", "Swap");
745	>	move(2,x);
746	>	printw("%5s", "used");
747		x+=6;
748		}
749	<	if(display_config->network_io_total_rx){
750	<	printf("\033[1;%dH%8s", x, "Net");
751	<	printf("\033[2;%dH%8s", x, "rx");
752	<	x+=9;
749	>	if(display_config->network_io_total_rx){
750	>	if(display_config->units=='b' && (display_config->maxx > x+9)){
751	>	move(1,x);
752	>	printw("%8s", "Net");
753	>	move(2,x);
754	>	printw("%8s", "rx");
755	>	x+=9;
756	>	}
757	>	if(display_config->units=='k' && (display_config->maxx > x+6)){
758	>	move(1,x);
759	>	printw("%5s", "Net");
760	>	move(2,x);
761	>	printw("%5s", "rx");
762	>	x+=6;
763	>	}
764	>	if(display_config->units=='m' && (display_config->maxx > x+5)){
765	>	move(1,x);
766	>	printw("%4s", "Net");
767	>	move(2,x);
768	>	printw("%4s", "rx");
769	>	x+=5;
770	>	}
771		}
772		if(display_config->network_io_total_tx){
773	<	printf("\033[1;%dH%8s", x, "Net");
774	<	printf("\033[2;%dH%8s", x, "tx");
775	<	x+=9;
773	>	if(display_config->units=='b' && (display_config->maxx > x+9)){
774	>	move(1,x);
775	>	printw("%8s", "Net");
776	>	move(2,x);
777	>	printw("%8s", "tx");
778	>	x+=9;
779	>	}
780	>	if(display_config->units=='k' && (display_config->maxx > x+6)){
781	>	move(1,x);
782	>	printw("%5s", "Net");
783	>	move(2,x);
784	>	printw("%5s", "tx");
785	>	x+=6;
786	>	}
787	>	if(display_config->units=='m' && (display_config->maxx > x+5)){
788	>	move(1,x);
789	>	printw("%4s", "Net");
790	>	move(2,x);
791	>	printw("%4s", "tx");
792	>	x+=5;
793	>	}
794		}
795	+
796		if(display_config->disk_io_total_read){
797	<	printf("\033[1;%dH%9s", x, "Disk");
798	<	printf("\033[2;%dH%9s", x, "read");
799	<	x+=10;
797	>	if(display_config->units=='b' && (display_config->maxx > x+10)){
798	>	move(1,x);
799	>	printw("%9s", "Disk");
800	>	move(2,x);
801	>	printw("%9s", "read");
802	>	x+=10;
803	>	}
804	>	if(display_config->units=='k' && (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	>	if(display_config->units=='m' && (display_config->maxx > x+6)){
812	>	move(1,x);
813	>	printw("%5s", "Disk");
814	>	move(2,x);
815	>	printw("%5s", "read");
816	>	x+=6;
817	>	}
818		}
819	+
820		if(display_config->disk_io_total_read){
821	<	printf("\033[1;%dH%9s", x, "Disk");
822	<	printf("\033[2;%dH%9s", x, "write");
823	<	x+=10;
821	>	if(display_config->units=='b' && (display_config->maxx > x+10)){
822	>	move(1,x);
823	>	printw("%9s", "Disk");
824	>	move(2,x);
825	>	printw("%9s", "write");
826	>	x+=10;
827	>	}
828	>	if(display_config->units=='k' && (display_config->maxx > x+7)){
829	>	move(1,x);
830	>	printw("%6s", "Disk");
831	>	move(2,x);
832	>	printw("%6s", "write");
833	>	x+=7;
834	>	}
835	>	if(display_config->units=='m' && (display_config->maxx > x+6)){
836	>	move(1,x);
837	>	printw("%5s", "Disk");
838	>	move(2,x);
839	>	printw("%5s", "write");
840	>	x+=6;
841	>	}
842		}
843
844		*title=0;
845		}
846
847	<	for(;num_lines;num_lines--){
847	>	/* Counter starts at 8, for padding (eg, headers, borders etc) */
848	>	for(counter=8;counter<display_config->maxy;counter++){
849		if(machine_data_list==NULL) break;
850	+	move(line_num++, 1);
851	+	printw("%-11s", machine_data_list->sysname);
852	+	x=13;
853
854	<	printf("\033[%d;%dH%-11s", line_num++, 1, machine_data_list->sysname);
854	>	if(display_config->cpu_used && (display_config->maxx > x+6)){
855	>	printw(" %5.1f", machine_data_list->cpu_used);
856	>	x+=6;
857	>	}
858	>	if(display_config->load_1 && (display_config->maxx > x+6)){
859	>	printw(" %5.1f", machine_data_list->load_1);
860	>	x+=6;
861	>	}
862	>	if(display_config->pages_in && (display_config->maxx > x+6)){
863	>	printw(" %5d", machine_data_list->pages_in);
864	>	x+=6;
865	>	}
866	>	if(display_config->pages_out && (display_config->maxx > x+6)){
867	>	printw(" %5d", machine_data_list->pages_out);
868	>	x+=6;
869	>	}
870	>	if(display_config->memory_used_pecent && (display_config->maxx > x+6)){
871	>	printw(" %5.1f", machine_data_list->memory_used_pecent);
872	>	x+=6;
873	>	}
874	>	if(display_config->swap_used_pecent && (display_config->maxx > x+6)){
875	>	printw(" %5.1f", machine_data_list->swap_used_pecent);
876	>	x+=6;
877	>	}
878
879	<	if(display_config->cpu_used)            printf(" %5.1f", machine_data_list->cpu_used);
880	<	if(display_config->load_1)              printf(" %5.1f", machine_data_list->load_1);
881	<	if(display_config->pages_in)            printf(" %5d", machine_data_list->pages_in);
882	<	if(display_config->pages_out)           printf(" %5d", machine_data_list->pages_out);
883	<	if(display_config->memory_used_pecent)  printf(" %5.1f", machine_data_list->memory_used_pecent);
884	<	if(display_config->swap_used_pecent)    printf(" %5.1f", machine_data_list->swap_used_pecent);
885	<	if(display_config->network_io_total_rx) printf(" %8lld", machine_data_list->network_io_total_rx);
886	<	if(display_config->network_io_total_tx) printf(" %8lld", machine_data_list->network_io_total_tx);
887	<	if(display_config->disk_io_total_read)  printf(" %9lld", machine_data_list->disk_io_total_read);
888	<	if(display_config->disk_io_total_write) printf(" %9lld", machine_data_list->disk_io_total_write);
879	>	if(display_config->network_io_total_rx){
880	>	if(display_config->units=='b' && (display_config->maxx > x+9)){
881	>	printw(" %8lld", machine_data_list->network_io_total_rx);
882	>	x+=9;
883	>	}
884	>	if(display_config->units=='k' && (display_config->maxx > x+6)){
885	>	printw(" %5lld", machine_data_list->network_io_total_rx/1024);
886	>	x+=6;
887	>	}
888	>	if(display_config->units=='m' && (display_config->maxx > x+5)){
889	>	printw(" %4.1f", (double)(machine_data_list->network_io_total_rx/(1024.00*1024.00)));
890	>	x+=5;
891	>	}
892	>	}
893
894	+	if(display_config->network_io_total_tx){
895	+	if(display_config->units=='b' && (display_config->maxx > x+9)){
896	+	printw(" %8lld", machine_data_list->network_io_total_tx);
897	+	x+=9;
898	+	}
899	+	if(display_config->units=='k' && (display_config->maxx > x+6)){
900	+	printw(" %5lld", machine_data_list->network_io_total_tx/1024);
901	+	x+=6;
902	+	}
903	+	if(display_config->units=='m' && (display_config->maxx > x+5)){
904	+	printw(" %4.1f", (double)(machine_data_list->network_io_total_tx/(1024.00*1024.00)));
905	+	x+=5;
906	+	}
907	+	}
908	+
909	+	if(display_config->disk_io_total_read){
910	+	if(display_config->units=='b' && (display_config->maxx > x+10)){
911	+	printw(" %9lld", machine_data_list->disk_io_total_read);
912	+	x+=10;
913	+	}
914	+	if(display_config->units=='k' && (display_config->maxx > x+7)){
915	+	printw(" %6lld", machine_data_list->disk_io_total_read/1024);
916	+	x+=7;
917	+	}
918	+	if(display_config->units=='m' && (display_config->maxx > x+6)){
919	+	printw(" %5.1f", (double)(machine_data_list->disk_io_total_read/(1024.00*1024.00)));
920	+	x+=6;
921	+	}
922	+	}
923	+
924	+	if(display_config->disk_io_total_write){
925	+	if(display_config->units=='b' && (display_config->maxx > x+10)){
926	+	printw(" %9lld", machine_data_list->disk_io_total_write);
927	+	x+=10;
928	+	}
929	+	if(display_config->units=='k' && (display_config->maxx > x+7)){
930	+	printw(" %6lld", machine_data_list->disk_io_total_write/1024);
931	+	x+=7;
932	+	}
933	+	if(display_config->units=='m' && (display_config->maxx > x+6)){
934	+	printw(" %5.1f", (double)(machine_data_list->disk_io_total_write/(1024.00*1024.00)));
935	+	x+=6;
936	+	}
937	+	}
938	+
939		machine_data_list=machine_data_list->next;
940		}
941
942
943	<	fflush(stdout);
943	>	refresh();
944
945		}
946
947		int main(int argc, char **argv){
948	+	WINDOW *window;
949	+	fd_set infds;
950	+	struct winsize size;
951	+
952		FILE *control;
953		FILE *data;
954
#	Line 653 | Line 962 | int main(int argc, char **argv){
962		machine_data_list_t *machine_data_list=NULL;
963
964		int num_hosts;
965	<	int max_display=0;
657	<	int title;
965	>	int title=1;
966
967		int cmdopt;
968		extern int optind;
969		extern char *optarg;
662	–	sortby_ptr=NULL;
970
971		display_config_t display_config;
972	+	char ch;
973
974	+	int data_fileno, stdin_fileno, biggest_fileno;
975	+
976	+	sortby_ptr=NULL;
977	+
978		/* What to display defaults */
979	+	display_config.units='b';
980	+
981		display_config.cpu_user=0;
982		display_config.cpu_idle=0;
983		display_config.cpu_iowait=0;
#	Line 696 | Line 1010 | int main(int argc, char **argv){
1010
1011		display_config.network_io_total_tx=1;
1012		display_config.network_io_total_rx=1;
1013	<	display_config.network_all_stats=1;
1013	>	display_config.network_all_stats=0;
1014
1015		display_config.disk_io_total_write=1;
1016		display_config.disk_io_total_read=1;
#	Line 705 | Line 1019 | int main(int argc, char **argv){
1019		display_config.disk_total_used=0;
1020		display_config.disk_all_stats=0;
1021
1022	<
709	<	while((cmdopt=getopt(argc, argv, "d:s:"))  != -1){
1022	>	while((cmdopt=getopt(argc, argv, "s:"))  != -1){
1023		switch(cmdopt){
711	–	case 'd':
712	–	max_display=atoi(optarg);
713	–	break;
1024		case 's':
1025		if(!strcmp(optarg, "cpu")){
1026		sortby_ptr=cmp_cpu_used;
1027	+	strlcpy(display_config.sortby, CPU_USED, SORTBYMAXNAME);
1028		}
1029		if(!strcmp(optarg, "load")){
1030		sortby_ptr=cmp_load_1;
1031	+	strlcpy(display_config.sortby, LOAD, SORTBYMAXNAME);
1032		}
1033		if(!strcmp(optarg, "mem")){
1034		sortby_ptr=cmp_memory_used_pecent;
1035	+	strlcpy(display_config.sortby, MEM, SORTBYMAXNAME);
1036		}
1037	+	if(!strcmp(optarg, "swap")){
1038	+	sortby_ptr=cmp_swap_used_pecent;
1039	+	strlcpy(display_config.sortby, SWAP, SORTBYMAXNAME);
1040	+	}
1041		if(sortby_ptr==NULL){
1042		errf("Invalid sort type");
1043		exit(1);
#	Line 729 | Line 1046 | int main(int argc, char **argv){
1046		}
1047		}
1048
1049	<	if(sortby_ptr==NULL) sortby_ptr=cmp_cpu_used;
1049	>	if(sortby_ptr==NULL){
1050	>	sortby_ptr=cmp_cpu_used;
1051	>	strlcpy(display_config.sortby, "CPU Used", SORTBYMAXNAME);
1052	>	}
1053
1054		if(argc<(optind+2)){
1055		printf("Usage is %s <-d lines> hostname port <machine list>\n", argv[0]);
#	Line 742 | Line 1062 | int main(int argc, char **argv){
1062		control=create_tcp_connection(servername, server_control_port);
1063		if(control==NULL){
1064		errf("Failed to connect (%m)");
1065	+	exit(1);
1066		}
1067
1068		if(argc==4){
#	Line 785 | Line 1106 | int main(int argc, char **argv){
1106		data=create_tcp_connection(servername, server_data_port);
1107		if(data==NULL){
1108		errf("Failed to connect to host %s on port %d (%m)",servername, server_data_port);
1109	+	exit(1);
1110		}
1111
1112		/*
#	Line 792 | Line 1114 | int main(int argc, char **argv){
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	<	fflush(stdout);
1117	>
1118	>	initscr();
1119	>	nonl();
1120	>	cbreak();
1121	>	echo();
1122	>	window=newwin(0, 0, 0, 0);
1123	>	getmaxyx(window, display_config.maxy, display_config.maxx);
1124	>
1125	>	stdin_fileno=fileno(stdin);
1126	>	data_fileno=fileno(data);
1127	>	biggest_fileno=(data_fileno>stdin_fileno) ? (data_fileno+1) : (stdin_fileno+1);
1128	>
1129		for(;;){
1130	<	response=fpgetline(data);
1131	<	if (response==NULL){
1132	<	errf("Failed to read data (%m)");
1133	<	exit(1);
1130	>	FD_ZERO(&infds);
1131	>	FD_SET(stdin_fileno, &infds);
1132	>	FD_SET(data_fileno, &infds);
1133	>	if((select(biggest_fileno, &infds, NULL, NULL, NULL))==-1){
1134	>	if (ioctl(fileno(stdout), TIOCGWINSZ, &size) == 0) {
1135	>	resizeterm(size.ws_row, size.ws_col);
1136	>	wrefresh(curscr);
1137	>	}
1138	>	getmaxyx(window, display_config.maxy, display_config.maxx);
1139	>	title=1;
1140	>	display(machine_data_list, &display_config, &title);
1141	>	refresh();
1142	>	continue;
1143		}
1144	+
1145	+	if(FD_ISSET(stdin_fileno, &infds)){
1146	+
1147	+	ch=getc(stdin);
1148	+	switch(ch){
1149
1150	+	/* Quit */
1151	+	case 'Q':
1152	+	case 'q':
1153	+	endwin();
1154	+	exit(0);
1155	+	break;
1156	+	/* Units */
1157	+	case 'U':
1158	+	case 'u':
1159	+	if(display_config.units == 'b'){
1160	+	display_config.units = 'k';
1161	+	}else if(display_config.units == 'k'){
1162	+	display_config.units = 'm';
1163	+	}else{
1164	+	display_config.units = 'b';
1165	+	}
1166	+	break;
1167	+
1168	+	/* Sort by */
1169	+	case 'C':
1170	+	sortby_ptr=cmp_cpu_used;
1171	+	strlcpy(display_config.sortby, CPU_USED, SORTBYMAXNAME);
1172	+	break;
1173	+
1174	+	case 'M':
1175	+	sortby_ptr=cmp_memory_used_pecent;
1176	+	strlcpy(display_config.sortby, MEM, SORTBYMAXNAME);
1177	+	break;
1178	+
1179	+	case 'L':
1180	+	sortby_ptr=cmp_load_1;
1181	+	strlcpy(display_config.sortby, LOAD, SORTBYMAXNAME);
1182	+	break;
1183	+
1184	+	case 'S':
1185	+	sortby_ptr=cmp_swap_used_pecent;
1186	+	strlcpy(display_config.sortby, SWAP, SORTBYMAXNAME);
1187	+	break;
1188	+
1189	+	case 'N':
1190	+	if(sortby_ptr==cmp_network_io_total){
1191	+	strlcpy(display_config.sortby, NETIORX, SORTBYMAXNAME);
1192	+	sortby_ptr=cmp_network_io_total_rx;
1193	+	}else if(sortby_ptr==cmp_network_io_total_rx){
1194	+	strlcpy(display_config.sortby, NETIOTX, SORTBYMAXNAME);
1195	+	sortby_ptr=cmp_network_io_total_tx;
1196	+	}else{
1197	+	strlcpy(display_config.sortby, NETIO, SORTBYMAXNAME);
1198	+	sortby_ptr=cmp_network_io_total;
1199	+	}
1200	+	break;
1201	+	case 'D':
1202	+	if(sortby_ptr==cmp_disk_io_total){
1203	+	strlcpy(display_config.sortby, DISKIOR, SORTBYMAXNAME);
1204	+	sortby_ptr=cmp_disk_io_total_read;
1205	+	}else if(sortby_ptr==cmp_disk_io_total_read){
1206	+	strlcpy(display_config.sortby, DISKIOW, SORTBYMAXNAME);
1207	+	sortby_ptr=cmp_disk_io_total_write;
1208	+	}else{
1209	+	strlcpy(display_config.sortby, DISKIO, SORTBYMAXNAME);
1210	+	sortby_ptr=cmp_disk_io_total;
1211	+	}
1212	+	break;
1213	+
1214	+	/* Display */
1215	+
1216	+	case 'd':
1217	+	if(display_config.disk_io_total_read){
1218	+	display_config.disk_io_total_read=0;
1219	+	display_config.disk_io_total_write=0;
1220	+	}else{
1221	+	display_config.disk_io_total_read=1;
1222	+	display_config.disk_io_total_write=1;
1223	+	}
1224	+	break;
1225	+	case 'n':
1226	+	if(display_config.network_io_total_rx){
1227	+	display_config.network_io_total_rx=0;
1228	+	display_config.network_io_total_tx=0;
1229	+	}else{
1230	+	display_config.network_io_total_rx=1;
1231	+	display_config.network_io_total_tx=1;
1232	+	}
1233	+	break;
1234	+	case 'm':
1235	+	if(display_config.memory_used_pecent){
1236	+	display_config.memory_used_pecent=0;
1237	+	}else{
1238	+	display_config.memory_used_pecent=1;
1239	+	}
1240	+	break;
1241	+
1242	+	case 's':
1243	+	if(display_config.swap_used_pecent){
1244	+	display_config.swap_used_pecent=0;
1245	+	}else{
1246	+	display_config.swap_used_pecent=1;
1247	+	}
1248	+	break;
1249	+	case 'l':
1250	+	if(display_config.load_1){
1251	+	display_config.load_1=0;
1252	+	}else{
1253	+	display_config.load_1=1;
1254	+	}
1255	+	break;
1256	+	case 'p':
1257	+	if(display_config.pages_in){
1258	+	display_config.pages_in=0;
1259	+	display_config.pages_out=0;
1260	+	}else{
1261	+	display_config.pages_in=1;
1262	+	display_config.pages_out=1;
1263	+	}
1264	+	break;
1265	+	case 'c':
1266	+	if(display_config.cpu_used){
1267	+	display_config.cpu_used=0;
1268	+	}else{
1269	+	display_config.cpu_used=1;
1270	+	}
1271	+	break;
1272	+
1273	+	default:
1274	+	/* 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;
1279	+	}
1280	+
1281	+	/* Increment title so it becomes true (and making the screen update */
1282	+	title++;
1283	+
1284	+	}
1285	+	if(FD_ISSET(data_fileno, &infds)){
1286	+	response=fpgetline(data);
1287	+	if (response==NULL){
1288	+	errf("Failed to read data (%m)");
1289	+	exit(1);
1290	+	}
1291	+	}
1292	+
1293	+
1294		num_hosts=parse_xml(response, &machine_data_list);
1295		if(num_hosts==-1) continue;
1296		machine_data_list=sort_machine_stats(machine_data_list, num_hosts, sortby_ptr);
1297	<	if(max_display==0){
807	<	display(machine_data_list, &display_config, num_hosts, &title);
808	<	}else{
809	<	display(machine_data_list, &display_config, max_display, &title);
810	<	}
1297	>	display(machine_data_list, &display_config, &title);
1298
1299		}
1300		exit(0);

Diff Legend

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