#include <babeltrace/ctf/metadata.h>
#include <babeltrace/babeltrace-internal.h>
#include <babeltrace/ctf/events-internal.h>
+#include <babeltrace/trace-debuginfo.h>
#include <inttypes.h>
#include <sys/mman.h>
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
-#define NSEC_PER_SEC 1000000000ULL
+#define NSEC_PER_SEC 1000000000LL
int opt_all_field_names,
opt_scope_field_names,
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->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);
+
+ babeltrace_ctf_console_output--;
if (pos->fp != stdout) {
ret = fclose(pos->fp);
if (ret) {