@@ -167,6 +167,7 @@ enum buffer_instance_flags {
BUFFER_FL_PROFILE = 1 << 1,
BUFFER_FL_GUEST = 1 << 2,
BUFFER_FL_AGENT = 1 << 3,
+ BUFFER_FL_HAS_CLOCK = 1 << 4,
};
struct func_list {
@@ -5532,6 +5532,8 @@ static void parse_record_options(int argc,
char *sav;
int name_counter = 0;
int neg_event = 0;
+ struct buffer_instance *instance;
+ bool guest_sync_set = false;
init_common_record_context(ctx, curr_cmd);
@@ -5575,6 +5577,8 @@ static void parse_record_options(int argc,
*/
if (c != 'B' && c != 'A' && is_guest(ctx->instance)) {
add_arg(ctx->instance, c, opts, long_options, optarg);
+ if (c == 'C')
+ ctx->instance->flags |= BUFFER_FL_HAS_CLOCK;
continue;
}
@@ -5689,6 +5693,9 @@ static void parse_record_options(int argc,
break;
case 'C':
ctx->instance->clock = optarg;
+ ctx->instance->flags |= BUFFER_FL_HAS_CLOCK;
+ if (is_top_instance(ctx->instance))
+ guest_sync_set = true;
break;
case 'v':
neg_event = 1;
@@ -5913,6 +5920,20 @@ static void parse_record_options(int argc,
add_argv(instance, "--date", true);
}
}
+ if (guest_sync_set) {
+ /* If -C is specified, prepend clock to all guest VM flags */
+ for_all_instances(instance) {
+ if (top_instance.clock) {
+ if (is_guest(instance) &&
+ !(instance->flags & BUFFER_FL_HAS_CLOCK)) {
+ add_argv(instance,
+ (char *)top_instance.clock,
+ true);
+ add_argv(instance, "-C", true);
+ }
+ }
+ }
+ }
if (!ctx->filtered && ctx->instance->filter_mod)
add_func(&ctx->instance->filter_funcs,
When tracing host and guest machines, both should use the same tracing clock for event timestamps. If a clock is specified as host tracing argument, with option "-C clock_name", the same is injected as guest tracing argument. If the user wants to use different tracing clocks, it can specify it using "-C clock_name" as guest tracing argument. In that case, the one specified by the user has higher priority. Signed-off-by: Tzvetomir Stoyanov (VMware) <tz.stoyanov@gmail.com> --- tracecmd/include/trace-local.h | 1 + tracecmd/trace-record.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+)