@@ -65,6 +65,7 @@ struct cs_etm_traceid_queue {
u64 period_instructions;
size_t last_branch_pos;
union perf_event *event_buf;
+ struct thread *thread;
struct branch_stack *last_branch;
struct branch_stack *last_branch_rb;
struct cs_etm_packet *prev_packet;
@@ -74,7 +75,6 @@ struct cs_etm_traceid_queue {
struct cs_etm_queue {
struct cs_etm_auxtrace *etm;
- struct thread *thread;
struct cs_etm_decoder *decoder;
struct auxtrace_buffer *buffer;
unsigned int queue_nr;
@@ -415,7 +415,7 @@ static void cs_etm__free_queue(void *priv)
if (!etmq)
return;
- thread__zput(etmq->thread);
+ thread__zput(etmq->traceid_queues->thread);
cs_etm_decoder__free(etmq->decoder);
zfree(&etmq->traceid_queues->event_buf);
zfree(&etmq->traceid_queues->last_branch);
@@ -503,7 +503,7 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *etmq, u64 address,
machine = etmq->etm->machine;
cpumode = cs_etm__cpu_mode(etmq, address);
- thread = etmq->thread;
+ thread = etmq->traceid_queues->thread;
if (!thread) {
if (cpumode != PERF_RECORD_MISC_KERNEL)
return 0;
@@ -819,18 +819,21 @@ cs_etm__get_trace(struct cs_etm_queue *etmq)
static void cs_etm__set_pid_tid_cpu(struct cs_etm_auxtrace *etm,
struct auxtrace_queue *queue)
{
+ struct cs_etm_traceid_queue *tidq;
struct cs_etm_queue *etmq = queue->priv;
+ tidq = cs_etm__etmq_get_traceid_queue(etmq, CS_ETM_PER_THREAD_TRACEID);
+
/* CPU-wide tracing isn't supported yet */
if (queue->tid == -1)
return;
- if ((!etmq->thread) && (etmq->tid != -1))
- etmq->thread = machine__find_thread(etm->machine, -1,
+ if ((!tidq->thread) && (etmq->tid != -1))
+ tidq->thread = machine__find_thread(etm->machine, -1,
etmq->tid);
- if (etmq->thread)
- etmq->pid = etmq->thread->pid_;
+ if (tidq->thread)
+ etmq->pid = tidq->thread->pid_;
}
static int cs_etm__synth_instruction_sample(struct cs_etm_queue *etmq,
The thread field of structure cs_etm_queue is CPU dependent and as such need to be part of the cs_etm_traceid_queue in order to support CPU-wide trace scenarios. Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org> --- tools/perf/util/cs-etm.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-)