| Message ID | 20210322095945.259300-12-tz.stoyanov@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | TSC trace clock to nanosecond conversion | expand |
On Mon, 22 Mar 2021 11:59:38 +0200 "Tzvetomir Stoyanov (VMware)" <tz.stoyanov@gmail.com> wrote: > 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 | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c > index be8a7919..dfbe4af6 100644 > --- a/lib/trace-cmd/trace-input.c > +++ b/lib/trace-cmd/trace-input.c > @@ -1276,6 +1276,19 @@ static unsigned long long timestamp_correct(unsigned long long ts, > &host->ts_samples[mid+1]); > } > > +static unsigned long long timestamp_calc(unsigned long long ts, > + struct tracecmd_input *handle) > +{ > + unsigned long long tstamp; > + > + tstamp = timestamp_correct(ts, handle); > + > + if (handle->ts2secs) > + tstamp *= handle->ts2secs; > + > + return tstamp; > +} I like to save on extra variables ;-) static unsigned long long timestamp_calc(unsigned long long ts, struct tracecmd_input *handle) { ts = timestamp_correct(ts, handle); if (handle->ts2secs) ts *= handle->ts2secs; return ts; } -- Steve
diff --git a/lib/trace-cmd/trace-input.c b/lib/trace-cmd/trace-input.c index be8a7919..dfbe4af6 100644 --- a/lib/trace-cmd/trace-input.c +++ b/lib/trace-cmd/trace-input.c @@ -1276,6 +1276,19 @@ static unsigned long long timestamp_correct(unsigned long long ts, &host->ts_samples[mid+1]); } +static unsigned long long timestamp_calc(unsigned long long ts, + struct tracecmd_input *handle) +{ + unsigned long long tstamp; + + tstamp = timestamp_correct(ts, handle); + + if (handle->ts2secs) + tstamp *= handle->ts2secs; + + return tstamp; +} + /* * Page is mapped, now read in the page header info. */ @@ -1297,10 +1310,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), handle); - - if (handle->ts2secs) - handle->cpu_data[cpu].timestamp *= handle->ts2secs; + handle->cpu_data[cpu].timestamp = timestamp_calc(kbuffer_timestamp(kbuf), + handle); return 0; } @@ -1930,10 +1941,7 @@ read_again: goto read_again; } - handle->cpu_data[cpu].timestamp = timestamp_correct(ts, handle); - - if (handle->ts2secs) - handle->cpu_data[cpu].timestamp *= handle->ts2secs; + handle->cpu_data[cpu].timestamp = timestamp_calc(ts, handle); index = kbuffer_curr_offset(kbuf);
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 | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)