Merge branch 'master' of ssh://efficios.com/home/efficios/git/babeltrace

[babeltrace.git] / formats / ctf / types / array.c

diff --git a/formats/ctf/types/array.c b/formats/ctf/types/array.c
index e6a2aa6c127eedcca00c3df6a4cfb888a1e7edf0..e5b428cc57571b05283bb7a8b1dc5b2b13bdc73b 100644 (file)
--- a/formats/ctf/types/array.c
+++ b/formats/ctf/types/array.c
@@ -3,7 +3,9 @@
  *
  * Array 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
@@ -18,13 +20,73 @@
 
 #include <babeltrace/ctf/types.h>
 
-void ctf_array_begin(struct stream_pos *pos,
-                    const struct type_class_array *array_class)
+int ctf_array_read(struct stream_pos *ppos, struct definition *definition)
 {
-       /* No need to align, because the first field will align itself. */
+       struct definition_array *array_definition =
+               container_of(definition, struct definition_array, p);
+       struct declaration_array *array_declaration =
+               array_definition->declaration;
+       struct declaration *elem = array_declaration->elem;
+       struct ctf_stream_pos *pos =
+               container_of(ppos, struct ctf_stream_pos, parent);
+
+       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) {
+
+                               ctf_align_pos(pos, integer_declaration->p.alignment);
+                               if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
+                                       return -EFAULT;
+
+                               g_string_assign(array_definition->string, "");
+                               g_string_insert_len(array_definition->string,
+                                       0, (char *) ctf_get_pos_addr(pos),
+                                       array_declaration->len);
+                               ctf_move_pos(pos, array_declaration->len * CHAR_BIT);
+                               return 0;
+                       }
+               }
+       }
+       return array_rw(ppos, definition);
 }
 
-void ctf_array_end(struct stream_pos *pos,
-                  const struct type_class_array *array_class)
+int ctf_array_write(struct stream_pos *ppos, struct definition *definition)
 {
+       struct definition_array *array_definition =
+               container_of(definition, struct definition_array, p);
+       struct declaration_array *array_declaration =
+               array_definition->declaration;
+       struct declaration *elem = array_declaration->elem;
+       struct ctf_stream_pos *pos =
+               container_of(ppos, struct ctf_stream_pos, parent);
+
+       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) {
+
+                               ctf_align_pos(pos, integer_declaration->p.alignment);
+                               if (!ctf_pos_access_ok(pos, array_declaration->len * CHAR_BIT))
+                                       return -EFAULT;
+
+                               memcpy((char *) ctf_get_pos_addr(pos),
+                                       array_definition->string->str,
+                                       array_declaration->len);
+                               ctf_move_pos(pos, array_declaration->len * CHAR_BIT);
+                               return 0;
+                       }
+               }
+       }
+       return array_rw(ppos, definition);
 }