projects / babeltrace.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
lib: make public reference count functions have strict 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 93ad97a5903427a6593e2ef9715c6f601df588a8..17fc234de4f4371938614de8e9248468f9d5a8f4 100644 (file)
--- a/plugins/ctf/lttng-live/viewer-connection.c
+++ b/plugins/ctf/lttng-live/viewer-connection.c
@@ -57,7 +57,7 @@ static ssize_t lttng_live_recv(struct bt_live_viewer_connection *viewer_connecti
        do {
                ret = bt_socket_recv(sock, buf + copied, to_copy, 0);
                if (ret > 0) {
-                       assert(ret <= to_copy);
+                       BT_ASSERT(ret <= to_copy);
                        copied += ret;
                        to_copy -= ret;
                }
@@ -178,13 +178,13 @@ static int lttng_live_handshake(struct bt_live_viewer_connection *viewer_connect
         */
        memcpy(cmd_buf, &cmd, sizeof(cmd));
        memcpy(cmd_buf + sizeof(cmd), &connect, sizeof(connect));
-
        ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
        if (ret_len == BT_SOCKET_ERROR) {
                BT_LOGE("Error sending version: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == cmd_buf_len);
+
+       BT_ASSERT(ret_len == cmd_buf_len);
 
        ret_len = lttng_live_recv(viewer_connection, &connect, sizeof(connect));
        if (ret_len == 0) {
@@ -195,7 +195,7 @@ static int lttng_live_handshake(struct bt_live_viewer_connection *viewer_connect
                BT_LOGE("Error receiving version: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == sizeof(connect));
+       BT_ASSERT(ret_len == sizeof(connect));
 
        BT_LOGD("Received viewer session ID : %" PRIu64,
                        (uint64_t) be64toh(connect.viewer_session_id));
@@ -303,7 +303,7 @@ enum bt_value_status list_update_session(struct bt_value *results,
        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,49 +344,43 @@ 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;
 }
@@ -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;
 }
 
@@ -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;
@@ -577,7 +565,7 @@ struct bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_c
                BT_LOGE("Error sending cmd: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == sizeof(cmd));
+       BT_ASSERT(ret_len == sizeof(cmd));
 
        ret_len = lttng_live_recv(viewer_connection, &list, sizeof(list));
        if (ret_len == 0) {
@@ -588,7 +576,7 @@ struct bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_c
                BT_LOGE("Error receiving session list: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == sizeof(list));
+       BT_ASSERT(ret_len == sizeof(list));
 
        sessions_count = be32toh(list.sessions_count);
        for (i = 0; i < sessions_count; i++) {
@@ -604,7 +592,7 @@ struct bt_value *bt_live_viewer_connection_list_sessions(struct bt_live_viewer_c
                        BT_LOGE("Error receiving session: %s", bt_socket_errormsg());
                        goto error;
                }
-               assert(ret_len == sizeof(lsession));
+               BT_ASSERT(ret_len == sizeof(lsession));
                lsession.hostname[LTTNG_VIEWER_HOST_NAME_MAX - 1] = '\0';
                lsession.session_name[LTTNG_VIEWER_NAME_MAX - 1] = '\0';
                if (list_append_session(results,
@@ -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;
 }
@@ -641,7 +629,7 @@ int lttng_live_query_session_ids(struct lttng_live_component *lttng_live)
                BT_LOGE("Error sending cmd: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == sizeof(cmd));
+       BT_ASSERT(ret_len == sizeof(cmd));
 
        ret_len = lttng_live_recv(viewer_connection, &list, sizeof(list));
        if (ret_len == 0) {
@@ -652,7 +640,7 @@ int lttng_live_query_session_ids(struct lttng_live_component *lttng_live)
                BT_LOGE("Error receiving session list: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == sizeof(list));
+       BT_ASSERT(ret_len == sizeof(list));
 
        sessions_count = be32toh(list.sessions_count);
        for (i = 0; i < sessions_count; i++) {
@@ -666,7 +654,7 @@ int lttng_live_query_session_ids(struct lttng_live_component *lttng_live)
                        BT_LOGE("Error receiving session: %s", bt_socket_errormsg());
                        goto error;
                }
-               assert(ret_len == sizeof(lsession));
+               BT_ASSERT(ret_len == sizeof(lsession));
                lsession.hostname[LTTNG_VIEWER_HOST_NAME_MAX - 1] = '\0';
                lsession.session_name[LTTNG_VIEWER_NAME_MAX - 1] = '\0';
                session_id = be64toh(lsession.id);
@@ -712,7 +700,7 @@ int lttng_live_create_viewer_session(struct lttng_live_component *lttng_live)
                BT_LOGE("Error sending cmd: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == sizeof(cmd));
+       BT_ASSERT(ret_len == sizeof(cmd));
 
        ret_len = lttng_live_recv(viewer_connection, &resp, sizeof(resp));
        if (ret_len == 0) {
@@ -723,7 +711,7 @@ int lttng_live_create_viewer_session(struct lttng_live_component *lttng_live)
                BT_LOGE("Error receiving create session reply: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == sizeof(resp));
+       BT_ASSERT(ret_len == sizeof(resp));
 
        if (be32toh(resp.status) != LTTNG_VIEWER_CREATE_SESSION_OK) {
                BT_LOGE("Error creating viewer session");
@@ -765,7 +753,7 @@ int receive_streams(struct lttng_live_session *session,
                        BT_LOGE("Error receiving stream");
                        goto error;
                }
-               assert(ret_len == sizeof(stream));
+               BT_ASSERT(ret_len == sizeof(stream));
                stream.path_name[LTTNG_VIEWER_PATH_MAX - 1] = '\0';
                stream.channel_name[LTTNG_VIEWER_NAME_MAX - 1] = '\0';
                stream_id = be64toh(stream.id);
@@ -837,14 +825,13 @@ int lttng_live_attach_session(struct lttng_live_session *session)
         */
        memcpy(cmd_buf, &cmd, sizeof(cmd));
        memcpy(cmd_buf + sizeof(cmd), &rq, sizeof(rq));
-
        ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
        if (ret_len == BT_SOCKET_ERROR) {
                BT_LOGE("Error sending attach request: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == cmd_buf_len);
 
+       BT_ASSERT(ret_len == cmd_buf_len);
        ret_len = lttng_live_recv(viewer_connection, &rp, sizeof(rp));
        if (ret_len == 0) {
                BT_LOGI("Remote side has closed connection");
@@ -854,7 +841,7 @@ int lttng_live_attach_session(struct lttng_live_session *session)
                BT_LOGE("Error receiving attach response: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == sizeof(rp));
+       BT_ASSERT(ret_len == sizeof(rp));
 
        streams_count = be32toh(rp.streams_count);
        switch(be32toh(rp.status)) {
@@ -923,14 +910,13 @@ int lttng_live_detach_session(struct lttng_live_session *session)
         */
        memcpy(cmd_buf, &cmd, sizeof(cmd));
        memcpy(cmd_buf + sizeof(cmd), &rq, sizeof(rq));
-
        ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
        if (ret_len == BT_SOCKET_ERROR) {
                BT_LOGE("Error sending detach request: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == cmd_buf_len);
 
+       BT_ASSERT(ret_len == cmd_buf_len);
        ret_len = lttng_live_recv(viewer_connection, &rp, sizeof(rp));
        if (ret_len == 0) {
                BT_LOGI("Remote side has closed connection");
@@ -940,7 +926,7 @@ int lttng_live_detach_session(struct lttng_live_session *session)
                BT_LOGE("Error receiving detach response: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == sizeof(rp));
+       BT_ASSERT(ret_len == sizeof(rp));
 
        switch(be32toh(rp.status)) {
        case LTTNG_VIEWER_DETACH_SESSION_OK:
@@ -995,14 +981,13 @@ ssize_t lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace,
         */
        memcpy(cmd_buf, &cmd, sizeof(cmd));
        memcpy(cmd_buf + sizeof(cmd), &rq, sizeof(rq));
-
        ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
        if (ret_len == BT_SOCKET_ERROR) {
                BT_LOGE("Error sending get_metadata request: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == cmd_buf_len);
 
+       BT_ASSERT(ret_len == cmd_buf_len);
        ret_len = lttng_live_recv(viewer_connection, &rp, sizeof(rp));
        if (ret_len == 0) {
                BT_LOGI("Remote side has closed connection");
@@ -1012,7 +997,7 @@ ssize_t lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace,
                BT_LOGE("Error receiving get_metadata response: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == sizeof(rp));
+       BT_ASSERT(ret_len == sizeof(rp));
 
        switch (be32toh(rp.status)) {
                case LTTNG_VIEWER_METADATA_OK:
@@ -1050,7 +1035,7 @@ ssize_t lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace,
                BT_LOGE("Error receiving trace packet: %s", bt_socket_errormsg());
                goto error_free_data;
        }
-       assert(ret_len == len);
+       BT_ASSERT(ret_len == len);
 
        do {
                ret_len = fwrite(data, 1, len, fp);
@@ -1059,7 +1044,7 @@ ssize_t lttng_live_get_one_metadata_packet(struct lttng_live_trace *trace,
                BT_LOGE("Writing in the metadata fp");
                goto error_free_data;
        }
-       assert(ret_len == len);
+       BT_ASSERT(ret_len == len);
        free(data);
        ret = len;
 end:
@@ -1078,8 +1063,8 @@ static
 void lttng_index_to_packet_index(struct lttng_viewer_index *lindex,
                struct packet_index *pindex)
 {
-       assert(lindex);
-       assert(pindex);
+       BT_ASSERT(lindex);
+       BT_ASSERT(pindex);
 
        pindex->offset = be64toh(lindex->offset);
        pindex->packet_size = be64toh(lindex->packet_size);
@@ -1122,14 +1107,13 @@ enum bt_lttng_live_iterator_status lttng_live_get_next_index(struct lttng_live_c
         */
        memcpy(cmd_buf, &cmd, sizeof(cmd));
        memcpy(cmd_buf + sizeof(cmd), &rq, sizeof(rq));
-
        ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
        if (ret_len == BT_SOCKET_ERROR) {
                BT_LOGE("Error sending get_next_index request: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == cmd_buf_len);
 
+       BT_ASSERT(ret_len == cmd_buf_len);
        ret_len = lttng_live_recv(viewer_connection, &rp, sizeof(rp));
        if (ret_len == 0) {
                BT_LOGI("Remote side has closed connection");
@@ -1139,7 +1123,7 @@ enum bt_lttng_live_iterator_status lttng_live_get_next_index(struct lttng_live_c
                BT_LOGE("Error receiving get_next_index response: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == sizeof(rp));
+       BT_ASSERT(ret_len == sizeof(rp));
 
        flags = be32toh(rp.flags);
        status = be32toh(rp.status);
@@ -1155,7 +1139,7 @@ enum bt_lttng_live_iterator_status lttng_live_get_next_index(struct lttng_live_c
                stream->current_inactivity_timestamp = index->ts_cycles.timestamp_end;
                ctf_stream_class_id = be64toh(rp.stream_id);
                if (stream->ctf_stream_class_id != -1ULL) {
-                       assert(stream->ctf_stream_class_id ==
+                       BT_ASSERT(stream->ctf_stream_class_id ==
                                ctf_stream_class_id);
                } else {
                        stream->ctf_stream_class_id = ctf_stream_class_id;
@@ -1171,7 +1155,7 @@ enum bt_lttng_live_iterator_status lttng_live_get_next_index(struct lttng_live_c
                lttng_index_to_packet_index(&rp, index);
                ctf_stream_class_id = be64toh(rp.stream_id);
                if (stream->ctf_stream_class_id != -1ULL) {
-                       assert(stream->ctf_stream_class_id ==
+                       BT_ASSERT(stream->ctf_stream_class_id ==
                                ctf_stream_class_id);
                } else {
                        stream->ctf_stream_class_id = ctf_stream_class_id;
@@ -1262,14 +1246,13 @@ enum bt_notif_iter_medium_status lttng_live_get_stream_bytes(struct lttng_live_c
         */
        memcpy(cmd_buf, &cmd, sizeof(cmd));
        memcpy(cmd_buf + sizeof(cmd), &rq, sizeof(rq));
-
        ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
        if (ret_len == BT_SOCKET_ERROR) {
                BT_LOGE("Error sending get_data request: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == cmd_buf_len);
 
+       BT_ASSERT(ret_len == cmd_buf_len);
        ret_len = lttng_live_recv(viewer_connection, &rp, sizeof(rp));
        if (ret_len == 0) {
                BT_LOGI("Remote side has closed connection");
@@ -1336,7 +1319,7 @@ enum bt_notif_iter_medium_status lttng_live_get_stream_bytes(struct lttng_live_c
                BT_LOGE("Error receiving trace packet: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == req_len);
+       BT_ASSERT(ret_len == req_len);
        *recv_len = ret_len;
 end:
        return retstatus;
@@ -1388,14 +1371,13 @@ enum bt_lttng_live_iterator_status lttng_live_get_new_streams(
         */
        memcpy(cmd_buf, &cmd, sizeof(cmd));
        memcpy(cmd_buf + sizeof(cmd), &rq, sizeof(rq));
-
        ret_len = lttng_live_send(viewer_connection, &cmd_buf, cmd_buf_len);
        if (ret_len == BT_SOCKET_ERROR) {
                BT_LOGE("Error sending get_new_streams request: %s", bt_socket_errormsg());
                goto error;
        }
-       assert(ret_len == cmd_buf_len);
 
+       BT_ASSERT(ret_len == cmd_buf_len);
        ret_len = lttng_live_recv(viewer_connection, &rp, sizeof(rp));
        if (ret_len == 0) {
                BT_LOGI("Remote side has closed connection");
@@ -1405,7 +1387,7 @@ enum bt_lttng_live_iterator_status lttng_live_get_new_streams(
                BT_LOGE("Error receiving get_new_streams response");
                goto error;
        }
-       assert(ret_len == sizeof(rp));
+       BT_ASSERT(ret_len == sizeof(rp));
 
        streams_count = be32toh(rp.streams_count);
 
BabelTrace - Trace Format Babel Tower
This page took 0.03087 seconds and 4 git commands to generate.