size_t src_buff_size, int (*match_fun)(void*, void*, simgrid::kernel::activity::CommImpl*),
void (*clean_fun)(void*), // used to free the synchro in case of problem after a detached send
void (*copy_data_fun)(simgrid::kernel::activity::CommImpl*, void*, size_t), // used to copy data if not default one
- void* data, int detached)
+ void* data, bool detached)
{
XBT_DEBUG("send from mailbox %p", mbox);
other_comm->state_ = SIMIX_READY;
other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::READY);
}
- src_proc->comms.push_back(other_comm);
if (detached) {
- other_comm->detached = true;
+ other_comm->detached_ = true;
other_comm->clean_fun = clean_fun;
} else {
other_comm->clean_fun = nullptr;
+ src_proc->comms.push_back(other_comm);
}
/* Setup the communication synchro */
other_comm->match_fun = match_fun;
other_comm->copy_data_fun = copy_data_fun;
- if (MC_is_active() || MC_record_replay_is_active()) {
+ if (MC_is_active() || MC_record_replay_is_active())
other_comm->state_ = SIMIX_RUNNING;
- return (detached ? nullptr : other_comm);
- }
-
- other_comm->start();
+ else
+ other_comm->start();
return (detached ? nullptr : other_comm);
}
other_comm = std::move(this_synchro);
mbox->push(other_comm);
} else {
- if (other_comm->surf_action_ && other_comm->remains() < 1e-12) {
+ if (other_comm->surf_action_ && other_comm->get_remaining() < 1e-12) {
XBT_DEBUG("comm %p has been already sent, and is finished, destroy it", other_comm.get());
other_comm->state_ = SIMIX_DONE;
other_comm->set_type(simgrid::kernel::activity::CommImpl::Type::DONE);
/* Associate this simcall to the wait synchro */
XBT_DEBUG("simcall_HANDLER_comm_wait, %p", comm);
- comm->simcalls_.push_back(simcall);
- simcall->issuer->waiting_synchro = comm;
+ comm->register_simcall(simcall);
if (MC_is_active() || MC_record_replay_is_active()) {
int idx = SIMCALL_GET_MC_VALUE(simcall);
comm->finish();
} else { /* we need a sleep action (even when there is no timeout) to be notified of host failures */
simgrid::kernel::resource::Action* sleep = simcall->issuer->get_host()->pimpl_cpu->sleep(timeout);
- sleep->set_data(comm);
+ sleep->set_activity(comm);
if (simcall->issuer == comm->src_actor_)
comm->src_timeout_ = sleep;
void simcall_HANDLER_comm_test(smx_simcall_t simcall, simgrid::kernel::activity::CommImpl* comm)
{
- int res;
+ bool res;
if (MC_is_active() || MC_record_replay_is_active()) {
res = comm->src_actor_ && comm->dst_actor_;
{
XBT_DEBUG("Copy the data over");
memcpy(comm->dst_buff_, buff, buff_size);
- if (comm->detached) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the
+ if (comm->detached_) { // if this is a detached send, the source buffer was duplicated by SMPI sender to make the
// original buffer available to the application ASAP
xbt_free(buff);
comm->src_buff_ = nullptr;
CommImpl::~CommImpl()
{
- XBT_DEBUG("Really free communication %p in state %d (detached = %d)", this, static_cast<int>(state_),
- static_cast<int>(detached));
+ XBT_DEBUG("Really free communication %p in state %d (detached = %d)", this, static_cast<int>(state_), detached_);
cleanupSurf();
- if (detached && state_ != SIMIX_DONE) {
+ if (detached_ && state_ != SIMIX_DONE) {
/* the communication has failed and was detached:
* we have to free the buffer */
if (clean_fun)
s4u::Host* receiver = dst_actor_->get_host();
surf_action_ = surf_network_model->communicate(sender, receiver, size_, rate_);
- surf_action_->set_data(this);
+ surf_action_->set_activity(this);
+ surf_action_->set_category(get_tracing_category());
state_ = SIMIX_RUNNING;
XBT_DEBUG("Starting communication %p from '%s' to '%s' (surf_action: %p)", this, sender->get_cname(),
{
/* if the synchro is a waiting state means that it is still in a mbox so remove from it and delete it */
if (state_ == SIMIX_WAITING) {
- if (not detached) {
+ if (not detached_) {
mbox->remove(this);
state_ = SIMIX_CANCELED;
}
}
}
-/** @brief get the amount remaining from the communication */
-double CommImpl::remains()
-{
- return surf_action_->get_remains();
-}
-
/** @brief This is part of the cleanup process, probably an internal command */
void CommImpl::cleanupSurf()
{
- if (surf_action_) {
- surf_action_->unref();
- surf_action_ = nullptr;
- }
+ clean_action();
if (src_timeout_) {
src_timeout_->unref();
state_ = SIMIX_DONE;
XBT_DEBUG("SIMIX_post_comm: comm %p, state %d, src_proc %p, dst_proc %p, detached: %d", this, (int)state_,
- src_actor_.get(), dst_actor_.get(), detached);
+ src_actor_.get(), dst_actor_.get(), detached_);
/* destroy the surf actions associated with the Simix communication */
cleanupSurf();
"detached:%d",
this, src_actor_ ? src_actor_->get_host()->get_cname() : nullptr,
dst_actor_ ? dst_actor_->get_host()->get_cname() : nullptr, simcall->issuer->get_cname(),
- simcall->issuer, detached);
+ simcall->issuer, detached_);
if (src_actor_ == simcall->issuer) {
XBT_DEBUG("I'm source");
} else if (dst_actor_ == simcall->issuer) {
simcall->issuer->waiting_synchro = nullptr;
simcall->issuer->comms.remove(this);
- if (detached) {
+ if (detached_) {
if (simcall->issuer == src_actor_) {
if (dst_actor_)
dst_actor_->comms.remove(this);