/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "portable.h" /* SIZEOF_MAX */
#include "xbt/misc.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
static void _dynar_map(const xbt_dynar_t dynar, void_f_pvoid_t const op);
static XBT_INLINE
- void _xbt_clear_mem(void *const ptr, const unsigned long length)
+void _xbt_dynar_resize(xbt_dynar_t dynar, unsigned long new_size)
{
- memset(ptr, 0, length);
+ if (new_size != dynar->size) {
+ dynar->size = new_size;
+ dynar->data = xbt_realloc(dynar->data, new_size * dynar->elmsize);
+ }
}
static XBT_INLINE
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);
}
}
if (object) {
_xbt_dynar_get_elm(object, dynar, idx);
} else if (dynar->free_f) {
- if (dynar->elmsize <= SIZEOF_MAX) {
- char elm[SIZEOF_MAX];
- _xbt_dynar_get_elm(elm, dynar, idx);
- (*dynar->free_f) (elm);
- } else {
- char *elm = malloc(dynar->elmsize);
- _xbt_dynar_get_elm(elm, dynar, idx);
- (*dynar->free_f) (elm);
- free(elm);
- }
+ dynar->free_f(_xbt_dynar_elm(dynar, idx));
}
nb_shift = dynar->used - 1 - idx;
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);
}
- /*
- if (dynar->data)
- free(dynar->data);
-
- dynar->size = 0;
- */
dynar->used = 0;
_dynar_unlock(dynar);
+}
- /* dynar->data = NULL; */
+/** @brief Merge dynar d2 into d1
+ *
+ * \param d1 dynar to keep
+ * \param d2 dynar to merge into d1. This dynar is free at end.
+ */
+void xbt_dynar_merge(xbt_dynar_t *d1, xbt_dynar_t *d2)
+{
+ if((*d1)->elmsize != (*d2)->elmsize)
+ xbt_die("Element size must are not equal");
+
+ const unsigned long elmsize = (*d1)->elmsize;
+
+ void *ptr = _xbt_dynar_elm((*d2), 0);
+ _xbt_dynar_resize(*d1, (*d1)->size + (*d2)->size);
+ void *elm = _xbt_dynar_elm((*d1), (*d1)->used);
+
+ memcpy(elm, ptr, ((*d2)->size)*elmsize);
+ (*d1)->used += (*d2)->used;
+ (*d2)->used = 0;
+ xbt_dynar_free(d2);
}
/**
*/
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);
}
return (dynar ? (unsigned long) dynar->used : (unsigned long) 0);
}
-/**@brief check if a dynar is empty
+ /**@brief check if a dynar is empty
*
*\param dynar the dynat we want to check
*/
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_clear_mem(((char * const)dynar->data) + dynar->used * dynar->elmsize,
- (idx + 1 - dynar->used)*dynar->elmsize);
+ _xbt_dynar_expand(dynar, idx + 1);
+ if (idx > dynar->used) {
+ memset(_xbt_dynar_elm(dynar, dynar->used), 0,
+ (idx - 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);
}
}
*/
XBT_INLINE void * xbt_dynar_to_array (xbt_dynar_t dynar)
{
- void * res;
- void * last = xbt_new0(char,dynar->elmsize);
- xbt_dynar_push(dynar, last);
- free(last);
- res = dynar->data;
- free(dynar);
- return res;
+ void *res;
+ xbt_dynar_shrink(dynar, 1);
+ memset(xbt_dynar_push_ptr(dynar), 0, dynar->elmsize);
+ res = dynar->data;
+ if (dynar->mutex)
+ xbt_mutex_destroy(dynar->mutex);
+ free(dynar);
+ return res;
}
/*
}
if((d1->elmsize)!=(d2->elmsize))
{
- XBT_DEBUG("Size of elmsize d1=%ld d2=%ld",d1->elmsize,d2->elmsize);
+ XBT_DEBUG("Size of elmsize d1=%lu d2=%lu",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_DEBUG("Size of dynar d1=%lu d2=%lu",xbt_dynar_length(d1),xbt_dynar_length(d2));
xbt_dynar_free(&d2);
return 1;
}
for (cursor = 0; cursor < NB_ELEM; cursor++) {
iptr = xbt_dynar_get_ptr(d, cursor);
xbt_test_assert(cursor == *iptr,
- "The retrieved value is not the same than the injected one (%d!=%d)",
+ "The retrieved value is not the same than the injected one (%u!=%d)",
cursor, cpt);
}
/* 3. Traverse the dynar using the neat macro to that extend */
xbt_dynar_foreach(d, cursor, cpt) {
xbt_test_assert(cursor == cpt,
- "The retrieved value is not the same than the injected one (%d!=%d)",
+ "The retrieved value is not the same than the injected one (%u!=%d)",
cursor, cpt);
}
/* end_of_traversal */
/* 3. Traverse the dynar */
xbt_dynar_foreach(d, cursor, cpt) {
xbt_test_assert(cursor == cpt,
- "The retrieved value is not the same than the injected one (%d!=%d)",
+ "The retrieved value is not the same than the injected one (%u!=%d)",
cursor, cpt);
}
/* end_of_traversal */
xbt_dynar_set_as(d, cpt, int, cpt);
xbt_dynar_foreach(d, cursor, cpt)
xbt_test_assert(cursor == cpt,
- "The retrieved value is not the same than the injected one (%d!=%d)",
+ "The retrieved value is not the same than the injected one (%u!=%d)",
cursor, cpt);
for (cpt = 0; cpt < NB_ELEM; cpt++) {
int val;
xbt_dynar_remove_at(d,0,&val);
xbt_test_assert(cpt == val,
- "The retrieved value is not the same than the injected one (%d!=%d)",
+ "The retrieved value is not the same than the injected one (%u!=%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);
/* 3. Traverse the dynar */
xbt_dynar_foreach(d, cursor, cpt) {
xbt_test_assert(cursor == cpt,
- "The retrieved value is not the same than the injected one (%d!=%d)",
+ "The retrieved value is not the same than the injected one (%u!=%d)",
cursor, cpt);
}
/* end_of_traversal */
int val;
xbt_dynar_remove_at(d,xbt_dynar_length(d)-1,&val);
xbt_test_assert(cpt == val,
- "The retrieved value is not the same than the injected one (%d!=%d)",
+ "The retrieved value is not the same than the injected one (%u!=%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);
}
/* 2. Traverse the dynar with the macro */
xbt_dynar_foreach(d, iter, s1) {
- sprintf(buf, "%d", NB_ELEM - iter - 1);
+ sprintf(buf, "%u", NB_ELEM - iter - 1);
xbt_test_assert(!strcmp(buf, s1),
"The retrieved value is not the same than the injected one (%s!=%s)",
buf, s1);