X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=475d6f72f3e3af0936b078af14c448926fc947b0;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=0cf799cd224f1d35978d7268675032294ece52f1;hpb=024ffe47266b6e162873fb6df08ad0e560194986;p=babeltrace.git diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index 0cf799cd..475d6f72 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 @@ -67,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" @@ -80,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 @@ -113,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 @@ -157,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++) { @@ -189,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; @@ -205,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++) { @@ -248,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; @@ -264,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; } /* @@ -317,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 */ @@ -331,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; @@ -368,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; @@ -392,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); @@ -867,6 +929,171 @@ 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_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; +} + /* * for SEEK_CUR: go to next packet. * for SEEK_SET: go to packet numer (index). @@ -1074,7 +1301,7 @@ int check_version(unsigned int major, unsigned int minor) } default: goto warning; - + } /* eventually return an error instead of warning */ @@ -1188,7 +1415,7 @@ int ctf_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, * because its size includes garbage at the end (after final * \0). This is the allocated size, not the actual string size. */ - out = babeltrace_open_memstream(buf, &size); + out = bt_open_memstream(buf, &size); if (out == NULL) { perror("Metadata open_memstream"); return -errno; @@ -1204,7 +1431,7 @@ int ctf_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, } } /* close to flush the buffer */ - ret = babeltrace_close_memstream(buf, &size, out); + ret = bt_close_memstream(buf, &size, out); if (ret < 0) { int closeret; @@ -1226,7 +1453,7 @@ int ctf_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, *fp = NULL; return -ENOENT; } - *fp = babeltrace_fmemopen(*buf, buflen, "rb"); + *fp = bt_fmemopen(*buf, buflen, "rb"); if (!*fp) { perror("Metadata fmemopen"); return -errno; @@ -1570,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; @@ -1587,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; @@ -1595,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); @@ -1612,7 +1839,7 @@ begin: } } - 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; @@ -1643,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; @@ -1655,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; @@ -1667,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; @@ -1682,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; @@ -1697,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; @@ -1709,7 +1936,7 @@ begin: /* read packet_seq_num from header */ len_index = bt_struct_declaration_lookup_field_index( file_stream->parent.stream_packet_context->declaration, - g_quark_from_static_string("packet_seq_num")); + g_quark_from_string("packet_seq_num")); if (len_index >= 0) { struct bt_definition *field; @@ -1838,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; } @@ -2242,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: @@ -2261,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; } @@ -2431,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: @@ -2582,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; } @@ -2611,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); }