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
Merge branch 'master' into MC_LTL
[simgrid.git]
/
src
/
xbt
/
dynar.c
diff --git
a/src/xbt/dynar.c
b/src/xbt/dynar.c
index
85687a2
..
c630ff0
100644
(file)
--- a/
src/xbt/dynar.c
+++ b/
src/xbt/dynar.c
@@
-6,7
+6,6
@@
/* 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. */
/* 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. */
-#include "portable.h" /* SIZEOF_MAX */
#include "xbt/misc.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
#include "xbt/misc.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
@@
-141,16
+140,7
@@
_xbt_dynar_remove_at(xbt_dynar_t const dynar,
if (object) {
_xbt_dynar_get_elm(object, dynar, idx);
} else if (dynar->free_f) {
if (object) {
_xbt_dynar_get_elm(object, dynar, idx);
} else if (dynar->free_f) {
- if (dynar->elmsize <= SIZEOF_MAX) {
- char elm[SIZEOF_MAX];
- _xbt_dynar_get_elm(elm, dynar, idx);
- dynar->free_f(elm);
- } else {
- char *elm = malloc(dynar->elmsize);
- _xbt_dynar_get_elm(elm, dynar, idx);
- dynar->free_f(elm);
- free(elm);
- }
+ dynar->free_f(_xbt_dynar_elm(dynar, idx));
}
nb_shift = dynar->used - 1 - idx;
}
nb_shift = dynar->used - 1 - idx;
@@
-301,7
+291,7
@@
XBT_INLINE unsigned long xbt_dynar_length(const xbt_dynar_t dynar)
return (dynar ? (unsigned long) dynar->used : (unsigned long) 0);
}
return (dynar ? (unsigned long) dynar->used : (unsigned long) 0);
}
-/**@brief check if a dynar is empty
+
/**@brief check if a dynar is empty
*
*\param dynar the dynat we want to check
*/
*
*\param dynar the dynat we want to check
*/
@@
-360,8
+350,10
@@
static XBT_INLINE void *_xbt_dynar_set_at_ptr(const xbt_dynar_t dynar,
if (idx >= dynar->used) {
_xbt_dynar_expand(dynar, idx + 1);
if (idx >= dynar->used) {
_xbt_dynar_expand(dynar, idx + 1);
- memset(((char * const)dynar->data) + dynar->used * dynar->elmsize, 0,
- (idx + 1 - dynar->used)*dynar->elmsize);
+ if (idx > dynar->used) {
+ memset(_xbt_dynar_elm(dynar, dynar->used), 0,
+ (idx - dynar->used) * dynar->elmsize);
+ }
dynar->used = idx + 1;
}
return _xbt_dynar_elm(dynar, idx);
dynar->used = idx + 1;
}
return _xbt_dynar_elm(dynar, idx);
@@
-712,13
+704,14
@@
XBT_INLINE void xbt_dynar_sort(xbt_dynar_t dynar,
*/
XBT_INLINE void * xbt_dynar_to_array (xbt_dynar_t dynar)
{
*/
XBT_INLINE void * xbt_dynar_to_array (xbt_dynar_t dynar)
{
- void * res;
- void * last = xbt_new0(char,dynar->elmsize);
- xbt_dynar_push(dynar, last);
- free(last);
- res = dynar->data;
- free(dynar);
- return res;
+ void *res;
+ xbt_dynar_shrink(dynar, 1);
+ memset(xbt_dynar_push_ptr(dynar), 0, dynar->elmsize);
+ res = dynar->data;
+ if (dynar->mutex)
+ xbt_mutex_destroy(dynar->mutex);
+ free(dynar);
+ return res;
}
/*
}
/*