X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..a04cda2a492c0549ff94b6dfc41b150d9e0abe61:/src/xbt/dynar.c diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c index 68be6978b7..30eafd0162 100644 --- a/src/xbt/dynar.c +++ b/src/xbt/dynar.c @@ -1,8 +1,7 @@ -/* $Id$ */ - /* a generic DYNamic ARray implementation. */ -/* Copyright (c) 2003, 2004 Martin Quinson. All rights reserved. */ +/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team. + * All rights reserved. */ /* 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. */ @@ -15,9 +14,6 @@ #include "xbt/dynar.h" #include -#include "xbt/dynar_private.h" /* type definition, which we share with the - code in charge of sending this across the net */ - /* IMPLEMENTATION NOTE ON SYNCHRONIZATION: every functions which name is prefixed by _ * assumes that the dynar is already locked if we have to. * Other functions (public ones) check for this. @@ -57,7 +53,8 @@ static XBT_INLINE void _check_inbound_idx(xbt_dynar_t dynar, int idx) } } -static XBT_INLINE void _check_sloppy_inbound_idx(xbt_dynar_t dynar, int idx) +static XBT_INLINE void _check_sloppy_inbound_idx(xbt_dynar_t dynar, + int idx) { if (idx > dynar->used) { _dynar_unlock(dynar); @@ -78,13 +75,13 @@ static XBT_INLINE void _check_populated_dynar(xbt_dynar_t 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_clear_mem(void *const ptr, const unsigned long length) { memset(ptr, 0, length); } static XBT_INLINE - void _xbt_dynar_expand(xbt_dynar_t const dynar, const unsigned long nb) + void _xbt_dynar_expand(xbt_dynar_t const dynar, const unsigned long nb) { const unsigned long old_size = dynar->size; @@ -92,22 +89,20 @@ static XBT_INLINE char *const old_data = (char *) dynar->data; const unsigned long elmsize = dynar->elmsize; - const unsigned long old_length = old_size * 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)); + 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, + DEBUG3("expand %p from %lu to %lu elements", (void *) dynar, (unsigned long) old_size, nb); if (old_data) { memcpy(new_data, old_data, used_length); - _xbt_clear_mem(old_data, old_length); free(old_data); } @@ -119,7 +114,7 @@ static XBT_INLINE } static XBT_INLINE - void *_xbt_dynar_elm(const xbt_dynar_t dynar, const unsigned long idx) + void *_xbt_dynar_elm(const xbt_dynar_t dynar, const unsigned long idx) { char *const data = (char *) dynar->data; const unsigned long elmsize = dynar->elmsize; @@ -128,7 +123,7 @@ static XBT_INLINE } static XBT_INLINE - void + void _xbt_dynar_get_elm(void *const dst, const xbt_dynar_t dynar, const unsigned long idx) { @@ -138,7 +133,7 @@ _xbt_dynar_get_elm(void *const dst, } static XBT_INLINE - void + void _xbt_dynar_put_elm(const xbt_dynar_t dynar, const unsigned long idx, const void *const src) { @@ -149,7 +144,7 @@ _xbt_dynar_put_elm(const xbt_dynar_t dynar, } static XBT_INLINE - void + void _xbt_dynar_remove_at(xbt_dynar_t const dynar, const unsigned long idx, void *const object) { @@ -176,9 +171,12 @@ _xbt_dynar_remove_at(xbt_dynar_t const dynar, } nb_shift = dynar->used - 1 - idx; - offset = nb_shift * dynar->elmsize; - memmove(_xbt_dynar_elm(dynar, idx), _xbt_dynar_elm(dynar, idx + 1), offset); + if (nb_shift) { + offset = nb_shift * dynar->elmsize; + memmove(_xbt_dynar_elm(dynar, idx), _xbt_dynar_elm(dynar, idx + 1), + offset); + } dynar->used--; } @@ -186,7 +184,8 @@ _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", - dynar->size, dynar->used, dynar->elmsize, dynar->data, dynar->free_f); + dynar->size, dynar->used, dynar->elmsize, dynar->data, + dynar->free_f); } /** @brief Constructor @@ -220,7 +219,8 @@ xbt_dynar_new(const unsigned long elmsize, void_f_pvoid_t const free_f) * */ xbt_dynar_t -xbt_dynar_new_sync(const unsigned long elmsize, void_f_pvoid_t const free_f) +xbt_dynar_new_sync(const unsigned long elmsize, + void_f_pvoid_t const free_f) { xbt_dynar_t res = xbt_dynar_new(elmsize, free_f); res->mutex = xbt_mutex_init(); @@ -257,7 +257,7 @@ void xbt_dynar_free_container(xbt_dynar_t * dynar) * * \param dynar who to squeeze */ -void xbt_dynar_reset(xbt_dynar_t const dynar) +XBT_INLINE void xbt_dynar_reset(xbt_dynar_t const dynar) { _dynar_lock(dynar); @@ -293,7 +293,7 @@ void xbt_dynar_reset(xbt_dynar_t const dynar) * Set \a empty_slots_wanted to zero to reduce the dynar internal array as much * as possible. * Note that if \a empty_slots_wanted is greater than the array size, the internal - * array is not expanded and nothing is done. + * array is expanded instead of shriked. */ void xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots_wanted) { @@ -302,9 +302,9 @@ void xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots_wanted) _dynar_lock(dynar); size_wanted = dynar->used + empty_slots_wanted; - if (size_wanted < dynar->size) { + if (size_wanted != dynar->size) { dynar->size = size_wanted; - dynar->data = xbt_realloc(dynar->data, sizeof(void *) * dynar->size); + dynar->data = xbt_realloc(dynar->data, dynar->elmsize * dynar->size); } _dynar_unlock(dynar); } @@ -316,7 +316,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) +XBT_INLINE void xbt_dynar_free(xbt_dynar_t * dynar) { if (dynar && *dynar) { xbt_dynar_reset(*dynar); @@ -334,18 +334,28 @@ void xbt_dynar_free_voidp(void *d) * * \param dynar the dynar we want to mesure */ -unsigned long xbt_dynar_length(const xbt_dynar_t dynar) +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 + * + *\param dynar the dynat we want to check + */ + +XBT_INLINE int xbt_dynar_is_empty(const xbt_dynar_t dynar) +{ + return (xbt_dynar_length(dynar) == 0); +} + /** @brief Retrieve a copy of the Nth element of a dynar. * * \param dynar information dealer * \param idx index of the slot we want to retrieve * \param[out] dst where to put the result to. */ -void +XBT_INLINE void xbt_dynar_get_cpy(const xbt_dynar_t dynar, const unsigned long idx, void *const dst) { @@ -366,7 +376,8 @@ xbt_dynar_get_cpy(const xbt_dynar_t dynar, * \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) +XBT_INLINE void *xbt_dynar_get_ptr(const xbt_dynar_t dynar, + const unsigned long idx) { void *res; @@ -379,6 +390,28 @@ void *xbt_dynar_get_ptr(const xbt_dynar_t dynar, const unsigned long idx) return res; } +XBT_INLINE void *xbt_dynar_set_at_ptr(const xbt_dynar_t dynar, + const unsigned long idx) +{ + + void *res; + _dynar_lock(dynar); + _sanity_check_dynar(dynar); + + _xbt_dynar_expand(dynar, idx + 1); + + if (idx >= dynar->used) { + _xbt_clear_mem(((char * const)dynar->data) + dynar->used * dynar->elmsize, + (idx + 1 - dynar->used)*dynar->elmsize); + dynar->used = idx + 1; + } + + _dynar_unlock(dynar); + + res = _xbt_dynar_elm(dynar, idx); + + return res; +} static void XBT_INLINE /* not synchronized */ _xbt_dynar_set(xbt_dynar_t dynar, @@ -386,18 +419,19 @@ _xbt_dynar_set(xbt_dynar_t dynar, { _sanity_check_dynar(dynar); - _sanity_check_idx(idx); _xbt_dynar_expand(dynar, idx + 1); if (idx >= dynar->used) { + _xbt_clear_mem(((char * const)dynar->data) + dynar->used * dynar->elmsize, + (idx + 1 - dynar->used)*dynar->elmsize); dynar->used = idx + 1; } _xbt_dynar_put_elm(dynar, idx, src); } -/** @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 @@ -405,7 +439,8 @@ _xbt_dynar_set(xbt_dynar_t dynar, * * 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) +XBT_INLINE void xbt_dynar_set(xbt_dynar_t dynar, const int idx, + const void *const src) { _dynar_lock(dynar); @@ -413,7 +448,7 @@ void xbt_dynar_set(xbt_dynar_t dynar, const int idx, const void *const src) _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 @@ -429,7 +464,6 @@ 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); @@ -447,11 +481,10 @@ 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); - _check_sloppy_inbound_idx(dynar, idx); old_used = dynar->used; new_used = old_used + 1; @@ -460,9 +493,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); @@ -484,13 +518,13 @@ 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 * position right in the dynar. */ -void +XBT_INLINE void xbt_dynar_insert_at(xbt_dynar_t const dynar, const int idx, const void *const src) { @@ -524,7 +558,7 @@ xbt_dynar_remove_at(xbt_dynar_t const dynar, * * Raises not_found_error if not found. */ -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; @@ -536,7 +570,8 @@ 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, dynar); + THROW2(not_found_error, 0, "Element %p not part of dynar %p", elem, + dynar); } /** @brief Returns a boolean indicating whether the element is part of the dynar */ @@ -562,7 +597,7 @@ 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) +XBT_INLINE void *xbt_dynar_push_ptr(xbt_dynar_t const dynar) { void *res; @@ -576,11 +611,13 @@ void *xbt_dynar_push_ptr(xbt_dynar_t const dynar) } /** @brief Add an element at the end of the dynar */ -void xbt_dynar_push(xbt_dynar_t const dynar, const void *const src) +XBT_INLINE void xbt_dynar_push(xbt_dynar_t const dynar, + const void *const src) { _dynar_lock(dynar); /* checks done in xbt_dynar_insert_at_ptr */ - memcpy(_xbt_dynar_insert_at_ptr(dynar, dynar->used), src, dynar->elmsize); + memcpy(_xbt_dynar_insert_at_ptr(dynar, dynar->used), src, + dynar->elmsize); _dynar_unlock(dynar); } @@ -589,7 +626,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) +XBT_INLINE void *xbt_dynar_pop_ptr(xbt_dynar_t const dynar) { void *res; @@ -603,7 +640,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) +XBT_INLINE void xbt_dynar_pop(xbt_dynar_t const dynar, void *const dst) { /* sanity checks done by remove_at */ @@ -617,7 +654,8 @@ 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) +XBT_INLINE void xbt_dynar_unshift(xbt_dynar_t const dynar, + const void *const src) { /* sanity checks done by insert_at */ @@ -628,7 +666,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) +XBT_INLINE void xbt_dynar_shift(xbt_dynar_t const dynar, void *const dst) { /* sanity checks done by remove_at */ @@ -656,90 +694,110 @@ static void _dynar_map(const xbt_dynar_t dynar, void_f_pvoid_t const op) * operation, so make sure your function don't call any function * from xbt_dynar_* on it, or you'll get a deadlock. */ -void xbt_dynar_map(const xbt_dynar_t dynar, void_f_pvoid_t const op) +XBT_INLINE void xbt_dynar_map(const xbt_dynar_t dynar, + void_f_pvoid_t const op) { - _dynar_lock(dynar); _sanity_check_dynar(dynar); + _dynar_lock(dynar); _dynar_map(dynar, op); _dynar_unlock(dynar); } -/** @brief Put the cursor at the begining of the dynar. - * - * Actually, the cursor is set one step before the begining, so that you - * can iterate over the dynar with a for loop. + +/** @brief Removes and free the entry pointed by the cursor * - * @warning Do not call this function directly, but only through xbt_dynar_foreach. + * This function can be used while traversing without problem. */ -void -_xbt_dynar_cursor_first(const xbt_dynar_t dynar, unsigned int *const cursor) +XBT_INLINE void xbt_dynar_cursor_rm(xbt_dynar_t dynar, + unsigned int *const cursor) { - _dynar_lock(dynar); - DEBUG1("Set cursor on %p to the first position", (void *) dynar); - *cursor = 0; + _xbt_dynar_remove_at(dynar, (*cursor)--, NULL); } -/** @brief Move the cursor to the next value +/** @brief Unlocks a synchronized dynar when you want to break the traversal * - * @warning Do not call this function directly, but only through xbt_dynar_foreach. + * This function must be used if you break the + * xbt_dynar_foreach loop, but shouldn't be called at the end of a + * regular traversal reaching the end of the elements */ -void -_xbt_dynar_cursor_step(const xbt_dynar_t dynar, unsigned int *const cursor) +XBT_INLINE void xbt_dynar_cursor_unlock(xbt_dynar_t dynar) { - - (*cursor)++; + _dynar_unlock(dynar); } -/** @brief Get the data currently pointed by the cursor +/** @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*)). * - * @warning Do not call this function directly, but only through xbt_dynar_foreach. + * Remark: if the elements stored in the dynar are structures, the compar_fn + * function has to retrieve the field to sort first. */ -int -_xbt_dynar_cursor_get(const xbt_dynar_t dynar, - unsigned int *const cursor, void *const dst) +XBT_INLINE void xbt_dynar_sort(xbt_dynar_t dynar, + int_f_cpvoid_cpvoid_t compar_fn) { - _sanity_check_dynar(dynar); - { - - const unsigned long idx = *cursor; - - if (idx >= dynar->used) { - DEBUG1("Cursor on %p already on last elem", (void *) dynar); - _dynar_unlock(dynar); - return FALSE; - } - DEBUG2("Cash out cursor on %p at %lu", (void *) dynar, idx); + _dynar_lock(dynar); - _xbt_dynar_get_elm(dst, dynar, idx); - } - return TRUE; + qsort(dynar->data, dynar->used, dynar->elmsize, compar_fn); + _dynar_unlock(dynar); } -/** @brief Removes and free the entry pointed by the cursor +/** @brief Transform a dynar into a NULL terminated array * - * This function can be used while traversing without problem. + * \param dynar the dynar to transform */ -void xbt_dynar_cursor_rm(xbt_dynar_t dynar, unsigned int *const cursor) +XBT_INLINE void * xbt_dynar_to_array (xbt_dynar_t dynar) { - - _xbt_dynar_remove_at(dynar, (*cursor)--, NULL); + void * res; + void * last = xbt_new0(char,dynar->elmsize); + xbt_dynar_push(dynar, last); + free(last); + dynar->used--; + res = dynar->data; + free(dynar); + return res; } -/** @brief Unlocks a synchronized dynar when you want to break the traversal - * - * This function must be used if you break the - * xbt_dynar_foreach loop, but shouldn't be called at the end of a - * regular traversal reaching the end of the elements +/* + * Return 0 if d1 and d2 are equal and 1 if not equal */ -void xbt_dynar_cursor_unlock(xbt_dynar_t dynar) +XBT_INLINE int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2, + int(*compar)(const void *, const void *)) { - _dynar_unlock(dynar); + int i ; + int size; + if((!d1) && (!d2)) return 0; + if((!d1) || (!d2)) + { + DEBUG2("NULL dynar d1=%p d2=%p",d1,d2); + return 1; + } + if((d1->elmsize)!=(d2->elmsize)) + { + DEBUG2("Size of elmsize d1=%ld d2=%ld",d1->elmsize,d2->elmsize); + 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)); + return 1; + } + + size = xbt_dynar_length(d1); + for(i=0;i=0; cpt--) { + xbt_dynar_replace(d, cpt, &cpt); + xbt_test_log2("Push %d, length=%lu", cpt, xbt_dynar_length(d)); + } + + /* 3. Traverse the dynar */ + xbt_dynar_foreach(d, cursor, cpt) { + xbt_test_assert2(cursor == cpt, + "The retrieved value is not the same than the injected one (%d!=%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_assert2(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, + "There is still %lu elements in the dynar after removing everything", + xbt_dynar_length(d)); xbt_dynar_free(&d); } @@ -911,10 +1047,12 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles") xbt_test_add0("==== Traverse the empty dynar"); d = xbt_dynar_new(sizeof(int), NULL); xbt_dynar_foreach(d, cursor, cpt) { - xbt_test_assert0(FALSE, "Damnit, there is something in the empty dynar"); + xbt_test_assert0(FALSE, + "Damnit, there is something in the empty dynar"); } - xbt_dynar_free(&d); - xbt_dynar_free(&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_add0("==== Push/shift 5000 doubles"); d = xbt_dynar_new(sizeof(double), NULL); @@ -935,9 +1073,9 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles") "The retrieved value is not the same than the injected one (%f!=%f)", d1, d2); } - xbt_dynar_free(&d); - xbt_dynar_free(&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_add0("==== Unshift/pop 5000 doubles"); d = xbt_dynar_new(sizeof(double), NULL); @@ -952,13 +1090,14 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles") "The retrieved value is not the same than the injected one (%f!=%f)", d1, d2); } - xbt_dynar_free(&d); - xbt_dynar_free(&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_add0 - ("==== Push 5000 doubles, insert 1000 doubles in the middle, shift everything"); + ("==== Push 5000 doubles, insert 1000 doubles in the middle, shift everything"); d = xbt_dynar_new(sizeof(double), NULL); for (cpt = 0; cpt < 5000; cpt++) { d1 = (double) cpt; @@ -991,8 +1130,9 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles") "The retrieved value is not the same than the injected one at the end (%f!=%f)", d1, d2); } - xbt_dynar_free(&d); - xbt_dynar_free(&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_add0("==== Push 5000 double, remove 2000-4000. free the rest"); @@ -1007,8 +1147,9 @@ XBT_TEST_UNIT("double", test_dynar_double, "Dynars of doubles") xbt_test_assert2(d1 == d2, "Remove a bad value. Got %f, expected %f", d2, d1); } - xbt_dynar_free(&d); - xbt_dynar_free(&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 */ } @@ -1028,10 +1169,12 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings") xbt_test_add0("==== Traverse the empty dynar"); d = xbt_dynar_new(sizeof(char *), &xbt_free_ref); xbt_dynar_foreach(d, iter, s1) { - xbt_test_assert0(FALSE, "Damnit, there is something in the empty dynar"); + xbt_test_assert0(FALSE, + "Damnit, there is something in the empty dynar"); } - xbt_dynar_free(&d); - xbt_dynar_free(&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("==== Push %d strings, set them again 3 times, shift them", NB_ELEM); @@ -1066,9 +1209,9 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings") buf, s2); free(s2); } - xbt_dynar_free(&d); - xbt_dynar_free(&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("==== Unshift, traverse and pop %d strings", NB_ELEM); d = xbt_dynar_new(sizeof(char **), &xbt_free_ref); @@ -1094,13 +1237,14 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings") free(s2); } /* 4. Free the resources */ - xbt_dynar_free(&d); - xbt_dynar_free(&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_add2 - ("==== Push %d strings, insert %d strings in the middle, shift everything", - NB_ELEM, NB_ELEM / 5); + ("==== 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++) { sprintf(buf, "%d", cpt); @@ -1137,12 +1281,13 @@ XBT_TEST_UNIT("string", test_dynar_string, "Dynars of strings") buf, s2); free(s2); } - xbt_dynar_free(&d); - xbt_dynar_free(&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_add3("==== Push %d strings, remove %d-%d. free the rest", NB_ELEM, - 2 * (NB_ELEM / 5), 4 * (NB_ELEM / 5)); + xbt_test_add3("==== 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++) { sprintf(buf, "%d", cpt); @@ -1196,8 +1341,7 @@ static void poper_f(void *a) } -XBT_TEST_UNIT("synchronized int", test_dynar_sync_int, - "Synchronized dynars of integers") +XBT_TEST_UNIT("synchronized int", test_dynar_sync_int, "Synchronized dynars of integers") { /* Vars_decl [doxygen cruft] */ xbt_dynar_t d; @@ -1205,11 +1349,11 @@ XBT_TEST_UNIT("synchronized int", test_dynar_sync_int, xbt_test_add0("==== 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); - poper = xbt_thread_create("poper", poper_f, d); + pusher = xbt_thread_create("pusher", pusher_f, d, 0 /*not joinable */ ); + poper = xbt_thread_create("poper", poper_f, d, 0 /*not joinable */ ); xbt_thread_join(pusher); xbt_thread_join(poper); xbt_dynar_free(&d); } -#endif /* SIMGRID_TEST */ +#endif /* SIMGRID_TEST */