Match xbt_malloc with xbt_free.

diff --git a/examples/c/app-bittorrent/tracker.c b/examples/c/app-bittorrent/tracker.c
index 6014e5a..359f803 100644 (file)
--- a/examples/c/app-bittorrent/tracker.c
+++ b/examples/c/app-bittorrent/tracker.c
@@ -17,7 +17,7 @@ void tracker_answer_free(void* data)
 {
   tracker_answer_t a = (tracker_answer_t)data;
   xbt_dynar_free(&a->peers);
-  free(a);
+  xbt_free(a);
 }
 
 static int is_in_list(const_xbt_dynar_t peers, int id)

diff --git a/examples/c/app-chainsend/broadcaster.c b/examples/c/app-chainsend/broadcaster.c
index 55b8af1..ef82e68 100644 (file)
--- a/examples/c/app-chainsend/broadcaster.c
+++ b/examples/c/app-chainsend/broadcaster.c
@@ -65,9 +65,9 @@ static broadcaster_t broadcaster_init(sg_mailbox_t* mailboxes, unsigned int host
 
 static void broadcaster_destroy(broadcaster_t bc)
 {
-  free(bc->pending_sends);
-  free(bc->mailboxes);
-  free(bc);
+  xbt_free(bc->pending_sends);
+  xbt_free(bc->mailboxes);
+  xbt_free(bc);
 }
 
 /** Emitter function  */

diff --git a/examples/c/app-chainsend/peer.c b/examples/c/app-chainsend/peer.c
index 2040458..2fd0525 100644 (file)
--- a/examples/c/app-chainsend/peer.c
+++ b/examples/c/app-chainsend/peer.c
@@ -16,7 +16,7 @@ static void peer_join_chain(peer_t p)
   p->total_pieces     = msg->num_pieces;
   XBT_DEBUG("Peer %s got a 'BUILD_CHAIN' message (prev: %s / next: %s)", sg_mailbox_get_name(p->me),
             p->prev ? sg_mailbox_get_name(p->prev) : NULL, p->next ? sg_mailbox_get_name(p->next) : NULL);
-  free(msg);
+  xbt_free(msg);
 }
 
 static void peer_forward_file(peer_t p)
@@ -73,10 +73,10 @@ static peer_t peer_init(int argc, char* argv[])
 
 static void peer_delete(peer_t p)
 {
-  free(p->pending_recvs);
-  free(p->pending_sends);
+  xbt_free(p->pending_recvs);
+  xbt_free(p->pending_sends);
 
-  free(p);
+  xbt_free(p);
 }
 
 void peer(int argc, char* argv[])

diff --git a/examples/c/app-masterworker/app-masterworker.c b/examples/c/app-masterworker/app-masterworker.c
index f5856c0..5dbb223 100644 (file)
--- a/examples/c/app-masterworker/app-masterworker.c
+++ b/examples/c/app-masterworker/app-masterworker.c
@@ -71,11 +71,11 @@ static void worker(int argc, char* argv[])
     double* payload = (double*)sg_mailbox_get(mailbox);
 
     if (*payload == FINALIZE) {
-      free(payload); /* - Exit if 'finalize' is received */
+      xbt_free(payload); /* - Exit if 'finalize' is received */
       break;
     }
     sg_actor_execute(*payload); /*  - Otherwise, process the received number of flops*/
-    free(payload);
+    xbt_free(payload);
   }
   XBT_INFO("I'm done. See you!");
 }

diff --git a/examples/c/cloud-masterworker/cloud-masterworker.c b/examples/c/cloud-masterworker/cloud-masterworker.c
index a1f20cd..a38f355 100644 (file)
--- a/examples/c/cloud-masterworker/cloud-masterworker.c
+++ b/examples/c/cloud-masterworker/cloud-masterworker.c
@@ -53,13 +53,13 @@ static void worker_fun(int argc, char* argv[])
     XBT_INFO("%s received from mailbox(%s)", pr_name, mbox_name);
 
     if (*payload == FINALIZE) {
-      free(payload);
+      xbt_free(payload);
       break;
     }
 
     sg_actor_execute(*payload);
     XBT_INFO("%s executed", pr_name);
-    free(payload);
+    xbt_free(payload);
   }
 }
 
@@ -163,7 +163,7 @@ static void master_fun(int argc, char* argv[])
   }
 
   XBT_INFO("# Goodbye now!");
-  free(vms);
+  xbt_free(vms);
 }
 
 int main(int argc, char* argv[])
@@ -189,7 +189,7 @@ int main(int argc, char* argv[])
   for (int i = 0; i < 2; i++)
     worker_pms[i] = pms[i + 1];
 
