X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=45ab65ef92db54f365ec57b7655e0606e2291093;hp=ccc103c586d612cda7877e9168c6c5da22565a8e;hb=fe2b0e243a39ba31130512a1678ad46720bab9f3;hpb=f824ae0446c7a1ef3acd5d8e30c039c4ed7381ce diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index ccc103c5..45ab65ef 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 @@ -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) @@ -423,7 +433,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream_definition *stream } 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; } @@ -583,11 +593,11 @@ int ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags) 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) { @@ -902,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 (;;) { @@ -1028,7 +1041,6 @@ 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"); - g_free(metadata_stream); ret = -1; goto end_free; } @@ -1156,9 +1168,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; } @@ -1234,11 +1246,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; } @@ -1305,7 +1317,7 @@ int create_stream_packet_index(struct ctf_trace *td, uint64_t magic; field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index); - magic = get_unsigned_int(field); + 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,13 +1338,13 @@ int create_stream_packet_index(struct ctf_trace *td, field = 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) { @@ -1347,7 +1359,7 @@ int create_stream_packet_index(struct ctf_trace *td, struct definition *field; field = struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index); - stream_id = get_unsigned_int(field); + stream_id = bt_get_unsigned_int(field); } } @@ -1384,7 +1396,7 @@ int create_stream_packet_index(struct ctf_trace *td, 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); + 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; @@ -1396,7 +1408,7 @@ int create_stream_packet_index(struct ctf_trace *td, 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); + 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; @@ -1408,7 +1420,7 @@ int create_stream_packet_index(struct ctf_trace *td, 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); + 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( @@ -1423,7 +1435,7 @@ int create_stream_packet_index(struct ctf_trace *td, 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); + 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( @@ -1438,8 +1450,8 @@ int create_stream_packet_index(struct ctf_trace *td, 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); + 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 */ @@ -1560,7 +1572,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) { @@ -1714,7 +1726,7 @@ error: return NULL; } - +static void ctf_init_mmap_pos(struct ctf_stream_pos *pos, struct mmap_stream *mmap_info) { @@ -1799,12 +1811,13 @@ 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, @@ -1941,9 +1954,11 @@ static int ctf_close_trace(struct trace_descriptor *tdp) { struct ctf_trace *td = container_of(tdp, struct ctf_trace, parent); - int i, ret; + int ret; if (td->streams) { + int i; + for (i = 0; i < td->streams->len; i++) { struct ctf_stream_declaration *stream; int j;