tools lib traceevent: Rename data2host*() APIs

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 renames data2host*() APIs

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/20180919185724.751088939@goodmis.org
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 055bee7b738a5c868ef1980e74c83f637a9a5069..7980fc6c3bac67752dc0708677ba687b74aff4ad 100644 (file)
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -3331,11 +3331,11 @@ unsigned long long tep_read_number(struct tep_handle *pevent,
        case 1:
                return *(unsigned char *)ptr;
        case 2:
-               return data2host2(pevent, ptr);
+               return tep_data2host2(pevent, ptr);
        case 4:
-               return data2host4(pevent, ptr);
+               return tep_data2host4(pevent, ptr);
        case 8:
-               return data2host8(pevent, ptr);
+               return tep_data2host8(pevent, ptr);
        default:
                /* BUG! */
                return 0;
@@ -4061,7 +4061,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
                        f = tep_find_any_field(event, arg->string.string);
                        arg->string.offset = f->offset;
                }
-               str_offset = data2host4(pevent, data + arg->string.offset);
+               str_offset = tep_data2host4(pevent, data + arg->string.offset);
                str_offset &= 0xffff;
                print_str_to_seq(s, format, len_arg, ((char *)data) + str_offset);
                break;
@@ -4079,7 +4079,7 @@ static void print_str_arg(struct trace_seq *s, void *data, int size,
                        f = tep_find_any_field(event, arg->bitmask.bitmask);
                        arg->bitmask.offset = f->offset;
                }
-               bitmask_offset = data2host4(pevent, data + arg->bitmask.offset);
+               bitmask_offset = tep_data2host4(pevent, data + arg->bitmask.offset);
                bitmask_size = bitmask_offset >> 16;
                bitmask_offset &= 0xffff;
                print_bitmask_to_seq(pevent, s, format, len_arg,

diff --git a/tools/lib/traceevent/event-parse.h b/tools/lib/traceevent/event-parse.h
index 2a7b0a857f39b8541f17696da8bd4b794611b145..830147dc6b219166c7fcf8214cf99d6563bf019a 100644 (file)
--- a/tools/lib/traceevent/event-parse.h
+++ b/tools/lib/traceevent/event-parse.h
@@ -496,7 +496,7 @@ static inline void tep_set_flag(struct tep_handle *pevent, int flag)
 }
 
 static inline unsigned short
-__data2host2(struct tep_handle *pevent, unsigned short data)
+__tep_data2host2(struct tep_handle *pevent, unsigned short data)
 {
        unsigned short swap;
 
@@ -510,7 +510,7 @@ __data2host2(struct tep_handle *pevent, unsigned short data)
 }
 
 static inline unsigned int
-__data2host4(struct tep_handle *pevent, unsigned int data)
+__tep_data2host4(struct tep_handle *pevent, unsigned int data)
 {
        unsigned int swap;
 
@@ -526,7 +526,7 @@ __data2host4(struct tep_handle *pevent, unsigned int data)
 }
 
 static inline unsigned long long
-__data2host8(struct tep_handle *pevent, unsigned long long data)
+__tep_data2host8(struct tep_handle *pevent, unsigned long long data)
 {
        unsigned long long swap;
 
@@ -545,14 +545,14 @@ __data2host8(struct tep_handle *pevent, unsigned long long data)
        return swap;
 }
 
-#define data2host2(pevent, ptr)                __data2host2(pevent, *(unsigned short *)(ptr))
-#define data2host4(pevent, ptr)                __data2host4(pevent, *(unsigned int *)(ptr))
-#define data2host8(pevent, ptr)                                        \
+#define tep_data2host2(pevent, ptr)            __tep_data2host2(pevent, *(unsigned short *)(ptr))
+#define tep_data2host4(pevent, ptr)            __tep_data2host4(pevent, *(unsigned int *)(ptr))
+#define tep_data2host8(pevent, ptr)                                    \
 ({                                                             \
        unsigned long long __val;                               \
                                                                \
        memcpy(&__val, (ptr), sizeof(unsigned long long));      \
-       __data2host8(pevent, __val);                            \
+       __tep_data2host8(pevent, __val);                                \
 })
 
 static inline int tep_host_bigendian(void)

diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index 3dfc1db6b25b62c192971d1ccc7dc4e83d03f662..b98ee2a2eb445eccac7d3c753f77a38eb6e07128 100644 (file)
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -102,7 +102,7 @@ static unsigned int read4(struct tep_handle *pevent)
 
        if (do_read(&data, 4) < 0)
                return 0;
-       return __data2host4(pevent, data);
+       return __tep_data2host4(pevent, data);
 }
 
 static unsigned long long read8(struct tep_handle *pevent)
@@ -111,7 +111,7 @@ static unsigned long long read8(struct tep_handle *pevent)
 
        if (do_read(&data, 8) < 0)
                return 0;
-       return __data2host8(pevent, data);
+       return __tep_data2host8(pevent, data);
 }
 
 static char *read_string(void)