X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/91acf4bb9f8445fc53fb4e252a36f86694be6a98..6f96af1403cf082547c5a77abaf61d1ceddf3057:/src/xbt/dynar.c?ds=inline
diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index 45c3190c60..0574b41ea7 100644
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -6,7 +6,6 @@
/* 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"
@@ -35,19 +34,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 +57,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,16 +67,19 @@ 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);
}
}
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
@@ -86,30 +88,10 @@ static XBT_INLINE
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);
-
- DEBUG3("expend %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);
}
}
@@ -158,16 +140,7 @@ _xbt_dynar_remove_at(xbt_dynar_t const dynar,
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;
@@ -183,7 +156,7 @@ _xbt_dynar_remove_at(xbt_dynar_t const dynar,
void xbt_dynar_dump(xbt_dynar_t dynar)
{
- INFO5("Dynar dump: size=%lu; used=%lu; elmsize=%lu; data=%p; free_f=%p",
+ XBT_INFO("Dynar dump: size=%lu; used=%lu; elmsize=%lu; data=%p; free_f=%p",
dynar->size, dynar->used, dynar->elmsize, dynar->data,
dynar->free_f);
}
@@ -237,18 +210,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;
}
}
@@ -263,21 +229,35 @@ XBT_INLINE void xbt_dynar_reset(xbt_dynar_t const dynar)
_sanity_check_dynar(dynar);
- DEBUG1("Reset the dynar %p", (void *) dynar);
+ XBT_DEBUG("Reset the dynar %p", (void *) 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);
+}
+
+/** @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);
- /* dynar->data = NULL; */
+ memcpy(elm, ptr, ((*d2)->size)*elmsize);
+ (*d1)->used += (*d2)->used;
+ (*d2)->used = 0;
+ xbt_dynar_free(d2);
}
/**
@@ -297,15 +277,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 +300,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
@@ -339,7 +313,7 @@ XBT_INLINE unsigned long xbt_dynar_length(const xbt_dynar_t 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
*/
@@ -390,25 +364,41 @@ XBT_INLINE void *xbt_dynar_get_ptr(const xbt_dynar_t dynar,
return res;
}
-
-static void XBT_INLINE /* not synchronized */
-_xbt_dynar_set(xbt_dynar_t dynar,
- const unsigned long idx, const void *const src)
+/* not synchronized */
+static XBT_INLINE void *_xbt_dynar_set_at_ptr(const xbt_dynar_t dynar,
+ const unsigned long idx)
{
-
_sanity_check_dynar(dynar);
- _sanity_check_idx(idx);
-
- _xbt_dynar_expand(dynar, idx + 1);
if (idx >= dynar->used) {
+ _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;
}
+ 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_put_elm(dynar, idx, src);
+static void XBT_INLINE /* not synchronized */
+_xbt_dynar_set(xbt_dynar_t dynar,
+ const unsigned long idx, const void *const src)
+{
+ memcpy(_xbt_dynar_set_at_ptr(dynar, idx), src, dynar->elmsize);
}
-/** @brief Set the Nth element of a dynar (expended if needed). Previous value at this position is NOT freed
+/** @brief Set the Nth element of a dynar (expanded if needed). Previous value at this position is NOT freed
*
* \param dynar information dealer
* \param idx index of the slot we want to modify
@@ -425,7 +415,7 @@ XBT_INLINE void xbt_dynar_set(xbt_dynar_t dynar, const int idx,
_dynar_unlock(dynar);
}
-/** @brief Set the Nth element of a dynar (expended if needed). Previous value is freed
+/** @brief Set the Nth element of a dynar (expanded if needed). Previous value is freed
*
* \param dynar
* \param idx
@@ -441,12 +431,11 @@ xbt_dynar_replace(xbt_dynar_t dynar,
{
_dynar_lock(dynar);
_sanity_check_dynar(dynar);
- _sanity_check_idx(idx);
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);
@@ -459,7 +448,7 @@ static XBT_INLINE void *_xbt_dynar_insert_at_ptr(xbt_dynar_t const dynar,
void *res;
unsigned long old_used;
unsigned long new_used;
- unsigned long nb_shift;
+ long nb_shift;
_sanity_check_dynar(dynar);
_sanity_check_idx(idx);
@@ -471,9 +460,10 @@ static XBT_INLINE void *_xbt_dynar_insert_at_ptr(xbt_dynar_t const dynar,
nb_shift = old_used - idx;
- if (nb_shift)
+ if (nb_shift>0) {
memmove(_xbt_dynar_elm(dynar, idx + 1),
_xbt_dynar_elm(dynar, idx), nb_shift * dynar->elmsize);
+ }
dynar->used = new_used;
res = _xbt_dynar_elm(dynar, idx);
@@ -495,7 +485,7 @@ void *xbt_dynar_insert_at_ptr(xbt_dynar_t const dynar, const int idx)
return res;
}
-/** @brief Set the Nth dynar's element, expending the dynar and sliding the previous values to the right
+/** @brief Set the Nth dynar's element, expanding the dynar and sliding the previous values to the right
*
* Set the Nth element of a dynar, expanding the dynar if needed, and
* moving the previously existing value and all subsequent ones to one
@@ -547,7 +537,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);
}
@@ -559,7 +549,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;
@@ -609,7 +600,7 @@ XBT_INLINE void *xbt_dynar_pop_ptr(xbt_dynar_t const dynar)
_dynar_lock(dynar);
_check_populated_dynar(dynar);
- DEBUG1("Pop %p", (void *) dynar);
+ XBT_DEBUG("Pop %p", (void *) dynar);
dynar->used--;
res = _xbt_dynar_elm(dynar, dynar->used);
_dynar_unlock(dynar);
@@ -621,7 +612,7 @@ XBT_INLINE void xbt_dynar_pop(xbt_dynar_t const dynar, void *const dst)
{
/* sanity checks done by remove_at */
- DEBUG1("Pop %p", (void *) dynar);
+ XBT_DEBUG("Pop %p", (void *) dynar);
_dynar_lock(dynar);
_xbt_dynar_remove_at(dynar, dynar->used - 1, dst);
_dynar_unlock(dynar);
@@ -652,13 +643,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);
}
}
@@ -708,6 +700,7 @@ XBT_INLINE void xbt_dynar_cursor_unlock(xbt_dynar_t dynar)
/** @brief Sorts a dynar according to the function compar_fn
*
+ * \param dynar the dynar to sort
* \param compar_fn comparison function of type (int (compar_fn*) (void*) (void*)).
*
* Remark: if the elements stored in the dynar are structures, the compar_fn
@@ -719,11 +712,30 @@ 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);
}
+/** @brief Transform a dynar into a NULL terminated array
+ *
+ * \param dynar the dynar to transform
+ */
+XBT_INLINE void * xbt_dynar_to_array (xbt_dynar_t dynar)
+{
+ 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;
+}
+
/*
* Return 0 if d1 and d2 are equal and 1 if not equal
*/
@@ -733,17 +745,37 @@ XBT_INLINE int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2,
int i ;
int size;
if((!d1) && (!d2)) return 0;
- if((!d1) || (!d2)) return 1;
- if((d1->elmsize)!=(d2->elmsize)) return 1; // xbt_die
- if(xbt_dynar_length(d1) != xbt_dynar_length(d2)) return 1;
+ 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=%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=%lu d2=%lu",xbt_dynar_length(d1),xbt_dynar_length(d2));
+ xbt_dynar_free(&d2);
+ return 1;
+ }
size = xbt_dynar_length(d1);
for(i=0;i= 0; cpt--) {
xbt_dynar_shift(d, &i);
- xbt_test_assert2(i == cpt,
+ xbt_test_assert(i == cpt,
"The retrieved value is not the same than the injected one in the middle (%d!=%d)",
i, cpt);
}
for (cpt = 2500; cpt < NB_ELEM; cpt++) {
xbt_dynar_shift(d, &i);
- xbt_test_assert2(i == cpt,
+ xbt_test_assert(i == cpt,
"The retrieved value is not the same than the injected one at the end (%d!=%d)",
i, cpt);
}
@@ -890,7 +922,7 @@ XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers")
xbt_dynar_free(&d); /* free the struct twice here to check that it's ok, but freeing it only once */
/* in your code is naturally the way to go outside a regression test */
- xbt_test_add1("==== Push %d int, remove 2000-4000. free the rest",
+ xbt_test_add("==== Push %d int, remove 2000-4000. free the rest",
NB_ELEM);
d = xbt_dynar_new(sizeof(int), NULL);
for (cpt = 0; cpt < NB_ELEM; cpt++)
@@ -898,15 +930,89 @@ XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers")
for (cpt = 2000; cpt < 4000; cpt++) {
xbt_dynar_remove_at(d, 2000, &i);
- xbt_test_assert2(i == cpt,
+ xbt_test_assert(i == cpt,
"Remove a bad value. Got %d, expected %d", i, cpt);
- DEBUG2("remove %d, length=%lu", cpt, xbt_dynar_length(d));
+ XBT_DEBUG("remove %d, length=%lu", cpt, xbt_dynar_length(d));
}
xbt_dynar_free(&d); /* This code is used both as example and as regression test, so we try to */
xbt_dynar_free(&d); /* free the struct twice here to check that it's ok, but freeing it only once */
/* in your code is naturally the way to go outside a regression test */
}
+/*******************************************************************************/
+/*******************************************************************************/
+/*******************************************************************************/
+XBT_TEST_UNIT("insert",test_dynar_insert,"Using the xbt_dynar_insert and xbt_dynar_remove functions")
+{
+ xbt_dynar_t d = xbt_dynar_new(sizeof(unsigned int), NULL);
+ unsigned int cursor;
+ int cpt;
+
+ xbt_test_add("==== Insert %d int, traverse them, remove them",NB_ELEM);
+ /* Populate_ints [doxygen cruft] */
+ /* 1. Populate the dynar */
+ for (cpt = 0; cpt < NB_ELEM; cpt++) {
+ xbt_dynar_insert_at(d, cpt, &cpt);
+ xbt_test_log("Push %d, length=%lu", cpt, xbt_dynar_length(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 (%u!=%d)",
+ cursor, cpt);
+ }
+ /* end_of_traversal */
+
+ /* Re-fill with the same values using set_as (and re-verify) */
+ for (cpt = 0; cpt < NB_ELEM; cpt++)
+ 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 (%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 (%u!=%d)",
+ cursor, cpt);
+ }
+ 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);
+
+ /* ********************* */
+ xbt_test_add("==== Insert %d int in reverse order, traverse them, remove them",NB_ELEM);
+ d = xbt_dynar_new(sizeof(int), NULL);
+ for (cpt = NB_ELEM-1; cpt >=0; cpt--) {
+ xbt_dynar_replace(d, cpt, &cpt);
+ xbt_test_log("Push %d, length=%lu", cpt, xbt_dynar_length(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 (%u!=%d)",
+ cursor, cpt);
+ }
+ /* end_of_traversal */
+
+ for (cpt =NB_ELEM-1; cpt >=0; cpt--) {
+ 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 (%u!=%d)",
+ cursor, cpt);
+ }
+ 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);
+}
+
/*******************************************************************************/
/*******************************************************************************/
/*******************************************************************************/
@@ -917,17 +1023,17 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles")
unsigned int cursor;
double d1, d2;
- xbt_test_add0("==== Traverse the empty dynar");
+ xbt_test_add("==== Traverse the empty dynar");
d = xbt_dynar_new(sizeof(int), NULL);
xbt_dynar_foreach(d, cursor, cpt) {
- xbt_test_assert0(FALSE,
+ xbt_test_assert(FALSE,
"Damnit, there is something in the empty dynar");
}
xbt_dynar_free(&d); /* This code is used both as example and as regression test, so we try to */
xbt_dynar_free(&d); /* free the struct twice here to check that it's ok, but freeing it only once */
/* in your code is naturally the way to go outside a regression test */
- xbt_test_add0("==== Push/shift 5000 doubles");
+ xbt_test_add("==== Push/shift 5000 doubles");
d = xbt_dynar_new(sizeof(double), NULL);
for (cpt = 0; cpt < 5000; cpt++) {
d1 = (double) cpt;
@@ -935,14 +1041,14 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles")
}
xbt_dynar_foreach(d, cursor, d2) {
d1 = (double) cursor;
- xbt_test_assert2(d1 == d2,
+ xbt_test_assert(d1 == d2,
"The retrieved value is not the same than the injected one (%f!=%f)",
d1, d2);
}
for (cpt = 0; cpt < 5000; cpt++) {
d1 = (double) cpt;
xbt_dynar_shift(d, &d2);
- xbt_test_assert2(d1 == d2,
+ xbt_test_assert(d1 == d2,
"The retrieved value is not the same than the injected one (%f!=%f)",
d1, d2);
}
@@ -950,7 +1056,7 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles")
xbt_dynar_free(&d); /* free the struct twice here to check that it's ok, but freeing it only once */
/* in your code is naturally the way to go outside a regression test */
- xbt_test_add0("==== Unshift/pop 5000 doubles");
+ xbt_test_add("==== Unshift/pop 5000 doubles");
d = xbt_dynar_new(sizeof(double), NULL);
for (cpt = 0; cpt < 5000; cpt++) {
d1 = (double) cpt;
@@ -959,7 +1065,7 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles")
for (cpt = 0; cpt < 5000; cpt++) {
d1 = (double) cpt;
xbt_dynar_pop(d, &d2);
- xbt_test_assert2(d1 == d2,
+ xbt_test_assert(d1 == d2,
"The retrieved value is not the same than the injected one (%f!=%f)",
d1, d2);
}
@@ -969,7 +1075,7 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles")
- xbt_test_add0
+ xbt_test_add
("==== Push 5000 doubles, insert 1000 doubles in the middle, shift everything");
d = xbt_dynar_new(sizeof(double), NULL);
for (cpt = 0; cpt < 5000; cpt++) {
@@ -984,22 +1090,22 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles")
for (cpt = 0; cpt < 2500; cpt++) {
d1 = (double) cpt;
xbt_dynar_shift(d, &d2);
- xbt_test_assert2(d1 == d2,
+ xbt_test_assert(d1 == d2,
"The retrieved value is not the same than the injected one at the begining (%f!=%f)",
d1, d2);
- DEBUG2("Pop %d, length=%lu", cpt, xbt_dynar_length(d));
+ XBT_DEBUG("Pop %d, length=%lu", cpt, xbt_dynar_length(d));
}
for (cpt = 999; cpt >= 0; cpt--) {
d1 = (double) cpt;
xbt_dynar_shift(d, &d2);
- xbt_test_assert2(d1 == d2,
+ xbt_test_assert(d1 == d2,
"The retrieved value is not the same than the injected one in the middle (%f!=%f)",
d1, d2);
}
for (cpt = 2500; cpt < 5000; cpt++) {
d1 = (double) cpt;
xbt_dynar_shift(d, &d2);
- xbt_test_assert2(d1 == d2,
+ xbt_test_assert(d1 == d2,
"The retrieved value is not the same than the injected one at the end (%f!=%f)",
d1, d2);
}
@@ -1008,7 +1114,7 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles")
/* in your code is naturally the way to go outside a regression test */
- xbt_test_add0("==== Push 5000 double, remove 2000-4000. free the rest");
+ xbt_test_add("==== Push 5000 double, remove 2000-4000. free the rest");
d = xbt_dynar_new(sizeof(double), NULL);
for (cpt = 0; cpt < 5000; cpt++) {
d1 = (double) cpt;
@@ -1017,7 +1123,7 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles")
for (cpt = 2000; cpt < 4000; cpt++) {
d1 = (double) cpt;
xbt_dynar_remove_at(d, 2000, &d2);
- xbt_test_assert2(d1 == d2,
+ xbt_test_assert(d1 == d2,
"Remove a bad value. Got %f, expected %f", d2, d1);
}
xbt_dynar_free(&d); /* This code is used both as example and as regression test, so we try to */
@@ -1039,17 +1145,17 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings")
char buf[1024];
char *s1, *s2;
- xbt_test_add0("==== Traverse the empty dynar");
+ xbt_test_add("==== Traverse the empty dynar");
d = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
xbt_dynar_foreach(d, iter, s1) {
- xbt_test_assert0(FALSE,
+ xbt_test_assert(FALSE,
"Damnit, there is something in the empty dynar");
}
xbt_dynar_free(&d); /* This code is used both as example and as regression test, so we try to */
xbt_dynar_free(&d); /* free the struct twice here to check that it's ok, but freeing it only once */
/* in your code is naturally the way to go outside a regression test */
- xbt_test_add1("==== Push %d strings, set them again 3 times, shift them",
+ xbt_test_add("==== Push %d strings, set them again 3 times, shift them",
NB_ELEM);
/* Populate_str [doxygen cruft] */
d = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
@@ -1077,7 +1183,7 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings")
for (cpt = 0; cpt < NB_ELEM; cpt++) {
sprintf(buf, "%d", cpt);
xbt_dynar_shift(d, &s2);
- xbt_test_assert2(!strcmp(buf, s2),
+ xbt_test_assert(!strcmp(buf, s2),
"The retrieved value is not the same than the injected one (%s!=%s)",
buf, s2);
free(s2);
@@ -1086,7 +1192,7 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings")
xbt_dynar_free(&d); /* free the struct twice here to check that it's ok, but freeing it only once */
/* in your code is naturally the way to go outside a regression test */
- xbt_test_add1("==== Unshift, traverse and pop %d strings", NB_ELEM);
+ xbt_test_add("==== Unshift, traverse and pop %d strings", NB_ELEM);
d = xbt_dynar_new(sizeof(char **), &xbt_free_ref);
for (cpt = 0; cpt < NB_ELEM; cpt++) {
sprintf(buf, "%d", cpt);
@@ -1095,8 +1201,8 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings")
}
/* 2. Traverse the dynar with the macro */
xbt_dynar_foreach(d, iter, s1) {
- sprintf(buf, "%d", NB_ELEM - iter - 1);
- xbt_test_assert2(!strcmp(buf, s1),
+ 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);
}
@@ -1104,7 +1210,7 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings")
for (cpt = 0; cpt < NB_ELEM; cpt++) {
sprintf(buf, "%d", cpt);
xbt_dynar_pop(d, &s2);
- xbt_test_assert2(!strcmp(buf, s2),
+ xbt_test_assert(!strcmp(buf, s2),
"The retrieved value is not the same than the injected one (%s!=%s)",
buf, s2);
free(s2);
@@ -1115,7 +1221,7 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings")
/* in your code is naturally the way to go outside a regression test */
- xbt_test_add2
+ xbt_test_add
("==== Push %d strings, insert %d strings in the middle, shift everything",
NB_ELEM, NB_ELEM / 5);
d = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
@@ -1133,7 +1239,7 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings")
for (cpt = 0; cpt < NB_ELEM / 2; cpt++) {
sprintf(buf, "%d", cpt);
xbt_dynar_shift(d, &s2);
- xbt_test_assert2(!strcmp(buf, s2),
+ xbt_test_assert(!strcmp(buf, s2),
"The retrieved value is not the same than the injected one at the begining (%s!=%s)",
buf, s2);
free(s2);
@@ -1141,7 +1247,7 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings")
for (cpt = (NB_ELEM / 5) - 1; cpt >= 0; cpt--) {
sprintf(buf, "%d", cpt);
xbt_dynar_shift(d, &s2);
- xbt_test_assert2(!strcmp(buf, s2),
+ xbt_test_assert(!strcmp(buf, s2),
"The retrieved value is not the same than the injected one in the middle (%s!=%s)",
buf, s2);
free(s2);
@@ -1149,7 +1255,7 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings")
for (cpt = NB_ELEM / 2; cpt < NB_ELEM; cpt++) {
sprintf(buf, "%d", cpt);
xbt_dynar_shift(d, &s2);
- xbt_test_assert2(!strcmp(buf, s2),
+ xbt_test_assert(!strcmp(buf, s2),
"The retrieved value is not the same than the injected one at the end (%s!=%s)",
buf, s2);
free(s2);
@@ -1159,7 +1265,7 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings")
/* in your code is naturally the way to go outside a regression test */
- xbt_test_add3("==== Push %d strings, remove %d-%d. free the rest",
+ xbt_test_add("==== Push %d strings, remove %d-%d. free the rest",
NB_ELEM, 2 * (NB_ELEM / 5), 4 * (NB_ELEM / 5));
d = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
for (cpt = 0; cpt < NB_ELEM; cpt++) {
@@ -1170,7 +1276,7 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings")
for (cpt = 2 * (NB_ELEM / 5); cpt < 4 * (NB_ELEM / 5); cpt++) {
sprintf(buf, "%d", cpt);
xbt_dynar_remove_at(d, 2 * (NB_ELEM / 5), &s2);
- xbt_test_assert2(!strcmp(buf, s2),
+ xbt_test_assert(!strcmp(buf, s2),
"Remove a bad value. Got %s, expected %s", s2, buf);
free(s2);
}
@@ -1194,7 +1300,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;
@@ -1220,7 +1326,7 @@ XBT_TEST_UNIT("synchronized int", test_dynar_sync_int, "Synchronized dynars of i
xbt_dynar_t d;
xbt_thread_t pusher, poper;
- xbt_test_add0("==== Have a pusher and a popper on the dynar");
+ xbt_test_add("==== Have a pusher and a popper on the dynar");
d = xbt_dynar_new_sync(sizeof(int), NULL);
pusher = xbt_thread_create("pusher", pusher_f, d, 0 /*not joinable */ );
poper = xbt_thread_create("poper", poper_f, d, 0 /*not joinable */ );