From patchwork Thu Dec 5 12:25:17 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: 180886 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp2022640ile; Thu, 5 Dec 2019 06:12:16 -0800 (PST) X-Google-Smtp-Source: APXvYqxFcP48LcZHotLcuGSCCnQa4aETCtADDFGibSV8a6WnBV2CPFOaHE6dG/fhXMXaCAPJrrqJ X-Received: by 2002:aca:57d4:: with SMTP id l203mr7425954oib.113.1575555136715; Thu, 05 Dec 2019 06:12:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575555136; cv=none; d=google.com; s=arc-20160816; b=QMD4iXz64sm+QL3Cx48zBhfto8Mzq9OEYGqxsPbWuI9R6VWlyP6QW5poGO8+zbjbvM gemOu4MKTXFupOvYgDA02ph14YYfDUkGt5zUYKcEZVUHna4EVuRP6I8ueezyKubLqydp GIyz/bGX46BeF0mFS9DR3m/Z13z2sCw0/2yKjik+ro2V1rPusQHpytCDAFNSy7lH2HEL 0lq9BI87IKs2aWcI+FqcL0RJHUFXoX/PF62e9GuO3Gd9GFNf26tkHe4DHo2f0zo6sbHq 5BPIyHD5c8DUfnta2j5WX58BU4oxZIY4TgZ+xcCUoN4ghUhzNArTjuKO7xnH0WcCRNOT roPQ== 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=et7ltZY7DPRXGygmqJQSM9s82vIGOWea1S/OwancEF4=; b=RmL1u1mB9XhiBCNMW4cYn5GT1pxCXNrZ49sHqu8SpnN3LIfdikU6FdTDHG2mtUclFf s+cyD6AnTogrixag7P9GGzt71kMOLBfFMNYuhGYPpaKsrXAK60+szgnerPITFEOduOs5 qvY61g7suXWlRy2k1vFlQzj8RxFWkkHepl/67vltwE6tQCVs17zmT0yo7j3JalWtZj0Y XgkgRXY7VB1GutdyT9QN1RgF5AfuLuok/IlRu/pjJg6nDpqmvpRoqAcmBYDHbhf/dyuZ cmT0n7YyQCzkoZB6udLbyVJWKg01qpX1/Ue2GwjWtvVFNJz36ZylbbHuyeVyddm8xq9d LhRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HloIVpv2; 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=pass (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 o16si5361083otp.289.2019.12.05.06.12.16 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 05 Dec 2019 06:12:16 -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=pass header.i=@linaro.org header.s=google header.b=HloIVpv2; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:54958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icrrc-0006aH-1n for patch@linaro.org; Thu, 05 Dec 2019 09:12:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56768) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icrex-0002Xw-4s for qemu-devel@nongnu.org; Thu, 05 Dec 2019 08:59:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icrew-0000Yl-0H for qemu-devel@nongnu.org; Thu, 05 Dec 2019 08:59:11 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38127) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1icrev-0000VF-PO for qemu-devel@nongnu.org; Thu, 05 Dec 2019 08:59:09 -0500 Received: by mail-wr1-x444.google.com with SMTP id y17so3731489wrh.5 for ; Thu, 05 Dec 2019 05:59:09 -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=et7ltZY7DPRXGygmqJQSM9s82vIGOWea1S/OwancEF4=; b=HloIVpv2ZsUpCeB42Jm/DQW8F9xJlGHdlqPleFxK8RcIiHbRu8uIVNQs89iJZ5/fxA 7XzBsbwZ5KPNkEtR2ApMkLaQYRFE+Mmdmya408z6SxkDKa+/vW1zjbbObGBq142BF2Oh W2ZCn9g/aqbtRNB7jvCxeRJs4Gb7ZWMDfDXZlSP9sK6S4uoGkICBhrHiy2g5BLFD1KRF pUEcggkqBm/3Xxtr+wJnX86SZ/KiZUzYBexdhh66dfKm8bTWGfLxK1LASWIlgaR6zCJb BL7POBLO9y0hffJYFCkiSYj+G/fEp1nAKU2HoyNx/5gd358sPM387nWpzZHxMsfaQ/cX R+ww== 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=et7ltZY7DPRXGygmqJQSM9s82vIGOWea1S/OwancEF4=; b=IwZesQVCPJLz961VtIPQ+WPHscbXUsi0lBYzSXdakNadPFXgJe/cr1eUwd0K+Ggw5P sX2tKclMLubjczE1dQ6XZxZk6kc8Ssli8Ln+6FzYztNPhTxmWyssa3z2P0d7iF7CDXXT Wtcy4YcCiIBZGkyRRC48UcogpORsTNS93Zl80sWKJWvWB8C1uDa8Tdlemrp/UUPXJJlt Mz2kdcm8d3VHWO7HgpyGatDtcSOviXdXPJs+bT/GX1PvL2dyj3U86RSHKjdN8z1h9eU0 ACeub89ozPeQJlf4PbnzIfTFdIMgvN8NNlPD2PObgHqw3434L91cnTjU+GKkf1n2/5+k 8Dbg== X-Gm-Message-State: APjAAAVXstFaO6ItJM/wH6nZODRjYgWWdg93Qb3ZyXeY2rRjxx+HCrt8 dtJCUvaTdp2AdK2IO30rTP9Pr9AFygs= X-Received: by 2002:a5d:4a84:: with SMTP id o4mr9712985wrq.396.1575548728753; Thu, 05 Dec 2019 04:25:28 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id i127sm10954997wma.35.2019.12.05.04.25.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Dec 2019 04:25:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 947E11FF93; Thu, 5 Dec 2019 12:25:18 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 6/6] trace: replace hand-crafted pattern_glob with g_pattern_match_simple Date: Thu, 5 Dec 2019 12:25:17 +0000 Message-Id: <20191205122518.10010-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191205122518.10010-1-alex.bennee@linaro.org> References: <20191205122518.10010-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::444 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: =?utf-8?q?Alex_Benn=C3=A9e?= , 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 --- trace/control.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) -- 2.20.1 Reviewed-by: Richard Henderson Reviewed-by: Stefan Hajnoczi 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; } }