trace->trace_class = NULL;
trace->trace = NULL;
trace->stream_iterators = g_ptr_array_new_with_free_func(
- (GDestroyNotify) lttng_live_stream_iterator_destroy);
+ (GDestroyNotify) lttng_live_stream_iterator_destroy);
BT_ASSERT(trace->stream_iterators);
trace->new_metadata_needed = true;
g_ptr_array_add(session->traces, trace);
session->self_comp = lttng_live_msg_iter->self_comp;
session->id = session_id;
session->traces = g_ptr_array_new_with_free_func(
- (GDestroyNotify) lttng_live_destroy_trace);
+ (GDestroyNotify) lttng_live_destroy_trace);
BT_ASSERT(session->traces);
session->lttng_live_msg_iter = lttng_live_msg_iter;
session->new_streams_needed = true;
{
bt_logging_level log_level = lttng_live_msg_iter->log_level;
bt_self_component *self_comp = lttng_live_msg_iter->self_comp;
- enum lttng_live_iterator_status ret =
- LTTNG_LIVE_ITERATOR_STATUS_OK;
- struct packet_index index;
+ enum lttng_live_iterator_status ret = LTTNG_LIVE_ITERATOR_STATUS_OK;
enum lttng_live_stream_state orig_state = lttng_live_stream->state;
+ struct packet_index index;
if (lttng_live_stream->trace->new_metadata_needed) {
ret = LTTNG_LIVE_ITERATOR_STATUS_CONTINUE;
if (ret != LTTNG_LIVE_ITERATOR_STATUS_OK) {
goto end;
}
- BT_ASSERT(lttng_live_stream->state != LTTNG_LIVE_STREAM_EOF);
+ BT_ASSERT_DBG(lttng_live_stream->state != LTTNG_LIVE_STREAM_EOF);
if (lttng_live_stream->state == LTTNG_LIVE_STREAM_QUIESCENT) {
uint64_t last_inact_ts = lttng_live_stream->last_inactivity_ts,
curr_inact_ts = lttng_live_stream->current_inactivity_ts;
lttng_live_iterator_handle_new_streams_and_metadata(
struct lttng_live_msg_iter *lttng_live_msg_iter)
{
- enum lttng_live_iterator_status ret =
- LTTNG_LIVE_ITERATOR_STATUS_OK;
+ enum lttng_live_iterator_status ret = LTTNG_LIVE_ITERATOR_STATUS_OK;
uint64_t session_idx = 0, nr_sessions_opened = 0;
struct lttng_live_session *session;
enum session_not_found_action sess_not_found_act =
struct lttng_live_stream_iterator *stream_iter,
bt_message **message, uint64_t timestamp)
{
- enum lttng_live_iterator_status ret =
- LTTNG_LIVE_ITERATOR_STATUS_OK;
+ enum lttng_live_iterator_status ret = LTTNG_LIVE_ITERATOR_STATUS_OK;
bt_message *msg = NULL;
BT_ASSERT(stream_iter->trace->clock_class);
msg = bt_message_message_iterator_inactivity_create(
- lttng_live_msg_iter->self_msg_iter,
- stream_iter->trace->clock_class,
- timestamp);
+ lttng_live_msg_iter->self_msg_iter,
+ stream_iter->trace->clock_class, timestamp);
if (!msg) {
goto error;
}
struct lttng_live_stream_iterator *lttng_live_stream,
bt_message **message)
{
- enum lttng_live_iterator_status ret =
- LTTNG_LIVE_ITERATOR_STATUS_OK;
+ enum lttng_live_iterator_status ret = LTTNG_LIVE_ITERATOR_STATUS_OK;
if (lttng_live_stream->state != LTTNG_LIVE_STREAM_QUIESCENT) {
return LTTNG_LIVE_ITERATOR_STATUS_OK;
}
ret = emit_inactivity_message(lttng_live_msg_iter, lttng_live_stream,
- message, lttng_live_stream->current_inactivity_ts);
+ message, lttng_live_stream->current_inactivity_ts);
lttng_live_stream->last_inactivity_ts =
- lttng_live_stream->current_inactivity_ts;
+ lttng_live_stream->current_inactivity_ts;
end:
return ret;
}
bt_logging_level log_level = lttng_live_msg_iter->log_level;
bt_self_component *self_comp = lttng_live_msg_iter->self_comp;
- BT_ASSERT(msg);
- BT_ASSERT(ts_ns);
+ BT_ASSERT_DBG(msg);
+ BT_ASSERT_DBG(ts_ns);
BT_COMP_LOGD("Getting message's timestamp: iter-data-addr=%p, msg-addr=%p, "
"last-msg-ts=%" PRId64, lttng_live_msg_iter, msg,
switch (bt_message_get_type(msg)) {
case BT_MESSAGE_TYPE_EVENT:
- clock_class =
- bt_message_event_borrow_stream_class_default_clock_class_const(
+ clock_class = bt_message_event_borrow_stream_class_default_clock_class_const(
msg);
- BT_ASSERT(clock_class);
+ BT_ASSERT_DBG(clock_class);
clock_snapshot = bt_message_event_borrow_default_clock_snapshot_const(
msg);
break;
case BT_MESSAGE_TYPE_PACKET_BEGINNING:
- clock_class =
- bt_message_packet_beginning_borrow_stream_class_default_clock_class_const(
+ clock_class = bt_message_packet_beginning_borrow_stream_class_default_clock_class_const(
msg);
BT_ASSERT(clock_class);
msg);
break;
case BT_MESSAGE_TYPE_PACKET_END:
- clock_class =
- bt_message_packet_end_borrow_stream_class_default_clock_class_const(
+ clock_class = bt_message_packet_end_borrow_stream_class_default_clock_class_const(
msg);
BT_ASSERT(clock_class);
msg);
break;
case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
- clock_class =
- bt_message_discarded_events_borrow_stream_class_default_clock_class_const(
+ clock_class = bt_message_discarded_events_borrow_stream_class_default_clock_class_const(
msg);
BT_ASSERT(clock_class);
msg);
break;
case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
- clock_class =
- bt_message_discarded_packets_borrow_stream_class_default_clock_class_const(
+ clock_class = bt_message_discarded_packets_borrow_stream_class_default_clock_class_const(
msg);
BT_ASSERT(clock_class);
msg);
break;
case BT_MESSAGE_TYPE_MESSAGE_ITERATOR_INACTIVITY:
- clock_snapshot =
- bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
- msg);
+ clock_snapshot = bt_message_message_iterator_inactivity_borrow_default_clock_snapshot_const(
+ msg);
break;
default:
/* All the other messages have a higher priority */
}
clock_class = bt_clock_snapshot_borrow_clock_class_const(clock_snapshot);
- BT_ASSERT(clock_class);
+ BT_ASSERT_DBG(clock_class);
ret = bt_clock_snapshot_get_ns_from_origin(clock_snapshot, ts_ns);
if (ret) {
bt_message **message)
{
enum lttng_live_iterator_status ret = LTTNG_LIVE_ITERATOR_STATUS_OK;
- enum bt_msg_iter_status status;
- uint64_t session_idx, trace_idx;
bt_logging_level log_level = lttng_live_msg_iter->log_level;
bt_self_component *self_comp = lttng_live_msg_iter->self_comp;
+ enum bt_msg_iter_status status;
+ uint64_t session_idx, trace_idx;
for (session_idx = 0; session_idx < lttng_live_msg_iter->sessions->len;
session_idx++) {
* `bt_msg_iter` should simply realize that it needs to close the
* stream properly by emitting the necessary stream end message.
*/
- enum bt_msg_iter_status status =
- bt_msg_iter_get_next_message(stream_iter->msg_iter,
- lttng_live_msg_iter->self_msg_iter, curr_msg);
+ enum bt_msg_iter_status status = bt_msg_iter_get_next_message(
+ stream_iter->msg_iter, lttng_live_msg_iter->self_msg_iter,
+ curr_msg);
if (status == BT_MSG_ITER_STATUS_ERROR) {
live_status = LTTNG_LIVE_ITERATOR_STATUS_ERROR;
retry:
print_stream_state(stream_iter);
live_status = lttng_live_iterator_handle_new_streams_and_metadata(
- lttng_live_msg_iter);
+ lttng_live_msg_iter);
if (live_status != LTTNG_LIVE_ITERATOR_STATUS_OK) {
goto end;
}
live_status = lttng_live_iterator_next_handle_one_no_data_stream(
- lttng_live_msg_iter, stream_iter);
+ lttng_live_msg_iter, stream_iter);
if (live_status != LTTNG_LIVE_ITERATOR_STATUS_OK) {
if (live_status == LTTNG_LIVE_ITERATOR_STATUS_END) {
goto end;
}
live_status = lttng_live_iterator_next_handle_one_quiescent_stream(
- lttng_live_msg_iter, stream_iter, curr_msg);
+ lttng_live_msg_iter, stream_iter, curr_msg);
if (live_status != LTTNG_LIVE_ITERATOR_STATUS_OK) {
BT_ASSERT(!*curr_msg);
goto end;
goto end;
}
live_status = lttng_live_iterator_next_handle_one_active_data_stream(
- lttng_live_msg_iter, stream_iter, curr_msg);
+ lttng_live_msg_iter, stream_iter, curr_msg);
if (live_status != LTTNG_LIVE_ITERATOR_STATUS_OK) {
BT_ASSERT(!*curr_msg);
}
struct lttng_live_stream_iterator **youngest_trace_stream_iter)
{
struct lttng_live_stream_iterator *youngest_candidate_stream_iter = NULL;
+ bt_logging_level log_level = lttng_live_msg_iter->log_level;
+ bt_self_component *self_comp = lttng_live_msg_iter->self_comp;
enum lttng_live_iterator_status stream_iter_status;;
int64_t youngest_candidate_msg_ts = INT64_MAX;
uint64_t stream_iter_idx;
- bt_logging_level log_level = lttng_live_msg_iter->log_level;
- bt_self_component *self_comp = lttng_live_msg_iter->self_comp;
- BT_ASSERT(live_trace);
- BT_ASSERT(live_trace->stream_iterators);
+ BT_ASSERT_DBG(live_trace);
+ BT_ASSERT_DBG(live_trace->stream_iterators);
/*
* Update the current message of every stream iterators of this trace.
* The current msg of every stream must have a timestamp equal or
bool stream_iter_is_ended = false;
struct lttng_live_stream_iterator *stream_iter =
g_ptr_array_index(live_trace->stream_iterators,
- stream_iter_idx);
+ stream_iter_idx);
/*
* Since we may remove elements from the GPtrArray as we
bt_message *msg = NULL;
int64_t curr_msg_ts_ns = INT64_MAX;
stream_iter_status = lttng_live_iterator_next_msg_on_stream(
- lttng_live_msg_iter, stream_iter, &msg);
+ lttng_live_msg_iter, stream_iter, &msg);
BT_COMP_LOGD("live stream iterator returned status :%s",
- print_live_iterator_status(stream_iter_status));
+ print_live_iterator_status(stream_iter_status));
if (stream_iter_status == LTTNG_LIVE_ITERATOR_STATUS_END) {
stream_iter_is_ended = true;
break;
goto end;
}
- BT_ASSERT(msg);
+ BT_ASSERT_DBG(msg);
/*
* Get the timestamp in nanoseconds from origin of this
}
}
- BT_ASSERT(stream_iter != youngest_candidate_stream_iter);
+ BT_ASSERT_DBG(stream_iter != youngest_candidate_stream_iter);
if (!stream_iter_is_ended) {
if (G_UNLIKELY(youngest_candidate_stream_iter == NULL) ||
* Order the messages in an arbitrary but
* deterministic way.
*/
- BT_ASSERT(stream_iter != youngest_candidate_stream_iter);
+ BT_ASSERT_DBG(stream_iter != youngest_candidate_stream_iter);
int ret = common_muxing_compare_messages(
stream_iter->current_msg,
youngest_candidate_stream_iter->current_msg);
goto end;
}
- BT_ASSERT(session->traces);
+ BT_ASSERT_DBG(session->traces);
- /*
- * Use while loops here rather then for loops so we can restart the
- * iteration if an element is removed from the array during the
- * looping.
- */
while (trace_idx < session->traces->len) {
bool trace_is_ended = false;
struct lttng_live_stream_iterator *stream_iter;
}
if (!trace_is_ended) {
- BT_ASSERT(stream_iter);
+ BT_ASSERT_DBG(stream_iter);
if (G_UNLIKELY(youngest_candidate_stream_iter == NULL) ||
stream_iter->current_msg_ts_ns < youngest_candidate_msg_ts) {
}
trace_idx++;
} else {
- g_ptr_array_remove_index_fast(session->traces, trace_idx);
- trace_idx = 0;
+ /*
+ * trace_idx is not incremented since
+ * g_ptr_array_remove_index_fast replaces the
+ * element at trace_idx with the array's last element.
+ */
+ g_ptr_array_remove_index_fast(session->traces,
+ trace_idx);
}
}
if (youngest_candidate_stream_iter) {
*count = 0;
- BT_ASSERT(lttng_live_msg_iter);
+ BT_ASSERT_DBG(lttng_live_msg_iter);
/*
* Clear all the invalid message reference that might be left over in
*candidate_stream_iter = NULL;
int64_t youngest_msg_ts_ns = INT64_MAX;
- BT_ASSERT(lttng_live_msg_iter->sessions);
+ BT_ASSERT_DBG(lttng_live_msg_iter->sessions);
session_idx = 0;
/*
* Use a while loop instead of a for loop so we can restart the
goto end;
}
- BT_ASSERT(youngest_stream_iter->current_msg);
+ BT_ASSERT_DBG(youngest_stream_iter->current_msg);
/* Ensure monotonicity. */
- BT_ASSERT(lttng_live_msg_iter->last_msg_ts_ns <=
+ BT_ASSERT_DBG(lttng_live_msg_iter->last_msg_ts_ns <=
youngest_stream_iter->current_msg_ts_ns);
/*
void lttng_live_component_finalize(bt_self_component_source *component)
{
void *data = bt_self_component_get_data(
- bt_self_component_source_as_self_component(component));
+ bt_self_component_source_as_self_component(component));
if (!data) {
return;