On Tue, Dec 11, 2018 at 11:01:09PM +0800, Leo Yan wrote:
In the middle of trace stream, it might be interrupted thus the trace data is not discontinuous, the trace stream firstly is ended for
s/discontinuous/continuous
previous trace block and restarted for next block.
To display related information for showing trace is restarted, this patch set sample flags for trace discontinuity:
- If one discontinuity packet is coming, append flag PERF_IP_FLAG_TRACE_END to the previous packet to indicate the trace has been ended;
- If one instruction packet is following discontinuity packet, this instruction packet is the first one packet to restarting trace. So set flag PERF_IP_FLAG_TRACE_START to discontinuity packet, this flag will be used to generate sample when connect with the sequential instruction packet.
Signed-off-by: Leo Yan leo.yan@linaro.org
tools/perf/util/cs-etm.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 3ad0b87..bc8a4bc 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -1111,6 +1111,7 @@ static int cs_etm__end_block(struct cs_etm_queue *etmq) static void cs_etm__set_sample_flags(struct cs_etm_queue *etmq) { struct cs_etm_packet *packet = etmq->packet;
- struct cs_etm_packet *prev_packet = etmq->prev_packet;
packet->flags = 0; @@ -1172,8 +1173,26 @@ static void cs_etm__set_sample_flags(struct cs_etm_queue *etmq) packet->last_instr_subtype == OCSD_S_INSTR_V8_RET) packet->flags = PERF_IP_FLAG_BRANCH | PERF_IP_FLAG_RETURN;
/** Decoder might insert a discontinuity in the middle of* instruction packets, fixup prev_packet with flag* PERF_IP_FLAG_TRACE_BEGIN to indicate restarting trace.*/if (prev_packet->sample_type == CS_ETM_DISCONTINUITY)prev_packet->flags |= PERF_IP_FLAG_BRANCH |PERF_IP_FLAG_TRACE_BEGIN;/** The trace is discontinuous, if the previous packet is* instruction packet, set flag PERF_IP_FLAG_TRACE_END* for previous packet.*/if (prev_packet->sample_type == CS_ETM_RANGE)prev_packet->flags |= PERF_IP_FLAG_BRANCH |PERF_IP_FLAG_TRACE_END;break;-- 2.7.4