X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Farray.c;h=d5b6ed46b44d25d81e87840cb1675e17bea612c7;hp=0133268fc6eba90eb5ae3cccb302649b407f1e2a;hb=c462e188f3e7819c7bc74f671038cdbf36e8c3c0;hpb=d06d03dbf4babd3426818f23770e15058a6876c4

diff --git a/formats/ctf/types/array.c b/formats/ctf/types/array.c
index 0133268f..d5b6ed46 100644
--- a/formats/ctf/types/array.c
+++ b/formats/ctf/types/array.c
@@ -3,32 +3,98 @@
  *
  * Array format access functions.
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * 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_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);
 }