X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=93d13e8a5bc5bfcbfefe75529181fe5d41ab8fc0;hb=b086c01a10fc706dacf1a5a8ea2c4a8acfa0ee24;hp=b39b86906e506ffbbe8cc77619a9a90d01c0b5e6;hpb=c87a8eb2082fb480f17c63e56ffab6cbc9257680;p=babeltrace.git diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index b39b8690..93d13e8a 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -55,7 +55,9 @@ extern int yydebug; static -struct trace_descriptor *ctf_open_trace(const char *path, int flags); +struct trace_descriptor *ctf_open_trace(const char *path, int flags, + void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, + int whence)); static void ctf_close_trace(struct trace_descriptor *descriptor); @@ -97,7 +99,7 @@ void ctf_update_timestamp(struct ctf_stream *stream, integer_definition->declaration; uint64_t oldval, newval, updateval; - if (integer_declaration->len == 64) { + if (unlikely(integer_declaration->len == 64)) { stream->timestamp = integer_definition->value._unsigned; return; } @@ -127,17 +129,17 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream) ctf_pos_get_event(pos); - if (pos->offset == EOF) + if (unlikely(pos->offset == EOF)) return EOF; assert(pos->offset < pos->content_size); /* Read event header */ - if (stream->stream_event_header) { + if (likely(stream->stream_event_header)) { struct definition_integer *integer_definition; struct definition *variant; ret = generic_rw(ppos, &stream->stream_event_header->p); - if (ret) + if (unlikely(ret)) goto error; /* lookup event id */ integer_definition = lookup_integer(&stream->stream_event_header->p, "id", FALSE); @@ -185,12 +187,12 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream) goto error; } - if (id >= stream_class->events_by_id->len) { + if (unlikely(id >= stream_class->events_by_id->len)) { fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id); return -EINVAL; } event = g_ptr_array_index(stream->events_by_id, id); - if (!event) { + if (unlikely(!event)) { fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id); return -EINVAL; } @@ -203,7 +205,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream) } /* Read event payload */ - if (event->event_fields) { + if (likely(event->event_fields)) { ret = generic_rw(ppos, &event->event_fields->p); if (ret) goto error; @@ -227,7 +229,7 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream) id = stream->event_id; /* print event header */ - if (stream->stream_event_header) { + if (likely(stream->stream_event_header)) { ret = generic_rw(pos, &stream->stream_event_header->p); if (ret) goto error; @@ -240,12 +242,12 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream) goto error; } - if (id >= stream_class->events_by_id->len) { + if (unlikely(id >= stream_class->events_by_id->len)) { fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id); return -EINVAL; } event = g_ptr_array_index(stream->events_by_id, id); - if (!event) { + if (unlikely(!event)) { fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id); return -EINVAL; } @@ -258,7 +260,7 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream) } /* Read and print event payload */ - if (event->event_fields) { + if (likely(event->event_fields)) { ret = generic_rw(pos, &event->event_fields->p); if (ret) goto error; @@ -609,7 +611,9 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, } static -int ctf_open_trace_metadata_read(struct ctf_trace *td) +int ctf_open_trace_metadata_read(struct ctf_trace *td, + void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, + int whence)) { struct ctf_scanner *scanner; struct ctf_file_stream *metadata_stream; @@ -618,6 +622,15 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td) int ret = 0; metadata_stream = g_new0(struct ctf_file_stream, 1); + + if (move_pos_slow) { + metadata_stream->pos.move_pos_slow = move_pos_slow; + } else { + fprintf(stderr, "[error] move_pos_slow function undefined.\n"); + ret = -1; + goto end_stream; + } + td->metadata = &metadata_stream->parent; metadata_stream->pos.fd = openat(td->dirfd, "metadata", O_RDONLY); if (metadata_stream->pos.fd < 0) { @@ -1083,7 +1096,9 @@ error: * description (metadata). */ static -int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags) +int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags, + void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, + int whence)) { int ret; struct ctf_file_stream *file_stream; @@ -1092,6 +1107,15 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags) if (ret < 0) goto error; file_stream = g_new0(struct ctf_file_stream, 1); + + if (move_pos_slow) { + file_stream->pos.move_pos_slow = move_pos_slow; + } else { + fprintf(stderr, "[error] move_pos_slow function undefined.\n"); + ret = -1; + goto error_def; + } + ctf_init_pos(&file_stream->pos, ret, flags); ret = create_trace_definitions(td, &file_stream->parent); if (ret) @@ -1116,7 +1140,9 @@ error: } static -int ctf_open_trace_read(struct ctf_trace *td, const char *path, int flags) +int ctf_open_trace_read(struct ctf_trace *td, const char *path, int flags, + void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, + int whence)) { int ret; struct dirent *dirent; @@ -1144,7 +1170,7 @@ int ctf_open_trace_read(struct ctf_trace *td, const char *path, int flags) * Keep the metadata file separate. */ - ret = ctf_open_trace_metadata_read(td); + ret = ctf_open_trace_metadata_read(td, move_pos_slow); if (ret) { goto error_metadata; } @@ -1173,7 +1199,7 @@ int ctf_open_trace_read(struct ctf_trace *td, const char *path, int flags) || !strcmp(diriter->d_name, "..") || !strcmp(diriter->d_name, "metadata")) continue; - ret = ctf_open_file_stream_read(td, diriter->d_name, flags); + ret = ctf_open_file_stream_read(td, diriter->d_name, flags, move_pos_slow); if (ret) { fprintf(stdout, "[error] Open file stream error.\n"); goto readdir_error; @@ -1194,7 +1220,9 @@ error: } static -struct trace_descriptor *ctf_open_trace(const char *path, int flags) +struct trace_descriptor *ctf_open_trace(const char *path, int flags, + void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, + int whence)) { struct ctf_trace *td; int ret; @@ -1207,7 +1235,7 @@ struct trace_descriptor *ctf_open_trace(const char *path, int flags) fprintf(stdout, "[error] Path missing for input CTF trace.\n"); goto error; } - ret = ctf_open_trace_read(td, path, flags); + ret = ctf_open_trace_read(td, path, flags, move_pos_slow); if (ret) goto error; break;