Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
source is sender's host. One field is enough
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 25 Feb 2019 10:28:36 +0000 (11:28 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 25 Feb 2019 10:28:36 +0000 (11:28 +0100)
src/msg/msg_gos.cpp
src/msg/msg_private.hpp
src/msg/msg_task.cpp
src/s4u/s4u_Actor.cpp

index 3bc5eb3..c173b4b 100644 (file)
@@ -77,7 +77,6 @@ msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo
       });
       /* checking for infinite values */
       xbt_assert(std::isfinite(simdata->flops_amount), "flops_amount is not finite!");
-      xbt_assert(std::isfinite(simdata->priority), "priority is not finite!");
 
       simdata->compute->start(simdata->flops_amount, simdata->priority, simdata->bound);
     }
@@ -287,7 +286,6 @@ 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->set_used();
   t_simdata->comm = nullptr;
   msg_global->sent_msg++;
@@ -731,7 +729,6 @@ msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, doubl
   /* Prepare the task to send */
   simdata_task_t t_simdata = task->simdata;
   t_simdata->sender        = MSG_process_self();
-  t_simdata->source = MSG_host_self();
   t_simdata->set_used();
 
   msg_global->sent_msg++;
index fc99a2a..080bf02 100644 (file)
@@ -31,7 +31,6 @@ struct s_simdata_task_t {
   double flops_amount                            = 0.0;     /* Computation size */
   msg_process_t sender                           = nullptr;
   msg_process_t receiver                         = nullptr;
-  msg_host_t source                              = nullptr;
 
   double priority = 1.0;
   double bound    = 0.0; /* Capping for CPU resource, or 0 for no capping */
index 67a3c53..7101756 100644 (file)
@@ -143,7 +143,7 @@ msg_process_t MSG_task_get_sender(msg_task_t task)
 /** @brief Returns the source (the sender's host) of the given task */
 msg_host_t MSG_task_get_source(msg_task_t task)
 {
-  return task->simdata->source;
+  return task->simdata->sender->get_host();
 }
 
 /** @brief Returns the name of the given task. */
index 17196f2..1df4ce5 100644 (file)
@@ -301,6 +301,7 @@ void parallel_execute(const std::vector<s4u::Host*>& hosts, const std::vector<do
 {
   parallel_execute(hosts, flops_amounts, bytes_amounts, -1);
 }
+
 void parallel_execute(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
                       const std::vector<double>& bytes_amounts, double timeout)
 {