X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_array_oset.c;h=623b4acbc1cd7848f06053dae94a233166244eff;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=6a227b0bfe75590a63596be6f4386ede5def39c4;hpb=757c49d51168c0aa4b9e4d2e0fea4bdd23cb2919;p=gnulib.git diff --git a/lib/gl_array_oset.c b/lib/gl_array_oset.c index 6a227b0bf..623b4acbc 100644 --- a/lib/gl_array_oset.c +++ b/lib/gl_array_oset.c @@ -1,11 +1,11 @@ /* Ordered set data type implemented by an array. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006-2007, 2009-2014 Free Software Foundation, Inc. Written by Bruno Haible , 2006. - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -13,8 +13,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include @@ -23,8 +22,6 @@ #include -#include "xalloc.h" - /* Checked size_t computations. */ #include "xsize.h" @@ -42,14 +39,19 @@ struct gl_oset_impl }; static gl_oset_t -gl_array_create_empty (gl_oset_implementation_t implementation, - gl_setelement_compar_fn compar_fn) +gl_array_nx_create_empty (gl_oset_implementation_t implementation, + gl_setelement_compar_fn compar_fn, + gl_setelement_dispose_fn dispose_fn) { struct gl_oset_impl *set = - (struct gl_oset_impl *) xmalloc (sizeof (struct gl_oset_impl)); + (struct gl_oset_impl *) malloc (sizeof (struct gl_oset_impl)); + + if (set == NULL) + return NULL; set->base.vtable = implementation; set->base.compar_fn = compar_fn; + set->base.dispose_fn = dispose_fn; set->elements = NULL; set->count = 0; set->allocated = 0; @@ -75,25 +77,25 @@ gl_array_indexof (gl_oset_t set, const void *elt) size_t high = count; /* At each loop iteration, low < high; for indices < low the values - are smaller than ELT; for indices >= high the values are greater - than ELT. So, if the element occurs in the list, it is at - low <= position < high. */ + are smaller than ELT; for indices >= high the values are greater + than ELT. So, if the element occurs in the list, it is at + low <= position < high. */ do - { - size_t mid = low + (high - low) / 2; /* low <= mid < high */ - int cmp = (compar != NULL - ? compar (set->elements[mid], elt) - : (set->elements[mid] > elt ? 1 : - set->elements[mid] < elt ? -1 : 0)); - - if (cmp < 0) - low = mid + 1; - else if (cmp > 0) - high = mid; - else /* cmp == 0 */ - /* We have an element equal to ELT at index MID. */ - return mid; - } + { + size_t mid = low + (high - low) / 2; /* low <= mid < high */ + int cmp = (compar != NULL + ? compar (set->elements[mid], elt) + : (set->elements[mid] > elt ? 1 : + set->elements[mid] < elt ? -1 : 0)); + + if (cmp < 0) + low = mid + 1; + else if (cmp > 0) + high = mid; + else /* cmp == 0 */ + /* We have an element equal to ELT at index MID. */ + return mid; + } while (low < high); } return (size_t)(-1); @@ -105,8 +107,59 @@ gl_array_search (gl_oset_t set, const void *elt) return gl_array_indexof (set, elt) != (size_t)(-1); } -/* Ensure that set->allocated > set->count. */ -static void +static bool +gl_array_search_atleast (gl_oset_t set, + gl_setelement_threshold_fn threshold_fn, + const void *threshold, + const void **eltp) +{ + size_t count = set->count; + + if (count > 0) + { + size_t low = 0; + size_t high = count; + + /* At each loop iteration, low < high; for indices < low the values are + smaller than THRESHOLD; for indices >= high the values are nonexistent. + So, if an element >= THRESHOLD occurs in the list, it is at + low <= position < high. */ + do + { + size_t mid = low + (high - low) / 2; /* low <= mid < high */ + + if (! threshold_fn (set->elements[mid], threshold)) + low = mid + 1; + else + { + /* We have an element >= THRESHOLD at index MID. But we need the + minimal such index. */ + high = mid; + /* At each loop iteration, low <= high and + compar (list->elements[high], value) >= 0, + and we know that the first occurrence of the element is at + low <= position <= high. */ + while (low < high) + { + size_t mid2 = low + (high - low) / 2; /* low <= mid2 < high */ + + if (! threshold_fn (set->elements[mid2], threshold)) + low = mid2 + 1; + else + high = mid2; + } + *eltp = set->elements[low]; + return true; + } + } + while (low < high); + } + return false; +} + +/* Ensure that set->allocated > set->count. + Return 0 upon success, -1 upon out-of-memory. */ +static int grow (gl_oset_t set) { size_t new_allocated; @@ -118,36 +171,40 @@ grow (gl_oset_t set) memory_size = xtimes (new_allocated, sizeof (const void *)); if (size_overflow_p (memory_size)) /* Overflow, would lead to out of memory. */ - xalloc_die (); - memory = (const void **) xrealloc (set->elements, memory_size); + return -1; + memory = (const void **) realloc (set->elements, memory_size); if (memory == NULL) /* Out of memory. */ - xalloc_die (); + return -1; set->elements = memory; set->allocated = new_allocated; + return 0; } /* Add the given element ELT at the given position, - 0 <= position <= gl_oset_size (set). */ -static inline void -gl_array_add_at (gl_oset_t set, size_t position, const void *elt) + 0 <= position <= gl_oset_size (set). + Return 1 upon success, -1 upon out-of-memory. */ +static int +gl_array_nx_add_at (gl_oset_t set, size_t position, const void *elt) { size_t count = set->count; const void **elements; size_t i; if (count == set->allocated) - grow (set); + if (grow (set) < 0) + return -1; elements = set->elements; for (i = count; i > position; i--) elements[i] = elements[i - 1]; elements[position] = elt; set->count = count + 1; + return 1; } /* Remove the element at the given position, 0 <= position < gl_oset_size (set). */ -static inline void +static void gl_array_remove_at (gl_oset_t set, size_t position) { size_t count = set->count; @@ -155,13 +212,15 @@ gl_array_remove_at (gl_oset_t set, size_t position) size_t i; elements = set->elements; + if (set->base.dispose_fn != NULL) + set->base.dispose_fn (elements[position]); for (i = position + 1; i < count; i++) elements[i - 1] = elements[i]; set->count = count - 1; } -static bool -gl_array_add (gl_oset_t set, const void *elt) +static int +gl_array_nx_add (gl_oset_t set, const void *elt) { size_t count = set->count; size_t low = 0; @@ -172,28 +231,27 @@ gl_array_add (gl_oset_t set, const void *elt) size_t high = count; /* At each loop iteration, low < high; for indices < low the values - are smaller than ELT; for indices >= high the values are greater - than ELT. So, if the element occurs in the list, it is at - low <= position < high. */ + are smaller than ELT; for indices >= high the values are greater + than ELT. So, if the element occurs in the list, it is at + low <= position < high. */ do - { - size_t mid = low + (high - low) / 2; /* low <= mid < high */ - int cmp = (compar != NULL - ? compar (set->elements[mid], elt) - : (set->elements[mid] > elt ? 1 : - set->elements[mid] < elt ? -1 : 0)); - - if (cmp < 0) - low = mid + 1; - else if (cmp > 0) - high = mid; - else /* cmp == 0 */ - return false; - } + { + size_t mid = low + (high - low) / 2; /* low <= mid < high */ + int cmp = (compar != NULL + ? compar (set->elements[mid], elt) + : (set->elements[mid] > elt ? 1 : + set->elements[mid] < elt ? -1 : 0)); + + if (cmp < 0) + low = mid + 1; + else if (cmp > 0) + high = mid; + else /* cmp == 0 */ + return false; + } while (low < high); } - gl_array_add_at (set, low, elt); - return true; + return gl_array_nx_add_at (set, low, elt); } static bool @@ -213,7 +271,23 @@ static void gl_array_free (gl_oset_t set) { if (set->elements != NULL) - free (set->elements); + { + if (set->base.dispose_fn != NULL) + { + size_t count = set->count; + + if (count > 0) + { + gl_setelement_dispose_fn dispose = set->base.dispose_fn; + const void **elements = set->elements; + + do + dispose (*elements++); + while (--count > 0); + } + } + free (set->elements); + } free (set); } @@ -244,12 +318,12 @@ gl_array_iterator_next (gl_oset_iterator_t *iterator, const void **eltp) if (iterator->count != set->count) { if (iterator->count != set->count + 1) - /* Concurrent modifications were done on the set. */ - abort (); + /* Concurrent modifications were done on the set. */ + abort (); /* The last returned element was removed. */ iterator->count--; - iterator->p--; - iterator->q--; + iterator->p = (const void **) iterator->p - 1; + iterator->q = (const void **) iterator->q - 1; } if (iterator->p < iterator->q) { @@ -270,10 +344,11 @@ gl_array_iterator_free (gl_oset_iterator_t *iterator) const struct gl_oset_implementation gl_array_oset_implementation = { - gl_array_create_empty, + gl_array_nx_create_empty, gl_array_size, gl_array_search, - gl_array_add, + gl_array_search_atleast, + gl_array_nx_add, gl_array_remove, gl_array_free, gl_array_iterator,