Various cleanups and some more debug

[simgrid.git] / src / xbt / dynar.c

diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c
index f6b45ce..ab89031 100644 (file)
--- a/src/xbt/dynar.c
+++ b/src/xbt/dynar.c
@@ -553,15 +553,27 @@ xbt_dynar_member(xbt_dynar_t  const dynar,
  */
 void *
 xbt_dynar_push_ptr(xbt_dynar_t  const dynar) {
-  return xbt_dynar_insert_at_ptr(dynar, dynar->used);    
+  void *res;
+
+  /* we have to inline xbt_dynar_insert_at_ptr here to make sure that 
+    dynar->used don't change between reading it and getting the lock 
+   within xbt_dynar_insert_at_ptr */
+  _dynar_lock(dynar);
+  res = _xbt_dynar_insert_at_ptr(dynar,dynar->used);
+  _dynar_unlock(dynar);
+  return res;
 }
 
 /** @brief Add an element at the end of the dynar */
 void
 xbt_dynar_push(xbt_dynar_t  const dynar,
                 const void   * const src) {
-  /* sanity checks done by insert_at */
-  xbt_dynar_insert_at(dynar, dynar->used, src); 
+  _dynar_lock(dynar);
+  /* checks done in xbt_dynar_insert_at_ptr */
+  memcpy(_xbt_dynar_insert_at_ptr(dynar,dynar->used),
+        src,
+        dynar->elmsize);
+  _dynar_unlock(dynar);
 }
 
 /** @brief Mark the last dynar's element as unused and return a pointer to it.
@@ -589,7 +601,9 @@ xbt_dynar_pop(xbt_dynar_t  const dynar,
 
   /* sanity checks done by remove_at */
   DEBUG1("Pop %p",(void*)dynar);
-  xbt_dynar_remove_at(dynar, dynar->used-1, dst);
+  _dynar_lock(dynar);
+  _xbt_dynar_remove_at(dynar, dynar->used-1, dst);
+  _dynar_unlock(dynar);
 }
 
 /** @brief Add an element at the begining of the dynar.
@@ -991,11 +1005,6 @@ XBT_TEST_UNIT("double",test_dynar_double,"Dynars of doubles") {
 
 /* doxygen_string_cruft */
 
-/* The function we will use to free the data */
-static void free_string(void *d){
-  free(*(void**)d);
-}
-
 /*******************************************************************************/
 /*******************************************************************************/
 /*******************************************************************************/
@@ -1007,7 +1016,7 @@ XBT_TEST_UNIT("string",test_dynar_string,"Dyars of strings") {
    char *s1,*s2;
    
    xbt_test_add0("==== Traverse the empty dynar");
-   d=xbt_dynar_new(sizeof(char *),&free_string);
+   d=xbt_dynar_new(sizeof(char *),&xbt_free_ref);
    xbt_dynar_foreach(d,iter,s1){
      xbt_test_assert0(FALSE,
                  "Damnit, there is something in the empty dynar");
@@ -1017,7 +1026,7 @@ XBT_TEST_UNIT("string",test_dynar_string,"Dyars of strings") {
 
    xbt_test_add1("==== Push %d strings, set them again 3 times, shift them",NB_ELEM);
    /* Populate_str [doxygen cruft] */
-   d=xbt_dynar_new(sizeof(char*),&free_string);
+   d=xbt_dynar_new(sizeof(char*),&xbt_free_ref);
    /* 1. Populate the dynar */
    for (cpt=0; cpt< NB_ELEM; cpt++) {
      sprintf(buf,"%d",cpt);
@@ -1052,7 +1061,7 @@ XBT_TEST_UNIT("string",test_dynar_string,"Dyars of strings") {
 
 
    xbt_test_add1("==== Unshift, traverse and pop %d strings",NB_ELEM);
-   d=xbt_dynar_new(sizeof(char**),&free_string);
+   d=xbt_dynar_new(sizeof(char**),&xbt_free_ref);
    for (cpt=0; cpt< NB_ELEM; cpt++) {
      sprintf(buf,"%d",cpt);
      s1=strdup(buf);
@@ -1080,7 +1089,7 @@ XBT_TEST_UNIT("string",test_dynar_string,"Dyars of strings") {
 
 
    xbt_test_add2("==== Push %d strings, insert %d strings in the middle, shift everything",NB_ELEM,NB_ELEM/5);
-   d=xbt_dynar_new(sizeof(char*),&free_string);
+   d=xbt_dynar_new(sizeof(char*),&xbt_free_ref);
    for (cpt=0; cpt< NB_ELEM; cpt++) {
      sprintf(buf,"%d",cpt);
      s1=strdup(buf);
@@ -1121,7 +1130,7 @@ XBT_TEST_UNIT("string",test_dynar_string,"Dyars of strings") {
 
 
    xbt_test_add3("==== Push %d strings, remove %d-%d. free the rest",NB_ELEM,2*(NB_ELEM/5),4*(NB_ELEM/5));
-   d=xbt_dynar_new(sizeof(char*),&free_string);
+   d=xbt_dynar_new(sizeof(char*),&xbt_free_ref);
    for (cpt=0; cpt< NB_ELEM; cpt++) {
      sprintf(buf,"%d",cpt);
      s1=strdup(buf);