snake casing

[simgrid.git] / src / msg / msg_task.cpp

diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp
index 9b3e46c..67a3c53 100644 (file)
--- a/src/msg/msg_task.cpp
+++ b/src/msg/msg_task.cpp
@@ -8,10 +8,11 @@
 #include <algorithm>
 #include <cmath>
 #include <simgrid/modelchecker.h>
+#include <simgrid/s4u/Comm.hpp>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_task, msg, "Logging specific to MSG (task)");
 
-void s_simdata_task_t::reportMultipleUse() const
+void s_simdata_task_t::report_multiple_use() const
 {
   if (msg_global->debug_multiple_use){
     XBT_ERROR("This task is already used in there:");
@@ -169,7 +170,7 @@ void MSG_task_set_name(msg_task_t task, const char *name)
  */
 msg_error_t MSG_task_destroy(msg_task_t task)
 {
-  if (task->simdata->isused) {
+  if (task->simdata->is_used) {
     /* the task is being sent or executed: cancel it first */
     MSG_task_cancel(task);
   }
@@ -196,9 +197,9 @@ msg_error_t MSG_task_cancel(msg_task_t task)
   if (simdata->compute) {
     simgrid::simix::simcall([simdata] { simdata->compute->cancel(); });
   } else if (simdata->comm) {
-    simgrid::simix::simcall([simdata] { simdata->comm->cancel(); });
+    simdata->comm->cancel();
   }
-  simdata->setNotUsed();
+  simdata->set_not_used();
   return MSG_OK;
 }
 
@@ -265,7 +266,7 @@ void MSG_task_set_bytes_amount(msg_task_t task, double data_size)
 double MSG_task_get_remaining_communication(msg_task_t task)
 {
   XBT_DEBUG("calling simcall_communication_get_remains(%p)", task->simdata->comm.get());
-  return task->simdata->comm->remains();
+  return task->simdata->comm->get_remaining();
 }
 
 /** @brief Returns the size of the data attached to the given task. */