X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Flttng-utils%2Fdebug-info%2Ftrace-ir-mapping.c;h=3b694d3b6b7f41d1c4eab8f2cd3324e5760ff293;hb=98b15851a941e7342b8bb19e265cdc3a40fabfb8;hp=dfef517f16e827eb124180335013c6e7a0699332;hpb=19bbdc9bfcbbfabb1f04dad12ff1df5d7075bf11;p=babeltrace.git diff --git a/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c b/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c index dfef517f..3b694d3b 100644 --- a/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c +++ b/src/plugins/lttng-utils/debug-info/trace-ir-mapping.c @@ -28,7 +28,7 @@ #define BT_COMP_LOG_SELF_COMP (ir_maps->self_comp) #define BT_LOG_OUTPUT_LEVEL (ir_maps->log_level) #define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/TRACE-IR-MAPPING" -#include "plugins/comp-logging.h" +#include "logging/comp-logging.h" #include @@ -71,7 +71,7 @@ bt_trace_class *create_new_mapped_trace_class(struct trace_ir_maps *ir_maps, } BT_COMP_LOGD("Created new mapped trace class: in-tc-addr=%p, out-tc-addr=%p", - in_trace_class, out_trace_class); + in_trace_class, out_trace_class); end: return out_trace_class; @@ -81,9 +81,9 @@ static bt_trace *create_new_mapped_trace(struct trace_ir_maps *ir_maps, const bt_trace *in_trace) { - bt_trace *out_trace; - const bt_trace_class *in_trace_class; struct trace_ir_metadata_maps *metadata_maps; + const bt_trace_class *in_trace_class; + bt_trace *out_trace; BT_COMP_LOGD("Creating new mapped trace: in-t-addr=%p", in_trace); BT_ASSERT(ir_maps); @@ -91,9 +91,13 @@ bt_trace *create_new_mapped_trace(struct trace_ir_maps *ir_maps, in_trace_class = bt_trace_borrow_class_const(in_trace); metadata_maps = borrow_metadata_maps_from_input_trace_class(ir_maps, - in_trace_class); + in_trace_class); if (!metadata_maps->output_trace_class) { + /* + * If there is no output trace class yet, create a one and add + * it to the mapping. + */ metadata_maps->output_trace_class = create_new_mapped_trace_class(ir_maps, in_trace_class); if (!metadata_maps->output_trace_class) { @@ -102,18 +106,19 @@ bt_trace *create_new_mapped_trace(struct trace_ir_maps *ir_maps, } } + /* Create the output trace from the output trace class. */ out_trace = bt_trace_create(metadata_maps->output_trace_class); if (!out_trace) { BT_COMP_LOGE_STR("Error create output trace"); goto end; } - /* If not, create a new one and add it to the mapping. */ + /* Copy the content over to the output trace. */ copy_trace_content(in_trace, out_trace, ir_maps->log_level, ir_maps->self_comp); BT_COMP_LOGD("Created new mapped trace: in-t-addr=%p, out-t-addr=%p", - in_trace, out_trace); + in_trace, out_trace); end: return out_trace; } @@ -122,54 +127,57 @@ static bt_stream_class *borrow_mapped_stream_class(struct trace_ir_metadata_maps *md_maps, const bt_stream_class *in_stream_class) { - BT_ASSERT(md_maps); - BT_ASSERT(in_stream_class); + BT_ASSERT_DBG(md_maps); + BT_ASSERT_DBG(in_stream_class); return g_hash_table_lookup(md_maps->stream_class_map, - (gpointer) in_stream_class); + (gpointer) in_stream_class); } static bt_stream_class *create_new_mapped_stream_class(struct trace_ir_maps *ir_maps, const bt_stream_class *in_stream_class) { - int ret; - bt_stream_class *out_stream_class; struct trace_ir_metadata_maps *md_maps; + bt_stream_class *out_stream_class; + int ret; BT_COMP_LOGD("Creating new mapped stream class: in-sc-addr=%p", - in_stream_class); + in_stream_class); + + BT_ASSERT(ir_maps); + BT_ASSERT(in_stream_class); md_maps = borrow_metadata_maps_from_input_stream_class(ir_maps, - in_stream_class); + in_stream_class); BT_ASSERT(md_maps); - BT_ASSERT(in_stream_class); BT_ASSERT(!borrow_mapped_stream_class(md_maps, in_stream_class)); - /* Create an out_stream_class. */ + /* Create the output stream class. */ out_stream_class = bt_stream_class_create_with_id( - md_maps->output_trace_class, - bt_stream_class_get_id(in_stream_class)); + md_maps->output_trace_class, + bt_stream_class_get_id(in_stream_class)); if (!out_stream_class) { BT_COMP_LOGE_STR("Error create output stream class"); goto end; } - /* If not, create a new one and add it to the mapping. */ + /* Copy the content over to the output stream class. */ ret = copy_stream_class_content(ir_maps, in_stream_class, - out_stream_class); + out_stream_class); if (ret) { BT_COMP_LOGE_STR("Error copy content to output stream class"); out_stream_class = NULL; goto end; } + /* Add it to the mapping. */ g_hash_table_insert(md_maps->stream_class_map, - (gpointer) in_stream_class, out_stream_class); + (gpointer) in_stream_class, out_stream_class); BT_COMP_LOGD("Created new mapped stream class: in-sc-addr=%p, out-sc-addr=%p", - in_stream_class, out_stream_class); + in_stream_class, out_stream_class); end: return out_stream_class; @@ -179,16 +187,15 @@ static bt_stream *borrow_mapped_stream(struct trace_ir_data_maps *d_maps, const bt_stream *in_stream) { - BT_ASSERT(d_maps); - BT_ASSERT(in_stream); + BT_ASSERT_DBG(d_maps); + BT_ASSERT_DBG(in_stream); return g_hash_table_lookup(d_maps->stream_map, (gpointer) in_stream); } BT_HIDDEN bt_stream *trace_ir_mapping_create_new_mapped_stream( - struct trace_ir_maps *ir_maps, - const bt_stream *in_stream) + struct trace_ir_maps *ir_maps, const bt_stream *in_stream) { struct trace_ir_data_maps *d_maps; struct trace_ir_metadata_maps *md_maps; @@ -205,6 +212,7 @@ bt_stream *trace_ir_mapping_create_new_mapped_stream( d_maps = borrow_data_maps_from_input_trace(ir_maps, in_trace); if (!d_maps->output_trace) { + /* Create the output trace for this input trace. */ d_maps->output_trace = create_new_mapped_trace(ir_maps, in_trace); if (!d_maps->output_trace) { goto end; @@ -218,33 +226,33 @@ bt_stream *trace_ir_mapping_create_new_mapped_stream( md_maps = borrow_metadata_maps_from_input_stream_class(ir_maps, in_stream_class); out_stream_class = borrow_mapped_stream_class(md_maps, in_stream_class); if (!out_stream_class) { + /* Create the output stream class for this input stream class. */ out_stream_class = create_new_mapped_stream_class(ir_maps, - in_stream_class); + in_stream_class); if (!out_stream_class) { goto end; } } BT_ASSERT(out_stream_class); + /* Create the output stream for this input stream. */ out_stream = bt_stream_create_with_id(out_stream_class, - d_maps->output_trace, bt_stream_get_id(in_stream)); + d_maps->output_trace, bt_stream_get_id(in_stream)); if (!out_stream) { BT_COMP_LOGE_STR("Error creating output stream"); goto end; } - /* - * Release our ref since the trace object will be managing the life - * time of the stream objects. - */ + /* Copy the content over to the output stream. */ copy_stream_content(in_stream, out_stream, ir_maps->log_level, ir_maps->self_comp); + /* Add it to the mapping. */ g_hash_table_insert(d_maps->stream_map, (gpointer) in_stream, - out_stream); + out_stream); BT_COMP_LOGD("Created new mapped stream: in-s-addr=%p, out-s-addr=%p", - in_stream, out_stream); + in_stream, out_stream); end: return out_stream; @@ -254,10 +262,11 @@ BT_HIDDEN bt_stream *trace_ir_mapping_borrow_mapped_stream(struct trace_ir_maps *ir_maps, const bt_stream *in_stream) { - BT_ASSERT(ir_maps); - BT_ASSERT(in_stream); struct trace_ir_data_maps *d_maps; + BT_ASSERT_DBG(ir_maps); + BT_ASSERT_DBG(in_stream); + d_maps = borrow_data_maps_from_input_stream(ir_maps, in_stream); /* Return the mapped stream. */ return borrow_mapped_stream(d_maps, in_stream); @@ -268,7 +277,7 @@ bt_event_class *borrow_mapped_event_class(struct trace_ir_metadata_maps *md_maps const bt_event_class *in_event_class) { return g_hash_table_lookup(md_maps->event_class_map, - (gpointer) in_event_class); + (gpointer) in_event_class); } BT_HIDDEN @@ -276,56 +285,55 @@ bt_event_class *trace_ir_mapping_create_new_mapped_event_class( struct trace_ir_maps *ir_maps, const bt_event_class *in_event_class) { - bt_event_class *out_event_class; - const bt_trace_class *in_trace_class; + struct trace_ir_metadata_maps *md_maps; const bt_stream_class *in_stream_class; bt_stream_class *out_stream_class; - struct trace_ir_metadata_maps *md_maps; + bt_event_class *out_event_class; int ret; + BT_COMP_LOGD("Creating new mapped event class: in-ec-addr=%p", + in_event_class); + BT_ASSERT(ir_maps); BT_ASSERT(in_event_class); - BT_COMP_LOGD("Creating new mapped event class: in-ec-addr=%p", - in_event_class); - in_trace_class = bt_stream_class_borrow_trace_class_const( - bt_event_class_borrow_stream_class_const( - in_event_class)); + in_stream_class = bt_event_class_borrow_stream_class_const(in_event_class); - md_maps = borrow_metadata_maps_from_input_trace_class(ir_maps, in_trace_class); + BT_ASSERT(in_stream_class); - BT_ASSERT(!borrow_mapped_event_class(md_maps, in_event_class)); + md_maps = borrow_metadata_maps_from_input_stream_class(ir_maps, + in_stream_class); - in_stream_class = - bt_event_class_borrow_stream_class_const(in_event_class); - BT_ASSERT(in_stream_class); + BT_ASSERT(md_maps); + BT_ASSERT(!borrow_mapped_event_class(md_maps, in_event_class)); - /* Get the right output stream class to add the new event class to. */ + /* Get the right output stream class to add the new event class to it. */ out_stream_class = borrow_mapped_stream_class(md_maps, in_stream_class); BT_ASSERT(out_stream_class); /* Create an output event class. */ out_event_class = bt_event_class_create_with_id(out_stream_class, - bt_event_class_get_id(in_event_class)); + bt_event_class_get_id(in_event_class)); if (!out_event_class) { BT_COMP_LOGE_STR("Error creating output event class"); goto end; } - /* If not, create a new one and add it to the mapping. */ + /* Copy the content over to the output event class. */ ret = copy_event_class_content(ir_maps, in_event_class, - out_event_class); + out_event_class); if (ret) { BT_COMP_LOGE_STR("Error copy content to output event class"); out_event_class = NULL; goto end; } + /* Add it to the mapping. */ g_hash_table_insert(md_maps->event_class_map, - (gpointer) in_event_class, out_event_class); + (gpointer) in_event_class, out_event_class); BT_COMP_LOGD("Created new mapped event class: in-ec-addr=%p, out-ec-addr=%p", - in_event_class, out_event_class); + in_event_class, out_event_class); end: return out_event_class; @@ -338,10 +346,11 @@ bt_event_class *trace_ir_mapping_borrow_mapped_event_class( { struct trace_ir_metadata_maps *md_maps; - BT_ASSERT(ir_maps); - BT_ASSERT(in_event_class); + BT_ASSERT_DBG(ir_maps); + BT_ASSERT_DBG(in_event_class); - md_maps = borrow_metadata_maps_from_input_event_class(ir_maps, in_event_class); + md_maps = borrow_metadata_maps_from_input_event_class(ir_maps, + in_event_class); /* Return the mapped event_class. */ return borrow_mapped_event_class(md_maps, in_event_class); @@ -351,11 +360,10 @@ static inline bt_packet *borrow_mapped_packet(struct trace_ir_data_maps *d_maps, const bt_packet *in_packet) { - BT_ASSERT(d_maps); - BT_ASSERT(in_packet); + BT_ASSERT_DBG(d_maps); + BT_ASSERT_DBG(in_packet); - return g_hash_table_lookup(d_maps->packet_map, - (gpointer) in_packet); + return g_hash_table_lookup(d_maps->packet_map, (gpointer) in_packet); } BT_HIDDEN @@ -364,8 +372,8 @@ bt_packet *trace_ir_mapping_create_new_mapped_packet( const bt_packet *in_packet) { struct trace_ir_data_maps *d_maps; - const bt_trace *in_trace; const bt_stream *in_stream; + const bt_trace *in_trace; bt_packet *out_packet; bt_stream *out_stream; @@ -375,9 +383,8 @@ bt_packet *trace_ir_mapping_create_new_mapped_packet( in_trace = bt_stream_borrow_trace_const(in_stream); d_maps = borrow_data_maps_from_input_trace(ir_maps, in_trace); - /* There should never be a mapped packet. */ + /* There should never be a mapped packet already. */ BT_ASSERT(!borrow_mapped_packet(d_maps, in_packet)); - BT_ASSERT(in_stream); /* Get output stream corresponding to this input stream. */ @@ -391,18 +398,16 @@ bt_packet *trace_ir_mapping_create_new_mapped_packet( goto end; } - /* - * Release our ref since the stream object will be managing the life - * time of the packet objects. - */ + /* Copy the content over to the output packet. */ copy_packet_content(in_packet, out_packet, ir_maps->log_level, ir_maps->self_comp); + /* Add it to the mapping. */ g_hash_table_insert(d_maps->packet_map, - (gpointer) in_packet, out_packet); + (gpointer) in_packet, out_packet); BT_COMP_LOGD("Created new mapped packet: in-p-addr=%p, out-p-addr=%p", - in_packet, out_packet); + in_packet, out_packet); end: return out_packet; @@ -413,8 +418,8 @@ bt_packet *trace_ir_mapping_borrow_mapped_packet(struct trace_ir_maps *ir_maps, const bt_packet *in_packet) { struct trace_ir_data_maps *d_maps; - BT_ASSERT(ir_maps); - BT_ASSERT(in_packet); + BT_ASSERT_DBG(ir_maps); + BT_ASSERT_DBG(in_packet); d_maps = borrow_data_maps_from_input_packet(ir_maps, in_packet); @@ -425,9 +430,9 @@ BT_HIDDEN void trace_ir_mapping_remove_mapped_packet(struct trace_ir_maps *ir_maps, const bt_packet *in_packet) { + struct trace_ir_data_maps *d_maps; gboolean ret; - struct trace_ir_data_maps *d_maps; BT_ASSERT(ir_maps); BT_ASSERT(in_packet); @@ -442,8 +447,8 @@ BT_HIDDEN void trace_ir_mapping_remove_mapped_stream(struct trace_ir_maps *ir_maps, const bt_stream *in_stream) { - gboolean ret; struct trace_ir_data_maps *d_maps; + gboolean ret; BT_ASSERT(ir_maps); BT_ASSERT(in_stream); @@ -463,7 +468,7 @@ void trace_ir_metadata_maps_remove_func(const bt_trace_class *in_trace_class, if (maps->metadata_maps) { gboolean ret; ret = g_hash_table_remove(maps->metadata_maps, - (gpointer) in_trace_class); + (gpointer) in_trace_class); BT_ASSERT(ret); } } @@ -482,9 +487,8 @@ void trace_ir_data_maps_remove_func(const bt_trace *in_trace, void *data) struct trace_ir_data_maps *trace_ir_data_maps_create(struct trace_ir_maps *ir_maps, const bt_trace *in_trace) { - struct trace_ir_data_maps *d_maps = - g_new0(struct trace_ir_data_maps, 1); bt_trace_add_listener_status add_listener_status; + struct trace_ir_data_maps *d_maps = g_new0(struct trace_ir_data_maps, 1); if (!d_maps) { BT_COMP_LOGE_STR("Error allocating trace_ir_maps"); @@ -497,9 +501,9 @@ struct trace_ir_data_maps *trace_ir_data_maps_create(struct trace_ir_maps *ir_ma /* Create the hashtables used to map data objects. */ d_maps->stream_map = g_hash_table_new_full(g_direct_hash, - g_direct_equal, NULL,(GDestroyNotify) bt_stream_put_ref); + g_direct_equal, NULL,(GDestroyNotify) bt_stream_put_ref); d_maps->packet_map = g_hash_table_new_full(g_direct_hash, - g_direct_equal, NULL,(GDestroyNotify) bt_packet_put_ref); + g_direct_equal, NULL,(GDestroyNotify) bt_packet_put_ref); add_listener_status = bt_trace_add_destruction_listener( in_trace, trace_ir_data_maps_remove_func, @@ -514,9 +518,9 @@ struct trace_ir_metadata_maps *trace_ir_metadata_maps_create( struct trace_ir_maps *ir_maps, const bt_trace_class *in_trace_class) { + bt_trace_class_add_listener_status add_listener_status; struct trace_ir_metadata_maps *md_maps = g_new0(struct trace_ir_metadata_maps, 1); - bt_trace_class_add_listener_status add_listener_status; if (!md_maps) { BT_COMP_LOGE_STR("Error allocating trace_ir_maps"); @@ -540,20 +544,18 @@ struct trace_ir_metadata_maps *trace_ir_metadata_maps_create( /* Create the hashtables used to map metadata objects. */ md_maps->stream_class_map = g_hash_table_new_full(g_direct_hash, - g_direct_equal, NULL, (GDestroyNotify) bt_stream_class_put_ref); + g_direct_equal, NULL, (GDestroyNotify) bt_stream_class_put_ref); md_maps->event_class_map = g_hash_table_new_full(g_direct_hash, - g_direct_equal, NULL, (GDestroyNotify) bt_event_class_put_ref); + g_direct_equal, NULL, (GDestroyNotify) bt_event_class_put_ref); md_maps->field_class_map = g_hash_table_new_full(g_direct_hash, - g_direct_equal, NULL, (GDestroyNotify) bt_field_class_put_ref); + g_direct_equal, NULL, (GDestroyNotify) bt_field_class_put_ref); md_maps->clock_class_map = g_hash_table_new_full(g_direct_hash, - g_direct_equal, NULL, (GDestroyNotify) bt_clock_class_put_ref); + g_direct_equal, NULL, (GDestroyNotify) bt_clock_class_put_ref); add_listener_status = bt_trace_class_add_destruction_listener( - in_trace_class, - trace_ir_metadata_maps_remove_func, - ir_maps, &md_maps->destruction_listener_id); - BT_ASSERT(add_listener_status == - BT_TRACE_CLASS_ADD_LISTENER_STATUS_OK); + in_trace_class, trace_ir_metadata_maps_remove_func, + ir_maps, &md_maps->destruction_listener_id); + BT_ASSERT(add_listener_status == BT_TRACE_CLASS_ADD_LISTENER_STATUS_OK); error: return md_maps; @@ -624,8 +626,7 @@ void trace_ir_metadata_maps_destroy(struct trace_ir_metadata_maps *maps) } status = bt_trace_class_remove_destruction_listener( - maps->input_trace_class, - maps->destruction_listener_id); + maps->input_trace_class, maps->destruction_listener_id); if (status != BT_TRACE_CLASS_REMOVE_LISTENER_STATUS_OK) { BT_COMP_LOG_CUR_LVL(BT_LOG_DEBUG, maps->log_level, maps->self_comp, @@ -673,8 +674,7 @@ BT_HIDDEN struct trace_ir_maps *trace_ir_maps_create(bt_self_component *self_comp, const char *debug_info_field_name, bt_logging_level log_level) { - struct trace_ir_maps *ir_maps = - g_new0(struct trace_ir_maps, 1); + struct trace_ir_maps *ir_maps = g_new0(struct trace_ir_maps, 1); if (!ir_maps) { BT_COMP_LOG_CUR_LVL(BT_LOG_ERROR, log_level, self_comp, "Error allocating trace_ir_maps"); @@ -685,8 +685,7 @@ struct trace_ir_maps *trace_ir_maps_create(bt_self_component *self_comp, ir_maps->self_comp = self_comp; /* Copy debug info field name received from the user. */ - ir_maps->debug_info_field_class_name = - g_strdup(debug_info_field_name); + ir_maps->debug_info_field_class_name = g_strdup(debug_info_field_name); if (!ir_maps->debug_info_field_class_name) { BT_COMP_LOGE_STR("Cannot copy debug info field name"); goto error; @@ -695,12 +694,12 @@ struct trace_ir_maps *trace_ir_maps_create(bt_self_component *self_comp, ir_maps->self_comp = self_comp; ir_maps->data_maps = g_hash_table_new_full(g_direct_hash, - g_direct_equal, (GDestroyNotify) NULL, - (GDestroyNotify) trace_ir_data_maps_destroy); + g_direct_equal, (GDestroyNotify) NULL, + (GDestroyNotify) trace_ir_data_maps_destroy); ir_maps->metadata_maps = g_hash_table_new_full(g_direct_hash, - g_direct_equal, (GDestroyNotify) NULL, - (GDestroyNotify) trace_ir_metadata_maps_destroy); + g_direct_equal, (GDestroyNotify) NULL, + (GDestroyNotify) trace_ir_metadata_maps_destroy); goto end; error: