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

[Fabien Thomas]

Author: fabient
Date: Mon Mar 29 06:57:43 2010
New Revision: 205825
URL: http://svn.freebsd.org/changeset/base/205825

Log:
  MFC r205693:
  Do not overflow the term in the case of multi-line display.

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

Modified: stable/8/usr.sbin/pmcstat/pmcpl_calltree.c
==============================================================================
--- stable/8/usr.sbin/pmcstat/pmcpl_calltree.c	Mon Mar 29 06:56:17 2010	(r205824)
+++ stable/8/usr.sbin/pmcstat/pmcpl_calltree.c	Mon Mar 29 06:57:43 2010	(r205825)
@@ -366,7 +366,7 @@ pmcpl_ct_node_cleartag(void)
 
 static int
 pmcpl_ct_node_dumptop(int pmcin, struct pmcpl_ct_node *ct,
-    struct pmcpl_ct_sample *rsamples, int x, int *y)
+    struct pmcpl_ct_sample *rsamples, int x, int *y, int maxy)
 {
 	int i;
 
@@ -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_displayheight)
+		    *y >= maxy)
 			return 1;
 		*y = *y + 1;
 		for (i=0; i < x; i++)
@@ -407,7 +407,7 @@ pmcpl_ct_node_dumptop(int pmcin, struct 
 		    &ct->pct_arc[i].pcta_samples) > pmcstat_threshold) {
 			if (pmcpl_ct_node_dumptop(pmcin,
 			        ct->pct_arc[i].pcta_child,
-			        rsamples, x+1, y))
+			        rsamples, x+1, y, maxy))
 				return 1;
 		}
 	}
@@ -472,6 +472,9 @@ pmcpl_ct_node_printtop(struct pmcpl_ct_s
 			/* Check for line wrap. */
 			width += ns_len + is_len + vs_len + 1;
 			if (width >= pmcstat_displaywidth) {
+				maxy--;
+				if (y >= maxy)
+					break;
 				PMCSTAT_PRINTW("\n%*s", indentwidth, space);
 				width = indentwidth + ns_len + is_len + vs_len;
 			}
@@ -515,7 +518,7 @@ pmcpl_ct_topdisplay(void)
 		for (i = 0; i < pmcpl_ct_root->pct_narc; i++) {
 			if (pmcpl_ct_node_dumptop(pmcin,
 			        pmcpl_ct_root->pct_arc[i].pcta_child,
-			        &rsamples, x, &y)) {
+			        &rsamples, x, &y, pmcstat_displayheight - 2)) {
 				break;
 			}
 		}