#include <babeltrace/ctf/metadata.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf/events-internal.h>
+#include <babeltrace/trace-debug-info.h>
#include <inttypes.h>
#include <sys/mman.h>
#include <errno.h>
opt_loglevel_field,
opt_emf_field,
opt_callsite_field,
- opt_delta_field = 1;
+ opt_delta_field = 1,
+ opt_debug_info_full_path;
enum field_item {
ITEM_SCOPE,
static
int ctf_text_close_trace(struct bt_trace_descriptor *descriptor);
-static
-struct bt_trace_descriptor *ctf_metadata_open_trace(const char *path, int flags,
- void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
- int whence), FILE *metadata_fp);
-static
-int ctf_metadata_close_trace(struct bt_trace_descriptor *descriptor);
-
static
rw_dispatch write_dispatch_table[] = {
[ CTF_TYPE_INTEGER ] = ctf_text_integer_write,
.close_trace = ctf_text_close_trace,
};
-static
-struct bt_format ctf_metadata_format = {
- .open_trace = ctf_metadata_open_trace,
- .close_trace = ctf_metadata_close_trace,
-};
-
static GQuark Q_STREAM_PACKET_CONTEXT_TIMESTAMP_BEGIN,
Q_STREAM_PACKET_CONTEXT_TIMESTAMP_END,
Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED,
Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE,
- Q_STREAM_PACKET_CONTEXT_PACKET_SIZE;
+ Q_STREAM_PACKET_CONTEXT_PACKET_SIZE,
+ Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM;
static
void __attribute__((constructor)) init_quarks(void)
Q_STREAM_PACKET_CONTEXT_EVENTS_DISCARDED = g_quark_from_static_string("stream.packet.context.events_discarded");
Q_STREAM_PACKET_CONTEXT_CONTENT_SIZE = g_quark_from_static_string("stream.packet.context.content_size");
Q_STREAM_PACKET_CONTEXT_PACKET_SIZE = g_quark_from_static_string("stream.packet.context.packet_size");
+ Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM = g_quark_from_static_string("stream.packet.context.packet_seq_num");
}
static
return 0;
if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SIZE)
return 0;
+ if (definition->path == Q_STREAM_PACKET_CONTEXT_PACKET_SEQ_NUM)
+ return 0;
return 1;
}
static
int ctf_text_write_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *stream)
-
{
struct ctf_text_stream_pos *pos =
container_of(ppos, struct ctf_text_stream_pos, parent);
return -EINVAL;
}
- /* Print events discarded */
- if (stream->events_discarded) {
- fflush(pos->fp);
- ctf_print_discarded(stderr, stream, 0);
- stream->events_discarded = 0;
- }
+ handle_debug_info_event(stream_class, event);
if (stream->has_timestamp) {
set_field_names_print(pos, ITEM_HEADER);
pos->last_cycles_timestamp = stream->cycles_timestamp;
}
- if ((opt_trace_field || opt_all_fields) && stream_class->trace->path[0] != '\0') {
+ if ((opt_trace_field || opt_all_fields) && stream_class->trace->parent.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);
+ fprintf(pos->fp, "%s", stream_class->trace->parent.path);
if (pos->print_names)
fprintf(pos->fp, ", ");
else
FILE *fp;
pos = g_new0(struct ctf_text_stream_pos, 1);
+ if (!pos) {
+ goto error;
+ }
+ init_trace_descriptor(&pos->trace_descriptor);
pos->last_real_timestamp = -1ULL;
pos->last_cycles_timestamp = -1ULL;
pos->fp = fp;
pos->parent.rw_table = write_dispatch_table;
pos->parent.event_cb = ctf_text_write_event;
+ pos->parent.trace = &pos->trace_descriptor;
pos->print_names = 0;
+ babeltrace_ctf_console_output++;
break;
case O_RDONLY:
default:
int ret;
struct ctf_text_stream_pos *pos =
container_of(td, struct ctf_text_stream_pos, trace_descriptor);
- if (pos->fp != stdout) {
- ret = fclose(pos->fp);
- if (ret) {
- perror("Error on fclose");
- return -1;
- }
- }
- g_free(pos);
- return 0;
-}
-
-static
-int ctf_metadata_trace_pre_handler(struct bt_stream_pos *ppos,
- struct bt_trace_descriptor *td)
-{
- struct ctf_text_stream_pos *pos =
- container_of(ppos, struct ctf_text_stream_pos, parent);
- struct ctf_trace *trace;
-
- trace = container_of(td, struct ctf_trace, parent);
- if (!trace->metadata_string)
- return -EINVAL;
- if (trace->metadata_packetized) {
- fprintf(pos->fp, "/* CTF %u.%u */\n",
- BT_CTF_MAJOR, BT_CTF_MINOR);
- }
- fprintf(pos->fp, "%s", trace->metadata_string);
- return 0;
-}
-
-static
-struct bt_trace_descriptor *ctf_metadata_open_trace(const char *path, int flags,
- void (*packet_seek)(struct bt_stream_pos *pos, size_t index,
- int whence), FILE *metadata_fp)
-{
- struct ctf_text_stream_pos *pos;
- FILE *fp;
-
- pos = g_new0(struct ctf_text_stream_pos, 1);
-
- pos->last_real_timestamp = -1ULL;
- pos->last_cycles_timestamp = -1ULL;
- switch (flags & O_ACCMODE) {
- case O_RDWR:
- if (!path)
- fp = stdout;
- else
- fp = fopen(path, "w");
- if (!fp)
- goto error;
- pos->fp = fp;
- pos->parent.pre_trace_cb = ctf_metadata_trace_pre_handler;
- pos->print_names = 0;
- break;
- case O_RDONLY:
- default:
- fprintf(stderr, "[error] Incorrect open flags.\n");
- goto error;
- }
-
- return &pos->trace_descriptor;
-error:
- g_free(pos);
- return NULL;
-}
-static
-int ctf_metadata_close_trace(struct bt_trace_descriptor *td)
-{
- int ret;
- struct ctf_text_stream_pos *pos =
- container_of(td, struct ctf_text_stream_pos, trace_descriptor);
+ babeltrace_ctf_console_output--;
if (pos->fp != stdout) {
ret = fclose(pos->fp);
if (ret) {
ctf_text_format.name = g_quark_from_static_string("text");
ret = bt_register_format(&ctf_text_format);
assert(!ret);
- ctf_metadata_format.name = g_quark_from_static_string("ctf-metadata");
- ret = bt_register_format(&ctf_metadata_format);
- assert(!ret);
}
static
void __attribute__((destructor)) ctf_text_exit(void)
{
- bt_unregister_format(&ctf_metadata_format);
bt_unregister_format(&ctf_text_format);
}