X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf-text%2Fctf-text.c;h=7211c97f955889a4d6c15e409f2df0a87b4ae275;hp=b7889ec0b945455402149cb6ac7cb8c5a0be25f9;hb=c3815874ce57c8b9dbceda4e5b7db5fdf869559c;hpb=1842a4c801d0878adf40862fda0c310a52a6fdd2 diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c index b7889ec0..7211c97f 100644 --- a/formats/ctf-text/ctf-text.c +++ b/formats/ctf-text/ctf-text.c @@ -22,8 +22,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -46,6 +46,8 @@ int opt_all_field_names, 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_delta_field = 1; @@ -56,9 +58,27 @@ enum field_item { ITEM_PAYLOAD, }; -struct trace_descriptor *ctf_text_open_trace(const char *collection_path, - const char *path, int flags, - void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, +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 (*packet_seek)(struct stream_pos *pos, size_t index, int whence), FILE *metadata_fp); void ctf_text_close_trace(struct trace_descriptor *descriptor); @@ -152,15 +172,56 @@ void set_field_names_print(struct ctf_text_stream_pos *pos, enum field_item item } static -int ctf_text_write_event(struct stream_pos *ppos, - struct ctf_stream *stream) +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_definition *stream) + { struct ctf_text_stream_pos *pos = container_of(ppos, struct ctf_text_stream_pos, parent); - struct ctf_stream_class *stream_class = stream->stream_class; + struct ctf_stream_declaration *stream_class = stream->stream_class; int field_nr_saved; - struct ctf_event *event_class; - struct ctf_stream_event *event; + struct ctf_event_declaration *event_class; + struct ctf_event_definition *event; uint64_t id; int ret; int dom_print = 0; @@ -177,20 +238,30 @@ int ctf_text_write_event(struct stream_pos *ppos, return -EINVAL; } event_class = g_ptr_array_index(stream_class->events_by_id, id); - if (!event) { - fprintf(stderr, "[error] Event id %" PRIu64 " is unknown.\n", id); + if (!event_class) { + fprintf(stderr, "[error] Event class 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 [", + 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); - fprintf(stderr, "]. You should consider increasing the buffer size.\n"); + 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; } @@ -201,7 +272,11 @@ int ctf_text_write_event(struct stream_pos *ppos, 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, "]"); @@ -218,8 +293,8 @@ int ctf_text_write_event(struct stream_pos *ppos, 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, @@ -234,7 +309,8 @@ int ctf_text_write_event(struct stream_pos *ppos, 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') { @@ -248,7 +324,18 @@ int ctf_text_write_event(struct stream_pos *ppos, 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 = "); @@ -258,7 +345,8 @@ int ctf_text_write_event(struct stream_pos *ppos, 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 = "); @@ -270,7 +358,8 @@ int ctf_text_write_event(struct stream_pos *ppos, 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 = "); @@ -289,7 +378,8 @@ int ctf_text_write_event(struct stream_pos *ppos, } else if (dom_print) { fprintf(pos->fp, ":"); } - fprintf(pos->fp, "(%d)", + fprintf(pos->fp, "%s (%d)", + print_loglevel(event_class->loglevel), event_class->loglevel); if (pos->print_names) fprintf(pos->fp, ", "); @@ -397,9 +487,8 @@ error: } -struct trace_descriptor *ctf_text_open_trace(const char *collection_path, - const char *path, int flags, - void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, +struct trace_descriptor *ctf_text_open_trace(const char *path, int flags, + void (*packet_seek)(struct stream_pos *pos, size_t index, int whence), FILE *metadata_fp) { struct ctf_text_stream_pos *pos; @@ -407,7 +496,8 @@ struct trace_descriptor *ctf_text_open_trace(const char *collection_path, 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)