qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
	"Stefan Hajnoczi" <stefanha@redhat.com>
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	[thread overview]
Message-ID: <20191205122518.10010-7-alex.bennee@linaro.org> (raw)
In-Reply-To: <20191205122518.10010-1-alex.bennee@linaro.org>

We already use g_pattern_match elsewhere so remove the duplication.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 trace/control.c | 35 +----------------------------------
 1 file changed, 1 insertion(+), 34 deletions(-)

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;
         }
     }
-- 
2.20.1



  parent reply	other threads:[~2019-12-05 14:11 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-05 12:25 [PATCH v2 0/6] linux-user mmap debug cleanup Alex Bennée
2019-12-05 12:25 ` [PATCH v2 1/6] linux-user: convert target_mprotect debug to tracepoint Alex Bennée
2019-12-05 15:43   ` Richard Henderson
2019-12-11 14:46   ` Laurent Vivier
2019-12-05 12:25 ` [PATCH v2 2/6] linux-user: convert target_mmap " Alex Bennée
2019-12-05 15:44   ` Richard Henderson
2019-12-11 14:48   ` Laurent Vivier
2019-12-05 12:25 ` [PATCH v2 3/6] linux-user: add target_mmap_complete tracepoint Alex Bennée
2019-12-11 14:48   ` Laurent Vivier
2019-12-05 12:25 ` [PATCH v2 4/6] linux-user: log page table changes under -d page Alex Bennée
2019-12-05 15:45   ` Richard Henderson
2019-12-11 14:53   ` Laurent Vivier
2019-12-05 12:25 ` [PATCH v2 5/6] linux-user: convert target_munmap debug to a tracepoint Alex Bennée
2019-12-11 14:54   ` Laurent Vivier
2019-12-16 12:00     ` Alex Bennée
2019-12-16 12:05       ` Laurent Vivier
2019-12-18 20:03         ` Alex Bennée
2019-12-05 12:25 ` Alex Bennée [this message]
2019-12-05 15:51   ` [PATCH v2 6/6] trace: replace hand-crafted pattern_glob with g_pattern_match_simple Richard Henderson
2019-12-06 11:03   ` Stefan Hajnoczi
2019-12-06 11:59     ` Alex Bennée
2019-12-09 15:58   ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191205122518.10010-7-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).