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);
_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_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)",
/* 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);
+ 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 */
+
+ 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 %d 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 %d elements in the dynar after removing everything",
+ xbt_dynar_length(d));
+ xbt_dynar_free(&d);
+}
+
/*******************************************************************************/
/*******************************************************************************/
/*******************************************************************************/