X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=475d6f72f3e3af0936b078af14c448926fc947b0;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=c87da63d7e8821bac70a78097304907c67423e7c;hpb=5cde0dc17329ae1e86b4cfb82dd23e25d69c2d26;p=babeltrace.git diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index c87da63d..475d6f72 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -27,6 +27,7 @@ */ #include +#include #include #include #include @@ -35,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -68,10 +69,6 @@ */ #define WRITE_PACKET_LEN (getpagesize() * 8 * CHAR_BIT) -#ifndef min -#define min(a, b) (((a) < (b)) ? (a) : (b)) -#endif - #define NSEC_PER_SEC 1000000000LL #define INDEX_PATH "./index/%s.idx" @@ -162,6 +159,14 @@ 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 int ctf_timestamp_begin(struct bt_trace_descriptor *descriptor, struct bt_trace_handle *handle, enum bt_clock_type type, @@ -932,13 +937,25 @@ void ctf_update_current_packet_index(struct ctf_stream_definition *stream, * 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) +int ctf_find_stream_intersection(struct bt_trace_descriptor *td_read, + struct packet_index_time *_real, + struct packet_index_time *_cycles) { - struct ctf_trace *tin; 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); - 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++) { @@ -967,56 +984,111 @@ int ctf_intersect_trace(struct bt_trace_descriptor *td_read, } 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; - } + 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); - if (index->ts_real.timestamp_end < *end) { - *end = index->ts_real.timestamp_end; - } + 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 timerange where all streams in the trace collection are active - * simultaneously. + * 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_packets_intersection(struct bt_context *ctx, - uint64_t *ts_begin, uint64_t *ts_end) +int ctf_find_tc_stream_packet_intersection_union(struct bt_context *ctx, + int64_t *_ts_begin, int64_t *_ts_end) { - int ret, i; + int ret = 0, i; + int64_t ts_begin = INT64_MAX, ts_end = INT64_MIN; - if (!ctx || !ctx->tc || !ctx->tc->array) { + 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_intersect_trace(td_read, ts_begin, ts_end); - if (ret) { + 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) { + + if (ts_end < ts_begin) { ret = 1; - } else { - ret = 0; + 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; @@ -1343,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; @@ -1359,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; @@ -1381,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; @@ -1725,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; @@ -1742,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; @@ -1767,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; @@ -1798,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; @@ -1810,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; @@ -1822,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; @@ -1837,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; @@ -1852,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; @@ -1864,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; @@ -2397,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: @@ -2423,8 +2499,10 @@ struct bt_trace_descriptor *ctf_open_trace(const char *path, int flags, return &td->parent; error: - trace_debug_info_destroy(td); - g_free(td); + if (td) { + trace_debug_info_destroy(td); + g_free(td); + } return NULL; } @@ -2778,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); }