lib, bt2: make query method receive custom data

[babeltrace.git] / src / plugins / ctf / lttng-live / lttng-live.c

diff --git a/src/plugins/ctf/lttng-live/lttng-live.c b/src/plugins/ctf/lttng-live/lttng-live.c
index 62dc28f0d8b4ebfe28e06a585362c1271d6ad2c8..40d76b9d2ad5d6f08e8aaf47480df20d56827585 100644 (file)
--- a/src/plugins/ctf/lttng-live/lttng-live.c
+++ b/src/plugins/ctf/lttng-live/lttng-live.c
@@ -1337,7 +1337,7 @@ bt_component_class_message_iterator_init_method_status lttng_live_msg_iter_init(
 
        lttng_live_msg_iter->viewer_connection =
                live_viewer_connection_create(lttng_live->params.url->str, false,
-                       lttng_live_msg_iter);
+                       lttng_live_msg_iter, log_level);
        if (!lttng_live_msg_iter->viewer_connection) {
                goto error;
        }
@@ -1372,6 +1372,17 @@ bt_component_class_message_iterator_init_method_status lttng_live_msg_iter_init(
                                SESS_NOT_FOUND_ACTION_END_STR,
                                lttng_live->params.url->str);
                        break;
+               case SESSION_NOT_FOUND_ACTION_UNKNOWN:
+               default:
+                       /* Fallthrough */
+                       BT_COMP_LOGE("Unknown action for session not found"
+                               "error. Fail the message iterator"
+                               "initialization because of %s=\"%s\" "
+                               "component parameter: url =\"%s\"",
+                               SESS_NOT_FOUND_ACTION_PARAM,
+                               SESS_NOT_FOUND_ACTION_FAIL_STR,
+                               lttng_live->params.url->str);
+                       break;
                }
        }
 
@@ -1413,7 +1424,8 @@ bt_component_class_query_method_status lttng_live_query_list_sessions(
 
        url = bt_value_string_get(url_value);
 
-       viewer_connection = live_viewer_connection_create(url, true, NULL);
+       viewer_connection = live_viewer_connection_create(url, true, NULL,
+               log_level);
        if (!viewer_connection) {
                goto error;
        }
@@ -1445,6 +1457,7 @@ bt_component_class_query_method_status lttng_live_query(
                bt_self_component_class_source *comp_class,
                bt_private_query_executor *priv_query_exec,
                const char *object, const bt_value *params,
+               __attribute__((unused)) void *method_data,
                const bt_value **result)
 {
        bt_component_class_query_method_status status =
@@ -1505,7 +1518,7 @@ enum session_not_found_action parse_session_not_found_action_param(
        } else if (strcmp(no_session_act_str, SESS_NOT_FOUND_ACTION_END_STR) == 0) {
                action = SESSION_NOT_FOUND_ACTION_END;
        } else {
-               action = -1;
+               action = SESSION_NOT_FOUND_ACTION_UNKNOWN;
        }
 
        return action;
@@ -1545,7 +1558,7 @@ struct lttng_live_component *lttng_live_component_create(const bt_value *params,
        if (value && bt_value_is_string(value)) {
                lttng_live->params.sess_not_found_act =
                        parse_session_not_found_action_param(value);
-               if (lttng_live->params.sess_not_found_act == -1) {
+               if (lttng_live->params.sess_not_found_act == SESSION_NOT_FOUND_ACTION_UNKNOWN) {
                        BT_COMP_LOGE("Unexpected value for `%s` parameter: "
                                "value=\"%s\"", SESS_NOT_FOUND_ACTION_PARAM,
                                bt_value_string_get(value));