Add pids graph.

Author: dtrace4linux

Changes

@@ -1,3 +1,15 @@
+Thu Jul 23 22:50:15 2015  fox
+
+      58* .gitignore
+          common/commands.c
+          linux/graphs.c
+          linux/proc.c
+          linux/sigdesc.h
+          makefile
+          scripts/stackmon.pl
+          Add pids to graph. Attempt to fix infinite loop where we dont
+	  read kbd on ^B; add support for ^N/^P
+
 Sat Aug 30 19:35:23 2014  fox
 
       57* .mk

common/commands.c

@@ -340,6 +340,7 @@ help_func(int argc, char **argv)
 		}
 	print("\n");
 	print("Ctrl-B - page/back; Ctrl-F - page/fwd; Ctrl-R - reset paging\n");
+	print("Ctrl-P - 1 min back; Ctrl-N - 1 min fwd\n");
 	print("Ctrl-L - refresh screen.\n");
 	print("\nPress any key to continue: ");
 	refresh();

include/build.h

@@ -1,6 +1,6 @@
 # define	MAJ_VERSION	2
 # define	MIN_VERSION	1
-int	version_build_no = 57;
-# define VERSION_BUILD_NO 57
-char	version_build_date[] = "Sat Aug 30 19:35:23 2014";
+int	version_build_no = 58;
+# define VERSION_BUILD_NO 58
+char	version_build_date[] = "Thu Jul 23 22:50:15 2015";
 

linux/graphs.c

@@ -35,10 +35,13 @@ display_graphs()
 	draw_graph(g, 1, "loadavg", 		0,  100, WIDTH, 50, 100., 0x00c080);
 	draw_graph(g, 1, "meminfo.Dirty", 	200, 100, WIDTH, 50, 1., 0x0080c0);
 	draw_graph(g, 1, "meminfo.Cached", 	400, 100, WIDTH, 50, 1., 0x40b090);
+
 	draw_graph(g, 1, "meminfo.MemFree", 	0,  170, WIDTH, 50, 1., 0xc04090);
 	draw_graph(g, 1, "stat.procs_running", 	200, 170, WIDTH, 50, 1., 0x409080);
 	draw_graph(g, 0x03, "stat.intr", 	400, 170, WIDTH, 50, 1., 0x503090);
+
 	draw_graph(g, 0x03, "vmstat.pgfault", 	0, 240, WIDTH, 50, 1., 0x508090);
+	draw_graph(g, 0x03, "loadavg.06", 	200, 240, WIDTH, 50, 1., 0x508090);
 
 	graph_free(g);
 }
@@ -65,13 +68,17 @@ draw_graph(graph_t *g, int flags, char *item, int x, int y,
 {	int	i;
 	char	buf[BUFSIZ];
 	unsigned long long v0 = 0;
+	char	*title = item;
+
+	if (strcmp(item, "loadavg.06") == 0)
+		title = "pids";
 
 	graph_clear(g);
 	graph_setfont(g, "6x9");
 	graph_setforeground(g, 0xffffff);
 	graph_setbackground(g, 0xffffff);
 	if (flags & 0x01)
-		graph_drawstring(g, x, y - 3, item);
+		graph_drawstring(g, x, y - 3, title);
 
 	graph_set(g, "x", x);
 	graph_set(g, "y", y);

linux/proc.c

@@ -1111,15 +1111,23 @@ main_loop(void)
 			}
 
 		/***********************************************/
-		/*   Avoid refreshing if nothing changed.      */
+		/*   Avoid  refreshing if nothing changed but  */
+		/*   avoid  infinite  loop  where  user loses  */
+		/*   control.				       */
 		/***********************************************/
 		mon_lock();
 		lt0 = lt;
 		lt = mon_get_time();
 		if (lt0 == lt) {
 			struct timeval tval = {0, 50 * 1000};
+			fd_set rbits;
+			int	ret;
+
+			FD_ZERO(&rbits);
+			FD_SET(1, &rbits);
+
 			mon_unlock();
-			select(0, NULL, NULL, NULL, &tval);
+			ret = select(32, &rbits, NULL, NULL, &tval);
 			if (lt == (unsigned long long) -1) {
 				set_attribute(RED, YELLOW, 0);
 				mvprint(5, 0, "Status pmap is missing - will refresh when procmon restarts.");
@@ -1136,6 +1144,8 @@ main_loop(void)
 				refresh();
 				stale_displayed = FALSE;
 				}
+			else if (ret)
+				wait_for_command();
 			continue;
 			}
 
@@ -1981,6 +1991,12 @@ static int first_time = TRUE;
 		  case 'f' & 0x1f:
 		  	mon_move(1);
 		  	return;
+		  case 'p' & 0x1f:
+		  	mon_move(-60);
+		  	return;
+		  case 'n' & 0x1f:
+		  	mon_move(60);
+		  	return;
 		  case 'r' & 0x1f:
 		  	mon_move(0);
 		  	return;

scripts/stackmon.pl

@@ -0,0 +1,88 @@
+#! /usr/bin/perl
+
+# $Header:$
+
+use strict;
+use warnings;
+
+use File::Basename;
+use FileHandle;
+use Getopt::Long;
+use IO::File;
+use POSIX;
+
+#######################################################################
+#   Command line switches.					      #
+#######################################################################
+my %opts = (
+	sleep => 5,
+	);
+
+sub main
+{
+	Getopt::Long::Configure('require_order');
+	Getopt::Long::Configure('no_ignore_case');
+	usage() unless GetOptions(\%opts,
+		'a',
+		'help',
+		'sleep=s',
+		);
+
+	usage() if $opts{help};
+
+	while (1) {
+		print "\n";
+		print strftime("%Y%m%d %H:%M:%S\n", localtime());
+		foreach my $f (glob("/proc/*/stack")) {
+			next if $f =~ /\/self\//;
+			$f =~ /\/([0-9]*)\//;
+			my $pid = $1;
+			next if $pid == $$;
+
+			my $fh = new FileHandle($f);
+			next if !$fh;
+			my $s = '';
+			while (<$fh>) {
+				$s .= $_;
+			}
+			if (!$opts{a}) {
+				next if $s =~ /do_signal_stop/;
+				next if $s =~ /poll_schedule_timeout/;
+				next if $s =~ /n_tty_read/;
+				next if $s =~ /do_wait/;
+				next if $s =~ /pipe_wait/;
+			}
+			
+			my $cmd = 'unknown';
+			$fh = new FileHandle("/proc/$pid/cmdline");
+			$cmd = <$fh> if $fh;
+			$cmd =~ s/\0/ /g;
+			print "$cmd:\n";
+			print $s;
+		}
+
+		sleep(5);
+	}
+}
+#######################################################################
+#   Print out command line usage.				      #
+#######################################################################
+sub usage
+{
+	print <<EOF;
+stackmon.pl -- list out stacks of processes.
+Usage: stackmon.pl
+
+Switches:
+
+  -a         Show all procs - otherwise we will filter the boring ones.
+  -sleep N   Pause for N seconds before refresh. Default $opts{sleep}
+
+EOF
+
+	exit(1);
+}
+
+main();
+0;
+