Replace some more malloc/free.

diff --git a/src/mc/checker/simgrid_mc.cpp b/src/mc/checker/simgrid_mc.cpp
index 45f1201..c094a75 100644 (file)
--- a/src/mc/checker/simgrid_mc.cpp
+++ b/src/mc/checker/simgrid_mc.cpp
@@ -33,7 +33,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
 static inline
 char** argvdup(int argc, char** argv)
 {
-  char** argv_copy = xbt_new(char*, argc+1);
+  char** argv_copy = new char*[argc + 1];
   std::memcpy(argv_copy, argv, sizeof(char*) * argc);
   argv_copy[argc] = nullptr;
   return argv_copy;
@@ -74,7 +74,7 @@ int main(int argc, char** argv)
 
     std::unique_ptr<Session> session =
       std::unique_ptr<Session>(Session::spawnvp(argv_copy[1], argv_copy+1));
-    free(argv_copy);
+    delete[] argv_copy;
 
     simgrid::mc::session = session.get();
     std::unique_ptr<simgrid::mc::Checker> checker = createChecker(*session);

diff --git a/src/msg/msg_synchro.cpp b/src/msg/msg_synchro.cpp
index b475b9d..15c3ef8 100644 (file)
--- a/src/msg/msg_synchro.cpp
+++ b/src/msg/msg_synchro.cpp
@@ -72,7 +72,7 @@ struct s_msg_bar_t {
 
 /** @brief Initializes a barrier, with count elements */
 msg_bar_t MSG_barrier_init(unsigned int count) {
-  msg_bar_t bar           = xbt_new0(s_msg_bar_t, 1);
+  msg_bar_t bar           = new s_msg_bar_t;
   bar->expected_processes = count;
   bar->arrived_processes  = 0;
   bar->mutex              = xbt_mutex_init();
@@ -84,7 +84,7 @@ msg_bar_t MSG_barrier_init(unsigned int count) {
 void MSG_barrier_destroy(msg_bar_t bar) {
   xbt_mutex_destroy(bar->mutex);
   xbt_cond_destroy(bar->cond);
-  xbt_free(bar);
+  delete bar;
 }
 
 /** @brief Performs a barrier already initialized */

diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp
index 0f6c705..0ad5499 100644 (file)
--- a/src/msg/msg_task.cpp
+++ b/src/msg/msg_task.cpp
@@ -50,7 +50,7 @@ void s_simdata_task_t::reportMultipleUse() const
  */
 msg_task_t MSG_task_create(const char *name, double flop_amount, double message_size, void *data)
 {
-  msg_task_t task = xbt_new(s_msg_task_t, 1);
+  msg_task_t task        = new s_msg_task_t;
   simdata_task_t simdata = new s_simdata_task_t();
   task->simdata = simdata;
 
@@ -203,7 +203,7 @@ msg_error_t MSG_task_destroy(msg_task_t task)
 
   /* free main structures */
   delete task->simdata;
-  xbt_free(task);
+  delete task;
 
   return MSG_OK;
 }