mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot for Tzvetomir Stoyanov (VMware)" <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: namhyung@kernel.org, akpm@linux-foundation.org, jolsa@redhat.com,
	mingo@kernel.org, hpa@zytor.com, acme@redhat.com,
	rostedt@goodmis.org, tz.stoyanov@gmail.com, tglx@linutronix.de,
	linux-kernel@vger.kernel.org
Subject: [tip:perf/core] tools lib traceevent: Add prefix tep_ to enum filter_trivial_type
Date: Wed, 26 Sep 2018 01:53:18 -0700	[thread overview]
Message-ID: <tip-035c450ffa0483e715fc7b14a2e8b744bf8a740a@git.kernel.org> (raw)
In-Reply-To: <20180919185725.076387655@goodmis.org>

Commit-ID:  035c450ffa0483e715fc7b14a2e8b744bf8a740a
Gitweb:     https://git.kernel.org/tip/035c450ffa0483e715fc7b14a2e8b744bf8a740a
Author:     Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
AuthorDate: Wed, 19 Sep 2018 14:56:58 -0400
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 19 Sep 2018 17:30:46 -0300

tools lib traceevent: Add prefix tep_ to enum filter_trivial_type

In order to make libtraceevent into a proper library, variables, data
structures and functions require a unique prefix to prevent name space
conflicts. That prefix will be "tep_". This adds prefix tep_ to
enum filter_trivial_type and all its members.

Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
Cc: linux-trace-devel@vger.kernel.org
Link: http://lkml.kernel.org/r/20180919185725.076387655@goodmis.org
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/traceevent/event-parse.h  | 14 +++++++-------
 tools/lib/traceevent/parse-filter.c | 22 +++++++++++-----------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index 830147dc6b21..9c29a5f7aa39 100644
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -905,10 +905,10 @@ struct tep_event_filter *tep_filter_alloc(struct tep_handle *pevent);
 #define FILTER_MISS		TEP_ERRNO__FILTER_MISS
 #define FILTER_MATCH		TEP_ERRNO__FILTER_MATCH
 
-enum filter_trivial_type {
-	FILTER_TRIVIAL_FALSE,
-	FILTER_TRIVIAL_TRUE,
-	FILTER_TRIVIAL_BOTH,
+enum tep_filter_trivial_type {
+	TEP_FILTER_TRIVIAL_FALSE,
+	TEP_FILTER_TRIVIAL_TRUE,
+	TEP_FILTER_TRIVIAL_BOTH,
 };
 
 enum tep_errno tep_filter_add_filter_str(struct tep_event_filter *filter,
@@ -926,7 +926,7 @@ int tep_event_filtered(struct tep_event_filter *filter,
 void tep_filter_reset(struct tep_event_filter *filter);
 
 int tep_filter_clear_trivial(struct tep_event_filter *filter,
-			     enum filter_trivial_type type);
+			     enum tep_filter_trivial_type type);
 
 void tep_filter_free(struct tep_event_filter *filter);
 
@@ -937,12 +937,12 @@ int tep_filter_remove_event(struct tep_event_filter *filter,
 
 int tep_filter_event_has_trivial(struct tep_event_filter *filter,
 				 int event_id,
-				 enum filter_trivial_type type);
+				 enum tep_filter_trivial_type type);
 
 int tep_filter_copy(struct tep_event_filter *dest, struct tep_event_filter *source);
 
 int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *source,
-			enum filter_trivial_type type);
+			enum tep_filter_trivial_type type);
 
 int tep_filter_compare(struct tep_event_filter *filter1, struct tep_event_filter *filter2);
 
