X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ffield.c;h=95a76e49a95ee4177cf5ca68225b894141dc3fa6;hb=aae30e61f85f6654c37da7a5da3b22fbbe2dbd5c;hp=b0a5b5320bea5462578593cff6e4ab6f9973f536;hpb=45c51519900e100d9acda4acb9516ef69bc2d045;p=babeltrace.git

diff --git a/src/lib/trace-ir/field.c b/src/lib/trace-ir/field.c
index b0a5b532..95a76e49 100644
--- a/src/lib/trace-ir/field.c
+++ b/src/lib/trace-ir/field.c
@@ -74,6 +74,13 @@ bool structure_field_is_set(const struct bt_field *field);
 static
 bool variant_field_is_set(const struct bt_field *field);
 
+static
+struct bt_field_methods bool_field_methods = {
+	.set_is_frozen = set_single_field_is_frozen,
+	.is_set = single_field_is_set,
+	.reset = reset_single_field,
+};
+
 static
 struct bt_field_methods integer_field_methods = {
 	.set_is_frozen = set_single_field_is_frozen,
@@ -116,6 +123,9 @@ struct bt_field_methods variant_field_methods = {
 	.reset = reset_variant_field,
 };
 
+static
+struct bt_field *create_bool_field(struct bt_field_class *);
+
 static
 struct bt_field *create_integer_field(struct bt_field_class *);
 
@@ -139,6 +149,7 @@ struct bt_field *create_variant_field(struct bt_field_class *);
 
 static
 struct bt_field *(* const field_create_funcs[])(struct bt_field_class *) = {
+	[BT_FIELD_CLASS_TYPE_BOOL]				= create_bool_field,
 	[BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER]			= create_integer_field,
 	[BT_FIELD_CLASS_TYPE_SIGNED_INTEGER]			= create_integer_field,
 	[BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION]		= create_integer_field,
@@ -153,6 +164,9 @@ struct bt_field *(* const field_create_funcs[])(struct bt_field_class *) = {
 	[BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR]	= create_variant_field,
 };
 
+static
+void destroy_bool_field(struct bt_field *field);
+
 static
 void destroy_integer_field(struct bt_field *field);
 
@@ -173,6 +187,7 @@ void destroy_variant_field(struct bt_field *field);
 
 static
 void (* const field_destroy_funcs[])(struct bt_field *) = {
+	[BT_FIELD_CLASS_TYPE_BOOL]				= destroy_bool_field,
 	[BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER]			= destroy_integer_field,
 	[BT_FIELD_CLASS_TYPE_SIGNED_INTEGER]			= destroy_integer_field,
 	[BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION]		= destroy_integer_field,
@@ -235,6 +250,26 @@ void init_field(struct bt_field *field, struct bt_field_class *fc,
 	bt_object_get_no_null_check(fc);
 }
 
+static
+struct bt_field *create_bool_field(struct bt_field_class *fc)
+{
+	struct bt_field_bool *bool_field;
+
+	BT_LIB_LOGD("Creating boolean field object: %![fc-]+F", fc);
+	bool_field = g_new0(struct bt_field_bool, 1);
+	if (!bool_field) {
+		BT_LIB_LOGE_APPEND_CAUSE(
+			"Failed to allocate one boolean field.");
+		goto end;
+	}
+
+	init_field((void *) bool_field, fc, &bool_field_methods);
+	BT_LIB_LOGD("Created boolean field object: %!+f", bool_field);
+
+end:
+	return (void *) bool_field;
+}
+
 static
 struct bt_field *create_integer_field(struct bt_field_class *fc)
 {
@@ -439,7 +474,7 @@ end:
 static
 struct bt_field *create_static_array_field(struct bt_field_class *fc)
 {
-	struct bt_field_class_static_array *array_fc = (void *) fc;
+	struct bt_field_class_array_static *array_fc = (void *) fc;
 	struct bt_field_array *array_field;
 
 	BT_LIB_LOGD("Creating static array field object: %![fc-]+F", fc);
@@ -494,7 +529,30 @@ end:
 	return (void *) array_field;
 }
 
-int64_t bt_field_signed_integer_get_value(const struct bt_field *field)
+bt_bool bt_field_bool_get_value(const struct bt_field *field)
+{
+	const struct bt_field_bool *bool_field = (const void *) field;
+
+	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_IS_SET(field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_BOOL,
+		"Field");
+	return (bt_bool) bool_field->value;
+}
+
+void bt_field_bool_set_value(struct bt_field *field, bt_bool value)
+{
+	struct bt_field_bool *bool_field = (void *) field;
+
+	BT_ASSERT_PRE_DEV_NON_NULL(field, "Field");
+	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field, BT_FIELD_CLASS_TYPE_BOOL,
+		"Field");
+	BT_ASSERT_PRE_DEV_FIELD_HOT(field, "Field");
+	bool_field->value = (bool) value;
+	bt_field_set_single(field, true);
+}
+
+int64_t bt_field_integer_signed_get_value(const struct bt_field *field)
 {
 	const struct bt_field_integer *int_field = (const void *) field;
 
@@ -504,7 +562,7 @@ int64_t bt_field_signed_integer_get_value(const struct bt_field *field)
 	return int_field->value.i;
 }
 
-void bt_field_signed_integer_set_value(struct bt_field *field, int64_t value)
+void bt_field_integer_signed_set_value(struct bt_field *field, int64_t value)
 {
 	struct bt_field_integer *int_field = (void *) field;
 
@@ -519,7 +577,7 @@ void bt_field_signed_integer_set_value(struct bt_field *field, int64_t value)
 	bt_field_set_single(field, true);
 }
 
-uint64_t bt_field_unsigned_integer_get_value(const struct bt_field *field)
+uint64_t bt_field_integer_unsigned_get_value(const struct bt_field *field)
 {
 	const struct bt_field_integer *int_field = (const void *) field;
 
@@ -529,7 +587,7 @@ uint64_t bt_field_unsigned_integer_get_value(const struct bt_field *field)
 	return int_field->value.u;
 }
 
-void bt_field_unsigned_integer_set_value(struct bt_field *field, uint64_t value)
+void bt_field_integer_unsigned_set_value(struct bt_field *field, uint64_t value)
 {
 	struct bt_field_integer *int_field = (void *) field;
 
@@ -571,7 +629,7 @@ void bt_field_real_set_value(struct bt_field *field, double value)
 }
 
 enum bt_field_enumeration_get_mapping_labels_status
-bt_field_unsigned_enumeration_get_mapping_labels(
+bt_field_enumeration_unsigned_get_mapping_labels(
 		const struct bt_field *field,
 		bt_field_class_enumeration_mapping_label_array *label_array,
 		uint64_t *count)
@@ -585,12 +643,12 @@ bt_field_unsigned_enumeration_get_mapping_labels(
 	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
 		BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field");
 	return (int)
-		bt_field_class_unsigned_enumeration_get_mapping_labels_for_value(
+		bt_field_class_enumeration_unsigned_get_mapping_labels_for_value(
 			field->class, int_field->value.u, label_array, count);
 }
 
 enum bt_field_enumeration_get_mapping_labels_status
-bt_field_signed_enumeration_get_mapping_labels(
+bt_field_enumeration_signed_get_mapping_labels(
 		const struct bt_field *field,
 		bt_field_class_enumeration_mapping_label_array *label_array,
 		uint64_t *count)
@@ -604,7 +662,7 @@ bt_field_signed_enumeration_get_mapping_labels(
 	BT_ASSERT_PRE_DEV_FIELD_HAS_CLASS_TYPE(field,
 		BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, "Field");
 	return (int)
-		bt_field_class_signed_enumeration_get_mapping_labels_for_value(
+		bt_field_class_enumeration_signed_get_mapping_labels_for_value(
 			field->class, int_field->value.i, label_array, count);
 }
 
@@ -674,7 +732,7 @@ enum bt_field_string_append_status bt_field_string_append_with_length(
 		BT_FIELD_CLASS_TYPE_STRING, "Field");
 
 	/* Make sure no null bytes are appended */
-	BT_ASSERT_PRE_DEV(memchr(value, '\0', length) == NULL,
+	BT_ASSERT_PRE_DEV(!memchr(value, '\0', length),
 		"String value to append contains a null character: "
 		"partial-value=\"%.32s\", length=%" PRIu64, value, length);
 
@@ -710,7 +768,7 @@ uint64_t bt_field_array_get_length(const struct bt_field *field)
 	return array_field->length;
 }
 
-enum bt_field_dynamic_array_set_length_status bt_field_dynamic_array_set_length(
+enum bt_field_array_dynamic_set_length_status bt_field_array_dynamic_set_length(
 		struct bt_field *field, uint64_t length)
 {
 	int ret = BT_FUNC_STATUS_OK;
@@ -897,7 +955,7 @@ bt_field_variant_borrow_selected_class_option_const(
 	return borrow_variant_field_selected_class_option(field);
 }
 
-const struct bt_field_class_variant_with_unsigned_selector_option *
+const struct bt_field_class_variant_with_selector_unsigned_option *
 bt_field_variant_with_unsigned_selector_borrow_selected_class_option_const(
 		const struct bt_field *field)
 {
@@ -907,7 +965,7 @@ bt_field_variant_with_unsigned_selector_borrow_selected_class_option_const(
 	return (const void *) borrow_variant_field_selected_class_option(field);
 }
 
-const struct bt_field_class_variant_with_signed_selector_option *
+const struct bt_field_class_variant_with_selector_signed_option *
 bt_field_variant_with_signed_selector_borrow_selected_class_option_const(
 		const struct bt_field *field)
 {
@@ -952,6 +1010,15 @@ void bt_field_finalize(struct bt_field *field)
 	BT_OBJECT_PUT_REF_AND_RESET(field->class);
 }
 
+static
+void destroy_bool_field(struct bt_field *field)
+{
+	BT_ASSERT(field);
+	BT_LIB_LOGD("Destroying boolean field object: %!+f", field);
+	bt_field_finalize(field);
+	g_free(field);
+}
+
 static
 void destroy_integer_field(struct bt_field *field)
 {