X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=plugins%2Ftext%2Fpretty%2Fpretty.c;h=d83b30c160123b85b3693a4bfab665e90118eaff;hb=8e53bed40d8ef5026ccfd0149a8e48e6e220d740;hp=846cbdae7265cbe33f8d4815d42e7bed9f129f6e;hpb=c5b9b4417bedfbec9b5dd23b8395ccdd4eeffc44;p=babeltrace.git

diff --git a/plugins/text/pretty/pretty.c b/plugins/text/pretty/pretty.c
index 846cbdae..d83b30c1 100644
--- a/plugins/text/pretty/pretty.c
+++ b/plugins/text/pretty/pretty.c
@@ -65,7 +65,7 @@ const char *plugin_options[] = {
 static
 void destroy_pretty_data(struct pretty_component *pretty)
 {
-	bt_self_component_port_input_notification_iterator_put_ref(pretty->iterator);
+	bt_self_component_port_input_message_iterator_put_ref(pretty->iterator);
 
 	if (pretty->string) {
 		(void) g_string_free(pretty->string, TRUE);
@@ -113,7 +113,7 @@ error:
 }
 
 BT_HIDDEN
-void pretty_finalize(struct bt_self_component_sink *comp)
+void pretty_finalize(bt_self_component_sink *comp)
 {
 	destroy_pretty_data(
 		bt_self_component_get_data(
@@ -121,28 +121,29 @@ void pretty_finalize(struct bt_self_component_sink *comp)
 }
 
 static
-enum bt_self_component_status handle_notification(
+bt_self_component_status handle_message(
 		struct pretty_component *pretty,
-		const struct bt_notification *notification)
+		const bt_message *message)
 {
-	enum bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
+	bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
 
 	BT_ASSERT(pretty);
 
-	switch (bt_notification_get_type(notification)) {
-	case BT_NOTIFICATION_TYPE_PACKET_BEGINNING:
-		if (pretty_print_packet(pretty, notification)) {
+	switch (bt_message_get_type(message)) {
+	case BT_MESSAGE_TYPE_EVENT:
+		if (pretty_print_event(pretty, message)) {
 			ret = BT_SELF_COMPONENT_STATUS_ERROR;
 		}
 		break;
-	case BT_NOTIFICATION_TYPE_EVENT:
-		if (pretty_print_event(pretty, notification)) {
+	case BT_MESSAGE_TYPE_INACTIVITY:
+		fprintf(stderr, "Inactivity message\n");
+		break;
+	case BT_MESSAGE_TYPE_DISCARDED_EVENTS:
+	case BT_MESSAGE_TYPE_DISCARDED_PACKETS:
+		if (pretty_print_discarded_items(pretty, message)) {
 			ret = BT_SELF_COMPONENT_STATUS_ERROR;
 		}
 		break;
-	case BT_NOTIFICATION_TYPE_INACTIVITY:
-		fprintf(stderr, "Inactivity notification\n");
-		break;
 	default:
 		break;
 	}
@@ -151,19 +152,19 @@ enum bt_self_component_status handle_notification(
 }
 
 BT_HIDDEN
-enum bt_self_component_status pretty_port_connected(
-		struct bt_self_component_sink *comp,
-		struct bt_self_component_port_input *self_port,
-		const struct bt_port_output *other_port)
+bt_self_component_status pretty_port_connected(
+		bt_self_component_sink *comp,
+		bt_self_component_port_input *self_port,
+		const bt_port_output *other_port)
 {
-	enum bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
+	bt_self_component_status status = BT_SELF_COMPONENT_STATUS_OK;
 	struct pretty_component *pretty;
 
 	pretty = bt_self_component_get_data(
 			bt_self_component_sink_as_self_component(comp));
 	BT_ASSERT(pretty);
 	BT_ASSERT(!pretty->iterator);
-	pretty->iterator = bt_self_component_port_input_notification_iterator_create(
+	pretty->iterator = bt_self_component_port_input_message_iterator_create(
 		self_port);
 	if (!pretty->iterator) {
 		status = BT_SELF_COMPONENT_STATUS_NOMEM;
@@ -173,34 +174,34 @@ enum bt_self_component_status pretty_port_connected(
 }
 
 BT_HIDDEN
-enum bt_self_component_status pretty_consume(
-		struct bt_self_component_sink *comp)
+bt_self_component_status pretty_consume(
+		bt_self_component_sink *comp)
 {
-	enum bt_self_component_status ret;
-	bt_notification_array_const notifs;
-	struct bt_self_component_port_input_notification_iterator *it;
+	bt_self_component_status ret;
+	bt_message_array_const msgs;
+	bt_self_component_port_input_message_iterator *it;
 	struct pretty_component *pretty = bt_self_component_get_data(
 		bt_self_component_sink_as_self_component(comp));
-	enum bt_notification_iterator_status it_ret;
+	bt_message_iterator_status it_ret;
 	uint64_t count = 0;
 	uint64_t i = 0;
 
 	it = pretty->iterator;
-	it_ret = bt_self_component_port_input_notification_iterator_next(it,
-		&notifs, &count);
+	it_ret = bt_self_component_port_input_message_iterator_next(it,
+		&msgs, &count);
 
 	switch (it_ret) {
-	case BT_NOTIFICATION_ITERATOR_STATUS_OK:
+	case BT_MESSAGE_ITERATOR_STATUS_OK:
 		break;
-	case BT_NOTIFICATION_ITERATOR_STATUS_NOMEM:
+	case BT_MESSAGE_ITERATOR_STATUS_NOMEM:
 		ret = BT_SELF_COMPONENT_STATUS_NOMEM;
 		goto end;
-	case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN:
+	case BT_MESSAGE_ITERATOR_STATUS_AGAIN:
 		ret = BT_SELF_COMPONENT_STATUS_AGAIN;
 		goto end;
-	case BT_NOTIFICATION_ITERATOR_STATUS_END:
+	case BT_MESSAGE_ITERATOR_STATUS_END:
 		ret = BT_SELF_COMPONENT_STATUS_END;
-		BT_SELF_COMPONENT_PORT_INPUT_NOTIFICATION_ITERATOR_PUT_REF_AND_RESET(
+		BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_PUT_REF_AND_RESET(
 			pretty->iterator);
 		goto end;
 	default:
@@ -208,34 +209,34 @@ enum bt_self_component_status pretty_consume(
 		goto end;
 	}
 
-	BT_ASSERT(it_ret == BT_NOTIFICATION_ITERATOR_STATUS_OK);
+	BT_ASSERT(it_ret == BT_MESSAGE_ITERATOR_STATUS_OK);
 
 	for (i = 0; i < count; i++) {
-		ret = handle_notification(pretty, notifs[i]);
+		ret = handle_message(pretty, msgs[i]);
 		if (ret) {
 			goto end;
 		}
 
-		bt_notification_put_ref(notifs[i]);
+		bt_message_put_ref(msgs[i]);
 	}
 
 end:
 	for (; i < count; i++) {
-		bt_notification_put_ref(notifs[i]);
+		bt_message_put_ref(msgs[i]);
 	}
 
 	return ret;
 }
 
 static
-int add_params_to_map(struct bt_value *plugin_opt_map)
+int add_params_to_map(bt_value *plugin_opt_map)
 {
 	int ret = 0;
 	unsigned int i;
 
 	for (i = 0; i < BT_ARRAY_SIZE(plugin_options); i++) {
 		const char *key = plugin_options[i];
-		enum bt_value_status status;
+		bt_value_status status;
 
 		status = bt_value_map_insert_entry(plugin_opt_map, key,
 			bt_value_null);
@@ -252,7 +253,7 @@ end:
 }
 
 static
-bt_bool check_param_exists(const char *key, const struct bt_value *object,
+bt_bool check_param_exists(const char *key, const bt_value *object,
 		void *data)
 {
 	struct pretty_component *pretty = data;
@@ -266,9 +267,9 @@ bt_bool check_param_exists(const char *key, const struct bt_value *object,
 }
 
 static
-void apply_one_string(const char *key, const struct bt_value *params, char **option)
+void apply_one_string(const char *key, const bt_value *params, char **option)
 {
-	const struct bt_value *value = NULL;
+	const bt_value *value = NULL;
 	const char *str;
 
 	value = bt_value_map_borrow_entry_value_const(params, key);
@@ -286,10 +287,10 @@ end:
 }
 
 static
-void apply_one_bool(const char *key, const struct bt_value *params, bool *option,
+void apply_one_bool(const char *key, const bt_value *params, bool *option,
 		bool *found)
 {
-	const struct bt_value *value = NULL;
+	const bt_value *value = NULL;
 	bt_bool bool_val;
 
 	value = bt_value_map_borrow_entry_value_const(params, key);
@@ -337,10 +338,10 @@ end:
 }
 
 static
-int apply_params(struct pretty_component *pretty, const struct bt_value *params)
+int apply_params(struct pretty_component *pretty, const bt_value *params)
 {
 	int ret = 0;
-	enum bt_value_status status;
+	bt_value_status status;
 	bool value, found;
 	char *str = NULL;
 
@@ -366,7 +367,7 @@ int apply_params(struct pretty_component *pretty, const struct bt_value *params)
 	/* Known parameters. */
 	pretty->options.color = PRETTY_COLOR_OPT_AUTO;
 	if (bt_value_map_has_entry(params, "color")) {
-		const struct bt_value *color_value;
+		const bt_value *color_value;
 		const char *color;
 
 		color_value = bt_value_map_borrow_entry_value_const(params,
@@ -636,12 +637,12 @@ void init_stream_packet_context_quarks(void)
 }
 
 BT_HIDDEN
-enum bt_self_component_status pretty_init(
-		struct bt_self_component_sink *comp,
-		const struct bt_value *params,
+bt_self_component_status pretty_init(
+		bt_self_component_sink *comp,
+		const bt_value *params,
 		UNUSED_VAR void *init_method_data)
 {
-	enum bt_self_component_status ret;
+	bt_self_component_status ret;
 	struct pretty_component *pretty = create_pretty();
 
 	if (!pretty) {