X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ac080087b39ef79ff497d3992ff04b3e20fe40b2..12789d134b3ae0061164cf1658bfdd42abd27574:/include/simgrid/s4u/Comm.hpp diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp index 153be7e069..2e891c9249 100644 --- a/include/simgrid/s4u/Comm.hpp +++ b/include/simgrid/s4u/Comm.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-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. */ @@ -30,7 +30,7 @@ class XBT_PUBLIC Comm : public Activity_T { std::string tracing_category_ = ""; /* FIXME: expose these elements in the API */ bool detached_ = false; - int (*match_fun_)(void*, void*, kernel::activity::CommImpl*) = nullptr; + 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; @@ -49,14 +49,14 @@ public: /*! 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(std::vector * comms) { return wait_any_for(comms, -1); } + static int wait_any(const std::vector* comms) { return wait_any_for(comms, -1); } /*! Same as wait_any, but with a timeout. If the timeout occurs, parameter last is returned.*/ - static int wait_any_for(std::vector* comms_in, double timeout); + static int wait_any_for(const std::vector* comms_in, double timeout); /*! take a vector s4u::CommPtr and return when all of them is finished. */ - static void wait_all(std::vector* comms); + static void wait_all(const std::vector* comms); /*! take a vector s4u::CommPtr and return the rank of the first finished one (or -1 if none is done). */ - static int test_any(std::vector * comms); + static int test_any(const std::vector* comms); Comm* start() override; Comm* wait() override; @@ -113,11 +113,11 @@ public: CommPtr set_tracing_category(const std::string& category); /** Retrieve the mailbox on which this comm acts */ - Mailbox* get_mailbox(); + Mailbox* get_mailbox() const; /** Retrieve the size of the received data. Not to be mixed with @ref Activity::set_remaining() */ - size_t get_dst_data_size(); + size_t get_dst_data_size() const; - Actor* get_sender(); + Actor* get_sender() const; }; } // namespace s4u } // namespace simgrid