X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1c712008ba8d59e1f90b173a86a8bbeef5edbaed..621567e097f236cdb81007637323ecc23ac26d45:/src/xbt/dynar.c diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c index c84b2ee084..7c3bcc6eff 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); } } @@ -98,7 +98,7 @@ static XBT_INLINE const unsigned long new_length = new_size * elmsize; char *const new_data = (char *) xbt_malloc0(elmsize * new_size); - DEBUG3("expand %p from %lu to %lu elements", (void *) dynar, + XBT_DEBUG("expand %p from %lu to %lu elements", (void *) dynar, (unsigned long) old_size, nb); if (old_data) { @@ -183,7 +183,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); } @@ -263,7 +263,7 @@ 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); } @@ -327,7 +327,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 @@ -570,7 +571,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); } @@ -632,7 +633,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); @@ -644,7 +645,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); @@ -675,12 +676,13 @@ 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); + char* elm = (char*) data + i * elmsize; (*op) (elm); } } @@ -743,8 +745,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); } @@ -754,11 +759,13 @@ XBT_INLINE void xbt_dynar_sort(xbt_dynar_t dynar, */ 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); - dynar->used--; - return dynar->data; + res = dynar->data; + free(dynar); + return res; } /* @@ -772,17 +779,20 @@ XBT_INLINE int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2, if((!d1) && (!d2)) return 0; if((!d1) || (!d2)) { - DEBUG2("NULL dynar d1=%p d2=%p",d1,d2); + XBT_DEBUG("NULL dynar d1=%p d2=%p",d1,d2); + xbt_dynar_free(&d2); return 1; } if((d1->elmsize)!=(d2->elmsize)) { - DEBUG2("Size of elmsize d1=%ld d2=%ld",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)) { - DEBUG2("Size of dynar d1=%ld d2=%ld",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; } @@ -791,9 +801,13 @@ 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 *); - DEBUG3("link[%d] d1=%p d2=%p",i,data1,data2); - if(compar(data1,data2)) return 1; + XBT_DEBUG("link[%d] d1=%p d2=%p",i,data1,data2); + if(compar(data1,data2)){ + xbt_dynar_free(&d2); + return 1; + } } + xbt_dynar_free(&d2); return 0; } @@ -813,16 +827,16 @@ XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers") unsigned int cursor; int *iptr; - 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, i) { - xbt_assert0(0, "Damnit, there is something in the empty dynar"); + xbt_die( "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 + xbt_test_add ("==== Push %d int, set them again 3 times, traverse them, shift them", NB_ELEM); /* Populate_ints [doxygen cruft] */ @@ -831,20 +845,20 @@ XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers") for (cpt = 0; cpt < NB_ELEM; cpt++) { xbt_dynar_push_as(d, int, cpt); /* This is faster (and possible only with scalars) */ /* xbt_dynar_push(d,&cpt); This would also work */ - xbt_test_log2("Push %d, length=%lu", cpt, xbt_dynar_length(d)); + xbt_test_log("Push %d, length=%lu", cpt, xbt_dynar_length(d)); } /* 2. Traverse manually the dynar */ for (cursor = 0; cursor < NB_ELEM; cursor++) { iptr = xbt_dynar_get_ptr(d, cursor); - xbt_test_assert2(cursor == *iptr, + xbt_test_assert(cursor == *iptr, "The retrieved value is not the same than the injected one (%d!=%d)", cursor, cpt); } /* 3. Traverse the dynar using the neat macro to that extend */ xbt_dynar_foreach(d, cursor, cpt) { - xbt_test_assert2(cursor == cpt, + xbt_test_assert(cursor == cpt, "The retrieved value is not the same than the injected one (%d!=%d)", cursor, cpt); } @@ -862,12 +876,12 @@ XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers") cpt = 0; xbt_dynar_foreach(d, cursor, i) { - xbt_test_assert2(i == cpt, + xbt_test_assert(i == cpt, "The retrieved value is not the same than the injected one (%d!=%d)", i, cpt); cpt++; } - xbt_test_assert2(cpt == NB_ELEM, + xbt_test_assert(cpt == NB_ELEM, "Cannot retrieve my %d values. Last got one is %d", NB_ELEM, cpt); @@ -875,10 +889,10 @@ XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers") /* 4. Shift all the values */ for (cpt = 0; 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 (%d!=%d)", i, cpt); - xbt_test_log2("Pop %d, length=%lu", cpt, xbt_dynar_length(d)); + xbt_test_log("Pop %d, length=%lu", cpt, xbt_dynar_length(d)); } /* 5. Free the resources */ @@ -886,53 +900,53 @@ 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("==== Unshift/pop %d int", NB_ELEM); + xbt_test_add("==== Unshift/pop %d int", NB_ELEM); d = xbt_dynar_new(sizeof(int), NULL); for (cpt = 0; cpt < NB_ELEM; cpt++) { xbt_dynar_unshift(d, &cpt); - DEBUG2("Push %d, length=%lu", cpt, xbt_dynar_length(d)); + XBT_DEBUG("Push %d, length=%lu", cpt, xbt_dynar_length(d)); } for (cpt = 0; cpt < NB_ELEM; cpt++) { i = xbt_dynar_pop_as(d, int); - xbt_test_assert2(i == cpt, + xbt_test_assert(i == cpt, "The retrieved value is not the same than the injected one (%d!=%d)", i, cpt); - xbt_test_log2("Pop %d, length=%lu", cpt, xbt_dynar_length(d)); + xbt_test_log("Pop %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_add1 + xbt_test_add ("==== Push %d int, insert 1000 int in the middle, shift everything", NB_ELEM); d = xbt_dynar_new(sizeof(int), NULL); for (cpt = 0; cpt < NB_ELEM; cpt++) { xbt_dynar_push_as(d, int, cpt); - DEBUG2("Push %d, length=%lu", cpt, xbt_dynar_length(d)); + XBT_DEBUG("Push %d, length=%lu", cpt, xbt_dynar_length(d)); } for (cpt = 0; cpt < NB_ELEM/5; cpt++) { xbt_dynar_insert_at_as(d, NB_ELEM/2, int, cpt); - DEBUG2("Push %d, length=%lu", cpt, xbt_dynar_length(d)); + XBT_DEBUG("Push %d, length=%lu", cpt, xbt_dynar_length(d)); } for (cpt = 0; cpt < NB_ELEM/2; 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 begining (%d!=%d)", i, cpt); - 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--) { 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); } @@ -940,7 +954,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++) @@ -948,9 +962,9 @@ 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 */ @@ -966,17 +980,17 @@ XBT_TEST_UNIT("insert",test_dynar_insert,"Using the xbt_dynar_insert and xbt_dyn unsigned int cursor; int cpt; - xbt_test_add1("==== Insert %d int, traverse them, remove them",NB_ELEM); + 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_log2("Push %d, length=%lu", cpt, xbt_dynar_length(d)); + xbt_test_log("Push %d, length=%lu", cpt, xbt_dynar_length(d)); } /* 3. Traverse the dynar */ xbt_dynar_foreach(d, cursor, cpt) { - xbt_test_assert2(cursor == cpt, + xbt_test_assert(cursor == cpt, "The retrieved value is not the same than the injected one (%d!=%d)", cursor, cpt); } @@ -986,33 +1000,33 @@ XBT_TEST_UNIT("insert",test_dynar_insert,"Using the xbt_dynar_insert and xbt_dyn for (cpt = 0; cpt < NB_ELEM; cpt++) xbt_dynar_set_as(d, cpt, int, cpt); xbt_dynar_foreach(d, cursor, cpt) - xbt_test_assert2(cursor == cpt, + xbt_test_assert(cursor == cpt, "The retrieved value is not the same than the injected one (%d!=%d)", cursor, cpt); for (cpt = 0; cpt < NB_ELEM; cpt++) { int val; xbt_dynar_remove_at(d,0,&val); - xbt_test_assert2(cpt == val, + xbt_test_assert(cpt == val, "The retrieved value is not the same than the injected one (%d!=%d)", cursor, cpt); } - xbt_test_assert1(xbt_dynar_length(d) == 0, + xbt_test_assert(xbt_dynar_length(d) == 0, "There is still %lu elements in the dynar after removing everything", xbt_dynar_length(d)); xbt_dynar_free(&d); /* ********************* */ - xbt_test_add1("==== Insert %d int in reverse order, traverse them, remove them",NB_ELEM); + 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_log2("Push %d, length=%lu", cpt, xbt_dynar_length(d)); + xbt_test_log("Push %d, length=%lu", cpt, xbt_dynar_length(d)); } /* 3. Traverse the dynar */ xbt_dynar_foreach(d, cursor, cpt) { - xbt_test_assert2(cursor == cpt, + xbt_test_assert(cursor == cpt, "The retrieved value is not the same than the injected one (%d!=%d)", cursor, cpt); } @@ -1021,11 +1035,11 @@ XBT_TEST_UNIT("insert",test_dynar_insert,"Using the xbt_dynar_insert and xbt_dyn for (cpt =NB_ELEM-1; cpt >=0; cpt--) { int val; xbt_dynar_remove_at(d,xbt_dynar_length(d)-1,&val); - xbt_test_assert2(cpt == val, + xbt_test_assert(cpt == val, "The retrieved value is not the same than the injected one (%d!=%d)", cursor, cpt); } - xbt_test_assert1(xbt_dynar_length(d) == 0, + xbt_test_assert(xbt_dynar_length(d) == 0, "There is still %lu elements in the dynar after removing everything", xbt_dynar_length(d)); xbt_dynar_free(&d); @@ -1041,17 +1055,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; @@ -1059,14 +1073,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); } @@ -1074,7 +1088,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; @@ -1083,7 +1097,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); } @@ -1093,7 +1107,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++) { @@ -1108,22 +1122,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); } @@ -1132,7 +1146,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; @@ -1141,7 +1155,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 */ @@ -1163,17 +1177,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); @@ -1201,7 +1215,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); @@ -1210,7 +1224,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); @@ -1220,7 +1234,7 @@ 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), + xbt_test_assert(!strcmp(buf, s1), "The retrieved value is not the same than the injected one (%s!=%s)", buf, s1); } @@ -1228,7 +1242,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); @@ -1239,7 +1253,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); @@ -1257,7 +1271,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); @@ -1265,7 +1279,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); @@ -1273,7 +1287,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); @@ -1283,7 +1297,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++) { @@ -1294,7 +1308,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); } @@ -1344,7 +1358,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 */ );