X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Flttng-live%2Flttng-live.c;h=ff646bb23ecbbc49ae52ec3fb1f440438606eb63;hb=b19ff26f04df428047676dd736bd7cc9473906fe;hp=1f0b84468404377553c7a7cf405a020653ab886c;hpb=a2d06fd591146b06535f3de6eae5cbeffd4e64c8;p=babeltrace.git diff --git a/plugins/ctf/lttng-live/lttng-live.c b/plugins/ctf/lttng-live/lttng-live.c index 1f0b8446..ff646bb2 100644 --- a/plugins/ctf/lttng-live/lttng-live.c +++ b/plugins/ctf/lttng-live/lttng-live.c @@ -68,7 +68,7 @@ static const char *print_state(struct lttng_live_stream_iterator *s) static void print_stream_state(struct lttng_live_stream_iterator *stream) { - struct bt_port *port; + const bt_port *port; port = bt_port_from_private(stream->port); print_dbg("stream %s state %s last_inact_ts %" PRId64 " cur_inact_ts %" PRId64, @@ -76,14 +76,14 @@ void print_stream_state(struct lttng_live_stream_iterator *stream) print_state(stream), stream->last_returned_inactivity_timestamp, stream->current_inactivity_timestamp); - bt_object_put_ref(port); + bt_port_put_ref(port); } BT_HIDDEN bt_bool lttng_live_is_canceled(struct lttng_live_component *lttng_live) { - struct bt_component *component; - struct bt_graph *graph; + bt_component *component; + const bt_graph *graph; bt_bool ret; if (!lttng_live) { @@ -92,9 +92,9 @@ bt_bool lttng_live_is_canceled(struct lttng_live_component *lttng_live) component = bt_component_from_private(lttng_live->private_component); graph = bt_component_get_graph(component); - ret = bt_private_graph_is_canceled(graph); - bt_object_put_ref(graph); - bt_object_put_ref(component); + ret = bt_graph_is_canceled(graph); + bt_graph_put_ref(graph); + bt_component_put_ref(component); return ret; } @@ -113,7 +113,7 @@ int lttng_live_add_port(struct lttng_live_component *lttng_live, if (lttng_live_is_canceled(lttng_live)) { return 0; } - status = bt_private_component_source_add_output_private_port( + status = bt_self_component_source_add_output_port( lttng_live->private_component, name, stream_iter, &private_port); switch (status) { @@ -145,7 +145,7 @@ BT_HIDDEN int lttng_live_remove_port(struct lttng_live_component *lttng_live, struct bt_private_port *port) { - struct bt_component *component; + bt_component *component; int64_t nr_ports; int ret; @@ -154,7 +154,7 @@ int lttng_live_remove_port(struct lttng_live_component *lttng_live, if (nr_ports < 0) { return -1; } - BT_OBJECT_PUT_REF_AND_RESET(component); + BT_COMPONENT_PUT_REF_AND_RESET(component); if (nr_ports == 1) { enum bt_component_status status; @@ -163,7 +163,7 @@ int lttng_live_remove_port(struct lttng_live_component *lttng_live, if (lttng_live_is_canceled(lttng_live)) { return 0; } - status = bt_private_component_source_add_output_private_port(lttng_live->private_component, + status = bt_self_component_source_add_output_port(lttng_live->private_component, "no-stream", lttng_live->no_stream_iter, <tng_live->no_stream_port); switch (status) { @@ -201,7 +201,7 @@ struct lttng_live_trace *lttng_live_find_trace(struct lttng_live_session *sessio } static -void lttng_live_destroy_trace(struct bt_object *obj) +void lttng_live_destroy_trace(bt_object *obj) { struct lttng_live_trace *trace = container_of(obj, struct lttng_live_trace, obj); @@ -214,7 +214,7 @@ void lttng_live_destroy_trace(struct bt_object *obj) retval = bt_trace_set_is_static(trace->trace); BT_ASSERT(!retval); - BT_OBJECT_PUT_REF_AND_RESET(trace->trace); + BT_TRACE_PUT_REF_AND_RESET(trace->trace); } lttng_live_metadata_fini(trace); BT_OBJECT_PUT_REF_AND_RESET(trace->cc_prio_map); @@ -339,10 +339,10 @@ void lttng_live_destroy_session(struct lttng_live_session *session) } BT_HIDDEN -void lttng_live_iterator_finalize(struct bt_private_connection_private_notification_iterator *it) +void lttng_live_iterator_finalize(bt_self_notification_iterator *it) { struct lttng_live_stream_iterator_generic *s = - bt_private_connection_private_notification_iterator_get_user_data(it); + bt_self_notification_iterator_get_user_data(it); switch (s->type) { case LIVE_STREAM_TYPE_NO_STREAM: @@ -556,15 +556,15 @@ static enum bt_lttng_live_iterator_status emit_inactivity_notification( struct lttng_live_component *lttng_live, struct lttng_live_stream_iterator *lttng_live_stream, - struct bt_notification **notification, + const bt_notification **notification, uint64_t timestamp) { enum bt_lttng_live_iterator_status ret = BT_LTTNG_LIVE_ITERATOR_STATUS_OK; struct lttng_live_trace *trace; - struct bt_clock_class *clock_class = NULL; - struct bt_clock_value *clock_value = NULL; - struct bt_notification *notif = NULL; + const bt_clock_class *clock_class = NULL; + bt_clock_value *clock_value = NULL; + const bt_notification *notif = NULL; int retval; trace = lttng_live_stream->trace; @@ -590,12 +590,12 @@ enum bt_lttng_live_iterator_status emit_inactivity_notification( *notification = notif; end: bt_object_put_ref(clock_value); - bt_object_put_ref(clock_class); + bt_clock_class_put_ref(clock_class); return ret; error: ret = BT_LTTNG_LIVE_ITERATOR_STATUS_ERROR; - bt_object_put_ref(notif); + bt_notification_put_ref(notif); goto end; } @@ -603,12 +603,12 @@ static enum bt_lttng_live_iterator_status lttng_live_iterator_next_handle_one_quiescent_stream( struct lttng_live_component *lttng_live, struct lttng_live_stream_iterator *lttng_live_stream, - struct bt_notification **notification) + const bt_notification **notification) { enum bt_lttng_live_iterator_status ret = BT_LTTNG_LIVE_ITERATOR_STATUS_OK; - struct bt_clock_class *clock_class = NULL; - struct bt_clock_value *clock_value = NULL; + const bt_clock_class *clock_class = NULL; + bt_clock_value *clock_value = NULL; if (lttng_live_stream->state != LTTNG_LIVE_STREAM_QUIESCENT) { return BT_LTTNG_LIVE_ITERATOR_STATUS_OK; @@ -628,7 +628,7 @@ enum bt_lttng_live_iterator_status lttng_live_iterator_next_handle_one_quiescent lttng_live_stream->current_inactivity_timestamp; end: bt_object_put_ref(clock_value); - bt_object_put_ref(clock_class); + bt_clock_class_put_ref(clock_class); return ret; } @@ -636,7 +636,7 @@ static enum bt_lttng_live_iterator_status lttng_live_iterator_next_handle_one_active_data_stream( struct lttng_live_component *lttng_live, struct lttng_live_stream_iterator *lttng_live_stream, - struct bt_notification **notification) + const bt_notification **notification) { enum bt_lttng_live_iterator_status ret = BT_LTTNG_LIVE_ITERATOR_STATUS_OK; @@ -755,12 +755,12 @@ enum bt_lttng_live_iterator_status lttng_live_iterator_next_handle_one_active_da * When disconnected from relayd: try to re-connect endlessly. */ static -struct bt_notification_iterator_next_method_return lttng_live_iterator_next_stream( - struct bt_private_connection_private_notification_iterator *iterator, +bt_notification_iterator_next_method_return lttng_live_iterator_next_stream( + bt_self_notification_iterator *iterator, struct lttng_live_stream_iterator *stream_iter) { enum bt_lttng_live_iterator_status status; - struct bt_notification_iterator_next_method_return next_return; + bt_notification_iterator_next_method_return next_return; struct lttng_live_component *lttng_live; lttng_live = stream_iter->trace->session->lttng_live; @@ -826,12 +826,12 @@ end: } static -struct bt_notification_iterator_next_method_return lttng_live_iterator_next_no_stream( - struct bt_private_connection_private_notification_iterator *iterator, +bt_notification_iterator_next_method_return lttng_live_iterator_next_no_stream( + bt_self_notification_iterator *iterator, struct lttng_live_no_stream_iterator *no_stream_iter) { enum bt_lttng_live_iterator_status status; - struct bt_notification_iterator_next_method_return next_return; + bt_notification_iterator_next_method_return next_return; struct lttng_live_component *lttng_live; lttng_live = no_stream_iter->lttng_live; @@ -875,12 +875,12 @@ end: } BT_HIDDEN -struct bt_notification_iterator_next_method_return lttng_live_iterator_next( - struct bt_private_connection_private_notification_iterator *iterator) +bt_notification_iterator_next_method_return lttng_live_iterator_next( + bt_self_notification_iterator *iterator) { struct lttng_live_stream_iterator_generic *s = - bt_private_connection_private_notification_iterator_get_user_data(iterator); - struct bt_notification_iterator_next_method_return next_return; + bt_self_notification_iterator_get_user_data(iterator); + bt_notification_iterator_next_method_return next_return; switch (s->type) { case LIVE_STREAM_TYPE_NO_STREAM: @@ -900,7 +900,7 @@ struct bt_notification_iterator_next_method_return lttng_live_iterator_next( BT_HIDDEN enum bt_notification_iterator_status lttng_live_iterator_init( - struct bt_private_connection_private_notification_iterator *it, + bt_self_notification_iterator *it, struct bt_private_port *port) { enum bt_notification_iterator_status ret = @@ -916,7 +916,7 @@ enum bt_notification_iterator_status lttng_live_iterator_init( { struct lttng_live_no_stream_iterator *no_stream_iter = container_of(s, struct lttng_live_no_stream_iterator, p); - ret = bt_private_connection_private_notification_iterator_set_user_data(it, no_stream_iter); + ret = bt_self_notification_iterator_set_user_data(it, no_stream_iter); if (ret) { goto error; } @@ -926,7 +926,7 @@ enum bt_notification_iterator_status lttng_live_iterator_init( { struct lttng_live_stream_iterator *stream_iter = container_of(s, struct lttng_live_stream_iterator, p); - ret = bt_private_connection_private_notification_iterator_set_user_data(it, stream_iter); + ret = bt_self_notification_iterator_set_user_data(it, stream_iter); if (ret) { goto error; } @@ -940,7 +940,7 @@ enum bt_notification_iterator_status lttng_live_iterator_init( end: return ret; error: - if (bt_private_connection_private_notification_iterator_set_user_data(it, NULL) + if (bt_self_notification_iterator_set_user_data(it, NULL) != BT_NOTIFICATION_ITERATOR_STATUS_OK) { BT_LOGE("Error setting private data to NULL"); } @@ -948,17 +948,17 @@ error: } static -struct bt_component_class_query_method_return lttng_live_query_list_sessions( - struct bt_component_class *comp_class, - struct bt_query_executor *query_exec, - struct bt_value *params) +bt_component_class_query_method_return lttng_live_query_list_sessions( + const bt_component_class *comp_class, + const bt_query_executor *query_exec, + bt_value *params) { - struct bt_component_class_query_method_return query_ret = { + bt_component_class_query_method_return query_ret = { .result = NULL, .status = BT_QUERY_STATUS_OK, }; - struct bt_value *url_value = NULL; + bt_value *url_value = NULL; const char *url; struct bt_live_viewer_connection *viewer_connection = NULL; @@ -999,17 +999,17 @@ end: if (viewer_connection) { bt_live_viewer_connection_destroy(viewer_connection); } - BT_OBJECT_PUT_REF_AND_RESET(url_value); + BT_VALUE_PUT_REF_AND_RESET(url_value); return query_ret; } BT_HIDDEN -struct bt_component_class_query_method_return lttng_live_query( - struct bt_component_class *comp_class, - struct bt_query_executor *query_exec, - const char *object, struct bt_value *params) +bt_component_class_query_method_return lttng_live_query( + const bt_component_class *comp_class, + const bt_query_executor *query_exec, + const char *object, bt_value *params) { - struct bt_component_class_query_method_return ret = { + bt_component_class_query_method_return ret = { .result = NULL, .status = BT_QUERY_STATUS_OK, }; @@ -1049,9 +1049,9 @@ void lttng_live_component_destroy_data(struct lttng_live_component *lttng_live) } BT_HIDDEN -void lttng_live_component_finalize(struct bt_private_component *component) +void lttng_live_component_finalize(bt_self_component *component) { - void *data = bt_private_component_get_user_data(component); + void *data = bt_self_component_get_user_data(component); if (!data) { return; @@ -1060,11 +1060,11 @@ void lttng_live_component_finalize(struct bt_private_component *component) } static -struct lttng_live_component *lttng_live_component_create(struct bt_value *params, - struct bt_private_component *private_component) +struct lttng_live_component *lttng_live_component_create(bt_value *params, + bt_self_component *private_component) { struct lttng_live_component *lttng_live; - struct bt_value *value = NULL; + bt_value *value = NULL; const char *url; enum bt_value_status ret; @@ -1085,7 +1085,7 @@ struct lttng_live_component *lttng_live_component_create(struct bt_value *params if (!lttng_live->url) { goto error; } - BT_OBJECT_PUT_REF_AND_RESET(value); + BT_VALUE_PUT_REF_AND_RESET(value); lttng_live->viewer_connection = bt_live_viewer_connection_create(lttng_live->url->str, lttng_live); if (!lttng_live->viewer_connection) { @@ -1107,8 +1107,8 @@ end: BT_HIDDEN enum bt_component_status lttng_live_component_init( - struct bt_private_component *private_component, - struct bt_value *params, void *init_method_data) + bt_self_component *private_component, + bt_value *params, void *init_method_data) { struct lttng_live_component *lttng_live; enum bt_component_status ret = BT_COMPONENT_STATUS_OK; @@ -1128,7 +1128,7 @@ enum bt_component_status lttng_live_component_init( if (lttng_live_is_canceled(lttng_live)) { goto end; } - ret = bt_private_component_source_add_output_private_port( + ret = bt_self_component_source_add_output_port( lttng_live->private_component, "no-stream", lttng_live->no_stream_iter, <tng_live->no_stream_port); @@ -1138,7 +1138,7 @@ enum bt_component_status lttng_live_component_init( bt_object_put_ref(lttng_live->no_stream_port); /* weak */ lttng_live->no_stream_iter->port = lttng_live->no_stream_port; - ret = bt_private_component_set_user_data(private_component, lttng_live); + ret = bt_self_component_set_user_data(private_component, lttng_live); if (ret != BT_COMPONENT_STATUS_OK) { goto error; } @@ -1146,25 +1146,25 @@ enum bt_component_status lttng_live_component_init( end: return ret; error: - (void) bt_private_component_set_user_data(private_component, NULL); + (void) bt_self_component_set_user_data(private_component, NULL); lttng_live_component_destroy_data(lttng_live); return ret; } BT_HIDDEN enum bt_component_status lttng_live_accept_port_connection( - struct bt_private_component *private_component, + bt_self_component *private_component, struct bt_private_port *self_private_port, - struct bt_port *other_port) + const bt_port *other_port) { struct lttng_live_component *lttng_live = - bt_private_component_get_user_data(private_component); - struct bt_component *other_component; + bt_self_component_get_user_data(private_component); + bt_component *other_component; enum bt_component_status status = BT_COMPONENT_STATUS_OK; - struct bt_port *self_port = bt_port_from_private(self_private_port); + const bt_port *self_port = bt_port_from_private(self_private_port); other_component = bt_port_get_component(other_port); - bt_object_put_ref(other_component); /* weak */ + bt_component_put_ref(other_component); /* weak */ if (!lttng_live->downstream_component) { lttng_live->downstream_component = other_component; @@ -1184,6 +1184,6 @@ enum bt_component_status lttng_live_accept_port_connection( goto end; } end: - bt_object_put_ref(self_port); + bt_port_put_ref(self_port); return status; }