X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Flib-logging.c;h=af30bd2f82c0817b43bf03f1b22bb325df65fc3e;hb=fe4df857056b4a03898f1031f136359ce733b0f5;hp=42eef20864a864f4998bde9dc6f662657e4a86b4;hpb=73ea076192095461cdf0e1ef81f703eae95b22ae;p=babeltrace.git

diff --git a/src/lib/lib-logging.c b/src/lib/lib-logging.c
index 42eef208..af30bd2f 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,6 +260,29 @@ static inline void format_field_class(char **buf_ch, bool extended,
 
 		break;
 	}
+	case BT_FIELD_CLASS_TYPE_OPTION:
+	{
+		const struct bt_field_class_option *opt_fc =
+			(const void *) field_class;
+
+		BUF_APPEND(", %scontent-fc-addr=%p, %scontent-fc-type=%s",
+			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 (opt_fc->selector_field_path) {
+			SET_TMP_PREFIX("selector-field-path-");
+			format_field_path(buf_ch, extended, tmp_prefix,
+				opt_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:
@@ -352,6 +375,21 @@ static inline void format_field(char **buf_ch, bool extended,
 	}
 
 	switch (field->class->type) {
+	case BT_FIELD_CLASS_TYPE_BOOL:
+	{
+		const struct bt_field_bool *bool_field = (const void *) field;
+
+		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:
@@ -360,7 +398,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;
 
@@ -859,7 +898,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));