X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/32892d0df7206a7c14ace5a13f985df1e0a9249a..0a98e0dd953ca1a907d77f3c4eabdce39e62c1e5:/src/xbt/dynar.cpp diff --git a/src/xbt/dynar.cpp b/src/xbt/dynar.cpp index c2dd5f03ac..8216c76429 100644 --- a/src/xbt/dynar.cpp +++ b/src/xbt/dynar.cpp @@ -1,6 +1,6 @@ /* a generic DYNamic ARray implementation. */ -/* Copyright (c) 2004-2018. The SimGrid Team. +/* Copyright (c) 2004-2019. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -11,6 +11,7 @@ #include "xbt/ex.h" #include "xbt/log.h" #include "xbt/misc.h" +#include "xbt/string.hpp" #include "xbt/sysdep.h" #include @@ -29,15 +30,15 @@ static inline void _sanity_check_idx(int idx) static inline void _check_inbound_idx(xbt_dynar_t dynar, int idx) { if (idx < 0 || idx >= static_cast(dynar->used)) { - THROWF(bound_error, idx, "dynar is not that long. You asked %d, but it's only %lu long", - idx, static_cast(dynar->used)); + throw std::out_of_range(simgrid::xbt::string_printf("dynar is not that long. You asked %d, but it's only %lu long", + idx, static_cast(dynar->used))); } } static inline void _check_populated_dynar(xbt_dynar_t dynar) { if (dynar->used == 0) { - THROWF(bound_error, 0, "dynar %p is empty", dynar); + throw std::out_of_range(simgrid::xbt::string_printf("dynar %p is empty", dynar)); } } @@ -431,8 +432,8 @@ void xbt_dynar_remove_n_at(xbt_dynar_t const dynar, const unsigned int n, const * } * @endcode * - * Raises not_found_error if not found. If you have less than 2 millions elements, you probably want to use - * #xbt_dynar_search_or_negative() instead, so that you don't have to TRY/CATCH on element not found. + * Raises std::out_of_range if not found. If you have less than 2 millions elements, you probably want to use + * #xbt_dynar_search_or_negative() instead, so that you don't have to try/catch on element not found. */ unsigned int xbt_dynar_search(xbt_dynar_t const dynar, void* const elem) { @@ -443,8 +444,7 @@ unsigned int xbt_dynar_search(xbt_dynar_t const dynar, void* const elem) return it; } - THROWF(not_found_error, 0, "Element %p not part of dynar %p", elem, dynar); - return 0; // Won't happen, just to please eclipse + throw std::out_of_range(simgrid::xbt::string_printf("Element %p not part of dynar %p", elem, dynar)); } /** @brief Returns the position of the element in the dynar (or -1 if not found) @@ -603,17 +603,6 @@ void xbt_dynar_sort(xbt_dynar_t dynar, int_f_cpvoid_cpvoid_t compar_fn) qsort(dynar->data, dynar->used, dynar->elmsize, compar_fn); } -static int strcmp_voidp(const void *pa, const void *pb) { - return strcmp(*(const char **)pa, *(const char **)pb); -} - -/** @brief Sorts a dynar of strings (ie, char* data) */ -xbt_dynar_t xbt_dynar_sort_strings(xbt_dynar_t dynar) -{ - xbt_dynar_sort(dynar, strcmp_voidp); - return dynar; // to enable functional uses -} - /** @brief Transform a dynar into a nullptr terminated array. * * @param dynar the dynar to transform @@ -677,435 +666,3 @@ int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2, int (*compar)(const void*, xbt_dynar_free(&d2); return 0; } - -#ifdef SIMGRID_TEST - -#define NB_ELEM 5000 - -XBT_TEST_SUITE("dynar", "Dynar data container"); -XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dyn); - -XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers") -{ - /* Vars_decl [doxygen cruft] */ - int i; - unsigned int cursor; - - xbt_test_add("==== Traverse the empty dynar"); - xbt_dynar_t d = xbt_dynar_new(sizeof(int), nullptr); - xbt_dynar_foreach(d, cursor, i) { - 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_add("==== Push %d int, set them again 3 times, traverse them, shift them", NB_ELEM); - /* Populate_ints [doxygen cruft] */ - /* 1. Populate the dynar */ - d = xbt_dynar_new(sizeof(int), nullptr); - for (int 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_log("Push %d, length=%lu", cpt, xbt_dynar_length(d)); - } - - /* 2. Traverse manually the dynar */ - for (cursor = 0; cursor < NB_ELEM; cursor++) { - int* iptr = (int*)xbt_dynar_get_ptr(d, cursor); - xbt_test_assert(cursor == (unsigned int)*iptr, "The retrieved value is not the same than the injected one (%u!=%d)", - cursor, *iptr); - } - - /* 3. Traverse the dynar using the neat macro to that extend */ - int cpt; - xbt_dynar_foreach(d, cursor, cpt) { - xbt_test_assert(cursor == (unsigned int) cpt, "The retrieved value is not the same than the injected one (%u!=%d)", cursor, cpt); - } - /* end_of_traversal */ - - for (int cpt = 0; cpt < NB_ELEM; cpt++) - *(int *) xbt_dynar_get_ptr(d, cpt) = cpt; - - for (int cpt = 0; cpt < NB_ELEM; cpt++) - *(int *) xbt_dynar_get_ptr(d, cpt) = cpt; - - for (int cpt = 0; cpt < NB_ELEM; cpt++) - *(int *) xbt_dynar_get_ptr(d, cpt) = cpt; - - cpt = 0; - xbt_dynar_foreach(d, cursor, i) { - xbt_test_assert(i == cpt, "The retrieved value is not the same than the injected one (%d!=%d)", i, cpt); - cpt++; - } - xbt_test_assert(cpt == NB_ELEM, "Cannot retrieve my %d values. Last got one is %d", NB_ELEM, cpt); - - /* shifting [doxygen cruft] */ - /* 4. Shift all the values */ - for (int cpt = 0; cpt < NB_ELEM; cpt++) { - xbt_dynar_shift(d, &i); - xbt_test_assert(i == cpt, "The retrieved value is not the same than the injected one (%d!=%d)", i, cpt); - xbt_test_log("Pop %d, length=%lu", cpt, xbt_dynar_length(d)); - } - - int* pi; - xbt_dynar_foreach_ptr(d, cursor, pi) { - *pi = 0; - } - xbt_dynar_foreach(d, cursor, i) { - xbt_test_assert(i == 0, "The value is not the same as the expected one."); - } - xbt_dynar_foreach_ptr(d, cursor, pi) { - *pi = 1; - } - xbt_dynar_foreach(d, cursor, i) { - xbt_test_assert(i == 1, "The value is not the same as the expected one."); - } - - /* 5. Free the resources */ - 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_add("==== Unshift/pop %d int", NB_ELEM); - d = xbt_dynar_new(sizeof(int), nullptr); - for (int cpt = 0; cpt < NB_ELEM; cpt++) { - xbt_dynar_unshift(d, &cpt); - XBT_DEBUG("Push %d, length=%lu", cpt, xbt_dynar_length(d)); - } - for (int cpt = 0; cpt < NB_ELEM; cpt++) { - i = xbt_dynar_pop_as(d, int); - xbt_test_assert(i == cpt, "The retrieved value is not the same than the injected one (%d!=%d)", i, cpt); - 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_add ("==== Push %d int, insert 1000 int in the middle, shift everything", NB_ELEM); - d = xbt_dynar_new(sizeof(int), nullptr); - for (cpt = 0; cpt < NB_ELEM; cpt++) { - xbt_dynar_push_as(d, int, cpt); - 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); - 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_assert(i == cpt, "The retrieved value is not the same than the injected one at the begining (%d!=%d)", - i, cpt); - XBT_DEBUG("Pop %d, length=%lu", cpt, xbt_dynar_length(d)); - } - for (cpt = 999; cpt >= 0; cpt--) { - xbt_dynar_shift(d, &i); - 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_assert(i == cpt, "The retrieved value is not the same than the injected one at the end (%d!=%d)", i, cpt); - } - 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_add("==== Push %d int, remove 2000-4000. free the rest", NB_ELEM); - d = xbt_dynar_new(sizeof(int), nullptr); - for (cpt = 0; cpt < NB_ELEM; cpt++) - xbt_dynar_push_as(d, int, cpt); - - for (cpt = 2000; cpt < 4000; cpt++) { - xbt_dynar_remove_at(d, 2000, &i); - xbt_test_assert(i == cpt, "Remove a bad value. Got %d, expected %d", i, cpt); - 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), nullptr); - unsigned int cursor; - - xbt_test_add("==== Insert %d int, traverse them, remove them",NB_ELEM); - /* Populate_ints [doxygen cruft] */ - /* 1. Populate the dynar */ - for (int 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 */ - int cpt; - xbt_dynar_foreach(d, cursor, cpt) { - xbt_test_assert(cursor == (unsigned int) 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 (int cpt = 0; cpt < NB_ELEM; cpt++) - xbt_dynar_set_as(d, cpt, int, cpt); - xbt_dynar_foreach(d, cursor, cpt) - xbt_test_assert(cursor == (unsigned int) cpt, "The retrieved value is not the same than the injected one (%u!=%d)", cursor, cpt); - - for (int 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), nullptr); - for (int 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 == (unsigned) 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); -} - -/*******************************************************************************/ -XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles") -{ - xbt_dynar_t d; - int cpt; - unsigned int cursor; - double d1, d2; - - xbt_test_add("==== Traverse the empty dynar"); - d = xbt_dynar_new(sizeof(int), nullptr); - xbt_dynar_foreach(d, cursor, cpt) { - 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_add("==== Push/shift 5000 doubles"); - d = xbt_dynar_new(sizeof(double), nullptr); - for (cpt = 0; cpt < 5000; cpt++) { - d1 = (double) cpt; - xbt_dynar_push(d, &d1); - } - xbt_dynar_foreach(d, cursor, d2) { - d1 = (double) cursor; - 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_assert(d1 == d2, "The retrieved value is not the same than the injected one (%f!=%f)", d1, d2); - } - 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_add("==== Unshift/pop 5000 doubles"); - d = xbt_dynar_new(sizeof(double), nullptr); - for (cpt = 0; cpt < 5000; cpt++) { - d1 = (double) cpt; - xbt_dynar_unshift(d, &d1); - } - for (cpt = 0; cpt < 5000; cpt++) { - d1 = (double) cpt; - xbt_dynar_pop(d, &d2); - xbt_test_assert(d1 == d2, "The retrieved value is not the same than the injected one (%f!=%f)", d1, d2); - } - 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_add("==== Push 5000 doubles, insert 1000 doubles in the middle, shift everything"); - d = xbt_dynar_new(sizeof(double), nullptr); - for (cpt = 0; cpt < 5000; cpt++) { - d1 = (double) cpt; - xbt_dynar_push(d, &d1); - } - for (cpt = 0; cpt < 1000; cpt++) { - d1 = (double) cpt; - xbt_dynar_insert_at(d, 2500, &d1); - } - - for (cpt = 0; cpt < 2500; cpt++) { - d1 = (double) cpt; - xbt_dynar_shift(d, &d2); - xbt_test_assert(d1 == d2, "The retrieved value is not the same than the injected one at the begining (%f!=%f)", - d1, d2); - 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_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_assert(d1 == d2, "The retrieved value is not the same than the injected one at the end (%f!=%f)", d1, d2); - } - 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_add("==== Push 5000 double, remove 2000-4000. free the rest"); - d = xbt_dynar_new(sizeof(double), nullptr); - for (cpt = 0; cpt < 5000; cpt++) { - d1 = (double) cpt; - xbt_dynar_push(d, &d1); - } - for (cpt = 2000; cpt < 4000; cpt++) { - d1 = (double) cpt; - xbt_dynar_remove_at(d, 2000, &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 */ - 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 */ -} - -/* doxygen_string_cruft */ - -/*******************************************************************************/ -XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings") -{ - unsigned int iter; - char buf[1024]; - char *s1, *s2; - - xbt_test_add("==== Traverse the empty dynar"); - xbt_dynar_t d = xbt_dynar_new(sizeof(char*), &xbt_free_ref); - xbt_dynar_foreach(d, iter, s1) { - 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_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); - /* 1. Populate the dynar */ - for (int cpt = 0; cpt < NB_ELEM; cpt++) { - snprintf(buf,1023, "%d", cpt); - s1 = xbt_strdup(buf); - xbt_dynar_push(d, &s1); - } - for (int i = 0 ; i < 3 ; i++) { - for (int cpt = 0; cpt < NB_ELEM; cpt++) { - snprintf(buf,1023, "%d", cpt); - s1 = xbt_strdup(buf); - xbt_dynar_replace(d, cpt, &s1); - } - } - for (int cpt = 0; cpt < NB_ELEM; cpt++) { - snprintf(buf,1023, "%d", cpt); - xbt_dynar_shift(d, &s2); - xbt_test_assert(not strcmp(buf, s2), "The retrieved value is not the same than the injected one (%s!=%s)", buf, s2); - xbt_free(s2); - } - 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_add("==== Unshift, traverse and pop %d strings", NB_ELEM); - d = xbt_dynar_new(sizeof(char **), &xbt_free_ref); - for (int cpt = 0; cpt < NB_ELEM; cpt++) { - snprintf(buf,1023, "%d", cpt); - s1 = xbt_strdup(buf); - xbt_dynar_unshift(d, &s1); - } - /* 2. Traverse the dynar with the macro */ - xbt_dynar_foreach(d, iter, s1) { - snprintf(buf,1023, "%u", NB_ELEM - iter - 1); - xbt_test_assert(not strcmp(buf, s1), "The retrieved value is not the same than the injected one (%s!=%s)", buf, s1); - } - /* 3. Traverse the dynar with the macro */ - for (int cpt = 0; cpt < NB_ELEM; cpt++) { - snprintf(buf,1023, "%d", cpt); - xbt_dynar_pop(d, &s2); - xbt_test_assert(not strcmp(buf, s2), "The retrieved value is not the same than the injected one (%s!=%s)", buf, s2); - xbt_free(s2); - } - /* 4. Free the resources */ - 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_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); - for (int cpt = 0; cpt < NB_ELEM; cpt++) { - snprintf(buf,1023, "%d", cpt); - s1 = xbt_strdup(buf); - xbt_dynar_push(d, &s1); - } - for (int cpt = 0; cpt < NB_ELEM / 5; cpt++) { - snprintf(buf,1023, "%d", cpt); - s1 = xbt_strdup(buf); - xbt_dynar_insert_at(d, NB_ELEM / 2, &s1); - } - - for (int cpt = 0; cpt < NB_ELEM / 2; cpt++) { - snprintf(buf,1023, "%d", cpt); - xbt_dynar_shift(d, &s2); - xbt_test_assert(not strcmp(buf, s2), - "The retrieved value is not the same than the injected one at the begining (%s!=%s)", buf, s2); - xbt_free(s2); - } - for (int cpt = (NB_ELEM / 5) - 1; cpt >= 0; cpt--) { - snprintf(buf,1023, "%d", cpt); - xbt_dynar_shift(d, &s2); - xbt_test_assert(not strcmp(buf, s2), - "The retrieved value is not the same than the injected one in the middle (%s!=%s)", buf, s2); - xbt_free(s2); - } - for (int cpt = NB_ELEM / 2; cpt < NB_ELEM; cpt++) { - snprintf(buf,1023, "%d", cpt); - xbt_dynar_shift(d, &s2); - xbt_test_assert(not strcmp(buf, s2), - "The retrieved value is not the same than the injected one at the end (%s!=%s)", buf, s2); - xbt_free(s2); - } - 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_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 (int cpt = 0; cpt < NB_ELEM; cpt++) { - snprintf(buf,1023, "%d", cpt); - s1 = xbt_strdup(buf); - xbt_dynar_push(d, &s1); - } - for (int cpt = 2 * (NB_ELEM / 5); cpt < 4 * (NB_ELEM / 5); cpt++) { - snprintf(buf,1023, "%d", cpt); - xbt_dynar_remove_at(d, 2 * (NB_ELEM / 5), &s2); - xbt_test_assert(not strcmp(buf, s2), "Remove a bad value. Got %s, expected %s", s2, buf); - xbt_free(s2); - } - xbt_dynar_free(&d); /* end_of_doxygen */ -} -#endif /* SIMGRID_TEST */