X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Flttng-live%2Flttng-live.cpp;h=02900df411a0f4375a28d0f8b42989204ff78a0d;hb=ecd7492f21a492b70569d5ecc1d3a808241b63f0;hp=e87de8d47aa18660ceb3540e46b1cfaeef4198f1;hpb=a4f118a39fb7e83c0160ad5850d99180d29e95e9;p=babeltrace.git diff --git a/src/plugins/ctf/lttng-live/lttng-live.cpp b/src/plugins/ctf/lttng-live/lttng-live.cpp index e87de8d4..02900df4 100644 --- a/src/plugins/ctf/lttng-live/lttng-live.cpp +++ b/src/plugins/ctf/lttng-live/lttng-live.cpp @@ -108,7 +108,6 @@ void lttng_live_stream_iterator_set_state(struct lttng_live_stream_iterator *str live_stream_iter->current_inactivity_ts); \ } while (0); -BT_HIDDEN bool lttng_live_graph_is_canceled(struct lttng_live_msg_iter *msg_iter) { bool ret; @@ -195,7 +194,6 @@ end: return trace; } -BT_HIDDEN struct lttng_live_trace * lttng_live_session_borrow_or_create_trace_by_id(struct lttng_live_session *session, uint64_t trace_id) @@ -214,7 +212,6 @@ end: return trace; } -BT_HIDDEN int lttng_live_add_session(struct lttng_live_msg_iter *lttng_live_msg_iter, uint64_t session_id, const char *hostname, const char *session_name) { @@ -321,7 +318,6 @@ end: return; } -BT_HIDDEN void lttng_live_msg_iter_finalize(bt_self_message_iterator *self_msg_iter) { struct lttng_live_msg_iter *lttng_live_msg_iter; @@ -412,10 +408,10 @@ static enum lttng_live_iterator_status lttng_live_iterator_next_handle_one_no_da if (orig_state == LTTNG_LIVE_STREAM_QUIESCENT_NO_DATA && last_inact_ts == curr_inact_ts) { /* - * Because the stream is in the QUIESCENT_NO_DATA - * state, we can assert that the last_inactivity_ts was - * set and can be safely used in the `if` above. - */ + * Because the stream is in the QUIESCENT_NO_DATA + * state, we can assert that the last_inactivity_ts was + * set and can be safely used in the `if` above. + */ BT_ASSERT(lttng_live_stream->last_inactivity_ts.is_set); ret = LTTNG_LIVE_ITERATOR_STATUS_AGAIN; @@ -724,11 +720,10 @@ end: return ret; } -static int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter, +static int live_get_msg_ts_ns(struct lttng_live_stream_iterator *, struct lttng_live_msg_iter *lttng_live_msg_iter, const bt_message *msg, int64_t last_msg_ts_ns, int64_t *ts_ns) { - const bt_clock_class *clock_class = NULL; const bt_clock_snapshot *clock_snapshot = NULL; int ret = 0; bt_logging_level log_level = lttng_live_msg_iter->log_level; @@ -743,37 +738,19 @@ static int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter, switch (bt_message_get_type(msg)) { case BT_MESSAGE_TYPE_EVENT: - clock_class = bt_message_event_borrow_stream_class_default_clock_class_const(msg); - 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(msg); - BT_ASSERT(clock_class); - clock_snapshot = bt_message_packet_beginning_borrow_default_clock_snapshot_const(msg); break; case BT_MESSAGE_TYPE_PACKET_END: - clock_class = bt_message_packet_end_borrow_stream_class_default_clock_class_const(msg); - BT_ASSERT(clock_class); - clock_snapshot = bt_message_packet_end_borrow_default_clock_snapshot_const(msg); break; case BT_MESSAGE_TYPE_DISCARDED_EVENTS: - clock_class = - bt_message_discarded_events_borrow_stream_class_default_clock_class_const(msg); - BT_ASSERT(clock_class); - clock_snapshot = bt_message_discarded_events_borrow_beginning_default_clock_snapshot_const(msg); break; case BT_MESSAGE_TYPE_DISCARDED_PACKETS: - clock_class = - bt_message_discarded_packets_borrow_stream_class_default_clock_class_const(msg); - BT_ASSERT(clock_class); - clock_snapshot = bt_message_discarded_packets_borrow_beginning_default_clock_snapshot_const(msg); break; @@ -787,9 +764,6 @@ static int live_get_msg_ts_ns(struct lttng_live_stream_iterator *stream_iter, goto end; } - clock_class = bt_clock_snapshot_borrow_clock_class_const(clock_snapshot); - BT_ASSERT_DBG(clock_class); - ret = bt_clock_snapshot_get_ns_from_origin(clock_snapshot, ts_ns); if (ret) { BT_COMP_LOGE_APPEND_CAUSE(self_comp, @@ -1529,7 +1503,6 @@ static inline void put_messages(bt_message_array_const msgs, uint64_t count) } } -BT_HIDDEN bt_message_iterator_class_next_method_status lttng_live_msg_iter_next(bt_self_message_iterator *self_msg_it, bt_message_array_const msgs, uint64_t capacity, uint64_t *count) @@ -1806,11 +1779,10 @@ end: return lttng_live_msg_iter; } -BT_HIDDEN bt_message_iterator_class_initialize_method_status lttng_live_msg_iter_init(bt_self_message_iterator *self_msg_it, - bt_self_message_iterator_configuration *config, - bt_self_component_port_output *self_port) + bt_self_message_iterator_configuration *, + bt_self_component_port_output *) { bt_message_iterator_class_initialize_method_status status; struct lttng_live_component *lttng_live; @@ -1986,7 +1958,7 @@ lttng_live_query_support_info(const bt_value *params, const bt_value **result, const bt_value *input_type_value; const bt_value *input_value; double weight = 0; - struct bt_common_lttng_live_url_parts parts = {0}; + struct bt_common_lttng_live_url_parts parts = {}; /* Used by the logging macros */ __attribute__((unused)) bt_self_component *self_comp = NULL; @@ -2050,7 +2022,6 @@ end: return status; } -BT_HIDDEN bt_component_class_query_method_status lttng_live_query(bt_self_component_class_source *comp_class, bt_private_query_executor *priv_query_exec, const char *object, const bt_value *params, @@ -2089,7 +2060,6 @@ static void lttng_live_component_destroy_data(struct lttng_live_component *lttng g_free(lttng_live); } -BT_HIDDEN void lttng_live_component_finalize(bt_self_component_source *component) { lttng_live_component *data = (lttng_live_component *) bt_self_component_get_data( @@ -2201,11 +2171,10 @@ end: return status; } -BT_HIDDEN bt_component_class_initialize_method_status lttng_live_component_init(bt_self_component_source *self_comp_src, - bt_self_component_source_configuration *config, const bt_value *params, - __attribute__((unused)) void *init_method_data) + bt_self_component_source_configuration *, const bt_value *params, + void *) { struct lttng_live_component *lttng_live; bt_component_class_initialize_method_status ret;