X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dccf1b41e9c7b5a696f01abceaa2779fe65f154f..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/xbt/dynar.cpp diff --git a/src/xbt/dynar.cpp b/src/xbt/dynar.cpp index 0ceb8cc948..b2420dac6e 100644 --- a/src/xbt/dynar.cpp +++ b/src/xbt/dynar.cpp @@ -1,6 +1,6 @@ /* a generic DYNamic ARray implementation. */ -/* Copyright (c) 2004-2015. The SimGrid Team. +/* Copyright (c) 2004-2018. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -23,14 +23,14 @@ static inline void _sanity_check_dynar(xbt_dynar_t dynar) static inline void _sanity_check_idx(int idx) { - xbt_assert(idx >= 0, "dynar idx(=%d) < 0", (int) (idx)); + xbt_assert(idx >= 0, "dynar idx(=%d) < 0", idx); } static inline void _check_inbound_idx(xbt_dynar_t dynar, int idx) { - if (idx < 0 || idx >= (int)dynar->used) { + 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", - (int) (idx), (unsigned long) dynar->used); + idx, static_cast(dynar->used)); } } @@ -102,6 +102,26 @@ xbt_dynar_t xbt_dynar_new(const unsigned long elmsize, void_f_pvoid_t const free return dynar; } +/** @brief Initialize a dynar structure that was not malloc'ed + * This can be useful to keep temporary dynars on the stack + */ +void xbt_dynar_init(xbt_dynar_t dynar, const unsigned long elmsize, void_f_pvoid_t const free_f) +{ + dynar->size = 0; + dynar->used = 0; + dynar->elmsize = elmsize; + dynar->data = nullptr; + dynar->free_f = free_f; +} + +/** @brief Destroy a dynar that was created with xbt_dynar_init */ +void xbt_dynar_free_data(xbt_dynar_t dynar) +{ + xbt_dynar_reset(dynar); + if (dynar) + xbt_free(dynar->data); +} + /** @brief Destructor of the structure not touching to the content * * \param dynar poor victim @@ -109,12 +129,12 @@ xbt_dynar_t xbt_dynar_new(const unsigned long elmsize, void_f_pvoid_t const free * kilkil a dynar BUT NOT its content. Ie, the array is freed, but the content is not touched (the \a free_f function * is not used) */ -void xbt_dynar_free_container(xbt_dynar_t * dynar) +void xbt_dynar_free_container(xbt_dynar_t* dynar) { if (dynar && *dynar) { xbt_dynar_t d = *dynar; - free(d->data); - free(d); + xbt_free(d->data); + xbt_free(d); *dynar = nullptr; } } @@ -139,7 +159,7 @@ void xbt_dynar_reset(xbt_dynar_t const dynar) * \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) +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"); @@ -178,7 +198,7 @@ void xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots_wanted) * * kilkil a dynar and its content */ -void xbt_dynar_free(xbt_dynar_t * dynar) +void xbt_dynar_free(xbt_dynar_t* dynar) { if (dynar && *dynar) { xbt_dynar_reset(*dynar); @@ -187,7 +207,7 @@ 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) +void xbt_dynar_free_voidp(void* d) { xbt_dynar_t dynar = (xbt_dynar_t)d; xbt_dynar_free(&dynar); @@ -206,7 +226,6 @@ unsigned long xbt_dynar_length(const xbt_dynar_t dynar) * *\param dynar the dynat we want to check */ - int xbt_dynar_is_empty(const xbt_dynar_t dynar) { return (xbt_dynar_length(dynar) == 0); @@ -218,7 +237,7 @@ int xbt_dynar_is_empty(const xbt_dynar_t dynar) * \param idx index of the slot we want to retrieve * \param[out] dst where to put the result to. */ -void xbt_dynar_get_cpy(const xbt_dynar_t dynar, const unsigned long idx, void *const dst) +void xbt_dynar_get_cpy(const xbt_dynar_t dynar, const unsigned long idx, void* const dst) { _sanity_check_dynar(dynar); _check_inbound_idx(dynar, idx); @@ -235,7 +254,7 @@ void xbt_dynar_get_cpy(const xbt_dynar_t dynar, const unsigned long idx, void *c * \warning The returned value is the actual content of the dynar. * Make a copy before fooling with it. */ -void *xbt_dynar_get_ptr(const xbt_dynar_t dynar, const unsigned long idx) +void* xbt_dynar_get_ptr(const xbt_dynar_t dynar, const unsigned long idx) { void *res; _sanity_check_dynar(dynar); @@ -245,7 +264,7 @@ void *xbt_dynar_get_ptr(const xbt_dynar_t dynar, const unsigned long idx) return res; } -void *xbt_dynar_set_at_ptr(const xbt_dynar_t dynar, const unsigned long idx) +void* xbt_dynar_set_at_ptr(const xbt_dynar_t dynar, const unsigned long idx) { _sanity_check_dynar(dynar); @@ -267,7 +286,7 @@ void *xbt_dynar_set_at_ptr(const xbt_dynar_t dynar, const unsigned long idx) * * If you want to free the previous content, use xbt_dynar_replace(). */ -void xbt_dynar_set(xbt_dynar_t dynar, const int idx, const void *const src) +void xbt_dynar_set(xbt_dynar_t dynar, const int idx, const void* const src) { memcpy(xbt_dynar_set_at_ptr(dynar, idx), src, dynar->elmsize); } @@ -281,7 +300,7 @@ void xbt_dynar_set(xbt_dynar_t dynar, const int idx, const void *const src) * Set the Nth element of a dynar, expanding the dynar if needed, AND DO free the previous value at this position. If * you don't want to free the previous content, use xbt_dynar_set(). */ -void xbt_dynar_replace(xbt_dynar_t dynar, const unsigned long idx, const void *const object) +void xbt_dynar_replace(xbt_dynar_t dynar, const unsigned long idx, const void* const object) { _sanity_check_dynar(dynar); @@ -299,7 +318,7 @@ void xbt_dynar_replace(xbt_dynar_t dynar, const unsigned long idx, const void *c * You can then use regular affectation to set its value instead of relying on the slow memcpy. This is what * xbt_dynar_insert_at_as() does. */ -void *xbt_dynar_insert_at_ptr(xbt_dynar_t const dynar, const int idx) +void* xbt_dynar_insert_at_ptr(xbt_dynar_t const dynar, const int idx) { void *res; unsigned long old_used; @@ -330,7 +349,7 @@ void *xbt_dynar_insert_at_ptr(xbt_dynar_t const dynar, const int idx) * Set the Nth element of a dynar, expanding the dynar if needed, and moving the previously existing value and all * subsequent ones to one position right in the dynar. */ -void xbt_dynar_insert_at(xbt_dynar_t const dynar, const int idx, const void *const src) +void xbt_dynar_insert_at(xbt_dynar_t const dynar, const int idx, const void* const src) { /* checks done in xbt_dynar_insert_at_ptr */ memcpy(xbt_dynar_insert_at_ptr(dynar, idx), src, dynar->elmsize); @@ -344,11 +363,8 @@ void xbt_dynar_insert_at(xbt_dynar_t const dynar, const int idx, const void *con * If the object argument of this function is a non-null pointer, the removed element is copied to this address. If not, * the element is freed using the free_f function passed at dynar creation. */ -void xbt_dynar_remove_at(xbt_dynar_t const dynar, const int idx, void *const object) +void xbt_dynar_remove_at(xbt_dynar_t const dynar, const int idx, void* const object) { - unsigned long nb_shift; - unsigned long offset; - _sanity_check_dynar(dynar); _check_inbound_idx(dynar, idx); @@ -358,10 +374,10 @@ void xbt_dynar_remove_at(xbt_dynar_t const dynar, const int idx, void *const obj dynar->free_f(_xbt_dynar_elm(dynar, idx)); } - nb_shift = dynar->used - 1 - idx; + unsigned long nb_shift = dynar->used - 1 - idx; if (nb_shift) { - offset = nb_shift * dynar->elmsize; + unsigned long offset = nb_shift * dynar->elmsize; memmove(_xbt_dynar_elm(dynar, idx), _xbt_dynar_elm(dynar, idx + 1), offset); } @@ -377,26 +393,23 @@ void xbt_dynar_remove_at(xbt_dynar_t const dynar, const int idx, void *const obj */ void xbt_dynar_remove_n_at(xbt_dynar_t const dynar, const unsigned int n, const int idx) { - unsigned long nb_shift; - unsigned long offset; - unsigned long cur; - - if (!n) return; + if (not n) + return; _sanity_check_dynar(dynar); _check_inbound_idx(dynar, idx); _check_inbound_idx(dynar, idx + n - 1); if (dynar->free_f) { - for (cur = idx; cur < idx + n; cur++) { + for (unsigned long cur = idx; cur < idx + n; cur++) { dynar->free_f(_xbt_dynar_elm(dynar, cur)); } } - nb_shift = dynar->used - n - idx; + unsigned long nb_shift = dynar->used - n - idx; if (nb_shift) { - offset = nb_shift * dynar->elmsize; + unsigned long offset = nb_shift * dynar->elmsize; memmove(_xbt_dynar_elm(dynar, idx), _xbt_dynar_elm(dynar, idx + n), offset); } @@ -411,60 +424,60 @@ void xbt_dynar_remove_n_at(xbt_dynar_t const dynar, const unsigned int n, const * \code * signed int position = -1; * xbt_dynar_foreach(dynar, iter, elem) { - * if (!memcmp(elem, searched_element, sizeof(*elem))) { + * if (not memcmp(elem, searched_element, sizeof(*elem))) { * position = iter; * break; * } * } * \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. */ -unsigned int xbt_dynar_search(xbt_dynar_t const dynar, void *const elem) +unsigned int xbt_dynar_search(xbt_dynar_t const dynar, void* const elem) { unsigned long it; for (it = 0; it < dynar->used; it++) - if (!memcmp(_xbt_dynar_elm(dynar, it), elem, dynar->elmsize)) { + if (not memcmp(_xbt_dynar_elm(dynar, it), elem, dynar->elmsize)) { return it; } THROWF(not_found_error, 0, "Element %p not part of dynar %p", elem, dynar); - return -1; // Won't happen, just to please eclipse + return 0; // Won't happen, just to please eclipse } /** @brief Returns the position of the element in the dynar (or -1 if not found) * * Beware that if your dynar contains pointed values (such as strings) instead of scalar, this function is probably not * what you want. Check the documentation of xbt_dynar_search() for more info. - * + * * Note that usually, the dynar indices are unsigned integers. If you have more than 2 million elements in your dynar, * this very function will not work (but the other will). */ -signed int xbt_dynar_search_or_negative(xbt_dynar_t const dynar, void *const elem) +signed int xbt_dynar_search_or_negative(xbt_dynar_t const dynar, void* const elem) { unsigned long it; for (it = 0; it < dynar->used; it++) - if (!memcmp(_xbt_dynar_elm(dynar, it), elem, dynar->elmsize)) { + if (not memcmp(_xbt_dynar_elm(dynar, it), elem, dynar->elmsize)) { return it; } return -1; } -/** @brief Returns a boolean indicating whether the element is part of the dynar +/** @brief Returns a boolean indicating whether the element is part of the dynar * * Beware that if your dynar contains pointed values (such as strings) instead of scalar, this function is probably not * what you want. Check the documentation of xbt_dynar_search() for more info. */ -int xbt_dynar_member(xbt_dynar_t const dynar, void *const elem) +int xbt_dynar_member(xbt_dynar_t const dynar, void* const elem) { unsigned long it; for (it = 0; it < dynar->used; it++) - if (!memcmp(_xbt_dynar_elm(dynar, it), elem, dynar->elmsize)) { + if (not memcmp(_xbt_dynar_elm(dynar, it), elem, dynar->elmsize)) { return 1; } @@ -476,13 +489,13 @@ int xbt_dynar_member(xbt_dynar_t const dynar, void *const elem) * You can then use regular affectation to set its value instead of relying on the slow memcpy. This is what * xbt_dynar_push_as() does. */ -void *xbt_dynar_push_ptr(xbt_dynar_t const dynar) +void* xbt_dynar_push_ptr(xbt_dynar_t const dynar) { return xbt_dynar_insert_at_ptr(dynar, dynar->used); } /** @brief Add an element at the end of the dynar */ -void xbt_dynar_push(xbt_dynar_t const dynar, const void *const src) +void xbt_dynar_push(xbt_dynar_t const dynar, const void* const src) { /* checks done in xbt_dynar_insert_at_ptr */ memcpy(xbt_dynar_insert_at_ptr(dynar, dynar->used), src, dynar->elmsize); @@ -493,7 +506,7 @@ void xbt_dynar_push(xbt_dynar_t const dynar, const void *const src) * You can then use regular affectation to set its value instead of relying on the slow memcpy. This is what * xbt_dynar_pop_as() does. */ -void *xbt_dynar_pop_ptr(xbt_dynar_t const dynar) +void* xbt_dynar_pop_ptr(xbt_dynar_t const dynar) { _check_populated_dynar(dynar); XBT_CDEBUG(xbt_dyn, "Pop %p", (void *) dynar); @@ -502,7 +515,7 @@ void *xbt_dynar_pop_ptr(xbt_dynar_t const dynar) } /** @brief Get and remove the last element of the dynar */ -void xbt_dynar_pop(xbt_dynar_t const dynar, void *const dst) +void xbt_dynar_pop(xbt_dynar_t const dynar, void* const dst) { /* sanity checks done by remove_at */ XBT_CDEBUG(xbt_dyn, "Pop %p", (void *) dynar); @@ -513,7 +526,7 @@ void xbt_dynar_pop(xbt_dynar_t const dynar, void *const dst) * * This is less efficient than xbt_dynar_push() */ -void xbt_dynar_unshift(xbt_dynar_t const dynar, const void *const src) +void xbt_dynar_unshift(xbt_dynar_t const dynar, const void* const src) { /* sanity checks done by insert_at */ xbt_dynar_insert_at(dynar, 0, src); @@ -523,7 +536,7 @@ void xbt_dynar_unshift(xbt_dynar_t const dynar, const void *const src) * * This is less efficient than xbt_dynar_pop() */ -void xbt_dynar_shift(xbt_dynar_t const dynar, void *const dst) +void xbt_dynar_shift(xbt_dynar_t const dynar, void* const dst) { /* sanity checks done by remove_at */ xbt_dynar_remove_at(dynar, 0, dst); @@ -552,9 +565,10 @@ void xbt_dynar_map(const xbt_dynar_t dynar, void_f_pvoid_t const op) * * This function can be used while traversing without problem. */ -void xbt_dynar_cursor_rm(xbt_dynar_t dynar, unsigned int *const cursor) +void xbt_dynar_cursor_rm(xbt_dynar_t dynar, unsigned int* const cursor) { - xbt_dynar_remove_at(dynar, (*cursor)--, nullptr); + xbt_dynar_remove_at(dynar, *cursor, nullptr); + *cursor -= 1; } /** @brief Sorts a dynar according to the function compar_fn @@ -600,66 +614,20 @@ xbt_dynar_t xbt_dynar_sort_strings(xbt_dynar_t dynar) return dynar; // to enable functional uses } -/** @brief Sorts a dynar according to their color assuming elements can have only three colors. - * Since there are only three colors, it is linear and much faster than a classical sort. - * See for example http://en.wikipedia.org/wiki/Dutch_national_flag_problem - * - * \param dynar the dynar to sort - * \param color the color function of type (int (compar_fn*) (void*) (void*)). The return value of color is assumed to - * be 0, 1, or 2. - * - * At the end of the call, elements with color 0 are at the beginning of the dynar, elements with color 2 are at the - * end and elements with color 1 are in the middle. - * - * Remark: if the elements stored in the dynar are structures, the color function has to retrieve the field to sort - * first. - */ -XBT_PUBLIC(void) xbt_dynar_three_way_partition(xbt_dynar_t const dynar, int_f_pvoid_t color) -{ - unsigned long int i; - unsigned long int p = -1; - unsigned long int q = dynar->used; - const unsigned long elmsize = dynar->elmsize; - void *tmp = xbt_malloc(elmsize); - void *elm; - - for (i = 0; i < q;) { - void *elmi = _xbt_dynar_elm(dynar, i); - int colori = color(elmi); - - if (colori == 1) { - ++i; - } else { - if (colori == 0) { - elm = _xbt_dynar_elm(dynar, ++p); - ++i; - } else { /* colori == 2 */ - elm = _xbt_dynar_elm(dynar, --q); - } - if (elm != elmi) { - memcpy(tmp, elm, elmsize); - memcpy(elm, elmi, elmsize); - memcpy(elmi, tmp, elmsize); - } - } - } - xbt_free(tmp); -} - -/** @brief Transform a dynar into a nullptr terminated array. +/** @brief Transform a dynar into a nullptr terminated array. * * \param dynar the dynar to transform * \return pointer to the first element of the array * * Note: The dynar won't be usable afterwards. */ -void *xbt_dynar_to_array(xbt_dynar_t dynar) +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; - free(dynar); + xbt_free(dynar); return res; } @@ -674,13 +642,13 @@ void *xbt_dynar_to_array(xbt_dynar_t dynar) * considered equal, and a value different of zero when they are considered different. Finally, d2 is destroyed * afterwards. */ -int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2, int(*compar)(const void *, const void *)) +int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2, int (*compar)(const void*, const void*)) { int i ; int size; - if((!d1) && (!d2)) return 0; - if((!d1) || (!d2)) - { + if ((not d1) && (not d2)) + return 0; + if ((not d1) || (not d2)) { XBT_DEBUG("nullptr dynar d1=%p d2=%p",d1,d2); xbt_dynar_free(&d2); return 1; @@ -720,13 +688,11 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_dyn); XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers") { /* Vars_decl [doxygen cruft] */ - xbt_dynar_t d; - int i, cpt; + int i; unsigned int cursor; - int *iptr; xbt_test_add("==== Traverse the empty dynar"); - d = xbt_dynar_new(sizeof(int), nullptr); + 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"); } @@ -738,7 +704,7 @@ XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers") /* Populate_ints [doxygen cruft] */ /* 1. Populate the dynar */ d = xbt_dynar_new(sizeof(int), nullptr); - for (cpt = 0; cpt < NB_ELEM; cpt++) { + 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)); @@ -746,24 +712,25 @@ XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers") /* 2. Traverse manually the dynar */ for (cursor = 0; cursor < NB_ELEM; cursor++) { - 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, cpt); + 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 (cpt = 0; cpt < NB_ELEM; cpt++) + for (int cpt = 0; cpt < NB_ELEM; cpt++) *(int *) xbt_dynar_get_ptr(d, cpt) = cpt; - for (cpt = 0; cpt < NB_ELEM; cpt++) + for (int cpt = 0; cpt < NB_ELEM; cpt++) *(int *) xbt_dynar_get_ptr(d, cpt) = cpt; - /* xbt_dynar_set(d,cpt,&cpt); */ - for (cpt = 0; cpt < NB_ELEM; cpt++) + for (int cpt = 0; cpt < NB_ELEM; cpt++) *(int *) xbt_dynar_get_ptr(d, cpt) = cpt; cpt = 0; @@ -775,7 +742,7 @@ XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers") /* shifting [doxygen cruft] */ /* 4. Shift all the values */ - for (cpt = 0; cpt < NB_ELEM; cpt++) { + 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)); @@ -802,11 +769,11 @@ XBT_TEST_UNIT("int", test_dynar_int, "Dynars of integers") xbt_test_add("==== Unshift/pop %d int", NB_ELEM); d = xbt_dynar_new(sizeof(int), nullptr); - for (cpt = 0; cpt < NB_ELEM; cpt++) { + 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 (cpt = 0; cpt < NB_ELEM; cpt++) { + 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)); @@ -865,29 +832,29 @@ XBT_TEST_UNIT("insert",test_dynar_insert,"Using the xbt_dynar_insert and xbt_dyn { xbt_dynar_t d = xbt_dynar_new(sizeof(unsigned int), nullptr); 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++) { + 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 (cpt = 0; cpt < NB_ELEM; cpt++) + 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 (cpt = 0; cpt < NB_ELEM; 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); @@ -899,7 +866,7 @@ XBT_TEST_UNIT("insert",test_dynar_insert,"Using the xbt_dynar_insert and xbt_dyn /* ********************* */ xbt_test_add("==== Insert %d int in reverse order, traverse them, remove them",NB_ELEM); d = xbt_dynar_new(sizeof(int), nullptr); - for (cpt = NB_ELEM-1; cpt >=0; cpt--) { + 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)); } @@ -931,7 +898,7 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles") 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_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 */ @@ -1025,16 +992,14 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles") /*******************************************************************************/ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings") { - xbt_dynar_t d; - int cpt; unsigned int iter; char buf[1024]; char *s1, *s2; xbt_test_add("==== Traverse the empty dynar"); - d = xbt_dynar_new(sizeof(char *), &xbt_free_ref); + 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_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 */ @@ -1044,31 +1009,23 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings") /* Populate_str [doxygen cruft] */ d = xbt_dynar_new(sizeof(char *), &xbt_free_ref); /* 1. Populate the dynar */ - for (cpt = 0; cpt < NB_ELEM; cpt++) { + for (int cpt = 0; cpt < NB_ELEM; cpt++) { snprintf(buf,1023, "%d", cpt); s1 = xbt_strdup(buf); xbt_dynar_push(d, &s1); } - for (cpt = 0; cpt < NB_ELEM; cpt++) { - snprintf(buf,1023, "%d", cpt); - s1 = xbt_strdup(buf); - xbt_dynar_replace(d, cpt, &s1); - } - for (cpt = 0; cpt < NB_ELEM; cpt++) { - snprintf(buf,1023, "%d", cpt); - s1 = xbt_strdup(buf); - xbt_dynar_replace(d, cpt, &s1); - } - for (cpt = 0; cpt < NB_ELEM; cpt++) { - snprintf(buf,1023, "%d", cpt); - s1 = xbt_strdup(buf); - xbt_dynar_replace(d, cpt, &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 (cpt = 0; cpt < NB_ELEM; cpt++) { + for (int cpt = 0; cpt < NB_ELEM; cpt++) { snprintf(buf,1023, "%d", cpt); xbt_dynar_shift(d, &s2); - xbt_test_assert(!strcmp(buf, s2), "The retrieved value is not the same than the injected one (%s!=%s)", buf, s2); - free(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 */ @@ -1076,7 +1033,7 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings") 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++) { + for (int cpt = 0; cpt < NB_ELEM; cpt++) { snprintf(buf,1023, "%d", cpt); s1 = xbt_strdup(buf); xbt_dynar_unshift(d, &s1); @@ -1084,14 +1041,14 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings") /* 2. Traverse the dynar with the macro */ xbt_dynar_foreach(d, iter, s1) { snprintf(buf,1023, "%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); + 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 (cpt = 0; cpt < NB_ELEM; cpt++) { + for (int cpt = 0; cpt < NB_ELEM; cpt++) { snprintf(buf,1023, "%d", cpt); xbt_dynar_pop(d, &s2); - xbt_test_assert(!strcmp(buf, s2), "The retrieved value is not the same than the injected one (%s!=%s)", buf, s2); - free(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 */ @@ -1100,37 +1057,37 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings") 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 (cpt = 0; cpt < NB_ELEM; cpt++) { + for (int cpt = 0; cpt < NB_ELEM; cpt++) { snprintf(buf,1023, "%d", cpt); s1 = xbt_strdup(buf); xbt_dynar_push(d, &s1); } - for (cpt = 0; cpt < NB_ELEM / 5; cpt++) { + 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 (cpt = 0; cpt < NB_ELEM / 2; cpt++) { + for (int cpt = 0; cpt < NB_ELEM / 2; cpt++) { snprintf(buf,1023, "%d", cpt); xbt_dynar_shift(d, &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); + 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 (cpt = (NB_ELEM / 5) - 1; cpt >= 0; cpt--) { + for (int cpt = (NB_ELEM / 5) - 1; cpt >= 0; cpt--) { snprintf(buf,1023, "%d", cpt); xbt_dynar_shift(d, &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); + 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 (cpt = NB_ELEM / 2; cpt < NB_ELEM; cpt++) { + for (int cpt = NB_ELEM / 2; cpt < NB_ELEM; cpt++) { snprintf(buf,1023, "%d", cpt); xbt_dynar_shift(d, &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); + 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 */ @@ -1138,16 +1095,16 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings") 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++) { + for (int cpt = 0; cpt < NB_ELEM; cpt++) { snprintf(buf,1023, "%d", cpt); s1 = xbt_strdup(buf); xbt_dynar_push(d, &s1); } - for (cpt = 2 * (NB_ELEM / 5); cpt < 4 * (NB_ELEM / 5); cpt++) { + 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(!strcmp(buf, s2), "Remove a bad value. Got %s, expected %s", s2, buf); - free(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 */ }