X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Fsequence.c;h=7f12bbceade30ce1727504b3a8d36d9d2b1fc094;hp=640f451735ada1c3867c01058e69c881063a3fce;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=46322b331aefc5739efd841df72d1928e35050e6

diff --git a/formats/ctf/types/sequence.c b/formats/ctf/types/sequence.c
index 640f4517..7f12bbce 100644
--- a/formats/ctf/types/sequence.c
+++ b/formats/ctf/types/sequence.c
@@ -3,7 +3,9 @@
  *
  * Sequence format access functions.
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -14,19 +16,83 @@
  *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
  */
 
 #include <babeltrace/ctf/types.h>
 
-void ctf_sequence_begin(struct stream_pos *ppos,
-			const struct declaration_sequence *sequence_declaration)
+int ctf_sequence_read(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);
 
-	ctf_align_pos(pos, sequence_declaration->p.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);
 }
 
-void ctf_sequence_end(struct stream_pos *pos,
-		      const struct declaration_sequence *sequence_declaration)
+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);
 }