From: "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com>
To: rostedt@goodmis.org
Cc: linux-trace-devel@vger.kernel.org
Subject: [PATCH v31 15/16] trace-cmd: Perform all timestamp corrections in a single function
Date: Thu, 11 Mar 2021 10:48:56 +0200 [thread overview]
Message-ID: <20210311084857.1919805-16-tz.stoyanov@gmail.com> (raw)
In-Reply-To: <20210311084857.1919805-1-tz.stoyanov@gmail.com>
When reading event timestamps from a trace file, there could be various
corrections depending on the metadata information from the file. Move
all logic that performs timestamp calculations in a single function.
Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com>
---
lib/trace-cmd/trace-input.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c
index 9bdf9da7..60a59873 100644
--- a/lib/trace-cmd/trace-input.c
+++ b/lib/trace-cmd/trace-input.c
@@ -1287,6 +1287,19 @@ static unsigned long long timestamp_correct(unsigned long long ts, int cpu,
&tsync->ts_samples[mid+1]);
}
+static unsigned long long timestamp_calc(unsigned long long ts, int cpu,
+ struct tracecmd_input *handle)
+{
+ unsigned long long tstamp;
+
+ tstamp = timestamp_correct(ts, cpu, handle);
+
+ if (handle->ts2secs)
+ tstamp *= handle->ts2secs;
+
+ return tstamp;
+}
+
/*
* Page is mapped, now read in the page header info.
*/
@@ -1308,11 +1321,8 @@ static int update_page_info(struct tracecmd_input *handle, int cpu)
kbuffer_subbuffer_size(kbuf));
return -1;
}
- handle->cpu_data[cpu].timestamp = timestamp_correct(kbuffer_timestamp(kbuf),
- cpu, handle);
-
- if (handle->ts2secs)
- handle->cpu_data[cpu].timestamp *= handle->ts2secs;
+ handle->cpu_data[cpu].timestamp = timestamp_calc(kbuffer_timestamp(kbuf),
+ cpu, handle);
return 0;
}
@@ -1942,10 +1952,7 @@ read_again:
goto read_again;
}
- handle->cpu_data[cpu].timestamp = timestamp_correct(ts, cpu, handle);
-
- if (handle->ts2secs)
- handle->cpu_data[cpu].timestamp *= handle->ts2secs;
+ handle->cpu_data[cpu].timestamp = timestamp_calc(ts, cpu, handle);
index = kbuffer_curr_offset(kbuf);
--
2.29.2
next prev parent reply other threads:[~2021-03-11 8:49 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 8:48 [PATCH v31 00/16] Timestamp synchronization of host - guest tracing session Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 01/16] trace-cmd: Add timestamp synchronization per vCPU Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 02/16] trace-cmd: Add dummy function to initialize timestamp sync logic Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 03/16] trace-cmd: Move time sync logic in the trace-cmd library Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 04/16] trace-cmd: Wait for first time sync before the trace Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 05/16] trace-cmd: PTP-like algorithm for host - guest timestamp synchronization Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 06/16] trace-cmd: Debug scripts for " Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 07/16] trace-cmd [POC]: Add KVM timestamp synchronization plugin Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 08/16] trace-cmd: Add initial perf interface in trace-cmd library Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 09/16] trace-cmd: Add logic for TSC to nanosecond conversion Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 10/16] trace-cmd: Append new options into guest trace file at the end of the tracing session Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 11/16] trace-cmd: Add a new option in trace file metadata for tsc2nsec conversion Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 12/16] trace-cmd: Save information for tsc to nanoseconds conversion in trace file Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 13/16] trace-cmd: Read information for tsc to nanoseconds conversion from " Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` [PATCH v31 14/16] trace-cmd: Remove unneeded multiply in events timestamp reading Tzvetomir Stoyanov (VMware)
2021-03-11 8:48 ` Tzvetomir Stoyanov (VMware) [this message]
2021-03-11 8:48 ` [PATCH v31 16/16] trace-cmd: Convert tsc timestamps to nanosecods when reading trace data from a file Tzvetomir Stoyanov (VMware)
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=20210311084857.1919805-16-tz.stoyanov@gmail.com \
--to=tz.stoyanov@gmail.com \
--cc=linux-trace-devel@vger.kernel.org \
--cc=rostedt@goodmis.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).