X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flib-logging.c;h=51682ed86072712ddae7588204d271803457525c;hb=fabfe03472e26e997f9bfaec3fb075e6dbb029dd;hp=c38948d60100ae01b0cffb933f28691d71a90201;hpb=b38aea749d62a3453343099231e0af48c3fd1460;p=babeltrace.git

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index c38948d6..51682ed8 100644
--- a/src/lib/lib-logging.c
+++ b/src/lib/lib-logging.c
@@ -193,18 +193,18 @@ static inline void format_field_class(char **buf_ch, bool extended,
 	}
 
 	switch (field_class->type) {
-	case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
-	case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
+	case BT_FIELD_CLASS_TYPE_BIT_ARRAY:
 	{
-		format_integer_field_class(buf_ch, extended, prefix, field_class);
+		const struct bt_field_class_bit_array *ba_fc =
+			(const void *) field_class;
+
+		BUF_APPEND(", %slength=%" PRIu64, PRFIELD(ba_fc->length));
 		break;
 	}
-	case BT_FIELD_CLASS_TYPE_REAL:
+	case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
+	case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
 	{
-		const struct bt_field_class_real *real_fc = (void *) field_class;
-
-		BUF_APPEND(", %sis-single-precision=%d",
-			PRFIELD(real_fc->is_single_precision));
+		format_integer_field_class(buf_ch, extended, prefix, field_class);
 		break;
 	}
 	case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION:
@@ -260,7 +260,10 @@ static inline void format_field_class(char **buf_ch, bool extended,
 
 		break;
 	}
-	case BT_FIELD_CLASS_TYPE_OPTION:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR:
 	{
 		const struct bt_field_class_option *opt_fc =
 			(const void *) field_class;
@@ -269,23 +272,29 @@ static inline void format_field_class(char **buf_ch, bool extended,
 			PRFIELD(opt_fc->content_fc),
 			PRFIELD(bt_common_field_class_type_string(opt_fc->content_fc->type)));
 
-		if (opt_fc->selector_fc) {
-			SET_TMP_PREFIX("selector-fc-");
-			format_field_class(buf_ch, extended, tmp_prefix,
-				opt_fc->selector_fc);
-		}
+		if (field_class->type !=
+				BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR) {
+			const struct bt_field_class_option_with_selector *opt_with_sel_fc =
+				(const void *) field_class;
 
-		if (opt_fc->selector_field_path) {
-			SET_TMP_PREFIX("selector-field-path-");
-			format_field_path(buf_ch, extended, tmp_prefix,
-				opt_fc->selector_field_path);
+			if (opt_with_sel_fc->selector_fc) {
+				SET_TMP_PREFIX("selector-fc-");
+				format_field_class(buf_ch, extended, tmp_prefix,
+					opt_with_sel_fc->selector_fc);
+			}
+
+			if (opt_with_sel_fc->selector_field_path) {
+				SET_TMP_PREFIX("selector-field-path-");
+				format_field_path(buf_ch, extended, tmp_prefix,
+					opt_with_sel_fc->selector_field_path);
+			}
 		}
 
 		break;
 	}
 	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR:
 	{
 		const struct bt_field_class_variant *var_fc =
 			(const void *) field_class;
@@ -295,8 +304,8 @@ static inline void format_field_class(char **buf_ch, bool extended,
 				PRFIELD(var_fc->common.named_fcs->len));
 		}
 
-		if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR ||
-				field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) {
+		if (field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR ||
+				field_class->type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR) {
 			const struct bt_field_class_variant_with_selector *var_with_sel_fc =
 				(const void *) var_fc;
 
@@ -382,6 +391,14 @@ static inline void format_field(char **buf_ch, bool extended,
 		BUF_APPEND(", %svalue=%d", PRFIELD(bool_field->value));
 		break;
 	}
+	case BT_FIELD_CLASS_TYPE_BIT_ARRAY:
+	{
+		const struct bt_field_bit_array *ba_field = (const void *) field;
+
+		BUF_APPEND(", %svalue-as-int=%" PRIx64,
+			PRFIELD(ba_field->value_as_int));
+		break;
+	}
 	case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
 	case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
 	case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION:
@@ -390,7 +407,8 @@ static inline void format_field(char **buf_ch, bool extended,
 		format_field_integer_extended(buf_ch, prefix, field);
 		break;
 	}
-	case BT_FIELD_CLASS_TYPE_REAL:
+	case BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL:
+	case BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL:
 	{
 		const struct bt_field_real *real_field = (const void *) field;
 
@@ -424,8 +442,8 @@ static inline void format_field(char **buf_ch, bool extended,
 		break;
 	}
 	case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR:
-	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR:
+	case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR:
 	{
 		const struct bt_field_variant *var_field = (const void *) field;
 
@@ -889,7 +907,7 @@ static inline void format_value(char **buf_ch, bool extended,
 	}
 	case BT_VALUE_TYPE_ARRAY:
 	{
-		int64_t count = bt_value_array_get_size(value);
+		int64_t count = bt_value_array_get_length(value);
 
 		BT_ASSERT(count >= 0);
 		BUF_APPEND(", %selement-count=%" PRId64, PRFIELD(count));