int ret = 0;
int i;
GString *tmpstr = NULL, *default_value = NULL;
+ bool default_set = false, non_default_set = false;
/*
* names_array may be NULL if no CLI options were specified to
g_string_assign(default_value, "hide");
}
if (is_default) {
+ default_set = true;
g_string_append(tmpstr, "default");
append_param_arg(params_arg, tmpstr->str,
default_value->str);
} else {
+ non_default_set = true;
g_string_append(tmpstr, suffix);
append_param_arg(params_arg, tmpstr->str, "yes");
}
}
+ /* Implicit field-default=hide if any non-default option is set. */
+ if (non_default_set && !default_set) {
+ g_string_assign(tmpstr, prefix);
+ g_string_append(tmpstr, "-default");
+ g_string_assign(default_value, "hide");
+ ret = map_insert_string_or_null(map_obj,
+ tmpstr->str,
+ default_value);
+ if (ret) {
+ print_err_oom();
+ goto end;
+ }
+ }
+
end:
if (default_value) {
g_string_free(default_value, TRUE);
struct bt_ctf_event_class *event_class = NULL;
struct bt_ctf_stream_class *stream_class = NULL;
struct bt_ctf_trace *trace_class = NULL;
+ int dom_print = 0;
event_class = bt_ctf_event_get_class(event);
if (!event_class) {
ret = BT_COMPONENT_STATUS_ERROR;
goto end;
}
- if (!text->start_line) {
- fputs(", ", text->out);
- }
- text->start_line = false;
ret = print_event_timestamp(text, event, &text->start_line);
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
if (!text->start_line) {
fputs(", ", text->out);
}
- text->start_line = false;
if (print_names) {
print_name_equal(text, "trace");
}
fprintf(text->out, "%s", name);
+ if (!print_names) {
+ fprintf(text->out, " ");
+ }
}
}
if (text->options.print_trace_hostname_field) {
if (!text->start_line) {
fputs(", ", text->out);
}
- text->start_line = false;
if (print_names) {
print_name_equal(text, "trace:hostname");
}
fprintf(text->out, "%s", str);
}
bt_put(hostname_str);
+ dom_print = 1;
}
}
if (text->options.print_trace_domain_field) {
if (!text->start_line) {
fputs(", ", text->out);
}
- text->start_line = false;
if (print_names) {
print_name_equal(text, "trace:domain");
+ } else if (dom_print) {
+ fputs(":", text->out);
}
if (bt_value_string_get(domain_str, &str)
== BT_VALUE_STATUS_OK) {
fprintf(text->out, "%s", str);
}
bt_put(domain_str);
+ dom_print = 1;
}
}
if (text->options.print_trace_procname_field) {
if (!text->start_line) {
fputs(", ", text->out);
}
- text->start_line = false;
if (print_names) {
print_name_equal(text, "trace:procname");
+ } else if (dom_print) {
+ fputs(":", text->out);
}
if (bt_value_string_get(procname_str, &str)
== BT_VALUE_STATUS_OK) {
fprintf(text->out, "%s", str);
}
bt_put(procname_str);
+ dom_print = 1;
}
}
if (text->options.print_trace_vpid_field) {
if (!text->start_line) {
fputs(", ", text->out);
}
- text->start_line = false;
if (print_names) {
print_name_equal(text, "trace:vpid");
+ } else if (dom_print) {
+ fputs(":", text->out);
}
if (bt_value_integer_get(vpid_value, &value)
== BT_VALUE_STATUS_OK) {
fprintf(text->out, "(%" PRId64 ")", value);
}
bt_put(vpid_value);
+ dom_print = 1;
}
}
if (text->options.print_loglevel_field) {
if (!text->start_line) {
fputs(", ", text->out);
}
- text->start_line = false;
if (print_names) {
print_name_equal(text, "loglevel");
+ } else if (dom_print) {
+ fputs(":", text->out);
}
if (loglevel_str) {
const char *str;
}
bt_put(loglevel_str);
bt_put(loglevel_value);
+ dom_print = 1;
}
}
if (text->options.print_emf_field) {
if (!text->start_line) {
fputs(", ", text->out);
}
- text->start_line = false;
if (print_names) {
print_name_equal(text, "model.emf.uri");
+ } else if (dom_print) {
+ fputs(":", text->out);
}
if (uri_str) {
const char *str;
}
}
bt_put(uri_str);
+ dom_print = 1;
}
}
+ if (dom_print && !print_names) {
+ fputs(" ", text->out);
+ }
if (!text->start_line) {
fputs(", ", text->out);
}
- text->start_line = false;
+ text->start_line = true;
if (print_names) {
print_name_equal(text, "name");
}
if (text->use_colors) {
fputs(COLOR_RST, text->out);
}
+ if (!print_names) {
+ fputs(": ", text->out);
+ } else {
+ fputs(", ", text->out);
+ }
end:
bt_put(trace_class);
bt_put(stream_class);
} else {
fprintf(text->out, " ");
}
+ if (print_names) {
+ fprintf(text->out, "[%" PRIu64 "] = ", i);
+ }
}
field = bt_ctf_field_array_get_field(array, i);
if (!field) {
} else {
fprintf(text->out, " ");
}
+ if (print_names) {
+ fprintf(text->out, "[%" PRIu64 "] = ", i);
+ }
}
field = bt_ctf_field_sequence_get_field(seq, i);
if (!field) {
goto end;
}
- ret = print_event_header_raw(text, event);
- if (ret != BT_COMPONENT_STATUS_OK) {
- goto end;
+ if (text->options.verbose) {
+ ret = print_event_header_raw(text, event);
+ if (ret != BT_COMPONENT_STATUS_OK) {
+ goto end;
+ }
}
ret = print_stream_event_context(text, event);
"field-trace:vpid",
"field-loglevel",
"field-emf",
+ "field-callsite",
};
static
switch (bt_notification_get_type(notification)) {
case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
- puts("<packet>");
break;
case BT_NOTIFICATION_TYPE_PACKET_END:
- puts("</packet>");
break;
case BT_NOTIFICATION_TYPE_EVENT:
{
break;
}
case BT_NOTIFICATION_TYPE_STREAM_END:
- puts("</stream>");
break;
default:
puts("Unhandled notification type");
text->options.print_trace_vpid_field = true;
text->options.print_loglevel_field = false;
text->options.print_emf_field = false;
- text->options.print_emf_field = false;
+ text->options.print_callsite_field = false;
break;
case TEXT_DEFAULT_SHOW:
text->options.print_trace_field = true;
text->options.print_trace_vpid_field = true;
text->options.print_loglevel_field = true;
text->options.print_emf_field = true;
- text->options.print_emf_field = true;
+ text->options.print_callsite_field = true;
break;
case TEXT_DEFAULT_HIDE:
text->options.print_trace_field = false;
text->options.print_trace_vpid_field = false;
text->options.print_loglevel_field = false;
text->options.print_emf_field = false;
- text->options.print_emf_field = false;
+ text->options.print_callsite_field = false;
break;
default:
ret = BT_COMPONENT_STATUS_ERROR;
value = false;
found = false;
- ret = apply_one_bool("field-emf", params, &value, &found);
+ ret = apply_one_bool("field-callsite", params, &value, &found);
if (ret != BT_COMPONENT_STATUS_OK) {
goto end;
}
if (found) {
- text->options.print_emf_field = value;
+ text->options.print_callsite_field = value;
}
end: