X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dcf893e03deb3f71feeee0218a83e7ed76aa574d..0d532db1711fc2383a3df2cb20a583281ad5adce:/include/xbt/dynar.h diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h index 87b501c655..79b590d6d0 100644 --- a/include/xbt/dynar.h +++ b/include/xbt/dynar.h @@ -224,16 +224,13 @@ typedef struct xbt_dynar_s { unsigned long elmsize; void *data; void_f_pvoid_t free_f; - xbt_mutex_t mutex; } s_xbt_dynar_t; static XBT_INLINE void _xbt_dynar_cursor_first(const xbt_dynar_t dynar, unsigned int *const cursor) { - /* don't test for dynar!=NULL. The segfault would tell us */ - if (dynar->mutex) /* ie _dynar_lock(dynar) but not public */ - xbt_mutex_acquire(dynar->mutex); + /* iterating over a NULL dynar is a no-op (but we don't want to have uninitialized counters) */ //XBT_DEBUG("Set cursor on %p to the first position", (void *) dynar); *cursor = 0; @@ -243,11 +240,11 @@ static XBT_INLINE int _xbt_dynar_cursor_get(const xbt_dynar_t dynar, unsigned int idx, void *const dst) { + if (!dynar) /* iterating over a NULL dynar is a no-op */ + return FALSE; if (idx >= dynar->used) { //XBT_DEBUG("Cursor on %p already on last elem", (void *) dynar); - if (dynar->mutex) /* unlock */ - xbt_mutex_release(dynar->mutex); return FALSE; } // XBT_DEBUG("Cash out cursor on %p at %u", (void *) dynar, *idx); @@ -279,7 +276,7 @@ xbt_dynar_foreach (dyn,cpt,str) { */ #define xbt_dynar_foreach(_dynar,_cursor,_data) \ for (_xbt_dynar_cursor_first(_dynar,&(_cursor)) ; \ - _xbt_dynar_cursor_get(_dynar,_cursor,&_data) ; \ + _xbt_dynar_cursor_get(_dynar,_cursor,&_data) ; \ (_cursor)++ ) /** @} */