From patchwork Thu Dec 19 10:49:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 182098 Delivered-To: patch@linaro.org Received: by 2002:a92:d0a:0:0:0:0:0 with SMTP id 10csp328996iln; Thu, 19 Dec 2019 03:09:05 -0800 (PST) X-Google-Smtp-Source: APXvYqwIbV2BlpPRryC6K1XLw+a4xrWIsWBHcDxTp6L5lSFvFA+agqCFKbp1qVnYF80V1JgNMb7K X-Received: by 2002:a05:6830:1db3:: with SMTP id z19mr8648337oti.152.1576753745091; Thu, 19 Dec 2019 03:09:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576753745; cv=none; d=google.com; s=arc-20160816; b=NKAr2IqBnwnIqWVTMAOvmn1Vvr2yKigriaQq7LmVtRfKHA+gsf1aC+CzQ59yFy8QeB yX/n6wI60f4YO8naZsF2En/mzxIGxhkUHuRvdigO2j6T1l5/Dx0CeF/Okea32UeX8hW4 sEyI8aAxVZSdi3SWYpaFbW0ci+vBMwV/JpYSTz9TvUm0vOjXIER6de+17h8yrJaWAHP8 2HnJu/POMvkAEr3SvmkIxLdZk7d5s5vDGP/gGKAEcF/diUVr0OqgHJRAe00UE8DOQqAD 6V2GYZ4g8+0JQ9Nxfa4yCGEdW3YGmOufnCgd3XvKmA4fQGTQggcsOkrFdaxN6L85kCBM 8ipQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=uLKaiiVcWx70eG0qkNbXF+zMJscr1d+jtw4eifA48Xc=; b=A7ZpbzxUinCSSQyDiSPSW8E4qOqzfvHyHLfAgu2w9E/qX2nJI6Yv0EZLyt/BXNK/2P LmyT4gQBC25Dk7AwqiFUEWq/oBpgV7sxbpcHVZQmYeeR9s1qHKwePdjgEFCzPNYBzyKa 2O/K38cNo/q83R8TtFDrHLF96Ax43Q54RtmCmBH19UcINjsKzkEVlgqdbvMWajct5270 +91DxBNWZw4cvS4hHTsEnxDeOxwlvzWY3S2MA8ziHSYrhczbw/4zB+7DY/BEDwu72cEZ MdhHUk8qA98byw+dEVf05JSnldN6gyz72/k+9aqU6Ne53LtLobxwWEX2/l7D6VPC05FF 8ubQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gN1LN8vo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v3si2811635oif.122.2019.12.19.03.09.05 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Dec 2019 03:09:05 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=gN1LN8vo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:39192 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihtg0-0008UF-74 for patch@linaro.org; Thu, 19 Dec 2019 06:09:04 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57449) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ihtWg-0003u5-HM for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:59:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ihtWf-0001G8-9F for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:59:26 -0500 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:53579) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ihtWf-0001A5-08 for qemu-devel@nongnu.org; Thu, 19 Dec 2019 05:59:25 -0500 Received: by mail-wm1-x32d.google.com with SMTP id m24so4960932wmc.3 for ; Thu, 19 Dec 2019 02:59:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uLKaiiVcWx70eG0qkNbXF+zMJscr1d+jtw4eifA48Xc=; b=gN1LN8vooBN7X/EDhpq1QpMUPDE6G8qMh6rpyNzcJSlQ480NdO4ap8W615ibJn6ekE +XFcQiCMxDIeOXdVmVEmktX2Q+bt1E7bRpRpxAWNKfLEKvX05j+fWCGSxZNOMP3geCEo fJkQDVB0ViPpz4u9Y2irlLaGt2UbQM9sDeaCk1yMvDgHzV4BgmGVVfr5C8ZHE7ujdntW JvmWN1w0ZGcd7giCvE6xAUEw0H43r2WaO5odMmb+eRhhn3zdYBZIfZhyxVc4KzCUDY5R W6zJlFXiWHSbVAWt523ebGjrGHqWbxGr5vLFXaEiy/lKlDx6AeeM6orKN9gbHXK428b/ /2lw== 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=uLKaiiVcWx70eG0qkNbXF+zMJscr1d+jtw4eifA48Xc=; b=EycCdFD++7h97fyQFYr4QeQfR/x9FSy27eka7NHHEEIh8Cuxt8LyZ6vclXMWcZ6l49 kQfZzdML01qb+XB98kXY1pun7maqaCK2b89SgtKDdeica8Fz/vDpcSeZ7CYC9pHLxQ0p BwMvpB62YJBlsHoENT5EWOO12RJoCNVI4bMX65EgebCuVzQUoU+yF9G49eSGhqcLgVLv RaQGLT2I6SLmKZBiq+StArIXfIGtygopq/GL2ePJfIRsnmrOBgExhF3K+QbD+bcgu6Xr PVjJFyr/GGyowbvBv50ESVYlmd/dG7VkOV/AAOkFip1X4g3LO1L58dI8KxEc5wcbDljK oPsg== X-Gm-Message-State: APjAAAV29IFKjo+tU2D0eYEUc6frEa8f0b5U5qW8RrP+IhVd4E1DNLFt v/AC43Y9Rq0NpGro2tPjAtVBzA== X-Received: by 2002:a1c:4907:: with SMTP id w7mr9067854wma.106.1576753163816; Thu, 19 Dec 2019 02:59:23 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y20sm5545442wmi.25.2019.12.19.02.59.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 02:59:19 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id BB09B1FFAF; Thu, 19 Dec 2019 10:49:36 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 24/25] trace: replace hand-crafted pattern_glob with g_pattern_match_simple Date: Thu, 19 Dec 2019 10:49:33 +0000 Message-Id: <20191219104934.866-25-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219104934.866-1-alex.bennee@linaro.org> References: <20191219104934.866-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32d X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Henderson , =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , qemu-devel@nongnu.org, Stefan Hajnoczi Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We already use g_pattern_match elsewhere so remove the duplication. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Stefan Hajnoczi Message-Id: <20191205122518.10010-7-alex.bennee@linaro.org> -- 2.20.1 diff --git a/trace/control.c b/trace/control.c index d9cafc161bb..0fb81241607 100644 --- a/trace/control.c +++ b/trace/control.c @@ -98,38 +98,6 @@ TraceEvent *trace_event_name(const char *name) return NULL; } -static bool pattern_glob(const char *pat, const char *ev) -{ - while (*pat != '\0' && *ev != '\0') { - if (*pat == *ev) { - pat++; - ev++; - } - else if (*pat == '*') { - if (pattern_glob(pat, ev+1)) { - return true; - } else if (pattern_glob(pat+1, ev)) { - return true; - } else { - return false; - } - } else { - return false; - } - } - - while (*pat == '*') { - pat++; - } - - if (*pat == '\0' && *ev == '\0') { - return true; - } else { - return false; - } -} - - void trace_event_iter_init(TraceEventIter *iter, const char *pattern) { iter->event = 0; @@ -148,8 +116,7 @@ TraceEvent *trace_event_iter_next(TraceEventIter *iter) iter->group++; } if (!iter->pattern || - pattern_glob(iter->pattern, - trace_event_get_name(ev))) { + g_pattern_match_simple(iter->pattern, trace_event_get_name(ev))) { return ev; } }