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;
}
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;
}
}
if (dynar->free_f) {
_dynar_map(dynar, dynar->free_f);
}
- /*
- free(dynar->data);
-
- dynar->size = 0;
- */
dynar->used = 0;
_dynar_unlock(dynar);
-
- /* dynar->data = NULL; */
}
/**
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;
}
_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
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);
for (i = 0; i < used; i++) {
char* elm = (char*) data + i * elmsize;
- (*op) (elm);
+ op(elm);
}
}
"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);