A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't call _xbt_dynar_expand when it's not needed.
[simgrid.git]
/
src
/
xbt
/
dynar.c
diff --git
a/src/xbt/dynar.c
b/src/xbt/dynar.c
index
b5468e3
..
7ae8517
100644
(file)
--- a/
src/xbt/dynar.c
+++ b/
src/xbt/dynar.c
@@
-152,11
+152,11
@@
_xbt_dynar_remove_at(xbt_dynar_t const dynar,
if (dynar->elmsize <= SIZEOF_MAX) {
char elm[SIZEOF_MAX];
_xbt_dynar_get_elm(elm, dynar, idx);
if (dynar->elmsize <= SIZEOF_MAX) {
char elm[SIZEOF_MAX];
_xbt_dynar_get_elm(elm, dynar, idx);
-
(*dynar->free_f)
(elm);
+
dynar->free_f
(elm);
} else {
char *elm = malloc(dynar->elmsize);
_xbt_dynar_get_elm(elm, dynar, idx);
} else {
char *elm = malloc(dynar->elmsize);
_xbt_dynar_get_elm(elm, dynar, idx);
-
(*dynar->free_f)
(elm);
+
dynar->free_f
(elm);
free(elm);
}
}
free(elm);
}
}
@@
-228,18
+228,11
@@
xbt_dynar_new_sync(const unsigned long elmsize,
void xbt_dynar_free_container(xbt_dynar_t * dynar)
{
if (dynar && *dynar) {
void xbt_dynar_free_container(xbt_dynar_t * dynar)
{
if (dynar && *dynar) {
-
- if ((*dynar)->data) {
- _xbt_clear_mem((*dynar)->data, (*dynar)->size);
- free((*dynar)->data);
- }
-
- if ((*dynar)->mutex)
- xbt_mutex_destroy((*dynar)->mutex);
-
- _xbt_clear_mem(*dynar, sizeof(s_xbt_dynar_t));
-
- free(*dynar);
+ xbt_dynar_t d = *dynar;
+ free(d->data);
+ if (d->mutex)
+ xbt_mutex_destroy(d->mutex);
+ free(d);
*dynar = NULL;
}
}
*dynar = NULL;
}
}
@@
-259,7
+252,6
@@
XBT_INLINE void xbt_dynar_reset(xbt_dynar_t const dynar)
_dynar_map(dynar, dynar->free_f);
}
/*
_dynar_map(dynar, dynar->free_f);
}
/*
- if (dynar->data)
free(dynar->data);
dynar->size = 0;
free(dynar->data);
dynar->size = 0;
@@
-390,9
+382,8
@@
XBT_INLINE void *xbt_dynar_set_at_ptr(const xbt_dynar_t dynar,
_dynar_lock(dynar);
_sanity_check_dynar(dynar);
_dynar_lock(dynar);
_sanity_check_dynar(dynar);
- _xbt_dynar_expand(dynar, idx + 1);
-
if (idx >= dynar->used) {
if (idx >= dynar->used) {
+ _xbt_dynar_expand(dynar, idx + 1);
_xbt_clear_mem(((char * const)dynar->data) + dynar->used * dynar->elmsize,
(idx + 1 - dynar->used)*dynar->elmsize);
dynar->used = idx + 1;
_xbt_clear_mem(((char * const)dynar->data) + dynar->used * dynar->elmsize,
(idx + 1 - dynar->used)*dynar->elmsize);
dynar->used = idx + 1;
@@
-412,9
+403,8
@@
_xbt_dynar_set(xbt_dynar_t dynar,
_sanity_check_dynar(dynar);
_sanity_check_dynar(dynar);
- _xbt_dynar_expand(dynar, idx + 1);
-
if (idx >= dynar->used) {
if (idx >= dynar->used) {
+ _xbt_dynar_expand(dynar, idx + 1);
_xbt_clear_mem(((char * const)dynar->data) + dynar->used * dynar->elmsize,
(idx + 1 - dynar->used)*dynar->elmsize);
dynar->used = idx + 1;
_xbt_clear_mem(((char * const)dynar->data) + dynar->used * dynar->elmsize,
(idx + 1 - dynar->used)*dynar->elmsize);
dynar->used = idx + 1;
@@
-460,7
+450,7
@@
xbt_dynar_replace(xbt_dynar_t dynar,
if (idx < dynar->used && dynar->free_f) {
void *const old_object = _xbt_dynar_elm(dynar, idx);
if (idx < dynar->used && dynar->free_f) {
void *const old_object = _xbt_dynar_elm(dynar, idx);
-
(*(dynar->free_f))
(old_object);
+
dynar->free_f
(old_object);
}
_xbt_dynar_set(dynar, idx, object);
}
_xbt_dynar_set(dynar, idx, object);
@@
-675,7
+665,7
@@
static void _dynar_map(const xbt_dynar_t dynar, void_f_pvoid_t const op)
for (i = 0; i < used; i++) {
char* elm = (char*) data + i * elmsize;
for (i = 0; i < used; i++) {
char* elm = (char*) data + i * elmsize;
-
(*op)
(elm);
+
op
(elm);
}
}
}
}
@@
-1003,7
+993,7
@@
XBT_TEST_UNIT("insert",test_dynar_insert,"Using the xbt_dynar_insert and xbt_dyn
"The retrieved value is not the same than the injected one (%d!=%d)",
cursor, cpt);
}
"The retrieved value is not the same than the injected one (%d!=%d)",
cursor, cpt);
}
- xbt_test_assert(xbt_dynar_
length(d) == 0
,
+ xbt_test_assert(xbt_dynar_
is_empty(d)
,
"There is still %lu elements in the dynar after removing everything",
xbt_dynar_length(d));
xbt_dynar_free(&d);
"There is still %lu elements in the dynar after removing everything",
xbt_dynar_length(d));
xbt_dynar_free(&d);
@@
-1031,7
+1021,7
@@
XBT_TEST_UNIT("insert",test_dynar_insert,"Using the xbt_dynar_insert and xbt_dyn
"The retrieved value is not the same than the injected one (%d!=%d)",
cursor, cpt);
}
"The retrieved value is not the same than the injected one (%d!=%d)",
cursor, cpt);
}
- xbt_test_assert(xbt_dynar_
length(d) == 0
,
+ xbt_test_assert(xbt_dynar_
is_empty(d)
,
"There is still %lu elements in the dynar after removing everything",
xbt_dynar_length(d));
xbt_dynar_free(&d);
"There is still %lu elements in the dynar after removing everything",
xbt_dynar_length(d));
xbt_dynar_free(&d);
@@
-1324,7
+1314,7
@@
static void pusher_f(void *a)
static void poper_f(void *a)
{
xbt_dynar_t d = (xbt_dynar_t) a;
static void poper_f(void *a)
{
xbt_dynar_t d = (xbt_dynar_t) a;
- int i;
+
volatile
int i;
int data;
xbt_ex_t e;
int data;
xbt_ex_t e;