X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=2411f7ff43e4afc3ede991396949d3d06a724e85;hp=a2403a77ab8d8906e18e59cb41d6a68684e2ba7a;hb=1b8455b701df7ac196e35795b9ab8ef2d402058d;hpb=86b06ede131de636cd9ee62ea79d37f86e75c257 diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index a2403a77..2411f7ff 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -16,6 +16,14 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include @@ -68,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 bt_trace_descriptor *ctf_open_mmap_trace( struct mmap_stream_list *mmap_list, - 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); 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 -void 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[] = { @@ -133,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; @@ -194,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; @@ -299,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) @@ -363,6 +372,7 @@ end: /* * Print timestamp, in cycles */ +static void ctf_print_timestamp_cycles(FILE *fp, struct ctf_stream_definition *stream, uint64_t timestamp) @@ -382,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); @@ -417,21 +427,21 @@ 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 { struct definition_enum *enum_definition; - enum_definition = lookup_enum(&stream->stream_event_header->p, "id", FALSE); + enum_definition = bt_lookup_enum(&stream->stream_event_header->p, "id", FALSE); if (enum_definition) { id = enum_definition->integer->value._unsigned; } } - 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; } @@ -440,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; @@ -494,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; @@ -548,7 +558,7 @@ error: return ret; } -void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags) +int ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags) { pos->fd = fd; if (fd >= 0) { @@ -578,34 +588,36 @@ void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags) default: assert(0); } + return 0; } -void ctf_fini_pos(struct ctf_stream_pos *pos) +int ctf_fini_pos(struct ctf_stream_pos *pos) { - int ret; - if (pos->prot == PROT_WRITE && pos->content_size_loc) *pos->content_size_loc = pos->offset; if (pos->base_mma) { + int ret; + /* unmap old base */ ret = munmap_align(pos->base_mma); if (ret) { fprintf(stderr, "[error] Unable to unmap old base: %s.\n", strerror(errno)); - assert(0); + return -1; } } if (pos->packet_cycles_index) (void) g_array_free(pos->packet_cycles_index, TRUE); if (pos->packet_real_index) (void) g_array_free(pos->packet_real_index, TRUE); + return 0; } /* * 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); @@ -699,6 +711,9 @@ void ctf_packet_seek(struct stream_pos *stream_pos, size_t index, int whence) break; } case SEEK_SET: + packet_index = &g_array_index(pos->packet_cycles_index, + struct packet_index, index); + pos->last_events_discarded = packet_index->events_discarded; pos->cur_index = index; file_stream->parent.prev_real_timestamp = 0; file_stream->parent.prev_real_timestamp_end = 0; @@ -897,6 +912,9 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, return -EINVAL; } + if ((header.content_size / CHAR_BIT) < header_sizeof(header)) + return -EINVAL; + toread = (header.content_size / CHAR_BIT) - header_sizeof(header); for (;;) { @@ -943,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; @@ -970,13 +988,27 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, /* close to flush the buffer */ ret = babeltrace_close_memstream(buf, &size, out); if (ret < 0) { + int closeret; + perror("babeltrace_flush_memstream"); - fclose(in); - return -errno; + ret = -errno; + closeret = fclose(in); + if (closeret) { + perror("Error in fclose"); + } + return ret; + } + ret = fclose(in); + if (ret) { + perror("Error in fclose"); } - fclose(in); /* 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; @@ -986,14 +1018,14 @@ 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; struct ctf_file_stream *metadata_stream; FILE *fp; char *buf = NULL; - int ret = 0; + int ret = 0, closeret; metadata_stream = g_new0(struct ctf_file_stream, 1); metadata_stream->pos.last_offset = LAST_OFFSET_POISON; @@ -1003,7 +1035,7 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td, } else { fprintf(stderr, "[error] packet_seek function undefined.\n"); ret = -1; - goto end_stream; + goto end_free; } if (metadata_fp) { @@ -1014,7 +1046,8 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td, metadata_stream->pos.fd = openat(td->dirfd, "metadata", O_RDONLY); if (metadata_stream->pos.fd < 0) { fprintf(stderr, "Unable to open metadata.\n"); - return metadata_stream->pos.fd; + ret = -1; + goto end_free; } fp = fdopen(metadata_stream->pos.fd, "r"); @@ -1024,14 +1057,19 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td, ret = -errno; goto end_stream; } + /* fd now belongs to fp */ + metadata_stream->pos.fd = -1; } if (babeltrace_debug) yydebug = 1; 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; @@ -1084,12 +1122,21 @@ end: ctf_scanner_free(scanner); end_scanner_alloc: end_packet_read: - if (fp) - fclose(fp); + if (fp) { + closeret = fclose(fp); + if (closeret) { + perror("Error on fclose"); + } + } free(buf); end_stream: - if (metadata_stream->pos.fd >= 0) - close(metadata_stream->pos.fd); + if (metadata_stream->pos.fd >= 0) { + closeret = close(metadata_stream->pos.fd); + if (closeret) { + perror("Error on metadata stream fd close"); + } + } +end_free: if (ret) g_free(metadata_stream); return ret; @@ -1129,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; } @@ -1207,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; } @@ -1264,6 +1311,7 @@ int create_stream_packet_index(struct ctf_trace *td, packet_index.timestamp_begin = 0; packet_index.timestamp_end = 0; packet_index.events_discarded = 0; + packet_index.events_discarded_len = 0; /* read and check header, set stream id (and check) */ if (file_stream->parent.trace_packet_header) { @@ -1271,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, @@ -1288,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) { @@ -1314,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); } } @@ -1351,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( @@ -1390,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( @@ -1405,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 */ @@ -1475,10 +1523,10 @@ 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; + int ret, fd, closeret; struct ctf_file_stream *file_stream; struct stat statbuf; @@ -1512,12 +1560,14 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags, goto error_def; } - ctf_init_pos(&file_stream->pos, fd, flags); + ret = ctf_init_pos(&file_stream->pos, fd, flags); + if (ret) + goto error_def; ret = create_trace_definitions(td, &file_stream->parent); if (ret) goto error_def; /* - * For now, only a single slock is supported. + * For now, only a single clock per trace is supported. */ file_stream->parent.current_clock = td->single_clock; ret = create_stream_packet_index(td, file_stream); @@ -1530,13 +1580,19 @@ 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: - ctf_fini_pos(&file_stream->pos); + closeret = ctf_fini_pos(&file_stream->pos); + if (closeret) { + fprintf(stderr, "Error on ctf_fini_pos\n"); + } g_free(file_stream); fd_is_dir_ok: fstat_error: - close(fd); + closeret = close(fd); + if (closeret) { + perror("Error on fd close"); + } error: return ret; } @@ -1544,10 +1600,10 @@ 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; + int ret, closeret; struct dirent *dirent; struct dirent *diriter; size_t dirent_len; @@ -1620,9 +1676,15 @@ int ctf_open_trace_read(struct ctf_trace *td, readdir_error: free(dirent); error_metadata: - close(td->dirfd); + closeret = close(td->dirfd); + if (closeret) { + perror("Error on fd close"); + } error_dirfd: - closedir(td->dir); + closeret = closedir(td->dir); + if (closeret) { + perror("Error on closedir"); + } error: return ret; } @@ -1633,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; @@ -1672,7 +1734,7 @@ error: return NULL; } - +static void ctf_init_mmap_pos(struct ctf_stream_pos *pos, struct mmap_stream *mmap_info) { @@ -1724,7 +1786,7 @@ 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, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence)) { int ret; @@ -1746,7 +1808,7 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td, goto error_index; /* - * For now, only a single slock is supported. + * For now, only a single clock per trace is supported. */ file_stream->parent.current_clock = td->single_clock; @@ -1757,15 +1819,16 @@ 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, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), FILE *metadata_fp) { @@ -1796,9 +1859,9 @@ error: } static -struct trace_descriptor *ctf_open_mmap_trace( +struct bt_trace_descriptor *ctf_open_mmap_trace( struct mmap_stream_list *mmap_list, - 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) { @@ -1828,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); @@ -1878,19 +1941,32 @@ int ctf_convert_index_timestamp(struct trace_descriptor *tdp) } static -void ctf_close_file_stream(struct ctf_file_stream *file_stream) +int ctf_close_file_stream(struct ctf_file_stream *file_stream) { - ctf_fini_pos(&file_stream->pos); - close(file_stream->pos.fd); + int ret; + + ret = ctf_fini_pos(&file_stream->pos); + if (ret) { + fprintf(stderr, "Error on ctf_fini_pos\n"); + return -1; + } + ret = close(file_stream->pos.fd); + if (ret) { + perror("Error closing file fd"); + return -1; + } + return 0; } static -void 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 i; + int ret; if (td->streams) { + int i; + for (i = 0; i < td->streams->len; i++) { struct ctf_stream_declaration *stream; int j; @@ -1900,41 +1976,31 @@ void ctf_close_trace(struct trace_descriptor *tdp) continue; for (j = 0; j < stream->streams->len; j++) { struct ctf_file_stream *file_stream; - file_stream = container_of(g_ptr_array_index(stream->streams, j), struct ctf_file_stream, parent); - ctf_close_file_stream(file_stream); + file_stream = container_of(g_ptr_array_index(stream->streams, j), + struct ctf_file_stream, parent); + ret = ctf_close_file_stream(file_stream); + if (ret) + return ret; } - - } - g_ptr_array_free(td->streams, TRUE); - } - - if (td->event_declarations) { - for (i = 0; i < td->event_declarations->len; i++) { - struct bt_ctf_event_decl *event; - - event = g_ptr_array_index(td->event_declarations, i); - if (event->context_decl) - g_ptr_array_free(event->context_decl, TRUE); - if (event->fields_decl) - g_ptr_array_free(event->fields_decl, TRUE); - if (event->packet_header_decl) - g_ptr_array_free(event->packet_header_decl, TRUE); - if (event->event_context_decl) - g_ptr_array_free(event->event_context_decl, TRUE); - if (event->event_header_decl) - g_ptr_array_free(event->event_header_decl, TRUE); - if (event->packet_context_decl) - g_ptr_array_free(event->packet_context_decl, TRUE); - g_free(event); } - g_ptr_array_free(td->event_declarations, TRUE); } - closedir(td->dir); + ctf_destroy_metadata(td); + ret = close(td->dirfd); + if (ret) { + perror("Error closing dirfd"); + return ret; + } + ret = closedir(td->dir); + if (ret) { + perror("Error closedir"); + return ret; + } g_free(td); + return 0; } 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, @@ -1944,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, @@ -1953,6 +2019,7 @@ void ctf_set_handle(struct trace_descriptor *descriptor, td->handle = handle; } +static void __attribute__((constructor)) ctf_init(void) { int ret; @@ -1962,4 +2029,8 @@ void __attribute__((constructor)) ctf_init(void) assert(!ret); } -/* TODO: finalize */ +static +void __attribute__((destructor)) ctf_exit(void) +{ + bt_unregister_format(&ctf_format); +}