X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=3bd1cc1e2b454ce190102c4924eb1bb7fba49176;hp=a8f8408910c0b32ab0931b3f9581f89d751227dd;hb=c150f912b9a128f830d7a0fe42141ae1c9bec1ae;hpb=9e3274b092343c999fcde33854d2df37b3702496 diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index a8f84089..3bd1cc1e 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -76,33 +76,33 @@ uint64_t opt_clock_offset; extern int yydebug; static -struct trace_descriptor *ctf_open_trace(const char *path, int flags, - void (*packet_seek)(struct stream_pos *pos, size_t index, +struct bt_trace_descriptor *ctf_open_trace(const char *path, int flags, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), FILE *metadata_fp); static -struct trace_descriptor *ctf_open_mmap_trace( - struct mmap_stream_list *mmap_list, - void (*packet_seek)(struct stream_pos *pos, size_t index, +struct bt_trace_descriptor *ctf_open_mmap_trace( + struct bt_mmap_stream_list *mmap_list, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), FILE *metadata_fp); static -void ctf_set_context(struct trace_descriptor *descriptor, +void ctf_set_context(struct bt_trace_descriptor *descriptor, struct bt_context *ctx); static -void ctf_set_handle(struct trace_descriptor *descriptor, +void ctf_set_handle(struct bt_trace_descriptor *descriptor, struct bt_trace_handle *handle); static -int ctf_close_trace(struct trace_descriptor *descriptor); +int ctf_close_trace(struct bt_trace_descriptor *descriptor); static -uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor, +uint64_t ctf_timestamp_begin(struct bt_trace_descriptor *descriptor, struct bt_trace_handle *handle, enum bt_clock_type type); static -uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor, +uint64_t ctf_timestamp_end(struct bt_trace_descriptor *descriptor, struct bt_trace_handle *handle, enum bt_clock_type type); static -int ctf_convert_index_timestamp(struct trace_descriptor *tdp); +int ctf_convert_index_timestamp(struct bt_trace_descriptor *tdp); static rw_dispatch read_dispatch_table[] = { @@ -141,7 +141,7 @@ struct format ctf_format = { }; static -uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor, +uint64_t ctf_timestamp_begin(struct bt_trace_descriptor *descriptor, struct bt_trace_handle *handle, enum bt_clock_type type) { struct ctf_trace *tin; @@ -202,7 +202,7 @@ error: } static -uint64_t ctf_timestamp_end(struct trace_descriptor *descriptor, +uint64_t ctf_timestamp_end(struct bt_trace_descriptor *descriptor, struct bt_trace_handle *handle, enum bt_clock_type type) { struct ctf_trace *tin; @@ -307,6 +307,7 @@ void ctf_update_timestamp(struct ctf_stream_definition *stream, * Print timestamp, rescaling clock frequency to nanoseconds and * applying offsets as needed (unix time). */ +static void ctf_print_timestamp_real(FILE *fp, struct ctf_stream_definition *stream, uint64_t timestamp) @@ -371,6 +372,7 @@ end: /* * Print timestamp, in cycles */ +static void ctf_print_timestamp_cycles(FILE *fp, struct ctf_stream_definition *stream, uint64_t timestamp) @@ -390,7 +392,7 @@ void ctf_print_timestamp(FILE *fp, } static -int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream) +int ctf_read_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *stream) { struct ctf_stream_pos *pos = container_of(ppos, struct ctf_stream_pos, parent); @@ -425,7 +427,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream if (unlikely(ret)) goto error; /* lookup event id */ - integer_definition = lookup_integer(&stream->stream_event_header->p, "id", FALSE); + integer_definition = bt_lookup_integer(&stream->stream_event_header->p, "id", FALSE); if (integer_definition) { id = integer_definition->value._unsigned; } else { @@ -437,9 +439,9 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream } } - variant = lookup_variant(&stream->stream_event_header->p, "v"); + variant = bt_lookup_variant(&stream->stream_event_header->p, "v"); if (variant) { - integer_definition = lookup_integer(variant, "id", FALSE); + integer_definition = bt_lookup_integer(variant, "id", FALSE); if (integer_definition) { id = integer_definition->value._unsigned; } @@ -448,13 +450,13 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream /* lookup timestamp */ stream->has_timestamp = 0; - integer_definition = lookup_integer(&stream->stream_event_header->p, "timestamp", FALSE); + integer_definition = bt_lookup_integer(&stream->stream_event_header->p, "timestamp", FALSE); if (integer_definition) { ctf_update_timestamp(stream, integer_definition); stream->has_timestamp = 1; } else { if (variant) { - integer_definition = lookup_integer(variant, "timestamp", FALSE); + integer_definition = bt_lookup_integer(variant, "timestamp", FALSE); if (integer_definition) { ctf_update_timestamp(stream, integer_definition); stream->has_timestamp = 1; @@ -502,7 +504,7 @@ error: } static -int ctf_write_event(struct stream_pos *pos, struct ctf_stream_definition *stream) +int ctf_write_event(struct bt_stream_pos *pos, struct ctf_stream_definition *stream) { struct ctf_stream_declaration *stream_class = stream->stream_class; struct ctf_event_definition *event; @@ -615,7 +617,7 @@ int ctf_fini_pos(struct ctf_stream_pos *pos) * for SEEK_CUR: go to next packet. * for SEEK_POS: go to packet numer (index). */ -void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, int whence) +void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) { struct ctf_stream_pos *pos = container_of(stream_pos, struct ctf_stream_pos, parent); @@ -959,7 +961,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, char **buf) { FILE *in, *out; - size_t size; + size_t size, buflen; int ret; in = *fp; @@ -1001,7 +1003,12 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, perror("Error in fclose"); } /* open for reading */ - *fp = babeltrace_fmemopen(*buf, strlen(*buf), "rb"); + buflen = strlen(*buf); + if (!buflen) { + *fp = NULL; + return -ENODATA; + } + *fp = babeltrace_fmemopen(*buf, buflen, "rb"); if (!*fp) { perror("Metadata fmemopen"); return -errno; @@ -1011,7 +1018,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, static int ctf_open_trace_metadata_read(struct ctf_trace *td, - void (*packet_seek)(struct stream_pos *pos, size_t index, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), FILE *metadata_fp) { struct ctf_scanner *scanner; @@ -1058,8 +1065,11 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td, if (packet_metadata(td, fp)) { ret = ctf_open_trace_metadata_stream_read(td, &fp, &buf); - if (ret) + if (ret) { + /* Warn about empty metadata */ + fprintf(stderr, "[warning] Empty metadata.\n"); goto end_packet_read; + } } else { unsigned int major, minor; ssize_t nr_items; @@ -1166,9 +1176,9 @@ struct ctf_event_definition *create_event_definitions(struct ctf_trace *td, error: if (stream_event->event_fields) - definition_unref(&stream_event->event_fields->p); + bt_definition_unref(&stream_event->event_fields->p); if (stream_event->event_context) - definition_unref(&stream_event->event_context->p); + bt_definition_unref(&stream_event->event_context->p); return NULL; } @@ -1244,11 +1254,11 @@ error_event: g_ptr_array_free(stream->events_by_id, TRUE); error: if (stream->stream_event_context) - definition_unref(&stream->stream_event_context->p); + bt_definition_unref(&stream->stream_event_context->p); if (stream->stream_event_header) - definition_unref(&stream->stream_event_header->p); + bt_definition_unref(&stream->stream_event_header->p); if (stream->stream_packet_context) - definition_unref(&stream->stream_packet_context->p); + bt_definition_unref(&stream->stream_packet_context->p); return ret; } @@ -1309,13 +1319,13 @@ int create_stream_packet_index(struct ctf_trace *td, ret = generic_rw(&pos->parent, &file_stream->parent.trace_packet_header->p); if (ret) return ret; - len_index = struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("magic")); + 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; uint64_t magic; - field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index); - magic = get_unsigned_int(field); + field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index); + magic = bt_get_unsigned_int(field); if (magic != CTF_MAGIC) { fprintf(stderr, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n", magic, @@ -1326,23 +1336,23 @@ int create_stream_packet_index(struct ctf_trace *td, } /* check uuid */ - len_index = struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("uuid")); + 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; uint64_t i; uint8_t uuidval[BABELTRACE_UUID_LEN]; - field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index); + field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index); assert(field->declaration->id == CTF_TYPE_ARRAY); defarray = container_of(field, struct definition_array, p); - assert(array_len(defarray) == BABELTRACE_UUID_LEN); + assert(bt_array_len(defarray) == BABELTRACE_UUID_LEN); for (i = 0; i < BABELTRACE_UUID_LEN; i++) { struct definition *elem; - elem = array_index(defarray, i); - uuidval[i] = get_unsigned_int(elem); + elem = bt_array_index(defarray, i); + uuidval[i] = bt_get_unsigned_int(elem); } ret = babeltrace_uuid_compare(td->uuid, uuidval); if (ret) { @@ -1352,12 +1362,12 @@ int create_stream_packet_index(struct ctf_trace *td, } - len_index = struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("stream_id")); + 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; - field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index); - stream_id = get_unsigned_int(field); + field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index); + stream_id = bt_get_unsigned_int(field); } } @@ -1389,36 +1399,36 @@ int create_stream_packet_index(struct ctf_trace *td, if (ret) return ret; /* read content size from header */ - len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size")); + 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; - field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index); - packet_index.content_size = get_unsigned_int(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); } else { /* Use file size for packet size */ packet_index.content_size = filestats.st_size * CHAR_BIT; } /* read packet size from header */ - len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size")); + 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; - field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index); - packet_index.packet_size = get_unsigned_int(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); } else { /* Use content size if non-zero, else file size */ packet_index.packet_size = packet_index.content_size ? : filestats.st_size * CHAR_BIT; } /* read timestamp begin from header */ - len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_begin")); + 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; - field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index); - packet_index.timestamp_begin = get_unsigned_int(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); if (file_stream->parent.stream_class->trace->collection) { packet_index.timestamp_begin = ctf_get_real_timestamp( @@ -1428,12 +1438,12 @@ int create_stream_packet_index(struct ctf_trace *td, } /* read timestamp end from header */ - len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_end")); + 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; - field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index); - packet_index.timestamp_end = get_unsigned_int(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); if (file_stream->parent.stream_class->trace->collection) { packet_index.timestamp_end = ctf_get_real_timestamp( @@ -1443,13 +1453,13 @@ int create_stream_packet_index(struct ctf_trace *td, } /* read events discarded from header */ - len_index = struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("events_discarded")); + 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; - field = struct_definition_get_field_from_index(file_stream->parent.stream_packet_context, len_index); - packet_index.events_discarded = get_unsigned_int(field); - packet_index.events_discarded_len = get_int_len(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); + packet_index.events_discarded_len = bt_get_int_len(field); } } else { /* Use file size for packet size */ @@ -1513,7 +1523,7 @@ error: */ static int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags, - void (*packet_seek)(struct stream_pos *pos, size_t index, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence)) { int ret, fd, closeret; @@ -1570,7 +1580,7 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags, error_index: if (file_stream->parent.trace_packet_header) - definition_unref(&file_stream->parent.trace_packet_header->p); + bt_definition_unref(&file_stream->parent.trace_packet_header->p); error_def: closeret = ctf_fini_pos(&file_stream->pos); if (closeret) { @@ -1590,7 +1600,7 @@ error: static int ctf_open_trace_read(struct ctf_trace *td, const char *path, int flags, - void (*packet_seek)(struct stream_pos *pos, size_t index, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), FILE *metadata_fp) { int ret, closeret; @@ -1685,8 +1695,8 @@ error: * since the index creation read it entirely. */ static -struct trace_descriptor *ctf_open_trace(const char *path, int flags, - void (*packet_seek)(struct stream_pos *pos, size_t index, +struct bt_trace_descriptor *ctf_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_trace *td; @@ -1724,9 +1734,9 @@ error: return NULL; } - +static void ctf_init_mmap_pos(struct ctf_stream_pos *pos, - struct mmap_stream *mmap_info) + struct bt_mmap_stream *mmap_info) { pos->mmap_offset = 0; pos->packet_size = 0; @@ -1775,8 +1785,8 @@ end: static int ctf_open_mmap_stream_read(struct ctf_trace *td, - struct mmap_stream *mmap_info, - void (*packet_seek)(struct stream_pos *pos, size_t index, + struct bt_mmap_stream *mmap_info, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence)) { int ret; @@ -1809,20 +1819,21 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td, error_index: if (file_stream->parent.trace_packet_header) - definition_unref(&file_stream->parent.trace_packet_header->p); + bt_definition_unref(&file_stream->parent.trace_packet_header->p); error_def: g_free(file_stream); return ret; } +static int ctf_open_mmap_trace_read(struct ctf_trace *td, - struct mmap_stream_list *mmap_list, - void (*packet_seek)(struct stream_pos *pos, size_t index, + struct bt_mmap_stream_list *mmap_list, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), FILE *metadata_fp) { int ret; - struct mmap_stream *mmap_info; + struct bt_mmap_stream *mmap_info; ret = ctf_open_trace_metadata_read(td, ctf_packet_seek, metadata_fp); if (ret) { @@ -1848,9 +1859,9 @@ error: } static -struct trace_descriptor *ctf_open_mmap_trace( - struct mmap_stream_list *mmap_list, - void (*packet_seek)(struct stream_pos *pos, size_t index, +struct bt_trace_descriptor *ctf_open_mmap_trace( + struct bt_mmap_stream_list *mmap_list, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), FILE *metadata_fp) { @@ -1880,7 +1891,7 @@ error: } static -int ctf_convert_index_timestamp(struct trace_descriptor *tdp) +int ctf_convert_index_timestamp(struct bt_trace_descriptor *tdp) { int i, j, k; struct ctf_trace *td = container_of(tdp, struct ctf_trace, parent); @@ -1948,7 +1959,7 @@ int ctf_close_file_stream(struct ctf_file_stream *file_stream) } static -int ctf_close_trace(struct trace_descriptor *tdp) +int ctf_close_trace(struct bt_trace_descriptor *tdp) { struct ctf_trace *td = container_of(tdp, struct ctf_trace, parent); int ret; @@ -1989,7 +2000,7 @@ int ctf_close_trace(struct trace_descriptor *tdp) } static -void ctf_set_context(struct trace_descriptor *descriptor, +void ctf_set_context(struct bt_trace_descriptor *descriptor, struct bt_context *ctx) { struct ctf_trace *td = container_of(descriptor, struct ctf_trace, @@ -1999,7 +2010,7 @@ void ctf_set_context(struct trace_descriptor *descriptor, } static -void ctf_set_handle(struct trace_descriptor *descriptor, +void ctf_set_handle(struct bt_trace_descriptor *descriptor, struct bt_trace_handle *handle) { struct ctf_trace *td = container_of(descriptor, struct ctf_trace,