From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.6 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1DEADC43460 for ; Tue, 11 May 2021 18:51:31 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id BF8756191C for ; Tue, 11 May 2021 18:51:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BF8756191C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 614826B0078; Tue, 11 May 2021 14:51:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 524586B007B; Tue, 11 May 2021 14:51:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 328D68D0001; Tue, 11 May 2021 14:51:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0122.hostedemail.com [216.40.44.122]) by kanga.kvack.org (Postfix) with ESMTP id 18E4B6B0078 for ; Tue, 11 May 2021 14:51:26 -0400 (EDT) Received: from smtpin37.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id D06828249980 for ; Tue, 11 May 2021 18:51:25 +0000 (UTC) X-FDA: 78129843330.37.D352675 Received: from mail-io1-f50.google.com (mail-io1-f50.google.com [209.85.166.50]) by imf30.hostedemail.com (Postfix) with ESMTP id 5129CE0011F1 for ; Tue, 11 May 2021 18:50:56 +0000 (UTC) Received: by mail-io1-f50.google.com with SMTP id i7so11698522ioa.12 for ; Tue, 11 May 2021 11:51:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=edbAM8pNMWrl0Zd/ZLYzgEM9CPxsCooD0s2Yg5J4Xik=; b=o/q+Qpd8wiM+S8VNNw4FvN68R7MMHEnj/9Ar6ooVy951E9qwyvXpjNdNe6zHpoINlX z8jVJttCTZID7um6zsJ+n0OW+nJopY7tyGHK+MLvHPu7q8vs7bNAF9Xv69u8nkotqCCb C5N+zUy/fNd2GMp+AWXgAiG1lfMWCZUDMUlxZhbqTzS7FQV89yLDLqCKs2WUPFBVGGNA 6e8JJv/VAIZO5s67UhGLW6bX0jtoFgp9toRKUtIycKrgDuG/I/XFJUC5EcJflkB7IDNv Jmy0id6oXOLXFxubtjCqMj8S7j0iioSSRecsnuA3GUjAadfl84PbZdJuNSBr7FfJ3Ddf 0PtQ== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=edbAM8pNMWrl0Zd/ZLYzgEM9CPxsCooD0s2Yg5J4Xik=; b=AehpfgFD2ELfQlR0r1WnF7G8G86z9AQMGvX5oPOg3MnDutRH9CZwHUSdo5htZrn7uy uWidACfxVueX1F5x2h1sWHe6cMbxd2vRZrmKsdPB8a8B10wTug10O1A5N5A1iySONxDZ JGsBT0U9tYWvU2qXMiKj/qYWvVlgdyr1gvWL+tBdpZoLZMXQcO4a66bl3hfamrhZZA25 PYVq47TLPcgWRPQX7rA3PgssM77eJPjsbeA8bniOOyf6kQ8U3yu/bfKLiC23cCHDHrCY ex0W2X7m4iFBN9Uyf8i0Jv5oMd8RJmNNayudS9uPGQekKUUywMkQqw6KjavsjEMyJidp gIXg== X-Gm-Message-State: AOAM533HOoGV5zW+E0hul9SuWaN4VowAUCrqu5QGFV8zdsTLPxjZdlGu pXX5iATrXVM01RFWCjdmpL4= X-Google-Smtp-Source: ABdhPJy/LBlcvLqRCMyyl1Jzgkwgsb71H5OvnqlkY4P+e1/3kWWKv5zaTdow/4t+NTf857Bnd4iIaQ== X-Received: by 2002:a02:54c1:: with SMTP id t184mr19223588jaa.79.1620759084933; Tue, 11 May 2021 11:51:24 -0700 (PDT) Received: from frodo.mearth (c-24-9-77-57.hsd1.co.comcast.net. [24.9.77.57]) by smtp.googlemail.com with ESMTPSA id t10sm405096ils.36.2021.05.11.11.51.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 May 2021 11:51:24 -0700 (PDT) From: Jim Cromie To: Jason Baron , linux-kernel@vger.kernel.org Cc: linux-mm@kvack.org, Jim Cromie Subject: [RFC PATCH v5 05/28] dyndbg: refactor part of ddebug_change to ddebug_match_site Date: Tue, 11 May 2021 12:50:34 -0600 Message-Id: <20210511185057.3815777-6-jim.cromie@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210511185057.3815777-1-jim.cromie@gmail.com> References: <20210511185057.3815777-1-jim.cromie@gmail.com> MIME-Version: 1.0 Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=gmail.com header.s=20161025 header.b="o/q+Qpd8"; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf30.hostedemail.com: domain of jimcromie@gmail.com designates 209.85.166.50 as permitted sender) smtp.mailfrom=jimcromie@gmail.com X-Stat-Signature: 3j66jpqhqe557k93cnphbeybqnboppie X-Rspamd-Queue-Id: 5129CE0011F1 X-Rspamd-Server: rspam02 Received-SPF: none (gmail.com>: No applicable sender policy available) receiver=imf30; identity=mailfrom; envelope-from=""; helo=mail-io1-f50.google.com; client-ip=209.85.166.50 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1620759056-249384 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Move all the site-match logic into a separate function, reindent the code, and replace the continues with return falses. No functional changes. Signed-off-by: Jim Cromie --- lib/dynamic_debug.c | 75 ++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 32 deletions(-) diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 5a33143215a4..e6e2cb0180e5 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c @@ -142,6 +142,48 @@ static void vpr_info_dq(const struct ddebug_query *q= uery, const char *msg) query->first_lineno, query->last_lineno); } =20 +static int ddebug_match_site(const struct ddebug_query *query, + const struct _ddebug *dp) +{ + struct _ddebug_site *dc =3D dp->site; + + /* match against the source filename */ + if (query->filename && + !match_wildcard(query->filename, dc->filename) && + !match_wildcard(query->filename, + kbasename(dc->filename)) && + !match_wildcard(query->filename, + trim_prefix(dc->filename))) + return false; + + /* match against the function */ + if (query->function && + !match_wildcard(query->function, dc->function)) + return false; + + /* match against the format */ + if (query->format) { + if (*query->format =3D=3D '^') { + char *p; + /* anchored search. match must be at beginning */ + p =3D strstr(dp->format, query->format+1); + if (p !=3D dp->format) + return false; + } else if (!strstr(dp->format, query->format)) + return false; + } + + /* match against the line number range */ + if (query->first_lineno && + dp->lineno < query->first_lineno) + return false; + if (query->last_lineno && + dp->lineno > query->last_lineno) + return false; + + return true; +} + /* * Search the tables for _ddebug's which match the given `query' and * apply the `flags' and `mask' to them. Returns number of matching @@ -170,38 +212,7 @@ static int ddebug_change(const struct ddebug_query *= query, struct _ddebug *dp =3D &dt->ddebugs[i]; struct _ddebug_site *dc =3D dp->site; =20 - /* match against the source filename */ - if (query->filename && - !match_wildcard(query->filename, dc->filename) && - !match_wildcard(query->filename, - kbasename(dc->filename)) && - !match_wildcard(query->filename, - trim_prefix(dc->filename))) - continue; - - /* match against the function */ - if (query->function && - !match_wildcard(query->function, dc->function)) - continue; - - /* match against the format */ - if (query->format) { - if (*query->format =3D=3D '^') { - char *p; - /* anchored search. match must be at beginning */ - p =3D strstr(dp->format, query->format+1); - if (p !=3D dp->format) - continue; - } else if (!strstr(dp->format, query->format)) - continue; - } - - /* match against the line number range */ - if (query->first_lineno && - dp->lineno < query->first_lineno) - continue; - if (query->last_lineno && - dp->lineno > query->last_lineno) + if (!ddebug_match_site(query, dp)) continue; =20 nfound++; --=20 2.31.1