From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Richard Henderson" <richard.henderson@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org, "Stefan Hajnoczi" <stefanha@redhat.com>
Subject: [PULL 24/25] trace: replace hand-crafted pattern_glob with g_pattern_match_simple
Date: Thu, 19 Dec 2019 10:49:33 +0000 [thread overview]
Message-ID: <20191219104934.866-25-alex.bennee@linaro.org> (raw)
In-Reply-To: <20191219104934.866-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>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20191205122518.10010-7-alex.bennee@linaro.org>
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
next prev parent reply other threads:[~2019-12-19 11:09 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-19 10:49 [PULL 00/25] testing and logging updates Alex Bennée
2019-12-19 10:49 ` [PULL 01/25] configure: allow disable of cross compilation containers Alex Bennée
2019-12-19 10:49 ` [PULL 02/25] tests/vm: Allow to set qemu-img path Alex Bennée
2019-12-19 10:49 ` [PULL 03/25] travis.yml: Run tcg tests with tci Alex Bennée
2019-12-19 10:49 ` [PULL 04/25] iotests: Provide a function for checking the creation of huge files Alex Bennée
2019-12-19 10:49 ` [PULL 05/25] iotests: Skip test 060 if it is not possible to create large files Alex Bennée
2019-12-19 10:49 ` [PULL 06/25] iotests: Skip test 079 " Alex Bennée
2019-12-19 10:49 ` [PULL 07/25] tests/hd-geo-test: Skip test when images can not be created Alex Bennée
2019-12-19 10:49 ` [PULL 08/25] tests/test-util-filemonitor: Skip test on non-x86 Travis containers Alex Bennée
2019-12-19 10:49 ` [PULL 09/25] travis.yml: Enable builds on arm64, ppc64le and s390x Alex Bennée
2019-12-19 10:49 ` [PULL 10/25] ci: build out-of-tree Alex Bennée
2019-12-19 10:49 ` [PULL 11/25] Fix double free issue in qemu_set_log_filename() Alex Bennée
2019-12-19 10:49 ` [PULL 12/25] Cleaned up flow of code in qemu_set_log(), to simplify and clarify Alex Bennée
2019-12-19 10:49 ` [PULL 13/25] Add a mutex to guarantee single writer to qemu_logfile handle Alex Bennée
2019-12-19 10:49 ` [PULL 14/25] qemu_log_lock/unlock now preserves the " Alex Bennée
2019-12-19 10:49 ` [PULL 15/25] Add use of RCU for qemu_logfile Alex Bennée
2019-12-19 10:49 ` [PULL 16/25] Added tests for close and change of logfile Alex Bennée
2019-12-19 10:49 ` [PULL 17/25] docker: gtester is no longer used Alex Bennée
2019-12-19 10:49 ` [PULL 18/25] travis.yml: Remove the redundant clang-with-MAIN_SOFTMMU_TARGETS entry Alex Bennée
2019-12-19 10:49 ` [PULL 19/25] linux-user: convert target_mprotect debug to tracepoint Alex Bennée
2019-12-19 10:49 ` [PULL 20/25] linux-user: convert target_mmap " Alex Bennée
2019-12-19 10:49 ` [PULL 21/25] linux-user: add target_mmap_complete tracepoint Alex Bennée
2019-12-19 10:49 ` [PULL 22/25] linux-user: log page table changes under -d page Alex Bennée
2019-12-19 10:49 ` [PULL 23/25] linux-user: convert target_munmap debug to a tracepoint Alex Bennée
2019-12-19 10:49 ` Alex Bennée [this message]
2019-12-19 10:49 ` [PULL 25/25] tests/tcg: ensure we re-configure if configure.sh is updated Alex Bennée
2019-12-20 16:36 ` [PULL 00/25] testing and logging updates Peter Maydell
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=20191219104934.866-25-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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).