From: Steven Rostedt <rostedt@goodmis.org>
To: linux-trace-devel@vger.kernel.org
Subject: [PATCH 2/5] trace-cmd: Separate out time diff code in trace_show_data()
Date: Tue, 17 Sep 2019 22:03:36 -0400 [thread overview]
Message-ID: <20190918020530.499901908@goodmis.org> (raw)
In-Reply-To: 20190918020334.344561631@goodmis.org
From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
To make it easier to convert to the new tep_print_event() format, use the
open coded version of the tracing data regardless if a different timestamp
is to be used.
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
tracecmd/trace-read.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/tracecmd/trace-read.c b/tracecmd/trace-read.c
index c14e87f76a32..01d904964edf 100644
--- a/tracecmd/trace-read.c
+++ b/tracecmd/trace-read.c
@@ -757,6 +757,7 @@ void trace_show_data(struct tracecmd_input *handle, struct tep_record *record)
{
tracecmd_show_data_func func = tracecmd_get_show_data_func(handle);
struct tep_handle *pevent;
+ struct tep_event *event;
struct trace_seq s;
int cpu = record->cpu;
bool use_trace_clock;
@@ -793,14 +794,13 @@ void trace_show_data(struct tracecmd_input *handle, struct tep_record *record)
}
}
use_trace_clock = tracecmd_get_use_trace_clock(handle);
+ event = tep_find_event_by_record(pevent, record);
+ tep_print_event_task(pevent, &s, event, record);
+ tep_print_event_time(pevent, &s, event, record,
+ use_trace_clock);
if (tsdiff) {
unsigned long long rec_ts = record->ts;
- struct tep_event *event;
- event = tep_find_event_by_record(pevent, record);
- tep_print_event_task(pevent, &s, event, record);
- tep_print_event_time(pevent, &s, event, record,
- use_trace_clock);
buf[0] = 0;
if (use_trace_clock && !tep_test_flag(pevent, TEP_NSEC_OUTPUT))
rec_ts = (rec_ts + 500) / 1000;
@@ -811,9 +811,10 @@ void trace_show_data(struct tracecmd_input *handle, struct tep_record *record)
}
last_ts = rec_ts;
trace_seq_printf(&s, " %-8s", buf);
- tep_print_event_data(pevent, &s, event, record);
- } else
- tep_print_event(pevent, &s, record, use_trace_clock);
+ }
+
+ tep_print_event_data(pevent, &s, event, record);
+
if (s.len && *(s.buffer + s.len - 1) == '\n')
s.len--;
if (tracecmd_get_debug()) {
--
2.20.1
next prev parent reply other threads:[~2019-09-18 2:05 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-18 2:03 [PATCH 0/5] trace-cmd: Update for the new trace_print_event() logic Steven Rostedt
2019-09-18 2:03 ` [PATCH 1/5] trace-cmd: Move extract trace_clock into trace-input.c Steven Rostedt
2019-09-20 14:55 ` Tzvetomir Stoyanov
2019-09-20 15:02 ` Steven Rostedt
2019-09-20 15:10 ` [PATCH 1/5 v2] " Steven Rostedt
2019-09-20 16:08 ` Tzvetomir Stoyanov
2019-09-20 16:11 ` Steven Rostedt
2019-09-18 2:03 ` Steven Rostedt [this message]
2019-09-20 15:08 ` [PATCH 2/5] trace-cmd: Separate out time diff code in trace_show_data() Tzvetomir Stoyanov
2019-09-18 2:03 ` [PATCH 3/5] trace-cmd: Add check for trace_clock using usecs into tracecmd_parse_trace_clock() Steven Rostedt
2019-09-20 15:10 ` Tzvetomir Stoyanov
2019-09-18 2:03 ` [PATCH 4/5] libtraceevent, perf tools: Changes in tep_print_event_* APIs Steven Rostedt
2019-09-19 22:50 ` Steven Rostedt
2019-09-19 22:53 ` [PATCH 4/5 v2] " Steven Rostedt
2019-09-20 16:06 ` [PATCH 4/5] " Tzvetomir Stoyanov
2019-09-19 22:52 ` Steven Rostedt
2019-09-18 2:03 ` [PATCH 5/5] tools/lib/traceevent: Round up in tep_print_event() time precision Steven Rostedt
2019-09-20 15:18 ` Tzvetomir Stoyanov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190918020530.499901908@goodmis.org \
--to=rostedt@goodmis.org \
--cc=linux-trace-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.