X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6b56c15c3ec34841fae10fa42a656aec029d27e9..365a83d3a1407923acccab758f9225e11408b5c6:/src/s4u/s4u_Mailbox.cpp diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp index 4621305dfd..76613fbfa8 100644 --- a/src/s4u/s4u_Mailbox.cpp +++ b/src/s4u/s4u_Mailbox.cpp @@ -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. */ @@ -14,7 +14,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel, s4u, "S4U Communication Mailboxes") namespace simgrid::s4u { -const xbt::string& Mailbox::get_name() const +const std::string& Mailbox::get_name() const { return pimpl_->get_name(); } @@ -101,7 +101,7 @@ CommPtr Mailbox::put_async(void* payload, uint64_t simulated_size_in_bytes) xbt_assert(payload != nullptr, "You cannot send nullptr"); CommPtr res = put_init(payload, simulated_size_in_bytes); - res->vetoable_start(); + res->start(); return res; } @@ -109,7 +109,7 @@ void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes) { xbt_assert(payload != nullptr, "You cannot send nullptr"); - put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->vetoable_start()->wait(); + put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->start()->wait(); } /** Blocking send with timeout */ @@ -117,7 +117,7 @@ void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes, double timeou { xbt_assert(payload != nullptr, "You cannot send nullptr"); - put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->vetoable_start()->wait_for(timeout); + put_init()->set_payload_size(simulated_size_in_bytes)->set_src_data(payload)->start()->wait_for(timeout); } CommPtr Mailbox::get_init() @@ -127,6 +127,13 @@ CommPtr Mailbox::get_init() return res; } +CommPtr Mailbox::get_async() +{ + CommPtr res = get_init()->set_dst_data(nullptr, sizeof(void*)); + res->start(); + return res; +} + kernel::activity::ActivityImplPtr Mailbox::iprobe(int type, const std::function& match_fun, void* data) {