X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=6a24087447b6fb5738f643ef6f24f51df0211904;hp=d60b4353fc2c0d9bbdaaac45fbfb7e1475dd3b1d;hb=13fad8b6d8ad53a55baca25234a0c59aeff83a3b;hpb=cd0058c96bdb3b32291f19899576978bb0fb6a19 diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index d60b4353..6a240874 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 @@ -86,7 +94,7 @@ void ctf_set_handle(struct trace_descriptor *descriptor, struct bt_trace_handle *handle); static -void ctf_close_trace(struct trace_descriptor *descriptor); +int ctf_close_trace(struct trace_descriptor *descriptor); static uint64_t ctf_timestamp_begin(struct trace_descriptor *descriptor, struct bt_trace_handle *handle, enum bt_clock_type type); @@ -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; } @@ -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,27 +588,29 @@ 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; } /* @@ -900,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 (;;) { @@ -973,11 +988,20 @@ 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"); if (!*fp) { @@ -996,7 +1020,7 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td, 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; @@ -1006,7 +1030,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) { @@ -1017,7 +1041,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"); @@ -1027,6 +1052,8 @@ 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; @@ -1087,12 +1114,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; @@ -1132,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; } @@ -1210,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; } @@ -1302,12 +1338,12 @@ 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); + elem = bt_array_index(defarray, i); uuidval[i] = get_unsigned_int(elem); } ret = babeltrace_uuid_compare(td->uuid, uuidval); @@ -1482,7 +1518,7 @@ 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, int whence)) { - int ret, fd; + int ret, fd, closeret; struct ctf_file_stream *file_stream; struct stat statbuf; @@ -1516,7 +1552,9 @@ 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; @@ -1534,13 +1572,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; } @@ -1551,7 +1595,7 @@ int ctf_open_trace_read(struct ctf_trace *td, void (*packet_seek)(struct 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; @@ -1624,9 +1668,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; } @@ -1676,7 +1726,7 @@ error: return NULL; } - +static void ctf_init_mmap_pos(struct ctf_stream_pos *pos, struct mmap_stream *mmap_info) { @@ -1761,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, @@ -1882,19 +1933,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 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; @@ -1906,14 +1970,25 @@ void ctf_close_trace(struct trace_descriptor *tdp) 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); + ret = ctf_close_file_stream(file_stream); + if (ret) + return ret; } } } ctf_destroy_metadata(td); - close(td->dirfd); - closedir(td->dir); + 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