From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6AA96283FE5; Tue, 16 Jun 2026 15:26:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781623563; cv=none; b=LB7f27xSx/mbTRZukxsImChmTO9x/gUzd0wyCV51M9DOeXpZSZLSqHZEPv/TY1sN+ihGKhBNZjxJlVFUl7qOS5KsZh7flCnE88hOoKtjB9xNQXm3HFxMaBnjHzqL2sYHDqs5mLH7unziWk0cqmHmPVBvxkYrYS0gl4OE/mCqetg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781623563; c=relaxed/simple; bh=UkhiuhHMI1LYKLqBSLZ7TvOZ7n2b4wnNtgxCtBg+TxQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=rKAiKAfVX5mDnKan0x6ZIm51BdfybUK1PDr4s0jKF2vT/WPWAw09RsCg500/FOAuJFkOYWOdsE9QHyh3bbGghr4IgmmO2QdKgFPuWdXmMEV3KuVP9L+UvcLhzCZLRubtF+vYIu5lGH1IA8IAEAWza/UJlYvg6qdR7AlKd3McRBw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C0IfBNth; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="C0IfBNth" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E12861F00A3A; Tue, 16 Jun 2026 15:26:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1781623562; bh=i6hTKoLKEHRj32VlzOaqvEx5YDShHWKHuW7KWNBFAh4=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=C0IfBNthd6p1qjUP+er51Ex7vxnrR6o+LBTGkVg2VaXiJU2ixZ+HD78+dqpyXf00r ad9XsZPAYp24ctpQ795O5yVLFX60czcGjSys12XB9uUiAOV3T7rKyyRfpdlF6l+YQe MmhTtlUUQmCSKPYVubHwOcclVTBAri4n6vQWR4XH8zg2jAAurAq2bc53Re/QJ/3/zr YlNGBC12Addo6FHyWPn3Y9S/kqW8RClaIvex4sxB6SFKka3SI+RcwrY56OD3MEsbDj gCm7glsN3BjBtIB6osStUuE6jeVz3isYzKdAk60Ohx63hgamyC4qVW6OdHQ4FQ/dLu 43qqpLcQRWu7A== Date: Tue, 16 Jun 2026 12:25:59 -0300 From: Arnaldo Carvalho de Melo To: Ian Rogers Cc: namhyung@kernel.org, adrian.hunter@intel.com, james.clark@linaro.org, jolsa@kernel.org, leo.yan@arm.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, mingo@redhat.com, peterz@infradead.org, thomas.falcon@intel.com, tmricht@linux.ibm.com Subject: Re: [PATCH v2 02/12] perf test: Truncate test description to fit terminal width Message-ID: References: <20260616012744.4049193-1-irogers@google.com> <20260616061404.41929-1-irogers@google.com> <20260616061404.41929-3-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260616061404.41929-3-irogers@google.com> On Mon, Jun 15, 2026 at 11:13:54PM -0700, Ian Rogers wrote: > The parallel test harness uses the carriage return delete escape sequence > `PERF_COLOR_DELETE_LINE` ("\033[A\33[2K\r") to erase and update the > "Running (X active)" progress lines. > > However, if a test description is longer than the terminal width, the line > wraps around. When this happens, the cursor up escape sequence `\033[A` only > moves the cursor to the last wrapped row, leaving the top half of the description > printed on the previous line. This leads to name duplication and output corruption > spilling over multiple rows on consoles narrower than the maximum description length > (e.g., 101 columns wide). > > Fix this by dynamically querying the terminal width using `get_term_dimensions` > and truncating the printed test descriptions using the `%-*.*s` printf format. > We reserve 35 characters for prefix, status, and spacing metrics to guarantee > the progress line never wraps. > > Fixes: 0e036dcad4e6 ("perf test: Display number of active running tests") > Signed-off-by: Ian Rogers > --- > tools/perf/tests/builtin-test.c | 110 ++++++++++++++++++++++++-------- > 1 file changed, 85 insertions(+), 25 deletions(-) > > diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c > index afc06cec4954..65a2dc50ef55 100644 > --- a/tools/perf/tests/builtin-test.c > +++ b/tools/perf/tests/builtin-test.c > @@ -10,35 +10,39 @@ > #ifdef HAVE_BACKTRACE_SUPPORT > #include > #endif > -#include > -#include > #include > -#include > #include > -#include > +#include > + > #include > -#include > +#include > +#include > +#include > +#include > +#include > #include > #include > +#include > +#include > +#include > + > +#include > +#include > +#include > + > #include "builtin.h" > +#include "color.h" > #include "config.h" > +#include "debug.h" > #include "hist.h" > #include "intlist.h" > -#include "tests.h" > -#include "debug.h" > -#include "color.h" > -#include > -#include > #include "string2.h" > #include "symbol.h" > +#include "tests-scripts.h" > +#include "tests.h" > #include "util/rlimit.h" > #include "util/strbuf.h" > -#include > -#include > -#include > -#include > - > -#include "tests-scripts.h" > +#include "util/term.h" > > static const char *junit_filename; > static struct strbuf junit_xml_buf = STRBUF_INIT; > @@ -413,19 +417,64 @@ static char *xml_escape(const char *str) > return res ? res : strdup(""); > } > > +static int get_term_width(void) > +{ > + struct winsize ws; > + int cols = 80; > + int term_width; > + A comment here to explain this 10000 magic number? > + if (!isatty(1)) > + return 10000; > + > + get_term_dimensions(&ws); > + if (ws.ws_col > 0) > + cols = ws.ws_col; > + > + /* > + * Limit description width to fit on a single line. We subtract 35 > + * columns of headroom to allocate space for: > + * - The suite index prefix: e.g. " 10.100:" (9 characters). > + * - The colon separator and spaces: " : " (3 characters). > + * - The longest status results: e.g. "Skip (some metrics failed)" (26 characters) > + * or "Running (XX active)" (20 characters). > + * > + * A minimum description width of 10 is enforced to ensure names are > + * legible even on very narrow consoles. > + */ > + term_width = cols - 35; > + if (term_width < 10) > + term_width = 10; > + > + return term_width; > +} > + > +static int get_max_desc_width(int width) > +{ > + int term_width = get_term_width(); > + > + return width > term_width ? term_width : width; > +} > + > static int print_test_result(struct test_suite *t, int curr_suite, int curr_test_case, > int result, int width, int running, > const char *err_output, double elapsed) > { > + int pad_width = get_max_desc_width(width); > + int term_width = get_term_width(); > + > if (test_suite__num_test_cases(t) > 1) { > char prefix[32]; > int len = snprintf(prefix, sizeof(prefix), "%3d.%1d:", > curr_suite + 1, curr_test_case + 1); > - int subw = len >= 4 ? width + 4 - len : width; > + int pad = len >= 4 ? pad_width + 4 - len : pad_width; > + int trunc = len >= 4 ? term_width + 4 - len : term_width; > > - pr_info("%s %-*s:", prefix, subw, test_description(t, curr_test_case)); > - } else > - pr_info("%3d: %-*s:", curr_suite + 1, width, test_description(t, curr_test_case)); > + pr_info("%s %-*.*s:", prefix, pad, trunc, > + test_description(t, curr_test_case)); > + } else { > + pr_info("%3d: %-*.*s:", curr_suite + 1, pad_width, term_width, > + test_description(t, curr_test_case)); > + } > > switch (result) { > case TEST_RUNNING: > @@ -695,6 +744,7 @@ static void finish_test(struct child_test **child_tests, int running_test, int c > int ret; > struct timespec end_time; > double elapsed; > + width = get_max_desc_width(width); > > if (child_test == NULL) { > /* Test wasn't started. */ > @@ -709,7 +759,8 @@ static void finish_test(struct child_test **child_tests, int running_test, int c > * sub test names. > */ > if (test_suite__num_test_cases(t) > 1 && curr_test_case == 0) > - pr_info("%3d: %-*s:\n", curr_suite + 1, width, test_description(t, -1)); > + pr_info("%3d: %-*.*s:\n", curr_suite + 1, width, width, > + test_description(t, -1)); > > /* > * Busy loop reading from the child's stdout/stderr that are set to be > @@ -917,6 +968,8 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tes > int last_suite_printed = -1; > sigset_t set, oldset; > > + width = get_max_desc_width(width); > + > sigemptyset(&set); > sigaddset(&set, SIGINT); > sigaddset(&set, SIGTERM); > @@ -985,8 +1038,11 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tes > if (next_child) { > if (test_suite__num_test_cases(next_child->test) > 1 && > last_suite_printed != next_child->suite_num) { > - pr_info("%3d: %-*s:\n", next_child->suite_num + 1, width, > - test_description(next_child->test, -1)); > + pr_info("%3d: %-*.*s:\n", > + next_child->suite_num + 1, > + width, width, > + test_description( > + next_child->test, -1)); > last_suite_printed = next_child->suite_num; > } > print_test_result(next_child->test, next_child->suite_num, > @@ -1049,7 +1105,8 @@ static int finish_tests_parallel(struct child_test **child_tests, size_t num_tes > > if (test_suite__num_test_cases(child->test) > 1 && > last_suite_printed != child->suite_num) { > - pr_info("%3d: %-*s:\n", child->suite_num + 1, width, > + pr_info("%3d: %-*.*s:\n", child->suite_num + 1, > + width, width, > test_description(child->test, -1)); > last_suite_printed = child->suite_num; > } > @@ -1296,7 +1353,10 @@ static int __cmd_test(struct test_suite **suites, int argc, const char *argv[], > > if (intlist__find(skiplist, curr_suite + 1)) { > if (pass == 1) { > - pr_info("%3d: %-*s:", curr_suite + 1, width, > + int pad_width = get_max_desc_width(width); > + int term_width = get_term_width(); > + > + pr_info("%3d: %-*.*s:", curr_suite + 1, pad_width, term_width, > test_description(*t, -1)); > color_fprintf(stderr, PERF_COLOR_YELLOW, > " Skip (user override)\n"); > -- > 2.54.0.1136.gdb2ca164c4-goog