};
static
-struct format ctf_format = {
+struct bt_format ctf_format = {
.open_trace = ctf_open_trace,
.open_mmap_trace = ctf_open_mmap_trace,
.close_trace = ctf_close_trace,
}
}
+static
+void print_uuid(FILE *fp, unsigned char *uuid)
+{
+ int i;
+
+ for (i = 0; i < BABELTRACE_UUID_LEN; i++)
+ fprintf(fp, "%x", (unsigned int) uuid[i]);
+}
+
+void ctf_print_discarded(FILE *fp, struct ctf_stream_definition *stream,
+ int end_stream)
+{
+ fprintf(fp, "[warning] Tracer discarded %" PRIu64 " events %sbetween [",
+ stream->events_discarded,
+ end_stream ? "at end of stream " : "");
+ if (opt_clock_cycles) {
+ ctf_print_timestamp(fp, stream,
+ stream->prev_cycles_timestamp);
+ fprintf(fp, "] and [");
+ ctf_print_timestamp(fp, stream,
+ stream->prev_cycles_timestamp_end);
+ } else {
+ ctf_print_timestamp(fp, stream,
+ stream->prev_real_timestamp);
+ fprintf(fp, "] and [");
+ ctf_print_timestamp(fp, stream,
+ stream->prev_real_timestamp_end);
+ }
+ fprintf(fp, "] in trace UUID ");
+ print_uuid(fp, stream->stream_class->trace->uuid);
+ if (stream->stream_class->trace->path[0])
+ fprintf(fp, ", at path: \"%s\"",
+ stream->stream_class->trace->path);
+
+ fprintf(fp, ", within stream id %" PRIu64, stream->stream_id);
+ if (stream->path[0])
+ fprintf(fp, ", at relative path: \"%s\"", stream->path);
+ fprintf(fp, ". ");
+ fprintf(fp, "You should consider recording a new trace with larger "
+ "buffers or with fewer events enabled.\n");
+ fflush(fp);
+}
+
static
int ctf_read_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *stream)
{
/* Read event header */
if (likely(stream->stream_event_header)) {
struct definition_integer *integer_definition;
- struct definition *variant;
+ struct bt_definition *variant;
ret = generic_rw(ppos, &stream->stream_event_header->p);
if (unlikely(ret))
}
if (pos->cur_index >= pos->packet_real_index->len) {
/*
- * When a stream reaches the end of the
- * file, we need to show the number of
- * events discarded ourselves, because
- * there is no next event scheduled to
- * be printed in the output.
+ * We need to check if we are in trace read or
+ * called from packet indexing. In this last
+ * case, the collection is not there, so we
+ * cannot print the timestamps.
*/
- if (file_stream->parent.events_discarded) {
+ if ((&file_stream->parent)->stream_class->trace->collection) {
/*
- * We need to check if we are in trace
- * read or called from packet indexing.
- * In this last case, the collection is
- * not there, so we cannot print the
- * timestamps.
+ * When a stream reaches the end of the
+ * file, we need to show the number of
+ * events discarded ourselves, because
+ * there is no next event scheduled to
+ * be printed in the output.
*/
- if ((&file_stream->parent)->stream_class->trace->collection) {
+ if (file_stream->parent.events_discarded) {
fflush(stdout);
- fprintf(stderr, "[warning] Tracer discarded %" PRIu64 " events at end of stream between [",
- file_stream->parent.events_discarded);
- if (opt_clock_cycles) {
- ctf_print_timestamp(stderr,
- &file_stream->parent,
- file_stream->parent.prev_cycles_timestamp);
- fprintf(stderr, "] and [");
- ctf_print_timestamp(stderr, &file_stream->parent,
- file_stream->parent.prev_cycles_timestamp_end);
- } else {
- ctf_print_timestamp(stderr,
- &file_stream->parent,
- file_stream->parent.prev_real_timestamp);
- fprintf(stderr, "] and [");
- ctf_print_timestamp(stderr, &file_stream->parent,
- file_stream->parent.prev_real_timestamp_end);
- }
- fprintf(stderr, "]. You should consider recording a new trace with larger buffers or with fewer events enabled.\n");
- fflush(stderr);
+ ctf_print_discarded(stderr,
+ &file_stream->parent,
+ 1);
+ file_stream->parent.events_discarded = 0;
}
- file_stream->parent.events_discarded = 0;
}
pos->offset = EOF;
return;
fprintf(stderr, "[warning] Empty metadata.\n");
goto end_packet_read;
}
+ td->metadata_string = buf;
+ td->metadata_packetized = 1;
} else {
unsigned int major, minor;
ssize_t nr_items;
perror("Error on fclose");
}
}
- free(buf);
end_stream:
if (metadata_stream->pos.fd >= 0) {
closeret = close(metadata_stream->pos.fd);
struct ctf_event_definition *stream_event = g_new0(struct ctf_event_definition, 1);
if (event->context_decl) {
- struct definition *definition =
+ struct bt_definition *definition =
event->context_decl->p.definition_new(&event->context_decl->p,
stream->parent_def_scope, 0, 0, "event.context");
if (!definition) {
stream->parent_def_scope = stream_event->event_context->p.scope;
}
if (event->fields_decl) {
- struct definition *definition =
+ struct bt_definition *definition =
event->fields_decl->p.definition_new(&event->fields_decl->p,
stream->parent_def_scope, 0, 0, "event.fields");
if (!definition) {
stream_class = stream->stream_class;
if (stream_class->packet_context_decl) {
- struct definition *definition =
+ struct bt_definition *definition =
stream_class->packet_context_decl->p.definition_new(&stream_class->packet_context_decl->p,
stream->parent_def_scope, 0, 0, "stream.packet.context");
if (!definition) {
stream->parent_def_scope = stream->stream_packet_context->p.scope;
}
if (stream_class->event_header_decl) {
- struct definition *definition =
+ struct bt_definition *definition =
stream_class->event_header_decl->p.definition_new(&stream_class->event_header_decl->p,
stream->parent_def_scope, 0, 0, "stream.event.header");
if (!definition) {
stream->parent_def_scope = stream->stream_event_header->p.scope;
}
if (stream_class->event_context_decl) {
- struct definition *definition =
+ struct bt_definition *definition =
stream_class->event_context_decl->p.definition_new(&stream_class->event_context_decl->p,
stream->parent_def_scope, 0, 0, "stream.event.context");
if (!definition) {
return ret;
len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("magic"));
if (len_index >= 0) {
- struct definition *field;
+ struct bt_definition *field;
uint64_t magic;
field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("uuid"));
if (len_index >= 0) {
struct definition_array *defarray;
- struct definition *field;
+ struct bt_definition *field;
uint64_t i;
uint8_t uuidval[BABELTRACE_UUID_LEN];
assert(bt_array_len(defarray) == BABELTRACE_UUID_LEN);
for (i = 0; i < BABELTRACE_UUID_LEN; i++) {
- struct definition *elem;
+ struct bt_definition *elem;
elem = bt_array_index(defarray, i);
uuidval[i] = bt_get_unsigned_int(elem);
len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("stream_id"));
if (len_index >= 0) {
- struct definition *field;
+ struct bt_definition *field;
field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index);
stream_id = bt_get_unsigned_int(field);
}
if (!first_packet && file_stream->parent.stream_id != stream_id) {
- fprintf(stderr, "[error] Stream ID is changing within a stream.\n");
+ fprintf(stderr, "[error] Stream ID is changing within a stream: expecting %" PRIu64 ", but packet has %" PRIu64 "\n",
+ stream_id,
+ file_stream->parent.stream_id);
return -EINVAL;
}
if (first_packet) {
/* read content size from header */
len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
if (len_index >= 0) {
- struct definition *field;
+ struct bt_definition *field;
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
packet_index.content_size = bt_get_unsigned_int(field);
/* read packet size from header */
len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
if (len_index >= 0) {
- struct definition *field;
+ struct bt_definition *field;
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
packet_index.packet_size = bt_get_unsigned_int(field);
/* read timestamp begin from header */
len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_begin"));
if (len_index >= 0) {
- struct definition *field;
+ struct bt_definition *field;
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
packet_index.timestamp_begin = bt_get_unsigned_int(field);
/* read timestamp end from header */
len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_end"));
if (len_index >= 0) {
- struct definition *field;
+ struct bt_definition *field;
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
packet_index.timestamp_end = bt_get_unsigned_int(field);
/* read events discarded from header */
len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("events_discarded"));
if (len_index >= 0) {
- struct definition *field;
+ struct bt_definition *field;
field = bt_struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index);
packet_index.events_discarded = bt_get_unsigned_int(field);
int ret;
if (td->packet_header_decl) {
- struct definition *definition =
+ struct bt_definition *definition =
td->packet_header_decl->p.definition_new(&td->packet_header_decl->p,
stream->parent_def_scope, 0, 0, "trace.packet.header");
if (!definition) {
file_stream = g_new0(struct ctf_file_stream, 1);
file_stream->pos.last_offset = LAST_OFFSET_POISON;
+ strncpy(file_stream->parent.path, path, PATH_MAX);
+ file_stream->parent.path[PATH_MAX - 1] = '\0';
+
if (packet_seek) {
file_stream->pos.packet_seek = packet_seek;
} else {
perror("Error closedir");
return ret;
}
+ free(td->metadata_string);
g_free(td);
return 0;
}
projects / babeltrace.git / blobdiff