X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a158b7a4db45818e8f62b7bdac7f0d1bf36d140..f84be00c4ed0cb612fcad0a07c40574bcae2cf35:/src/xbt/dynar.c diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c index 9d5de7d503..437a47f741 100644 --- a/src/xbt/dynar.c +++ b/src/xbt/dynar.c @@ -35,19 +35,19 @@ static XBT_INLINE void _dynar_unlock(xbt_dynar_t dynar) static XBT_INLINE void _sanity_check_dynar(xbt_dynar_t dynar) { - xbt_assert0(dynar, "dynar is NULL"); + xbt_assert(dynar, "dynar is NULL"); } static XBT_INLINE void _sanity_check_idx(int idx) { - xbt_assert1(idx >= 0, "dynar idx(=%d) < 0", (int) (idx)); + xbt_assert(idx >= 0, "dynar idx(=%d) < 0", (int) (idx)); } static XBT_INLINE void _check_inbound_idx(xbt_dynar_t dynar, int idx) { if (idx < 0 || idx >= dynar->used) { _dynar_unlock(dynar); - THROW2(bound_error, idx, + THROWF(bound_error, idx, "dynar is not that long. You asked %d, but it's only %lu long", (int) (idx), (unsigned long) dynar->used); } @@ -58,7 +58,7 @@ static XBT_INLINE void _check_sloppy_inbound_idx(xbt_dynar_t dynar, { if (idx > dynar->used) { _dynar_unlock(dynar); - THROW2(bound_error, idx, + THROWF(bound_error, idx, "dynar is not that long. You asked %d, but it's only %lu long (could have been equal to it)", (int) (idx), (unsigned long) dynar->used); } @@ -68,7 +68,7 @@ static XBT_INLINE void _check_populated_dynar(xbt_dynar_t dynar) { if (dynar->used == 0) { _dynar_unlock(dynar); - THROW1(bound_error, 0, "dynar %p is empty", dynar); + THROWF(bound_error, 0, "dynar %p is empty", dynar); } } @@ -80,36 +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) { - char *const old_data = (char *) dynar->data; - - const unsigned long elmsize = dynar->elmsize; - - const unsigned long used = dynar->used; - const unsigned long used_length = used * elmsize; - - const unsigned long new_size = - nb > (2 * (old_size + 1)) ? nb : (2 * (old_size + 1)); - const unsigned long new_length = new_size * elmsize; - char *const new_data = (char *) xbt_malloc0(elmsize * new_size); - - XBT_DEBUG("expand %p from %lu to %lu elements", (void *) dynar, - (unsigned long) old_size, nb); - - if (old_data) { - memcpy(new_data, old_data, used_length); - free(old_data); - } - - _xbt_clear_mem(new_data + used_length, new_length - used_length); - - dynar->size = new_size; - dynar->data = new_data; + const unsigned long expand = 2 * (old_size + 1); + _xbt_dynar_resize(dynar, (nb > expand ? nb : expand)); + XBT_DEBUG("expand %p from %lu to %lu elements", + dynar, old_size, dynar->size); } } @@ -161,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); } } @@ -237,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; } } @@ -267,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; */ } /** @@ -297,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); } @@ -327,7 +294,8 @@ XBT_INLINE void xbt_dynar_free(xbt_dynar_t * dynar) /** \brief free a dynar passed as void* (handy to store dynar in dynars or dict) */ void xbt_dynar_free_voidp(void *d) { - xbt_dynar_free((xbt_dynar_t *) d); + xbt_dynar_t dynar = (xbt_dynar_t)d; + xbt_dynar_free(&dynar); } /** @brief Count of dynar's elements @@ -390,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; } @@ -417,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 @@ -468,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); @@ -570,7 +529,7 @@ unsigned int xbt_dynar_search(xbt_dynar_t const dynar, void *const elem) } _dynar_unlock(dynar); - THROW2(not_found_error, 0, "Element %p not part of dynar %p", elem, + THROWF(not_found_error, 0, "Element %p not part of dynar %p", elem, dynar); } @@ -582,7 +541,8 @@ int xbt_dynar_member(xbt_dynar_t const dynar, void *const elem) TRY { xbt_dynar_search(dynar, elem); - } CATCH(e) { + } + CATCH(e) { if (e.category == not_found_error) { xbt_ex_free(e); return 0; @@ -675,13 +635,14 @@ XBT_INLINE void xbt_dynar_shift(xbt_dynar_t const dynar, void *const dst) static void _dynar_map(const xbt_dynar_t dynar, void_f_pvoid_t const op) { - char elm[SIZEOF_MAX]; + char *const data = (char *) dynar->data; + const unsigned long elmsize = dynar->elmsize; const unsigned long used = dynar->used; - unsigned long i = 0; + unsigned long i; for (i = 0; i < used; i++) { - _xbt_dynar_get_elm(elm, dynar, i); - (*op) (elm); + char* elm = (char*) data + i * elmsize; + op(elm); } } @@ -743,8 +704,11 @@ XBT_INLINE void xbt_dynar_sort(xbt_dynar_t dynar, _dynar_lock(dynar); +#ifdef HAVE_MERGESORT + mergesort(dynar->data, dynar->used, dynar->elmsize, compar_fn); +#else qsort(dynar->data, dynar->used, dynar->elmsize, compar_fn); - +#endif _dynar_unlock(dynar); } @@ -775,16 +739,19 @@ XBT_INLINE int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2, if((!d1) || (!d2)) { XBT_DEBUG("NULL dynar d1=%p d2=%p",d1,d2); + xbt_dynar_free(&d2); return 1; } if((d1->elmsize)!=(d2->elmsize)) { XBT_DEBUG("Size of elmsize d1=%ld d2=%ld",d1->elmsize,d2->elmsize); + xbt_dynar_free(&d2); return 1; // xbt_die } if(xbt_dynar_length(d1) != xbt_dynar_length(d2)) { XBT_DEBUG("Size of dynar d1=%ld d2=%ld",xbt_dynar_length(d1),xbt_dynar_length(d2)); + xbt_dynar_free(&d2); return 1; } @@ -794,8 +761,12 @@ XBT_INLINE int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2, void *data1 = xbt_dynar_get_as(d1, i, void *); void *data2 = xbt_dynar_get_as(d2, i, void *); XBT_DEBUG("link[%d] d1=%p d2=%p",i,data1,data2); - if(compar(data1,data2)) return 1; + if(compar(data1,data2)){ + xbt_dynar_free(&d2); + return 1; + } } + xbt_dynar_free(&d2); return 0; } @@ -999,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); @@ -1027,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); @@ -1320,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;