perf cs-etm: Cleaning up function cs_etm__alloc_queue()

Function cs_etm__alloc_queue() should only be concerned with the allocation
of memory for the etmq and accompanying decoder.  Everything else should
be done in the calling function.

Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Suzuki K Poulouse <suzuki.poulose@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: http://lkml.kernel.org/r/20190212171618.25355-9-mathieu.poirier@linaro.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c
index 4cc9fce97a8668172c1a862e7bc0e24ab96d9cfb..c9a5b49352098c874c3532bbee9cccff6768db7f 100644 (file)
--- a/tools/perf/util/cs-etm.c
+++ b/tools/perf/util/cs-etm.c
@@ -405,8 +405,7 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u64 address,
        return len;
 }
 
-static struct cs_etm_queue *cs_etm__alloc_queue(struct cs_etm_auxtrace *etm,
-                                               unsigned int queue_nr)
+static struct cs_etm_queue *cs_etm__alloc_queue(struct cs_etm_auxtrace *etm)
 {
        struct cs_etm_decoder_params d_params;
        struct cs_etm_trace_params  *t_params = NULL;
@@ -444,12 +443,6 @@ static struct cs_etm_queue *cs_etm__alloc_queue(struct cs_etm_auxtrace *etm,
        if (!etmq->event_buf)
                goto out_free;
 
-       etmq->etm = etm;
-       etmq->queue_nr = queue_nr;
-       etmq->pid = -1;
-       etmq->tid = -1;
-       etmq->cpu = -1;
-
        /* Use metadata to fill in trace parameters for trace decoder */
        t_params = zalloc(sizeof(*t_params) * etm->num_cpu);
 
@@ -479,10 +472,6 @@ static struct cs_etm_queue *cs_etm__alloc_queue(struct cs_etm_auxtrace *etm,
                goto out_free_decoder;
 
        zfree(&t_params);
-
-       etmq->offset = 0;
-       etmq->period_instructions = 0;
-
        return etmq;
 
 out_free_decoder:
@@ -503,24 +492,30 @@ static int cs_etm__setup_queue(struct cs_etm_auxtrace *etm,
                               struct auxtrace_queue *queue,
                               unsigned int queue_nr)
 {
+       int ret = 0;
        struct cs_etm_queue *etmq = queue->priv;
 
        if (list_empty(&queue->head) || etmq)
-               return 0;
+               goto out;
 
-       etmq = cs_etm__alloc_queue(etm, queue_nr);
+       etmq = cs_etm__alloc_queue(etm);
 
-       if (!etmq)
-               return -ENOMEM;
+       if (!etmq) {
+               ret = -ENOMEM;
+               goto out;
+       }
 
        queue->priv = etmq;
-
-       if (queue->cpu != -1)
-               etmq->cpu = queue->cpu;
-
+       etmq->etm = etm;
+       etmq->queue_nr = queue_nr;
+       etmq->cpu = queue->cpu;
        etmq->tid = queue->tid;
+       etmq->pid = -1;
+       etmq->offset = 0;
+       etmq->period_instructions = 0;
 
-       return 0;
+out:
+       return ret;
 }
 
 static int cs_etm__setup_queues(struct cs_etm_auxtrace *etm)