From: Jiri Olsa <jolsa@redhat.com>
To: zheng.z.yan@intel.com
Cc: a.p.zijlstra@chello.nl, mingo@elte.hu, andi@firstfloor.org,
eranian@google.com, jolsa@redhat.com, ming.m.lin@intel.com,
gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org
Subject: [PATCH 5/5] perf, tool: Add automated test for pure terms parsing
Date: Mon, 21 May 2012 09:36:53 +0200 [thread overview]
Message-ID: <1337585813-3349-6-git-send-email-jolsa@redhat.com> (raw)
In-Reply-To: <1337585813-3349-1-git-send-email-jolsa@redhat.com>
Adding automated test for parsing terms out of the event grammar.
Also slightly changing current event parsing test functions to
follow up more generic namespace.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
---
tools/perf/util/parse-events-test.c | 122 +++++++++++++++++++++++++++++++++--
1 files changed, 117 insertions(+), 5 deletions(-)
diff --git a/tools/perf/util/parse-events-test.c b/tools/perf/util/parse-events-test.c
index 76b98e2..af1039c 100644
--- a/tools/perf/util/parse-events-test.c
+++ b/tools/perf/util/parse-events-test.c
@@ -430,6 +430,49 @@ static int test__checkevent_pmu_name(struct perf_evlist *evlist)
return 0;
}
+static int test__checkterms_simple(struct list_head *terms)
+{
+ struct parse_events__term *term;
+
+ /* config=10 */
+ term = list_entry(terms->next, struct parse_events__term, list);
+ TEST_ASSERT_VAL("wrong type term",
+ term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG);
+ TEST_ASSERT_VAL("wrong type val",
+ term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
+ TEST_ASSERT_VAL("wrong val", term->val.num == 10);
+ TEST_ASSERT_VAL("wrong config", !term->config);
+
+ /* config1 */
+ term = list_entry(term->list.next, struct parse_events__term, list);
+ TEST_ASSERT_VAL("wrong type term",
+ term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG1);
+ TEST_ASSERT_VAL("wrong type val",
+ term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
+ TEST_ASSERT_VAL("wrong val", term->val.num == 1);
+ TEST_ASSERT_VAL("wrong config", !term->config);
+
+ /* config2=3 */
+ term = list_entry(term->list.next, struct parse_events__term, list);
+ TEST_ASSERT_VAL("wrong type term",
+ term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG2);
+ TEST_ASSERT_VAL("wrong type val",
+ term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
+ TEST_ASSERT_VAL("wrong val", term->val.num == 3);
+ TEST_ASSERT_VAL("wrong config", !term->config);
+
+ /* umask=1*/
+ term = list_entry(term->list.next, struct parse_events__term, list);
+ TEST_ASSERT_VAL("wrong type term",
+ term->type_term == PARSE_EVENTS__TERM_TYPE_USER);
+ TEST_ASSERT_VAL("wrong type val",
+ term->type_val == PARSE_EVENTS__TERM_TYPE_NUM);
+ TEST_ASSERT_VAL("wrong val", term->val.num == 1);
+ TEST_ASSERT_VAL("wrong config", !strcmp(term->config, "umask"));
+
+ return 0;
+}
+
struct test__event_st {
const char *name;
__u32 type;
@@ -559,7 +602,23 @@ static struct test__event_st test__events_pmu[] = {
#define TEST__EVENTS_PMU_CNT (sizeof(test__events_pmu) / \
sizeof(struct test__event_st))
-static int test(struct test__event_st *e)
+struct test__term {
+ const char *str;
+ __u32 type;
+ int (*check)(struct list_head *terms);
+};
+
+static struct test__term test__terms[] = {
+ [0] = {
+ .str = "config=10,config1,config2=3,umask=1",
+ .check = test__checkterms_simple,
+ },
+};
+
+#define TEST__TERMS_CNT (sizeof(test__terms) / \
+ sizeof(struct test__term))
+
+static int test_event(struct test__event_st *e)
{
struct perf_evlist *evlist;
int ret;
@@ -590,7 +649,48 @@ static int test_events(struct test__event_st *events, unsigned cnt)
struct test__event_st *e = &events[i];
pr_debug("running test %d '%s'\n", i, e->name);
- ret = test(e);
+ ret = test_event(e);
+ if (ret)
+ break;
+ }
+
+ return ret;
+}
+
+static int test_term(struct test__term *t)
+{
+ struct list_head *terms;
+ int ret;
+
+ terms = malloc(sizeof(*terms));
+ if (!terms)
+ return -ENOMEM;
+
+ INIT_LIST_HEAD(terms);
+
+ ret = parse_events_terms(terms, t->str);
+ if (ret) {
+ pr_debug("failed to parse terms '%s', err %d\n",
+ t->str , ret);
+ return ret;
+ }
+
+ ret = t->check(terms);
+ parse_events__free_terms(terms);
+
+ return ret;
+}
+
+static int test_terms(struct test__term *terms, unsigned cnt)
+{
+ int ret = 0;
+ unsigned i;
+
+ for (i = 0; i < cnt; i++) {
+ struct test__term *t = &terms[i];
+
+ pr_debug("running test %d '%s'\n", i, t->str);
+ ret = test_term(t);
if (ret)
break;
}
@@ -617,9 +717,21 @@ int parse_events__test(void)
{
int ret;
- ret = test_events(test__events, TEST__EVENTS_CNT);
- if (!ret && test_pmu())
- ret = test_events(test__events_pmu, TEST__EVENTS_PMU_CNT);
+ do {
+ ret = test_events(test__events, TEST__EVENTS_CNT);
+ if (ret)
+ break;
+
+ if (test_pmu()) {
+ ret = test_events(test__events_pmu,
+ TEST__EVENTS_PMU_CNT);
+ if (ret)
+ break;
+ }
+
+ ret = test_terms(test__terms, TEST__TERMS_CNT);
+
+ } while (0);
return ret;
}
--
1.7.7.6
next prev parent reply other threads:[~2012-05-21 7:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-16 4:59 [PATCH V4 0/10] perf: Intel uncore pmu counting support Yan, Zheng
2012-05-16 4:59 ` [PATCH 01/10] perf: Export perf_assign_events Yan, Zheng
2012-05-16 4:59 ` [PATCH 02/10] perf: Avoid race between cpu hotplug and installing event Yan, Zheng
2012-05-16 4:59 ` [PATCH 03/10] perf: Allow pmu to choose cpu on which to install event Yan, Zheng
2012-05-16 4:59 ` [PATCH 04/10] perf: Introduce perf_pmu_migrate_context Yan, Zheng
2012-05-16 4:59 ` [PATCH 05/10] perf: Generic intel uncore support Yan, Zheng
2012-05-16 4:59 ` [PATCH 06/10] perf: Add Nehalem and Sandy Bridge " Yan, Zheng
2012-05-16 5:00 ` [PATCH 07/10] perf: Generic pci uncore device support Yan, Zheng
2012-05-16 5:00 ` [PATCH 08/10] perf: Add Sandy Bridge-EP uncore support Yan, Zheng
2012-05-16 5:00 ` [PATCH 09/10] perf tool: Make the event parser reentrantable Yan, Zheng
2012-05-16 5:00 ` [PATCH 10/10] perf tool: Add pmu event alias support Yan, Zheng
2012-05-21 7:36 ` [RFC 0/5] perf, tool: uncore related changes Jiri Olsa
2012-05-21 7:36 ` [PATCH 1/5] perf, tool: Use data struct for arg passing in event parse function Jiri Olsa
2012-05-21 7:36 ` [PATCH 2/5] perf, tool: Make the event parser reentrantable Jiri Olsa
2012-05-21 7:36 ` [PATCH 3/5] perf, tool: Add support to reuse event grammar to parse out terms Jiri Olsa
2012-05-21 7:36 ` [PATCH 4/5] perf, tool: Add pmu event alias support Jiri Olsa
2012-05-21 7:36 ` Jiri Olsa [this message]
2012-05-21 8:22 ` [RFC 0/5] perf, tool: uncore related changes Jiri Olsa
2012-05-23 14:53 ` Stephane Eranian
2012-05-23 15:16 ` Jiri Olsa
2012-05-23 15:21 ` Stephane Eranian
2012-05-23 15:28 ` Jiri Olsa
2012-06-04 9:35 ` [PATCH V4 0/10] perf: Intel uncore pmu counting support Anshuman Khandual
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=1337585813-3349-6-git-send-email-jolsa@redhat.com \
--to=jolsa@redhat.com \
--cc=a.p.zijlstra@chello.nl \
--cc=andi@firstfloor.org \
--cc=eranian@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=ming.m.lin@intel.com \
--cc=mingo@elte.hu \
--cc=zheng.z.yan@intel.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
Powered by JetHome