static XBT_INLINE void _sanity_check_dynar(xbt_dynar_t dynar)
{
- xbt_assert0(dynar, "dynar is NULL");
+ xbt_assert(dynar, "dynar is NULL");
}
static XBT_INLINE void _sanity_check_idx(int idx)
{
- xbt_assert1(idx >= 0, "dynar idx(=%d) < 0", (int) (idx));
+ xbt_assert(idx >= 0, "dynar idx(=%d) < 0", (int) (idx));
}
static XBT_INLINE void _check_inbound_idx(xbt_dynar_t dynar, int idx)
{
if (idx < 0 || idx >= dynar->used) {
_dynar_unlock(dynar);
- THROW2(bound_error, idx,
+ THROWF(bound_error, idx,
"dynar is not that long. You asked %d, but it's only %lu long",
(int) (idx), (unsigned long) dynar->used);
}
{
if (idx > dynar->used) {
_dynar_unlock(dynar);
- THROW2(bound_error, idx,
+ THROWF(bound_error, idx,
"dynar is not that long. You asked %d, but it's only %lu long (could have been equal to it)",
(int) (idx), (unsigned long) dynar->used);
}
{
if (dynar->used == 0) {
_dynar_unlock(dynar);
- THROW1(bound_error, 0, "dynar %p is empty", dynar);
+ THROWF(bound_error, 0, "dynar %p is empty", dynar);
}
}
const unsigned long old_size = dynar->size;
if (nb > old_size) {
- char *const old_data = (char *) dynar->data;
-
+ void *const old_data = 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));
+ const unsigned long expand = 2 * (old_size + 1);
+ const unsigned long new_size = (nb > expand ? nb : expand);
const unsigned long new_length = new_size * elmsize;
- char *const new_data = (char *) xbt_malloc0(elmsize * new_size);
+ void *const new_data = xbt_realloc(old_data, new_length);
- XBT_DEBUG("expand %p from %lu to %lu elements", (void *) dynar,
- (unsigned long) old_size, nb);
-
- if (old_data) {
- memcpy(new_data, old_data, used_length);
- free(old_data);
- }
+ XBT_DEBUG("expand %p from %lu to %lu elements", dynar, old_size, new_size);
- _xbt_clear_mem(new_data + used_length, new_length - used_length);
+ _xbt_clear_mem((char *)new_data + old_length, new_length - old_length);
dynar->size = new_size;
dynar->data = new_data;
/** \brief free a dynar passed as void* (handy to store dynar in dynars or dict) */
void xbt_dynar_free_voidp(void *d)
{
- xbt_dynar_free((xbt_dynar_t *) d);
+ xbt_dynar_t dynar = (xbt_dynar_t)d;
+ xbt_dynar_free(&dynar);
}
/** @brief Count of dynar's elements
}
_dynar_unlock(dynar);
- THROW2(not_found_error, 0, "Element %p not part of dynar %p", elem,
+ THROWF(not_found_error, 0, "Element %p not part of dynar %p", elem,
dynar);
}
TRY {
xbt_dynar_search(dynar, elem);
- } CATCH(e) {
+ }
+ CATCH(e) {
if (e.category == not_found_error) {
xbt_ex_free(e);
return 0;
static void _dynar_map(const xbt_dynar_t dynar, void_f_pvoid_t const op)
{
- char elm[SIZEOF_MAX];
+ char *const data = (char *) dynar->data;
+ const unsigned long elmsize = dynar->elmsize;
const unsigned long used = dynar->used;
- unsigned long i = 0;
+ unsigned long i;
for (i = 0; i < used; i++) {
- _xbt_dynar_get_elm(elm, dynar, i);
+ char* elm = (char*) data + i * elmsize;
(*op) (elm);
}
}
_dynar_lock(dynar);
+#ifdef HAVE_MERGESORT
+ mergesort(dynar->data, dynar->used, dynar->elmsize, compar_fn);
+#else
qsort(dynar->data, dynar->used, dynar->elmsize, compar_fn);
-
+#endif
_dynar_unlock(dynar);
}
if((!d1) || (!d2))
{
XBT_DEBUG("NULL dynar d1=%p d2=%p",d1,d2);
+ xbt_dynar_free(&d2);
return 1;
}
if((d1->elmsize)!=(d2->elmsize))
{
XBT_DEBUG("Size of elmsize d1=%ld d2=%ld",d1->elmsize,d2->elmsize);
+ xbt_dynar_free(&d2);
return 1; // xbt_die
}
if(xbt_dynar_length(d1) != xbt_dynar_length(d2))
{
XBT_DEBUG("Size of dynar d1=%ld d2=%ld",xbt_dynar_length(d1),xbt_dynar_length(d2));
+ xbt_dynar_free(&d2);
return 1;
}
void *data1 = xbt_dynar_get_as(d1, i, void *);
void *data2 = xbt_dynar_get_as(d2, i, void *);
XBT_DEBUG("link[%d] d1=%p d2=%p",i,data1,data2);
- if(compar(data1,data2)) return 1;
+ if(compar(data1,data2)){
+ xbt_dynar_free(&d2);
+ return 1;
+ }
}
+ xbt_dynar_free(&d2);
return 0;
}