perf intel-pt: Factor out intel_pt_update_sample_time

To eliminate some duplication and make the code more understandable,
factor out intel_pt_update_sample_time.

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

diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
index f4c3c84b090f6674655e6414a4551fb0fd96ca96..1ab4070b5633eca443a5b01e899a5498c6a335a8 100644 (file)
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -479,6 +479,12 @@ static int intel_pt_bad_packet(struct intel_pt_decoder *decoder)
        return -EBADMSG;
 }
 
+static inline void intel_pt_update_sample_time(struct intel_pt_decoder *decoder)
+{
+       decoder->sample_timestamp = decoder->timestamp;
+       decoder->sample_insn_cnt = decoder->timestamp_insn_cnt;
+}
+
 static int intel_pt_get_data(struct intel_pt_decoder *decoder)
 {
        struct intel_pt_buffer buffer = { .buf = 0, };
@@ -1319,8 +1325,7 @@ static int intel_pt_walk_tnt(struct intel_pt_decoder *decoder)
                        }
                        decoder->ip += intel_pt_insn.length;
                        if (!decoder->tnt.count) {
-                               decoder->sample_timestamp = decoder->timestamp;
-                               decoder->sample_insn_cnt = decoder->timestamp_insn_cnt;
+                               intel_pt_update_sample_time(decoder);
                                return -EAGAIN;
                        }
                        decoder->tnt.payload <<= 1;
@@ -2413,8 +2418,7 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder)
        if (err) {
                decoder->state.err = intel_pt_ext_err(err);
                decoder->state.from_ip = decoder->ip;
-               decoder->sample_timestamp = decoder->timestamp;
-               decoder->sample_insn_cnt = decoder->timestamp_insn_cnt;
+               intel_pt_update_sample_time(decoder);
        } else {
                decoder->state.err = 0;
                if (decoder->cbr != decoder->cbr_seen && decoder->state.type) {
@@ -2422,10 +2426,8 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder)
                        decoder->state.type |= INTEL_PT_CBR_CHG;
                        decoder->state.cbr_payload = decoder->cbr_payload;
                }
-               if (intel_pt_sample_time(decoder->pkt_state)) {
-                       decoder->sample_timestamp = decoder->timestamp;
-                       decoder->sample_insn_cnt = decoder->timestamp_insn_cnt;
-               }
+               if (intel_pt_sample_time(decoder->pkt_state))
+                       intel_pt_update_sample_time(decoder);
        }
 
        decoder->state.timestamp = decoder->sample_timestamp;