X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b04faa98dd6b4d52c3383a177e810f8e450fd48..cb84a76be885b5d00ebaa29b56df7c5d6fb1df24:/src/msg/msg_gos.cpp

diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp
index 877cfcfab2..1ca2db5e9d 100644
--- a/src/msg/msg_gos.cpp
+++ b/src/msg/msg_gos.cpp
@@ -46,8 +46,7 @@ msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo
   e_smx_state_t comp_state;
   msg_error_t status = MSG_OK;
 
-
-  xbt_assert((not simdata->compute) && not task->simdata->isused,
+  xbt_assert((not simdata->compute) && not task->simdata->is_used,
              "This task is executed somewhere else. Go fix your code!");
 
   XBT_DEBUG("Computing on %s", MSG_process_get_name(MSG_process_self()));
@@ -60,7 +59,7 @@ msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo
     simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->push_event("execute");
 
   try {
-    simdata->setUsed();
+    simdata->set_used();
 
     if (simdata->host_nb > 0) {
       simdata->compute =
@@ -74,8 +73,7 @@ msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo
       sg_host_t host   = MSG_process_get_host(MSG_process_self());
       simdata->compute = simgrid::simix::simcall([task, host] {
         return simgrid::kernel::activity::ExecImplPtr(
-            new simgrid::kernel::activity::ExecImpl(task->name ?: "", task->category ?: "",
-                                                    /*timeout_detector*/ nullptr, host));
+            new simgrid::kernel::activity::ExecImpl(task->name ?: "", task->category ?: "", host));
       });
       /* checking for infinite values */
       xbt_assert(std::isfinite(simdata->flops_amount), "flops_amount is not finite!");
@@ -86,7 +84,7 @@ msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo
 
     comp_state = simcall_execution_wait(simdata->compute);
 
-    simdata->setNotUsed();
+    simdata->set_not_used();
 
     XBT_DEBUG("Execution task '%s' finished in state %d", task->name, (int)comp_state);
   } catch (simgrid::HostFailureException& e) {
@@ -233,14 +231,11 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d
                                          double rate)
 {
   XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias);
-  simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(alias);
   msg_error_t ret = MSG_OK;
   /* We no longer support getting a task from a specific host */
   if (host)
     THROW_UNIMPLEMENTED;
 
-  TRACE_msg_task_get_start();
-
   /* Sanity check */
   xbt_assert(task, "Null pointer for the task storage");
 
@@ -249,16 +244,21 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d
 
   /* Try to receive it by calling SIMIX network layer */
   try {
-    simcall_comm_recv(MSG_process_self()->get_impl(), mailbox->get_impl(), task, nullptr, nullptr, nullptr, nullptr,
-                      timeout, rate);
-    XBT_DEBUG("Got task %s from %s", (*task)->name, mailbox->get_cname());
-    (*task)->simdata->setNotUsed();
+    void* payload;
+    simgrid::s4u::Mailbox::by_name(alias)
+        ->get_init()
+        ->set_dst_data(&payload, sizeof(msg_task_t*))
+        ->set_rate(rate)
+        ->wait_for(timeout);
+    *task = static_cast<msg_task_t>(payload);
+    XBT_DEBUG("Got task %s from %s", (*task)->name, alias);
+    (*task)->simdata->set_not_used();
   } catch (simgrid::HostFailureException& e) {
     ret = MSG_HOST_FAILURE;
   } catch (simgrid::TimeoutError& e) {
     ret = MSG_TIMEOUT;
   } catch (simgrid::CancelException& e) {
-    ret = MSG_HOST_FAILURE;
+    ret = MSG_TASK_CANCELED;
   } catch (xbt_ex& e) {
     if (e.category == network_error)
       ret = MSG_TRANSFER_FAILURE;
@@ -266,15 +266,18 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d
       throw;
   }
 
-  if (ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
-    TRACE_msg_task_get_end(*task);
+  if (TRACE_actor_is_enabled() && ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
+    container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self()));
+
+    std::string key = std::string("p") + std::to_string((*task)->counter);
+    simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->end_event(process_container, "SR", key);
   }
   return ret;
 }
 
 /* Internal function used to factorize code between MSG_task_isend(), MSG_task_isend_bounded(), and MSG_task_dsend(). */
