@@ -110,6 +110,7 @@ enum {
TRACECMD_OPTION_VERSION,
TRACECMD_OPTION_PROCMAPS,
TRACECMD_OPTION_TRACEID,
+ TRACECMD_OPTION_TIME_SHIFT,
};
enum {
@@ -153,6 +154,8 @@ void tracecmd_set_flag(struct tracecmd_input *handle, int flag);
void tracecmd_clear_flag(struct tracecmd_input *handle, int flag);
unsigned long tracecmd_get_flags(struct tracecmd_input *handle);
unsigned long long tracecmd_get_traceid(struct tracecmd_input *handle);
+unsigned long long tracecmd_get_tsync_peer(struct tracecmd_input *handle);
+int tracecmd_enable_tsync(struct tracecmd_input *handle, bool enable);
void tracecmd_parse_trace_clock(struct tracecmd_input *handle, char *file, int size);
@@ -77,6 +77,18 @@ struct input_buffer_instance {
size_t offset;
};
+struct ts_offset_sample {
+ long long time;
+ long long offset;
+};
+
+struct host_trace_info {
+ bool sync_enable;
+ unsigned long long trace_id;
+ int ts_samples_count;
+ struct ts_offset_sample *ts_samples;
+};
+
struct tracecmd_input {
struct tep_handle *pevent;
struct tep_plugin_list *plugin_list;
@@ -95,6 +107,7 @@ struct tracecmd_input {
bool use_pipe;
struct cpu_data *cpu_data;
long long ts_offset;
+ struct host_trace_info host;
double ts2secs;
char * cpustats;
char * uname;
@@ -1075,6 +1088,69 @@ static void free_next(struct tracecmd_input *handle, int cpu)
free_record(record);
}
+static inline unsigned long long
+timestamp_correction_calc(unsigned long long ts, struct ts_offset_sample *min,
+ struct ts_offset_sample *max)
+{
+ long long offset = ((long long)ts - min->time) *
+ (max->offset - min->offset);
+ long long delta = max->time - min->time;
+ long long tscor = min->offset +
+ (offset + delta / 2) / delta;
+
+ if (tscor < 0)
+ return ts - llabs(tscor);
+
+ return ts + tscor;
+}
+
+static unsigned long long timestamp_correct(unsigned long long ts,
+ struct tracecmd_input *handle)
+{
+ struct host_trace_info *host = &handle->host;
+ int min, mid, max;
+
+ if (handle->ts_offset)
+ return ts + handle->ts_offset;
+
+ if (!host->sync_enable)
+ return ts;
+
+ /* We have one sample, nothing to calc here */
+ if (host->ts_samples_count == 1)
+ return ts + host->ts_samples[0].offset;
+
+ /* We have two samples, nothing to search here */
+ if (host->ts_samples_count == 2)
+ return timestamp_correction_calc(ts, &host->ts_samples[0],
+ &host->ts_samples[1]);
+
+ /* We have more than two samples */
+ if (ts <= host->ts_samples[0].time)
+ return timestamp_correction_calc(ts,
+ &host->ts_samples[0],
+ &host->ts_samples[1]);
+ else if (ts >= host->ts_samples[host->ts_samples_count-1].time)
+ return timestamp_correction_calc(ts,
+ &host->ts_samples[host->ts_samples_count-2],
+ &host->ts_samples[host->ts_samples_count-1]);
+ min = 0;
+ max = host->ts_samples_count-1;
+ mid = (min + max)/2;
+ while (min <= max) {
+ if (ts < host->ts_samples[mid].time)
+ max = mid - 1;
+ else if (ts > host->ts_samples[mid].time)
+ min = mid + 1;
+ else
+ break;
+ mid = (min + max)/2;
+ }
+
+ return timestamp_correction_calc(ts, &host->ts_samples[mid],
+ &host->ts_samples[mid+1]);
+}
+
/*
* Page is mapped, now read in the page header info.
*/
@@ -1096,7 +1172,7 @@ static int update_page_info(struct tracecmd_input *handle, int cpu)
kbuffer_subbuffer_size(kbuf));
return -1;
}
- handle->cpu_data[cpu].timestamp = kbuffer_timestamp(kbuf) + handle->ts_offset;
+ handle->cpu_data[cpu].timestamp = timestamp_correct(kbuffer_timestamp(kbuf), handle);
if (handle->ts2secs)
handle->cpu_data[cpu].timestamp *= handle->ts2secs;
@@ -1729,7 +1805,7 @@ read_again:
goto read_again;
}
- handle->cpu_data[cpu].timestamp = ts + handle->ts_offset;
+ handle->cpu_data[cpu].timestamp = timestamp_correct(ts, handle);
if (handle->ts2secs) {
handle->cpu_data[cpu].timestamp *= handle->ts2secs;
@@ -2052,6 +2128,48 @@ void tracecmd_set_ts2secs(struct tracecmd_input *handle,
handle->use_trace_clock = false;
}
+static int tsync_offset_cmp(const void *a, const void *b)
+{
+ struct ts_offset_sample *ts_a = (struct ts_offset_sample *)a;
+ struct ts_offset_sample *ts_b = (struct ts_offset_sample *)b;
+
+ if (ts_a->time > ts_b->time)
+ return 1;
+ if (ts_a->time < ts_b->time)
+ return -1;
+ return 0;
+}
+
+static void tsync_offset_load(struct tracecmd_input *handle, char *buf)
+{
+ struct host_trace_info *host = &handle->host;
+ long long *buf8 = (long long *)buf;
+ int i, j;
+
+ for (i = 0; i < host->ts_samples_count; i++) {
+ host->ts_samples[i].time = tep_read_number(handle->pevent,
+ buf8 + i, 8);
+ host->ts_samples[i].offset = tep_read_number(handle->pevent,
+ buf8 + host->ts_samples_count+i, 8);
+ }
+ qsort(host->ts_samples, host->ts_samples_count,
+ sizeof(struct ts_offset_sample), tsync_offset_cmp);
+ /* Filter possible samples with equal time */
+ for (i = 0, j = 0; i < host->ts_samples_count; i++) {
+ if (i == 0 || host->ts_samples[i].time != host->ts_samples[i-1].time)
+ host->ts_samples[j++] = host->ts_samples[i];
+ }
+ host->ts_samples_count = j;
+ if (j)
+ host->sync_enable = true;
+}
+
+static void trace_tsync_offset_free(struct host_trace_info *host)
+{
+ free(host->ts_samples);
+ host->ts_samples = NULL;
+}
+
static int trace_pid_map_cmp(const void *a, const void *b)
{
struct tracecmd_proc_addr_map *m_a = (struct tracecmd_proc_addr_map *)a;
@@ -2224,6 +2342,7 @@ static int handle_options(struct tracecmd_input *handle)
struct input_buffer_instance *buffer;
struct hook_list *hook;
char *buf;
+ int samples_size;
int cpus;
/* By default, use usecs, unless told otherwise */
@@ -2271,6 +2390,30 @@ static int handle_options(struct tracecmd_input *handle)
offset = strtoll(buf, NULL, 0);
handle->ts_offset += offset;
break;
+ case TRACECMD_OPTION_TIME_SHIFT:
+ /*
+ * long long int (8 bytes) trace session ID
+ * int (4 bytes) count of timestamp offsets.
+ * long long array of size [count] of times,
+ * when the offsets were calculated.
+ * long long array of size [count] of timestamp offsets.
+ */
+ if (size < 12 || handle->flags & TRACECMD_FL_IGNORE_DATE)
+ break;
+ handle->host.trace_id = tep_read_number(handle->pevent,
+ buf, 8);
+ handle->host.ts_samples_count = tep_read_number(handle->pevent,
+ buf + 8, 4);
+ samples_size = (8 * handle->host.ts_samples_count);
+ if (size != (12 + (2 * samples_size))) {
+ warning("Failed to extract Time Shift information from the file, unexpected size %d", size);
+ break;
+ }
+ handle->host.ts_samples = malloc(2 * samples_size);
+ if (!handle->host.ts_samples)
+ return -ENOMEM;
+ tsync_offset_load(handle, buf + 12);
+ break;
case TRACECMD_OPTION_CPUSTAT:
buf[size-1] = '\n';
cpustats = realloc(cpustats, cpustats_size + size + 1);
@@ -2974,6 +3117,8 @@ void tracecmd_close(struct tracecmd_input *handle)
trace_pid_map_free(handle->pid_maps);
handle->pid_maps = NULL;
+ trace_tsync_offset_free(&handle->host);
+
if (handle->flags & TRACECMD_FL_BUFFER_INSTANCE)
tracecmd_close(handle->parent);
else {
@@ -3315,6 +3460,7 @@ tracecmd_buffer_instance_handle(struct tracecmd_input *handle, int indx)
return NULL;
}
}
+ memset(&new_handle->host, 0, sizeof(new_handle->host));
new_handle->parent = handle;
new_handle->cpustats = NULL;
new_handle->hooks = NULL;
@@ -3435,3 +3581,38 @@ unsigned long long tracecmd_get_traceid(struct tracecmd_input *handle)
{
return handle->trace_id;
}
+
+/**
+ * tracecmd_get_tsync_peer - get the trace session id of the peer host
+ * @handle: input handle for the trace.dat file
+ *
+ * Returns the trace id of the peer host, written in the trace file
+ *
+ * This information is stored in guest trace.dat file
+ */
+unsigned long long tracecmd_get_tsync_peer(struct tracecmd_input *handle)
+{
+ return handle->host.trace_id;
+}
+
+/**
+ * tracecmd_enable_tsync - enable / disable the timestamps correction
+ * @handle: input handle for the trace.dat file
+ * @enable: enable / disable the timestamps correction
+ *
+ * Enables or disables timestamps correction on file load, using the array of
+ * recorded time offsets. If "enable" is true, but there are no time offsets,
+ * function fails and -1 is returned.
+ *
+ * Returns -1 in case of an error, or 0 otherwise
+ */
+int tracecmd_enable_tsync(struct tracecmd_input *handle, bool enable)
+{
+ if (enable &&
+ (!handle->host.ts_samples || !handle->host.ts_samples_count))
+ return -1;
+
+ handle->host.sync_enable = enable;
+
+ return 0;
+}
@@ -366,6 +366,52 @@ static void dump_option_xlong(int fd, int size, char *desc)
read_file_number(fd, &val, size);
do_print(OPTIONS, "0x%llX\n", val);
}
+
+static void dump_option_timeshift(int fd, int size)
+{
+ long long *offsets = NULL;
+ long long *times = NULL;
+ long long trace_id;
+ unsigned int count;
+ int i;
+
+ /*
+ * long long int (8 bytes) trace session ID
+ * int (4 bytes) count of timestamp offsets.
+ * long long array of size [count] of times,
+ * when the offsets were calculated.
+ * long long array of size [count] of timestamp offsets.
+ */
+ if (size < 12) {
+ do_print(OPTIONS, "Broken time shift option, size %s", size);
+ return;
+ }
+ do_print(OPTIONS, "\t\t[Option TimeShift, %d bytes]\n", size);
+ read_file_number(fd, &trace_id, 8);
+ do_print(OPTIONS, "0x%llX [peer's trace id]\n", trace_id);
+ read_file_number(fd, &count, 4);
+ do_print(OPTIONS, "%lld [samples count]\n", count);
+ times = calloc(count, sizeof(long long));
+ if (!times)
+ goto out;
+ offsets = calloc(count, sizeof(long long));
+ if (!offsets)
+ goto out;
+
+ for (i = 0; i < count; i++)
+ read_file_number(fd, times + i, 8);
+ for (i = 0; i < count; i++)
+ read_file_number(fd, offsets + i, 8);
+
+ for (i = 0; i < count; i++)
+ do_print(OPTIONS, "\t%lld %lld [offset @ time]\n",
+ offsets[i], times[i]);
+
+out:
+ free(times);
+ free(offsets);
+}
+
static void dump_options(int fd)
{
unsigned short option;
@@ -419,6 +465,9 @@ static void dump_options(int fd)
case TRACECMD_OPTION_TRACEID:
dump_option_xlong(fd, size, "TRACEID");
break;
+ case TRACECMD_OPTION_TIME_SHIFT:
+ dump_option_timeshift(fd, size);
+ break;
default:
do_print(OPTIONS, " %d %d\t[Unknown option, size - skipping]\n",
option, size);