X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Flttng-utils%2Fplugin.c;h=09740c677308d1542452a5ca8011a8b32a313878;hb=b19ff26f04df428047676dd736bd7cc9473906fe;hp=c3b24f3f5eea0e33fc85d6665f7c0e8117f0d5d1;hpb=0d72b8c329ad51d14ab4e83330b38c2c8da69dd4;p=babeltrace.git

diff --git a/plugins/lttng-utils/plugin.c b/plugins/lttng-utils/plugin.c
index c3b24f3f..09740c67 100644
--- a/plugins/lttng-utils/plugin.c
+++ b/plugins/lttng-utils/plugin.c
@@ -54,7 +54,7 @@ void destroy_debug_info_data(struct debug_info_component *debug_info)
 }
 
 static
-void destroy_debug_info_component(struct bt_self_component *component)
+void destroy_debug_info_component(bt_self_component *component)
 {
 	void *data = bt_self_component_get_user_data(component);
 	destroy_debug_info_data(data);
@@ -78,12 +78,12 @@ end:
 static
 void unref_trace(struct debug_info_trace *di_trace)
 {
-	bt_object_put_ref(di_trace->writer_trace);
+	bt_trace_put_ref(di_trace->writer_trace);
 	g_free(di_trace);
 }
 
 static
-void debug_info_iterator_destroy(struct bt_self_notification_iterator *it)
+void debug_info_iterator_destroy(bt_self_notification_iterator *it)
 {
 	struct debug_info_iterator *it_data;
 
@@ -98,25 +98,25 @@ void debug_info_iterator_destroy(struct bt_self_notification_iterator *it)
 			empty_trace_map, it_data);
 	g_hash_table_destroy(it_data->trace_map);
 
-	bt_object_put_ref(it_data->current_notification);
+	bt_notification_put_ref(it_data->current_notification);
 	bt_object_put_ref(it_data->input_iterator);
 
 	g_free(it_data);
 }
 
 static
