X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Ftypes%2Finteger.c;fp=formats%2Fctf%2Ftypes%2Finteger.c;h=0000000000000000000000000000000000000000;hp=85931be23d82e741982cd7545fc72cef1a47d1a1;hb=dc3fffef7b84cc4af1a7c99828fd57a106cd2257;hpb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10

diff --git a/formats/ctf/types/integer.c b/formats/ctf/types/integer.c
deleted file mode 100644
index 85931be2..00000000
--- a/formats/ctf/types/integer.c
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
- * Common Trace Format
- *
- * Integers read/write functions.
- *
- * 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
- * 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:
- *
- * 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>
-#include <babeltrace/bitfield.h>
-#include <stdint.h>
-#include <glib.h>
-#include <babeltrace/endian.h>
-
-/*
- * The aligned read/write functions are expected to be faster than the
- * bitfield variants. They will be enabled eventually as an
- * optimisation.
- */
-
-static
-int _aligned_integer_read(struct bt_stream_pos *ppos,
-			  struct bt_definition *definition)
-{
-	struct definition_integer *integer_definition =
-		container_of(definition, struct definition_integer, p);
-	const struct declaration_integer *integer_declaration =
-		integer_definition->declaration;
-	struct ctf_stream_pos *pos = ctf_pos(ppos);
-	int rbo = (integer_declaration->byte_order != BYTE_ORDER);	/* reverse byte order */
-
-	if (!ctf_align_pos(pos, integer_declaration->p.alignment))
-		return -EFAULT;
-
-	if (!ctf_pos_access_ok(pos, integer_declaration->len))
-		return -EFAULT;
-
-	assert(!(pos->offset % CHAR_BIT));
-	if (!integer_declaration->signedness) {
-		switch (integer_declaration->len) {
-		case 8:
-		{
-			uint8_t v;
-
-			memcpy(&v, ctf_get_pos_addr(pos), sizeof(v));
-			integer_definition->value._unsigned = v;
-			break;
-		}
-		case 16:
-		{
-			uint16_t v;
-
-			memcpy(&v, ctf_get_pos_addr(pos), sizeof(v));
-			integer_definition->value._unsigned =
-				rbo ? GUINT16_SWAP_LE_BE(v) : v;
-			break;
-		}
-		case 32:
-		{
-			uint32_t v;
-
-			memcpy(&v, ctf_get_pos_addr(pos), sizeof(v));
-			integer_definition->value._unsigned =
-				rbo ? GUINT32_SWAP_LE_BE(v) : v;
-			break;
-		}
-		case 64:
-		{
-			uint64_t v;
-
-			memcpy(&v, ctf_get_pos_addr(pos), sizeof(v));
-			integer_definition->value._unsigned =
-				rbo ? GUINT64_SWAP_LE_BE(v) : v;
-			break;
-		}
-		default:
-			assert(0);
-		}
-	} else {
-		switch (integer_declaration->len) {
-		case 8:
-		{
-			int8_t v;
-
-			memcpy(&v, ctf_get_pos_addr(pos), sizeof(v));
-			integer_definition->value._signed = v;
-			break;
-		}
-		case 16:
-		{
-			int16_t v;
-
-			memcpy(&v, ctf_get_pos_addr(pos), sizeof(v));
-			integer_definition->value._signed =
-				rbo ? (int16_t) GUINT16_SWAP_LE_BE(v) : v;
-			break;
-		}
-		case 32:
-		{
-			int32_t v;
-
-			memcpy(&v, ctf_get_pos_addr(pos), sizeof(v));
-			integer_definition->value._signed =
-				rbo ? (int32_t) GUINT32_SWAP_LE_BE(v) : v;
-			break;
-		}
-		case 64:
-		{
-			int64_t v;
-
-			memcpy(&v, ctf_get_pos_addr(pos), sizeof(v));
-			integer_definition->value._signed =
-				rbo ? (int64_t) GUINT64_SWAP_LE_BE(v) : v;
-			break;
-		}
-		default:
-			assert(0);
-		}
-	}
-	if (!ctf_move_pos(pos, integer_declaration->len))
-		return -EFAULT;
-	return 0;
-}
-
-static
-int _aligned_integer_write(struct bt_stream_pos *ppos,
-			    struct bt_definition *definition)
-{
-	struct definition_integer *integer_definition =
-		container_of(definition, struct definition_integer, p);
-	const struct declaration_integer *integer_declaration =
-		integer_definition->declaration;
-	struct ctf_stream_pos *pos = ctf_pos(ppos);
-	int rbo = (integer_declaration->byte_order != BYTE_ORDER);	/* reverse byte order */
-
-	if (!ctf_align_pos(pos, integer_declaration->p.alignment))
-		return -EFAULT;
-
-	if (!ctf_pos_access_ok(pos, integer_declaration->len))
-		return -EFAULT;
-
-	assert(!(pos->offset % CHAR_BIT));
-	if (pos->dummy)
-		goto end;
-	if (!integer_declaration->signedness) {
-		switch (integer_declaration->len) {
-		case 8:
-		{
-			uint8_t v = integer_definition->value._unsigned;
-
-			memcpy(ctf_get_pos_addr(pos), &v, sizeof(v));
-			break;
-		}
-		case 16:
-		{
-			uint16_t v = integer_definition->value._unsigned;
-
-			if (rbo)
-				v = GUINT16_SWAP_LE_BE(v);
-			memcpy(ctf_get_pos_addr(pos), &v, sizeof(v));
-			break;
-		}
-		case 32:
-		{
-			uint32_t v = integer_definition->value._unsigned;
-
-			if (rbo)
-				v = GUINT32_SWAP_LE_BE(v);
-			memcpy(ctf_get_pos_addr(pos), &v, sizeof(v));
-			break;
-		}
-		case 64:
-		{
-			uint64_t v = integer_definition->value._unsigned;
-
-			if (rbo)
-				v = GUINT64_SWAP_LE_BE(v);
-			memcpy(ctf_get_pos_addr(pos), &v, sizeof(v));
-			break;
-		}
-		default:
-			assert(0);
-		}
-	} else {
-		switch (integer_declaration->len) {
-		case 8:
-		{
-			uint8_t v = integer_definition->value._signed;
-
-			memcpy(ctf_get_pos_addr(pos), &v, sizeof(v));
-			break;
-		}
-		case 16:
-		{
-			int16_t v = integer_definition->value._signed;
-
-			if (rbo)
-				v = GUINT16_SWAP_LE_BE(v);
-			memcpy(ctf_get_pos_addr(pos), &v, sizeof(v));
-			break;
-		}
-		case 32:
-		{
-			int32_t v = integer_definition->value._signed;
-
-			if (rbo)
-				v = GUINT32_SWAP_LE_BE(v);
-			memcpy(ctf_get_pos_addr(pos), &v, sizeof(v));
-			break;
-		}
-		case 64:
-		{
-			int64_t v = integer_definition->value._signed;
-
-			if (rbo)
-				v = GUINT64_SWAP_LE_BE(v);
-			memcpy(ctf_get_pos_addr(pos), &v, sizeof(v));
-			break;
-		}
-		default:
-			assert(0);
-		}
-	}
-end:
-	if (!ctf_move_pos(pos, integer_declaration->len))
-		return -EFAULT;
-	return 0;
-}
-
-int ctf_integer_read(struct bt_stream_pos *ppos, struct bt_definition *definition)
-{
-	struct definition_integer *integer_definition =
-		container_of(definition, struct definition_integer, p);
-	const struct declaration_integer *integer_declaration =
-		integer_definition->declaration;
-	struct ctf_stream_pos *pos = ctf_pos(ppos);
-
-	if (!(integer_declaration->p.alignment % CHAR_BIT)
-	    && !(integer_declaration->len % CHAR_BIT)) {
-		return _aligned_integer_read(ppos, definition);
-	}
-
-	if (!ctf_align_pos(pos, integer_declaration->p.alignment))
-		return -EFAULT;
-
-	if (!ctf_pos_access_ok(pos, integer_declaration->len))
-		return -EFAULT;
-
-	if (!integer_declaration->signedness) {
-		if (integer_declaration->byte_order == LITTLE_ENDIAN)
-			bt_bitfield_read_le(mmap_align_addr(pos->base_mma) +
-					pos->mmap_base_offset, unsigned char,
-				pos->offset, integer_declaration->len,
-				&integer_definition->value._unsigned);
-		else
-			bt_bitfield_read_be(mmap_align_addr(pos->base_mma) +
-					pos->mmap_base_offset, unsigned char,
-				pos->offset, integer_declaration->len,
-				&integer_definition->value._unsigned);
-	} else {
-		if (integer_declaration->byte_order == LITTLE_ENDIAN)
-			bt_bitfield_read_le(mmap_align_addr(pos->base_mma) +
-					pos->mmap_base_offset, unsigned char,
-				pos->offset, integer_declaration->len,
-				&integer_definition->value._signed);
-		else
-			bt_bitfield_read_be(mmap_align_addr(pos->base_mma) +
-					pos->mmap_base_offset, unsigned char,
-				pos->offset, integer_declaration->len,
-				&integer_definition->value._signed);
-	}
-	if (!ctf_move_pos(pos, integer_declaration->len))
-		return -EFAULT;
-	return 0;
-}
-
-int ctf_integer_write(struct bt_stream_pos *ppos, struct bt_definition *definition)
-{
-	struct definition_integer *integer_definition =
-		container_of(definition, struct definition_integer, p);
-	const struct declaration_integer *integer_declaration =
-		integer_definition->declaration;
-	struct ctf_stream_pos *pos = ctf_pos(ppos);
-
-	if (!(integer_declaration->p.alignment % CHAR_BIT)
-	    && !(integer_declaration->len % CHAR_BIT)) {
-		return _aligned_integer_write(ppos, definition);
-	}
-
-	if (!ctf_align_pos(pos, integer_declaration->p.alignment))
-		return -EFAULT;
-
-	if (!ctf_pos_access_ok(pos, integer_declaration->len))
-		return -EFAULT;
-
-	if (pos->dummy)
-		goto end;
-	if (!integer_declaration->signedness) {
-		if (integer_declaration->byte_order == LITTLE_ENDIAN)
-			bt_bitfield_write_le(mmap_align_addr(pos->base_mma) +
-					pos->mmap_base_offset, unsigned char,
-				pos->offset, integer_declaration->len,
-				integer_definition->value._unsigned);
-		else
-			bt_bitfield_write_be(mmap_align_addr(pos->base_mma) +
-					pos->mmap_base_offset, unsigned char,
-				pos->offset, integer_declaration->len,
-				integer_definition->value._unsigned);
-	} else {
-		if (integer_declaration->byte_order == LITTLE_ENDIAN)
-			bt_bitfield_write_le(mmap_align_addr(pos->base_mma) +
-					pos->mmap_base_offset, unsigned char,
-				pos->offset, integer_declaration->len,
-				integer_definition->value._signed);
-		else
-			bt_bitfield_write_be(mmap_align_addr(pos->base_mma) +
-					pos->mmap_base_offset, unsigned char,
-				pos->offset, integer_declaration->len,
-				integer_definition->value._signed);
-	}
-end:
-	if (!ctf_move_pos(pos, integer_declaration->len))
-		return -EFAULT;
-	return 0;
-}