X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=597e8d25f9e97baf2852d468a2422d3ae7aa377a;hb=7e3e3582f6fc79c97b07fad7fa7019e8a80aeb0e;hp=e31808c3843d27380a63b0d173a949aa027e336e;hpb=2654fe9bab8f0eaeb17264ef7abadfd14e245b23;p=babeltrace.git diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index e31808c3..597e8d25 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -27,6 +27,7 @@ */ #include +#include #include #include #include @@ -35,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -53,6 +55,7 @@ #include "metadata/ctf-ast.h" #include "events-private.h" #include +#include #define LOG2_CHAR_BIT 3 @@ -66,11 +69,7 @@ */ #define WRITE_PACKET_LEN (getpagesize() * 8 * CHAR_BIT) -#ifndef min -#define min(a, b) (((a) < (b)) ? (a) : (b)) -#endif - -#define NSEC_PER_SEC 1000000000ULL +#define NSEC_PER_SEC 1000000000LL #define INDEX_PATH "./index/%s.idx" @@ -79,10 +78,12 @@ int opt_clock_cycles, opt_clock_date, opt_clock_gmt; -uint64_t opt_clock_offset; -uint64_t opt_clock_offset_ns; +int64_t opt_clock_offset; +int64_t opt_clock_offset_ns; extern int yydebug; +char *opt_debug_info_dir; +char *opt_debug_info_target_prefix; /* * TODO: babeltrace_ctf_console_output ensures that we only print @@ -112,36 +113,38 @@ void ctf_set_handle(struct bt_trace_descriptor *descriptor, static int ctf_close_trace(struct bt_trace_descriptor *descriptor); static -uint64_t ctf_timestamp_begin(struct bt_trace_descriptor *descriptor, - struct bt_trace_handle *handle, enum bt_clock_type type); +int ctf_timestamp_begin(struct bt_trace_descriptor *descriptor, + struct bt_trace_handle *handle, enum bt_clock_type type, + int64_t *timestamp); static -uint64_t ctf_timestamp_end(struct bt_trace_descriptor *descriptor, - struct bt_trace_handle *handle, enum bt_clock_type type); +int ctf_timestamp_end(struct bt_trace_descriptor *descriptor, + struct bt_trace_handle *handle, enum bt_clock_type type, + int64_t *timestamp); static int ctf_convert_index_timestamp(struct bt_trace_descriptor *tdp); static rw_dispatch read_dispatch_table[] = { - [ CTF_TYPE_INTEGER ] = ctf_integer_read, - [ CTF_TYPE_FLOAT ] = ctf_float_read, - [ CTF_TYPE_ENUM ] = ctf_enum_read, - [ CTF_TYPE_STRING ] = ctf_string_read, - [ CTF_TYPE_STRUCT ] = ctf_struct_rw, - [ CTF_TYPE_VARIANT ] = ctf_variant_rw, - [ CTF_TYPE_ARRAY ] = ctf_array_read, - [ CTF_TYPE_SEQUENCE ] = ctf_sequence_read, + [ BT_CTF_TYPE_ID_INTEGER ] = ctf_integer_read, + [ BT_CTF_TYPE_ID_FLOAT ] = ctf_float_read, + [ BT_CTF_TYPE_ID_ENUM ] = ctf_enum_read, + [ BT_CTF_TYPE_ID_STRING ] = ctf_string_read, + [ BT_CTF_TYPE_ID_STRUCT ] = ctf_struct_rw, + [ BT_CTF_TYPE_ID_VARIANT ] = ctf_variant_rw, + [ BT_CTF_TYPE_ID_ARRAY ] = ctf_array_read, + [ BT_CTF_TYPE_ID_SEQUENCE ] = ctf_sequence_read, }; static rw_dispatch write_dispatch_table[] = { - [ CTF_TYPE_INTEGER ] = ctf_integer_write, - [ CTF_TYPE_FLOAT ] = ctf_float_write, - [ CTF_TYPE_ENUM ] = ctf_enum_write, - [ CTF_TYPE_STRING ] = ctf_string_write, - [ CTF_TYPE_STRUCT ] = ctf_struct_rw, - [ CTF_TYPE_VARIANT ] = ctf_variant_rw, - [ CTF_TYPE_ARRAY ] = ctf_array_write, - [ CTF_TYPE_SEQUENCE ] = ctf_sequence_write, + [ BT_CTF_TYPE_ID_INTEGER ] = ctf_integer_write, + [ BT_CTF_TYPE_ID_FLOAT ] = ctf_float_write, + [ BT_CTF_TYPE_ID_ENUM ] = ctf_enum_write, + [ BT_CTF_TYPE_ID_STRING ] = ctf_string_write, + [ BT_CTF_TYPE_ID_STRUCT ] = ctf_struct_rw, + [ BT_CTF_TYPE_ID_VARIANT ] = ctf_variant_rw, + [ BT_CTF_TYPE_ID_ARRAY ] = ctf_array_write, + [ BT_CTF_TYPE_ID_SEQUENCE ] = ctf_sequence_write, }; static @@ -156,18 +159,29 @@ struct bt_format ctf_format = { .convert_index_timestamp = ctf_convert_index_timestamp, }; +void bt_ctf_hook(void) +{ + /* + * Dummy function to prevent the linker from discarding this format as + * "unused" in static builds. + */ +} + static -uint64_t ctf_timestamp_begin(struct bt_trace_descriptor *descriptor, - struct bt_trace_handle *handle, enum bt_clock_type type) +int ctf_timestamp_begin(struct bt_trace_descriptor *descriptor, + struct bt_trace_handle *handle, enum bt_clock_type type, + int64_t *timestamp) { struct ctf_trace *tin; - uint64_t begin = ULLONG_MAX; - int i, j; + int64_t begin = LLONG_MAX; + int i, j, ret; tin = container_of(descriptor, struct ctf_trace, parent); - if (!tin) + if (!tin || !timestamp) { + ret = -EINVAL; goto error; + } /* for each stream_class */ for (i = 0; i < tin->streams->len; i++) { @@ -188,8 +202,10 @@ uint64_t ctf_timestamp_begin(struct bt_trace_descriptor *descriptor, parent); stream_pos = &cfs->pos; - if (!stream_pos->packet_index) + if (!stream_pos->packet_index) { + ret = -EINVAL; goto error; + } if (stream_pos->packet_index->len <= 0) continue; @@ -204,29 +220,37 @@ uint64_t ctf_timestamp_begin(struct bt_trace_descriptor *descriptor, if (index->ts_cycles.timestamp_begin < begin) begin = index->ts_cycles.timestamp_begin; } else { + ret = -EINVAL; goto error; } } } - - return begin; + if (begin == LLONG_MAX) { + ret = -ENOENT; + goto error; + } + *timestamp = begin; + return 0; error: - return -1ULL; + return ret; } static -uint64_t ctf_timestamp_end(struct bt_trace_descriptor *descriptor, - struct bt_trace_handle *handle, enum bt_clock_type type) +int ctf_timestamp_end(struct bt_trace_descriptor *descriptor, + struct bt_trace_handle *handle, enum bt_clock_type type, + int64_t *timestamp) { struct ctf_trace *tin; - uint64_t end = 0; - int i, j; + int64_t end = LLONG_MIN; + int i, j, ret; tin = container_of(descriptor, struct ctf_trace, parent); - if (!tin) + if (!tin || !timestamp) { + ret = -EINVAL; goto error; + } /* for each stream_class */ for (i = 0; i < tin->streams->len; i++) { @@ -247,8 +271,10 @@ uint64_t ctf_timestamp_end(struct bt_trace_descriptor *descriptor, parent); stream_pos = &cfs->pos; - if (!stream_pos->packet_index) + if (!stream_pos->packet_index) { + ret = -EINVAL; goto error; + } if (stream_pos->packet_index->len <= 0) continue; @@ -263,15 +289,20 @@ uint64_t ctf_timestamp_end(struct bt_trace_descriptor *descriptor, if (index->ts_cycles.timestamp_end > end) end = index->ts_cycles.timestamp_end; } else { + ret = -EINVAL; goto error; } } } - - return end; + if (end == LLONG_MIN) { + ret = -ENOENT; + goto error; + } + *timestamp = end; + return 0; error: - return -1ULL; + return ret; } /* @@ -316,13 +347,15 @@ void ctf_update_timestamp(struct ctf_stream_definition *stream, static void ctf_print_timestamp_real(FILE *fp, struct ctf_stream_definition *stream, - uint64_t timestamp) + int64_t timestamp) { - uint64_t ts_sec = 0, ts_nsec; + int64_t ts_sec = 0, ts_nsec; + uint64_t ts_sec_abs, ts_nsec_abs; + bool is_negative; ts_nsec = timestamp; - /* Add command-line offset in ns*/ + /* Add command-line offset in ns */ ts_nsec += opt_clock_offset_ns; /* Add command-line offset */ @@ -330,10 +363,40 @@ void ctf_print_timestamp_real(FILE *fp, ts_sec += ts_nsec / NSEC_PER_SEC; ts_nsec = ts_nsec % NSEC_PER_SEC; + if (ts_sec >= 0 && ts_nsec >= 0) { + is_negative = false; + ts_sec_abs = ts_sec; + ts_nsec_abs = ts_nsec; + } else if (ts_sec > 0 && ts_nsec < 0) { + is_negative = false; + ts_sec_abs = ts_sec - 1; + ts_nsec_abs = NSEC_PER_SEC + ts_nsec; + } else if (ts_sec == 0 && ts_nsec < 0) { + is_negative = true; + ts_sec_abs = ts_sec; + ts_nsec_abs = -ts_nsec; + } else if (ts_sec < 0 && ts_nsec > 0) { + is_negative = true; + ts_sec_abs = -(ts_sec + 1); + ts_nsec_abs = NSEC_PER_SEC - ts_nsec; + } else if (ts_sec < 0 && ts_nsec == 0) { + is_negative = true; + ts_sec_abs = -ts_sec; + ts_nsec_abs = ts_nsec; + } else { /* (ts_sec < 0 && ts_nsec < 0) */ + is_negative = true; + ts_sec_abs = -ts_sec; + ts_nsec_abs = -ts_nsec; + } if (!opt_clock_seconds) { struct tm tm; - time_t time_s = (time_t) ts_sec; + time_t time_s = (time_t) ts_sec_abs; + + if (is_negative) { + fprintf(stderr, "[warning] Fallback to [sec.ns] to print negative time value. Use --clock-seconds.\n"); + goto seconds; + } if (!opt_clock_gmt) { struct tm *res; @@ -367,12 +430,12 @@ void ctf_print_timestamp_real(FILE *fp, } /* Print time in HH:MM:SS.ns */ fprintf(fp, "%02d:%02d:%02d.%09" PRIu64, - tm.tm_hour, tm.tm_min, tm.tm_sec, ts_nsec); + tm.tm_hour, tm.tm_min, tm.tm_sec, ts_nsec_abs); goto end; } seconds: - fprintf(fp, "%3" PRIu64 ".%09" PRIu64, - ts_sec, ts_nsec); + fprintf(fp, "%s%" PRId64 ".%09" PRIu64, + is_negative ? "-" : "", ts_sec_abs, ts_nsec_abs); end: return; @@ -391,7 +454,7 @@ void ctf_print_timestamp_cycles(FILE *fp, void ctf_print_timestamp(FILE *fp, struct ctf_stream_definition *stream, - uint64_t timestamp) + int64_t timestamp) { if (opt_clock_cycles) { ctf_print_timestamp_cycles(fp, stream, timestamp); @@ -420,16 +483,26 @@ void print_uuid(FILE *fp, unsigned char *uuid) * Given we have discarded counters of those two types merged into the * events_discarded counter, we need to use the union of those ranges: * [ prev_timestamp_end, timestamp_end ] + * + * Lost packets occur if the tracer overwrote some subbuffer(s) before the + * consumer had time to extract them. We keep track of those gaps with the + * packet sequence number in each packet. */ static -void ctf_print_discarded(FILE *fp, struct ctf_stream_definition *stream) +void ctf_print_discarded_lost(FILE *fp, struct ctf_stream_definition *stream) { - if (!stream->events_discarded || !babeltrace_ctf_console_output) { + if ((!stream->events_discarded && !stream->packets_lost) || + !babeltrace_ctf_console_output) { return; } fflush(stdout); - fprintf(fp, "[warning] Tracer discarded %" PRIu64 " events between [", - stream->events_discarded); + if (stream->events_discarded) { + fprintf(fp, "[warning] Tracer discarded %" PRIu64 " events between [", + stream->events_discarded); + } else if (stream->packets_lost) { + fprintf(fp, "[warning] Tracer lost %" PRIu64 " trace packets between [", + stream->packets_lost); + } if (opt_clock_cycles) { ctf_print_timestamp(fp, stream, stream->prev.cycles.end); @@ -763,13 +836,11 @@ int ctf_init_pos(struct ctf_stream_pos *pos, struct bt_trace_descriptor *trace, pos->parent.trace = trace; break; case O_RDWR: - pos->prot = PROT_WRITE; /* Write has priority */ + pos->prot = PROT_READ | PROT_WRITE; pos->flags = MAP_SHARED; pos->parent.rw_table = write_dispatch_table; pos->parent.event_cb = ctf_write_event; pos->parent.trace = trace; - if (fd >= 0) - ctf_packet_seek(&pos->parent, 0, SEEK_SET); /* position for write */ break; default: assert(0); @@ -779,7 +850,7 @@ int ctf_init_pos(struct ctf_stream_pos *pos, struct bt_trace_descriptor *trace, int ctf_fini_pos(struct ctf_stream_pos *pos) { - if (pos->prot == PROT_WRITE && pos->content_size_loc) + if ((pos->prot & PROT_WRITE) && pos->content_size_loc) *pos->content_size_loc = pos->offset; if (pos->base_mma) { int ret; @@ -802,6 +873,7 @@ void ctf_update_current_packet_index(struct ctf_stream_definition *stream, struct packet_index *cur_index) { uint64_t events_discarded_diff; + uint64_t packets_lost_diff = 0; /* Update packet index time information */ @@ -829,6 +901,11 @@ void ctf_update_current_packet_index(struct ctf_stream_definition *stream, prev_index->ts_real.timestamp_end; events_discarded_diff -= prev_index->events_discarded; + /* packet_seq_num stays at 0 if not produced by the tracer */ + if (cur_index->packet_seq_num) { + packets_lost_diff = cur_index->packet_seq_num - + prev_index->packet_seq_num - 1; + } /* * Deal with 32-bit wrap-around if the tracer provided a * 32-bit field. @@ -849,6 +926,172 @@ void ctf_update_current_packet_index(struct ctf_stream_definition *stream, stream->current.real.begin; } stream->events_discarded = events_discarded_diff; + stream->packets_lost = packets_lost_diff; +} + +/* + * Find the timerange where all the streams in the trace are active + * simultaneously. + * + * Return 0 and update begin/end if necessary on success, return 1 for + * empty streams and return a negative value on error. + */ +static +int ctf_find_stream_intersection(struct bt_trace_descriptor *td_read, + struct packet_index_time *_real, + struct packet_index_time *_cycles) +{ + int stream_id, ret = 0; + struct packet_index_time real = { INT64_MIN, INT64_MAX }, + cycles = { INT64_MIN, INT64_MAX }; + struct ctf_trace *tin = container_of(td_read, struct ctf_trace, parent); + + /* At least one of the two return args must be provided. */ + if (!_real && !_cycles) { + ret = -1; + goto end; + } + + if (tin->streams->len == 0) { + ret = 1; + goto end; + } + + for (stream_id = 0; stream_id < tin->streams->len; + stream_id++) { + int filenr; + struct ctf_stream_declaration *stream_class; + + stream_class = g_ptr_array_index(tin->streams, stream_id); + if (!stream_class) { + continue; + } + for (filenr = 0; filenr < stream_class->streams->len; filenr++) { + struct ctf_file_stream *file_stream; + struct ctf_stream_pos *stream_pos; + struct packet_index *index; + + file_stream = g_ptr_array_index(stream_class->streams, + filenr); + if (!file_stream) { + continue; + } + stream_pos = &file_stream->pos; + if (!stream_pos->packet_index || + stream_pos->packet_index->len <= 0) { + ret = 1; + goto end; + } + index = &g_array_index(stream_pos->packet_index, + struct packet_index, 0); + real.timestamp_begin = max(real.timestamp_begin, + index->ts_real.timestamp_begin); + cycles.timestamp_begin = max(cycles.timestamp_begin, + index->ts_cycles.timestamp_begin); + + index = &g_array_index(stream_pos->packet_index, + struct packet_index, + stream_pos->packet_index->len - 1); + real.timestamp_end = min(real.timestamp_end, + index->ts_real.timestamp_end); + cycles.timestamp_end = min(cycles.timestamp_end, + index->ts_cycles.timestamp_end); + } + } +end: + if (ret == 0) { + if (_real) { + *_real = real; + } + if (_cycles) { + *_cycles = cycles; + } + } + return ret; +} + +/* + * Find the union of all active regions in the trace collection's traces. + * Returns "real" timestamps. + * + * Return 0 on success. + * Return 1 if no intersections are found. + * Return a negative value on error. + */ +int ctf_find_tc_stream_packet_intersection_union(struct bt_context *ctx, + int64_t *_ts_begin, int64_t *_ts_end) +{ + int ret = 0, i; + int64_t ts_begin = INT64_MAX, ts_end = INT64_MIN; + + if (!ctx || !ctx->tc || !ctx->tc->array || !_ts_begin || !_ts_end) { + ret = -EINVAL; + goto end; + } + + for (i = 0; i < ctx->tc->array->len; i++) { + struct bt_trace_descriptor *td_read; + struct packet_index_time intersection_real; + + td_read = g_ptr_array_index(ctx->tc->array, i); + if (!td_read) { + continue; + } + ret = ctf_find_stream_intersection(td_read, &intersection_real, + NULL); + if (ret == 1) { + /* Empty trace or no stream intersection. */ + continue; + } else if (ret < 0) { + goto end; + } + + ts_begin = min(intersection_real.timestamp_begin, ts_begin); + ts_end = max(intersection_real.timestamp_end, ts_end); + } + + if (ts_end < ts_begin) { + ret = 1; + goto end; + } + *_ts_begin = ts_begin; + *_ts_end = ts_end; +end: + return ret; +} + +int ctf_tc_set_stream_intersection_mode(struct bt_context *ctx) +{ + int ret = 0, i; + + if (!ctx || !ctx->tc || !ctx->tc->array) { + ret = -EINVAL; + goto end; + } + + for (i = 0; i < ctx->tc->array->len; i++) { + struct bt_trace_descriptor *td_read; + struct packet_index_time intersection_real; + + td_read = g_ptr_array_index(ctx->tc->array, i); + if (!td_read) { + continue; + } + + ret = ctf_find_stream_intersection(td_read, &intersection_real, + NULL); + if (ret == 1) { + /* Empty trace or no stream intersection. */ + continue; + } else if (ret < 0) { + goto end; + } + + td_read->interval_real = intersection_real; + td_read->interval_set = true; + } +end: + return ret; } /* @@ -862,7 +1105,6 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) struct ctf_file_stream *file_stream = container_of(pos, struct ctf_file_stream, pos); int ret; - off_t off; struct packet_index *packet_index, *prev_index; switch (whence) { @@ -873,7 +1115,7 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) assert(0); } - if (pos->prot == PROT_WRITE && pos->content_size_loc) + if ((pos->prot & PROT_WRITE) && pos->content_size_loc) *pos->content_size_loc = pos->offset; if (pos->base_mma) { @@ -891,7 +1133,7 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) * The caller should never ask for ctf_move_pos across packets, * except to get exactly at the beginning of the next packet. */ - if (pos->prot == PROT_WRITE) { + if (pos->prot & PROT_WRITE) { switch (whence) { case SEEK_CUR: /* The writer will add padding */ @@ -906,9 +1148,11 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) } pos->content_size = -1U; /* Unknown at this point */ pos->packet_size = WRITE_PACKET_LEN; - off = posix_fallocate(pos->fd, pos->mmap_offset, - pos->packet_size / CHAR_BIT); - assert(off >= 0); + do { + ret = bt_posix_fallocate(pos->fd, pos->mmap_offset, + pos->packet_size / CHAR_BIT); + } while (ret == EINTR); + assert(ret == 0); pos->offset = 0; } else { read_next_packet: @@ -934,6 +1178,11 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) assert(0); } + if (pos->cur_index >= pos->packet_index->len) { + pos->offset = EOF; + return; + } + packet_index = &g_array_index(pos->packet_index, struct packet_index, pos->cur_index); if (pos->cur_index > 0) { @@ -946,11 +1195,6 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) ctf_update_current_packet_index(&file_stream->parent, prev_index, packet_index); - if (pos->cur_index >= pos->packet_index->len) { - pos->offset = EOF; - return; - } - /* * We need to check if we are in trace read or called * from packet indexing. In this last case, the @@ -958,7 +1202,7 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) * timestamps. */ if ((&file_stream->parent)->stream_class->trace->parent.collection) { - ctf_print_discarded(stderr, &file_stream->parent); + ctf_print_discarded_lost(stderr, &file_stream->parent); } packet_index = &g_array_index(pos->packet_index, @@ -1001,12 +1245,14 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) } /* update trace_packet_header and stream_packet_context */ - if (pos->prot != PROT_WRITE && file_stream->parent.trace_packet_header) { + if (!(pos->prot & PROT_WRITE) && + file_stream->parent.trace_packet_header) { /* Read packet header */ ret = generic_rw(&pos->parent, &file_stream->parent.trace_packet_header->p); assert(!ret); } - if (pos->prot != PROT_WRITE && file_stream->parent.stream_packet_context) { + if (!(pos->prot & PROT_WRITE) && + file_stream->parent.stream_packet_context) { /* Read packet context */ ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p); assert(!ret); @@ -1055,7 +1301,7 @@ int check_version(unsigned int major, unsigned int minor) } default: goto warning; - + } /* eventually return an error instead of warning */ @@ -1107,7 +1353,7 @@ int ctf_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, memcpy(td->uuid, header.uuid, sizeof(header.uuid)); CTF_TRACE_SET_FIELD(td, uuid); } else { - if (babeltrace_uuid_compare(header.uuid, td->uuid)) + if (bt_uuid_compare(header.uuid, td->uuid)) return -EINVAL; } @@ -1508,6 +1754,7 @@ int create_stream_one_packet_index(struct ctf_stream_pos *pos, int ret; begin: + memset(&packet_index, 0, sizeof(packet_index)); if (!pos->mmap_offset) { first_packet = 1; } @@ -1539,14 +1786,6 @@ begin: pos->offset = 0; /* Position of the packet header */ packet_index.offset = pos->mmap_offset; - packet_index.content_size = 0; - packet_index.packet_size = 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; /* read and check header, set stream id (and check) */ if (file_stream->parent.trace_packet_header) { @@ -1558,7 +1797,7 @@ begin: fprintf(stderr, "[error] Unable to read packet header: %s\n", strerror(-ret)); return ret; } - len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("magic")); + len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_string("magic")); if (len_index >= 0) { struct bt_definition *field; uint64_t magic; @@ -1575,7 +1814,7 @@ begin: } /* check uuid */ - len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("uuid")); + len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_string("uuid")); if (len_index >= 0) { struct definition_array *defarray; struct bt_definition *field; @@ -1583,7 +1822,7 @@ begin: uint8_t uuidval[BABELTRACE_UUID_LEN]; field = bt_struct_definition_get_field_from_index(file_stream->parent.trace_packet_header, len_index); - assert(field->declaration->id == CTF_TYPE_ARRAY); + assert(field->declaration->id == BT_CTF_TYPE_ID_ARRAY); defarray = container_of(field, struct definition_array, p); assert(bt_array_len(defarray) == BABELTRACE_UUID_LEN); @@ -1593,14 +1832,14 @@ begin: elem = bt_array_index(defarray, i); uuidval[i] = bt_get_unsigned_int(elem); } - ret = babeltrace_uuid_compare(td->uuid, uuidval); + ret = bt_uuid_compare(td->uuid, uuidval); if (ret) { fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n"); return -EINVAL; } } - len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_static_string("stream_id")); + len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.trace_packet_header->declaration, g_quark_from_string("stream_id")); if (len_index >= 0) { struct bt_definition *field; @@ -1631,7 +1870,7 @@ begin: return ret; } /* read packet size from header */ - len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("packet_size")); + len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_string("packet_size")); if (len_index >= 0) { struct bt_definition *field; @@ -1643,7 +1882,7 @@ begin: } /* read content size from header */ - len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("content_size")); + len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_string("content_size")); if (len_index >= 0) { struct bt_definition *field; @@ -1655,7 +1894,7 @@ begin: } /* read timestamp begin from header */ - len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_begin")); + len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_string("timestamp_begin")); if (len_index >= 0) { struct bt_definition *field; @@ -1670,7 +1909,7 @@ begin: } /* read timestamp end from header */ - len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("timestamp_end")); + len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_string("timestamp_end")); if (len_index >= 0) { struct bt_definition *field; @@ -1685,7 +1924,7 @@ begin: } /* read events discarded from header */ - len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_static_string("events_discarded")); + len_index = bt_struct_declaration_lookup_field_index(file_stream->parent.stream_packet_context->declaration, g_quark_from_string("events_discarded")); if (len_index >= 0) { struct bt_definition *field; @@ -1693,6 +1932,19 @@ begin: packet_index.events_discarded = bt_get_unsigned_int(field); packet_index.events_discarded_len = bt_get_int_len(field); } + + /* read packet_seq_num from header */ + len_index = bt_struct_declaration_lookup_field_index( + file_stream->parent.stream_packet_context->declaration, + g_quark_from_string("packet_seq_num")); + if (len_index >= 0) { + struct bt_definition *field; + + field = bt_struct_definition_get_field_from_index( + file_stream->parent.stream_packet_context, + len_index); + packet_index.packet_seq_num = bt_get_unsigned_int(field); + } } else { /* Use file size for packet size */ packet_index.packet_size = filesize * CHAR_BIT; @@ -1813,7 +2065,7 @@ int create_trace_definitions(struct ctf_trace *td, struct ctf_stream_definition ret = -EINVAL; goto error; } - stream->trace_packet_header = + stream->trace_packet_header = container_of(definition, struct definition_struct, p); stream->parent_def_scope = stream->trace_packet_header->p.scope; } @@ -1833,7 +2085,7 @@ int import_stream_packet_index(struct ctf_trace *td, struct ctf_packet_index *ctf_index = NULL; struct ctf_packet_index_file_hdr index_hdr; struct packet_index index; - uint32_t packet_index_len; + uint32_t packet_index_len, index_minor; int ret = 0; int first_packet = 1; size_t len; @@ -1853,14 +2105,16 @@ int import_stream_packet_index(struct ctf_trace *td, goto error; } if (be32toh(index_hdr.index_major) != CTF_INDEX_MAJOR) { - fprintf(stderr, "[error] Incompatible index file %" PRIu64 - ".%" PRIu64 ", supported %d.%d\n", - be64toh(index_hdr.index_major), - be64toh(index_hdr.index_minor), CTF_INDEX_MAJOR, + fprintf(stderr, "[error] Incompatible index file %" PRIu32 + ".%" PRIu32 ", supported %d.%d\n", + be32toh(index_hdr.index_major), + be32toh(index_hdr.index_minor), CTF_INDEX_MAJOR, CTF_INDEX_MINOR); ret = -1; goto error; } + index_minor = be32toh(index_hdr.index_minor); + packet_index_len = be32toh(index_hdr.packet_index_len); if (packet_index_len == 0) { fprintf(stderr, "[error] Packet index length cannot be 0.\n"); @@ -1887,6 +2141,10 @@ int import_stream_packet_index(struct ctf_trace *td, index.events_discarded_len = 64; index.data_offset = -1; stream_id = be64toh(ctf_index->stream_id); + if (index_minor >= 1) { + index.stream_instance_id = be64toh(ctf_index->stream_instance_id); + index.packet_seq_num = be64toh(ctf_index->packet_seq_num); + } if (!first_packet) { /* add index to packet array */ @@ -1962,6 +2220,11 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags, ret = 0; goto fd_is_dir_ok; } + if (!statbuf.st_size) { + /** Skip empty files. */ + ret = 0; + goto fd_is_empty_file; + } file_stream = g_new0(struct ctf_file_stream, 1); file_stream->pos.last_offset = LAST_OFFSET_POISON; @@ -1996,12 +2259,13 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags, index_name = malloc((strlen(path) + sizeof(INDEX_PATH)) * sizeof(char)); if (!index_name) { fprintf(stderr, "[error] Cannot allocate index filename\n"); + ret = -ENOMEM; goto error_def; } snprintf(index_name, strlen(path) + sizeof(INDEX_PATH), INDEX_PATH, path); - if (faccessat(td->dirfd, index_name, O_RDONLY, flags) < 0) { + if (bt_faccessat(td->dirfd, td->parent.path, index_name, O_RDONLY, 0) < 0) { ret = create_stream_packet_index(td, file_stream); if (ret) { fprintf(stderr, "[error] Stream index creation error.\n"); @@ -2054,6 +2318,7 @@ error_def: fprintf(stderr, "Error on ctf_fini_pos\n"); } g_free(file_stream); +fd_is_empty_file: fd_is_dir_ok: fstat_error: closeret = close(fd); @@ -2075,6 +2340,7 @@ int ctf_open_trace_read(struct ctf_trace *td, struct dirent *dirent; struct dirent *diriter; size_t dirent_len; + int pc_name_max; char *ext; td->flags = flags; @@ -2124,8 +2390,15 @@ int ctf_open_trace_read(struct ctf_trace *td, * the stream array. */ - dirent_len = offsetof(struct dirent, d_name) + - fpathconf(td->dirfd, _PC_NAME_MAX) + 1; + pc_name_max = fpathconf(td->dirfd, _PC_NAME_MAX); + if (pc_name_max < 0) { + perror("Error on fpathconf"); + fprintf(stderr, "[error] Failed to get _PC_NAME_MAX for path \"%s\".\n", path); + ret = -1; + goto error_metadata; + } + + dirent_len = offsetof(struct dirent, d_name) + pc_name_max + 1; dirent = malloc(dirent_len); @@ -2196,6 +2469,10 @@ struct bt_trace_descriptor *ctf_open_trace(const char *path, int flags, packet_seek = ctf_packet_seek; td = g_new0(struct ctf_trace, 1); + if (!td) { + goto error; + } + init_trace_descriptor(&td->parent); switch (flags & O_ACCMODE) { case O_RDONLY: @@ -2215,9 +2492,17 @@ struct bt_trace_descriptor *ctf_open_trace(const char *path, int flags, goto error; } + ret = trace_debug_info_create(td); + if (ret) { + goto error; + } + return &td->parent; error: - g_free(td); + if (td) { + trace_debug_info_destroy(td); + g_free(td); + } return NULL; } @@ -2245,13 +2530,17 @@ void ctf_init_mmap_pos(struct ctf_stream_pos *pos, static int prepare_mmap_stream_definition(struct ctf_trace *td, - struct ctf_file_stream *file_stream) + struct ctf_file_stream *file_stream, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, + int whence)) { struct ctf_stream_declaration *stream; - uint64_t stream_id = 0; + uint64_t stream_id; int ret; - file_stream->parent.stream_id = stream_id; + /* Ask for the first packet to get the stream_id. */ + packet_seek(&file_stream->pos.parent, 0, SEEK_SET); + stream_id = file_stream->parent.stream_id; if (stream_id >= td->streams->len) { fprintf(stderr, "[error] Stream %" PRIu64 " is not declared " "in metadata.\n", stream_id); @@ -2281,6 +2570,7 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td, struct ctf_file_stream *file_stream; file_stream = g_new0(struct ctf_file_stream, 1); + file_stream->parent.stream_id = -1ULL; file_stream->pos.last_offset = LAST_OFFSET_POISON; ctf_init_mmap_pos(&file_stream->pos, mmap_info); @@ -2291,7 +2581,7 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td, goto error_def; } - ret = prepare_mmap_stream_definition(td, file_stream); + ret = prepare_mmap_stream_definition(td, file_stream, packet_seek); if (ret) goto error_index; @@ -2380,6 +2670,11 @@ struct bt_trace_descriptor *ctf_open_mmap_trace( if (ret) goto error_free; + ret = trace_debug_info_create(td); + if (ret) { + goto error_free; + } + return &td->parent; error_free: @@ -2531,6 +2826,7 @@ int ctf_close_trace(struct bt_trace_descriptor *tdp) } } free(td->metadata_string); + trace_debug_info_destroy(td); g_free(td); return 0; } @@ -2560,7 +2856,7 @@ void __attribute__((constructor)) ctf_init(void) { int ret; - ctf_format.name = g_quark_from_static_string("ctf"); + ctf_format.name = g_quark_from_string("ctf"); ret = bt_register_format(&ctf_format); assert(!ret); }