#include <ctfcopytrace.h>
#include "debug-info.h"
+static
+struct bt_ctf_stream *insert_new_stream(
+ struct debug_info_iterator *debug_it,
+ struct bt_ctf_stream *stream,
+ struct debug_info_trace *di_trace);
+
+static
+void unref_stream(struct bt_ctf_stream *stream)
+{
+ bt_put(stream);
+}
+
+static
+void unref_packet(struct bt_ctf_packet *packet)
+{
+ bt_put(packet);
+}
+
+static
+void unref_stream_class(struct bt_ctf_stream_class *stream_class)
+{
+ bt_put(stream_class);
+}
+
+static
+void unref_debug_info(struct debug_info *debug_info)
+{
+ debug_info_destroy(debug_info);
+}
+
+static
+void destroy_stream_state_key(gpointer key)
+{
+ g_free((enum fs_writer_stream_state *) key);
+}
+
static
struct bt_ctf_field *get_payload_field(FILE *err,
struct bt_ctf_event *event, const char *field_name)
sec = bt_ctf_event_get_stream_event_context(event);
if (!sec) {
- fprintf(err, "[error] %s in %s:%d\n", __func__,
- __FILE__, __LINE__);
goto end;
}
field = get_stream_event_context_field(err, event, field_name);
if (!field) {
- fprintf(err, "[error] %s in %s:%d\n", __func__,
- __FILE__, __LINE__);
goto error;
}
struct bt_ctf_field_type *field_type = NULL;
int ret;
+ /*
+ * The field might not exist, no error here.
+ */
field = get_payload_field(err, event, field_name);
if (!field) {
- fprintf(err, "[error] %s in %s:%d\n", __func__,
- __FILE__, __LINE__);
goto error;
}
static
struct debug_info *lookup_trace_debug_info(struct debug_info_iterator *debug_it,
- struct bt_ctf_trace *writer_trace)
+ struct bt_ctf_trace *writer_trace,
+ struct debug_info_trace *di_trace)
{
return (struct debug_info *) g_hash_table_lookup(
- debug_it->trace_debug_map,
+ di_trace->trace_debug_map,
(gpointer) writer_trace);
}
static
struct debug_info *insert_new_debug_info(struct debug_info_iterator *debug_it,
- struct bt_ctf_trace *writer_trace)
+ struct bt_ctf_trace *writer_trace,
+ struct debug_info_trace *di_trace)
{
struct debug_info *debug_info = NULL;
struct bt_value *field = NULL;
goto end;
}
- g_hash_table_insert(debug_it->trace_debug_map, (gpointer) writer_trace,
+ g_hash_table_insert(di_trace->trace_debug_map, (gpointer) writer_trace,
debug_info);
end:
static
struct debug_info *get_trace_debug_info(struct debug_info_iterator *debug_it,
- struct bt_ctf_trace *writer_trace)
+ struct bt_ctf_trace *writer_trace,
+ struct debug_info_trace *di_trace)
{
struct debug_info *debug_info;
- debug_info = lookup_trace_debug_info(debug_it, writer_trace);
+ debug_info = lookup_trace_debug_info(debug_it, writer_trace, di_trace);
if (debug_info) {
goto end;
}
- debug_info = insert_new_debug_info(debug_it, writer_trace);
+ debug_info = insert_new_debug_info(debug_it, writer_trace, di_trace);
end:
return debug_info;
}
static
-struct bt_ctf_trace *lookup_trace(struct debug_info_iterator *debug_it,
+struct debug_info_trace *lookup_trace(struct debug_info_iterator *debug_it,
struct bt_ctf_trace *trace)
{
- return (struct bt_ctf_trace *) g_hash_table_lookup(
+ return (struct debug_info_trace *) g_hash_table_lookup(
debug_it->trace_map,
(gpointer) trace);
}
static
-struct bt_ctf_trace *insert_new_trace(struct debug_info_iterator *debug_it,
- struct bt_ctf_trace *trace) {
+enum debug_info_stream_state *insert_new_stream_state(
+ struct debug_info_iterator *debug_it,
+ struct debug_info_trace *di_trace, struct bt_ctf_stream *stream)
+{
+ enum debug_info_stream_state *v = NULL;
+
+ v = g_new0(enum debug_info_stream_state, 1);
+ if (!v) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto end;
+ }
+ *v = DEBUG_INFO_UNKNOWN_STREAM;
+
+ g_hash_table_insert(di_trace->stream_states, stream, v);
+
+end:
+ return v;
+}
+
+static
+void check_completed_trace(gpointer key, gpointer value, gpointer user_data)
+{
+ enum debug_info_stream_state *state = value;
+ int *trace_completed = user_data;
+
+ if (*state != DEBUG_INFO_COMPLETED_STREAM) {
+ *trace_completed = 0;
+ }
+}
+
+static
+gboolean empty_ht(gpointer key, gpointer value, gpointer user_data)
+{
+ return TRUE;
+}
+
+BT_HIDDEN
+void debug_info_close_trace(struct debug_info_iterator *debug_it,
+ struct debug_info_trace *di_trace)
+{
+ if (di_trace->static_listener_id >= 0) {
+ bt_ctf_trace_remove_is_static_listener(di_trace->trace,
+ di_trace->static_listener_id);
+ }
+
+ /* Empty the stream class HT. */
+ g_hash_table_foreach_remove(di_trace->stream_class_map,
+ empty_ht, NULL);
+ g_hash_table_destroy(di_trace->stream_class_map);
+
+ /* Empty the stream HT. */
+ g_hash_table_foreach_remove(di_trace->stream_map,
+ empty_ht, NULL);
+ g_hash_table_destroy(di_trace->stream_map);
+
+ /* Empty the stream state HT. */
+ g_hash_table_foreach_remove(di_trace->stream_states,
+ empty_ht, NULL);
+ g_hash_table_destroy(di_trace->stream_states);
+
+ /* Empty the packet HT. */
+ g_hash_table_foreach_remove(di_trace->packet_map,
+ empty_ht, NULL);
+ g_hash_table_destroy(di_trace->packet_map);
+
+ /* Empty the trace_debug HT. */
+ g_hash_table_foreach_remove(di_trace->trace_debug_map,
+ empty_ht, NULL);
+ g_hash_table_destroy(di_trace->trace_debug_map);
+}
+
+static
+int sync_event_classes(struct debug_info_iterator *debug_it,
+ struct bt_ctf_stream *stream,
+ struct bt_ctf_stream *writer_stream)
+{
+ int int_ret;
+ struct bt_ctf_stream_class *stream_class = NULL,
+ *writer_stream_class = NULL;
+ enum bt_component_status ret;
+
+ stream_class = bt_ctf_stream_get_class(stream);
+ if (!stream_class) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+
+ writer_stream_class = bt_ctf_stream_get_class(writer_stream);
+ if (!writer_stream_class) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+
+ ret = ctf_copy_event_classes(debug_it->err, stream_class,
+ writer_stream_class);
+ if (ret != BT_COMPONENT_STATUS_OK) {
+ goto error;
+ }
+
+ int_ret = 0;
+ goto end;
+
+error:
+ int_ret = -1;
+end:
+ bt_put(stream_class);
+ bt_put(writer_stream_class);
+ return int_ret;
+}
+
+static
+void trace_is_static_listener(struct bt_ctf_trace *trace, void *data)
+{
+ struct debug_info_trace *di_trace = data;
+ struct debug_info_iterator *debug_it = di_trace->debug_it;
+ int trace_completed = 1, ret, nr_stream, i;
+ struct bt_ctf_stream *stream = NULL, *writer_stream = NULL;
+ struct bt_ctf_trace *writer_trace = di_trace->writer_trace;
+
+ /*
+ * When the trace becomes static, make sure that we have all
+ * the event classes in our stream_class copies before setting it
+ * static as well.
+ */
+ nr_stream = bt_ctf_trace_get_stream_count(trace);
+ for (i = 0; i < nr_stream; i++) {
+ stream = bt_ctf_trace_get_stream_by_index(trace, i);
+ if (!stream) {
+ fprintf(debug_it->err,
+ "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+ writer_stream = bt_ctf_trace_get_stream_by_index(writer_trace, i);
+ if (!writer_stream) {
+ fprintf(debug_it->err,
+ "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+ ret = sync_event_classes(di_trace->debug_it, stream, writer_stream);
+ if (ret) {
+ fprintf(debug_it->err,
+ "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+ BT_PUT(stream);
+ BT_PUT(writer_stream);
+ }
+
+ bt_ctf_trace_set_is_static(di_trace->writer_trace);
+ di_trace->trace_static = 1;
+
+ g_hash_table_foreach(di_trace->stream_states,
+ check_completed_trace, &trace_completed);
+ if (trace_completed) {
+ debug_info_close_trace(di_trace->debug_it, di_trace);
+ g_hash_table_remove(di_trace->debug_it->trace_map,
+ di_trace->trace);
+ }
+
+error:
+ bt_put(writer_stream);
+ bt_put(stream);
+}
+
+static
+struct debug_info_trace *insert_new_trace(struct debug_info_iterator *debug_it,
+ struct bt_ctf_stream *stream) {
struct bt_ctf_trace *writer_trace = NULL;
- int ret;
+ struct debug_info_trace *di_trace = NULL;
+ struct bt_ctf_trace *trace = NULL;
+ struct bt_ctf_stream_class *stream_class = NULL;
+ struct bt_ctf_stream *writer_stream = NULL;
+ int ret, nr_stream, i;
writer_trace = bt_ctf_trace_create();
if (!writer_trace) {
__FILE__, __LINE__);
goto error;
}
- g_hash_table_insert(debug_it->trace_map, (gpointer) trace, writer_trace);
+
+ stream_class = bt_ctf_stream_get_class(stream);
+ if (!stream_class) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+
+ trace = bt_ctf_stream_class_get_trace(stream_class);
+ if (!trace) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
ret = ctf_copy_trace(debug_it->err, trace, writer_trace);
if (ret != BT_COMPONENT_STATUS_OK) {
goto error;
}
+ di_trace = g_new0(struct debug_info_trace, 1);
+ if (!di_trace) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+
+ di_trace->trace = trace;
+ di_trace->writer_trace = writer_trace;
+ di_trace->debug_info_component = debug_it->debug_info_component;
+ di_trace->debug_it = debug_it;
+ di_trace->stream_map = g_hash_table_new_full(g_direct_hash,
+ g_direct_equal, NULL, (GDestroyNotify) unref_stream);
+ di_trace->stream_class_map = g_hash_table_new_full(g_direct_hash,
+ g_direct_equal, NULL, (GDestroyNotify) unref_stream_class);
+ di_trace->packet_map = g_hash_table_new_full(g_direct_hash,
+ g_direct_equal, NULL, (GDestroyNotify) unref_packet);
+ di_trace->trace_debug_map = g_hash_table_new_full(g_direct_hash,
+ g_direct_equal, NULL, (GDestroyNotify) unref_debug_info);
+ di_trace->stream_states = g_hash_table_new_full(g_direct_hash,
+ g_direct_equal, NULL, destroy_stream_state_key);
+ g_hash_table_insert(debug_it->trace_map, (gpointer) trace, di_trace);
+
+ /* Set all the existing streams in the unknown state. */
+ nr_stream = bt_ctf_trace_get_stream_count(trace);
+ for (i = 0; i < nr_stream; i++) {
+ stream = bt_ctf_trace_get_stream_by_index(trace, i);
+ if (!stream) {
+ fprintf(debug_it->err,
+ "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+ insert_new_stream_state(debug_it, di_trace, stream);
+ writer_stream = insert_new_stream(debug_it, stream, di_trace);
+ if (!writer_stream) {
+ fprintf(debug_it->err,
+ "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+ bt_get(writer_stream);
+ ret = sync_event_classes(debug_it, stream, writer_stream);
+ if (ret) {
+ fprintf(debug_it->err,
+ "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+ BT_PUT(writer_stream);
+ BT_PUT(stream);
+ }
+
+ /* Check if the trace is already static or register a listener. */
+ if (bt_ctf_trace_is_static(trace)) {
+ di_trace->trace_static = 1;
+ di_trace->static_listener_id = -1;
+ bt_ctf_trace_set_is_static(writer_trace);
+ } else {
+ ret = bt_ctf_trace_add_is_static_listener(trace,
+ trace_is_static_listener, di_trace);
+ if (ret < 0) {
+ fprintf(debug_it->err,
+ "[error] %s in %s:%d\n", __func__, __FILE__,
+ __LINE__);
+ goto error;
+ }
+ di_trace->static_listener_id = ret;
+ }
+
+
goto end;
error:
BT_PUT(writer_trace);
+ g_free(di_trace);
+ di_trace = NULL;
end:
- return writer_trace;
+ bt_put(stream);
+ bt_put(writer_stream);
+ bt_put(stream_class);
+ bt_put(trace);
+ return di_trace;
}
static
struct bt_ctf_packet *lookup_packet(struct debug_info_iterator *debug_it,
- struct bt_ctf_packet *packet)
+ struct bt_ctf_packet *packet,
+ struct debug_info_trace *di_trace)
{
return (struct bt_ctf_packet *) g_hash_table_lookup(
- debug_it->packet_map,
+ di_trace->packet_map,
(gpointer) packet);
}
static
struct bt_ctf_packet *insert_new_packet(struct debug_info_iterator *debug_it,
struct bt_ctf_packet *packet,
- struct bt_ctf_stream *writer_stream)
+ struct bt_ctf_stream *writer_stream,
+ struct debug_info_trace *di_trace)
{
struct bt_ctf_packet *writer_packet;
__FILE__, __LINE__);
goto end;
}
- g_hash_table_insert(debug_it->packet_map, (gpointer) packet, writer_packet);
+ g_hash_table_insert(di_trace->packet_map, (gpointer) packet, writer_packet);
end:
return writer_packet;
BT_PUT(type);
type = bt_ctf_stream_class_get_event_header_type(stream_class);
- if (!type) {
- fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
- __LINE__);
- goto error;
- }
-
- ret_int = bt_ctf_stream_class_set_event_header_type(
- writer_stream_class, type);
- if (ret_int < 0) {
- fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
- __LINE__);
- goto error;
+ if (type) {
+ ret_int = bt_ctf_stream_class_set_event_header_type(
+ writer_stream_class, type);
+ if (ret_int < 0) {
+ fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
+ __LINE__);
+ goto error;
+ }
+ BT_PUT(type);
}
- BT_PUT(type);
type = bt_ctf_stream_class_get_event_context_type(stream_class);
if (type) {
{
struct bt_ctf_stream_class *writer_stream_class = NULL;
struct bt_ctf_trace *trace, *writer_trace = NULL;
+ struct debug_info_trace *di_trace;
enum bt_component_status ret;
int int_ret;
goto error;
}
- writer_trace = lookup_trace(debug_it, trace);
- if (!writer_trace) {
- writer_trace = insert_new_trace(debug_it, trace);
- if (!writer_trace) {
- fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
- __FILE__, __LINE__);
- ret = BT_COMPONENT_STATUS_ERROR;
- goto error;
- }
+ di_trace = lookup_trace(debug_it, trace);
+ if (!di_trace) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ ret = BT_COMPONENT_STATUS_ERROR;
+ goto error;
}
+ writer_trace = di_trace->writer_trace;
bt_get(writer_trace);
writer_stream_class = copy_stream_class_debug_info(debug_it->err, stream_class,
__LINE__);
goto error;
}
- BT_PUT(writer_trace);
- BT_PUT(trace);
- g_hash_table_insert(debug_it->stream_class_map,
+ g_hash_table_insert(di_trace->stream_class_map,
(gpointer) stream_class, writer_stream_class);
goto end;
static
struct bt_ctf_stream *insert_new_stream(
struct debug_info_iterator *debug_it,
- struct bt_ctf_stream_class *stream_class,
- struct bt_ctf_stream *stream)
+ struct bt_ctf_stream *stream,
+ struct debug_info_trace *di_trace)
{
struct bt_ctf_stream *writer_stream = NULL;
+ struct bt_ctf_stream_class *stream_class = NULL;
struct bt_ctf_stream_class *writer_stream_class = NULL;
+ stream_class = bt_ctf_stream_get_class(stream);
+ if (!stream_class) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n",
+ __func__, __FILE__, __LINE__);
+ goto error;
+ }
+
writer_stream_class = g_hash_table_lookup(
- debug_it->stream_class_map,
+ di_trace->stream_class_map,
(gpointer) stream_class);
if (!writer_stream_class) {
goto error;
}
- g_hash_table_insert(debug_it->stream_map, (gpointer) stream,
+ g_hash_table_insert(di_trace->stream_map, (gpointer) stream,
writer_stream);
goto end;
error:
BT_PUT(writer_stream);
end:
+ bt_put(stream_class);
bt_put(writer_stream_class);
return writer_stream;
}
static
struct bt_ctf_stream *lookup_stream(struct debug_info_iterator *debug_it,
- struct bt_ctf_stream *stream)
+ struct bt_ctf_stream *stream,
+ struct debug_info_trace *di_trace)
{
return (struct bt_ctf_stream *) g_hash_table_lookup(
- debug_it->stream_map,
- (gpointer) stream);
+ di_trace->stream_map, (gpointer) stream);
}
static
bt_ctf_event_class_get_id(event_class));
}
+static
+struct debug_info_trace *lookup_di_trace_from_stream(
+ struct debug_info_iterator *debug_it,
+ struct bt_ctf_stream *stream)
+{
+ struct bt_ctf_stream_class *stream_class = NULL;
+ struct bt_ctf_trace *trace = NULL;
+ struct debug_info_trace *di_trace = NULL;
+
+ stream_class = bt_ctf_stream_get_class(stream);
+ if (!stream_class) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n",
+ __func__, __FILE__, __LINE__);
+ goto end;
+ }
+
+ trace = bt_ctf_stream_class_get_trace(stream_class);
+ if (!trace) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n",
+ __func__, __FILE__, __LINE__);
+ goto end;
+ }
+
+ di_trace = (struct debug_info_trace *) g_hash_table_lookup(
+ debug_it->trace_map, (gpointer) trace);
+
+end:
+ BT_PUT(stream_class);
+ BT_PUT(trace);
+ return di_trace;
+}
+
static
struct bt_ctf_stream *get_writer_stream(
struct debug_info_iterator *debug_it,
{
struct bt_ctf_stream_class *stream_class = NULL;
struct bt_ctf_stream *writer_stream = NULL;
+ struct debug_info_trace *di_trace = NULL;
stream_class = bt_ctf_stream_get_class(stream);
if (!stream_class) {
goto error;
}
- writer_stream = lookup_stream(debug_it, stream);
+ di_trace = lookup_di_trace_from_stream(debug_it, stream);
+ if (!di_trace) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n",
+ __func__, __FILE__, __LINE__);
+ goto error;
+ }
+
+ writer_stream = lookup_stream(debug_it, stream, di_trace);
if (!writer_stream) {
- writer_stream = insert_new_stream(debug_it, stream_class, stream);
+ fprintf(debug_it->err, "[error] %s in %s:%d\n",
+ __func__, __FILE__, __LINE__);
+ goto error;
}
bt_get(writer_stream);
struct bt_ctf_stream *stream = NULL, *writer_stream = NULL;
struct bt_ctf_field *writer_packet_context = NULL;
struct bt_ctf_packet *writer_packet = NULL;
+ struct debug_info_trace *di_trace;
int int_ret;
stream = bt_ctf_packet_get_stream(packet);
goto error;
}
+ di_trace = lookup_di_trace_from_stream(debug_it, stream);
+ if (!di_trace) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+
/*
* If a packet was already opened, close it and remove it from
* the HT.
*/
- writer_packet = lookup_packet(debug_it, packet);
+ writer_packet = lookup_packet(debug_it, packet, di_trace);
if (writer_packet) {
- g_hash_table_remove(debug_it->packet_map, packet);
+ g_hash_table_remove(di_trace->packet_map, packet);
BT_PUT(writer_packet);
}
- writer_packet = insert_new_packet(debug_it, packet, writer_stream);
+ writer_packet = insert_new_packet(debug_it, packet, writer_stream,
+ di_trace);
if (!writer_packet) {
fprintf(debug_it->err, "[error] %s in %s:%d\n",
__func__, __FILE__, __LINE__);
goto error;
}
- bt_get(writer_packet);
writer_packet_context = ctf_copy_packet_context(debug_it->err, packet,
writer_stream);
__func__, __FILE__, __LINE__);
goto error;
}
+
+ bt_get(writer_packet);
goto end;
error:
struct bt_ctf_packet *packet)
{
struct bt_ctf_packet *writer_packet = NULL;
+ struct bt_ctf_stream *stream = NULL;
+ struct debug_info_trace *di_trace;
+
+ stream = bt_ctf_packet_get_stream(packet);
+ if (!stream) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto end;
+ }
- writer_packet = lookup_packet(debug_it, packet);
+ di_trace = lookup_di_trace_from_stream(debug_it, stream);
+ if (!di_trace) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto end;
+ }
+
+ writer_packet = lookup_packet(debug_it, packet, di_trace);
if (!writer_packet) {
fprintf(debug_it->err, "[error] %s in %s:%d\n",
__func__, __FILE__, __LINE__);
goto end;
}
- g_hash_table_remove(debug_it->packet_map, packet);
+ bt_get(writer_packet);
+ g_hash_table_remove(di_trace->packet_map, packet);
end:
+ bt_put(stream);
return writer_packet;
}
+BT_HIDDEN
+struct bt_ctf_stream *debug_info_stream_begin(
+ struct debug_info_iterator *debug_it,
+ struct bt_ctf_stream *stream)
+{
+ struct bt_ctf_stream *writer_stream = NULL;
+ enum debug_info_stream_state *state;
+ struct debug_info_trace *di_trace = NULL;
+
+ di_trace = lookup_di_trace_from_stream(debug_it, stream);
+ if (!di_trace) {
+ di_trace = insert_new_trace(debug_it, stream);
+ if (!di_trace) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n",
+ __func__, __FILE__, __LINE__);
+ goto error;
+ }
+ }
+
+ /* Set the stream as active */
+ state = g_hash_table_lookup(di_trace->stream_states, stream);
+ if (!state) {
+ if (di_trace->trace_static) {
+ fprintf(debug_it->err, "[error] Adding a new stream "
+ "on a static trace\n");
+ goto error;
+ }
+ state = insert_new_stream_state(debug_it, di_trace,
+ stream);
+ if (!state) {
+ fprintf(debug_it->err, "[error] Adding a new stream "
+ "on a static trace\n");
+ goto error;
+ }
+ }
+ if (*state != DEBUG_INFO_UNKNOWN_STREAM) {
+ fprintf(debug_it->err, "[error] Unexpected stream state %d\n",
+ *state);
+ goto error;
+ }
+ *state = DEBUG_INFO_ACTIVE_STREAM;
+
+ writer_stream = lookup_stream(debug_it, stream, di_trace);
+ if (!writer_stream) {
+ writer_stream = insert_new_stream(debug_it, stream, di_trace);
+ }
+ bt_get(writer_stream);
+
+ goto end;
+
+error:
+ BT_PUT(writer_stream);
+end:
+ return writer_stream;
+}
+
BT_HIDDEN
struct bt_ctf_stream *debug_info_stream_end(struct debug_info_iterator *debug_it,
struct bt_ctf_stream *stream)
{
- struct bt_ctf_stream *writer_stream;
+ struct bt_ctf_stream *writer_stream = NULL;
+ struct debug_info_trace *di_trace = NULL;
+ enum debug_info_stream_state *state;
+
+ di_trace = lookup_di_trace_from_stream(debug_it, stream);
+ if (!di_trace) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n",
+ __func__, __FILE__, __LINE__);
+ goto error;
+ }
- writer_stream = lookup_stream(debug_it, stream);
+ writer_stream = lookup_stream(debug_it, stream, di_trace);
if (!writer_stream) {
fprintf(debug_it->err, "[error] %s in %s:%d\n",
__func__, __FILE__, __LINE__);
- goto end;
+ goto error;
}
- g_hash_table_remove(debug_it->stream_map, stream);
+ /*
+ * Take the ref on the stream and keep it until the notification
+ * is created.
+ */
+ bt_get(writer_stream);
+
+ state = g_hash_table_lookup(di_trace->stream_states, stream);
+ if (*state != DEBUG_INFO_ACTIVE_STREAM) {
+ fprintf(debug_it->err, "[error] Unexpected stream "
+ "state %d\n", *state);
+ goto error;
+ }
+ *state = DEBUG_INFO_COMPLETED_STREAM;
+
+ g_hash_table_remove(di_trace->stream_map, stream);
+
+ if (di_trace->trace_static) {
+ int trace_completed = 1;
+
+ g_hash_table_foreach(di_trace->stream_states,
+ check_completed_trace, &trace_completed);
+ if (trace_completed) {
+ debug_info_close_trace(debug_it, di_trace);
+ g_hash_table_remove(debug_it->trace_map,
+ di_trace->trace);
+ }
+ }
+
+ goto end;
+
+error:
+ BT_PUT(writer_stream);
end:
return writer_stream;
struct debug_info_source *dbg_info_src,
struct debug_info_component *component)
{
- int i, nr_fields, ret;
+ int i, nr_fields, ret = 0;
struct bt_ctf_field_type *debug_field_type = NULL;
struct bt_ctf_field *field = NULL;
struct bt_ctf_field_type *field_type = NULL;
struct debug_info *debug_info,
struct debug_info_component *component)
{
- struct bt_ctf_field_type *writer_event_context_type = NULL;
+ struct bt_ctf_field_type *writer_event_context_type = NULL,
+ *event_context_type = NULL;
struct bt_ctf_field *writer_event_context = NULL;
struct bt_ctf_field *field = NULL, *copy_field = NULL, *debug_field = NULL;
struct bt_ctf_field_type *field_type = NULL;
goto error;
}
+ event_context_type = bt_ctf_field_get_type(event_context);
+ if (!event_context_type) {
+ fprintf(err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+
/*
* If it is not a structure, we did not modify it to add the debug info
* fields, so just assign it as is.
goto error;
}
- field = bt_ctf_field_structure_get_field_by_index(event_context, i);
+ /*
+ * Prevent illegal access in the event_context.
+ */
+ if (i < bt_ctf_field_type_structure_get_field_count(event_context_type)) {
+ field = bt_ctf_field_structure_get_field_by_index(event_context, i);
+ }
/*
* The debug_info field, only exists in the writer event or
* if it was set by a earlier pass of the debug_info plugin.
- *
- * FIXME: are we replacing an exisiting debug_info struct here ??
*/
if (!strcmp(field_name, component->arg_debug_info_field_name) &&
!field) {
goto error;
}
- ret = bt_ctf_field_structure_set_field(writer_event_context,
+ ret = bt_ctf_field_structure_set_field_by_name(
+ writer_event_context,
field_name, copy_field);
if (ret) {
fprintf(err, "[error] %s in %s:%d\n", __func__,
error:
ret = -1;
end:
+ bt_put(event_context_type);
bt_put(writer_event_context_type);
bt_put(writer_event_context);
bt_put(field);
goto end;
}
+ if (!bt_ctf_trace_get_clock_class_count(trace)) {
+ /* No clock. */
+ goto end;
+ }
+
/* FIXME multi-clock? */
clock_class = bt_ctf_trace_get_clock_class_by_index(trace, 0);
clock_class = event_get_clock_class(err, event);
if (!clock_class) {
- fprintf(err, "[error] %s in %s:%d\n", __func__, __FILE__,
- __LINE__);
- goto error;
+ /* No clock on input trace. */
+ goto end;
}
clock_value = bt_ctf_event_get_clock_value(event, clock_class);
goto error;
}
+ /* Optional field, so it can fail silently. */
field = bt_ctf_event_get_header(event);
- if (!field) {
- fprintf(err, "[error] %s in %s:%d\n", __func__,
- __FILE__, __LINE__);
- goto error;
- }
-
- ret = ctf_copy_event_header(err, event, writer_event_class,
- writer_event, field);
- if (ret) {
- fprintf(err, "[error] %s in %s:%d\n", __func__,
- __FILE__, __LINE__);
- goto error;
+ if (field) {
+ ret = ctf_copy_event_header(err, event, writer_event_class,
+ writer_event, field);
+ if (ret) {
+ fprintf(err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+ BT_PUT(field);
}
- BT_PUT(field);
/* Optional field, so it can fail silently. */
field = bt_ctf_event_get_stream_event_context(event);
/* Optional field, so it can fail silently. */
field = bt_ctf_event_get_event_context(event);
- copy_field = bt_ctf_field_copy(field);
- if (copy_field) {
+ if (field) {
+ copy_field = bt_ctf_field_copy(field);
+ if (!copy_field) {
+ fprintf(err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
ret = bt_ctf_event_set_event_context(writer_event, copy_field);
if (ret < 0) {
fprintf(err, "[error] %s in %s:%d\n", __func__,
goto error;
}
BT_PUT(copy_field);
+ BT_PUT(field);
}
- BT_PUT(field);
field = bt_ctf_event_get_event_payload(event);
if (!field) {
struct bt_ctf_event *writer_event = NULL;
struct bt_ctf_packet *packet = NULL, *writer_packet = NULL;
struct bt_ctf_trace *writer_trace = NULL;
+ struct bt_ctf_stream *stream = NULL;
+ struct debug_info_trace *di_trace;
struct debug_info *debug_info;
const char *event_name;
int int_ret;
__FILE__, __LINE__);
goto error;
}
+ stream = bt_ctf_event_get_stream(event);
+ if (!stream) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
+ di_trace = lookup_di_trace_from_stream(debug_it, stream);
+ if (!di_trace) {
+ fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
+ __FILE__, __LINE__);
+ goto error;
+ }
writer_stream_class = g_hash_table_lookup(
- debug_it->stream_class_map,
+ di_trace->stream_class_map,
(gpointer) stream_class);
- if (!writer_stream_class || !bt_get(writer_stream_class)) {
+ if (!writer_stream_class) {
fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
__FILE__, __LINE__);
goto error;
}
+ bt_get(writer_stream_class);
writer_event_class = get_event_class(debug_it,
writer_stream_class, event_class);
goto error;
}
- debug_info = get_trace_debug_info(debug_it, writer_trace);
+ debug_info = get_trace_debug_info(debug_it, writer_trace, di_trace);
if (debug_info) {
debug_info_handle_event(debug_it->err, event, debug_info);
}
goto error;
}
- writer_packet = lookup_packet(debug_it, packet);
+ writer_packet = lookup_packet(debug_it, packet, di_trace);
if (!writer_packet) {
fprintf(debug_it->err, "[error] %s in %s:%d\n", __func__,
__FILE__, __LINE__);
BT_PUT(writer_event);
end:
+ bt_put(stream);
bt_put(writer_trace);
bt_put(writer_packet);
bt_put(packet);
projects / babeltrace.git / blobdiff