Visibility hidden by default

[babeltrace.git] / src / lib / graph / mip.c

diff --git a/src/lib/graph/mip.c b/src/lib/graph/mip.c
index 7c2bb698be25224297339275f8bfc9528b0c5ec0..96fb368636f76fe906dd093c1882986a8562c136 100644 (file)
--- a/src/lib/graph/mip.c
+++ b/src/lib/graph/mip.c
@@ -7,8 +7,7 @@
 #define BT_LOG_TAG "LIB/MIP"
 #include "lib/logging.h"
 
-#include "lib/assert-pre.h"
-#include "lib/assert-post.h"
+#include "lib/assert-cond.h"
 #include <stdbool.h>
 #include <unistd.h>
 #include <glib.h>
@@ -72,6 +71,7 @@ int validate_operative_mip_version_in_array(GPtrArray *descriptors,
                struct bt_component_descriptor_set_entry *descr =
                        descriptors->pdata[i];
                method_t method = NULL;
+               const char *method_name = NULL;
                bt_component_class_get_supported_mip_versions_method_status method_status;
 
                switch (descr->comp_cls->type) {
@@ -81,6 +81,7 @@ int validate_operative_mip_version_in_array(GPtrArray *descriptors,
                                descr->comp_cls;
 
                        method = (method_t) src_cc->methods.get_supported_mip_versions;
+                       method_name = "bt_component_class_source_get_supported_mip_versions_method";
                        break;
                }
                case BT_COMPONENT_CLASS_TYPE_FILTER:
@@ -89,6 +90,7 @@ int validate_operative_mip_version_in_array(GPtrArray *descriptors,
                                descr->comp_cls;
 
                        method = (method_t) flt_cc->methods.get_supported_mip_versions;
+                       method_name = "bt_component_class_filter_get_supported_mip_versions_method";
                        break;
                }
                case BT_COMPONENT_CLASS_TYPE_SINK:
@@ -97,6 +99,7 @@ int validate_operative_mip_version_in_array(GPtrArray *descriptors,
                                descr->comp_cls;
 
                        method = (method_t) sink_cc->methods.get_supported_mip_versions;
+                       method_name = "bt_component_class_sink_get_supported_mip_versions_method";
                        break;
                }
                default:
@@ -126,11 +129,13 @@ int validate_operative_mip_version_in_array(GPtrArray *descriptors,
                        range_set);
                BT_LIB_LOGD("User method returned: status=%s",
                        bt_common_func_status_string(method_status));
-               BT_ASSERT_POST(method_status != BT_FUNC_STATUS_OK ||
+               BT_ASSERT_POST(method_name, "status-ok-with-at-least-one-range",
+                       method_status != BT_FUNC_STATUS_OK ||
                        range_set->ranges->len > 0,
                        "User method returned `BT_FUNC_STATUS_OK` without "
                        "adding a range to the supported MIP version range set.");
-               BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(method_status);
+               BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(method_name,
+                       method_status);
                if (method_status < 0) {
                        BT_LIB_LOGW_APPEND_CAUSE(
                                "Component class's \"get supported MIP versions\" method failed: "
@@ -171,6 +176,7 @@ end:
  * When any component descriptor does not support MIP version 0, this
  * function returns `BT_FUNC_STATUS_NO_MATCH`.
  */
+BT_EXPORT
 enum bt_get_greatest_operative_mip_version_status
 bt_get_greatest_operative_mip_version(
                const struct bt_component_descriptor_set *comp_descr_set,
@@ -180,10 +186,12 @@ bt_get_greatest_operative_mip_version(
        int status = BT_FUNC_STATUS_OK;
 
        BT_ASSERT_PRE_NO_ERROR();
-       BT_ASSERT_PRE_NON_NULL(comp_descr_set, "Component descriptor set");
-       BT_ASSERT_PRE_NON_NULL(operative_mip_version,
+       BT_ASSERT_PRE_COMP_DESCR_SET_NON_NULL(comp_descr_set);
+       BT_ASSERT_PRE_NON_NULL("operative-mip-version-output",
+               operative_mip_version,
                "Operative MIP version (output)");
-       BT_ASSERT_PRE(comp_descr_set->sources->len +
+       BT_ASSERT_PRE("component-descriptor-set-is-not-empty",
+               comp_descr_set->sources->len +
                comp_descr_set->filters->len +
                comp_descr_set->sinks->len > 0,
                "Component descriptor set is empty: addr=%p", comp_descr_set);
@@ -211,6 +219,7 @@ end:
        return status;
 }
 
+BT_EXPORT
 uint64_t bt_get_maximal_mip_version(void)
 {
        return 0;