lib: rename bt_plugin_create_all_*() -> bt_plugin_find_all_*()

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

diff --git a/plugins/ctf/lttng-live/viewer-connection.c b/plugins/ctf/lttng-live/viewer-connection.c
index 0492340c212c5158e7621fbd4d5c8d973699884c..2549875013a01c7bf39fdc3a9844ecd764f28027 100644 (file)
--- a/plugins/ctf/lttng-live/viewer-connection.c
+++ b/plugins/ctf/lttng-live/viewer-connection.c
@@ -282,7 +282,7 @@ static void lttng_live_disconnect_viewer(struct bt_live_viewer_connection *viewe
        }
 }
 
-static void connection_release(struct bt_object *obj)
+static void connection_release(bt_object *obj)
 {
        struct bt_live_viewer_connection *conn =
                container_of(obj, struct bt_live_viewer_connection, obj);
@@ -291,19 +291,19 @@ static void connection_release(struct bt_object *obj)
 }
 
 static
-enum bt_value_status list_update_session(struct bt_value *results,
+enum bt_value_status list_update_session(bt_value *results,
                const struct lttng_viewer_session *session,
                bool *_found)
 {
        enum bt_value_status ret = BT_VALUE_STATUS_OK;
-       struct bt_value *map = NULL;
-       struct bt_value *hostname = NULL;
-       struct bt_value *session_name = NULL;
-       struct bt_value *btval = NULL;
+       bt_value *map = NULL;
+       bt_value *hostname = NULL;
+       bt_value *session_name = NULL;
+       bt_value *btval = NULL;
        int i, len;
        bool found = false;
 
-       len = bt_value_array_size(results);
+       len = bt_value_array_get_size(results);
        if (len < 0) {
                ret = BT_VALUE_STATUS_ERROR;
                goto end;
@@ -327,14 +327,8 @@ enum bt_value_status list_update_session(struct bt_value *results,
                        ret = BT_VALUE_STATUS_ERROR;
                        goto end;
                }
-               ret = bt_value_string_get(hostname, &hostname_str);
-               if (ret != BT_VALUE_STATUS_OK) {
-                       goto end;
-               }
-               ret = bt_value_string_get(session_name, &session_name_str);
-               if (ret != BT_VALUE_STATUS_OK) {
-                       goto end;
-               }
+               hostname_str = bt_value_string_get(hostname);
+               session_name_str = bt_value_string_get(session_name);
 
                if (!strcmp(session->hostname, hostname_str)
                                && !strcmp(session->session_name,
@@ -350,60 +344,54 @@ enum bt_value_status list_update_session(struct bt_value *results,
                                ret = BT_VALUE_STATUS_ERROR;
                                goto end;
                        }
-                       ret = bt_value_integer_get(btval, &val);
-                       if (ret != BT_VALUE_STATUS_OK) {
-                               goto end;
-                       }
+                       val = bt_value_integer_get(btval);
                        /* sum */
                        val += streams;
-                       ret = bt_value_integer_set(btval, val);
+                       ret = bt_private_integer_bool_set(btval, val);
                        if (ret != BT_VALUE_STATUS_OK) {
                                goto end;
                        }
-                       BT_PUT(btval);
+                       BT_VALUE_PUT_REF_AND_RESET(btval);
 
                        btval = bt_value_map_get(map, "client-count");
                        if (!btval) {
                                ret = BT_VALUE_STATUS_ERROR;
                                goto end;
                        }
-                       ret = bt_value_integer_get(btval, &val);
-                       if (ret != BT_VALUE_STATUS_OK) {
-                               goto end;
-                       }
+                       val = bt_value_integer_get(btval);
                        /* max */
                        val = max_t(int64_t, clients, val);
-                       ret = bt_value_integer_set(btval, val);
+                       ret = bt_private_integer_bool_set(btval, val);
                        if (ret != BT_VALUE_STATUS_OK) {
                                goto end;
                        }
-                       BT_PUT(btval);
+                       BT_VALUE_PUT_REF_AND_RESET(btval);
                }
 
-               BT_PUT(hostname);
-               BT_PUT(session_name);
-               BT_PUT(map);
+               BT_VALUE_PUT_REF_AND_RESET(hostname);
+               BT_VALUE_PUT_REF_AND_RESET(session_name);
+               BT_VALUE_PUT_REF_AND_RESET(map);
 
                if (found) {
                        break;
                }
        }
 end:
-       BT_PUT(btval);
-       BT_PUT(hostname);
-       BT_PUT(session_name);
-       BT_PUT(map);
+       BT_VALUE_PUT_REF_AND_RESET(btval);
+       BT_VALUE_PUT_REF_AND_RESET(hostname);
+       BT_VALUE_PUT_REF_AND_RESET(session_name);
+       BT_VALUE_PUT_REF_AND_RESET(map);
        *_found = found;
        return ret;
 }
 
 static
-enum bt_value_status list_append_session(struct bt_value *results,
+enum bt_value_status list_append_session(bt_value *results,
                GString *base_url,
                const struct lttng_viewer_session *session)
 {
        enum bt_value_status ret = BT_VALUE_STATUS_OK;
-       struct bt_value *map = NULL;
+       bt_value *map = NULL;
        GString *url = NULL;
        bool found = false;
 
@@ -416,7 +404,7 @@ enum bt_value_status list_append_session(struct bt_value *results,
                goto end;
        }
 
-       map = bt_value_map_create();
+       map = bt_private_value_map_create();
        if (!map) {
                ret = BT_VALUE_STATUS_ERROR;
                goto end;
@@ -436,7 +424,7 @@ enum bt_value_status list_append_session(struct bt_value *results,
        g_string_append_c(url, '/');
        g_string_append(url, session->session_name);
 
-       ret = bt_value_map_insert_string(map, "url", url->str);
+       ret = bt_private_value_map_insert_string_entry(map, "url", url->str);
        if (ret != BT_VALUE_STATUS_OK) {
                goto end;
        }
@@ -445,7 +433,7 @@ enum bt_value_status list_append_session(struct bt_value *results,
         * key = "target-hostname",
         * value = <string>,
         */
-       ret = bt_value_map_insert_string(map, "target-hostname",
+       ret = bt_private_value_map_insert_string_entry(map, "target-hostname",
                session->hostname);
        if (ret != BT_VALUE_STATUS_OK) {
                goto end;
@@ -455,7 +443,7 @@ enum bt_value_status list_append_session(struct bt_value *results,
         * key = "session-name",
         * value = <string>,
         */
-       ret = bt_value_map_insert_string(map, "session-name",
+       ret = bt_private_value_map_insert_string_entry(map, "session-name",
                session->session_name);
        if (ret != BT_VALUE_STATUS_OK) {
                goto end;
@@ -468,7 +456,7 @@ enum bt_value_status list_append_session(struct bt_value *results,
        {
                uint32_t live_timer = be32toh(session->live_timer);
 
-               ret = bt_value_map_insert_integer(map, "timer-us",
+               ret = bt_private_value_map_insert_integer_entry(map, "timer-us",
                        live_timer);
                if (ret != BT_VALUE_STATUS_OK) {
                        goto end;
@@ -482,7 +470,7 @@ enum bt_value_status list_append_session(struct bt_value *results,
        {
                uint32_t streams = be32toh(session->streams);
 
-               ret = bt_value_map_insert_integer(map, "stream-count",
+               ret = bt_private_value_map_insert_integer_entry(map, "stream-count",
                        streams);
                if (ret != BT_VALUE_STATUS_OK) {
                        goto end;
@@ -497,19 +485,19 @@ enum bt_value_status list_append_session(struct bt_value *results,
        {
                uint32_t clients = be32toh(session->clients);
 
-               ret = bt_value_map_insert_integer(map, "client-count",
+               ret = bt_private_value_map_insert_integer_entry(map, "client-count",
                        clients);
                if (ret != BT_VALUE_STATUS_OK) {
                        goto end;
                }
        }
 
-       ret = bt_value_array_append(results, map);
+       ret = bt_private_value_array_append_element(results, map);
 end:
        if (url) {
                g_string_free(url, TRUE);
        }
-       BT_PUT(map);
+       BT_VALUE_PUT_REF_AND_RESET(map);
        return ret;
 }
 
@@ -550,9 +538,9 @@ end:
  */
 
 BT_HIDDEN
-struct bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_connection *viewer_connection)
+bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_connection *viewer_connection)
 {
-       struct bt_value *results = NULL;
+       bt_value *results = NULL;
        struct lttng_viewer_cmd cmd;
        struct lttng_viewer_list_sessions list;
        uint32_t i, sessions_count;
@@ -562,7 +550,7 @@ struct bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_c
                goto error;
        }
 
-       results = bt_value_array_create();
+       results = bt_private_value_array_create();
        if (!results) {
                BT_LOGE("Error creating array");
                goto error;
@@ -615,7 +603,7 @@ struct bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_c
        }
        goto end;
 error:
-       BT_PUT(results);
+       BT_VALUE_PUT_REF_AND_RESET(results);
 end:
        return results;
 }