X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f8498e93073ae2ad6e6e19571ecf52c9104edbd0..6c98d311c94b09a185a36f90f7a4a56a6a70298a:/src/kernel/activity/ActivityImpl.cpp diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp index da8f12d825..240631100b 100644 --- a/src/kernel/activity/ActivityImpl.cpp +++ b/src/kernel/activity/ActivityImpl.cpp @@ -4,6 +4,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/kernel/activity/ActivityImpl.hpp" +#include "src/simix/smx_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); @@ -17,6 +18,12 @@ ActivityImpl::~ActivityImpl() XBT_DEBUG("Destroy activity %p", this); } +void ActivityImpl::register_simcall(smx_simcall_t simcall) +{ + simcalls_.push_back(simcall); + simcall->issuer_->waiting_synchro = this; +} + void ActivityImpl::clean_action() { if (surf_action_) { @@ -53,6 +60,7 @@ void ActivityImpl::cancel() XBT_VERB("Activity %p is canceled", this); if (surf_action_ != nullptr) surf_action_->cancel(); + state_ = State::CANCELED; } // boost::intrusive_ptr support: