}
if(mbox)
- SIMIX_mbox_remove(mbox, this);
-
+ mbox->remove(this);
}
void simgrid::kernel::activity::Comm::suspend()
{
/* 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) {
- SIMIX_mbox_remove(mbox, this);
+ mbox->remove(this);
state = SIMIX_CANCELED;
- }
- else if (!MC_is_active() /* when running the MC there are no surf actions */
- && !MC_record_replay_is_active()
- && (state == SIMIX_READY || state == SIMIX_RUNNING)) {
+ } else if (not MC_is_active() /* when running the MC there are no surf actions */
+ && not MC_record_replay_is_active() && (state == SIMIX_READY || state == SIMIX_RUNNING)) {
surf_comm->cancel();
}
/** @brief get the amount remaining from the communication */
double simgrid::kernel::activity::Comm::remains()
{
- switch (state) {
-
- case SIMIX_RUNNING:
+ if (state == SIMIX_RUNNING)
return surf_comm->getRemains();
- default:
- return 0; /*FIXME: check what should be returned */
- }
+ /* FIXME: check what should be returned in the other cases */
+ return 0;
}
/** @brief This is part of the cleanup process, probably an internal command */
cleanupSurf();
/* if there are simcalls associated with the synchro, then answer them */
- if (!simcalls.empty())
+ if (not simcalls.empty())
SIMIX_comm_finish(this);
}