svn commit: r204859 - stable/8/usr.sbin/pmcstat

[Fabien Thomas]

Author: fabient
Date: Mon Mar  8 07:53:44 2010
New Revision: 204859
URL: http://svn.freebsd.org/changeset/base/204859

Log:
  MFC r204783:
   Bug fixed:
   - no display on serial terminal in top mode.
   - display alignment for continuation string.
   - correct invalid value used for display limit.

Modified:
  stable/8/usr.sbin/pmcstat/pmcpl_callgraph.c
  stable/8/usr.sbin/pmcstat/pmcpl_calltree.c
  stable/8/usr.sbin/pmcstat/pmcstat.c
Directory Properties:
  stable/8/usr.sbin/pmcstat/   (props changed)

Modified: stable/8/usr.sbin/pmcstat/pmcpl_callgraph.c
==============================================================================
--- stable/8/usr.sbin/pmcstat/pmcpl_callgraph.c	Mon Mar  8 06:00:42 2010	(r204858)
+++ stable/8/usr.sbin/pmcstat/pmcpl_callgraph.c	Mon Mar  8 07:53:44 2010	(r204859)
@@ -550,7 +550,7 @@ pmcstat_cgnode_topprint(struct pmcstat_c
 
 		len = ns_len + vs_len + 1;
 		if (width - len < 0) {
-			PMCSTAT_PRINTW("...");
+			PMCSTAT_PRINTW(" ...");
 			break;
 		}
 		width -= len;

Modified: stable/8/usr.sbin/pmcstat/pmcpl_calltree.c
==============================================================================
--- stable/8/usr.sbin/pmcstat/pmcpl_calltree.c	Mon Mar  8 06:00:42 2010	(r204858)
+++ stable/8/usr.sbin/pmcstat/pmcpl_calltree.c	Mon Mar  8 07:53:44 2010	(r204859)
@@ -387,7 +387,7 @@ pmcpl_ct_node_dumptop(int pmcin, struct 
 	if (ct->pct_narc == 0) {
 		pmcpl_ct_topscreen[x+1][*y] = NULL;
 		if (*y >= PMCPL_CT_MAXLINE ||
-		    *y >= pmcstat_displaywidth)
+		    *y >= pmcstat_displayheight)
 			return 1;
 		*y = *y + 1;
 		for (i=0; i < x; i++)

Modified: stable/8/usr.sbin/pmcstat/pmcstat.c
==============================================================================
--- stable/8/usr.sbin/pmcstat/pmcstat.c	Mon Mar  8 06:00:42 2010	(r204858)
+++ stable/8/usr.sbin/pmcstat/pmcstat.c	Mon Mar  8 07:53:44 2010	(r204859)
@@ -1311,6 +1311,9 @@ main(int argc, char **argv)
 			intrflush(stdscr, FALSE);
 			keypad(stdscr, TRUE);
 			clear();
+			/* Get terminal width / height with ncurses. */
+			getmaxyx(stdscr, pmcstat_displayheight, pmcstat_displaywidth);
+			pmcstat_displayheight--; pmcstat_displaywidth--;
 			atexit(pmcstat_topexit);
 		}
 	}