From patchwork Tue Jan 23 19:31:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Petr Vorel X-Patchwork-Id: 10181005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CB024602B7 for ; Tue, 23 Jan 2018 19:31:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A8C2926CF9 for ; Tue, 23 Jan 2018 19:31:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9D39B28760; Tue, 23 Jan 2018 19:31:37 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C543826CF9 for ; Tue, 23 Jan 2018 19:31:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752118AbeAWTbg (ORCPT ); Tue, 23 Jan 2018 14:31:36 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:44295 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752025AbeAWTbf (ORCPT ); Tue, 23 Jan 2018 14:31:35 -0500 Received: by mail-wm0-f67.google.com with SMTP id t74so4036768wme.3 for ; Tue, 23 Jan 2018 11:31:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=YgSuiU3nVGWZ4zMwh0RhgEwg2wW7sfqsYgliYAC36nE=; b=ZQs2Y8KgsZk76O+PkgYI9XaYZ78pNj+aIWaZM+MWv9l+pu5+xrUsMnqNmUi76TNnhD LG2+tHeLcdqA+AfG8bx+p2zMhwb+eWP223YmD9ycAv4+Y3lyYkw2bJhZ8Vi/08YtN3Sx TwBizUU+Q5KFbzTSvYr9ZGFzvQKIIiDUCaIWEAfpWiNkE0ug5WDD+qz5eyNK28cHFkFo C7VUGXFlNijUG0dBgh9ylqpTgcEH9HvdW+jdWR2HqwR62j+ohAZy97C8aNpe2RN6QUUB hzzu/5UIQCpCP8CkEeTzIatOka+H94SMvzumAMcpB5ecZPLAYkD1Dnnxbls59quFhryW eRGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=YgSuiU3nVGWZ4zMwh0RhgEwg2wW7sfqsYgliYAC36nE=; b=dcBBvJM7nLUMky0ExLtyFpg0UlwU98x4UoDBj86kRZtVrbuMWJJNz0xR4g3HPHtK8G OhRRdLWeGLVoUFYE+ffag/HzRUTUNY+ib3eEt/evORmkdCh3XW1gmZY7VMEGCH2vB5b4 WQuS9bjPZNLkdRQV/xPGfL6tB/Ki/q7WUNvmOXjAKxWd8L9Atth0/hqdr1khKFg08vVg s/1xANLEiww/7M3LcdoSZ2gbIRTE6wo+V431URO3gpcvqz4AXFQcVg0RZOJ+fyYWqXHw GmInDaG+ENJegQNjA3iuigdJpRQZ8FvuJnRzLWYWEfrgOfZsMTtiAzuWBIPtFm1KeUdp 8mdA== X-Gm-Message-State: AKwxyteUFhMES9AmNAYtwfj5rPcp4oAfEyq5ix2abnkV+wSVlK9OPfcb Ew4q/YB8wIbhjo89TSPrfYRZIw== X-Google-Smtp-Source: AH8x226UdGYlkH+1eOGICzK5B0ZtsUZ76UDH39s3xGYZBpCx/efVIpzpngoD/49FLeyzn1HKGChyjA== X-Received: by 10.28.137.85 with SMTP id l82mr2885457wmd.109.1516735893745; Tue, 23 Jan 2018 11:31:33 -0800 (PST) Received: from localhost.localdomain ([85.119.94.113]) by smtp.gmail.com with ESMTPSA id h16sm1202746wre.43.2018.01.23.11.31.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 23 Jan 2018 11:31:33 -0800 (PST) From: Petr Vorel To: linux-kbuild@vger.kernel.org Cc: Petr Vorel , Masahiro Yamada , Randy Dunlap , Paul Bolle Subject: [PATCH v5 1/1] kconfig: menuconfig make "Selected by:" and "Implied by:" readable Date: Tue, 23 Jan 2018 20:31:03 +0100 Message-Id: <20180123193103.17651-1-petr.vorel@gmail.com> X-Mailer: git-send-email 2.15.1 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Reverse dependency expressions can get rather unwieldy, especially if a symbol is selected by more than a handful of other symbols. I.e. it's possible to have near endless expressions like: A && B && !C || D || F && (G || H) || [...] Chop these expressions into actually readable chunks: - A && B && !C - D - F && (G || H) - [...] I.e. transform the top level OR tokens into newlines and prepend each line with a minus. This makes the "Selected by:" and "Implied by:" blurb much easier to read. This is done only if there is more than one top level OR. "Depends on:" and "Range :" were deliberately left as they are. Based on idea from Paul Bolle. Reported-by: Paul Bolle Signed-off-by: Petr Vorel --- Changes v4->v5: * Fixed issues with "make alldefconfig". Now is change done really only for "Selected by:" and "Implied by:" in "make menuconfig". I tested it on various items on x86_64: Implied by: PTP_1588_CLOCK; Selected by: USB, INPUT, NET, RT2X00_LIB_USB and on this config: config BAR5 bool default y imply BAZ config FOO bool default y select BAR imply BAZ config BAR bool "foo" depends on BAZ || QUX imply BAZ config FOO2 bool default y select BAR2 config BAR2 bool "foo2" depends on BAZ || QUX || BAY || (PEV1 && PEV2) imply BAZ config FOO3 bool default y select BAR imply BAZ3 config BAR3 bool "foo" depends on BAZ || QUX imply BAZ4 --- scripts/kconfig/expr.c | 26 ++++++++++++++++++++++---- scripts/kconfig/expr.h | 1 + scripts/kconfig/menu.c | 8 ++++++-- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c index fd8a416ceab7..6613eae0226e 100644 --- a/scripts/kconfig/expr.c +++ b/scripts/kconfig/expr.c @@ -1176,7 +1176,7 @@ struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2) return expr_get_leftmost_symbol(ret); } -void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken) +static void __expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken, bool revdep) { if (!e) { fn(data, NULL, "y"); @@ -1231,9 +1231,12 @@ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char * fn(data, e->right.sym, e->right.sym->name); break; case E_OR: - expr_print(e->left.expr, fn, data, E_OR); - fn(data, NULL, " || "); - expr_print(e->right.expr, fn, data, E_OR); + __expr_print(e->left.expr, fn, data, E_OR, revdep); + if (revdep) + fn(data, NULL, "\n - "); + else + fn(data, NULL, " || "); + __expr_print(e->right.expr, fn, data, E_OR, revdep); break; case E_AND: expr_print(e->left.expr, fn, data, E_AND); @@ -1266,6 +1269,11 @@ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char * fn(data, NULL, ")"); } +void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken) +{ + __expr_print(e, fn, data, prevtoken, false); +} + static void expr_print_file_helper(void *data, struct symbol *sym, const char *str) { xfwrite(str, strlen(str), 1, data); @@ -1310,3 +1318,13 @@ void expr_gstr_print(struct expr *e, struct gstr *gs) { expr_print(e, expr_print_gstr_helper, gs, E_NONE); } + +/* + * Transform the top level "||" tokens into newlines and prepend each + * line with a minus. This makes expressions much easier to read. + * Suitable for reverse dependency expressions. + */ +void expr_gstr_print_revdep(struct expr *e, struct gstr *gs) +{ + __expr_print(e, expr_print_gstr_helper, gs, E_NONE, true); +} diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h index e7d7a5e3da68..c16e82e302a2 100644 --- a/scripts/kconfig/expr.h +++ b/scripts/kconfig/expr.h @@ -310,6 +310,7 @@ struct expr *expr_simplify_unmet_dep(struct expr *e1, struct expr *e2); void expr_fprint(struct expr *e, FILE *out); struct gstr; /* forward */ void expr_gstr_print(struct expr *e, struct gstr *gs); +void expr_gstr_print_revdep(struct expr *e, struct gstr *gs); static inline int expr_is_yes(struct expr *e) { diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c index d365fc9513c5..cee9e6a53ec3 100644 --- a/scripts/kconfig/menu.c +++ b/scripts/kconfig/menu.c @@ -828,14 +828,18 @@ static void get_symbol_str(struct gstr *r, struct symbol *sym, get_symbol_props_str(r, sym, P_SELECT, _(" Selects: ")); if (sym->rev_dep.expr) { str_append(r, _(" Selected by: ")); - expr_gstr_print(sym->rev_dep.expr, r); + if (sym->rev_dep.expr->type == E_OR) + str_append(r, "\n - "); + expr_gstr_print_revdep(sym->rev_dep.expr, r); str_append(r, "\n"); } get_symbol_props_str(r, sym, P_IMPLY, _(" Implies: ")); if (sym->implied.expr) { str_append(r, _(" Implied by: ")); - expr_gstr_print(sym->implied.expr, r); + if (sym->implied.expr->type == E_OR) + str_append(r, "\n - "); + expr_gstr_print_revdep(sym->implied.expr, r); str_append(r, "\n"); }