From: Steven Rostedt <rostedt@goodmis.org>
To: linux-trace-devel@vger.kernel.org
Cc: "Steven Rostedt (Google)" <rostedt@goodmis.org>
Subject: [PATCH 1/2] trace-cmd library: Keep USECS flag if TSC multiplier is set
Date: Mon, 23 May 2022 21:50:27 -0400 [thread overview]
Message-ID: <20220524015028.260238-2-rostedt@goodmis.org> (raw)
In-Reply-To: <20220524015028.260238-1-rostedt@goodmis.org>
From: "Steven Rostedt (Google)" <rostedt@goodmis.org>
If the option TSC2NSECS is set, then display as microseconds like it does
with trace clock local. This is because even though the x86-tsc is not in
nanoseconds, the clock will be shifted and multiplied to be in
nanoseconds, so it makes sense to convert it to seconds.
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
lib/trace-cmd/trace-input.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 442b1c5a6724..e2ceff331869 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -3483,6 +3483,8 @@ static int handle_options(struct tracecmd_input *handle)
buf + 4, 4);
handle->tsc_calc.offset = tep_read_number(handle->pevent,
buf + 8, 8);
+ if (!(handle->flags & TRACECMD_FL_RAW_TS))
+ handle->flags |= TRACECMD_FL_IN_USECS;
break;
case TRACECMD_OPTION_HEADER_INFO:
case TRACECMD_OPTION_FTRACE_EVENTS:
@@ -3865,6 +3867,10 @@ static void extract_trace_clock(struct tracecmd_input *handle, char *line)
if (handle->flags & TRACECMD_FL_RAW_TS)
handle->flags &= ~TRACECMD_FL_IN_USECS;
+ /* tsc_calc is a conversion to nanoseconds */
+ if (handle->tsc_calc.mult)
+ return;
+
/* Clear usecs if not one of the specified clocks */
if (strcmp(clock, "local") && strcmp(clock, "global") &&
strcmp(clock, "uptime") && strcmp(clock, "perf") &&
--
2.35.1
next prev parent reply other threads:[~2022-05-24 1:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-24 1:50 [PATCH 0/2] trace-cmd: Fix clock setting of agent proxy Steven Rostedt
2022-05-24 1:50 ` Steven Rostedt [this message]
2022-05-24 1:50 ` [PATCH 2/2] trace-cmd record: Set clock to TSC when connecting to a proxy with kvm Steven Rostedt
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=20220524015028.260238-2-rostedt@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.