X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=ebc6d0e8d2023010e4807b8e2833148f47f7c14f;hb=05984e0cf2b0b9e63e72d601ec4941f7f2a5c13d;hp=a617497e05b719d544e5d662137632d4cb3d3718;hpb=6246fd54ccebd72fc12f0d0885dd90b64094616e;p=babeltrace.git diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index a617497e..ebc6d0e8 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -35,6 +35,7 @@ #include #include #include +#include #include #include #include @@ -71,7 +72,7 @@ #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" @@ -80,10 +81,11 @@ 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; /* * TODO: babeltrace_ctf_console_output ensures that we only print @@ -113,36 +115,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 @@ -158,17 +162,20 @@ struct bt_format ctf_format = { }; 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++) { @@ -189,8 +196,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; @@ -205,29 +214,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++) { @@ -248,8 +265,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; @@ -264,15 +283,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; } /* @@ -317,13 +341,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 */ @@ -331,10 +357,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; @@ -368,12 +424,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; @@ -392,7 +448,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); @@ -867,6 +923,104 @@ void ctf_update_current_packet_index(struct ctf_stream_definition *stream, 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_intersect_trace(struct bt_trace_descriptor *td_read, + uint64_t *begin, uint64_t *end) +{ + struct ctf_trace *tin; + int stream_id, ret = 0; + + tin = container_of(td_read, struct ctf_trace, parent); + + 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); + if (index->ts_real.timestamp_begin > *begin) { + *begin = index->ts_real.timestamp_begin; + } + index = &g_array_index(stream_pos->packet_index, + struct packet_index, + stream_pos->packet_index->len - 1); + if (index->ts_real.timestamp_end < *end) { + *end = index->ts_real.timestamp_end; + } + } + } + +end: + return ret; +} + +/* + * Find the timerange where all streams in the trace collection are active + * simultaneously. + * + * Return 0 on success. + * Return 1 if no intersections are found. + * Return a negative value on error. + */ +int ctf_find_packets_intersection(struct bt_context *ctx, + uint64_t *ts_begin, uint64_t *ts_end) +{ + int ret, 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; + + td_read = g_ptr_array_index(ctx->tc->array, i); + if (!td_read) { + continue; + } + ret = ctf_intersect_trace(td_read, ts_begin, ts_end); + if (ret) { + goto end; + } + } + if (*ts_end < *ts_begin) { + ret = 1; + } else { + ret = 0; + } +end: + return ret; +} + /* * for SEEK_CUR: go to next packet. * for SEEK_SET: go to packet numer (index). @@ -951,6 +1105,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) { @@ -963,11 +1122,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 @@ -1074,7 +1228,7 @@ int check_version(unsigned int major, unsigned int minor) } default: goto warning; - + } /* eventually return an error instead of warning */ @@ -1595,7 +1749,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); @@ -1838,7 +1992,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; } @@ -2113,6 +2267,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; @@ -2162,8 +2317,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); @@ -2253,8 +2415,14 @@ 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: + trace_debug_info_destroy(td); g_free(td); return NULL; } @@ -2423,6 +2591,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: @@ -2574,6 +2747,7 @@ int ctf_close_trace(struct bt_trace_descriptor *tdp) } } free(td->metadata_string); + trace_debug_info_destroy(td); g_free(td); return 0; }