Simplifications in MSG task execution

[simgrid.git] / src / msg / msg_private.hpp

diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp
index 31440dc..dff4ef7 100644 (file)
--- a/src/msg/msg_private.hpp
+++ b/src/msg/msg_private.hpp
@@ -23,6 +23,7 @@ class Task {
   void* userdata_               = nullptr;
   long long int id_;
 
+  double timeout_  = 0.0;
   double priority_ = 1.0;
   double bound_    = 0.0;   /* Capping for CPU resource, or 0 for no capping */
   double rate_     = -1;    /* Capping for network resource, or -1 for no capping*/
@@ -39,7 +40,7 @@ public:
   static Task* create_parallel(std::string name, int host_nb, const msg_host_t* host_list, double* flops_amount,
                                double* bytes_amount, void* data);
   msg_error_t execute();
-  Comm* send_async(std::string alias, void_f_pvoid_t cleanup, bool detached);
+  s4u::CommPtr send_async(std::string alias, void_f_pvoid_t cleanup, bool detached);
   void cancel();
 
   Task(const Task&) = delete;
@@ -66,15 +67,15 @@ public:
   double get_bound() { return bound_; }
   void set_rate(double rate) { rate_ = rate; }
   double get_rate() { return rate_; }
+  void set_timeout(double timeout) { timeout_ = timeout; }
 
   s4u::Actor* get_sender();
   s4u::Host* get_source();
 
-  kernel::activity::ExecImplPtr compute          = nullptr; /* SIMIX modeling of computation */
-  s4u::CommPtr comm                              = nullptr; /* S4U modeling of communication */
-  double flops_amount                            = 0.0;     /* Computation size */
-  double bytes_amount                            = 0.0;     /* Data size */
-
+  s4u::ExecPtr compute = nullptr; /* S4U modeling of computation */
+  s4u::CommPtr comm    = nullptr; /* S4U modeling of communication */
+  double flops_amount  = 0.0;     /* Computation size */
+  double bytes_amount  = 0.0;     /* Data size */
 
   /*******  Parallel Tasks Only !!!! *******/
   bool parallel_ = false;
@@ -112,9 +113,4 @@ XBT_PUBLIC_DATA MSG_Global_t msg_global;
 /*************************************************************/
 XBT_PRIVATE void MSG_comm_copy_data_from_SIMIX(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size);
 
-/********** Tracing **********/
-/* declaration of instrumentation functions from msg_task_instr.c */
-XBT_PRIVATE void TRACE_msg_task_put_start(msg_task_t task);
-
-
 #endif