perf auxtrace: Rename some buffer-queuing functions

Rename some buffer-queuing functions in preparation for supporting AUX area
sampling buffers.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Link: http://lkml.kernel.org/r/1520327598-1317-5-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index 6470ea2..6ea840e 100644 (file)
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -233,9 +233,9 @@ static void *auxtrace_copy_data(u64 size, struct perf_session *session)
        return p;
 }
 
-static int auxtrace_queues__add_buffer(struct auxtrace_queues *queues,
-                                      unsigned int idx,
-                                      struct auxtrace_buffer *buffer)
+static int auxtrace_queues__queue_buffer(struct auxtrace_queues *queues,
+                                        unsigned int idx,
+                                        struct auxtrace_buffer *buffer)
 {
        struct auxtrace_queue *queue;
        int err;
@@ -286,7 +286,7 @@ static int auxtrace_queues__split_buffer(struct auxtrace_queues *queues,
                        return -ENOMEM;
                b->size = BUFFER_LIMIT_FOR_32_BIT;
                b->consecutive = consecutive;
-               err = auxtrace_queues__add_buffer(queues, idx, b);
+               err = auxtrace_queues__queue_buffer(queues, idx, b);
                if (err) {
                        auxtrace_buffer__free(b);
                        return err;
@@ -302,10 +302,10 @@ static int auxtrace_queues__split_buffer(struct auxtrace_queues *queues,
        return 0;
 }
 
-static int auxtrace_queues__add_event_buffer(struct auxtrace_queues *queues,
-                                            struct perf_session *session,
-                                            unsigned int idx,
-                                            struct auxtrace_buffer *buffer)
+static int auxtrace_queues__add_buffer(struct auxtrace_queues *queues,
+                                      struct perf_session *session,
+                                      unsigned int idx,
+                                      struct auxtrace_buffer *buffer)
 {
        if (session->one_mmap) {
                buffer->data = buffer->data_offset - session->one_mmap_offset +
@@ -324,7 +324,7 @@ static int auxtrace_queues__add_event_buffer(struct auxtrace_queues *queues,
                        return err;
        }
 
-       return auxtrace_queues__add_buffer(queues, idx, buffer);
+       return auxtrace_queues__queue_buffer(queues, idx, buffer);
 }
 
 static bool filter_cpu(struct perf_session *session, int cpu)
@@ -359,7 +359,7 @@ int auxtrace_queues__add_event(struct auxtrace_queues *queues,
        buffer->size = event->auxtrace.size;
        idx = event->auxtrace.idx;
 
-       err = auxtrace_queues__add_event_buffer(queues, session, idx, buffer);
+       err = auxtrace_queues__add_buffer(queues, session, idx, buffer);
        if (err)
                goto out_err;