const unsigned long old_size = dynar->size;
if (nb > old_size) {
- char *const old_data = (char *) dynar->data;
-
+ void *const old_data = dynar->data;
const unsigned long elmsize = dynar->elmsize;
+ const unsigned long old_length = old_size * 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 expand = 2 * (old_size + 1);
+ const unsigned long new_size = (nb > expand ? nb : expand);
const unsigned long new_length = new_size * elmsize;
- char *const new_data = (char *) xbt_malloc0(elmsize * new_size);
+ void *const new_data = xbt_realloc(old_data, new_length);
- XBT_DEBUG("expand %p from %lu to %lu elements", (void *) dynar,
- (unsigned long) old_size, nb);
+ XBT_DEBUG("expand %p from %lu to %lu elements", dynar, old_size, new_size);
- if (old_data) {
- memcpy(new_data, old_data, used_length);
- free(old_data);
- }
-
- _xbt_clear_mem(new_data + used_length, new_length - used_length);
+ _xbt_clear_mem((char *)new_data + old_length, new_length - old_length);
dynar->size = new_size;
dynar->data = new_data;
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);
}
}
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;
}
}
_dynar_map(dynar, dynar->free_f);
}
/*
- if (dynar->data)
free(dynar->data);
dynar->size = 0;
_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);
+ _dynar_unlock(dynar);
+
return res;
}
_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;
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);
TRY {
xbt_dynar_search(dynar, elem);
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category == not_found_error) {
xbt_ex_free(e);
return 0;
for (i = 0; i < used; i++) {
char* elm = (char*) data + i * elmsize;
- (*op) (elm);
+ op(elm);
}
}
_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);
}
"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);
"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);
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;