lib: add aliases for Babeltrace enumeration types

[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 bea4c2cae344889b2f18b37cfb96604987a074d1..d7a4a0a106be293c5731bed49b59262770d33cfe 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,15 +291,15 @@ static void connection_release(struct bt_object *obj)
 }
 
 static
-enum bt_value_status list_update_session(struct bt_value *results,
+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_status ret = BT_VALUE_STATUS_OK;
+       bt_value *map = NULL;
+       bt_value *hostname = NULL;
+       bt_value *session_name = NULL;
+       bt_value *btval = NULL;
        int i, len;
        bool found = false;
 
@@ -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_OBJECT_PUT_REF_AND_RESET(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_OBJECT_PUT_REF_AND_RESET(btval);
+                       BT_VALUE_PUT_REF_AND_RESET(btval);
                }
 
-               BT_OBJECT_PUT_REF_AND_RESET(hostname);
-               BT_OBJECT_PUT_REF_AND_RESET(session_name);
-               BT_OBJECT_PUT_REF_AND_RESET(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_OBJECT_PUT_REF_AND_RESET(btval);
-       BT_OBJECT_PUT_REF_AND_RESET(hostname);
-       BT_OBJECT_PUT_REF_AND_RESET(session_name);
-       BT_OBJECT_PUT_REF_AND_RESET(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,
+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_status ret = BT_VALUE_STATUS_OK;
+       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_entry(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_entry(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_entry(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_entry(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_entry(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_entry(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_element(results, map);
+       ret = bt_private_value_array_append_element(results, map);
 end:
        if (url) {
                g_string_free(url, TRUE);
        }
-       BT_OBJECT_PUT_REF_AND_RESET(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_OBJECT_PUT_REF_AND_RESET(results);
+       BT_VALUE_PUT_REF_AND_RESET(results);
 end:
        return results;
 }
@@ -782,7 +770,7 @@ int receive_streams(struct lttng_live_session *session,
 
                                goto error;
                        }
-                       session->lazy_stream_notif_init = true;
+                       session->lazy_stream_msg_init = true;
                } else {
                        BT_LOGD("    stream %" PRIu64 " : %s/%s",
                                        stream_id, stream.path_name,
@@ -1087,7 +1075,7 @@ void lttng_index_to_packet_index(struct lttng_viewer_index *lindex,
 }
 
 BT_HIDDEN
-enum bt_lttng_live_iterator_status lttng_live_get_next_index(struct lttng_live_component *lttng_live,
+bt_lttng_live_iterator_status lttng_live_get_next_index(struct lttng_live_component *lttng_live,
                struct lttng_live_stream_iterator *stream,
                struct packet_index *index)
 {
@@ -1096,7 +1084,7 @@ enum bt_lttng_live_iterator_status lttng_live_get_next_index(struct lttng_live_c
        ssize_t ret_len;
        struct lttng_viewer_index rp;
        uint32_t flags, status;
-       enum bt_lttng_live_iterator_status retstatus =
+       bt_lttng_live_iterator_status retstatus =
                        BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
        struct bt_live_viewer_connection *viewer_connection =
                        lttng_live->viewer_connection;
@@ -1224,11 +1212,11 @@ error:
 }
 
 BT_HIDDEN
-enum bt_notif_iter_medium_status lttng_live_get_stream_bytes(struct lttng_live_component *lttng_live,
+enum bt_msg_iter_medium_status lttng_live_get_stream_bytes(struct lttng_live_component *lttng_live,
                struct lttng_live_stream_iterator *stream, uint8_t *buf, uint64_t offset,
                uint64_t req_len, uint64_t *recv_len)
 {
-       enum bt_notif_iter_medium_status retstatus = BT_NOTIF_ITER_MEDIUM_STATUS_OK;
+       enum bt_msg_iter_medium_status retstatus = BT_MSG_ITER_MEDIUM_STATUS_OK;
        struct lttng_viewer_cmd cmd;
        struct lttng_viewer_get_packet rq;
        struct lttng_viewer_trace_packet rp;
@@ -1292,7 +1280,7 @@ enum bt_notif_iter_medium_status lttng_live_get_stream_bytes(struct lttng_live_c
        case LTTNG_VIEWER_GET_PACKET_RETRY:
                /* Unimplemented by relay daemon */
                BT_LOGD("get_data_packet: retry");
-               retstatus = BT_NOTIF_ITER_MEDIUM_STATUS_AGAIN;
+               retstatus = BT_MSG_ITER_MEDIUM_STATUS_AGAIN;
                goto end;
        case LTTNG_VIEWER_GET_PACKET_ERR:
                if (flags & LTTNG_VIEWER_FLAG_NEW_METADATA) {
@@ -1305,13 +1293,13 @@ enum bt_notif_iter_medium_status lttng_live_get_stream_bytes(struct lttng_live_c
                }
                if (flags & (LTTNG_VIEWER_FLAG_NEW_METADATA
                                | LTTNG_VIEWER_FLAG_NEW_STREAM)) {
-                       retstatus = BT_NOTIF_ITER_MEDIUM_STATUS_AGAIN;
+                       retstatus = BT_MSG_ITER_MEDIUM_STATUS_AGAIN;
                        goto end;
                }
                BT_LOGE("get_data_packet: error");
                goto error;
        case LTTNG_VIEWER_GET_PACKET_EOF:
-               retstatus = BT_NOTIF_ITER_MEDIUM_STATUS_EOF;
+               retstatus = BT_MSG_ITER_MEDIUM_STATUS_EOF;
                goto end;
        default:
                BT_LOGE("get_data_packet: unknown");
@@ -1338,9 +1326,9 @@ end:
 
 error:
        if (lttng_live_is_canceled(lttng_live)) {
-               retstatus = BT_NOTIF_ITER_MEDIUM_STATUS_AGAIN;
+               retstatus = BT_MSG_ITER_MEDIUM_STATUS_AGAIN;
        } else {
-               retstatus = BT_NOTIF_ITER_MEDIUM_STATUS_ERROR;
+               retstatus = BT_MSG_ITER_MEDIUM_STATUS_ERROR;
        }
        return retstatus;
 }
@@ -1349,10 +1337,10 @@ error:
  * Request new streams for a session.
  */
 BT_HIDDEN
-enum bt_lttng_live_iterator_status lttng_live_get_new_streams(
+bt_lttng_live_iterator_status lttng_live_get_new_streams(
                struct lttng_live_session *session)
 {
-       enum bt_lttng_live_iterator_status status =
+       bt_lttng_live_iterator_status status =
                        BT_LTTNG_LIVE_ITERATOR_STATUS_OK;
        struct lttng_viewer_cmd cmd;
        struct lttng_viewer_new_streams_request rq;