X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=5911b19d25cdaa5f45735893a0771af1fbf42b6a;hp=f1c0de478ba7f5cc60a1c9e0ffa99555136eab49;hb=2715de36f53dbe1a631a757e8fd3f53b81784c26;hpb=5b80ddfb8dfa4db544efddcd8acaed1228f87daa diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index f1c0de47..5911b19d 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -65,12 +65,12 @@ extern int yydebug; static struct trace_descriptor *ctf_open_trace(const char *path, int flags, - void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, + void (*packet_seek)(struct stream_pos *pos, size_t offset, int whence), FILE *metadata_fp); static struct trace_descriptor *ctf_open_mmap_trace( struct mmap_stream_list *mmap_list, - void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, int whence), + void (*packet_seek)(struct stream_pos *pos, size_t offset, int whence), FILE *metadata_fp); static @@ -107,6 +107,9 @@ struct format ctf_format = { .close_trace = ctf_close_trace, }; +/* + * Update stream current timestamp, keep at clock frequency. + */ static void ctf_update_timestamp(struct ctf_stream *stream, struct definition_integer *integer_definition) @@ -134,6 +137,10 @@ void ctf_update_timestamp(struct ctf_stream *stream, stream->timestamp = updateval; } +/* + * Print timestamp, rescaling clock frequency to nanoseconds and + * applying offsets as needed (unix time). + */ void ctf_print_timestamp(FILE *fp, struct ctf_stream *stream, uint64_t timestamp) @@ -143,7 +150,12 @@ void ctf_print_timestamp(FILE *fp, struct trace_collection *tc = trace->collection; uint64_t tc_offset = tc->single_clock_offset_avg; - ts_nsec = timestamp; + if (stream->current_clock->freq == 1000000000ULL) { + ts_nsec = timestamp; + } else { + ts_nsec = (uint64_t) ((double) timestamp * 1000000000.0 + / (double) stream->current_clock->freq); + } /* Add offsets */ if (!opt_clock_raw) { @@ -217,6 +229,11 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream) ctf_pos_get_event(pos); + /* save the current position as a restore point */ + pos->last_offset = pos->offset; + /* we just read the event, it is consumed when used by the caller */ + stream->consumed = 0; + /* * This is the EOF check after we've advanced the position in * ctf_pos_get_event. @@ -394,7 +411,7 @@ void ctf_init_pos(struct ctf_stream_pos *pos, int fd, int open_flags) pos->parent.rw_table = write_dispatch_table; pos->parent.event_cb = ctf_write_event; if (fd >= 0) - ctf_move_pos_slow(pos, 0, SEEK_SET); /* position for write */ + ctf_packet_seek(&pos->parent, 0, SEEK_SET); /* position for write */ break; default: assert(0); @@ -419,8 +436,10 @@ void ctf_fini_pos(struct ctf_stream_pos *pos) (void) g_array_free(pos->packet_index, TRUE); } -void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence) +void ctf_packet_seek(struct stream_pos *stream_pos, size_t offset, int whence) { + struct ctf_stream_pos *pos = + container_of(stream_pos, struct ctf_stream_pos, parent); struct ctf_file_stream *file_stream = container_of(pos, struct ctf_file_stream, pos); int ret; @@ -495,8 +514,8 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence) break; } case SEEK_SET: - assert(offset == 0); /* only seek supported for now */ - pos->cur_index = 0; + if (offset == 0) + pos->cur_index = 0; file_stream->parent.prev_timestamp = 0; file_stream->parent.prev_timestamp_end = 0; break; @@ -751,7 +770,7 @@ 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 (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, + void (*packet_seek)(struct stream_pos *pos, size_t offset, int whence), FILE *metadata_fp) { struct ctf_scanner *scanner; @@ -762,10 +781,10 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td, metadata_stream = g_new0(struct ctf_file_stream, 1); - if (move_pos_slow) { - metadata_stream->pos.move_pos_slow = move_pos_slow; + if (packet_seek) { + metadata_stream->pos.packet_seek = packet_seek; } else { - fprintf(stderr, "[error] move_pos_slow function undefined.\n"); + fprintf(stderr, "[error] packet_seek function undefined.\n"); ret = -1; goto end_stream; } @@ -1168,14 +1187,14 @@ int create_stream_packet_index(struct ctf_trace *td, /* Validate content size and packet size values */ if (packet_index.content_size > packet_index.packet_size) { - fprintf(stderr, "[error] Content size (%zu bits) is larger than packet size (%zu bits).\n", + fprintf(stderr, "[error] Content size (%" PRIu64 " bits) is larger than packet size (%" PRIu64 " bits).\n", packet_index.content_size, packet_index.packet_size); return -EINVAL; } - if (packet_index.packet_size > (filestats.st_size - packet_index.offset) * CHAR_BIT) { - fprintf(stderr, "[error] Packet size (%zu bits) is larger than remaining file size (%zu bits).\n", - packet_index.content_size, (size_t) (filestats.st_size - packet_index.offset) * CHAR_BIT); + if (packet_index.packet_size > ((uint64_t)filestats.st_size - packet_index.offset) * CHAR_BIT) { + fprintf(stderr, "[error] Packet size (%" PRIu64 " bits) is larger than remaining file size (%" PRIu64 " bits).\n", + packet_index.content_size, ((uint64_t)filestats.st_size - packet_index.offset) * CHAR_BIT); return -EINVAL; } @@ -1189,7 +1208,7 @@ int create_stream_packet_index(struct ctf_trace *td, } /* Move pos back to beginning of file */ - ctf_move_pos_slow(pos, 0, SEEK_SET); /* position for write */ + ctf_packet_seek(&pos->parent, 0, SEEK_SET); /* position for write */ return 0; } @@ -1224,7 +1243,7 @@ error: */ static 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, + void (*packet_seek)(struct stream_pos *pos, size_t offset, int whence)) { int ret; @@ -1237,10 +1256,10 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags, } file_stream = g_new0(struct ctf_file_stream, 1); - if (move_pos_slow) { - file_stream->pos.move_pos_slow = move_pos_slow; + if (packet_seek) { + file_stream->pos.packet_seek = packet_seek; } else { - fprintf(stderr, "[error] move_pos_slow function undefined.\n"); + fprintf(stderr, "[error] packet_seek function undefined.\n"); ret = -1; goto error_def; } @@ -1249,6 +1268,10 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags, ret = create_trace_definitions(td, &file_stream->parent); if (ret) goto error_def; + /* + * For now, only a single slock is supported. + */ + file_stream->parent.current_clock = td->single_clock; ret = create_stream_packet_index(td, file_stream); if (ret) goto error_index; @@ -1271,7 +1294,7 @@ error: static 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, + void (*packet_seek)(struct stream_pos *pos, size_t offset, int whence), FILE *metadata_fp) { int ret; @@ -1303,7 +1326,7 @@ int ctf_open_trace_read(struct ctf_trace *td, * Keep the metadata file separate. */ - ret = ctf_open_trace_metadata_read(td, move_pos_slow, metadata_fp); + ret = ctf_open_trace_metadata_read(td, packet_seek, metadata_fp); if (ret) { goto error_metadata; } @@ -1332,7 +1355,8 @@ int ctf_open_trace_read(struct ctf_trace *td, || !strcmp(diriter->d_name, "..") || !strcmp(diriter->d_name, "metadata")) continue; - ret = ctf_open_file_stream_read(td, diriter->d_name, flags, move_pos_slow); + ret = ctf_open_file_stream_read(td, diriter->d_name, + flags, packet_seek); if (ret) { fprintf(stderr, "[error] Open file stream error.\n"); goto readdir_error; @@ -1354,12 +1378,18 @@ error: static struct trace_descriptor *ctf_open_trace(const char *path, int flags, - void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, + void (*packet_seek)(struct stream_pos *pos, size_t offset, int whence), FILE *metadata_fp) { struct ctf_trace *td; int ret; + /* + * If packet_seek is NULL, we provide our default version. + */ + if (!packet_seek) + packet_seek = ctf_packet_seek; + td = g_new0(struct ctf_trace, 1); switch (flags & O_ACCMODE) { @@ -1368,7 +1398,7 @@ struct trace_descriptor *ctf_open_trace(const char *path, int flags, fprintf(stderr, "[error] Path missing for input CTF trace.\n"); goto error; } - ret = ctf_open_trace_read(td, path, flags, move_pos_slow, metadata_fp); + ret = ctf_open_trace_read(td, path, flags, packet_seek, metadata_fp); if (ret) goto error; break; @@ -1437,7 +1467,7 @@ end: static int ctf_open_mmap_stream_read(struct ctf_trace *td, struct mmap_stream *mmap_info, - void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, + void (*packet_seek)(struct stream_pos *pos, size_t offset, int whence)) { int ret; @@ -1446,7 +1476,7 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td, file_stream = g_new0(struct ctf_file_stream, 1); ctf_init_mmap_pos(&file_stream->pos, mmap_info); - file_stream->pos.move_pos_slow = move_pos_slow; + file_stream->pos.packet_seek = packet_seek; ret = create_trace_definitions(td, &file_stream->parent); if (ret) { @@ -1472,14 +1502,14 @@ error_def: int ctf_open_mmap_trace_read(struct ctf_trace *td, struct mmap_stream_list *mmap_list, - void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, + void (*packet_seek)(struct stream_pos *pos, size_t offset, int whence), FILE *metadata_fp) { int ret; struct mmap_stream *mmap_info; - ret = ctf_open_trace_metadata_read(td, ctf_move_pos_slow, metadata_fp); + ret = ctf_open_trace_metadata_read(td, ctf_packet_seek, metadata_fp); if (ret) { goto error; } @@ -1488,8 +1518,8 @@ int ctf_open_mmap_trace_read(struct ctf_trace *td, * for each stream, try to open, check magic number, and get the * stream ID to add to the right location in the stream array. */ - cds_list_for_each_entry(mmap_info, &mmap_list->head, list) { - ret = ctf_open_mmap_stream_read(td, mmap_info, move_pos_slow); + bt_list_for_each_entry(mmap_info, &mmap_list->head, list) { + ret = ctf_open_mmap_stream_read(td, mmap_info, packet_seek); if (ret) { fprintf(stderr, "[error] Open file mmap stream error.\n"); goto error; @@ -1505,7 +1535,7 @@ error: static struct trace_descriptor *ctf_open_mmap_trace( struct mmap_stream_list *mmap_list, - void (*move_pos_slow)(struct ctf_stream_pos *pos, size_t offset, int whence), + void (*packet_seek)(struct stream_pos *pos, size_t offset, int whence), FILE *metadata_fp) { struct ctf_trace *td; @@ -1516,12 +1546,12 @@ struct trace_descriptor *ctf_open_mmap_trace( "required for mmap parsing\n"); goto error; } - if (!move_pos_slow) { - fprintf(stderr, "[error] move_pos_slow function undefined.\n"); + if (!packet_seek) { + fprintf(stderr, "[error] packet_seek function undefined.\n"); goto error; } td = g_new0(struct ctf_trace, 1); - ret = ctf_open_mmap_trace_read(td, mmap_list, move_pos_slow, metadata_fp); + ret = ctf_open_mmap_trace_read(td, mmap_list, packet_seek, metadata_fp); if (ret) goto error_free;