X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fsequence.c;fp=formats%2Fctf%2Ftypes%2Fsequence.c;h=a14d5891027370cac352bc5522aebd6d5c38aed8;hp=acd4c7c0fca8310efc5bc890283525122d533fa1;hb=81dee1bb528a95f7bf2bc622948807150794a75e;hpb=7f4b5c4d89ec59fed423be83ca49811459329679

diff --git a/formats/ctf/types/sequence.c b/formats/ctf/types/sequence.c
index acd4c7c0..a14d5891 100644
--- a/formats/ctf/types/sequence.c
+++ b/formats/ctf/types/sequence.c
@@ -18,11 +18,71 @@
 
 #include <babeltrace/ctf/types.h>
 
-int ctf_sequence_rw(struct stream_pos *ppos, struct definition *definition)
+int ctf_sequence_read(struct stream_pos *ppos, struct definition *definition)
 {
-	struct declaration *declaration = definition->declaration;
+	struct definition_sequence *sequence_definition =
+		container_of(definition, struct definition_sequence, p);
+	struct declaration_sequence *sequence_declaration =
+		sequence_definition->declaration;
+	struct declaration *elem = sequence_declaration->elem;
 	struct ctf_stream_pos *pos = ctf_pos(ppos);
 
-	ctf_align_pos(pos, declaration->alignment);
+	if (elem->id == CTF_TYPE_INTEGER) {
+		struct declaration_integer *integer_declaration =
+			container_of(elem, struct declaration_integer, p);
+
+		if (integer_declaration->encoding == CTF_STRING_UTF8
+		      || integer_declaration->encoding == CTF_STRING_ASCII) {
+
+			if (integer_declaration->len == CHAR_BIT
+			    && integer_declaration->p.alignment == CHAR_BIT) {
+				uint64_t len = sequence_len(sequence_definition);
+
+				ctf_align_pos(pos, integer_declaration->p.alignment);
+				if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
+					return -EFAULT;
+
+				g_string_assign(sequence_definition->string, "");
+				g_string_insert_len(sequence_definition->string,
+					0, (char *) ctf_get_pos_addr(pos), len);
+				ctf_move_pos(pos, len * CHAR_BIT);
+				return 0;
+			}
+		}
+	}
+	return sequence_rw(ppos, definition);
+}
+
+int ctf_sequence_write(struct stream_pos *ppos, struct definition *definition)
+{
+	struct definition_sequence *sequence_definition =
+		container_of(definition, struct definition_sequence, p);
+	struct declaration_sequence *sequence_declaration =
+		sequence_definition->declaration;
+	struct declaration *elem = sequence_declaration->elem;
+	struct ctf_stream_pos *pos = ctf_pos(ppos);
+
+	if (elem->id == CTF_TYPE_INTEGER) {
+		struct declaration_integer *integer_declaration =
+			container_of(elem, struct declaration_integer, p);
+
+		if (integer_declaration->encoding == CTF_STRING_UTF8
+		      || integer_declaration->encoding == CTF_STRING_ASCII) {
+
+			if (integer_declaration->len == CHAR_BIT
+			    && integer_declaration->p.alignment == CHAR_BIT) {
+				uint64_t len = sequence_len(sequence_definition);
+
+				ctf_align_pos(pos, integer_declaration->p.alignment);
+				if (!ctf_pos_access_ok(pos, len * CHAR_BIT))
+					return -EFAULT;
+
+				memcpy((char *) ctf_get_pos_addr(pos),
+					sequence_definition->string->str, len);
+				ctf_move_pos(pos, len * CHAR_BIT);
+				return 0;
+			}
+		}
+	}
 	return sequence_rw(ppos, definition);
 }