}
}
-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);
}
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;
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) {
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;
if (url) {
g_string_free(url, TRUE);
}
- BT_OBJECT_PUT_REF_AND_RESET(map);
+ BT_VALUE_PUT_REF_AND_RESET(map);
return ret;
}
*/
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;
}
goto end;
error:
- BT_OBJECT_PUT_REF_AND_RESET(results);
+ BT_VALUE_PUT_REF_AND_RESET(results);
end:
return results;
}
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,
}
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)
{
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;
}
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;
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) {
}
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");
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;
}
* 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;