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
Doc update.
[simgrid.git]
/
src
/
xbt
/
dynar.c
diff --git
a/src/xbt/dynar.c
b/src/xbt/dynar.c
index
7517190
..
b7ed051
100644
(file)
--- a/
src/xbt/dynar.c
+++ b/
src/xbt/dynar.c
@@
-149,7
+149,7
@@
XBT_INLINE void xbt_dynar_reset(xbt_dynar_t const dynar)
{
_sanity_check_dynar(dynar);
- XBT_
DEBUG(
"Reset the dynar %p", (void *) dynar);
+ XBT_
CDEBUG(xbt_dyn,
"Reset the dynar %p", (void *) dynar);
if (dynar->free_f) {
xbt_dynar_map(dynar, dynar->free_f);
}
@@
-557,7
+557,7
@@
XBT_INLINE void xbt_dynar_push(xbt_dynar_t const dynar,
XBT_INLINE void *xbt_dynar_pop_ptr(xbt_dynar_t const dynar)
{
_check_populated_dynar(dynar);
- XBT_
DEBUG(
"Pop %p", (void *) dynar);
+ XBT_
CDEBUG(xbt_dyn,
"Pop %p", (void *) dynar);
dynar->used--;
return _xbt_dynar_elm(dynar, dynar->used);
}
@@
-567,7
+567,7
@@
XBT_INLINE void xbt_dynar_pop(xbt_dynar_t const dynar, void *const dst)
{
/* sanity checks done by remove_at */
- XBT_
DEBUG(
"Pop %p", (void *) dynar);
+ XBT_
CDEBUG(xbt_dyn,
"Pop %p", (void *) dynar);
xbt_dynar_remove_at(dynar, dynar->used - 1, dst);
}
@@
-638,11
+638,7
@@
XBT_INLINE void xbt_dynar_cursor_rm(xbt_dynar_t dynar,
XBT_INLINE void xbt_dynar_sort(xbt_dynar_t dynar,
int_f_cpvoid_cpvoid_t compar_fn)
{
-#ifdef HAVE_MERGESORT
- mergesort(dynar->data, dynar->used, dynar->elmsize, compar_fn);
-#else
qsort(dynar->data, dynar->used, dynar->elmsize, compar_fn);
-#endif
}
/** @brief Sorts a dynar according to their color assuming elements can have only three colors.
@@
-691,10
+687,13
@@
XBT_PUBLIC(void) xbt_dynar_three_way_partition(xbt_dynar_t const dynar,
}
/** @brief Transform a dynar into a NULL terminated array.
- * The dynar won't be usable afterwards.
- * \param dynar the dynar to transform
+ *
+ * \param dynar the dynar to transform
+ * \return pointer to the first element of the array
+ *
+ * Note: The dynar won't be usable afterwards.
*/
-XBT_INLINE void *
xbt_dynar_to_array
(xbt_dynar_t dynar)
+XBT_INLINE void *
xbt_dynar_to_array
(xbt_dynar_t dynar)
{
void *res;
xbt_dynar_shrink(dynar, 1);
@@
-704,10
+703,19
@@
XBT_INLINE void * xbt_dynar_to_array (xbt_dynar_t dynar)
return res;
}
-/*
- * Return 0 if d1 and d2 are equal and 1 if not equal
+/** @brief Compare two dynars
+ *
+ * \param d1 first dynar to compare
+ * \param d2 second dynar to compare
+ * \param compar function to use to compare elements
+ * \return 0 if d1 and d2 are equal and 1 if not equal
+ *
+ * d1 and d2 should be dynars of pointers. The compar function takes two
+ * elements and returns 0 when they are considered equal, and a value different
+ * of zero when they are considered different. Finally, d2 is destroyed
+ * afterwards.
*/
-
XBT_INLINE
int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2,
+int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2,
int(*compar)(const void *, const void *))
{
int i ;