From nobody Mon Apr 13 20:18:00 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E1090C433FE for ; Wed, 16 Nov 2022 07:13:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232835AbiKPHNW (ORCPT ); Wed, 16 Nov 2022 02:13:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232716AbiKPHNJ (ORCPT ); Wed, 16 Nov 2022 02:13:09 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C335920181 for ; Tue, 15 Nov 2022 23:13:08 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id bw25-20020a056a00409900b0056bdd4f8818so9216923pfb.15 for ; Tue, 15 Nov 2022 23:13:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NVCMLdIaGKYl515v9BSPBB+0JzpaXzttaEc2YraX+wA=; b=YBypCi/EgROQraVH/pC6M9CYoxe2JUhU33fWhx/1ZIT2+vPvTKkBb3E6wsNNiCtmO1 T52/NNdz/qmL4tHIZzdA8Jid+rFwh5E1mxSJU/rQe9N2flMehzZ5+KYViypk9Gap8Ipa ycW4RH5w/HD9PtSzaCepkSW4ZQV7kGaS4pxw5rhdoJZNASDkmL2H1ZcUo5iquj78GHh2 o32wRcdJS1LgBhX475WE6YVdIPvjqSmKdEM4XEe4Gw8d9rPMCqH3ZZWU31bxu+0yAGXw G79ILt8QsdeDMgoSGREhRNzYWZF4Kmu5qJAZih6OttXSgEePNViLoSm9Om/k5GdcSuqS sGKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NVCMLdIaGKYl515v9BSPBB+0JzpaXzttaEc2YraX+wA=; b=wjqaU66biaWvauV7+EbDm2kmMWfOw2bl83pLCkAumyZ88+5dxgWJ6F/ooW40En11c1 TmC9nMVVkGdgmPhfxZMdGu6Bqs6Ddnn0LvlXMGh5X3Mmr0E+gbSiRz1woj28iKiJ4Xzu Uw5nACMfi0ARrDRR6ggfqkiJwCU9BjJ/Wi/3vRvx0BIg+3Ecw3xkgqcV5yPoQZuU4pYa AXgigD3+AaKrEaxap+PtU1l0GX1CKB9W+GIoj8NqXryerOKqSUu6wMU6kmkPePEmEz5R WFhjf9mWsOSWmOuNJXdQJHV0h9HpVTvZWNBgWuvZbJeAsmhJwvHM1sUrbSKQ6V1hIos3 yf3w== X-Gm-Message-State: ANoB5pmiyR1+oDdUeubbAGUUG5jQ+YObSYSunzmn/NP37Iz/6hHQD4D6 MaZCsUTNYos4rzS5HttlEP7ChZmABTzs X-Google-Smtp-Source: AA0mqf5yOlyfg23shcD/S8pZEuV65Yr6XU4+Cu8EefLfLGvQd24JxozE1zWMO4ySuQt8AswjPsOipUHBRcJt X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:bf0f:58f3:342e:c1ec]) (user=irogers job=sendgmr) by 2002:aa7:8f0d:0:b0:56b:d738:9b with SMTP id x13-20020aa78f0d000000b0056bd738009bmr21882110pfr.61.1668582788294; Tue, 15 Nov 2022 23:13:08 -0800 (PST) Date: Tue, 15 Nov 2022 23:12:57 -0800 In-Reply-To: <20221116071259.2832681-1-irogers@google.com> Message-Id: <20221116071259.2832681-3-irogers@google.com> Mime-Version: 1.0 References: <20221116071259.2832681-1-irogers@google.com> X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Subject: [PATCH v1 2/4] perf list: Support newlines in wordwrap From: Ian Rogers To: Weilin Wang , Perry Taylor , Caleb Biggers , Leo Yan , Adrian Hunter , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Sandipan Das , Kajol Jain , Zhengjun Xing , Kan Liang , Ravi Bangoria , Xin Gao , Rob Herring , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rather than a newline starting from column 0, record a newline was seen and then add the newline and space before the next word. Signed-off-by: Ian Rogers --- tools/perf/builtin-list.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index 0450fbfd0a5c..43c635d58627 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -73,17 +73,19 @@ static void wordwrap(const char *s, int start, int max,= int corr) { int column =3D start; int n; + bool saw_newline =3D false; =20 while (*s) { - int wlen =3D strcspn(s, " \t"); + int wlen =3D strcspn(s, " \t\n"); =20 - if (column + wlen >=3D max && column > start) { + if ((column + wlen >=3D max && column > start) || saw_newline) { printf("\n%*s", start, ""); column =3D start + corr; } n =3D printf("%s%.*s", column > start ? " " : "", wlen, s); if (n <=3D 0) break; + saw_newline =3D s[wlen] =3D=3D '\n'; s +=3D wlen; column +=3D n; s =3D skip_spaces(s); @@ -145,7 +147,7 @@ static void default_print_event(void *ps, const char *p= mu_name, const char *topi wordwrap(desc, 8, pager_get_columns(), 0); printf("]\n"); } - + long_desc =3D long_desc ?: desc; if (long_desc && print_state->long_desc) { printf("%*s", 8, "["); wordwrap(long_desc, 8, pager_get_columns(), 0); @@ -153,7 +155,8 @@ static void default_print_event(void *ps, const char *p= mu_name, const char *topi } =20 if (print_state->detailed && encoding_desc) { - printf("%*s%s", 8, "", encoding_desc); + printf("%*s", 8, ""); + wordwrap(encoding_desc, 8, pager_get_columns(), 0); if (metric_name) printf(" MetricName: %s", metric_name); if (metric_expr) --=20 2.38.1.431.g37b22c650d-goog