d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r205693:

Browse Source 
Do not overflow the term in the case of multi-line display.
This commit is contained in:
Fabien Thomas 2010-03-29 06:57:43 +00:00
parent 44a4e1d8fb
commit 2efccbe06d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.sbin/pmcstat/pmcpl_calltree.c
View File

@ -366,7 +366,7 @@ pmcpl_ct_node_cleartag(void)
static int static int
pmcpl_ct_node_dumptop(int pmcin, struct pmcpl_ct_node *ct, 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; int i;
@ -387,7 +387,7 @@ pmcpl_ct_node_dumptop(int pmcin, struct pmcpl_ct_node *ct,
if (ct->pct_narc == 0) { if (ct->pct_narc == 0) {
pmcpl_ct_topscreen[x+1][*y] = NULL; pmcpl_ct_topscreen[x+1][*y] = NULL;
if (*y >= PMCPL_CT_MAXLINE || if (*y >= PMCPL_CT_MAXLINE ||
*y >= pmcstat_displayheight) *y >= maxy)
return 1; return 1;
*y = *y + 1; *y = *y + 1;
for (i=0; i < x; i++) for (i=0; i < x; i++)
@ -407,7 +407,7 @@ pmcpl_ct_node_dumptop(int pmcin, struct pmcpl_ct_node *ct,
&ct->pct_arc[i].pcta_samples) > pmcstat_threshold) { &ct->pct_arc[i].pcta_samples) > pmcstat_threshold) {
if (pmcpl_ct_node_dumptop(pmcin, if (pmcpl_ct_node_dumptop(pmcin,
ct->pct_arc[i].pcta_child, ct->pct_arc[i].pcta_child,
rsamples, x+1, y)) rsamples, x+1, y, maxy))
return 1; return 1;
} }
} }
@ -472,6 +472,9 @@ pmcpl_ct_node_printtop(struct pmcpl_ct_sample *rsamples, int pmcin, int maxy)
/* Check for line wrap. */ /* Check for line wrap. */
width += ns_len + is_len + vs_len + 1; width += ns_len + is_len + vs_len + 1;
if (width >= pmcstat_displaywidth) { if (width >= pmcstat_displaywidth) {
maxy--;
if (y >= maxy)
break;
PMCSTAT_PRINTW("\n%*s", indentwidth, space); PMCSTAT_PRINTW("\n%*s", indentwidth, space);
width = indentwidth + ns_len + is_len + vs_len; 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++) { for (i = 0; i < pmcpl_ct_root->pct_narc; i++) {
if (pmcpl_ct_node_dumptop(pmcin, if (pmcpl_ct_node_dumptop(pmcin,
pmcpl_ct_root->pct_arc[i].pcta_child, pmcpl_ct_root->pct_arc[i].pcta_child,
&rsamples, x, &y)) { &rsamples, x, &y, pmcstat_displayheight - 2)) {
break; break;
} }
} }