From 219fc9ac99e2c24acea011d7845a22d6b3700f75 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Wed, 1 Jul 2009 20:07:12 +0000 Subject: Inline some functions: about a 5% performance boost. --- libdimension/array.c | 116 --------------------------------------------------- 1 file changed, 116 deletions(-) delete mode 100644 libdimension/array.c (limited to 'libdimension/array.c') diff --git a/libdimension/array.c b/libdimension/array.c deleted file mode 100644 index fcd77f5..0000000 --- a/libdimension/array.c +++ /dev/null @@ -1,116 +0,0 @@ -/************************************************************************* - * Copyright (C) 2008 Tavian Barnes * - * * - * This file is part of The Dimension Library. * - * * - * The Dimension 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 3 of the * - * License, or (at your option) any later version. * - * * - * The Dimension 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. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this program. If not, see * - * . * - *************************************************************************/ - -#include "dimension.h" -#include -#include /* For memcpy */ - -/* Allocate a new array - guaranteed not to fail if it returns */ -dmnsn_array * -dmnsn_new_array(size_t obj_size) -{ - dmnsn_array *array = malloc(sizeof(dmnsn_array)); - if (array) { - array->obj_size = obj_size; - array->length = 0; - array->capacity = 4; /* Start with capacity of 4 */ - - /* Allocate the memory */ - array->ptr = malloc(array->capacity*array->obj_size); - if (!array->ptr) { - dmnsn_error(DMNSN_SEVERITY_HIGH, "Array allocation failed."); - } - } - - return array; -} - -/* Delete the array */ -void dmnsn_delete_array(dmnsn_array *array) { - if (array) { - free(array->ptr); - free(array); - } -} - -/* Push obj to the end of the array */ -void -dmnsn_array_push(dmnsn_array *array, const void *obj) -{ - dmnsn_array_set(array, dmnsn_array_size(array), obj); -} - -/* Pop obj from the end of the array */ -void -dmnsn_array_pop(dmnsn_array *array, void *obj) -{ - size_t size = dmnsn_array_size(array); - dmnsn_array_get(array, size - 1, obj); /* Copy the object */ - dmnsn_array_resize(array, size - 1); /* Shrink the array */ -} - -/* Get the i'th object, bailing out if i is out of range */ -void -dmnsn_array_get(const dmnsn_array *array, size_t i, void *obj) -{ - if (i >= dmnsn_array_size(array)) { - /* Range check failed */ - dmnsn_error(DMNSN_SEVERITY_HIGH, "Array index out of bounds."); - } - memcpy(obj, (char *)array->ptr + array->obj_size*i, array->obj_size); -} - -/* Set the i'th object, expanding the array if necessary */ -void -dmnsn_array_set(dmnsn_array *array, size_t i, const void *obj) -{ - if (i >= dmnsn_array_size(array)) { - /* Resize if i is out of range */ - dmnsn_array_resize(array, i + 1); - } - memcpy((char *)array->ptr + array->obj_size*i, obj, array->obj_size); -} - -/* Element access */ -void * -dmnsn_array_at(dmnsn_array *array, size_t i) -{ - if (i >= dmnsn_array_size(array)) { - /* Resize if i is out of range */ - dmnsn_array_resize(array, i + 1); - } - return (char *)array->ptr + array->obj_size*i; -} - -/* Set the size of the array */ -void -dmnsn_array_resize(dmnsn_array *array, size_t length) -{ - if (length > array->capacity) { - /* Resize if we don't have enough capacity */ - array->capacity = length*2; /* We are greedy */ - array->ptr = realloc(array->ptr, array->obj_size*array->capacity); - if (!array->ptr) { - dmnsn_error(DMNSN_SEVERITY_HIGH, "Resizing array failed."); - } - } - - array->length = length; -} -- cgit v1.2.3