X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc4eceb15c80a597e44222b8c0ff60caf85db959..8bc85164acb335cf909052b966b2ee4932e06cd7:/src/msg/msg_private.hpp diff --git a/src/msg/msg_private.hpp b/src/msg/msg_private.hpp index 0b832dedf7..07d9b498ca 100644 --- a/src/msg/msg_private.hpp +++ b/src/msg/msg_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2020. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -6,99 +6,117 @@ #ifndef MSG_PRIVATE_HPP #define MSG_PRIVATE_HPP +#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 { + +extern template class XBT_PUBLIC xbt::Extendable; + 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(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: - explicit Task(std::string name, double flops_amount, double bytes_amount, void* data) - : name_(std::move(name)), userdata_(data), flops_amount(flops_amount), bytes_amount(bytes_amount) - { - static std::atomic_ullong counter{0}; - id_ = counter++; - if (MC_is_active()) - MC_ignore_heap(&(id_), sizeof(id_)); - } + 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; Task& operator=(const Task&) = delete; - ~Task(); - void set_used(); - void set_not_used() { this->is_used = false; } + ~Task() = default; + + bool is_used() const { return is_used_; } + bool is_parallel() const { return parallel_; } + void set_used(); + void set_not_used() { this->is_used_ = false; } const std::string& get_name() const { return name_; } - const char* get_cname() { return name_.c_str(); } + const char* get_cname() const { return name_.c_str(); } void set_name(const char* new_name) { name_ = std::string(new_name); } - void set_tracing_category(const char* category) { tracing_category_ = category ? std::string(category) : ""; } - const std::string& get_tracing_category() { return tracing_category_; } + void set_tracing_category(const char* category) { tracing_category_ = category ? category : ""; } + const std::string& get_tracing_category() const { 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; } - long long int get_id() { return id_; } - - 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 */ - msg_process_t sender = nullptr; - msg_process_t receiver = nullptr; - - 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 */ - int host_nb = 0; /* ==0 if sequential task; parallel task if not */ - /******* Parallel Tasks Only !!!! *******/ - sg_host_t* host_list = nullptr; - double* flops_parallel_amount = nullptr; - double* bytes_parallel_amount = nullptr; + 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() const { return id_; } + double get_priority() const { return priority_; } + void set_priority(double priority); + void set_bound(double bound) { bound_ = bound; } + double get_bound() const { return bound_; } + void set_rate(double rate) { rate_ = rate; } + double get_rate() const { return rate_; } + void set_timeout(double timeout) { timeout_ = timeout; } + + s4u::Actor* get_sender() const; + s4u::Host* get_source() const; + + 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 */ -private: - void report_multiple_use() const; + /******* Parallel Tasks Only !!!! *******/ + bool parallel_ = false; + std::vector hosts_; + std::vector flops_parallel_amount; + std::vector bytes_parallel_amount; }; 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() const { 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