X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/14df1b2b0538cba0da86ce62f01863d7d2c156c0..184f0e36afb128db3cc35349d699b86f977c2820:/include/simgrid/s4u/Comm.hpp diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp index d43131a9fa..366d38babf 100644 --- a/include/simgrid/s4u/Comm.hpp +++ b/include/simgrid/s4u/Comm.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2023. 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. */ @@ -32,11 +32,12 @@ class XBT_PUBLIC Comm : public Activity_T { /* FIXME: expose these elements in the API */ bool detached_ = false; - bool (*match_fun_)(void*, void*, kernel::activity::CommImpl*) = nullptr; - void (*clean_fun_)(void*) = nullptr; - void (*copy_data_function_)(kernel::activity::CommImpl*, void*, size_t) = nullptr; + std::function match_fun_; + std::function clean_fun_; + std::function copy_data_function_; Comm() = default; + Comm* do_start() override; public: /* signals and related callbacks */ @@ -45,20 +46,31 @@ public: static xbt::signal on_send; static xbt::signal on_recv; static xbt::signal on_start; - static xbt::signal on_completion; #endif 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); } + void fire_this_completion() const override { on_completion(*this); } /* More callbacks */ - 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); + CommPtr set_copy_data_callback(const std::function& callback); + XBT_ATTRIB_DEPRECATED_v337("Please manifest if you actually need this function") static void copy_buffer_callback( + kernel::activity::CommImpl*, void*, size_t); + XBT_ATTRIB_DEPRECATED_v337("Please manifest if you actually need this function") static void copy_pointer_callback( + kernel::activity::CommImpl*, void*, size_t); ~Comm() override; + static void send(kernel::actor::ActorImpl* sender, const Mailbox* mbox, double task_size, double rate, void* src_buff, + size_t src_buff_size, + const std::function& match_fun, + const std::function& copy_data_fun, + void* data, double timeout); + static void recv(kernel::actor::ActorImpl* receiver, const Mailbox* mbox, void* dst_buff, size_t* dst_buff_size, + const std::function& match_fun, + const std::function& copy_data_fun, + void* data, double timeout, double rate); + /* "One-sided" communications. This way of communicating bypasses the mailbox and actors mechanism. It creates a * communication (vetoabled, asynchronous, or synchronous) directly between two hosts. There is really no limit on * the hosts involved. In particular, the actor creating such a communication does not have to be on one of the @@ -119,8 +131,8 @@ public: * That's a buffer where the sent data will be copied */ CommPtr set_dst_data(void** buff, size_t size); /** Retrieve where the data will be copied on the receiver side */ - void* get_dst_data() { return dst_buff_; } - /** Retrieve the size of the received data. Not to be mixed with @ref Activity::set_remaining() */ + void* get_dst_data() const { return dst_buff_; } + /** Retrieve the size of the received data. Not to be mixed with @ref Activity::get_remaining() */ size_t get_dst_data_size() const { return dst_buff_size_; } /* Common functions */ @@ -140,11 +152,10 @@ public: Actor* get_sender() const; /* Comm life cycle */ - Comm* start() override; /** Start the comm, and ignore its result. It can be completely forgotten after that. */ Comm* detach(); /** Start the comm, and ignore its result. It can be completely forgotten after that. */ - Comm* detach(void (*clean_function)(void*)) + Comm* detach(const std::function& clean_function) { clean_fun_ = clean_function; return detach(); @@ -166,29 +177,6 @@ public: /*! Same as wait_all, but with a timeout. Return the number of terminated comm (less than comms.size() if the timeout * occurs). */ static size_t wait_all_for(const std::vector& comms, double timeout); - -#ifndef DOXYGEN - XBT_ATTRIB_DEPRECATED_v332("Please use a plain vector for parameter") 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 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 }; } // namespace s4u } // namespace simgrid