1 files changed, 14 insertions, 9 deletions

diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index ca069f893381..3fddd610d350 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -4,7 +4,9 @@
  * Parse symbolic events/counts passed in as options:
  */
 
+#include <stdbool.h>
 #include "../../../include/linux/perf_event.h"
+#include "types.h"
 
 struct list_head;
 struct perf_evsel;
@@ -34,16 +36,17 @@ extern int parse_filter(const struct option *opt, const char *str, int unset);
 #define EVENTS_HELP_MAX (128*1024)
 
 enum {
+        PARSE_EVENTS__TERM_TYPE_NUM,
+        PARSE_EVENTS__TERM_TYPE_STR,
+};
+
+enum {
+        PARSE_EVENTS__TERM_TYPE_USER,
         PARSE_EVENTS__TERM_TYPE_CONFIG,
         PARSE_EVENTS__TERM_TYPE_CONFIG1,
         PARSE_EVENTS__TERM_TYPE_CONFIG2,
         PARSE_EVENTS__TERM_TYPE_SAMPLE_PERIOD,
         PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE,
-        PARSE_EVENTS__TERM_TYPE_NUM,
-        PARSE_EVENTS__TERM_TYPE_STR,
-
-        PARSE_EVENTS__TERM_TYPE_HARDCODED_MAX =
-                PARSE_EVENTS__TERM_TYPE_BRANCH_SAMPLE_TYPE,
 };
 
 struct parse_events__term {
@@ -52,14 +55,16 @@ struct parse_events__term {
                 char *str;
                 long  num;
         } val;
-        int type;
-
+        int type_val;
+        int type_term;
         struct list_head list;
 };
 
 int parse_events__is_hardcoded_term(struct parse_events__term *term);
-int parse_events__new_term(struct parse_events__term **term, int type,
-                           char *config, char *str, long num);
+int parse_events__term_num(struct parse_events__term **_term,
+                           int type_term, char *config, long num);
+int parse_events__term_str(struct parse_events__term **_term,
+                           int type_term, char *config, char *str);
 void parse_events__free_terms(struct list_head *terms);
 int parse_events_modifier(struct list_head *list __used, char *str __used);
 int parse_events_add_tracepoint(struct list_head *list, int *idx,