diff --git a/tools/lib/traceevent/parse-filter.c b/tools/lib/traceevent/parse-filter.c
index 875bfaf79771..d64b6128fa7d 100644
--- a/tools/lib/traceevent/parse-filter.c
+++ b/tools/lib/traceevent/parse-filter.c
@@ -1534,7 +1534,7 @@ int tep_filter_copy(struct tep_event_filter *dest, struct tep_event_filter *sour
  *   events may have still been updated on error.
  */
 int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *source,
-		       enum filter_trivial_type type)
+		       enum tep_filter_trivial_type type)
 {
 	struct tep_handle *src_pevent;
 	struct tep_handle *dest_pevent;
@@ -1556,8 +1556,8 @@ int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *s
 		arg = filter_type->filter;
 		if (arg->type != TEP_FILTER_ARG_BOOLEAN)
 			continue;
-		if ((arg->boolean.value && type == FILTER_TRIVIAL_FALSE) ||
-		    (!arg->boolean.value && type == FILTER_TRIVIAL_TRUE))
+		if ((arg->boolean.value && type == TEP_FILTER_TRIVIAL_FALSE) ||
+		    (!arg->boolean.value && type == TEP_FILTER_TRIVIAL_TRUE))
 			continue;
 
 		event = filter_type->event;
@@ -1593,7 +1593,7 @@ int tep_update_trivial(struct tep_event_filter *dest, struct tep_event_filter *s
  * Returns 0 on success and -1 if there was a problem.
  */
 int tep_filter_clear_trivial(struct tep_event_filter *filter,
-			     enum filter_trivial_type type)
+			     enum tep_filter_trivial_type type)
 {
 	struct tep_filter_type *filter_type;
 	int count = 0;
@@ -1614,11 +1614,11 @@ int tep_filter_clear_trivial(struct tep_event_filter *filter,
 		if (filter_type->filter->type != TEP_FILTER_ARG_BOOLEAN)
 			continue;
 		switch (type) {
-		case FILTER_TRIVIAL_FALSE:
+		case TEP_FILTER_TRIVIAL_FALSE:
 			if (filter_type->filter->boolean.value)
 				continue;
 			break;
-		case FILTER_TRIVIAL_TRUE:
+		case TEP_FILTER_TRIVIAL_TRUE:
 			if (!filter_type->filter->boolean.value)
 				continue;
 		default:
@@ -1656,7 +1656,7 @@ int tep_filter_clear_trivial(struct tep_event_filter *filter,
  */
 int tep_filter_event_has_trivial(struct tep_event_filter *filter,
 				 int event_id,
-				 enum filter_trivial_type type)
+				 enum tep_filter_trivial_type type)
 {
 	struct tep_filter_type *filter_type;
 
@@ -1672,10 +1672,10 @@ int tep_filter_event_has_trivial(struct tep_event_filter *filter,
 		return 0;
 
 	switch (type) {
-	case FILTER_TRIVIAL_FALSE:
+	case TEP_FILTER_TRIVIAL_FALSE:
 		return !filter_type->filter->boolean.value;
 
-	case FILTER_TRIVIAL_TRUE:
+	case TEP_FILTER_TRIVIAL_TRUE:
 		return filter_type->filter->boolean.value;
 	default:
 		return 1;
@@ -2409,8 +2409,8 @@ int tep_filter_compare(struct tep_event_filter *filter1, struct tep_event_filter
 		if (filter_type1->filter->type != filter_type2->filter->type)
 			break;
 		switch (filter_type1->filter->type) {
-		case FILTER_TRIVIAL_FALSE:
-		case FILTER_TRIVIAL_TRUE:
+		case TEP_FILTER_TRIVIAL_FALSE:
+		case TEP_FILTER_TRIVIAL_TRUE:
 			/* trivial types just need the type compared */
 			continue;
 		default:

  reply	other threads:[~2018-09-26  8:53 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-19 18:56 [PATCH 00/15] tools/lib/traceevent: Namespace updates to make traceevent into a library Steven Rostedt
2018-09-19 18:56 ` [PATCH 01/15] tools/lib/traceevent, tools/perf: Rename struct event_format to struct tep_event_format Steven Rostedt
2018-09-26  8:45   ` [tip:perf/core] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 02/15] tools/lib/traceevent, tools/perf: Rename struct format{_field} to struct tep_format{_field} Steven Rostedt
2018-09-26  8:46   ` [tip:perf/core] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 03/15] tools/lib/traceevent, tools/perf: Rename enum format_flags to enum tep_format_flags Steven Rostedt
2018-09-26  8:46   ` [tip:perf/core] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 04/15] tools/lib/traceevent: Rename enum event_{sort_}type to enum tep_event_{sort_}type Steven Rostedt
2018-09-26  8:47   ` [tip:perf/core] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 05/15] tools/lib/traceevent: Add prefix TEP_ to all EVENT_FL_* flags Steven Rostedt
2018-09-26  8:47   ` [tip:perf/core] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 06/15] tools/lib/traceevent, tools/perf: Add prefix tep_ to all print_* structures Steven Rostedt
2018-09-26  8:48   ` [tip:perf/core] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 07/15] tools/lib/traceevent, tools/perf: Rename enum print_arg_type to enum tep_print_arg_type Steven Rostedt
2018-09-26  8:49   ` [tip:perf/core] tools lib traceevent, perf tools: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 08/15] tools/lib/traceevent: Add prefix tep_ to enums filter_{boolean,op,cmp}_type Steven Rostedt
2018-09-26  8:49   ` [tip:perf/core] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 09/15] tools/lib/traceevent: Add prefix tep_ to enums filter_{exp,arg}_type Steven Rostedt
2018-09-26  8:50   ` [tip:perf/core] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 10/15] tools/lib/traceevent: Add prefix tep_ to struct filter_{arg,value_type} Steven Rostedt
2018-09-26  8:50   ` [tip:perf/core] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 11/15] tools/lib/traceevent: Add prefix tep_ to various structs filter_arg_* Steven Rostedt
2018-09-26  8:51   ` [tip:perf/core] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 12/15] tools/lib/traceevent: Add prefix tep_ to structs filter_type and event_filter Steven Rostedt
2018-09-26  8:51   ` [tip:perf/core] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 13/15] tools/lib/traceevent: Rename struct plugin_list to struct tep_plugin_list Steven Rostedt
2018-09-26  8:52   ` [tip:perf/core] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 14/15] tools/lib/traceevent: Rename data2host*() APIs Steven Rostedt
2018-09-26  8:52   ` [tip:perf/core] tools lib traceevent: " tip-bot for Tzvetomir Stoyanov (VMware)
2018-09-19 18:56 ` [PATCH 15/15] tools/lib/traceevent: Add prefix tep_ to enum filter_trivial_type Steven Rostedt
2018-09-26  8:53   ` tip-bot for Tzvetomir Stoyanov (VMware) [this message]
2018-09-23 18:56 ` [PATCH 00/15] tools/lib/traceevent: Namespace updates to make traceevent into a library Jiri Olsa
2018-09-24  8:55   ` Steven Rostedt
2018-09-24 14:16     ` Arnaldo Carvalho de Melo
2018-09-24 15:19       ` Steven Rostedt
2018-09-24 15:21       ` Arnaldo Carvalho de Melo
2018-09-24 17:48     ` Jiri Olsa

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=tip-035c450ffa0483e715fc7b14a2e8b744bf8a740a@git.kernel.org \
    --to=tipbot@zytor.com \
    --cc=acme@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=hpa@zytor.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    --cc=tz.stoyanov@gmail.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