-static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* alias,
-                                                 void_f_pvoid_t cleanup, int detached)
+static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* alias, void_f_pvoid_t cleanup,
+                                                 bool detached)
 {
   simdata_task_t t_simdata = nullptr;
   msg_process_t myself = MSG_process_self();
@@ -284,28 +287,26 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* al
   /* Prepare the task to send */
   t_simdata = task->simdata;
   t_simdata->sender = myself;
-  t_simdata->source = MSG_host_self();
-  t_simdata->setUsed();
+  t_simdata->set_used();
   t_simdata->comm = nullptr;
   msg_global->sent_msg++;
 
-  /* Send it by calling SIMIX network layer */
-  smx_activity_t act =
-      simcall_comm_isend(myself->get_impl(), mailbox->get_impl(), t_simdata->bytes_amount, t_simdata->rate, task,
-                         sizeof(void*), nullptr, cleanup, nullptr, nullptr, detached);
-  t_simdata->comm = boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(act);
+  simgrid::s4u::CommPtr comm = mailbox->put_init(task, t_simdata->bytes_amount)->set_rate(t_simdata->rate);
+  t_simdata->comm            = comm;
+  if (detached)
+    comm->detach(cleanup);
+  else
+    comm->start();
 
-  msg_comm_t comm = nullptr;
+  msg_comm_t msg_comm = nullptr;
   if (not detached) {
-    comm = new simgrid::msg::Comm(task, nullptr, act);
+    msg_comm = new simgrid::msg::Comm(task, nullptr, comm);
   }
 
   if (TRACE_is_enabled() && task->category != nullptr)
-    simgrid::simix::simcall([act, task] { act->set_category(task->category); });
+    simgrid::simix::simcall([comm, task] { comm->get_impl()->set_category(task->category); });
 
-  TRACE_msg_task_put_end();
-
-  return comm;
+  return msg_comm;
 }
 
 /**
@@ -319,7 +320,7 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* al
  */
 msg_comm_t MSG_task_isend(msg_task_t task, const char *alias)
 {
-  return MSG_task_isend_internal(task, alias, nullptr, 0);
+  return MSG_task_isend_internal(task, alias, nullptr, false);
 }
 
 /**
@@ -336,7 +337,7 @@ msg_comm_t MSG_task_isend(msg_task_t task, const char *alias)
 msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double maxrate)
 {
   task->simdata->rate = maxrate;
-  return MSG_task_isend_internal(task, alias, nullptr, 0);
+  return MSG_task_isend_internal(task, alias, nullptr, false);
 }
 
 /**
@@ -356,7 +357,7 @@ msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double max
  */
 void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup)
 {
-  msg_comm_t XBT_ATTRIB_UNUSED comm = MSG_task_isend_internal(task, alias, cleanup, 1);
+  msg_comm_t XBT_ATTRIB_UNUSED comm = MSG_task_isend_internal(task, alias, cleanup, true);
   xbt_assert(comm == nullptr);
 }
 
@@ -429,8 +430,7 @@ msg_comm_t MSG_task_irecv_bounded(msg_task_t *task, const char *name, double rat
 
   /* Try to receive it by calling SIMIX network layer */
   msg_comm_t comm = new simgrid::msg::Comm(
-      nullptr, task,
-      simcall_comm_irecv(SIMIX_process_self(), mbox->get_impl(), task, nullptr, nullptr, nullptr, nullptr, rate));
+      nullptr, task, mbox->get_init()->set_dst_data((void**)task, sizeof(msg_task_t*))->set_rate(rate)->start());
 
   return comm;
 }
