From: Philippe Proulx Date: Wed, 21 Nov 2018 15:39:48 +0000 (-0500) Subject: lib: private functions: do not repeat `private` word X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=28e6ca8b6e08d1cdd1af81ae819aa39baa206eaf lib: private functions: do not repeat `private` word Some private function names look ridiculous. Because a private function name already starts with `bt_private`, do not repeat the `private` word elsewhere in the function name: we already know we're dealing with a private function and private objects. For example: * Before this patch: bt_private_event_class_set_payload_private_field_class * After this patch: bt_private_event_class_set_payload_field_class() Signed-off-by: Philippe Proulx --- diff --git a/include/babeltrace/graph/private-component-filter.h b/include/babeltrace/graph/private-component-filter.h index 4431bffd..9b1de8cd 100644 --- a/include/babeltrace/graph/private-component-filter.h +++ b/include/babeltrace/graph/private-component-filter.h @@ -37,31 +37,31 @@ struct bt_private_component; struct bt_private_port; extern struct bt_private_port * -bt_private_component_filter_get_output_private_port_by_name( +bt_private_component_filter_get_output_port_by_name( struct bt_private_component *private_component, const char *name); extern struct bt_private_port * -bt_private_component_filter_get_output_private_port_by_index( +bt_private_component_filter_get_output_port_by_index( struct bt_private_component *private_component, uint64_t index); extern enum bt_component_status -bt_private_component_filter_add_output_private_port( +bt_private_component_filter_add_output_port( struct bt_private_component *private_component, const char *name, void *user_data, struct bt_private_port **private_port); extern struct bt_private_port * -bt_private_component_filter_get_input_private_port_by_name( +bt_private_component_filter_get_input_port_by_name( struct bt_private_component *private_component, const char *name); extern struct bt_private_port * -bt_private_component_filter_get_input_private_port_by_index( +bt_private_component_filter_get_input_port_by_index( struct bt_private_component *private_component, uint64_t index); extern enum bt_component_status -bt_private_component_filter_add_input_private_port( +bt_private_component_filter_add_input_port( struct bt_private_component *private_component, const char *name, void *user_data, struct bt_private_port **private_port); diff --git a/include/babeltrace/graph/private-component-sink.h b/include/babeltrace/graph/private-component-sink.h index 853cff26..ba7b2907 100644 --- a/include/babeltrace/graph/private-component-sink.h +++ b/include/babeltrace/graph/private-component-sink.h @@ -37,16 +37,16 @@ struct bt_private_component; struct bt_private_port; extern struct bt_private_port * -bt_private_component_sink_get_input_private_port_by_name( +bt_private_component_sink_get_input_port_by_name( struct bt_private_component *private_component, const char *name); extern struct bt_private_port * -bt_private_component_sink_get_input_private_port_by_index( +bt_private_component_sink_get_input_port_by_index( struct bt_private_component *private_component, uint64_t index); extern enum bt_component_status -bt_private_component_sink_add_input_private_port( +bt_private_component_sink_add_input_port( struct bt_private_component *private_component, const char *name, void *user_data, struct bt_private_port **private_port); diff --git a/include/babeltrace/graph/private-component-source.h b/include/babeltrace/graph/private-component-source.h index 29ed0b96..0f4f41fc 100644 --- a/include/babeltrace/graph/private-component-source.h +++ b/include/babeltrace/graph/private-component-source.h @@ -37,17 +37,17 @@ struct bt_private_component; struct bt_private_port; extern struct bt_private_port * -bt_private_component_source_get_output_private_port_by_name( +bt_private_component_source_get_output_port_by_name( struct bt_private_component *private_component, const char *name); extern struct bt_private_port * -bt_private_component_source_get_output_private_port_by_index( +bt_private_component_source_get_output_port_by_index( struct bt_private_component *private_component, uint64_t index); extern enum bt_component_status -bt_private_component_source_add_output_private_port( +bt_private_component_source_add_output_port( struct bt_private_component *private_component, const char *name, void *user_data, struct bt_private_port **private_port); diff --git a/include/babeltrace/graph/private-notification-event.h b/include/babeltrace/graph/private-notification-event.h index c9a6ed47..8a046198 100644 --- a/include/babeltrace/graph/private-notification-event.h +++ b/include/babeltrace/graph/private-notification-event.h @@ -42,7 +42,7 @@ struct bt_private_notification *bt_private_notification_event_create( struct bt_private_packet *packet); extern struct bt_private_event * -bt_private_notification_event_borrow_private_event( +bt_private_notification_event_borrow_event( struct bt_private_notification *notification); #ifdef __cplusplus diff --git a/include/babeltrace/graph/private-notification-packet.h b/include/babeltrace/graph/private-notification-packet.h index a3971d44..2e0b21f2 100644 --- a/include/babeltrace/graph/private-notification-packet.h +++ b/include/babeltrace/graph/private-notification-packet.h @@ -44,11 +44,11 @@ struct bt_private_notification *bt_private_notification_packet_end_create( struct bt_private_packet *packet); extern struct bt_private_packet * -bt_private_notification_packet_begin_borrow_private_packet( +bt_private_notification_packet_begin_borrow_packet( struct bt_private_notification *notification); extern struct bt_private_packet * -bt_private_notification_packet_end_borrow_private_packet( +bt_private_notification_packet_end_borrow_packet( struct bt_private_notification *notification); #ifdef __cplusplus diff --git a/include/babeltrace/graph/private-notification-stream.h b/include/babeltrace/graph/private-notification-stream.h index 524fd29c..bfdcf3c4 100644 --- a/include/babeltrace/graph/private-notification-stream.h +++ b/include/babeltrace/graph/private-notification-stream.h @@ -46,14 +46,14 @@ struct bt_private_notification *bt_private_notification_stream_end_create( struct bt_private_stream *stream); extern struct bt_private_stream * -bt_private_notification_stream_begin_borrow_private_stream( +bt_private_notification_stream_begin_borrow_stream( struct bt_private_notification *notification); extern int bt_private_notification_stream_begin_set_default_clock_value( struct bt_private_notification *notif, uint64_t value_cycles); extern struct bt_private_stream * -bt_private_notification_stream_end_borrow_private_stream( +bt_private_notification_stream_end_borrow_stream( struct bt_private_notification *notification); extern int bt_private_notification_stream_end_set_default_clock_value( diff --git a/include/babeltrace/graph/private-port.h b/include/babeltrace/graph/private-port.h index 32dc463f..d7de1690 100644 --- a/include/babeltrace/graph/private-port.h +++ b/include/babeltrace/graph/private-port.h @@ -35,10 +35,10 @@ struct bt_private_connection; struct bt_port *bt_port_borrow_from_private( struct bt_private_port *private_port); -extern struct bt_private_connection *bt_private_port_get_private_connection( +extern struct bt_private_connection *bt_private_port_get_connection( struct bt_private_port *private_port); -extern struct bt_private_component *bt_private_port_get_private_component( +extern struct bt_private_component *bt_private_port_get_component( struct bt_private_port *private_port); extern enum bt_port_status bt_private_port_remove_from_component( diff --git a/include/babeltrace/trace-ir/private-event-class.h b/include/babeltrace/trace-ir/private-event-class.h index 60251983..f81f6103 100644 --- a/include/babeltrace/trace-ir/private-event-class.h +++ b/include/babeltrace/trace-ir/private-event-class.h @@ -51,7 +51,7 @@ extern struct bt_private_event_class *bt_private_event_class_create_with_id( struct bt_private_stream_class *stream_class, uint64_t id); extern struct bt_private_stream_class * -bt_private_event_class_borrow_private_stream_class( +bt_private_event_class_borrow_stream_class( struct bt_private_event_class *event_class); extern int bt_private_event_class_set_name( @@ -66,18 +66,18 @@ extern int bt_private_event_class_set_emf_uri( const char *emf_uri); extern struct bt_private_field_class * -bt_private_event_class_borrow_specific_context_private_field_class( +bt_private_event_class_borrow_specific_context_field_class( struct bt_private_event_class *event_class); -extern int bt_private_event_class_set_specific_context_private_field_class( +extern int bt_private_event_class_set_specific_context_field_class( struct bt_private_event_class *event_class, struct bt_private_field_class *field_class); extern struct bt_private_field_class * -bt_private_event_class_borrow_payload_private_field_class( +bt_private_event_class_borrow_payload_field_class( struct bt_private_event_class *event_class); -extern int bt_private_event_class_set_payload_private_field_class( +extern int bt_private_event_class_set_payload_field_class( struct bt_private_event_class *event_class, struct bt_private_field_class *field_class); diff --git a/include/babeltrace/trace-ir/private-event-header-field.h b/include/babeltrace/trace-ir/private-event-header-field.h index ab7e827e..fd1ac1f7 100644 --- a/include/babeltrace/trace-ir/private-event-header-field.h +++ b/include/babeltrace/trace-ir/private-event-header-field.h @@ -39,7 +39,7 @@ struct bt_private_event_header_field *bt_private_event_header_field_create( struct bt_private_stream_class *stream_class); extern -struct bt_private_field *bt_private_event_header_field_borrow_private_field( +struct bt_private_field *bt_private_event_header_field_borrow_field( struct bt_private_event_header_field *field); extern diff --git a/include/babeltrace/trace-ir/private-event.h b/include/babeltrace/trace-ir/private-event.h index 3cca3052..d6519c36 100644 --- a/include/babeltrace/trace-ir/private-event.h +++ b/include/babeltrace/trace-ir/private-event.h @@ -50,22 +50,22 @@ extern struct bt_private_packet *bt_private_event_borrow_packet( extern struct bt_private_stream *bt_private_event_borrow_stream( struct bt_private_event *event); -extern struct bt_private_field *bt_private_event_borrow_header_private_field( +extern struct bt_private_field *bt_private_event_borrow_header_field( struct bt_private_event *event); -extern int bt_private_event_move_private_header_field( +extern int bt_private_event_move_header_field( struct bt_private_event *event, struct bt_private_event_header_field *header); extern struct bt_private_field * -bt_private_event_borrow_common_context_private_field( +bt_private_event_borrow_common_context_field( struct bt_private_event *event); extern struct bt_private_field * -bt_private_event_borrow_specific_context_private_field( +bt_private_event_borrow_specific_context_field( struct bt_private_event *event); -extern struct bt_private_field *bt_private_event_borrow_payload_private_field( +extern struct bt_private_field *bt_private_event_borrow_payload_field( struct bt_private_event *event); extern int bt_private_event_set_default_clock_value( diff --git a/include/babeltrace/trace-ir/private-field-classes.h b/include/babeltrace/trace-ir/private-field-classes.h index 7463d3dc..4ea7afc1 100644 --- a/include/babeltrace/trace-ir/private-field-classes.h +++ b/include/babeltrace/trace-ir/private-field-classes.h @@ -92,17 +92,17 @@ bt_private_field_class_string_create(void); extern struct bt_private_field_class * bt_private_field_class_structure_create(void); -extern void bt_private_field_class_structure_borrow_private_member_by_index( +extern void bt_private_field_class_structure_borrow_member_by_index( struct bt_private_field_class *struct_field_class, uint64_t index, const char **name, struct bt_private_field_class **field_class); extern struct bt_private_field_class * -bt_private_field_class_structure_borrow_member_private_field_class_by_name( +bt_private_field_class_structure_borrow_member_field_class_by_name( struct bt_private_field_class *field_class, const char *name); -extern int bt_private_field_class_structure_append_private_member( +extern int bt_private_field_class_structure_append_member( struct bt_private_field_class *struct_field_class, const char *name, struct bt_private_field_class *field_class); @@ -116,28 +116,28 @@ bt_private_field_class_dynamic_array_create( struct bt_private_field_class *elem_field_class); extern struct bt_private_field_class * -bt_private_field_class_array_borrow_element_private_field_class( +bt_private_field_class_array_borrow_element_field_class( struct bt_private_field_class *field_class); -extern int bt_private_field_class_dynamic_array_set_length_private_field_class( +extern int bt_private_field_class_dynamic_array_set_length_field_class( struct bt_private_field_class *field_class, struct bt_private_field_class *length_field_class); extern struct bt_private_field_class * bt_private_field_class_variant_create(void); -extern int bt_private_field_class_variant_set_selector_private_field_class( +extern int bt_private_field_class_variant_set_selector_field_class( struct bt_private_field_class *field_class, struct bt_private_field_class *selector_field_class); -extern void bt_private_field_class_variant_borrow_private_option_by_index( +extern void bt_private_field_class_variant_borrow_option_by_index( struct bt_private_field_class *variant_field_class, uint64_t index, const char **name, struct bt_private_field_class **field_class); extern struct bt_private_field_class * -bt_private_field_class_variant_borrow_option_private_field_class_by_name( +bt_private_field_class_variant_borrow_option_field_class_by_name( struct bt_private_field_class *field_class, const char *name); extern int bt_private_field_class_variant_append_private_option( diff --git a/include/babeltrace/trace-ir/private-fields.h b/include/babeltrace/trace-ir/private-fields.h index 4edc8636..09479edb 100644 --- a/include/babeltrace/trace-ir/private-fields.h +++ b/include/babeltrace/trace-ir/private-fields.h @@ -41,7 +41,7 @@ struct bt_private_field_class; extern struct bt_field *bt_field_borrow_from_private( struct bt_private_field *priv_field); -extern struct bt_private_field_class *bt_private_field_borrow_private_class( +extern struct bt_private_field_class *bt_private_field_borrow_class( struct bt_private_field *field); extern void bt_private_field_signed_integer_set_value( @@ -66,28 +66,25 @@ extern int bt_private_field_string_append_with_length( extern int bt_private_field_string_clear(struct bt_private_field *field); extern struct bt_private_field * -bt_private_field_structure_borrow_member_private_field_by_index( +bt_private_field_structure_borrow_member_field_by_index( struct bt_private_field *field, uint64_t index); extern struct bt_private_field * -bt_private_field_structure_borrow_member_private_field_by_name( +bt_private_field_structure_borrow_member_field_by_name( struct bt_private_field *field, const char *name); extern struct bt_private_field * -bt_private_field_array_borrow_element_private_field_by_index( +bt_private_field_array_borrow_element_field_by_index( struct bt_private_field *field, uint64_t index); extern int bt_private_field_dynamic_array_set_length( struct bt_private_field *field, uint64_t length); -extern int bt_private_field_variant_select_option_private_field( +extern int bt_private_field_variant_select_option_field( struct bt_private_field *field, uint64_t index); -extern uint64_t bt_private_field_variant_get_selected_option_private_field_index( - struct bt_private_field *field); - extern struct bt_private_field * -bt_private_field_variant_borrow_selected_option_private_field( +bt_private_field_variant_borrow_selected_option_field( struct bt_private_field *field); #ifdef __cplusplus diff --git a/include/babeltrace/trace-ir/private-packet-context-field.h b/include/babeltrace/trace-ir/private-packet-context-field.h index 08ce931c..dc55ca9b 100644 --- a/include/babeltrace/trace-ir/private-packet-context-field.h +++ b/include/babeltrace/trace-ir/private-packet-context-field.h @@ -39,7 +39,7 @@ struct bt_private_packet_context_field *bt_private_packet_context_field_create( struct bt_private_stream_class *stream_class); extern -struct bt_private_field *bt_private_packet_context_field_borrow_private_field( +struct bt_private_field *bt_private_packet_context_field_borrow_field( struct bt_private_packet_context_field *field); extern diff --git a/include/babeltrace/trace-ir/private-packet-header-field.h b/include/babeltrace/trace-ir/private-packet-header-field.h index 4e616425..189e57ab 100644 --- a/include/babeltrace/trace-ir/private-packet-header-field.h +++ b/include/babeltrace/trace-ir/private-packet-header-field.h @@ -39,7 +39,7 @@ struct bt_private_packet_header_field *bt_private_packet_header_field_create( struct bt_private_trace *trace); extern -struct bt_private_field *bt_private_packet_header_field_borrow_private_field( +struct bt_private_field *bt_private_packet_header_field_borrow_field( struct bt_private_packet_header_field *field); extern diff --git a/include/babeltrace/trace-ir/private-packet.h b/include/babeltrace/trace-ir/private-packet.h index fab1fa73..33b7786c 100644 --- a/include/babeltrace/trace-ir/private-packet.h +++ b/include/babeltrace/trace-ir/private-packet.h @@ -44,24 +44,24 @@ extern struct bt_packet *bt_packet_borrow_from_private( extern struct bt_private_packet *bt_private_packet_create( struct bt_private_stream *stream); -extern struct bt_private_stream *bt_private_packet_borrow_private_stream( +extern struct bt_private_stream *bt_private_packet_borrow_stream( struct bt_private_packet *packet); extern -struct bt_private_field *bt_private_packet_borrow_header_private_field( +struct bt_private_field *bt_private_packet_borrow_header_field( struct bt_private_packet *packet); extern -int bt_private_packet_move_private_header_field( +int bt_private_packet_move_header_field( struct bt_private_packet *packet, struct bt_private_packet_header_field *header); extern -struct bt_private_field *bt_private_packet_borrow_context_private_field( +struct bt_private_field *bt_private_packet_borrow_context_field( struct bt_private_packet *packet); extern -int bt_private_packet_move_private_context_field( +int bt_private_packet_move_context_field( struct bt_private_packet *packet, struct bt_private_packet_context_field *context); diff --git a/include/babeltrace/trace-ir/private-stream-class.h b/include/babeltrace/trace-ir/private-stream-class.h index e251b267..f744ebc1 100644 --- a/include/babeltrace/trace-ir/private-stream-class.h +++ b/include/babeltrace/trace-ir/private-stream-class.h @@ -52,7 +52,7 @@ extern struct bt_private_stream_class *bt_private_stream_class_create( extern struct bt_private_stream_class *bt_private_stream_class_create_with_id( struct bt_private_trace *trace, uint64_t id); -extern struct bt_private_trace *bt_private_stream_class_borrow_private_trace( +extern struct bt_private_trace *bt_private_stream_class_borrow_trace( struct bt_private_stream_class *stream_class); extern int bt_private_stream_class_set_name( @@ -66,36 +66,36 @@ extern int bt_private_stream_class_set_assigns_automatic_stream_id( struct bt_private_stream_class *stream_class, bt_bool value); extern struct bt_private_field_class * -bt_private_stream_class_borrow_packet_context_private_field_class( +bt_private_stream_class_borrow_packet_context_field_class( struct bt_private_stream_class *stream_class); -extern int bt_private_stream_class_set_packet_context_private_field_class( +extern int bt_private_stream_class_set_packet_context_field_class( struct bt_private_stream_class *stream_class, struct bt_private_field_class *field_class); extern struct bt_private_field_class * -bt_private_stream_class_borrow_event_header_private_field_class( +bt_private_stream_class_borrow_event_header_field_class( struct bt_private_stream_class *stream_class); -extern int bt_private_stream_class_set_event_header_private_field_class( +extern int bt_private_stream_class_set_event_header_field_class( struct bt_private_stream_class *stream_class, struct bt_private_field_class *field_class); extern struct bt_private_field_class * -bt_private_stream_class_borrow_event_common_context_private_field_class( +bt_private_stream_class_borrow_event_common_context_field_class( struct bt_private_stream_class *stream_class); extern int -bt_private_stream_class_set_event_common_context_private_field_class( +bt_private_stream_class_set_event_common_context_field_class( struct bt_private_stream_class *stream_class, struct bt_private_field_class *field_class); extern struct bt_private_event_class * -bt_private_stream_class_borrow_private_event_class_by_index( +bt_private_stream_class_borrow_event_class_by_index( struct bt_private_stream_class *stream_class, uint64_t index); extern struct bt_private_event_class * -bt_private_stream_class_borrow_private_event_class_by_id( +bt_private_stream_class_borrow_event_class_by_id( struct bt_private_stream_class *stream_class, uint64_t id); extern int bt_private_stream_class_set_default_clock_class( diff --git a/include/babeltrace/trace-ir/private-stream.h b/include/babeltrace/trace-ir/private-stream.h index 6a8d0bb3..39e019d3 100644 --- a/include/babeltrace/trace-ir/private-stream.h +++ b/include/babeltrace/trace-ir/private-stream.h @@ -47,7 +47,7 @@ extern struct bt_private_stream *bt_private_stream_create( extern struct bt_private_stream *bt_private_stream_create_with_id( struct bt_private_stream_class *stream_class, uint64_t id); -extern struct bt_private_stream_class *bt_private_stream_borrow_private_class( +extern struct bt_private_stream_class *bt_private_stream_borrow_class( struct bt_private_stream *stream); extern int bt_private_stream_set_name(struct bt_private_stream *stream, diff --git a/include/babeltrace/trace-ir/private-trace.h b/include/babeltrace/trace-ir/private-trace.h index a3651162..5b429494 100644 --- a/include/babeltrace/trace-ir/private-trace.h +++ b/include/babeltrace/trace-ir/private-trace.h @@ -65,40 +65,40 @@ extern int bt_private_trace_set_name(struct bt_private_trace *trace, extern int bt_private_trace_set_uuid(struct bt_private_trace *trace, bt_uuid uuid); -extern void bt_private_trace_borrow_private_environment_entry_by_index( +extern void bt_private_trace_borrow_environment_entry_by_index( struct bt_private_trace *trace, uint64_t index, const char **name, struct bt_private_value **value); extern struct bt_private_value * -bt_private_trace_borrow_private_environment_entry_value_by_name( +bt_private_trace_borrow_environment_entry_value_by_name( struct bt_private_trace *trace, const char *name); -extern int bt_private_trace_set_private_environment_entry_integer( +extern int bt_private_trace_set_environment_entry_integer( struct bt_private_trace *trace, const char *name, int64_t value); -extern int bt_private_trace_set_private_environment_entry_string( +extern int bt_private_trace_set_environment_entry_string( struct bt_private_trace *trace, const char *name, const char *value); extern struct bt_private_field_class * -bt_private_trace_borrow_packet_header_private_field_class( +bt_private_trace_borrow_packet_header_field_class( struct bt_private_trace *trace); -extern int bt_private_trace_set_packet_header_private_field_class( +extern int bt_private_trace_set_packet_header_field_class( struct bt_private_trace *trace, struct bt_private_field_class *packet_header_field_class); extern struct bt_private_stream_class * -bt_private_trace_borrow_private_stream_class_by_index( +bt_private_trace_borrow_stream_class_by_index( struct bt_private_trace *trace, uint64_t index); extern struct bt_private_stream_class * -bt_private_trace_borrow_private_stream_class_by_id( +bt_private_trace_borrow_stream_class_by_id( struct bt_private_trace *trace, uint64_t id); extern struct bt_private_stream * -bt_private_trace_borrow_private_stream_by_index( +bt_private_trace_borrow_stream_by_index( struct bt_private_trace *trace, uint64_t index); extern struct bt_private_stream *bt_private_trace_borrow_stream_by_id( diff --git a/lib/graph/component-class-sink-colander.c b/lib/graph/component-class-sink-colander.c index d1b75fea..f1067d41 100644 --- a/lib/graph/component-class-sink-colander.c +++ b/lib/graph/component-class-sink-colander.c @@ -69,7 +69,7 @@ enum bt_component_status colander_init( colander_data->notifs = user_provided_data->notifs; colander_data->count_addr = user_provided_data->count_addr; - status = bt_private_component_sink_add_input_private_port( + status = bt_private_component_sink_add_input_port( priv_comp, "in", NULL, NULL); if (status != BT_COMPONENT_STATUS_OK) { BT_LOGE_STR("Cannot add input port."); @@ -107,7 +107,7 @@ enum bt_component_status colander_port_connected(struct bt_private_component *pr enum bt_component_status status = BT_COMPONENT_STATUS_OK; enum bt_connection_status conn_status; struct bt_private_connection *priv_conn = - bt_private_port_get_private_connection(self_priv_port); + bt_private_port_get_connection(self_priv_port); struct colander_data *colander_data = bt_private_component_get_user_data(priv_comp); diff --git a/lib/graph/filter.c b/lib/graph/filter.c index 539443ef..c25160f5 100644 --- a/lib/graph/filter.c +++ b/lib/graph/filter.c @@ -224,7 +224,7 @@ end: } struct bt_private_port * -bt_private_component_filter_get_input_private_port_by_index( +bt_private_component_filter_get_input_port_by_index( struct bt_private_component *private_component, uint64_t index) { /* bt_component_filter_get_input_port_by_index() logs details/errors */ @@ -234,7 +234,7 @@ bt_private_component_filter_get_input_private_port_by_index( } struct bt_private_port * -bt_private_component_filter_get_input_private_port_by_name( +bt_private_component_filter_get_input_port_by_name( struct bt_private_component *private_component, const char *name) { @@ -244,7 +244,7 @@ bt_private_component_filter_get_input_private_port_by_name( bt_component_borrow_from_private(private_component), name)); } -enum bt_component_status bt_private_component_filter_add_input_private_port( +enum bt_component_status bt_private_component_filter_add_input_port( struct bt_private_component *private_component, const char *name, void *user_data, struct bt_private_port **user_priv_port) @@ -300,7 +300,7 @@ end: } struct bt_private_port * -bt_private_component_filter_get_output_private_port_by_index( +bt_private_component_filter_get_output_port_by_index( struct bt_private_component *private_component, uint64_t index) { /* bt_component_filter_get_output_port_by_index() logs details/errors */ @@ -310,7 +310,7 @@ bt_private_component_filter_get_output_private_port_by_index( } struct bt_private_port * -bt_private_component_filter_get_output_private_port_by_name( +bt_private_component_filter_get_output_port_by_name( struct bt_private_component *private_component, const char *name) { @@ -320,7 +320,7 @@ bt_private_component_filter_get_output_private_port_by_name( bt_component_borrow_from_private(private_component), name)); } -enum bt_component_status bt_private_component_filter_add_output_private_port( +enum bt_component_status bt_private_component_filter_add_output_port( struct bt_private_component *private_component, const char *name, void *user_data, struct bt_private_port **user_priv_port) diff --git a/lib/graph/notification/event.c b/lib/graph/notification/event.c index 18f6a4ac..bd0d077b 100644 --- a/lib/graph/notification/event.c +++ b/lib/graph/notification/event.c @@ -202,7 +202,7 @@ struct bt_event *bt_notification_event_borrow_event( return event_notification->event; } -struct bt_private_event *bt_private_notification_event_borrow_private_event( +struct bt_private_event *bt_private_notification_event_borrow_event( struct bt_private_notification *notification) { return (void *) bt_notification_event_borrow_event( diff --git a/lib/graph/notification/packet.c b/lib/graph/notification/packet.c index 6752bee0..64d24cbd 100644 --- a/lib/graph/notification/packet.c +++ b/lib/graph/notification/packet.c @@ -164,7 +164,7 @@ struct bt_packet *bt_notification_packet_begin_borrow_packet( } struct bt_private_packet * -bt_private_notification_packet_begin_borrow_private_packet( +bt_private_notification_packet_begin_borrow_packet( struct bt_private_notification *notification) { return (void *) bt_notification_packet_begin_borrow_packet( diff --git a/lib/graph/port.c b/lib/graph/port.c index 4e1b44bb..6660c66a 100644 --- a/lib/graph/port.c +++ b/lib/graph/port.c @@ -141,14 +141,14 @@ struct bt_component *bt_port_get_component(struct bt_port *port) return (struct bt_component *) bt_object_get_parent(&port->base); } -struct bt_private_connection *bt_private_port_get_private_connection( +struct bt_private_connection *bt_private_port_get_connection( struct bt_private_port *private_port) { return bt_private_connection_from_connection(bt_port_get_connection( bt_port_borrow_from_private(private_port))); } -struct bt_private_component *bt_private_port_get_private_component( +struct bt_private_component *bt_private_port_get_component( struct bt_private_port *private_port) { return bt_private_component_from_component(bt_port_get_component( diff --git a/lib/graph/sink.c b/lib/graph/sink.c index 5a8996fc..dc107017 100644 --- a/lib/graph/sink.c +++ b/lib/graph/sink.c @@ -142,7 +142,7 @@ end: } struct bt_private_port * -bt_private_component_sink_get_input_private_port_by_index( +bt_private_component_sink_get_input_port_by_index( struct bt_private_component *private_component, uint64_t index) { /* bt_component_sink_get_input_port_by_index() logs details/errors */ @@ -152,7 +152,7 @@ bt_private_component_sink_get_input_private_port_by_index( } struct bt_private_port * -bt_private_component_sink_get_input_private_port_by_name( +bt_private_component_sink_get_input_port_by_name( struct bt_private_component *private_component, const char *name) { @@ -162,7 +162,7 @@ bt_private_component_sink_get_input_private_port_by_name( bt_component_borrow_from_private(private_component), name)); } -enum bt_component_status bt_private_component_sink_add_input_private_port( +enum bt_component_status bt_private_component_sink_add_input_port( struct bt_private_component *private_component, const char *name, void *user_data, struct bt_private_port **user_priv_port) diff --git a/lib/graph/source.c b/lib/graph/source.c index a573df15..3510c00c 100644 --- a/lib/graph/source.c +++ b/lib/graph/source.c @@ -143,7 +143,7 @@ end: } struct bt_private_port * -bt_private_component_source_get_output_private_port_by_name( +bt_private_component_source_get_output_port_by_name( struct bt_private_component *private_component, const char *name) { @@ -154,7 +154,7 @@ bt_private_component_source_get_output_private_port_by_name( } struct bt_private_port * -bt_private_component_source_get_output_private_port_by_index( +bt_private_component_source_get_output_port_by_index( struct bt_private_component *private_component, uint64_t index) { /* bt_component_source_get_output_port_by_index() logs details/errors */ @@ -163,7 +163,7 @@ bt_private_component_source_get_output_private_port_by_index( bt_component_borrow_from_private(private_component), index)); } -enum bt_component_status bt_private_component_source_add_output_private_port( +enum bt_component_status bt_private_component_source_add_output_port( struct bt_private_component *private_component, const char *name, void *user_data, struct bt_private_port **user_priv_port) diff --git a/lib/trace-ir/event-class.c b/lib/trace-ir/event-class.c index 9574a9da..7c4ff432 100644 --- a/lib/trace-ir/event-class.c +++ b/lib/trace-ir/event-class.c @@ -270,7 +270,7 @@ struct bt_stream_class *bt_event_class_borrow_stream_class( } struct bt_private_stream_class * -bt_private_event_class_borrow_private_stream_class( +bt_private_event_class_borrow_stream_class( struct bt_private_event_class *event_class) { return (void *) bt_event_class_borrow_stream_class( @@ -285,14 +285,14 @@ struct bt_field_class *bt_event_class_borrow_specific_context_field_class( } struct bt_private_field_class * -bt_private_event_class_borrow_specific_context_private_field_class( +bt_private_event_class_borrow_specific_context_field_class( struct bt_private_event_class *event_class) { return (void *) bt_event_class_borrow_specific_context_field_class( (void *) event_class); } -int bt_private_event_class_set_specific_context_private_field_class( +int bt_private_event_class_set_specific_context_field_class( struct bt_private_event_class *priv_event_class, struct bt_private_field_class *priv_field_class) { @@ -349,14 +349,14 @@ struct bt_field_class *bt_event_class_borrow_payload_field_class( return event_class->payload_fc; } -struct bt_private_field_class *bt_private_event_class_borrow_payload_private_field_class( +struct bt_private_field_class *bt_private_event_class_borrow_payload_field_class( struct bt_private_event_class *event_class) { return (void *) bt_event_class_borrow_payload_field_class( (void *) event_class); } -int bt_private_event_class_set_payload_private_field_class( +int bt_private_event_class_set_payload_field_class( struct bt_private_event_class *priv_event_class, struct bt_private_field_class *priv_field_class) { diff --git a/lib/trace-ir/event-header-field.c b/lib/trace-ir/event-header-field.c index 37061174..dce75335 100644 --- a/lib/trace-ir/event-header-field.c +++ b/lib/trace-ir/event-header-field.c @@ -30,7 +30,7 @@ #include #include -struct bt_private_field *bt_private_event_header_field_borrow_private_field( +struct bt_private_field *bt_private_event_header_field_borrow_field( struct bt_private_event_header_field *header_field) { struct bt_field_wrapper *field_wrapper = (void *) header_field; diff --git a/lib/trace-ir/event.c b/lib/trace-ir/event.c index c2f772a5..b7d4607c 100644 --- a/lib/trace-ir/event.c +++ b/lib/trace-ir/event.c @@ -217,7 +217,7 @@ struct bt_field *bt_event_borrow_header_field(struct bt_event *event) return event->header_field ? event->header_field->field : NULL; } -struct bt_private_field *bt_private_event_borrow_header_private_field( +struct bt_private_field *bt_private_event_borrow_header_field( struct bt_private_event *event) { return (void *) bt_event_borrow_header_field((void *) event); @@ -229,7 +229,7 @@ struct bt_field *bt_event_borrow_common_context_field(struct bt_event *event) return event->common_context_field; } -struct bt_private_field *bt_private_event_borrow_common_context_private_field( +struct bt_private_field *bt_private_event_borrow_common_context_field( struct bt_private_event *event) { return (void *) bt_event_borrow_common_context_field((void *) event); @@ -241,7 +241,7 @@ struct bt_field *bt_event_borrow_specific_context_field(struct bt_event *event) return event->specific_context_field; } -struct bt_private_field *bt_private_event_borrow_specific_context_private_field( +struct bt_private_field *bt_private_event_borrow_specific_context_field( struct bt_private_event *event) { return (void *) bt_event_borrow_specific_context_field((void *) event); @@ -253,7 +253,7 @@ struct bt_field *bt_event_borrow_payload_field(struct bt_event *event) return event->payload_field; } -struct bt_private_field *bt_private_event_borrow_payload_private_field( +struct bt_private_field *bt_private_event_borrow_payload_field( struct bt_private_event *event) { return (void *) bt_event_borrow_payload_field((void *) event); @@ -353,7 +353,7 @@ struct bt_private_packet *bt_private_event_borrow_packet( return (void *) bt_event_borrow_packet((void *) event); } -int bt_private_event_move_private_header_field( +int bt_private_event_move_header_field( struct bt_private_event *priv_event, struct bt_private_event_header_field *priv_header_field) { diff --git a/lib/trace-ir/field-classes.c b/lib/trace-ir/field-classes.c index b2cee6e1..668bc46b 100644 --- a/lib/trace-ir/field-classes.c +++ b/lib/trace-ir/field-classes.c @@ -772,7 +772,7 @@ end: return ret; } -int bt_private_field_class_structure_append_private_member( +int bt_private_field_class_structure_append_member( struct bt_private_field_class *priv_fc, const char *name, struct bt_private_field_class *member_fc) { @@ -820,7 +820,7 @@ void bt_field_class_structure_borrow_member_by_index( index, name, out_fc); } -void bt_private_field_class_structure_borrow_private_member_by_index( +void bt_private_field_class_structure_borrow_member_by_index( struct bt_private_field_class *fc, uint64_t index, const char **name, struct bt_private_field_class **out_fc) { @@ -863,7 +863,7 @@ struct bt_field_class *bt_field_class_structure_borrow_member_field_class_by_nam } struct bt_private_field_class * -bt_private_field_class_structure_borrow_member_private_field_class_by_name( +bt_private_field_class_structure_borrow_member_field_class_by_name( struct bt_private_field_class *fc, const char *name) { return (void *) bt_field_class_structure_borrow_member_field_class_by_name( @@ -911,7 +911,7 @@ end: return (void *) var_fc; } -int bt_private_field_class_variant_set_selector_private_field_class( +int bt_private_field_class_variant_set_selector_field_class( struct bt_private_field_class *priv_fc, struct bt_private_field_class *selector_fc) { @@ -950,7 +950,7 @@ struct bt_field_class *bt_field_class_variant_borrow_option_field_class_by_name( } struct bt_private_field_class * -bt_private_field_class_variant_borrow_option_private_field_class_by_name( +bt_private_field_class_variant_borrow_option_field_class_by_name( struct bt_private_field_class *fc, const char *name) { return (void *) bt_field_class_variant_borrow_option_field_class_by_name( @@ -976,7 +976,7 @@ void bt_field_class_variant_borrow_option_by_index( index, name, out_fc); } -void bt_private_field_class_variant_borrow_private_option_by_index( +void bt_private_field_class_variant_borrow_option_by_index( struct bt_private_field_class *fc, uint64_t index, const char **name, struct bt_private_field_class **out_fc) { @@ -1119,7 +1119,7 @@ end: return (void *) array_fc; } -int bt_private_field_class_dynamic_array_set_length_private_field_class( +int bt_private_field_class_dynamic_array_set_length_field_class( struct bt_private_field_class *priv_fc, struct bt_private_field_class *priv_length_fc) { diff --git a/lib/trace-ir/fields.c b/lib/trace-ir/fields.c index d374d0a0..eb367c7e 100644 --- a/lib/trace-ir/fields.c +++ b/lib/trace-ir/fields.c @@ -189,7 +189,7 @@ struct bt_field_class *bt_field_borrow_class(struct bt_field *field) return field->class; } -struct bt_private_field_class *bt_private_field_borrow_private_class( +struct bt_private_field_class *bt_private_field_borrow_class( struct bt_private_field *field) { return (void *) bt_field_borrow_class((void *) field); @@ -754,7 +754,7 @@ struct bt_field *bt_field_array_borrow_element_field_by_index( } struct bt_private_field * -bt_private_field_array_borrow_element_private_field_by_index( +bt_private_field_array_borrow_element_field_by_index( struct bt_private_field *field, uint64_t index) { return (void *) bt_field_array_borrow_element_field_by_index( @@ -774,7 +774,7 @@ struct bt_field *bt_field_structure_borrow_member_field_by_index( } struct bt_private_field * -bt_private_field_structure_borrow_member_private_field_by_index( +bt_private_field_structure_borrow_member_field_by_index( struct bt_private_field *field, uint64_t index) { return (void *) bt_field_structure_borrow_member_field_by_index( @@ -809,7 +809,7 @@ end: } struct bt_private_field * -bt_private_field_structure_borrow_member_private_field_by_name( +bt_private_field_structure_borrow_member_field_by_name( struct bt_private_field *field, const char *name) { return (void *) bt_field_structure_borrow_member_field_by_name( @@ -830,14 +830,14 @@ struct bt_field *bt_field_variant_borrow_selected_option_field( } struct bt_private_field * -bt_private_field_variant_borrow_selected_option_private_field( +bt_private_field_variant_borrow_selected_option_field( struct bt_private_field *field) { return (void *) bt_field_variant_borrow_selected_option_field( (void *) field); } -int bt_private_field_variant_select_option_private_field( +int bt_private_field_variant_select_option_field( struct bt_private_field *priv_field, uint64_t index) { struct bt_field *field = (void *) priv_field; diff --git a/lib/trace-ir/packet-context-field.c b/lib/trace-ir/packet-context-field.c index 967ba52c..b71c6de4 100644 --- a/lib/trace-ir/packet-context-field.c +++ b/lib/trace-ir/packet-context-field.c @@ -30,7 +30,7 @@ #include #include -struct bt_private_field *bt_private_packet_context_field_borrow_private_field( +struct bt_private_field *bt_private_packet_context_field_borrow_field( struct bt_private_packet_context_field *context_field) { struct bt_field_wrapper *field_wrapper = (void *) context_field; diff --git a/lib/trace-ir/packet-header-field.c b/lib/trace-ir/packet-header-field.c index b02704bc..b381100c 100644 --- a/lib/trace-ir/packet-header-field.c +++ b/lib/trace-ir/packet-header-field.c @@ -30,7 +30,7 @@ #include #include -struct bt_private_field *bt_private_packet_header_field_borrow_private_field( +struct bt_private_field *bt_private_packet_header_field_borrow_field( struct bt_private_packet_header_field *header_field) { struct bt_field_wrapper *field_wrapper = (void *) header_field; diff --git a/lib/trace-ir/packet.c b/lib/trace-ir/packet.c index f4443453..3c01165f 100644 --- a/lib/trace-ir/packet.c +++ b/lib/trace-ir/packet.c @@ -50,7 +50,7 @@ struct bt_stream *bt_packet_borrow_stream(struct bt_packet *packet) return packet->stream; } -struct bt_private_stream *bt_private_packet_borrow_private_stream( +struct bt_private_stream *bt_private_packet_borrow_stream( struct bt_private_packet *packet) { return (void *) bt_packet_borrow_stream((void *) packet); @@ -62,7 +62,7 @@ struct bt_field *bt_packet_borrow_header_field(struct bt_packet *packet) return packet->header_field ? packet->header_field->field : NULL; } -struct bt_private_field *bt_private_packet_borrow_header_private_field( +struct bt_private_field *bt_private_packet_borrow_header_field( struct bt_private_packet *packet) { return (void *) bt_packet_borrow_header_field((void *) packet); @@ -74,7 +74,7 @@ struct bt_field *bt_packet_borrow_context_field(struct bt_packet *packet) return packet->context_field ? packet->context_field->field : NULL; } -struct bt_private_field *bt_private_packet_borrow_context_private_field( +struct bt_private_field *bt_private_packet_borrow_context_field( struct bt_private_packet *packet) { return (void *) bt_packet_borrow_context_field((void *) packet); @@ -342,7 +342,7 @@ end: return (void *) packet; } -int bt_private_packet_move_private_header_field( +int bt_private_packet_move_header_field( struct bt_private_packet *priv_packet, struct bt_private_packet_header_field *header_field) { @@ -372,7 +372,7 @@ int bt_private_packet_move_private_header_field( return 0; } -int bt_private_packet_move_private_context_field( +int bt_private_packet_move_context_field( struct bt_private_packet *priv_packet, struct bt_private_packet_context_field *context_field) { diff --git a/lib/trace-ir/stream-class.c b/lib/trace-ir/stream-class.c index 8c5133b1..f99ce1ad 100644 --- a/lib/trace-ir/stream-class.c +++ b/lib/trace-ir/stream-class.c @@ -258,7 +258,7 @@ struct bt_event_class *bt_stream_class_borrow_event_class_by_index( } struct bt_private_event_class * -bt_private_stream_class_borrow_private_event_class_by_index( +bt_private_stream_class_borrow_event_class_by_index( struct bt_private_stream_class *stream_class, uint64_t index) { return (void *) bt_stream_class_borrow_event_class_by_index( @@ -288,7 +288,7 @@ end: } struct bt_private_event_class * -bt_private_stream_class_borrow_private_event_class_by_id( +bt_private_stream_class_borrow_event_class_by_id( struct bt_private_stream_class *stream_class, uint64_t id) { return (void *) bt_stream_class_borrow_event_class_by_id( @@ -303,14 +303,14 @@ struct bt_field_class *bt_stream_class_borrow_packet_context_field_class( } struct bt_private_field_class * -bt_private_stream_class_borrow_packet_context_private_field_class( +bt_private_stream_class_borrow_packet_context_field_class( struct bt_private_stream_class *stream_class) { return (void *) bt_stream_class_borrow_packet_context_field_class( (void *) stream_class); } -int bt_private_stream_class_set_packet_context_private_field_class( +int bt_private_stream_class_set_packet_context_field_class( struct bt_private_stream_class *priv_stream_class, struct bt_private_field_class *priv_field_class) { @@ -359,14 +359,14 @@ struct bt_field_class *bt_stream_class_borrow_event_header_field_class( } struct bt_private_field_class * -bt_private_stream_class_borrow_event_header_private_field_class( +bt_private_stream_class_borrow_event_header_field_class( struct bt_private_stream_class *stream_class) { return (void *) bt_stream_class_borrow_event_header_field_class( (void *) stream_class); } -int bt_private_stream_class_set_event_header_private_field_class( +int bt_private_stream_class_set_event_header_field_class( struct bt_private_stream_class *priv_stream_class, struct bt_private_field_class *priv_field_class) { @@ -416,14 +416,14 @@ struct bt_field_class *bt_stream_class_borrow_event_common_context_field_class( } struct bt_private_field_class * -bt_private_stream_class_borrow_event_common_context_private_field_class( +bt_private_stream_class_borrow_event_common_context_field_class( struct bt_private_stream_class *stream_class) { return (void *) bt_stream_class_borrow_event_common_context_field_class( (void *) stream_class); } -int bt_private_stream_class_set_event_common_context_private_field_class( +int bt_private_stream_class_set_event_common_context_field_class( struct bt_private_stream_class *priv_stream_class, struct bt_private_field_class *priv_field_class) { diff --git a/lib/trace-ir/stream.c b/lib/trace-ir/stream.c index 546b5c44..15810b7b 100644 --- a/lib/trace-ir/stream.c +++ b/lib/trace-ir/stream.c @@ -177,7 +177,7 @@ struct bt_stream_class *bt_stream_borrow_class(struct bt_stream *stream) return stream->class; } -struct bt_private_stream_class *bt_private_stream_borrow_private_class( +struct bt_private_stream_class *bt_private_stream_borrow_class( struct bt_private_stream *priv_stream) { return (void *) bt_stream_borrow_class((void *) priv_stream); diff --git a/lib/trace-ir/trace.c b/lib/trace-ir/trace.c index 5c0546fe..2c572f67 100644 --- a/lib/trace-ir/trace.c +++ b/lib/trace-ir/trace.c @@ -278,7 +278,7 @@ int set_environment_entry(struct bt_trace *trace, const char *name, return ret; } -int bt_private_trace_set_private_environment_entry_string( +int bt_private_trace_set_environment_entry_string( struct bt_private_trace *priv_trace, const char *name, const char *value) { @@ -304,7 +304,7 @@ end: return ret; } -int bt_private_trace_set_private_environment_entry_integer( +int bt_private_trace_set_environment_entry_integer( struct bt_private_trace *priv_trace, const char *name, int64_t value) { @@ -355,7 +355,7 @@ void bt_trace_borrow_environment_entry_by_index( BT_ASSERT(*name); } -void bt_private_trace_borrow_private_environment_entry_by_index( +void bt_private_trace_borrow_environment_entry_by_index( struct bt_private_trace *trace, uint64_t index, const char **name, struct bt_private_value **value) { @@ -374,7 +374,7 @@ struct bt_value *bt_trace_borrow_environment_entry_value_by_name( } struct bt_private_value * -bt_private_trace_borrow_private_environment_entry_value_by_name( +bt_private_trace_borrow_environment_entry_value_by_name( struct bt_private_trace *trace, const char *name) { return (void *) bt_trace_borrow_environment_entry_value_by_name( @@ -395,7 +395,7 @@ struct bt_stream *bt_trace_borrow_stream_by_index( return g_ptr_array_index(trace->streams, index); } -struct bt_private_stream *bt_private_trace_borrow_private_stream_by_index( +struct bt_private_stream *bt_private_trace_borrow_stream_by_index( struct bt_private_trace *trace, uint64_t index) { return (void *) bt_trace_borrow_stream_by_index((void *) trace, index); @@ -444,7 +444,7 @@ struct bt_stream_class *bt_trace_borrow_stream_class_by_index( } struct bt_private_stream_class * -bt_private_trace_borrow_private_stream_class_by_index( +bt_private_trace_borrow_stream_class_by_index( struct bt_private_trace *trace, uint64_t index) { return (void *) bt_trace_borrow_stream_class_by_index( @@ -474,7 +474,7 @@ end: } struct bt_private_stream_class * -bt_private_trace_borrow_private_stream_class_by_id( +bt_private_trace_borrow_stream_class_by_id( struct bt_private_trace *trace, uint64_t id) { return (void *) bt_trace_borrow_stream_class_by_id((void *) trace, id); @@ -487,7 +487,7 @@ struct bt_field_class *bt_trace_borrow_packet_header_field_class( return trace->packet_header_fc; } -int bt_private_trace_set_packet_header_private_field_class( +int bt_private_trace_set_packet_header_field_class( struct bt_private_trace *priv_trace, struct bt_private_field_class *priv_field_class) { diff --git a/plugins/ctf/common/metadata/ctf-meta-translate.c b/plugins/ctf/common/metadata/ctf-meta-translate.c index eee4998d..ea2eea78 100644 --- a/plugins/ctf/common/metadata/ctf-meta-translate.c +++ b/plugins/ctf/common/metadata/ctf-meta-translate.c @@ -154,7 +154,7 @@ struct bt_private_field_class *ctf_field_class_struct_to_ir( member_ir_fc = ctf_field_class_to_ir(named_fc->fc, tc, sc, ec); BT_ASSERT(member_ir_fc); - ret = bt_private_field_class_structure_append_private_member( + ret = bt_private_field_class_structure_append_member( ir_fc, named_fc->name->str, member_ir_fc); BT_ASSERT(ret == 0); bt_object_put_ref(member_ir_fc); @@ -196,7 +196,7 @@ struct bt_private_field_class *ctf_field_class_variant_to_ir( uint64_t i; BT_ASSERT(ir_fc); - ret = bt_private_field_class_variant_set_selector_private_field_class( + ret = bt_private_field_class_variant_set_selector_field_class( ir_fc, borrow_ir_ft_from_field_path(&fc->tag_path, tc, sc, ec)); BT_ASSERT(ret == 0); @@ -267,7 +267,7 @@ struct bt_private_field_class *ctf_field_class_sequence_to_ir( BT_ASSERT(ir_fc); bt_object_put_ref(elem_ir_fc); BT_ASSERT(ir_fc); - ret = bt_private_field_class_dynamic_array_set_length_private_field_class( + ret = bt_private_field_class_dynamic_array_set_length_field_class( ir_fc, borrow_ir_ft_from_field_path(&fc->length_path, tc, sc, ec)); BT_ASSERT(ret == 0); @@ -405,7 +405,7 @@ struct bt_private_event_class *ctf_event_class_to_ir(struct ctf_event_class *ec, struct bt_private_event_class *ir_ec = NULL; if (ec->is_translated) { - ir_ec = bt_private_stream_class_borrow_private_event_class_by_id( + ir_ec = bt_private_stream_class_borrow_event_class_by_id( ir_sc, ec->id); BT_ASSERT(ir_ec); goto end; @@ -420,7 +420,7 @@ struct bt_private_event_class *ctf_event_class_to_ir(struct ctf_event_class *ec, ec->spec_context_fc, tc, sc, ec); if (ir_fc) { - ret = bt_private_event_class_set_specific_context_private_field_class( + ret = bt_private_event_class_set_specific_context_field_class( ir_ec, ir_fc); BT_ASSERT(ret == 0); bt_object_put_ref(ir_fc); @@ -432,7 +432,7 @@ struct bt_private_event_class *ctf_event_class_to_ir(struct ctf_event_class *ec, ec->payload_fc, tc, sc, ec); if (ir_fc) { - ret = bt_private_event_class_set_payload_private_field_class(ir_ec, + ret = bt_private_event_class_set_payload_field_class(ir_ec, ir_fc); BT_ASSERT(ret == 0); bt_object_put_ref(ir_fc); @@ -471,7 +471,7 @@ struct bt_private_stream_class *ctf_stream_class_to_ir(struct ctf_stream_class * struct ctf_field_class_int *int_fc; if (sc->is_translated) { - ir_sc = bt_private_trace_borrow_private_stream_class_by_id( + ir_sc = bt_private_trace_borrow_stream_class_by_id( ir_trace, sc->id); BT_ASSERT(ir_sc); goto end; @@ -486,7 +486,7 @@ struct bt_private_stream_class *ctf_stream_class_to_ir(struct ctf_stream_class * sc->packet_context_fc, tc, sc, NULL); if (ir_fc) { - ret = bt_private_stream_class_set_packet_context_private_field_class( + ret = bt_private_stream_class_set_packet_context_field_class( ir_sc, ir_fc); BT_ASSERT(ret == 0); bt_object_put_ref(ir_fc); @@ -498,7 +498,7 @@ struct bt_private_stream_class *ctf_stream_class_to_ir(struct ctf_stream_class * sc->event_header_fc, tc, sc, NULL); if (ir_fc) { - ret = bt_private_stream_class_set_event_header_private_field_class( + ret = bt_private_stream_class_set_event_header_field_class( ir_sc, ir_fc); BT_ASSERT(ret == 0); bt_object_put_ref(ir_fc); @@ -510,7 +510,7 @@ struct bt_private_stream_class *ctf_stream_class_to_ir(struct ctf_stream_class * sc->event_common_context_fc, tc, sc, NULL); if (ir_fc) { - ret = bt_private_stream_class_set_event_common_context_private_field_class( + ret = bt_private_stream_class_set_event_common_context_field_class( ir_sc, ir_fc); BT_ASSERT(ret == 0); bt_object_put_ref(ir_fc); @@ -592,7 +592,7 @@ int ctf_trace_class_to_ir(struct bt_private_trace *ir_trace, tc->packet_header_fc, tc, NULL, NULL); if (ir_fc) { - ret = bt_private_trace_set_packet_header_private_field_class( + ret = bt_private_trace_set_packet_header_field_class( ir_trace, ir_fc); BT_ASSERT(ret == 0); bt_object_put_ref(ir_fc); @@ -619,12 +619,12 @@ int ctf_trace_class_to_ir(struct bt_private_trace *ir_trace, switch (env_entry->type) { case CTF_TRACE_CLASS_ENV_ENTRY_TYPE_INT: - ret = bt_private_trace_set_private_environment_entry_integer( + ret = bt_private_trace_set_environment_entry_integer( ir_trace, env_entry->name->str, env_entry->value.i); break; case CTF_TRACE_CLASS_ENV_ENTRY_TYPE_STR: - ret = bt_private_trace_set_private_environment_entry_string( + ret = bt_private_trace_set_environment_entry_string( ir_trace, env_entry->name->str, env_entry->value.str->str); break; diff --git a/plugins/ctf/common/notif-iter/notif-iter.c b/plugins/ctf/common/notif-iter/notif-iter.c index cc1707ea..3fc618b9 100644 --- a/plugins/ctf/common/notif-iter/notif-iter.c +++ b/plugins/ctf/common/notif-iter/notif-iter.c @@ -691,7 +691,7 @@ enum bt_notif_iter_status read_packet_header_begin_state( } notit->dscopes.trace_packet_header = - bt_private_packet_header_field_borrow_private_field( + bt_private_packet_header_field_borrow_field( notit->packet_header_field); BT_ASSERT(notit->dscopes.trace_packet_header); } @@ -927,7 +927,7 @@ enum bt_notif_iter_status read_packet_context_begin_state( } notit->dscopes.stream_packet_context = - bt_private_packet_context_field_borrow_private_field( + bt_private_packet_context_field_borrow_field( notit->packet_context_field); BT_ASSERT(notit->dscopes.stream_packet_context); } @@ -1105,7 +1105,7 @@ enum bt_notif_iter_status read_event_header_begin_state( } notit->dscopes.event_header = - bt_private_event_header_field_borrow_private_field( + bt_private_event_header_field_borrow_field( notit->event_header_field); BT_ASSERT(notit->dscopes.event_header); } @@ -1247,7 +1247,7 @@ enum bt_notif_iter_status after_event_header_state( goto end; } - notit->event = bt_private_notification_event_borrow_private_event( + notit->event = bt_private_notification_event_borrow_event( notit->event_notif); BT_ASSERT(notit->event); @@ -1255,7 +1255,7 @@ enum bt_notif_iter_status after_event_header_state( int ret; BT_ASSERT(notit->event); - ret = bt_private_event_move_private_header_field(notit->event, + ret = bt_private_event_move_header_field(notit->event, notit->event_header_field); if (ret) { status = BT_NOTIF_ITER_STATUS_ERROR; @@ -1269,7 +1269,7 @@ enum bt_notif_iter_status after_event_header_state( * the same value as the event header field within * notit->event. */ - BT_ASSERT(bt_private_event_borrow_header_private_field( + BT_ASSERT(bt_private_event_borrow_header_field( notit->event) == notit->dscopes.event_header); } @@ -1295,7 +1295,7 @@ enum bt_notif_iter_status read_event_common_context_begin_state( if (event_common_context_fc->in_ir) { BT_ASSERT(!notit->dscopes.event_common_context); notit->dscopes.event_common_context = - bt_private_event_borrow_common_context_private_field( + bt_private_event_borrow_common_context_field( notit->event); BT_ASSERT(notit->dscopes.event_common_context); } @@ -1348,7 +1348,7 @@ enum bt_notif_iter_status read_event_spec_context_begin_state( if (event_spec_context_fc->in_ir) { BT_ASSERT(!notit->dscopes.event_spec_context); notit->dscopes.event_spec_context = - bt_private_event_borrow_specific_context_private_field( + bt_private_event_borrow_specific_context_field( notit->event); BT_ASSERT(notit->dscopes.event_spec_context); } @@ -1404,7 +1404,7 @@ enum bt_notif_iter_status read_event_payload_begin_state( if (event_payload_fc->in_ir) { BT_ASSERT(!notit->dscopes.event_payload); notit->dscopes.event_payload = - bt_private_event_borrow_payload_private_field( + bt_private_event_borrow_payload_field( notit->event); BT_ASSERT(notit->dscopes.event_payload); } @@ -1690,7 +1690,7 @@ struct bt_private_field *borrow_next_field(struct bt_notif_iter *notit) index = stack_top(notit->stack)->index; base_field = stack_top(notit->stack)->base; BT_ASSERT(base_field); - base_fc = bt_private_field_borrow_private_class(base_field); + base_fc = bt_private_field_borrow_class(base_field); BT_ASSERT(base_fc); switch (bt_field_class_get_type(bt_field_class_borrow_from_private(base_fc))) { @@ -1699,10 +1699,10 @@ struct bt_private_field *borrow_next_field(struct bt_notif_iter *notit) BT_ASSERT(index < bt_field_class_structure_get_member_count( bt_field_class_borrow_from_private( - bt_private_field_borrow_private_class( + bt_private_field_borrow_class( base_field)))); next_field = - bt_private_field_structure_borrow_member_private_field_by_index( + bt_private_field_structure_borrow_member_field_by_index( base_field, index); break; } @@ -1710,12 +1710,12 @@ struct bt_private_field *borrow_next_field(struct bt_notif_iter *notit) case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: BT_ASSERT(index < bt_field_array_get_length( bt_field_borrow_from_private(base_field))); - next_field = bt_private_field_array_borrow_element_private_field_by_index( + next_field = bt_private_field_array_borrow_element_field_by_index( base_field, index); break; case BT_FIELD_CLASS_TYPE_VARIANT: BT_ASSERT(index == 0); - next_field = bt_private_field_variant_borrow_selected_option_private_field( + next_field = bt_private_field_variant_borrow_selected_option_field( base_field); break; default: @@ -1843,7 +1843,7 @@ update_def_clock: field = borrow_next_field(notit); BT_ASSERT(field); - BT_ASSERT(bt_private_field_borrow_private_class(field) == fc->ir_fc); + BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc); BT_ASSERT(bt_field_get_class_type( bt_field_borrow_from_private(field)) == BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER || @@ -1934,7 +1934,7 @@ enum bt_bfcr_status bfcr_signed_int_cb(int64_t value, field = borrow_next_field(notit); BT_ASSERT(field); - BT_ASSERT(bt_private_field_borrow_private_class(field) == fc->ir_fc); + BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc); BT_ASSERT(bt_field_get_class_type( bt_field_borrow_from_private(field)) == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER || @@ -1962,7 +1962,7 @@ enum bt_bfcr_status bfcr_floating_point_cb(double value, BT_ASSERT(fc->in_ir); field = borrow_next_field(notit); BT_ASSERT(field); - BT_ASSERT(bt_private_field_borrow_private_class(field) == fc->ir_fc); + BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc); BT_ASSERT(bt_field_get_class_type( bt_field_borrow_from_private(field)) == BT_FIELD_CLASS_TYPE_REAL); @@ -1987,7 +1987,7 @@ enum bt_bfcr_status bfcr_string_begin_cb( BT_ASSERT(fc->in_ir); field = borrow_next_field(notit); BT_ASSERT(field); - BT_ASSERT(bt_private_field_borrow_private_class(field) == fc->ir_fc); + BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc); BT_ASSERT(bt_field_get_class_type( bt_field_borrow_from_private(field)) == BT_FIELD_CLASS_TYPE_STRING); @@ -2081,7 +2081,7 @@ enum bt_bfcr_status bfcr_compound_begin_cb( /* Push field */ BT_ASSERT(field); - BT_ASSERT(bt_private_field_borrow_private_class(field) == fc->ir_fc); + BT_ASSERT(bt_private_field_borrow_class(field) == fc->ir_fc); stack_push(notit->stack, field); /* @@ -2125,7 +2125,7 @@ enum bt_bfcr_status bfcr_compound_end_cb( } BT_ASSERT(!stack_empty(notit->stack)); - BT_ASSERT(bt_private_field_borrow_private_class(stack_top(notit->stack)->base) == + BT_ASSERT(bt_private_field_borrow_class(stack_top(notit->stack)->base) == fc->ir_fc); /* @@ -2243,7 +2243,7 @@ struct ctf_field_class *bfcr_borrow_variant_selected_field_class_cb( if (selected_option->fc->in_ir) { struct bt_private_field *var_field = stack_top(notit->stack)->base; - ret = bt_private_field_variant_select_option_private_field( + ret = bt_private_field_variant_select_option_field( var_field, option_index); if (ret) { BT_LOGW("Cannot select variant field's option field: " @@ -2264,7 +2264,7 @@ static void set_event_default_clock_value(struct bt_notif_iter *notit) { struct bt_private_event *event = - bt_private_notification_event_borrow_private_event( + bt_private_notification_event_borrow_event( notit->event_notif); struct bt_stream_class *sc = bt_stream_class_borrow_from_private( notit->meta.sc->ir_sc); @@ -2378,7 +2378,7 @@ void notify_new_packet(struct bt_notif_iter *notit, } if (notit->packet_header_field) { - ret = bt_private_packet_move_private_header_field( + ret = bt_private_packet_move_header_field( notit->packet, notit->packet_header_field); if (ret) { goto end; @@ -2391,13 +2391,13 @@ void notify_new_packet(struct bt_notif_iter *notit, * the same value as the packet header field within * notit->packet. */ - BT_ASSERT(bt_private_packet_borrow_header_private_field( + BT_ASSERT(bt_private_packet_borrow_header_field( notit->packet) == notit->dscopes.trace_packet_header); } if (notit->packet_context_field) { - ret = bt_private_packet_move_private_context_field( + ret = bt_private_packet_move_context_field( notit->packet, notit->packet_context_field); if (ret) { goto end; @@ -2410,7 +2410,7 @@ void notify_new_packet(struct bt_notif_iter *notit, * the same value as the packet header field within * notit->packet. */ - BT_ASSERT(bt_private_packet_borrow_context_private_field( + BT_ASSERT(bt_private_packet_borrow_context_field( notit->packet) == notit->dscopes.stream_packet_context); } diff --git a/plugins/ctf/fs-sink/writer.c b/plugins/ctf/fs-sink/writer.c index d9166834..ccd57fdd 100644 --- a/plugins/ctf/fs-sink/writer.c +++ b/plugins/ctf/fs-sink/writer.c @@ -210,7 +210,7 @@ void writer_component_port_connected( writer = bt_private_component_get_user_data(component); BT_ASSERT(writer); BT_ASSERT(!writer->input_iterator); - connection = bt_private_port_get_private_connection(self_port); + connection = bt_private_port_get_connection(self_port); BT_ASSERT(connection); conn_status = bt_private_connection_create_notification_iterator( connection, &writer->input_iterator); @@ -305,7 +305,7 @@ enum bt_component_status writer_component_init( goto end; } - ret = bt_private_component_sink_add_input_private_port(component, + ret = bt_private_component_sink_add_input_port(component, "in", NULL, NULL); if (ret != BT_COMPONENT_STATUS_OK) { goto end; diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c index 1e4356d6..d47e18b8 100644 --- a/plugins/ctf/fs-src/data-stream-file.c +++ b/plugins/ctf/fs-src/data-stream-file.c @@ -181,7 +181,7 @@ struct bt_private_stream *medop_borrow_stream( struct bt_private_stream_class *ds_file_stream_class; struct bt_private_stream *stream = NULL; - ds_file_stream_class = bt_private_stream_borrow_private_class( + ds_file_stream_class = bt_private_stream_borrow_class( ds_file->stream); if (stream_class != ds_file_stream_class) { diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c index e3fa27e7..23240952 100644 --- a/plugins/ctf/fs-src/fs.c +++ b/plugins/ctf/fs-src/fs.c @@ -414,7 +414,7 @@ int create_one_port_for_trace(struct ctf_fs_component *ctf_fs, port_data->ctf_fs = ctf_fs; port_data->ds_file_group = ds_file_group; - ret = bt_private_component_source_add_output_private_port( + ret = bt_private_component_source_add_output_port( ctf_fs->priv_comp, port_name->str, port_data, NULL); if (ret) { goto error; diff --git a/plugins/ctf/lttng-live/lttng-live.c b/plugins/ctf/lttng-live/lttng-live.c index 1f0b8446..833c2ab6 100644 --- a/plugins/ctf/lttng-live/lttng-live.c +++ b/plugins/ctf/lttng-live/lttng-live.c @@ -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_private_component_source_add_output_port( lttng_live->private_component, name, stream_iter, &private_port); switch (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_private_component_source_add_output_port(lttng_live->private_component, "no-stream", lttng_live->no_stream_iter, <tng_live->no_stream_port); switch (status) { @@ -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_private_component_source_add_output_port( lttng_live->private_component, "no-stream", lttng_live->no_stream_iter, <tng_live->no_stream_port); diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c index f6ec53d3..d107b322 100644 --- a/plugins/lttng-utils/plugin.c +++ b/plugins/lttng-utils/plugin.c @@ -285,14 +285,14 @@ enum bt_notification_iterator_status debug_info_iterator_init( goto end; } - input_port = bt_private_component_filter_get_input_private_port_by_name( + input_port = bt_private_component_filter_get_input_port_by_name( component, "in"); if (!input_port) { ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; goto end; } - connection = bt_private_port_get_private_connection(input_port); + connection = bt_private_port_get_connection(input_port); bt_object_put_ref(input_port); if (!connection) { ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; @@ -413,13 +413,13 @@ enum bt_component_status debug_info_component_init( goto error; } - ret = bt_private_component_filter_add_input_private_port( + ret = bt_private_component_filter_add_input_port( component, "in", NULL, NULL); if (ret != BT_COMPONENT_STATUS_OK) { goto end; } - ret = bt_private_component_filter_add_output_private_port( + ret = bt_private_component_filter_add_output_port( component, "out", NULL, NULL); if (ret != BT_COMPONENT_STATUS_OK) { goto end; diff --git a/plugins/text/dmesg/dmesg.c b/plugins/text/dmesg/dmesg.c index 964ad831..6ea9af0d 100644 --- a/plugins/text/dmesg/dmesg.c +++ b/plugins/text/dmesg/dmesg.c @@ -95,7 +95,7 @@ struct bt_private_field_class *create_event_payload_fc(void) goto error; } - ret = bt_private_field_class_structure_append_private_member(root_fc, + ret = bt_private_field_class_structure_append_member(root_fc, "str", fc); if (ret) { BT_LOGE("Cannot add `str` member to structure field class: " @@ -190,7 +190,7 @@ int create_meta(struct dmesg_component *dmesg_comp, bool has_ts) goto error; } - ret = bt_private_event_class_set_payload_private_field_class(dmesg_comp->event_class, fc); + ret = bt_private_event_class_set_payload_field_class(dmesg_comp->event_class, fc); if (ret) { BT_LOGE_STR("Cannot set event class's event payload field class."); goto error; @@ -353,7 +353,7 @@ void destroy_dmesg_component(struct dmesg_component *dmesg_comp) static enum bt_component_status create_port(struct bt_private_component *priv_comp) { - return bt_private_component_source_add_output_private_port(priv_comp, + return bt_private_component_source_add_output_port(priv_comp, "out", NULL, NULL); } @@ -502,7 +502,7 @@ skip_ts: goto error; } - event = bt_private_notification_event_borrow_private_event(notif); + event = bt_private_notification_event_borrow_event(notif); BT_ASSERT(event); if (dmesg_comp->clock_class) { @@ -528,9 +528,9 @@ int fill_event_payload_from_line(const char *line, size_t len; int ret; - ep_field = bt_private_event_borrow_payload_private_field(event); + ep_field = bt_private_event_borrow_payload_field(event); BT_ASSERT(ep_field); - str_field = bt_private_field_structure_borrow_member_private_field_by_index( + str_field = bt_private_field_structure_borrow_member_field_by_index( ep_field, 0); if (!str_field) { BT_LOGE_STR("Cannot borrow `timestamp` field from event payload structure field."); @@ -581,7 +581,7 @@ struct bt_private_notification *create_notif_from_line( goto error; } - event = bt_private_notification_event_borrow_private_event(notif); + event = bt_private_notification_event_borrow_event(notif); BT_ASSERT(event); ret = fill_event_payload_from_line(new_start, event); if (ret) { diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c index 5ef2c7a7..66534b58 100644 --- a/plugins/text/pretty/pretty.c +++ b/plugins/text/pretty/pretty.c @@ -164,7 +164,7 @@ enum bt_component_status pretty_port_connected( pretty = bt_private_component_get_user_data(component); BT_ASSERT(pretty); BT_ASSERT(!pretty->input_iterator); - connection = bt_private_port_get_private_connection(self_port); + connection = bt_private_port_get_connection(self_port); BT_ASSERT(connection); conn_status = bt_private_connection_create_notification_iterator( connection, &pretty->input_iterator); @@ -716,7 +716,7 @@ enum bt_component_status pretty_init( goto end; } - ret = bt_private_component_sink_add_input_private_port(component, + ret = bt_private_component_sink_add_input_port(component, "in", NULL, NULL); if (ret != BT_COMPONENT_STATUS_OK) { goto end; diff --git a/plugins/utils/counter/counter.c b/plugins/utils/counter/counter.c index 0c2cd3cf..04450d65 100644 --- a/plugins/utils/counter/counter.c +++ b/plugins/utils/counter/counter.c @@ -132,7 +132,7 @@ enum bt_component_status counter_init(struct bt_private_component *component, goto end; } - ret = bt_private_component_sink_add_input_private_port(component, + ret = bt_private_component_sink_add_input_port(component, "in", NULL, NULL); if (ret != BT_COMPONENT_STATUS_OK) { goto end; @@ -185,7 +185,7 @@ enum bt_component_status counter_port_connected( counter = bt_private_component_get_user_data(component); BT_ASSERT(counter); - connection = bt_private_port_get_private_connection(self_port); + connection = bt_private_port_get_connection(self_port); BT_ASSERT(connection); conn_status = bt_private_connection_create_notification_iterator( connection, &iterator); diff --git a/plugins/utils/dummy/dummy.c b/plugins/utils/dummy/dummy.c index 3e98d5ce..31d1b70d 100644 --- a/plugins/utils/dummy/dummy.c +++ b/plugins/utils/dummy/dummy.c @@ -53,7 +53,7 @@ enum bt_component_status dummy_init(struct bt_private_component *component, goto end; } - ret = bt_private_component_sink_add_input_private_port(component, + ret = bt_private_component_sink_add_input_port(component, "in", NULL, NULL); if (ret != BT_COMPONENT_STATUS_OK) { goto end; @@ -86,7 +86,7 @@ enum bt_component_status dummy_port_connected( dummy = bt_private_component_get_user_data(component); BT_ASSERT(dummy); - connection = bt_private_port_get_private_connection(self_port); + connection = bt_private_port_get_connection(self_port); BT_ASSERT(connection); conn_status = bt_private_connection_create_notification_iterator( connection, &iterator); diff --git a/plugins/utils/muxer/muxer.c b/plugins/utils/muxer/muxer.c index 8275f3e4..1cd3fd51 100644 --- a/plugins/utils/muxer/muxer.c +++ b/plugins/utils/muxer/muxer.c @@ -193,7 +193,7 @@ enum bt_component_status ensure_available_input_port( } g_string_append_printf(port_name, "%u", muxer_comp->next_port_num); - status = bt_private_component_filter_add_input_private_port( + status = bt_private_component_filter_add_input_port( priv_comp, port_name->str, NULL, NULL); if (status != BT_COMPONENT_STATUS_OK) { BT_LOGE("Cannot add input port to muxer component: " @@ -220,7 +220,7 @@ static enum bt_component_status create_output_port( struct bt_private_component *priv_comp) { - return bt_private_component_filter_add_output_private_port( + return bt_private_component_filter_add_output_port( priv_comp, "out", NULL, NULL); } @@ -421,7 +421,7 @@ struct bt_notification_iterator *create_notif_iter_on_input_port( *ret = 0; BT_ASSERT(port); BT_ASSERT(bt_port_is_connected(port)); - priv_conn = bt_private_port_get_private_connection(priv_port); + priv_conn = bt_private_port_get_connection(priv_port); BT_ASSERT(priv_conn); // TODO: Advance the iterator to >= the time of the latest @@ -1187,7 +1187,7 @@ int muxer_notif_iter_init_newly_connected_ports(struct muxer_comp *muxer_comp, for (i = 0; i < count; i++) { struct bt_private_port *priv_port = - bt_private_component_filter_get_input_private_port_by_index( + bt_private_component_filter_get_input_port_by_index( muxer_comp->priv_comp, i); struct bt_port *port; diff --git a/plugins/utils/trimmer/iterator.c b/plugins/utils/trimmer/iterator.c index e23daa64..f157de81 100644 --- a/plugins/utils/trimmer/iterator.c +++ b/plugins/utils/trimmer/iterator.c @@ -84,10 +84,10 @@ enum bt_notification_iterator_status trimmer_iterator_init( } /* Create a new iterator on the upstream component. */ - input_port = bt_private_component_filter_get_input_private_port_by_name( + input_port = bt_private_component_filter_get_input_port_by_name( component, "in"); BT_ASSERT(input_port); - connection = bt_private_port_get_private_connection(input_port); + connection = bt_private_port_get_connection(input_port); BT_ASSERT(connection); conn_status = bt_private_connection_create_notification_iterator(connection, diff --git a/plugins/utils/trimmer/trimmer.c b/plugins/utils/trimmer/trimmer.c index 777b14fa..0aa74758 100644 --- a/plugins/utils/trimmer/trimmer.c +++ b/plugins/utils/trimmer/trimmer.c @@ -357,13 +357,13 @@ enum bt_component_status trimmer_component_init( } /* Create input and output ports */ - ret = bt_private_component_filter_add_input_private_port( + ret = bt_private_component_filter_add_input_port( component, "in", NULL, NULL); if (ret != BT_COMPONENT_STATUS_OK) { goto error; } - ret = bt_private_component_filter_add_output_private_port( + ret = bt_private_component_filter_add_output_port( component, "out", NULL, NULL); if (ret != BT_COMPONENT_STATUS_OK) { goto error; diff --git a/tests/lib/test_bt_notification_iterator.c b/tests/lib/test_bt_notification_iterator.c index 606decdf..828b11a4 100644 --- a/tests/lib/test_bt_notification_iterator.c +++ b/tests/lib/test_bt_notification_iterator.c @@ -495,7 +495,7 @@ enum bt_component_status src_init( { int ret; - ret = bt_private_component_source_add_output_private_port( + ret = bt_private_component_source_add_output_port( private_component, "out", NULL, NULL); BT_ASSERT(ret == 0); return BT_COMPONENT_STATUS_OK; @@ -647,7 +647,7 @@ enum bt_component_status sink_port_connected( struct bt_port *other_port) { struct bt_private_connection *priv_conn = - bt_private_port_get_private_connection(self_private_port); + bt_private_port_get_connection(self_private_port); struct sink_user_data *user_data = bt_private_component_get_user_data( private_component); enum bt_connection_status conn_status; @@ -673,7 +673,7 @@ enum bt_component_status sink_init( ret = bt_private_component_set_user_data(private_component, user_data); BT_ASSERT(ret == 0); - ret = bt_private_component_sink_add_input_private_port( + ret = bt_private_component_sink_add_input_port( private_component, "in", NULL, NULL); BT_ASSERT(ret == 0); return BT_COMPONENT_STATUS_OK; diff --git a/tests/lib/test_graph_topo.c b/tests/lib/test_graph_topo.c index bb29db0b..b57d644f 100644 --- a/tests/lib/test_graph_topo.c +++ b/tests/lib/test_graph_topo.c @@ -336,7 +336,7 @@ enum bt_component_status src_port_connected( switch (current_test) { case TEST_SRC_ADDS_PORT_IN_PORT_CONNECTED: - ret = bt_private_component_source_add_output_private_port( + ret = bt_private_component_source_add_output_port( private_component, "hello", NULL, NULL); BT_ASSERT(ret == 0); break; @@ -379,7 +379,7 @@ enum bt_component_status src_init(struct bt_private_component *priv_comp, { int ret; - ret = bt_private_component_source_add_output_private_port( + ret = bt_private_component_source_add_output_port( priv_comp, "out", NULL, NULL); BT_ASSERT(ret == 0); return BT_COMPONENT_STATUS_OK; @@ -395,7 +395,7 @@ enum bt_component_status sink_consume( switch (current_test) { case TEST_SINK_REMOVES_PORT_IN_CONSUME: case TEST_SINK_REMOVES_PORT_IN_CONSUME_THEN_SRC_REMOVES_DISCONNECTED_PORT: - def_port = bt_private_component_sink_get_input_private_port_by_name( + def_port = bt_private_component_sink_get_input_port_by_name( priv_component, "in"); BT_ASSERT(def_port); ret = bt_private_port_remove_from_component(def_port); @@ -454,7 +454,7 @@ enum bt_component_status sink_init(struct bt_private_component *priv_comp, { int ret; - ret = bt_private_component_sink_add_input_private_port(priv_comp, + ret = bt_private_component_sink_add_input_port(priv_comp, "in", NULL, NULL); BT_ASSERT(ret == 0); return BT_COMPONENT_STATUS_OK; diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c index 47aaeac5..9191890e 100644 --- a/tests/lib/test_trace_ir_ref.c +++ b/tests/lib/test_trace_ir_ref.c @@ -75,21 +75,21 @@ static struct bt_private_field_class *create_integer_struct(void) BT_ASSERT(ui8); ret = bt_private_field_class_integer_set_field_value_range(ui8, 8); BT_ASSERT(ret == 0); - ret = bt_private_field_class_structure_append_private_member(structure, + ret = bt_private_field_class_structure_append_member(structure, "payload_8", ui8); BT_ASSERT(ret == 0); ui16 = bt_private_field_class_unsigned_integer_create(); BT_ASSERT(ui16); ret = bt_private_field_class_integer_set_field_value_range(ui16, 16); BT_ASSERT(ret == 0); - ret = bt_private_field_class_structure_append_private_member(structure, + ret = bt_private_field_class_structure_append_member(structure, "payload_16", ui16); BT_ASSERT(ret == 0); ui32 = bt_private_field_class_unsigned_integer_create(); BT_ASSERT(ui32); ret = bt_private_field_class_integer_set_field_value_range(ui32, 32); BT_ASSERT(ret == 0); - ret = bt_private_field_class_structure_append_private_member(structure, + ret = bt_private_field_class_structure_append_member(structure, "payload_32", ui32); BT_ASSERT(ret == 0); BT_OBJECT_PUT_REF_AND_RESET(ui8); @@ -147,7 +147,7 @@ static struct bt_private_event_class *create_simple_event( BT_ASSERT(ret == 0); payload = create_integer_struct(); BT_ASSERT(payload); - ret = bt_private_event_class_set_payload_private_field_class(event, payload); + ret = bt_private_event_class_set_payload_field_class(event, payload); BT_ASSERT(ret == 0); BT_OBJECT_PUT_REF_AND_RESET(payload); return event; @@ -180,10 +180,10 @@ static struct bt_private_event_class *create_complex_event( BT_ASSERT(outer); inner = create_integer_struct(); BT_ASSERT(inner); - ret = bt_private_field_class_structure_append_private_member(outer, + ret = bt_private_field_class_structure_append_member(outer, "payload_struct", inner); BT_ASSERT(ret == 0); - ret = bt_private_event_class_set_payload_private_field_class(event, outer); + ret = bt_private_event_class_set_payload_field_class(event, outer); BT_ASSERT(ret == 0); BT_OBJECT_PUT_REF_AND_RESET(inner); BT_OBJECT_PUT_REF_AND_RESET(outer); @@ -204,7 +204,7 @@ static void set_stream_class_field_classes( BT_ASSERT(fc); ret = bt_private_field_class_integer_set_field_value_range(fc, 32); BT_ASSERT(ret == 0); - ret = bt_private_field_class_structure_append_private_member(packet_context_type, + ret = bt_private_field_class_structure_append_member(packet_context_type, "packet_size", fc); BT_ASSERT(ret == 0); bt_object_put_ref(fc); @@ -212,7 +212,7 @@ static void set_stream_class_field_classes( BT_ASSERT(fc); ret = bt_private_field_class_integer_set_field_value_range(fc, 32); BT_ASSERT(ret == 0); - ret = bt_private_field_class_structure_append_private_member(packet_context_type, + ret = bt_private_field_class_structure_append_member(packet_context_type, "content_size", fc); BT_ASSERT(ret == 0); bt_object_put_ref(fc); @@ -222,14 +222,14 @@ static void set_stream_class_field_classes( BT_ASSERT(fc); ret = bt_private_field_class_integer_set_field_value_range(fc, 32); BT_ASSERT(ret == 0); - ret = bt_private_field_class_structure_append_private_member(event_header_type, + ret = bt_private_field_class_structure_append_member(event_header_type, "id", fc); BT_ASSERT(ret == 0); bt_object_put_ref(fc); - ret = bt_private_stream_class_set_packet_context_private_field_class( + ret = bt_private_stream_class_set_packet_context_field_class( stream_class, packet_context_type); BT_ASSERT(ret == 0); - ret = bt_private_stream_class_set_event_header_private_field_class( + ret = bt_private_stream_class_set_event_header_field_class( stream_class, event_header_type); BT_ASSERT(ret == 0); bt_object_put_ref(packet_context_type); @@ -251,9 +251,9 @@ static void create_sc1(struct bt_private_trace *trace) BT_ASSERT(ec1); ec2 = create_simple_event(sc1, "ec2"); BT_ASSERT(ec2); - ret_stream = bt_private_event_class_borrow_private_stream_class(ec1); + ret_stream = bt_private_event_class_borrow_stream_class(ec1); ok(ret_stream == sc1, "Borrow parent stream SC1 from EC1"); - ret_stream = bt_private_event_class_borrow_private_stream_class(ec2); + ret_stream = bt_private_event_class_borrow_stream_class(ec2); ok(ret_stream == sc1, "Borrow parent stream SC1 from EC2"); BT_OBJECT_PUT_REF_AND_RESET(ec1); BT_OBJECT_PUT_REF_AND_RESET(ec2); @@ -272,7 +272,7 @@ static void create_sc2(struct bt_private_trace *trace) BT_ASSERT(ret == 0); set_stream_class_field_classes(sc2); ec3 = create_simple_event(sc2, "ec3"); - ret_stream = bt_private_event_class_borrow_private_stream_class(ec3); + ret_stream = bt_private_event_class_borrow_stream_class(ec3); ok(ret_stream == sc2, "Borrow parent stream SC2 from EC3"); BT_OBJECT_PUT_REF_AND_RESET(ec3); BT_OBJECT_PUT_REF_AND_RESET(sc2); @@ -290,11 +290,11 @@ static void set_trace_packet_header(struct bt_private_trace *trace) BT_ASSERT(fc); ret = bt_private_field_class_integer_set_field_value_range(fc, 32); BT_ASSERT(ret == 0); - ret = bt_private_field_class_structure_append_private_member(packet_header_type, + ret = bt_private_field_class_structure_append_member(packet_header_type, "stream_id", fc); BT_ASSERT(ret == 0); bt_object_put_ref(fc); - ret = bt_private_trace_set_packet_header_private_field_class(trace, + ret = bt_private_trace_set_packet_header_field_class(trace, packet_header_type); BT_ASSERT(ret == 0); @@ -322,11 +322,11 @@ static void init_weak_refs(struct bt_private_trace *tc, struct bt_private_event_class **ec3) { *tc1 = tc; - *sc1 = bt_private_trace_borrow_private_stream_class_by_index(tc, 0); - *sc2 = bt_private_trace_borrow_private_stream_class_by_index(tc, 1); - *ec1 = bt_private_stream_class_borrow_private_event_class_by_index(*sc1, 0); - *ec2 = bt_private_stream_class_borrow_private_event_class_by_index(*sc1, 1); - *ec3 = bt_private_stream_class_borrow_private_event_class_by_index(*sc2, 0); + *sc1 = bt_private_trace_borrow_stream_class_by_index(tc, 0); + *sc2 = bt_private_trace_borrow_stream_class_by_index(tc, 1); + *ec1 = bt_private_stream_class_borrow_event_class_by_index(*sc1, 0); + *ec2 = bt_private_stream_class_borrow_event_class_by_index(*sc1, 1); + *ec3 = bt_private_stream_class_borrow_event_class_by_index(*sc2, 0); } static void test_example_scenario(void) @@ -368,7 +368,7 @@ static void test_example_scenario(void) /* User A acquires a reference to SC2 from TC1. */ user_a.sc = bt_object_get_ref( - bt_private_trace_borrow_private_stream_class_by_index( + bt_private_trace_borrow_stream_class_by_index( user_a.tc, 1)); ok(user_a.sc, "User A acquires SC2 from TC1"); ok(bt_object_get_ref_count((void *) weak_tc1) == 2, @@ -378,7 +378,7 @@ static void test_example_scenario(void) /* User A acquires a reference to EC3 from SC2. */ user_a.ec = bt_object_get_ref( - bt_private_stream_class_borrow_private_event_class_by_index( + bt_private_stream_class_borrow_event_class_by_index( user_a.sc, 0)); ok(user_a.ec, "User A acquires EC3 from SC2"); ok(bt_object_get_ref_count((void *) weak_tc1) == 2, @@ -427,7 +427,7 @@ static void test_example_scenario(void) /* User C acquires a reference to EC1. */ diag("User C acquires a reference to EC1"); user_c.ec = bt_object_get_ref( - bt_private_stream_class_borrow_private_event_class_by_index( + bt_private_stream_class_borrow_event_class_by_index( user_b.sc, 0)); ok(bt_object_get_ref_count((void *) weak_ec1) == 1, "EC1 reference count is 1");