X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/794197ca26e1237d004cb9f3b3fc9f2f754f4ea1..d011cb8a5566e78daba9b90c6a370dca07b74c5a:/src/msg/msg_private.hpp diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp index ccacb308e6..505c892d4c 100644 --- a/src/msg/msg_private.hpp +++ b/src/msg/msg_private.hpp @@ -9,36 +9,39 @@ #include "simgrid/Exception.hpp" #include "simgrid/msg.h" #include "src/kernel/activity/CommImpl.hpp" -#include "src/kernel/activity/ExecImpl.hpp" #include +#include #include /**************** datatypes **********************************/ namespace simgrid { namespace msg { -class Task { +class Task : public xbt::Extendable { std::string name_ = ""; std::string tracing_category_ = ""; - 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*/ bool is_used_ = false; /* Indicates whether the task is used in SIMIX currently */ - explicit Task(std::string name, double flops_amount, double bytes_amount, void* data); - explicit Task(std::string name, std::vector hosts, std::vector flops_amount, - std::vector bytes_amount, void* data); + explicit Task(const std::string& name, double flops_amount, double bytes_amount, void* data); + explicit Task(const std::string& name, std::vector&& hosts, std::vector&& flops_amount, + std::vector&& bytes_amount, void* data); void report_multiple_use() const; public: - static Task* create(std::string name, double flops_amount, double bytes_amount, void* data); - static Task* create_parallel(std::string name, int host_nb, const msg_host_t* host_list, double* flops_amount, + static Task* create(const std::string& name, double flops_amount, double bytes_amount, void* data); + static Task* create_parallel(const std::string& name, int host_nb, const msg_host_t* host_list, double* flops_amount, double* bytes_amount, void* data); msg_error_t execute(); + msg_error_t send(const std::string& alias, double timeout); + s4u::CommPtr send_async(const std::string& alias, void_f_pvoid_t cleanup, bool detached); + void cancel(); Task(const Task&) = delete; @@ -56,8 +59,8 @@ public: void set_tracing_category(const char* category) { tracing_category_ = category ? std::string(category) : ""; } const std::string& get_tracing_category() { return tracing_category_; } bool has_tracing_category() { return not tracing_category_.empty(); } - void* get_user_data() { return userdata_; } - void set_user_data(void* data) { userdata_ = data; } + XBT_ATTRIB_DEPRECATED_v329("Please use set_data()") void* get_user_data() { return get_data(); } + XBT_ATTRIB_DEPRECATED_v329("Please use get_data()") void set_user_data(void* data) { set_data(data); } long long int get_id() { return id_; } double get_priority() { return priority_; } void set_priority(double priority); @@ -65,15 +68,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; @@ -83,37 +86,34 @@ public: }; class Comm { + msg_error_t status_ = MSG_OK; /* status of the communication once finished */ public: - msg_task_t task_sent; /* task sent (NULL for the receiver) */ - msg_task_t* task_received; /* where the task will be received (NULL for the sender) */ + Task* task_sent; /* task sent (NULL for the receiver) */ + Task** task_received; /* where the task will be received (NULL for the sender) */ s4u::CommPtr s_comm; /* SIMIX communication object encapsulated (the same for both processes) */ - msg_error_t status = MSG_OK; /* status of the communication once finished */ Comm(msg_task_t sent, msg_task_t* received, s4u::CommPtr comm) : task_sent(sent), task_received(received), s_comm(std::move(comm)) { } + bool test(); + msg_error_t wait_for(double timeout); + void set_status(msg_error_t status) { status_ = status; } + msg_error_t get_status() { return status_; } }; } // namespace msg } // namespace simgrid /************************** Global variables ********************************/ -struct s_MSG_Global_t { - bool debug_multiple_use; /* whether we want an error message when reusing the same Task for 2 things */ +struct MSG_Global_t { + static bool debug_multiple_use; /* whether we want an error message when reusing the same Task for 2 things */ std::atomic_int_fast32_t sent_msg; /* Total amount of messages sent during the simulation */ void (*task_copy_callback)(msg_task_t task, msg_process_t src, msg_process_t dst); void_f_pvoid_t process_data_cleanup; }; -typedef s_MSG_Global_t* MSG_Global_t; -XBT_PUBLIC_DATA MSG_Global_t msg_global; +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