@@ -448,14 +448,17 @@ int MSG_comm_test(msg_comm_t comm)
   bool finished = false;
 
   try {
-    finished = simcall_comm_test(comm->s_comm);
+    finished = comm->s_comm->test();
     if (finished && comm->task_received != nullptr) {
       /* I am the receiver */
-      (*comm->task_received)->simdata->setNotUsed();
+      (*comm->task_received)->simdata->set_not_used();
     }
   } catch (simgrid::TimeoutError& e) {
     comm->status = MSG_TIMEOUT;
     finished     = true;
+  } catch (simgrid::CancelException& e) {
+    comm->status = MSG_TASK_CANCELED;
+    finished     = true;
   }
   catch (xbt_ex& e) {
     if (e.category == network_error) {
@@ -486,7 +489,7 @@ int MSG_comm_testany(xbt_dynar_t comms)
   msg_comm_t comm;
   unsigned int cursor;
   xbt_dynar_foreach(comms, cursor, comm) {
-    s_comms.push_back(static_cast<simgrid::kernel::activity::CommImpl*>(comm->s_comm.get()));
+    s_comms.push_back(static_cast<simgrid::kernel::activity::CommImpl*>(comm->s_comm->get_impl().get()));
   }
 
   msg_error_t status = MSG_OK;
@@ -495,6 +498,9 @@ int MSG_comm_testany(xbt_dynar_t comms)
   } catch (simgrid::TimeoutError& e) {
     finished_index = e.value;
     status         = MSG_TIMEOUT;
+  } catch (simgrid::CancelException& e) {
+    finished_index = e.value;
+    status         = MSG_TASK_CANCELED;
   }
   catch (xbt_ex& e) {
     if (e.category != network_error)
@@ -510,7 +516,7 @@ int MSG_comm_testany(xbt_dynar_t comms)
 
     if (status == MSG_OK && comm->task_received != nullptr) {
       /* I am the receiver */
-      (*comm->task_received)->simdata->setNotUsed();
+      (*comm->task_received)->simdata->set_not_used();
     }
   }
 
@@ -534,16 +540,18 @@ void MSG_comm_destroy(msg_comm_t comm)
 msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout)
 {
   try {
-    simcall_comm_wait(comm->s_comm, timeout);
+    comm->s_comm->wait_for(timeout);
 
     if (comm->task_received != nullptr) {
       /* I am the receiver */
-      (*comm->task_received)->simdata->setNotUsed();
+      (*comm->task_received)->simdata->set_not_used();
     }
 
     /* FIXME: these functions are not traceable */
   } catch (simgrid::TimeoutError& e) {
     comm->status = MSG_TIMEOUT;
+  } catch (simgrid::CancelException& e) {
+    comm->status = MSG_TASK_CANCELED;
   }
   catch (xbt_ex& e) {
     if (e.category == network_error)
@@ -582,7 +590,7 @@ int MSG_comm_waitany(xbt_dynar_t comms)
   msg_comm_t comm;
   unsigned int cursor;
   xbt_dynar_foreach(comms, cursor, comm) {
-    s_comms.push_back(static_cast<simgrid::kernel::activity::CommImpl*>(comm->s_comm.get()));
+    s_comms.push_back(static_cast<simgrid::kernel::activity::CommImpl*>(comm->s_comm->get_impl().get()));
   }
 
   msg_error_t status = MSG_OK;
@@ -591,6 +599,9 @@ int MSG_comm_waitany(xbt_dynar_t comms)
   } catch (simgrid::TimeoutError& e) {
     finished_index = e.value;
     status         = MSG_TIMEOUT;
+  } catch (simgrid::CancelException& e) {
+    finished_index = e.value;
+    status         = MSG_TASK_CANCELED;
   }
   catch(xbt_ex& e) {
     if (e.category == network_error) {
@@ -609,7 +620,7 @@ int MSG_comm_waitany(xbt_dynar_t comms)
 
   if (comm->task_received != nullptr) {
     /* I am the receiver */
-    (*comm->task_received)->simdata->setNotUsed();
+    (*comm->task_received)->simdata->set_not_used();
   }
 
   return finished_index;
@@ -713,30 +724,21 @@ msg_error_t MSG_task_send_bounded(msg_task_t task, const char *alias, double max
 msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, double timeout)
 {
   msg_error_t ret = MSG_OK;
-  simdata_task_t t_simdata = nullptr;
-  msg_process_t process = MSG_process_self();
-  simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(alias);
 
-  if (TRACE_actor_is_enabled()) {
-    container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self()));
-    std::string key               = std::string("p") + std::to_string(task->counter);
-    simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key);
-  }
+  TRACE_msg_task_put_start(task);
 
   /* Prepare the task to send */
-  t_simdata = task->simdata;
-  t_simdata->sender = process;
-  t_simdata->source = MSG_host_self();
+  simdata_task_t t_simdata = task->simdata;
+  t_simdata->sender        = MSG_process_self();
+  t_simdata->set_used();
 
-  t_simdata->setUsed();
-
-  t_simdata->comm = nullptr;
   msg_global->sent_msg++;
 
-  /* Try to send it by calling SIMIX network layer */
+  /* Try to send it */
   try {
-    simgrid::s4u::CommPtr comm = mailbox->put_init(task, t_simdata->bytes_amount)->set_rate(t_simdata->rate);
-    t_simdata->comm            = boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(comm->get_impl());
+    simgrid::s4u::CommPtr comm =
+        simgrid::s4u::Mailbox::by_name(alias)->put_init(task, t_simdata->bytes_amount)->set_rate(t_simdata->rate);
+    t_simdata->comm = comm;
     comm->start();
     if (TRACE_is_enabled() && task->category != nullptr)
       simgrid::simix::simcall([comm, task] { comm->get_impl()->set_category(task->category); });
@@ -752,7 +754,7 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl
       throw;
 
     /* If the send failed, it is not used anymore */
-    t_simdata->setNotUsed();
+    t_simdata->set_not_used();
   }
 
   return ret;
@@ -814,7 +816,18 @@ int MSG_task_listen_from(const char *alias)
  */
 void MSG_task_set_category (msg_task_t task, const char *category)
 {
-  TRACE_msg_set_task_category (task, category);
+  xbt_assert(task->category == nullptr, "Task %p(%s) already has a category (%s).", task, task->name, task->category);
+
+  // if user provides a nullptr category, task is no longer traced
+  if (category == nullptr) {
+    xbt_free(task->category);
+    task->category = nullptr;
+    XBT_DEBUG("MSG task %p(%s), category removed", task, task->name);
+  } else {
+    // set task category
+    task->category = xbt_strdup(category);
+    XBT_DEBUG("MSG task %p(%s), category %s", task, task->name, task->category);
+  }
 }
 
 /**