-  free(pms);
+  xbt_free(pms);
 
   sg_actor_t actor = sg_actor_init("master", master_pm);
   sg_actor_set_data(actor, worker_pms);
@@ -198,7 +198,7 @@ int main(int argc, char* argv[])
   simgrid_run();
   XBT_INFO("Bye (simulation time %g)", simgrid_get_clock());
 
-  free(worker_pms);
+  xbt_free(worker_pms);
 
   return 0;
 }

diff --git a/examples/c/cloud-simple/cloud-simple.c b/examples/c/cloud-simple/cloud-simple.c
index 10b0f68..dcd03e0 100644 (file)
--- a/examples/c/cloud-simple/cloud-simple.c
+++ b/examples/c/cloud-simple/cloud-simple.c
@@ -64,7 +64,7 @@ static void communication_rx_fun(int argc, char* argv[])
   XBT_INFO("%s:%s to %s:%s => %g sec", sg_host_get_name(priv->tx_host), sg_actor_get_name(priv->tx_proc), host_name,
            pr_name, clock_end - priv->clock_sta);
 
-  free(priv);
+  xbt_free(priv);
 }
 
 static void launch_communication_worker(sg_host_t tx_host, sg_host_t rx_host)

diff --git a/examples/c/comm-waitall/comm-waitall.c b/examples/c/comm-waitall/comm-waitall.c
index 15257d9..ad537dc 100644 (file)
--- a/examples/c/comm-waitall/comm-waitall.c
+++ b/examples/c/comm-waitall/comm-waitall.c
@@ -61,8 +61,8 @@ static void sender(int argc, char* argv[])
   /* Now that all message exchanges were initiated, wait for their completion in one single call */
   sg_comm_wait_all(pending_comms, pending_comms_count);
 
-  free(pending_comms);
-  free(mboxes);
+  xbt_free(pending_comms);
+  xbt_free(mboxes);
 
   XBT_INFO("Goodbye now!");
 }

diff --git a/examples/c/comm-waitany/comm-waitany.c b/examples/c/comm-waitany/comm-waitany.c
index b93bc28..64df359 100644 (file)
--- a/examples/c/comm-waitany/comm-waitany.c
+++ b/examples/c/comm-waitany/comm-waitany.c
@@ -74,8 +74,8 @@ static void sender(int argc, char* argv[])
                changed_pos);
   }
 
-  free(pending_comms);
-  free(mboxes);
+  xbt_free(pending_comms);
+  xbt_free(mboxes);
 
   XBT_INFO("Goodbye now!");
 }

diff --git a/examples/c/dht-kademlia/message.c b/examples/c/dht-kademlia/message.c
index 3af31d1..24b6a35 100644 (file)
--- a/examples/c/dht-kademlia/message.c
+++ b/examples/c/dht-kademlia/message.c
@@ -26,5 +26,5 @@ void free_message(void* message)
   const kademlia_message_t msg = (kademlia_message_t)message;
   if (msg)
     answer_free(msg->answer);
-  free(msg);
+  xbt_free(msg);
 }

diff --git a/examples/c/dht-kademlia/node.c b/examples/c/dht-kademlia/node.c
index edc9518..d8204d3 100644 (file)
--- a/examples/c/dht-kademlia/node.c
+++ b/examples/c/dht-kademlia/node.c
@@ -83,8 +83,7 @@ unsigned int join(node_t node, unsigned int id_known)
       } else {
         handle_find_node(node, msg);
       }
-      answer_free(msg->answer);
-      free(msg);
+      free_message(msg);
     } else {
       sg_actor_sleep_for(1);
     }
@@ -264,8 +263,7 @@ unsigned int find_node(node_t node, unsigned int id_to_find, unsigned int count_
           timeout += simgrid_get_clock() - time_beginreceive;
           time_beginreceive = simgrid_get_clock();
         }
-        answer_free(msg->answer);
-        free(msg);
+        free_message(msg);
       } else {
         sg_actor_sleep_for(1);
       }

diff --git a/examples/c/exec-waitany/exec-waitany.c b/examples/c/exec-waitany/exec-waitany.c
index 787317e..f866c6d 100644 (file)
--- a/examples/c/exec-waitany/exec-waitany.c
+++ b/examples/c/exec-waitany/exec-waitany.c
@@ -58,7 +58,7 @@ static void worker(int argc, char* argv[])
     XBT_INFO("%d activities remain pending", pending_execs_count);
   }
 
