X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e566c09daba9ad67b31f3992da9172eb04b807a8..f84be00c4ed0cb612fcad0a07c40574bcae2cf35:/src/xbt/dynar.c diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c index b5468e3b9f..437a47f741 100644 --- a/src/xbt/dynar.c +++ b/src/xbt/dynar.c @@ -80,27 +80,25 @@ static XBT_INLINE memset(ptr, 0, length); } +static XBT_INLINE +void _xbt_dynar_resize(xbt_dynar_t dynar, unsigned long new_size) +{ + if (new_size != dynar->size) { + dynar->size = new_size; + dynar->data = xbt_realloc(dynar->data, new_size * dynar->elmsize); + } +} + static XBT_INLINE void _xbt_dynar_expand(xbt_dynar_t const dynar, const unsigned long nb) { const unsigned long old_size = dynar->size; if (nb > old_size) { - void *const old_data = dynar->data; - const unsigned long elmsize = dynar->elmsize; - const unsigned long old_length = old_size * elmsize; - const unsigned long expand = 2 * (old_size + 1); - const unsigned long new_size = (nb > expand ? nb : expand); - const unsigned long new_length = new_size * elmsize; - void *const new_data = xbt_realloc(old_data, new_length); - - XBT_DEBUG("expand %p from %lu to %lu elements", dynar, old_size, new_size); - - _xbt_clear_mem((char *)new_data + old_length, new_length - old_length); - - dynar->size = new_size; - dynar->data = new_data; + _xbt_dynar_resize(dynar, (nb > expand ? nb : expand)); + XBT_DEBUG("expand %p from %lu to %lu elements", + dynar, old_size, dynar->size); } } @@ -152,11 +150,11 @@ _xbt_dynar_remove_at(xbt_dynar_t const dynar, if (dynar->elmsize <= SIZEOF_MAX) { char elm[SIZEOF_MAX]; _xbt_dynar_get_elm(elm, dynar, idx); - (*dynar->free_f) (elm); + dynar->free_f(elm); } else { char *elm = malloc(dynar->elmsize); _xbt_dynar_get_elm(elm, dynar, idx); - (*dynar->free_f) (elm); + dynar->free_f(elm); free(elm); } } @@ -228,18 +226,11 @@ xbt_dynar_new_sync(const unsigned long elmsize, void xbt_dynar_free_container(xbt_dynar_t * dynar) { if (dynar && *dynar) { - - if ((*dynar)->data) { - _xbt_clear_mem((*dynar)->data, (*dynar)->size); - free((*dynar)->data); - } - - if ((*dynar)->mutex) - xbt_mutex_destroy((*dynar)->mutex); - - _xbt_clear_mem(*dynar, sizeof(s_xbt_dynar_t)); - - free(*dynar); + xbt_dynar_t d = *dynar; + free(d->data); + if (d->mutex) + xbt_mutex_destroy(d->mutex); + free(d); *dynar = NULL; } } @@ -258,17 +249,9 @@ XBT_INLINE void xbt_dynar_reset(xbt_dynar_t const dynar) if (dynar->free_f) { _dynar_map(dynar, dynar->free_f); } - /* - if (dynar->data) - free(dynar->data); - - dynar->size = 0; - */ dynar->used = 0; _dynar_unlock(dynar); - - /* dynar->data = NULL; */ } /** @@ -288,15 +271,8 @@ XBT_INLINE void xbt_dynar_reset(xbt_dynar_t const dynar) */ void xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots_wanted) { - unsigned long size_wanted; - _dynar_lock(dynar); - - size_wanted = dynar->used + empty_slots_wanted; - if (size_wanted != dynar->size) { - dynar->size = size_wanted; - dynar->data = xbt_realloc(dynar->data, dynar->elmsize * dynar->size); - } + _xbt_dynar_resize(dynar, dynar->used + empty_slots_wanted); _dynar_unlock(dynar); } @@ -382,26 +358,28 @@ XBT_INLINE void *xbt_dynar_get_ptr(const xbt_dynar_t dynar, return res; } -XBT_INLINE void *xbt_dynar_set_at_ptr(const xbt_dynar_t dynar, - const unsigned long idx) +/* not synchronized */ +static XBT_INLINE void *_xbt_dynar_set_at_ptr(const xbt_dynar_t dynar, + const unsigned long idx) { - - void *res; - _dynar_lock(dynar); _sanity_check_dynar(dynar); - _xbt_dynar_expand(dynar, idx + 1); - if (idx >= dynar->used) { + _xbt_dynar_expand(dynar, idx + 1); _xbt_clear_mem(((char * const)dynar->data) + dynar->used * dynar->elmsize, (idx + 1 - dynar->used)*dynar->elmsize); dynar->used = idx + 1; } - - _dynar_unlock(dynar); - - res = _xbt_dynar_elm(dynar, idx); + return _xbt_dynar_elm(dynar, idx); +} +XBT_INLINE void *xbt_dynar_set_at_ptr(const xbt_dynar_t dynar, + const unsigned long idx) +{ + void *res; + _dynar_lock(dynar); + res = _xbt_dynar_set_at_ptr(dynar, idx); + _dynar_unlock(dynar); return res; } @@ -409,18 +387,7 @@ static void XBT_INLINE /* not synchronized */ _xbt_dynar_set(xbt_dynar_t dynar, const unsigned long idx, const void *const src) { - - _sanity_check_dynar(dynar); - - _xbt_dynar_expand(dynar, idx + 1); - - if (idx >= dynar->used) { - _xbt_clear_mem(((char * const)dynar->data) + dynar->used * dynar->elmsize, - (idx + 1 - dynar->used)*dynar->elmsize); - dynar->used = idx + 1; - } - - _xbt_dynar_put_elm(dynar, idx, src); + memcpy(_xbt_dynar_set_at_ptr(dynar, idx), src, dynar->elmsize); } /** @brief Set the Nth element of a dynar (expanded if needed). Previous value at this position is NOT freed @@ -460,7 +427,7 @@ xbt_dynar_replace(xbt_dynar_t dynar, if (idx < dynar->used && dynar->free_f) { void *const old_object = _xbt_dynar_elm(dynar, idx); - (*(dynar->free_f)) (old_object); + dynar->free_f(old_object); } _xbt_dynar_set(dynar, idx, object); @@ -675,7 +642,7 @@ static void _dynar_map(const xbt_dynar_t dynar, void_f_pvoid_t const op) for (i = 0; i < used; i++) { char* elm = (char*) data + i * elmsize; - (*op) (elm); + op(elm); } } @@ -1003,7 +970,7 @@ XBT_TEST_UNIT("insert",test_dynar_insert,"Using the xbt_dynar_insert and xbt_dyn "The retrieved value is not the same than the injected one (%d!=%d)", cursor, cpt); } - xbt_test_assert(xbt_dynar_length(d) == 0, + xbt_test_assert(xbt_dynar_is_empty(d), "There is still %lu elements in the dynar after removing everything", xbt_dynar_length(d)); xbt_dynar_free(&d); @@ -1031,7 +998,7 @@ XBT_TEST_UNIT("insert",test_dynar_insert,"Using the xbt_dynar_insert and xbt_dyn "The retrieved value is not the same than the injected one (%d!=%d)", cursor, cpt); } - xbt_test_assert(xbt_dynar_length(d) == 0, + xbt_test_assert(xbt_dynar_is_empty(d), "There is still %lu elements in the dynar after removing everything", xbt_dynar_length(d)); xbt_dynar_free(&d); @@ -1324,7 +1291,7 @@ static void pusher_f(void *a) static void poper_f(void *a) { xbt_dynar_t d = (xbt_dynar_t) a; - int i; + volatile int i; int data; xbt_ex_t e;