X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=141f9bfae0c7c7dd040471d74c725fc97a622bc0;hb=eb897cf195d5f008bb29242d031990010aeace72;hp=16a7ba0fd66e831b0691b17f75a812ace6964017;hpb=731087d8e045649286a83aa9909b8b0d79b3368d;p=babeltrace.git diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index 16a7ba0f..141f9bfa 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -181,26 +181,24 @@ uint64_t ctf_timestamp_begin(struct bt_trace_descriptor *descriptor, parent); stream_pos = &cfs->pos; - if (!stream_pos->packet_real_index) + if (!stream_pos->packet_index) goto error; - if (stream_pos->packet_real_index->len <= 0) + if (stream_pos->packet_index->len <= 0) continue; + index = &g_array_index(stream_pos->packet_index, + struct packet_index, + stream_pos->packet_index->len - 1); if (type == BT_CLOCK_REAL) { - index = &g_array_index(stream_pos->packet_real_index, - struct packet_index, - stream_pos->packet_real_index->len - 1); + if (index->ts_real.timestamp_begin < begin) + begin = index->ts_real.timestamp_begin; } else if (type == BT_CLOCK_CYCLES) { - index = &g_array_index(stream_pos->packet_cycles_index, - struct packet_index, - stream_pos->packet_real_index->len - 1); - + if (index->ts_cycles.timestamp_begin < begin) + begin = index->ts_cycles.timestamp_begin; } else { goto error; } - if (index->timestamp_begin < begin) - begin = index->timestamp_begin; } } @@ -242,26 +240,24 @@ uint64_t ctf_timestamp_end(struct bt_trace_descriptor *descriptor, parent); stream_pos = &cfs->pos; - if (!stream_pos->packet_real_index) + if (!stream_pos->packet_index) goto error; - if (stream_pos->packet_real_index->len <= 0) + if (stream_pos->packet_index->len <= 0) continue; + index = &g_array_index(stream_pos->packet_index, + struct packet_index, + stream_pos->packet_index->len - 1); if (type == BT_CLOCK_REAL) { - index = &g_array_index(stream_pos->packet_real_index, - struct packet_index, - stream_pos->packet_real_index->len - 1); + if (index->ts_real.timestamp_end > end) + end = index->ts_real.timestamp_end; } else if (type == BT_CLOCK_CYCLES) { - index = &g_array_index(stream_pos->packet_cycles_index, - struct packet_index, - stream_pos->packet_real_index->len - 1); - + if (index->ts_cycles.timestamp_end > end) + end = index->ts_cycles.timestamp_end; } else { goto error; } - if (index->timestamp_end > end) - end = index->timestamp_end; } } @@ -472,12 +468,16 @@ int ctf_read_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *str if (unlikely(pos->offset == EOF)) return EOF; - if (pos->content_size == 0) { - /* Stream is inactive for now (live reading). */ + /* Stream is inactive for now (live reading). */ + if (unlikely(pos->content_size == 0)) return EAGAIN; - } - /* Packet only contains headers */ - if (pos->offset == pos->content_size) + + /* + * Packet seeked to by ctf_pos_get_event() only contains + * headers, no event. Consider stream as inactive (live + * reading). + */ + if (unlikely(pos->data_offset == pos->content_size)) return EAGAIN; assert(pos->offset < pos->content_size); @@ -733,13 +733,10 @@ int ctf_init_pos(struct ctf_stream_pos *pos, struct bt_trace_descriptor *trace, { pos->fd = fd; if (fd >= 0) { - pos->packet_cycles_index = g_array_new(FALSE, TRUE, - sizeof(struct packet_index)); - pos->packet_real_index = g_array_new(FALSE, TRUE, + pos->packet_index = g_array_new(FALSE, TRUE, sizeof(struct packet_index)); } else { - pos->packet_cycles_index = NULL; - pos->packet_real_index = NULL; + pos->packet_index = NULL; } switch (open_flags & O_ACCMODE) { case O_RDONLY: @@ -779,13 +776,47 @@ int ctf_fini_pos(struct ctf_stream_pos *pos) 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); + if (pos->packet_index) + (void) g_array_free(pos->packet_index, TRUE); return 0; } +void ctf_update_current_packet_index(struct ctf_stream_definition *stream, + struct packet_index *prev_index, + struct packet_index *cur_index) +{ + uint64_t events_discarded_diff; + + /* Update packet index time information */ + stream->prev_cycles_timestamp_end = + cur_index->ts_cycles.timestamp_end; + stream->prev_cycles_timestamp = + cur_index->ts_cycles.timestamp_begin; + stream->prev_real_timestamp_end = + cur_index->ts_real.timestamp_end; + stream->prev_real_timestamp = + cur_index->ts_real.timestamp_begin; + + stream->prev_real_timestamp = + stream->real_timestamp; + stream->prev_cycles_timestamp = + stream->cycles_timestamp; + + /* Update packet index discarded event information */ + events_discarded_diff = cur_index->events_discarded; + if (prev_index) { + events_discarded_diff -= prev_index->events_discarded; + /* + * Deal with 32-bit wrap-around if the tracer provided a + * 32-bit field. + */ + if (prev_index->events_discarded_len == 32) { + events_discarded_diff = (uint32_t) events_discarded_diff; + } + } + stream->events_discarded = events_discarded_diff; +} + /* * for SEEK_CUR: go to next packet. * for SEEK_SET: go to packet numer (index). @@ -850,56 +881,32 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) switch (whence) { case SEEK_CUR: { - uint64_t events_discarded_diff; + struct packet_index *prev_index = NULL; if (pos->offset == EOF) { return; } - assert(pos->cur_index < pos->packet_cycles_index->len); - assert(pos->cur_index < pos->packet_real_index->len); - - /* For printing discarded event count */ - packet_index = &g_array_index(pos->packet_cycles_index, + assert(pos->cur_index < pos->packet_index->len); + packet_index = &g_array_index(pos->packet_index, struct packet_index, pos->cur_index); - file_stream->parent.prev_cycles_timestamp_end = - packet_index->timestamp_end; - file_stream->parent.prev_cycles_timestamp = - packet_index->timestamp_begin; - - packet_index = &g_array_index(pos->packet_real_index, - struct packet_index, pos->cur_index); - file_stream->parent.prev_real_timestamp_end = - packet_index->timestamp_end; - file_stream->parent.prev_real_timestamp = - packet_index->timestamp_begin; - - events_discarded_diff = packet_index->events_discarded; if (pos->cur_index > 0) { - packet_index = &g_array_index(pos->packet_real_index, + prev_index = &g_array_index(pos->packet_index, struct packet_index, pos->cur_index - 1); - events_discarded_diff -= packet_index->events_discarded; - /* - * Deal with 32-bit wrap-around if the - * tracer provided a 32-bit field. - */ - if (packet_index->events_discarded_len == 32) { - events_discarded_diff = (uint32_t) events_discarded_diff; - } } - file_stream->parent.events_discarded = events_discarded_diff; - file_stream->parent.prev_real_timestamp = file_stream->parent.real_timestamp; - file_stream->parent.prev_cycles_timestamp = file_stream->parent.cycles_timestamp; + ctf_update_current_packet_index(&file_stream->parent, + prev_index, packet_index); + /* The reader will expect us to skip padding */ ++pos->cur_index; break; } case SEEK_SET: - if (index >= pos->packet_cycles_index->len) { + if (index >= pos->packet_index->len) { pos->offset = EOF; return; } - packet_index = &g_array_index(pos->packet_cycles_index, + packet_index = &g_array_index(pos->packet_index, struct packet_index, index); pos->last_events_discarded = packet_index->events_discarded; pos->cur_index = index; @@ -911,7 +918,7 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) default: assert(0); } - if (pos->cur_index >= pos->packet_real_index->len) { + if (pos->cur_index >= pos->packet_index->len) { /* * We need to check if we are in trace read or * called from packet indexing. In this last @@ -937,15 +944,12 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) pos->offset = EOF; return; } - packet_index = &g_array_index(pos->packet_cycles_index, + packet_index = &g_array_index(pos->packet_index, struct packet_index, pos->cur_index); - file_stream->parent.cycles_timestamp = packet_index->timestamp_begin; + file_stream->parent.cycles_timestamp = packet_index->ts_cycles.timestamp_begin; - packet_index = &g_array_index(pos->packet_real_index, - struct packet_index, - pos->cur_index); - file_stream->parent.real_timestamp = packet_index->timestamp_begin; + file_stream->parent.real_timestamp = packet_index->ts_real.timestamp_begin; /* Lookup context/packet size in index */ if (packet_index->data_offset == -1) { @@ -957,9 +961,10 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) pos->content_size = packet_index->content_size; pos->packet_size = packet_index->packet_size; pos->mmap_offset = packet_index->offset; - if (packet_index->data_offset < packet_index->content_size) { + pos->data_offset = packet_index->data_offset; + if (pos->data_offset < packet_index->content_size) { pos->offset = 0; /* will read headers */ - } else if (packet_index->data_offset == packet_index->content_size) { + } else if (pos->data_offset == packet_index->content_size) { /* empty packet */ pos->offset = packet_index->data_offset; whence = SEEK_CUR; @@ -1518,8 +1523,10 @@ begin: packet_index.offset = pos->mmap_offset; packet_index.content_size = 0; packet_index.packet_size = 0; - packet_index.timestamp_begin = 0; - packet_index.timestamp_end = 0; + packet_index.ts_real.timestamp_begin = 0; + packet_index.ts_real.timestamp_end = 0; + packet_index.ts_cycles.timestamp_begin = 0; + packet_index.ts_cycles.timestamp_end = 0; packet_index.events_discarded = 0; packet_index.events_discarded_len = 0; @@ -1543,7 +1550,7 @@ begin: if (magic != CTF_MAGIC) { fprintf(stderr, "[error] Invalid magic number 0x%" PRIX64 " at packet %u (file offset %zd).\n", magic, - file_stream->pos.packet_cycles_index->len, + file_stream->pos.packet_index->len, (ssize_t) pos->mmap_offset); return -EINVAL; } @@ -1635,12 +1642,12 @@ begin: struct bt_definition *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); + packet_index.ts_cycles.timestamp_begin = bt_get_unsigned_int(field); if (file_stream->parent.stream_class->trace->parent.collection) { - packet_index.timestamp_begin = + packet_index.ts_real.timestamp_begin = ctf_get_real_timestamp( &file_stream->parent, - packet_index.timestamp_begin); + packet_index.ts_cycles.timestamp_begin); } } @@ -1650,12 +1657,12 @@ begin: struct bt_definition *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); + packet_index.ts_cycles.timestamp_end = bt_get_unsigned_int(field); if (file_stream->parent.stream_class->trace->parent.collection) { - packet_index.timestamp_end = + packet_index.ts_real.timestamp_end = ctf_get_real_timestamp( &file_stream->parent, - packet_index.timestamp_end); + packet_index.ts_cycles.timestamp_end); } } @@ -1702,7 +1709,7 @@ begin: packet_index.data_offset = pos->offset; /* add index to packet array */ - g_array_append_val(file_stream->pos.packet_cycles_index, packet_index); + g_array_append_val(file_stream->pos.packet_index, packet_index); pos->mmap_offset += packet_index.packet_size >> LOG2_CHAR_BIT; @@ -1850,8 +1857,8 @@ int import_stream_packet_index(struct ctf_trace *td, index.offset = be64toh(ctf_index.offset); index.packet_size = be64toh(ctf_index.packet_size); index.content_size = be64toh(ctf_index.content_size); - index.timestamp_begin = be64toh(ctf_index.timestamp_begin); - index.timestamp_end = be64toh(ctf_index.timestamp_end); + index.ts_cycles.timestamp_begin = be64toh(ctf_index.timestamp_begin); + index.ts_cycles.timestamp_end = be64toh(ctf_index.timestamp_end); index.events_discarded = be64toh(ctf_index.events_discarded); index.events_discarded_len = 64; index.data_offset = -1; @@ -1859,7 +1866,7 @@ int import_stream_packet_index(struct ctf_trace *td, if (!first_packet) { /* add index to packet array */ - g_array_append_val(file_stream->pos.packet_cycles_index, index); + g_array_append_val(file_stream->pos.packet_index, index); continue; } @@ -1878,7 +1885,13 @@ int import_stream_packet_index(struct ctf_trace *td, goto error; first_packet = 0; /* add index to packet array */ - g_array_append_val(file_stream->pos.packet_cycles_index, index); + g_array_append_val(file_stream->pos.packet_index, index); + } + + /* Index containing only the header. */ + if (!file_stream->parent.stream_class) { + ret = -1; + goto error; } ret = 0; @@ -2182,13 +2195,13 @@ void ctf_init_mmap_pos(struct ctf_stream_pos *pos, pos->offset = 0; pos->dummy = false; pos->cur_index = 0; - pos->packet_cycles_index = NULL; - pos->packet_real_index = NULL; pos->prot = PROT_READ; pos->flags = MAP_PRIVATE; pos->parent.rw_table = read_dispatch_table; pos->parent.event_cb = ctf_read_event; pos->priv = mmap_info->priv; + pos->packet_index = g_array_new(FALSE, TRUE, + sizeof(struct packet_index)); } static @@ -2314,6 +2327,7 @@ struct bt_trace_descriptor *ctf_open_mmap_trace( goto error; } td = g_new0(struct ctf_trace, 1); + td->dirfd = -1; ret = ctf_open_mmap_trace_read(td, mmap_list, packet_seek, metadata_fp); if (ret) goto error_free; @@ -2351,25 +2365,20 @@ int ctf_convert_index_timestamp(struct bt_trace_descriptor *tdp) cfs = container_of(stream, struct ctf_file_stream, parent); stream_pos = &cfs->pos; - if (!stream_pos->packet_cycles_index) + if (!stream_pos->packet_index) continue; - for (k = 0; k < stream_pos->packet_cycles_index->len; k++) { + for (k = 0; k < stream_pos->packet_index->len; k++) { struct packet_index *index; - struct packet_index new_index; - index = &g_array_index(stream_pos->packet_cycles_index, + index = &g_array_index(stream_pos->packet_index, struct packet_index, k); - memcpy(&new_index, index, - sizeof(struct packet_index)); - new_index.timestamp_begin = + index->ts_real.timestamp_begin = ctf_get_real_timestamp(stream, - index->timestamp_begin); - new_index.timestamp_end = + index->ts_cycles.timestamp_begin); + index->ts_real.timestamp_end = ctf_get_real_timestamp(stream, - index->timestamp_end); - g_array_append_val(stream_pos->packet_real_index, - new_index); + index->ts_cycles.timestamp_end); } } } @@ -2386,10 +2395,12 @@ int ctf_close_file_stream(struct ctf_file_stream *file_stream) 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; + if (file_stream->pos.fd >= 0) { + ret = close(file_stream->pos.fd); + if (ret) { + perror("Error closing file fd"); + return -1; + } } return 0; } @@ -2421,15 +2432,19 @@ int ctf_close_trace(struct bt_trace_descriptor *tdp) } } ctf_destroy_metadata(td); - ret = close(td->dirfd); - if (ret) { - perror("Error closing dirfd"); - return ret; + if (td->dirfd >= 0) { + ret = close(td->dirfd); + if (ret) { + perror("Error closing dirfd"); + return ret; + } } - ret = closedir(td->dir); - if (ret) { - perror("Error closedir"); - return ret; + if (td->dir) { + ret = closedir(td->dir); + if (ret) { + perror("Error closedir"); + return ret; + } } free(td->metadata_string); g_free(td);