projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change default printout to add host, process names and vpid
[babeltrace.git]
/
formats
/
ctf-text
/
ctf-text.c
diff --git
a/formats/ctf-text/ctf-text.c
b/formats/ctf-text/ctf-text.c
index d209eca23f99da6634d6c1680045d8a3bd14f79b..7211c97f955889a4d6c15e409f2df0a87b4ae275 100644
(file)
--- a/
formats/ctf-text/ctf-text.c
+++ b/
formats/ctf-text/ctf-text.c
@@
-47,6
+47,7
@@
int opt_all_field_names,
opt_trace_procname_field,
opt_trace_vpid_field,
opt_trace_hostname_field,
opt_trace_procname_field,
opt_trace_vpid_field,
opt_trace_hostname_field,
+ opt_trace_default_fields = 1,
opt_loglevel_field,
opt_delta_field = 1;
opt_loglevel_field,
opt_delta_field = 1;
@@
-323,7
+324,8
@@
int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
else
fprintf(pos->fp, " ");
}
else
fprintf(pos->fp, " ");
}
- if ((opt_trace_hostname_field && !opt_all_fields) && stream_class->trace->env.hostname[0] != '\0') {
+ if ((opt_trace_hostname_field || opt_all_fields || opt_trace_default_fields)
+ && stream_class->trace->env.hostname[0] != '\0') {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace:hostname = ");
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace:hostname = ");
@@
-333,7
+335,7
@@
int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
fprintf(pos->fp, ", ");
dom_print = 1;
}
fprintf(pos->fp, ", ");
dom_print = 1;
}
- if ((opt_trace_domain_field
&& !
opt_all_fields) && stream_class->trace->env.domain[0] != '\0') {
+ if ((opt_trace_domain_field
||
opt_all_fields) && stream_class->trace->env.domain[0] != '\0') {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace:domain = ");
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace:domain = ");
@@
-343,7
+345,8
@@
int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
fprintf(pos->fp, ", ");
dom_print = 1;
}
fprintf(pos->fp, ", ");
dom_print = 1;
}
- if ((opt_trace_procname_field && !opt_all_fields) && stream_class->trace->env.procname[0] != '\0') {
+ if ((opt_trace_procname_field || opt_all_fields || opt_trace_default_fields)
+ && stream_class->trace->env.procname[0] != '\0') {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace:procname = ");
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace:procname = ");
@@
-355,7
+358,8
@@
int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_definition *
fprintf(pos->fp, ", ");
dom_print = 1;
}
fprintf(pos->fp, ", ");
dom_print = 1;
}
- if ((opt_trace_vpid_field && !opt_all_fields) && stream_class->trace->env.vpid != -1) {
+ if ((opt_trace_vpid_field || opt_all_fields || opt_trace_default_fields)
+ && stream_class->trace->env.vpid != -1) {
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace:vpid = ");
set_field_names_print(pos, ITEM_HEADER);
if (pos->print_names) {
fprintf(pos->fp, "trace:vpid = ");
This page took
0.024699 seconds
and
4
git commands to generate.