opt_trace_domain_field,
opt_trace_procname_field,
opt_trace_vpid_field,
+ opt_trace_hostname_field,
+ opt_trace_default_fields = 1,
opt_loglevel_field,
+ opt_emf_field,
+ opt_callsite_field,
opt_delta_field = 1;
enum field_item {
Q_STREAM_PACKET_CONTEXT_PACKET_SIZE = g_quark_from_static_string("stream.packet.context.packet_size");
}
+static
+struct ctf_callsite *ctf_trace_callsite_lookup(struct ctf_trace *trace,
+ GQuark callsite_name)
+{
+ return g_hash_table_lookup(trace->callsites,
+ (gpointer) (unsigned long) callsite_name);
+}
+
int print_field(struct definition *definition)
{
/* Print all fields in verbose mode */
fflush(pos->fp);
fprintf(stderr, "[warning] Tracer discarded %" PRIu64 " events between [",
stream->events_discarded);
- ctf_print_timestamp(stderr, stream, stream->prev_timestamp);
- fprintf(stderr, "] and [");
- ctf_print_timestamp(stderr, stream, stream->prev_timestamp_end);
+ if (opt_clock_cycles) {
+ ctf_print_timestamp(stderr, stream,
+ stream->prev_cycles_timestamp);
+ fprintf(stderr, "] and [");
+ ctf_print_timestamp(stderr, stream,
+ stream->prev_cycles_timestamp_end);
+ } else {
+ ctf_print_timestamp(stderr, stream,
+ stream->prev_real_timestamp);
+ fprintf(stderr, "] and [");
+ ctf_print_timestamp(stderr, stream,
+ stream->prev_real_timestamp_end);
+ }
fprintf(stderr, "]. You should consider recording a new trace with larger buffers or with fewer events enabled.\n");
fflush(stderr);
stream->events_discarded = 0;
fprintf(pos->fp, "timestamp = ");
else
fprintf(pos->fp, "[");
- ctf_print_timestamp(pos->fp, stream, stream->timestamp);
+ if (opt_clock_cycles) {
+ ctf_print_timestamp(pos->fp, stream, stream->cycles_timestamp);
+ } else {
+ ctf_print_timestamp(pos->fp, stream, stream->real_timestamp);
+ }
if (!pos->print_names)
fprintf(pos->fp, "]");
fprintf(pos->fp, "delta = ");
else
fprintf(pos->fp, "(");
- if (pos->last_timestamp != -1ULL) {
- delta = stream->timestamp - pos->last_timestamp;
+ if (pos->last_real_timestamp != -1ULL) {
+ delta = stream->real_timestamp - pos->last_real_timestamp;
delta_sec = delta / NSEC_PER_SEC;
delta_nsec = delta % NSEC_PER_SEC;
fprintf(pos->fp, "+%" PRIu64 ".%09" PRIu64,
fprintf(pos->fp, ", ");
else
fprintf(pos->fp, " ");
- pos->last_timestamp = stream->timestamp;
+ pos->last_real_timestamp = stream->real_timestamp;
+ pos->last_cycles_timestamp = stream->cycles_timestamp;
}
if ((opt_trace_field || opt_all_fields) && stream_class->trace->path[0] != '\0') {
else
fprintf(pos->fp, " ");
}
- if ((opt_trace_domain_field && !opt_all_fields) && stream_class->trace->env.domain[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 = ");
+ }
+ fprintf(pos->fp, "%s", stream_class->trace->env.hostname);
+ if (pos->print_names)
+ fprintf(pos->fp, ", ");
+ dom_print = 1;
+ }
+ 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 = ");
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 = ");
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 = ");
fprintf(pos->fp, ", ");
dom_print = 1;
}
+ if ((opt_emf_field || opt_all_fields) && event_class->model_emf_uri) {
+ set_field_names_print(pos, ITEM_HEADER);
+ if (pos->print_names) {
+ fprintf(pos->fp, "model.emf.uri = ");
+ } else if (dom_print) {
+ fprintf(pos->fp, ":");
+ }
+ fprintf(pos->fp, "\"%s\"",
+ g_quark_to_string(event_class->model_emf_uri));
+ if (pos->print_names)
+ fprintf(pos->fp, ", ");
+ dom_print = 1;
+ }
+ if ((opt_callsite_field || opt_all_fields)) {
+ struct ctf_callsite *callsite;
+
+ callsite = ctf_trace_callsite_lookup(stream_class->trace,
+ event_class->name);
+ if (callsite) {
+ set_field_names_print(pos, ITEM_HEADER);
+ if (pos->print_names) {
+ fprintf(pos->fp, "callsite = ");
+ } else if (dom_print) {
+ fprintf(pos->fp, ":");
+ }
+ fprintf(pos->fp, "[%s@%s:%" PRIu64 "]",
+ callsite->func, callsite->file,
+ callsite->line);
+ if (pos->print_names)
+ fprintf(pos->fp, ", ");
+ dom_print = 1;
+ }
+ }
if (dom_print && !pos->print_names)
fprintf(pos->fp, " ");
set_field_names_print(pos, ITEM_HEADER);
/* newline */
fprintf(pos->fp, "\n");
pos->field_nr = 0;
- stream->consumed = 1;
return 0;
pos = g_new0(struct ctf_text_stream_pos, 1);
- pos->last_timestamp = -1ULL;
+ pos->last_real_timestamp = -1ULL;
+ pos->last_cycles_timestamp = -1ULL;
switch (flags & O_ACCMODE) {
case O_RDWR:
if (!path)