-const struct bt_notification *handle_notification(FILE *err,
+const bt_notification *handle_notification(FILE *err,
 		struct debug_info_iterator *debug_it,
-		const struct bt_notification *notification)
+		const bt_notification *notification)
 {
-	const struct bt_notification *new_notification = NULL;
+	const bt_notification *new_notification = NULL;
 
 	switch (bt_notification_get_type(notification)) {
-	case BT_NOTIFICATION_TYPE_PACKET_BEGIN:
+	case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
 	{
-		const struct bt_packet *packet =
-			bt_notification_packet_begin_get_packet(notification);
-		const struct bt_packet *writer_packet;
+		const bt_packet *packet =
+			bt_notification_packet_beginning_get_packet(notification);
+		const bt_packet *writer_packet;
 
 		if (!packet) {
 			goto end;
@@ -124,18 +124,18 @@ const struct bt_notification *handle_notification(FILE *err,
 
 		writer_packet = debug_info_new_packet(debug_it, packet);
 		BT_ASSERT(writer_packet);
-		new_notification = bt_notification_packet_begin_create(
+		new_notification = bt_notification_packet_beginning_create(
 				writer_packet);
 		BT_ASSERT(new_notification);
-		bt_object_put_ref(packet);
-		bt_object_put_ref(writer_packet);
+		bt_packet_put_ref(packet);
+		bt_packet_put_ref(writer_packet);
 		break;
 	}
 	case BT_NOTIFICATION_TYPE_PACKET_END:
 	{
-		const struct bt_packet *packet =
+		const bt_packet *packet =
 			bt_notification_packet_end_get_packet(notification);
-		const struct bt_packet *writer_packet;
+		const bt_packet *writer_packet;
 
 		if (!packet) {
 			goto end;
@@ -146,16 +146,16 @@ const struct bt_notification *handle_notification(FILE *err,
 		new_notification = bt_notification_packet_end_create(
 				writer_packet);
 		BT_ASSERT(new_notification);
-		bt_object_put_ref(packet);
-		bt_object_put_ref(writer_packet);
+		bt_packet_put_ref(packet);
+		bt_packet_put_ref(writer_packet);
 		break;
 	}
 	case BT_NOTIFICATION_TYPE_EVENT:
 	{
-		const struct bt_event *event = bt_notification_event_get_event(
+		const bt_event *event = bt_notification_event_get_event(
 				notification);
-		const struct bt_event *writer_event;
-		struct bt_clock_class_priority_map *cc_prio_map =
+		const bt_event *writer_event;
+		bt_clock_class_priority_map *cc_prio_map =
 			bt_notification_event_get_clock_class_priority_map(
 					notification);
 
@@ -172,11 +172,11 @@ const struct bt_notification *handle_notification(FILE *err,
 		bt_object_put_ref(writer_event);
 		break;
 	}
-	case BT_NOTIFICATION_TYPE_STREAM_BEGIN:
+	case BT_NOTIFICATION_TYPE_STREAM_BEGINNING:
 	{
-		const struct bt_stream *stream =
-			bt_notification_stream_begin_get_stream(notification);
-		const struct bt_stream *writer_stream;
+		const bt_stream *stream =
+			bt_notification_stream_beginning_get_stream(notification);
+		const bt_stream *writer_stream;
 
 		if (!stream) {
 			goto end;
@@ -184,18 +184,18 @@ const struct bt_notification *handle_notification(FILE *err,
 
 		writer_stream = debug_info_stream_begin(debug_it, stream);
 		BT_ASSERT(writer_stream);
-		new_notification = bt_notification_stream_begin_create(
+		new_notification = bt_notification_stream_beginning_create(
 				writer_stream);
 		BT_ASSERT(new_notification);
-		bt_object_put_ref(stream);
-		bt_object_put_ref(writer_stream);
+		bt_stream_put_ref(stream);
+		bt_stream_put_ref(writer_stream);
 		break;
 	}
 	case BT_NOTIFICATION_TYPE_STREAM_END:
 	{
-		const struct bt_stream *stream =
+		const bt_stream *stream =
 			bt_notification_stream_end_get_stream(notification);
-		const struct bt_stream *writer_stream;
+		const bt_stream *writer_stream;
 
 		if (!stream) {
 			goto end;
@@ -206,12 +206,12 @@ const struct bt_notification *handle_notification(FILE *err,
 		new_notification = bt_notification_stream_end_create(
 				writer_stream);
 		BT_ASSERT(new_notification);
-		bt_object_put_ref(stream);
-		bt_object_put_ref(writer_stream);
+		bt_stream_put_ref(stream);
+		bt_stream_put_ref(writer_stream);
 		break;
 	}
 	default:
-		new_notification = bt_object_get_ref(notification);
+		new_notification = bt_notification_get_ref(notification);
 		break;
 	}
 
@@ -220,15 +220,15 @@ end:
 }
 
 static
-struct bt_notification_iterator_next_method_return debug_info_iterator_next(
-		struct bt_self_notification_iterator *iterator)
+bt_notification_iterator_next_method_return debug_info_iterator_next(
+		bt_self_notification_iterator *iterator)
 {
 	struct debug_info_iterator *debug_it = NULL;
-	struct bt_self_component *component = NULL;
+	bt_self_component *component = NULL;
 	struct debug_info_component *debug_info = NULL;
-	struct bt_notification_iterator *source_it = NULL;
-	const struct bt_notification *notification;
-	struct bt_notification_iterator_next_method_return ret = {
+	bt_notification_iterator *source_it = NULL;
+	const bt_notification *notification;
+	bt_notification_iterator_next_method_return ret = {
 		.status = BT_NOTIFICATION_ITERATOR_STATUS_OK,
 		.notification = NULL,
 	};
@@ -258,7 +258,7 @@ struct bt_notification_iterator_next_method_return debug_info_iterator_next(
 	ret.notification = handle_notification(debug_info->err, debug_it,
 			notification);
 	BT_ASSERT(ret.notification);
-	bt_object_put_ref(notification);
+	bt_notification_put_ref(notification);
 
 end:
 	bt_object_put_ref(component);
@@ -267,7 +267,7 @@ end:
 
 static
 enum bt_notification_iterator_status debug_info_iterator_init(
-		struct bt_self_notification_iterator *iterator,
+		bt_self_notification_iterator *iterator,
 		struct bt_private_port *port)
 {
 	enum bt_notification_iterator_status ret =
@@ -275,7 +275,7 @@ enum bt_notification_iterator_status debug_info_iterator_init(
 	enum bt_notification_iterator_status it_ret;
 	enum bt_connection_status conn_status;
 	struct bt_private_connection *connection = NULL;
-	struct bt_self_component *component =
+	bt_self_component *component =
 		bt_self_notification_iterator_get_private_component(iterator);
 	struct debug_info_iterator *it_data = g_new0(struct debug_info_iterator, 1);
 	struct bt_private_port *input_port;
@@ -326,9 +326,9 @@ end:
 static
 enum bt_component_status init_from_params(
 		struct debug_info_component *debug_info_component,
-		struct bt_value *params)
+		bt_value *params)
 {
-	struct bt_value *value = NULL;
+	bt_value *value = NULL;
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 
 	BT_ASSERT(params);
@@ -340,7 +340,7 @@ enum bt_component_status init_from_params(
 
 		tmp = bt_value_string_get(value);
 		strcpy(debug_info_component->arg_debug_info_field_name, tmp);
-		bt_object_put_ref(value);
+		bt_value_put_ref(value);
 	} else {
 		debug_info_component->arg_debug_info_field_name =
 			malloc(strlen("debug_info") + 1);
@@ -362,7 +362,7 @@ enum bt_component_status init_from_params(
 
 		debug_info_component->arg_debug_dir = bt_value_string_get(value);
 	}
-	bt_object_put_ref(value);
+	bt_value_put_ref(value);
 	if (ret != BT_COMPONENT_STATUS_OK) {
 		goto end;
 	}
@@ -373,7 +373,7 @@ enum bt_component_status init_from_params(
 
 		debug_info_component->arg_target_prefix = bt_value_string_get(value);
 	}
-	bt_object_put_ref(value);
+	bt_value_put_ref(value);
 	if (ret != BT_COMPONENT_STATUS_OK) {
 		goto end;
 	}
@@ -387,7 +387,7 @@ enum bt_component_status init_from_params(
 
 		debug_info_component->arg_full_path = bool_val;
 	}
-	bt_object_put_ref(value);
+	bt_value_put_ref(value);
 	if (ret != BT_COMPONENT_STATUS_OK) {
 		goto end;
 	}
@@ -397,7 +397,7 @@ end:
 }
 
 enum bt_component_status debug_info_component_init(
-	struct bt_self_component *component, struct bt_value *params,
+	bt_self_component *component, bt_value *params,
 	UNUSED_VAR void *init_method_data)
 {
 	enum bt_component_status ret;