-  free(pending_execs);
+  xbt_free(pending_execs);
 }
 
 int main(int argc, char* argv[])

diff --git a/examples/c/platform-failures/platform-failures.c b/examples/c/platform-failures/platform-failures.c
index 0478d6e..59f10a2 100644 (file)
--- a/examples/c/platform-failures/platform-failures.c
+++ b/examples/c/platform-failures/platform-failures.c
@@ -46,11 +46,11 @@ static void master(int argc, char* argv[])
         break;
       case SG_ERROR_NETWORK:
         XBT_INFO("Mmh. The communication with '%s' failed. Nevermind. Let's keep going!", mailbox_name);
-        free(payload);
+        xbt_free(payload);
         break;
       case SG_ERROR_TIMEOUT:
         XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", mailbox_name);
-        free(payload);
+        xbt_free(payload);
         break;
       default:
         xbt_die("Unexpected behavior");
@@ -69,11 +69,11 @@ static void master(int argc, char* argv[])
     switch (sg_comm_wait_for(comm, 1.0)) {
       case SG_ERROR_NETWORK:
         XBT_INFO("Mmh. Can't reach '%s'! Nevermind. Let's keep going!", mailbox_name);
-        free(payload);
+        xbt_free(payload);
         break;
       case SG_ERROR_TIMEOUT:
         XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", mailbox_name);
-        free(payload);
+        xbt_free(payload);
         break;
       case SG_OK:
         /* nothing */
@@ -102,11 +102,11 @@ static void worker(int argc, char* argv[])
     sg_error_t retcode = sg_comm_wait(comm);
     if (retcode == SG_OK) {
       if (*payload == FINALIZE) {
-        free(payload);
+        xbt_free(payload);
         break;
       } else {
         double comp_size = *payload;
-        free(payload);
+        xbt_free(payload);
         XBT_INFO("Start execution...");
         sg_actor_execute(comp_size);
         XBT_INFO("Execution complete.");

diff --git a/teshsuite/smpi/coll-alltoallv/coll-alltoallv.c b/teshsuite/smpi/coll-alltoallv/coll-alltoallv.c
index 3e4ec10..9e74d4b 100644 (file)
--- a/teshsuite/smpi/coll-alltoallv/coll-alltoallv.c
+++ b/teshsuite/smpi/coll-alltoallv/coll-alltoallv.c
@@ -143,12 +143,12 @@ int main(int argc, char **argv)
     printf("Alltoallv TEST COMPLETE.\n");
     fflush(stdout);
   }
-  free(sdispls);
-  free(rdispls);
-  free(recvcounts);
-  free(sendcounts);
-  free(rbuf);
-  free(sbuf);
+  xbt_free(sdispls);
+  xbt_free(rdispls);
+  xbt_free(recvcounts);
+  xbt_free(sendcounts);
+  xbt_free(rbuf);
+  xbt_free(sbuf);
 
   MPI_Finalize();
   return 0;

diff --git a/teshsuite/smpi/coll-reduce/coll-reduce.c b/teshsuite/smpi/coll-reduce/coll-reduce.c
index c7ca6e5..db40cd7 100644 (file)
--- a/teshsuite/smpi/coll-reduce/coll-reduce.c
+++ b/teshsuite/smpi/coll-reduce/coll-reduce.c
@@ -90,8 +90,8 @@ int main(int argc, char *argv[])
       fflush(stdout);
     }
   }
-  free(sb);
-  free(rb);
+  xbt_free(sb);
+  xbt_free(rb);
   MPI_Finalize();
   return EXIT_SUCCESS;
 }

diff --git a/teshsuite/smpi/gh-139/gh-139.c b/teshsuite/smpi/gh-139/gh-139.c
index c397ae0..43f59ec 100644 (file)
--- a/teshsuite/smpi/gh-139/gh-139.c
+++ b/teshsuite/smpi/gh-139/gh-139.c
@@ -35,7 +35,7 @@ static void thread_create_wrapper(XBT_ATTRIB_UNUSED int argc, XBT_ATTRIB_UNUSED
            the_global_rank);
   SMPI_thread_create();
   t->f(t->param);
-  free(t);
+  xbt_free(t);
 }
 
 static void mpi_thread_create(const char* name, void* (*f)(void*), void* param)
@@ -73,7 +73,7 @@ void* req_wait(void* bar)
   MPI_Error_string(ret, err_string, &length);
   XBT_INFO("%d request done, return %s", rank, err_string);
   XBT_INFO("%d still has MPI rank %d and global variable %d", param->rank, rank, global_rank);
-  free(param);
+  xbt_free(param);
   return NULL;
 }