-/* $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. */
}
}
-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);
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;
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);
}
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;
}
static XBT_INLINE
- void
+ void
_xbt_dynar_get_elm(void *const dst,
const xbt_dynar_t dynar, const unsigned long idx)
{
}
static XBT_INLINE
- void
+ void
_xbt_dynar_put_elm(const xbt_dynar_t dynar,
const unsigned long idx, const void *const src)
{
}
static XBT_INLINE
- void
+ void
_xbt_dynar_remove_at(xbt_dynar_t const dynar,
const unsigned long idx, void *const object)
{
if (nb_shift) {
offset = nb_shift * dynar->elmsize;
- memmove(_xbt_dynar_elm(dynar, idx), _xbt_dynar_elm(dynar, idx + 1), offset);
+ memmove(_xbt_dynar_elm(dynar, idx), _xbt_dynar_elm(dynar, idx + 1),
+ offset);
}
dynar->used--;
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
*
*/
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();
* 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)
{
_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);
}
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
* \warning The returned value is the actual content of the dynar.
* Make a copy before fooling with it.
*/
-XBT_INLINE 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;
*
* If you want to free the previous content, use xbt_dynar_replace().
*/
-XBT_INLINE 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);
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;
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);
*
* 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;
}
_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 */
}
/** @brief Add an element at the end of the dynar */
-XBT_INLINE 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);
}
*
* This is less efficient than xbt_dynar_push()
*/
-XBT_INLINE 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 */
* operation, so make sure your function don't call any function
* from xbt_dynar_* on it, or you'll get a deadlock.
*/
-XBT_INLINE 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)
{
_sanity_check_dynar(dynar);
*
* This function can be used while traversing without problem.
*/
-XBT_INLINE void xbt_dynar_cursor_rm(xbt_dynar_t dynar, unsigned int *const cursor)
+XBT_INLINE void xbt_dynar_cursor_rm(xbt_dynar_t dynar,
+ unsigned int *const cursor)
{
_xbt_dynar_remove_at(dynar, (*cursor)--, NULL);
_dynar_unlock(dynar);
}
+/** @brief Sorts a dynar according to the function <tt>compar_fn</tt>
+ *
+ * \param compar_fn comparison function of type (int (compar_fn*) (void*) (void*)).
+ *
+ * Remark: if the elements stored in the dynar are structures, the compar_fn
+ * function has to retrieve the field to sort first.
+ */
+XBT_INLINE void xbt_dynar_sort(xbt_dynar_t dynar,
+ int_f_cpvoid_cpvoid_t compar_fn)
+{
+
+ _dynar_lock(dynar);
+
+ qsort(dynar->data, dynar->used, dynar->elmsize, compar_fn);
+
+ _dynar_unlock(dynar);
+}
+
+/*
+ * Return 0 if d1 and d2 are equal and 1 if not equal
+ */
+XBT_INLINE 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)) return 1;
+ if((d1->elmsize)!=(d2->elmsize)) return 1; // xbt_die
+ if(xbt_dynar_length(d1) != xbt_dynar_length(d2)) return 1;
+
+ size = xbt_dynar_length(d1);
+ for(i=0;i<size;i++)
+ {
+ void *data1 = xbt_dynar_get_as(d1, i, void *);
+ void *data2 = xbt_dynar_get_as(d2, i, void *);
+ if(compar(data1,data2)) return 1;
+ }
+ return 0;
+}
+
#ifdef SIMGRID_TEST
#define NB_ELEM 5000
xbt_dynar_foreach(d, cursor, i) {
xbt_assert0(0, "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 int, set them again 3 times, traverse them, shift them",
- NB_ELEM);
+ ("==== 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), NULL);
}
/* 5. 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_add1("==== Unshift/pop %d int", NB_ELEM);
d = xbt_dynar_new(sizeof(int), NULL);
i, cpt);
xbt_test_log2("Pop %d, length=%lu", cpt, xbt_dynar_length(d));
}
- 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 int, insert 1000 int in the middle, shift everything",
- NB_ELEM);
+ ("==== 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));
}
- for (cpt = 0; cpt < 1000; cpt++) {
- xbt_dynar_insert_at_as(d, 2500, int, cpt);
+ 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));
}
- for (cpt = 0; cpt < 2500; cpt++) {
+ for (cpt = 0; cpt < NB_ELEM/2; cpt++) {
xbt_dynar_shift(d, &i);
xbt_test_assert2(i == cpt,
"The retrieved value is not the same than the injected one at the begining (%d!=%d)",
"The retrieved value is not the same than the injected one at the end (%d!=%d)",
i, cpt);
}
- 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 int, remove 2000-4000. free the rest", NB_ELEM);
+ xbt_test_add1("==== 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++)
xbt_dynar_push_as(d, int, cpt);
"Remove a bad value. Got %d, expected %d", i, cpt);
DEBUG2("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(int), NULL);
+ unsigned int cursor,cpt;
+
+ xbt_test_add1("==== 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));
+ }
+
+ /* 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 */
+
+ /* Re-fill with the same values using set_as (and re-verify) */
+ for (cpt = 0; cpt < NB_ELEM; cpt++)
+ xbt_dynar_set_as(d, cpt, int, cpt);
+ xbt_dynar_foreach(d, cursor, cpt)
+ xbt_test_assert2(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,
+ "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);
+
+ /* ********************* */
+ xbt_test_add1("==== 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));
+ }
+
+ /* 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);
}
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);
"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);
"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;
"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");
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 */
}
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);
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);
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);
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);
}
-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;
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,0/*not joinable*/);
- poper = xbt_thread_create("poper", poper_f, d,0/*not joinable*/);
+ 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 */
