X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/500d56f4d9b6e10ad5bfa2b96e0154f212a3a505..d4e5297feb8df40f3ccb3782f7cb326a69d58cad:/include/simgrid/s4u/Comm.hpp diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp index 7fb446f409..b900be0624 100644 --- a/include/simgrid/s4u/Comm.hpp +++ b/include/simgrid/s4u/Comm.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2022. 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. */ @@ -37,9 +37,6 @@ class XBT_PUBLIC Comm : public Activity_T { Comm() = default; -protected: - void complete(Activity::State state) override; - public: #ifndef DOXYGEN friend Mailbox; // Factory of comms @@ -47,6 +44,8 @@ public: ~Comm() override; + /*! Creates a communication that bypasses the mailbox mechanism. */ + static CommPtr sendto_init(); /*! Creates a communication beween the two given hosts, bypassing the mailbox mechanism. */ static CommPtr sendto_init(Host* from, Host* to); /** Do an asynchronous communication between two arbitrary hosts. @@ -55,23 +54,32 @@ public: * There is really no limit on the hosts involved. In particular, the actor does not have to be on one of the involved * hosts. */ - static CommPtr sendto_async(Host* from, Host* to, double simulated_size_in_bytes); + static CommPtr sendto_async(Host* from, Host* to, uint64_t simulated_size_in_bytes); /** Do a blocking communication between two arbitrary hosts. * * This starts a blocking communication right away, bypassing the mailbox and actors mechanism. * The calling actor is blocked until the end of the communication; there is really no limit on the hosts involved. * In particular, the actor does not have to be on one of the involved hosts. Enjoy the comfort of the simulator :) */ - static void sendto(Host* from, Host* to, double simulated_size_in_bytes); + static void sendto(Host* from, Host* to, uint64_t simulated_size_in_bytes); - static xbt::signal on_start; + static void on_send_cb(const std::function& cb) { on_send.connect(cb); } + static void on_recv_cb(const std::function& cb) { on_recv.connect(cb); } + static void on_start_cb(const std::function& cb) { on_start.connect(cb); } + static void on_completion_cb(const std::function& cb) { on_completion.connect(cb); } +#ifndef DOXYGEN + /* FIXME signals should be private */ + static xbt::signal on_send; + static xbt::signal on_recv; + static xbt::signal on_start; static xbt::signal on_completion; +#endif /*! take a vector s4u::CommPtr and return when one of them is finished. * The return value is the rank of the first finished CommPtr. */ - static int wait_any(const std::vector& comms) { return wait_any_for(comms, -1); } + static ssize_t wait_any(const std::vector& comms) { return wait_any_for(comms, -1); } /*! Same as wait_any, but with a timeout. Return -1 if the timeout occurs.*/ - static int wait_any_for(const std::vector& comms, double timeout); + static ssize_t wait_any_for(const std::vector& comms, double timeout); /*! take a vector s4u::CommPtr and return when all of them is finished. */ static void wait_all(const std::vector& comms); @@ -81,14 +89,16 @@ public: /*! take a vector s4u::CommPtr and return the rank of the first finished one (or -1 if none is done). */ static ssize_t test_any(const std::vector& comms); +#ifndef DOXYGEN XBT_ATTRIB_DEPRECATED_v332("Please use a plain vector for parameter") - static int wait_any(const std::vector* comms) { return wait_any_for(*comms, -1); } + static int wait_any(const std::vector* comms) { return static_cast(wait_any_for(*comms, -1)); } XBT_ATTRIB_DEPRECATED_v332("Please use a plain vector for first parameter") - static int wait_any_for(const std::vector* comms, double timeout) { return wait_any_for(*comms, timeout); } + static int wait_any_for(const std::vector* comms, double timeout) { return static_cast(wait_any_for(*comms, timeout)); } XBT_ATTRIB_DEPRECATED_v332("Please use a plain vector for parameter") static void wait_all(const std::vector* comms) { wait_all(*comms); } XBT_ATTRIB_DEPRECATED_v332("Please use a plain vector for parameter") static int test_any(const std::vector* comms) { return static_cast(test_any(*comms)); } +#endif Comm* start() override; Comm* wait_for(double timeout) override; @@ -103,6 +113,12 @@ public: return detach(); } + /** Set the source and destination of communications that bypass the mailbox mechanism */ + CommPtr set_source(Host* from); + Host* get_source() const { return from_; } + CommPtr set_destination(Host* to); + Host* get_destination() const { return to_; } + /** Sets the maximal communication rate (in byte/sec). Must be done before start */ CommPtr set_rate(double rate); @@ -134,7 +150,7 @@ public: * :cpp:func:`simgrid::s4u::Comm::set_src_data_size`). * @endrst */ - CommPtr set_payload_size(double bytes); + CommPtr set_payload_size(uint64_t bytes); /** Specify the data to send and its size (not to be mixed with set_payload_size()) * @@ -166,6 +182,10 @@ public: Actor* get_sender() const; bool is_assigned() const override { return (to_ != nullptr && from_ != nullptr) || (mailbox_ != nullptr); } + + CommPtr set_copy_data_callback(void (*callback)(kernel::activity::CommImpl*, void*, size_t)); + static void copy_buffer_callback(kernel::activity::CommImpl*, void*, size_t); + static void copy_pointer_callback(kernel::activity::CommImpl*, void*, size_t); }; } // namespace s4u } // namespace simgrid