-/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2018. 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. */
namespace s4u {
Comm::~Comm()
{
- if (state_ == started && not detached_ && (pimpl_ == nullptr || pimpl_->state == SIMIX_RUNNING)) {
- XBT_INFO("Comm %p freed before its completion. Detached: %d, State: %d", this, detached_, state_);
+ if (state_ == State::started && not detached_ && (pimpl_ == nullptr || pimpl_->state == SIMIX_RUNNING)) {
+ XBT_INFO("Comm %p freed before its completion. Detached: %d, State: %d", this, detached_, (int)state_);
if (pimpl_ != nullptr)
XBT_INFO("pimpl_->state: %d", pimpl_->state);
else
}
}
-Activity* Comm::setRate(double rate)
+int Comm::wait_any_for(std::vector<CommPtr>* comms_in, double timeout)
{
- xbt_assert(state_==inited);
+ // Map to dynar<Synchro*>:
+ xbt_dynar_t comms = xbt_dynar_new(sizeof(simgrid::kernel::activity::ActivityImpl*), [](void* ptr) {
+ intrusive_ptr_release(*(simgrid::kernel::activity::ActivityImpl**)ptr);
+ });
+ for (auto const& comm : *comms_in) {
+ if (comm->state_ == Activity::State::inited)
+ comm->start();
+ xbt_assert(comm->state_ == Activity::State::started);
+ simgrid::kernel::activity::ActivityImpl* ptr = comm->pimpl_.get();
+ intrusive_ptr_add_ref(ptr);
+ xbt_dynar_push_as(comms, simgrid::kernel::activity::ActivityImpl*, ptr);
+ }
+ // Call the underlying simcall:
+ int idx = simcall_comm_waitany(comms, timeout);
+ xbt_dynar_free(&comms);
+ return idx;
+}
+
+void Comm::wait_all(std::vector<CommPtr>* comms)
+{
+ // TODO: this should be a simcall or something
+ // TODO: we are missing a version with timeout
+ for (CommPtr comm : *comms) {
+ comm->wait();
+ }
+}
+
+Activity* Comm::set_rate(double rate)
+{
+ xbt_assert(state_ == State::inited);
rate_ = rate;
return this;
}
-Activity* Comm::setSrcData(void* buff)
+Activity* Comm::set_src_data(void* buff)
{
- xbt_assert(state_==inited);
- xbt_assert(dstBuff_ == nullptr, "Cannot set the src and dst buffers at the same time");
- srcBuff_ = buff;
+ xbt_assert(state_ == State::inited);
+ xbt_assert(dst_buff_ == nullptr, "Cannot set the src and dst buffers at the same time");
+ src_buff_ = buff;
return this;
}
-Activity* Comm::setSrcDataSize(size_t size)
+Activity* Comm::set_src_data_size(size_t size)
{
- xbt_assert(state_==inited);
- srcBuffSize_ = size;
+ xbt_assert(state_ == State::inited);
+ src_buff_size_ = size;
return this;
}
-Activity* Comm::setSrcData(void* buff, size_t size)
+Activity* Comm::set_src_data(void* buff, size_t size)
{
- xbt_assert(state_==inited);
+ xbt_assert(state_ == State::inited);
- xbt_assert(dstBuff_ == nullptr, "Cannot set the src and dst buffers at the same time");
- srcBuff_ = buff;
- srcBuffSize_ = size;
+ xbt_assert(dst_buff_ == nullptr, "Cannot set the src and dst buffers at the same time");
+ src_buff_ = buff;
+ src_buff_size_ = size;
return this;
}
-Activity* Comm::setDstData(void** buff)
+Activity* Comm::set_dst_data(void** buff)
{
- xbt_assert(state_==inited);
- xbt_assert(srcBuff_ == nullptr, "Cannot set the src and dst buffers at the same time");
- dstBuff_ = buff;
+ xbt_assert(state_ == State::inited);
+ xbt_assert(src_buff_ == nullptr, "Cannot set the src and dst buffers at the same time");
+ dst_buff_ = buff;
return this;
}
-size_t Comm::getDstDataSize(){
- xbt_assert(state_==finished);
- return dstBuffSize_;
+size_t Comm::get_dst_data_size()
+{
+ xbt_assert(state_ == State::finished);
+ return dst_buff_size_;
}
-Activity* Comm::setDstData(void** buff, size_t size)
+Activity* Comm::set_dst_data(void** buff, size_t size)
{
- xbt_assert(state_==inited);
+ xbt_assert(state_ == State::inited);
- xbt_assert(srcBuff_ == nullptr, "Cannot set the src and dst buffers at the same time");
- dstBuff_ = buff;
- dstBuffSize_ = size;
+ xbt_assert(src_buff_ == nullptr, "Cannot set the src and dst buffers at the same time");
+ dst_buff_ = buff;
+ dst_buff_size_ = size;
return this;
}
Activity* Comm::start()
{
- xbt_assert(state_ == inited);
+ xbt_assert(state_ == State::inited);
- if (srcBuff_ != nullptr) { // Sender side
- pimpl_ = simcall_comm_isend(sender_, mailbox_->getImpl(), remains_, rate_, srcBuff_, srcBuffSize_, matchFunction_,
- cleanFunction_, copyDataFunction_, user_data_, detached_);
- } else if (dstBuff_ != nullptr) { // Receiver side
+ if (src_buff_ != nullptr) { // Sender side
+ pimpl_ = simcall_comm_isend(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
+ clean_fun_, copy_data_function_, user_data_, detached_);
+ } else if (dst_buff_ != nullptr) { // Receiver side
xbt_assert(not detached_, "Receive cannot be detached");
- pimpl_ = simcall_comm_irecv(receiver_, mailbox_->getImpl(), dstBuff_, &dstBuffSize_, matchFunction_,
- copyDataFunction_, user_data_, rate_);
+ pimpl_ = simcall_comm_irecv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_,
+ copy_data_function_, user_data_, rate_);
} else {
xbt_die("Cannot start a communication before specifying whether we are the sender or the receiver");
}
- state_ = started;
+ state_ = State::started;
return this;
}
Activity* Comm::wait(double timeout)
{
switch (state_) {
- case finished:
+ case State::finished:
return this;
- case inited: // It's not started yet. Do it in one simcall
- if (srcBuff_ != nullptr) {
- simcall_comm_send(sender_, mailbox_->getImpl(), remains_, rate_, srcBuff_, srcBuffSize_, matchFunction_,
- copyDataFunction_, user_data_, timeout);
+ case State::inited: // It's not started yet. Do it in one simcall
+ if (src_buff_ != nullptr) {
+ simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
+ copy_data_function_, user_data_, timeout);
} else { // Receiver
- simcall_comm_recv(receiver_, mailbox_->getImpl(), dstBuff_, &dstBuffSize_, matchFunction_, copyDataFunction_,
+ simcall_comm_recv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_,
user_data_, timeout, rate_);
}
- state_ = finished;
+ state_ = State::finished;
return this;
- case started:
+ case State::started:
simcall_comm_wait(pimpl_, timeout);
- state_ = finished;
+ state_ = State::finished;
return this;
default:
Activity* Comm::detach()
{
- xbt_assert(state_ == inited, "You cannot detach communications once they are started.");
- xbt_assert(srcBuff_ != nullptr && srcBuffSize_ != 0, "You can only detach sends, not recvs");
+ xbt_assert(state_ == State::inited, "You cannot detach communications once they are started (not implemented).");
+ xbt_assert(src_buff_ != nullptr && src_buff_size_ != 0, "You can only detach sends, not recvs");
detached_ = true;
return start();
}
bool Comm::test()
{
- xbt_assert(state_ == inited || state_ == started || state_ == finished);
+ xbt_assert(state_ == State::inited || state_ == State::started || state_ == State::finished);
- if (state_ == finished) {
+ if (state_ == State::finished)
return true;
- }
- if (state_ == inited) {
+ if (state_ == State::inited)
this->start();
- }
if(simcall_comm_test(pimpl_)){
- state_ = finished;
+ state_ = State::finished;
return true;
}
return false;
}
-MailboxPtr Comm::getMailbox()
+MailboxPtr Comm::get_mailbox()
{
return mailbox_;
}
