lib: create input port msg iterator from self {msg iterator, sink comp.}

[babeltrace.git] / src / plugins / text / details / details.c

diff --git a/src/plugins/text/details/details.c b/src/plugins/text/details/details.c
index 37951910138eb330c402e7efbc213bfb233c90de..34410187cb384adf6234ff6c6ba69af5770280c9 100644 (file)
--- a/src/plugins/text/details/details.c
+++ b/src/plugins/text/details/details.c
@@ -53,9 +53,6 @@ const char * const with_metadata_param_name = "with-metadata";
 static
 const char * const with_time_param_name = "with-time";
 
-static
-const char * const with_trace_class_name_param_name = "with-trace-class-name";
-
 static
 const char * const with_trace_name_param_name = "with-trace-name";
 
@@ -139,9 +136,11 @@ void destroy_details_comp(struct details_comp *details_comp)
 
                        if (details_tc_meta->tc_destruction_listener_id !=
                                        UINT64_C(-1)) {
-                               bt_trace_class_remove_destruction_listener(
-                                       (const void *) key,
-                                       details_tc_meta->tc_destruction_listener_id);
+                               if (bt_trace_class_remove_destruction_listener(
+                                               (const void *) key,
+                                               details_tc_meta->tc_destruction_listener_id)) {
+                                       bt_current_thread_clear_error();
+                               }
                        }
                }
 
@@ -160,9 +159,11 @@ void destroy_details_comp(struct details_comp *details_comp)
                while (g_hash_table_iter_next(&iter, &key, &value)) {
                        struct details_trace *details_trace = value;
 
-                       bt_trace_remove_destruction_listener(
-                               (const void *) key,
-                               details_trace->trace_destruction_listener_id);
+                       if (bt_trace_remove_destruction_listener(
+                                       (const void *) key,
+                                       details_trace->trace_destruction_listener_id)) {
+                               bt_current_thread_clear_error();
+                       }
                }
 
                g_hash_table_destroy(details_comp->traces);
@@ -318,14 +319,6 @@ int configure_details_comp(struct details_comp *details_comp,
                goto error;
        }
 
-       /* With trace class name? */
-       ret = configure_bool_opt(details_comp, params,
-               with_trace_class_name_param_name,
-               true, &details_comp->cfg.with_trace_class_name);
-       if (ret) {
-               goto error;
-       }
-
        /* With trace name? */
        ret = configure_bool_opt(details_comp, params,
                with_trace_name_param_name,
@@ -377,8 +370,6 @@ void log_configuration(bt_self_component_sink *comp,
        BT_COMP_LOGI("  Compact: %d", details_comp->cfg.compact);
        BT_COMP_LOGI("  With metadata: %d", details_comp->cfg.with_meta);
        BT_COMP_LOGI("  With time: %d", details_comp->cfg.with_time);
-       BT_COMP_LOGI("  With trace class name: %d",
-               details_comp->cfg.with_trace_class_name);
        BT_COMP_LOGI("  With trace name: %d", details_comp->cfg.with_trace_name);
        BT_COMP_LOGI("  With stream class name: %d",
                details_comp->cfg.with_stream_class_name);
@@ -462,8 +453,8 @@ details_graph_is_configured(bt_self_component_sink *comp)
                goto end;
        }
 
-       iterator = bt_self_component_port_input_message_iterator_create(
-               bt_self_component_sink_borrow_input_port_by_name(comp,
+       iterator = bt_self_component_port_input_message_iterator_create_from_sink_component(
+               comp, bt_self_component_sink_borrow_input_port_by_name(comp,
                        in_port_name));
        if (!iterator) {
                status = BT_COMPONENT_CLASS_SINK_GRAPH_IS_CONFIGURED_METHOD_STATUS_MEMORY_ERROR;