X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=plugins%2Ftext%2Fpretty%2Fprint.c;h=a4ace53420145cfe112b253178a32e53e0c7fac5;hp=c5f57ae3a62dc45d9416fb2128f6b32d5ec9f34a;hb=44c440bc5fe8219cc17d1b786d91fd83c4c9860a;hpb=c800eb3790218d2f33df01e77ec38cbd43cc02a1

diff --git a/plugins/text/pretty/print.c b/plugins/text/pretty/print.c
index c5f57ae3..a4ace534 100644
--- a/plugins/text/pretty/print.c
+++ b/plugins/text/pretty/print.c
@@ -84,23 +84,17 @@ static
 void print_timestamp_cycles(struct pretty_component *pretty,
 		struct bt_event *event)
 {
-	int ret;
 	struct bt_clock_value *clock_value;
 	uint64_t cycles;
+	enum bt_clock_value_status cv_status;
 
-	clock_value = bt_event_borrow_default_clock_value(event);
-	if (!clock_value) {
+	cv_status = bt_event_borrow_default_clock_value(event, &clock_value);
+	if (cv_status != BT_CLOCK_VALUE_STATUS_KNOWN || !clock_value) {
 		g_string_append(pretty->string, "????????????????????");
 		return;
 	}
 
-	ret = bt_clock_value_get_value(clock_value, &cycles);
-	if (ret) {
-		// TODO: log, this is unexpected
-		g_string_append(pretty->string, "Error");
-		return;
-	}
-
+	cycles = bt_clock_value_get_value(clock_value);
 	g_string_append_printf(pretty->string, "%020" PRIu64, cycles);
 
 	if (pretty->last_cycles_timestamp != -1ULL) {
@@ -124,7 +118,7 @@ void print_timestamp_wall(struct pretty_component *pretty,
 		return;
 	}
 
-	ret = bt_clock_value_get_value_ns_from_epoch(clock_value, &ts_nsec);
+	ret = bt_clock_value_get_ns_from_origin(clock_value, &ts_nsec);
 	if (ret) {
 		// TODO: log, this is unexpected
 		g_string_append(pretty->string, "Error");
@@ -234,6 +228,7 @@ enum bt_component_status print_event_timestamp(struct pretty_component *pretty,
 	struct bt_stream_class *stream_class = NULL;
 	struct bt_trace *trace = NULL;
 	struct bt_clock_value *clock_value = NULL;
+	enum bt_clock_value_status cv_status;
 
 	stream = bt_event_borrow_stream(event);
 	if (!stream) {
@@ -252,8 +247,8 @@ enum bt_component_status print_event_timestamp(struct pretty_component *pretty,
 		goto end;
 	}
 
-	clock_value = bt_event_borrow_default_clock_value(event);
-	if (!clock_value) {
+	cv_status = bt_event_borrow_default_clock_value(event, &clock_value);
+	if (cv_status != BT_CLOCK_VALUE_STATUS_KNOWN || !clock_value) {
 		/* No default clock value: skip the timestamp without an error */
 		goto end;
 	}
@@ -269,9 +264,9 @@ enum bt_component_status print_event_timestamp(struct pretty_component *pretty,
 	if (pretty->options.print_timestamp_cycles) {
 		print_timestamp_cycles(pretty, event);
 	} else {
-		struct bt_clock_value *clock_value =
-			bt_event_borrow_default_clock_value(event);
-
+		clock_value = NULL;
+		cv_status = bt_event_borrow_default_clock_value(event,
+			&clock_value);
 		print_timestamp_wall(pretty, clock_value);
 	}
 	if (pretty->use_colors) {
@@ -330,6 +325,7 @@ enum bt_component_status print_event_header(struct pretty_component *pretty,
 	struct bt_stream_class *stream_class = NULL;
 	struct bt_trace *trace_class = NULL;
 	int dom_print = 0;
+	enum bt_property_availability prop_avail;
 
 	event_class = bt_event_borrow_class(event);
 	if (!event_class) {
@@ -372,7 +368,7 @@ enum bt_component_status print_event_header(struct pretty_component *pretty,
 	if (pretty->options.print_trace_hostname_field) {
 		struct bt_value *hostname_str;
 
-		hostname_str = bt_trace_borrow_environment_field_value_by_name(
+		hostname_str = bt_trace_borrow_environment_entry_value_by_name(
 			trace_class, "hostname");
 		if (hostname_str) {
 			const char *str;
@@ -393,7 +389,7 @@ enum bt_component_status print_event_header(struct pretty_component *pretty,
 	if (pretty->options.print_trace_domain_field) {
 		struct bt_value *domain_str;
 
-		domain_str = bt_trace_borrow_environment_field_value_by_name(
+		domain_str = bt_trace_borrow_environment_entry_value_by_name(
 			trace_class, "domain");
 		if (domain_str) {
 			const char *str;
@@ -416,7 +412,7 @@ enum bt_component_status print_event_header(struct pretty_component *pretty,
 	if (pretty->options.print_trace_procname_field) {
 		struct bt_value *procname_str;
 
-		procname_str = bt_trace_borrow_environment_field_value_by_name(
+		procname_str = bt_trace_borrow_environment_entry_value_by_name(
 			trace_class, "procname");
 		if (procname_str) {
 			const char *str;
@@ -440,7 +436,7 @@ enum bt_component_status print_event_header(struct pretty_component *pretty,
 	if (pretty->options.print_trace_vpid_field) {
 		struct bt_value *vpid_value;
 
-		vpid_value = bt_trace_borrow_environment_field_value_by_name(
+		vpid_value = bt_trace_borrow_environment_entry_value_by_name(
 			trace_class, "vpid");
 		if (vpid_value) {
 			int64_t value;
@@ -482,13 +478,12 @@ enum bt_component_status print_event_header(struct pretty_component *pretty,
 		enum bt_event_class_log_level log_level;
 		const char *log_level_str = NULL;
 
-		log_level = bt_event_class_get_log_level(event_class);
-		BT_ASSERT(log_level != BT_EVENT_CLASS_LOG_LEVEL_UNKNOWN);
-		if (log_level != BT_EVENT_CLASS_LOG_LEVEL_UNSPECIFIED) {
+		prop_avail = bt_event_class_get_log_level(event_class,
+			&log_level);
+		if (prop_avail == BT_PROPERTY_AVAILABILITY_AVAILABLE) {
 			log_level_str = log_level_names[log_level];
-		}
+			BT_ASSERT(log_level_str);
 
-		if (log_level_str) {
 			if (!pretty->start_line) {
 				g_string_append(pretty->string, ", ");
 			}
@@ -554,10 +549,7 @@ enum bt_component_status print_integer(struct pretty_component *pretty,
 		struct bt_field *field)
 {
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-	struct bt_field_type *field_type = NULL;
-	enum bt_integer_base base;
-	enum bt_string_encoding encoding;
-	int signedness;
+	enum bt_field_type_integer_preferred_display_base base;
 	struct bt_field_type *int_ft;
 	union {
 		uint64_t u;
@@ -566,54 +558,14 @@ enum bt_component_status print_integer(struct pretty_component *pretty,
 	bool rst_color = false;
 	enum bt_field_type_id ft_id;
 
-	field_type = bt_field_borrow_type(field);
-	if (!field_type) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
-	}
-
+	int_ft = bt_field_borrow_type(field);
+	BT_ASSERT(int_ft);
 	ft_id = bt_field_get_type_id(field);
-
-	switch (ft_id) {
-	case BT_FIELD_TYPE_ID_INTEGER:
-		int_ft = field_type;
-		break;
-	case BT_FIELD_TYPE_ID_ENUM:
-		int_ft = bt_field_type_enumeration_borrow_container_field_type(
-			field_type);
-		break;
-	default:
-		abort();
-	}
-
-	signedness = bt_field_type_integer_is_signed(int_ft);
-	if (signedness < 0) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
-	}
-	if (!signedness) {
-		ret = bt_field_integer_unsigned_get_value(field, &v.u);
+	if (ft_id == BT_FIELD_TYPE_ID_UNSIGNED_INTEGER ||
+			ft_id == BT_FIELD_TYPE_ID_UNSIGNED_ENUMERATION) {
+		v.u = bt_field_unsigned_integer_get_value(field);
 	} else {
-		ret = bt_field_integer_signed_get_value(field, &v.s);
-	}
-
-	if (ret < 0) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
-	}
-
-	encoding = bt_field_type_integer_get_encoding(int_ft);
-	switch (encoding) {
-	case BT_STRING_ENCODING_UTF8:
-	case BT_STRING_ENCODING_ASCII:
-		g_string_append_c(pretty->tmp_string, (int) v.u);
-		goto end;
-	case BT_STRING_ENCODING_NONE:
-	case BT_STRING_ENCODING_UNKNOWN:
-		break;
-	default:
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
+		v.s = bt_field_signed_integer_get_value(field);
 	}
 
 	if (pretty->use_colors) {
@@ -621,17 +573,13 @@ enum bt_component_status print_integer(struct pretty_component *pretty,
 		rst_color = true;
 	}
 
-	base = bt_field_type_integer_get_base(int_ft);
+	base = bt_field_type_integer_get_preferred_display_base(int_ft);
 	switch (base) {
-	case BT_INTEGER_BASE_BINARY:
+	case BT_FIELD_TYPE_INTEGER_PREFERRED_DISPLAY_BASE_BINARY:
 	{
 		int bitnr, len;
 
-		len = bt_field_type_integer_get_size(int_ft);
-		if (len < 0) {
-			ret = BT_COMPONENT_STATUS_ERROR;
-			goto end;
-		}
+		len = bt_field_type_integer_get_field_value_range(int_ft);
 		g_string_append(pretty->string, "0b");
 		v.u = _bt_piecewise_lshift(v.u, 64 - len);
 		for (bitnr = 0; bitnr < len; bitnr++) {
@@ -640,16 +588,14 @@ enum bt_component_status print_integer(struct pretty_component *pretty,
 		}
 		break;
 	}
-	case BT_INTEGER_BASE_OCTAL:
+	case BT_FIELD_TYPE_INTEGER_PREFERRED_DISPLAY_BASE_OCTAL:
 	{
-		if (signedness) {
+		if (ft_id == BT_FIELD_TYPE_ID_SIGNED_INTEGER ||
+				ft_id == BT_FIELD_TYPE_ID_SIGNED_ENUMERATION) {
 			int len;
 
-			len = bt_field_type_integer_get_size(int_ft);
-			if (len < 0) {
-				ret = BT_COMPONENT_STATUS_ERROR;
-				goto end;
-			}
+			len = bt_field_type_integer_get_field_value_range(
+				int_ft);
 			if (len < 64) {
 			        size_t rounded_len;
 
@@ -663,23 +609,19 @@ enum bt_component_status print_integer(struct pretty_component *pretty,
 		g_string_append_printf(pretty->string, "0%" PRIo64, v.u);
 		break;
 	}
-	case BT_INTEGER_BASE_DECIMAL:
-	case BT_INTEGER_BASE_UNSPECIFIED:
-		if (!signedness) {
+	case BT_FIELD_TYPE_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL:
+		if (ft_id == BT_FIELD_TYPE_ID_UNSIGNED_INTEGER ||
+				ft_id == BT_FIELD_TYPE_ID_UNSIGNED_ENUMERATION) {
 			g_string_append_printf(pretty->string, "%" PRIu64, v.u);
 		} else {
 			g_string_append_printf(pretty->string, "%" PRId64, v.s);
 		}
 		break;
-	case BT_INTEGER_BASE_HEXADECIMAL:
+	case BT_FIELD_TYPE_INTEGER_PREFERRED_DISPLAY_BASE_HEXADECIMAL:
 	{
 		int len;
 
-		len = bt_field_type_integer_get_size(int_ft);
-		if (len < 0) {
-			ret = BT_COMPONENT_STATUS_ERROR;
-			goto end;
-		}
+		len = bt_field_type_integer_get_field_value_range(int_ft);
 		if (len < 64) {
 			/* Round length to the nearest nibble */
 			uint8_t rounded_len = ((len + 3) & ~0x3);
@@ -775,30 +717,36 @@ enum bt_component_status print_enum(struct pretty_component *pretty,
 {
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	struct bt_field_type *enumeration_field_type = NULL;
-	struct bt_field_type *container_field_type = NULL;
-	struct bt_field_type_enumeration_mapping_iterator *iter = NULL;
-	int nr_mappings = 0;
+	bt_field_type_enumeration_mapping_label_array label_array;
+	uint64_t label_count;
+	uint64_t i;
 
 	enumeration_field_type = bt_field_borrow_type(field);
 	if (!enumeration_field_type) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		goto end;
 	}
-	container_field_type =
-		bt_field_type_enumeration_borrow_container_field_type(
-			enumeration_field_type);
-	if (!container_field_type) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
+
+	switch (bt_field_get_type_id(field)) {
+	case BT_FIELD_TYPE_ID_UNSIGNED_ENUMERATION:
+		ret = bt_field_unsigned_enumeration_get_mapping_labels(field,
+			&label_array, &label_count);
+		break;
+	case BT_FIELD_TYPE_ID_SIGNED_ENUMERATION:
+		ret = bt_field_signed_enumeration_get_mapping_labels(field,
+			&label_array, &label_count);
+		break;
+	default:
+		abort();
 	}
-	iter = bt_field_enumeration_get_mappings(field);
-	if (!iter) {
+
+	if (ret) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		goto end;
 	}
+
 	g_string_append(pretty->string, "( ");
-	ret = bt_field_type_enumeration_mapping_iterator_next(iter);
-	if (ret) {
+	if (label_count == 0) {
 		if (pretty->use_colors) {
 			g_string_append(pretty->string, COLOR_UNKNOWN);
 		}
@@ -808,16 +756,12 @@ enum bt_component_status print_enum(struct pretty_component *pretty,
 		}
 		goto skip_loop;
 	}
-	for (;;) {
-		const char *mapping_name;
+	for (i = 0; i < label_count; i++) {
+		const char *mapping_name = label_array[i];
 
-		if (bt_field_type_enumeration_mapping_iterator_signed_get(
-				iter, &mapping_name, NULL, NULL) < 0) {
-			ret = BT_COMPONENT_STATUS_ERROR;
-			goto end;
-		}
-		if (nr_mappings++)
+		if (i == 0) {
 			g_string_append(pretty->string, ", ");
+		}
 		if (pretty->use_colors) {
 			g_string_append(pretty->string, COLOR_ENUM_MAPPING_NAME);
 		}
@@ -825,9 +769,6 @@ enum bt_component_status print_enum(struct pretty_component *pretty,
 		if (pretty->use_colors) {
 			g_string_append(pretty->string, COLOR_RST);
 		}
-		if (bt_field_type_enumeration_mapping_iterator_next(iter) < 0) {
-			break;
-		}
 	}
 skip_loop:
 	g_string_append(pretty->string, " : container = ");
@@ -837,7 +778,6 @@ skip_loop:
 	}
 	g_string_append(pretty->string, " )");
 end:
-	bt_put(iter);
 	return ret;
 }
 
@@ -864,7 +804,7 @@ static
 enum bt_component_status print_struct_field(struct pretty_component *pretty,
 		struct bt_field *_struct,
 		struct bt_field_type *struct_type,
-		int i, bool print_names, int *nr_printed_fields,
+		uint64_t i, bool print_names, uint64_t *nr_printed_fields,
 		GQuark *filter_fields, int filter_array_len)
 {
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
@@ -872,16 +812,14 @@ enum bt_component_status print_struct_field(struct pretty_component *pretty,
 	struct bt_field *field = NULL;
 	struct bt_field_type *field_type = NULL;;
 
-	field = bt_field_structure_borrow_field_by_index(_struct, i);
+	field = bt_field_structure_borrow_member_field_by_index(_struct, i);
 	if (!field) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		goto end;
 	}
-	if (bt_field_type_structure_borrow_field_by_index(struct_type,
-			&field_name, &field_type, i) < 0) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
-	}
+
+	bt_field_type_structure_borrow_member_by_index(struct_type, i,
+		&field_name, &field_type);
 
 	if (filter_fields && !filter_field_name(pretty, field_name,
 				filter_fields, filter_array_len)) {
@@ -911,14 +849,14 @@ enum bt_component_status print_struct(struct pretty_component *pretty,
 {
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	struct bt_field_type *struct_type = NULL;
-	int nr_fields, i, nr_printed_fields;
+	uint64_t nr_fields, i, nr_printed_fields;
 
 	struct_type = bt_field_borrow_type(_struct);
 	if (!struct_type) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		goto end;
 	}
-	nr_fields = bt_field_type_structure_get_field_count(struct_type);
+	nr_fields = bt_field_type_structure_get_member_count(struct_type);
 	if (nr_fields < 0) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		goto end;
@@ -943,31 +881,22 @@ end:
 
 static
 enum bt_component_status print_array_field(struct pretty_component *pretty,
-		struct bt_field *array, uint64_t i,
-		bool is_string, bool print_names)
+		struct bt_field *array, uint64_t i, bool print_names)
 {
-	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	struct bt_field *field = NULL;
 
-	if (!is_string) {
-		if (i != 0) {
-			g_string_append(pretty->string, ", ");
-		} else {
-			g_string_append(pretty->string, " ");
-		}
-		if (print_names) {
-			g_string_append_printf(pretty->string, "[%" PRIu64 "] = ", i);
-		}
+	if (i != 0) {
+		g_string_append(pretty->string, ", ");
+	} else {
+		g_string_append(pretty->string, " ");
 	}
-	field = bt_field_array_borrow_field(array, i);
-	if (!field) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
+	if (print_names) {
+		g_string_append_printf(pretty->string, "[%" PRIu64 "] = ", i);
 	}
-	ret = print_field(pretty, field, print_names, NULL, 0);
 
-end:
-	return ret;
+	field = bt_field_array_borrow_element_field_by_index(array, i);
+	BT_ASSERT(field);
+	return print_field(pretty, field, print_names, NULL, 0);
 }
 
 static
@@ -975,77 +904,26 @@ enum bt_component_status print_array(struct pretty_component *pretty,
 		struct bt_field *array, bool print_names)
 {
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-	struct bt_field_type *array_type = NULL, *field_type = NULL;
-	enum bt_field_type_id type_id;
-	int64_t len;
+	struct bt_field_type *array_type = NULL;
+	uint64_t len;
 	uint64_t i;
-	bool is_string = false;
 
 	array_type = bt_field_borrow_type(array);
 	if (!array_type) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		goto end;
 	}
-	field_type = bt_field_type_array_borrow_element_field_type(array_type);
-	if (!field_type) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
-	}
-	len = bt_field_type_array_get_length(array_type);
-	if (len < 0) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
-	}
-	type_id = bt_field_type_get_type_id(field_type);
-	if (type_id == BT_FIELD_TYPE_ID_INTEGER) {
-		enum bt_string_encoding encoding;
-
-		encoding = bt_field_type_integer_get_encoding(field_type);
-		if (encoding == BT_STRING_ENCODING_UTF8
-				|| encoding == BT_STRING_ENCODING_ASCII) {
-			int integer_len, integer_alignment;
-
-			integer_len = bt_field_type_integer_get_size(field_type);
-			if (integer_len < 0) {
-				return BT_COMPONENT_STATUS_ERROR;
-			}
-			integer_alignment = bt_field_type_get_alignment(field_type);
-			if (integer_alignment < 0) {
-				return BT_COMPONENT_STATUS_ERROR;
-			}
-			if (integer_len == CHAR_BIT
-					&& integer_alignment == CHAR_BIT) {
-				is_string = true;
-			}
-		}
-	}
-
-	if (is_string) {
-		g_string_assign(pretty->tmp_string, "");
-	} else {
-		g_string_append(pretty->string, "[");
-	}
-
+	len = bt_field_array_get_length(array);
+	g_string_append(pretty->string, "[");
 	pretty->depth++;
 	for (i = 0; i < len; i++) {
-		ret = print_array_field(pretty, array, i, is_string, print_names);
+		ret = print_array_field(pretty, array, i, print_names);
 		if (ret != BT_COMPONENT_STATUS_OK) {
 			goto end;
 		}
 	}
 	pretty->depth--;
-
-	if (is_string) {
-		if (pretty->use_colors) {
-			g_string_append(pretty->string, COLOR_STRING_VALUE);
-		}
-		print_escape_string(pretty, pretty->tmp_string->str);
-		if (pretty->use_colors) {
-			g_string_append(pretty->string, COLOR_RST);
-		}
-	} else {
-		g_string_append(pretty->string, " ]");
-	}
+	g_string_append(pretty->string, " ]");
 
 end:
 	return ret;
@@ -1053,31 +931,22 @@ end:
 
 static
 enum bt_component_status print_sequence_field(struct pretty_component *pretty,
-		struct bt_field *seq, uint64_t i,
-		bool is_string, bool print_names)
+		struct bt_field *seq, uint64_t i, bool print_names)
 {
-	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	struct bt_field *field = NULL;
 
-	if (!is_string) {
-		if (i != 0) {
-			g_string_append(pretty->string, ", ");
-		} else {
-			g_string_append(pretty->string, " ");
-		}
-		if (print_names) {
-			g_string_append_printf(pretty->string, "[%" PRIu64 "] = ", i);
-		}
+	if (i != 0) {
+		g_string_append(pretty->string, ", ");
+	} else {
+		g_string_append(pretty->string, " ");
 	}
-	field = bt_field_sequence_borrow_field(seq, i);
-	if (!field) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
+	if (print_names) {
+		g_string_append_printf(pretty->string, "[%" PRIu64 "] = ", i);
 	}
-	ret = print_field(pretty, field, print_names, NULL, 0);
 
-end:
-	return ret;
+	field = bt_field_array_borrow_element_field_by_index(seq, i);
+	BT_ASSERT(field);
+	return print_field(pretty, field, print_names, NULL, 0);
 }
 
 static
@@ -1085,80 +954,26 @@ enum bt_component_status print_sequence(struct pretty_component *pretty,
 		struct bt_field *seq, bool print_names)
 {
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
-	struct bt_field_type *seq_type = NULL, *field_type = NULL;
-	enum bt_field_type_id type_id;
-	int64_t len;
+	uint64_t len;
 	uint64_t i;
-	bool is_string = false;
 
-	seq_type = bt_field_borrow_type(seq);
-	if (!seq_type) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
-	}
-	len = bt_field_sequence_get_length(seq);
+	len = bt_field_array_get_length(seq);
 	if (len < 0) {
 		ret = BT_COMPONENT_STATUS_ERROR;
 		goto end;
 	}
-	field_type = bt_field_type_sequence_borrow_element_field_type(seq_type);
-	if (!field_type) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
-	}
-	type_id = bt_field_type_get_type_id(field_type);
-	if (type_id == BT_FIELD_TYPE_ID_INTEGER) {
-		enum bt_string_encoding encoding;
-
-		encoding = bt_field_type_integer_get_encoding(field_type);
-		if (encoding == BT_STRING_ENCODING_UTF8
-				|| encoding == BT_STRING_ENCODING_ASCII) {
-			int integer_len, integer_alignment;
 
-			integer_len = bt_field_type_integer_get_size(field_type);
-			if (integer_len < 0) {
-				ret = BT_COMPONENT_STATUS_ERROR;
-				goto end;
-			}
-			integer_alignment = bt_field_type_get_alignment(field_type);
-			if (integer_alignment < 0) {
-				ret = BT_COMPONENT_STATUS_ERROR;
-				goto end;
-			}
-			if (integer_len == CHAR_BIT
-					&& integer_alignment == CHAR_BIT) {
-				is_string = true;
-			}
-		}
-	}
-
-	if (is_string) {
-		g_string_assign(pretty->tmp_string, "");
-	} else {
-		g_string_append(pretty->string, "[");
-	}
+	g_string_append(pretty->string, "[");
 
 	pretty->depth++;
 	for (i = 0; i < len; i++) {
-		ret = print_sequence_field(pretty, seq, i,
-			is_string, print_names);
+		ret = print_sequence_field(pretty, seq, i, print_names);
 		if (ret != BT_COMPONENT_STATUS_OK) {
 			goto end;
 		}
 	}
 	pretty->depth--;
-
-	if (is_string) {
-		if (pretty->use_colors) {
-			g_string_append(pretty->string, COLOR_STRING_VALUE);
-		}
-		print_escape_string(pretty, pretty->tmp_string->str);
-		if (pretty->use_colors) {
-			g_string_append(pretty->string, COLOR_RST);
-		}
-	} else {
-		g_string_append(pretty->string, " ]");
-	}
+	g_string_append(pretty->string, " ]");
 
 end:
 	return ret;
@@ -1171,76 +986,13 @@ enum bt_component_status print_variant(struct pretty_component *pretty,
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	struct bt_field *field = NULL;
 
-	field = bt_field_variant_borrow_current_field(variant);
-	if (!field) {
-		ret = BT_COMPONENT_STATUS_ERROR;
-		goto end;
-	}
+	field = bt_field_variant_borrow_selected_option_field(variant);
+	BT_ASSERT(field);
 	g_string_append(pretty->string, "{ ");
 	pretty->depth++;
 	if (print_names) {
-		int iret;
-		struct bt_field_type *var_ft;
-		struct bt_field_type *tag_ft;
-		struct bt_field_type *container_ft;
-		const char *tag_choice;
-		bt_bool is_signed;
-		struct bt_field_type_enumeration_mapping_iterator *iter;
-
-		var_ft = bt_field_borrow_type(variant);
-		tag_ft = bt_field_type_variant_borrow_tag_field_type(
-			var_ft);
-		container_ft =
-			bt_field_type_enumeration_borrow_container_field_type(
-				tag_ft);
-		is_signed = bt_field_type_integer_is_signed(container_ft);
-
-		if (is_signed) {
-			int64_t tag;
-
-			iret = bt_field_variant_get_tag_signed(variant, &tag);
-			if (iret) {
-				ret = BT_COMPONENT_STATUS_ERROR;
-				goto end;
-			}
-
-			iter = bt_field_type_enumeration_signed_find_mappings_by_value(
-				tag_ft, tag);
-		} else {
-			uint64_t tag;
-
-			iret = bt_field_variant_get_tag_unsigned(variant, &tag);
-			if (iret) {
-				ret = BT_COMPONENT_STATUS_ERROR;
-				goto end;
-			}
-
-			iter = bt_field_type_enumeration_unsigned_find_mappings_by_value(
-				tag_ft, tag);
-		}
-
-		if (!iter) {
-			ret = BT_COMPONENT_STATUS_ERROR;
-			goto end;
-		}
-
-		iret = bt_field_type_enumeration_mapping_iterator_next(
-			iter);
-		if (!iter || ret) {
-			ret = BT_COMPONENT_STATUS_ERROR;
-			goto end;
-		}
-
-		iret =
-			bt_field_type_enumeration_mapping_iterator_signed_get(
-				iter, &tag_choice, NULL, NULL);
-		if (iret) {
-			bt_put(iter);
-			ret = BT_COMPONENT_STATUS_ERROR;
-			goto end;
-		}
-		print_field_name_equal(pretty, tag_choice);
-		bt_put(iter);
+		// TODO: find tag's name using field path
+		// print_field_name_equal(pretty, tag_choice);
 	}
 	ret = print_field(pretty, field, print_names, NULL, 0);
 	if (ret != BT_COMPONENT_STATUS_OK) {
@@ -1262,15 +1014,14 @@ enum bt_component_status print_field(struct pretty_component *pretty,
 
 	type_id = bt_field_get_type_id(field);
 	switch (type_id) {
-	case BT_FIELD_TYPE_ID_INTEGER:
+	case BT_FIELD_TYPE_ID_UNSIGNED_INTEGER:
+	case BT_FIELD_TYPE_ID_SIGNED_INTEGER:
 		return print_integer(pretty, field);
-	case BT_FIELD_TYPE_ID_FLOAT:
+	case BT_FIELD_TYPE_ID_REAL:
 	{
 		double v;
 
-		if (bt_field_floating_point_get_value(field, &v)) {
-			return BT_COMPONENT_STATUS_ERROR;
-		}
+		v = bt_field_real_get_value(field);
 		if (pretty->use_colors) {
 			g_string_append(pretty->string, COLOR_NUMBER_VALUE);
 		}
@@ -1280,7 +1031,8 @@ enum bt_component_status print_field(struct pretty_component *pretty,
 		}
 		return BT_COMPONENT_STATUS_OK;
 	}
-	case BT_FIELD_TYPE_ID_ENUM:
+	case BT_FIELD_TYPE_ID_UNSIGNED_ENUMERATION:
+	case BT_FIELD_TYPE_ID_SIGNED_ENUMERATION:
 		return print_enum(pretty, field);
 	case BT_FIELD_TYPE_ID_STRING:
 	{
@@ -1300,14 +1052,14 @@ enum bt_component_status print_field(struct pretty_component *pretty,
 		}
 		return BT_COMPONENT_STATUS_OK;
 	}
-	case BT_FIELD_TYPE_ID_STRUCT:
+	case BT_FIELD_TYPE_ID_STRUCTURE:
 		return print_struct(pretty, field, print_names, filter_fields,
 				filter_array_len);
 	case BT_FIELD_TYPE_ID_VARIANT:
 		return print_variant(pretty, field, print_names);
-	case BT_FIELD_TYPE_ID_ARRAY:
+	case BT_FIELD_TYPE_ID_STATIC_ARRAY:
 		return print_array(pretty, field, print_names);
-	case BT_FIELD_TYPE_ID_SEQUENCE:
+	case BT_FIELD_TYPE_ID_DYNAMIC_ARRAY:
 		return print_sequence(pretty, field, print_names);
 	default:
 		// TODO: log instead
@@ -1329,7 +1081,7 @@ enum bt_component_status print_stream_packet_context(struct pretty_component *pr
 		ret = BT_COMPONENT_STATUS_ERROR;
 		goto end;
 	}
-	main_field = bt_packet_borrow_context(packet);
+	main_field = bt_packet_borrow_context_field(packet);
 	if (!main_field) {
 		goto end;
 	}
@@ -1356,7 +1108,7 @@ enum bt_component_status print_event_header_raw(struct pretty_component *pretty,
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	struct bt_field *main_field = NULL;
 
-	main_field = bt_event_borrow_header(event);
+	main_field = bt_event_borrow_header_field(event);
 	if (!main_field) {
 		goto end;
 	}
@@ -1381,7 +1133,7 @@ enum bt_component_status print_stream_event_context(struct pretty_component *pre
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	struct bt_field *main_field = NULL;
 
-	main_field = bt_event_borrow_stream_event_context(event);
+	main_field = bt_event_borrow_common_context_field(event);
 	if (!main_field) {
 		goto end;
 	}
@@ -1406,7 +1158,7 @@ enum bt_component_status print_event_context(struct pretty_component *pretty,
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	struct bt_field *main_field = NULL;
 
-	main_field = bt_event_borrow_context(event);
+	main_field = bt_event_borrow_specific_context_field(event);
 	if (!main_field) {
 		goto end;
 	}
@@ -1431,7 +1183,7 @@ enum bt_component_status print_event_payload(struct pretty_component *pretty,
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	struct bt_field *main_field = NULL;
 
-	main_field = bt_event_borrow_payload(event);
+	main_field = bt_event_borrow_payload_field(event);
 	if (!main_field) {
 		goto end;
 	}
@@ -1524,6 +1276,7 @@ enum bt_component_status print_discarded_elements_msg(
 		struct pretty_component *pretty, struct bt_packet *packet,
 		uint64_t count, const char *elem_type)
 {
+#if 0
 	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
 	struct bt_stream *stream = NULL;
 	struct bt_stream_class *stream_class = NULL;
@@ -1635,12 +1388,15 @@ enum bt_component_status print_discarded_elements_msg(
 	}
 
 	return ret;
+#endif
+	return 0;
 }
 
 BT_HIDDEN
 enum bt_component_status pretty_print_packet(struct pretty_component *pretty,
 		struct bt_notification *packet_beginning_notif)
 {
+#if 0
 	struct bt_packet *packet = bt_notification_packet_begin_borrow_packet(
 		packet_beginning_notif);
 	uint64_t count;
@@ -1668,4 +1424,6 @@ enum bt_component_status pretty_print_packet(struct pretty_component *pretty,
 
 end:
 	return status;
+#endif
+	return 0;
 }