X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-sink%2Ffs-sink-ctf-meta.h;h=d525faa8a914361054a332e1b0b452f607a70750;hb=b8ddb4f036272e30030202637201d11baf5f20a5;hp=9fcd3636c8aae13b563169791c632af63ca9423c;hpb=c27259b025303a64f2c1ae387bf9e34b95e401bb;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h b/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h
index 9fcd3636..d525faa8 100644
--- a/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h
+++ b/src/plugins/ctf/fs-sink/fs-sink-ctf-meta.h
@@ -27,6 +27,7 @@
 
 enum fs_sink_ctf_field_class_type {
 	FS_SINK_CTF_FIELD_CLASS_TYPE_BOOL,
+	FS_SINK_CTF_FIELD_CLASS_TYPE_BIT_ARRAY,
 	FS_SINK_CTF_FIELD_CLASS_TYPE_INT,
 	FS_SINK_CTF_FIELD_CLASS_TYPE_FLOAT,
 	FS_SINK_CTF_FIELD_CLASS_TYPE_STRING,
@@ -248,6 +249,22 @@ void _fs_sink_ctf_named_field_class_fini(
 	named_fc->fc = NULL;
 }
 
+static inline
+struct fs_sink_ctf_field_class_bit_array *
+fs_sink_ctf_field_class_bit_array_create(
+		const bt_field_class *ir_fc, uint64_t index_in_parent)
+{
+	struct fs_sink_ctf_field_class_bit_array *fc =
+		g_new0(struct fs_sink_ctf_field_class_bit_array, 1);
+
+	BT_ASSERT(fc);
+	_fs_sink_ctf_field_class_bit_array_init((void *) fc,
+		FS_SINK_CTF_FIELD_CLASS_TYPE_BIT_ARRAY, ir_fc,
+		(unsigned int) bt_field_class_bit_array_get_length(ir_fc),
+		index_in_parent);
+	return fc;
+}
+
 static inline
 struct fs_sink_ctf_field_class_bool *fs_sink_ctf_field_class_bool_create(
 		const bt_field_class *ir_fc, uint64_t index_in_parent)
@@ -290,7 +307,8 @@ struct fs_sink_ctf_field_class_float *fs_sink_ctf_field_class_float_create(
 	BT_ASSERT(fc);
 	_fs_sink_ctf_field_class_bit_array_init((void *) fc,
 		FS_SINK_CTF_FIELD_CLASS_TYPE_FLOAT,
-		ir_fc, bt_field_class_real_is_single_precision(ir_fc) ? 32 : 64,
+		ir_fc,
+		bt_field_class_get_type(ir_fc) == BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL ? 32 : 64,
 		index_in_parent);
 	return fc;
 }
@@ -392,8 +410,8 @@ struct fs_sink_ctf_field_class_sequence *fs_sink_ctf_field_class_sequence_create
 	fc->length_ref = g_string_new(NULL);
 	BT_ASSERT(fc->length_ref);
 	fc->length_is_before =
-		bt_field_class_array_dynamic_borrow_length_field_path_const(ir_fc) ==
-		NULL;
+		bt_field_class_get_type(ir_fc) ==
+			BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD;
 	return fc;
 }
 
@@ -413,6 +431,15 @@ void _fs_sink_ctf_field_class_fini(struct fs_sink_ctf_field_class *fc)
 	BT_ASSERT(fc);
 }
 
+static inline
+void _fs_sink_ctf_field_class_bit_array_destroy(
+		struct fs_sink_ctf_field_class_int *fc)
+{
+	BT_ASSERT(fc);
+	_fs_sink_ctf_field_class_fini((void *) fc);
+	g_free(fc);
+}
+
 static inline
 void _fs_sink_ctf_field_class_bool_destroy(
 		struct fs_sink_ctf_field_class_int *fc)
@@ -565,6 +592,9 @@ void fs_sink_ctf_field_class_destroy(struct fs_sink_ctf_field_class *fc)
 	case FS_SINK_CTF_FIELD_CLASS_TYPE_BOOL:
 		_fs_sink_ctf_field_class_bool_destroy((void *) fc);
 		break;
+	case FS_SINK_CTF_FIELD_CLASS_TYPE_BIT_ARRAY:
+		_fs_sink_ctf_field_class_bit_array_destroy((void *) fc);
+		break;
 	case FS_SINK_CTF_FIELD_CLASS_TYPE_INT:
 		_fs_sink_ctf_field_class_int_destroy((void *) fc);
 		break;