X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=3ad9dfc04146053bbede4ed70e1540e65db38955;hp=9ad23012d9512cc2fe4c79e8cc999a8a1850ada1;hb=7e18eedf5333dbd6f1e0a8d873a7275dee1ed396;hpb=82662ad4362f791f9cd7026652f60708923554f4 diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index 9ad23012..3ad9dfc0 100644 --- a/formats/ctf-text/ctf-text.c +++ b/formats/ctf-text/ctf-text.c @@ -34,12 +34,20 @@ #include #include +#define NSEC_PER_SEC 1000000000ULL + int opt_all_field_names, opt_scope_field_names, opt_header_field_names, opt_context_field_names, opt_payload_field_names, - opt_trace_name; + opt_all_fields, + opt_trace_field, + opt_trace_domain_field, + opt_trace_procname_field, + opt_trace_vpid_field, + opt_loglevel_field, + opt_delta_field = 1; enum field_item { ITEM_SCOPE, @@ -48,6 +56,25 @@ enum field_item { ITEM_PAYLOAD, }; +enum bt_loglevel { + BT_LOGLEVEL_EMERG = 0, + BT_LOGLEVEL_ALERT = 1, + BT_LOGLEVEL_CRIT = 2, + BT_LOGLEVEL_ERR = 3, + BT_LOGLEVEL_WARNING = 4, + BT_LOGLEVEL_NOTICE = 5, + BT_LOGLEVEL_INFO = 6, + BT_LOGLEVEL_DEBUG_SYSTEM = 7, + BT_LOGLEVEL_DEBUG_PROGRAM = 8, + BT_LOGLEVEL_DEBUG_PROCESS = 9, + BT_LOGLEVEL_DEBUG_MODULE = 10, + BT_LOGLEVEL_DEBUG_UNIT = 11, + BT_LOGLEVEL_DEBUG_FUNCTION = 12, + BT_LOGLEVEL_DEBUG_LINE = 13, + BT_LOGLEVEL_DEBUG = 14, +}; + + struct trace_descriptor *ctf_text_open_trace(const char *path, int flags, void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, int whence), FILE *metadata_fp); @@ -142,6 +169,47 @@ void set_field_names_print(struct ctf_text_stream_pos *pos, enum field_item item } } +static +const char *print_loglevel(int value) +{ + switch (value) { + case -1: + return ""; + case BT_LOGLEVEL_EMERG: + return "TRACE_EMERG"; + case BT_LOGLEVEL_ALERT: + return "TRACE_ALERT"; + case BT_LOGLEVEL_CRIT: + return "TRACE_CRIT"; + case BT_LOGLEVEL_ERR: + return "TRACE_ERR"; + case BT_LOGLEVEL_WARNING: + return "TRACE_WARNING"; + case BT_LOGLEVEL_NOTICE: + return "TRACE_NOTICE"; + case BT_LOGLEVEL_INFO: + return "TRACE_INFO"; + case BT_LOGLEVEL_DEBUG_SYSTEM: + return "TRACE_DEBUG_SYSTEM"; + case BT_LOGLEVEL_DEBUG_PROGRAM: + return "TRACE_DEBUG_PROGRAM"; + case BT_LOGLEVEL_DEBUG_PROCESS: + return "TRACE_DEBUG_PROCESS"; + case BT_LOGLEVEL_DEBUG_MODULE: + return "TRACE_DEBUG_MODULE"; + case BT_LOGLEVEL_DEBUG_UNIT: + return "TRACE_DEBUG_UNIT"; + case BT_LOGLEVEL_DEBUG_FUNCTION: + return "TRACE_DEBUG_FUNCTION"; + case BT_LOGLEVEL_DEBUG_LINE: + return "TRACE_DEBUG_LINE"; + case BT_LOGLEVEL_DEBUG: + return "TRACE_DEBUG"; + default: + return "<>"; + } +} + static int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream *stream) @@ -154,31 +222,45 @@ int ctf_text_write_event(struct stream_pos *ppos, struct ctf_stream_event *event; uint64_t id; int ret; + int dom_print = 0; id = stream->event_id; if (id >= stream_class->events_by_id->len) { - fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id); + fprintf(stderr, "[error] Event id %" PRIu64 " is outside range.\n", id); return -EINVAL; } event = g_ptr_array_index(stream->events_by_id, id); if (!event) { - fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id); + fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id); return -EINVAL; } event_class = g_ptr_array_index(stream_class->events_by_id, id); if (!event) { - fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id); + fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id); return -EINVAL; } + /* Print events discarded */ + if (stream->events_discarded) { + fflush(pos->fp); + fprintf(stderr, "[warning] Tracer discarded %d 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); + fprintf(stderr, "]. You should consider increasing the buffer size.\n"); + fflush(stderr); + stream->events_discarded = 0; + } + if (stream->has_timestamp) { set_field_names_print(pos, ITEM_HEADER); if (pos->print_names) fprintf(pos->fp, "timestamp = "); else fprintf(pos->fp, "["); - fprintf(pos->fp, "%12" PRIu64, stream->timestamp); + ctf_print_timestamp(pos->fp, stream, stream->timestamp); if (!pos->print_names) fprintf(pos->fp, "]"); @@ -187,18 +269,94 @@ int ctf_text_write_event(struct stream_pos *ppos, else fprintf(pos->fp, " "); } - if ((opt_trace_name || opt_all_field_names) && stream_class->trace->path[0] != '\0') { + if ((opt_delta_field || opt_all_fields) && stream->has_timestamp) { + uint64_t delta, delta_sec, delta_nsec; + set_field_names_print(pos, ITEM_HEADER); if (pos->print_names) - fprintf(pos->fp, "trace = "); + fprintf(pos->fp, "delta = "); + else + fprintf(pos->fp, "("); + if (pos->last_timestamp != -1ULL) { + delta = stream->timestamp - pos->last_timestamp; + delta_sec = delta / NSEC_PER_SEC; + delta_nsec = delta % NSEC_PER_SEC; + fprintf(pos->fp, "+%" PRIu64 ".%09" PRIu64, + delta_sec, delta_nsec); + } else { + fprintf(pos->fp, "+?.?????????"); + } + if (!pos->print_names) + fprintf(pos->fp, ")"); - fprintf(pos->fp, "%s", stream_class->trace->path); + if (pos->print_names) + fprintf(pos->fp, ", "); + else + fprintf(pos->fp, " "); + pos->last_timestamp = stream->timestamp; + } + if ((opt_trace_field || opt_all_fields) && stream_class->trace->path[0] != '\0') { + set_field_names_print(pos, ITEM_HEADER); + if (pos->print_names) { + fprintf(pos->fp, "trace = "); + } + fprintf(pos->fp, "%s", stream_class->trace->path); if (pos->print_names) fprintf(pos->fp, ", "); else fprintf(pos->fp, " "); } + 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, "%s", stream_class->trace->env.domain); + if (pos->print_names) + fprintf(pos->fp, ", "); + dom_print = 1; + } + if ((opt_trace_procname_field && !opt_all_fields) && stream_class->trace->env.procname[0] != '\0') { + set_field_names_print(pos, ITEM_HEADER); + if (pos->print_names) { + fprintf(pos->fp, "trace:procname = "); + } else if (dom_print) { + fprintf(pos->fp, ":"); + } + fprintf(pos->fp, "%s", stream_class->trace->env.procname); + if (pos->print_names) + fprintf(pos->fp, ", "); + dom_print = 1; + } + if ((opt_trace_vpid_field && !opt_all_fields) && stream_class->trace->env.vpid != -1) { + set_field_names_print(pos, ITEM_HEADER); + if (pos->print_names) { + fprintf(pos->fp, "trace:vpid = "); + } else if (dom_print) { + fprintf(pos->fp, ":"); + } + fprintf(pos->fp, "%d", stream_class->trace->env.vpid); + if (pos->print_names) + fprintf(pos->fp, ", "); + dom_print = 1; + } + if ((opt_loglevel_field || opt_all_fields) && event_class->loglevel != -1) { + set_field_names_print(pos, ITEM_HEADER); + if (pos->print_names) { + fprintf(pos->fp, "loglevel = "); + } else if (dom_print) { + fprintf(pos->fp, ":"); + } + fprintf(pos->fp, "%s (%d)", + print_loglevel(event_class->loglevel), + event_class->loglevel); + 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); if (pos->print_names) fprintf(pos->fp, "name = "); @@ -290,11 +448,12 @@ int ctf_text_write_event(struct stream_pos *ppos, /* newline */ fprintf(pos->fp, "\n"); pos->field_nr = 0; + stream->consumed = 1; return 0; error: - fprintf(stdout, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n"); + fprintf(stderr, "[error] Unexpected end of stream. Either the trace data stream is corrupted or metadata description does not match data layout.\n"); return ret; } @@ -308,6 +467,7 @@ struct trace_descriptor *ctf_text_open_trace(const char *path, int flags, pos = g_new0(struct ctf_text_stream_pos, 1); + pos->last_timestamp = -1ULL; switch (flags & O_ACCMODE) { case O_RDWR: if (!path) @@ -323,7 +483,7 @@ struct trace_descriptor *ctf_text_open_trace(const char *path, int flags, break; case O_RDONLY: default: - fprintf(stdout, "[error] Incorrect open flags.\n"); + fprintf(stderr, "[error] Incorrect open flags.\n"); goto error; }