X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..cdef428603e68472f5999bdcc382748f8eb5b7de:/src/kernel/activity/ActivityImpl.cpp diff --git a/src/kernel/activity/ActivityImpl.cpp b/src/kernel/activity/ActivityImpl.cpp index c1bb6850b6..54540506b1 100644 --- a/src/kernel/activity/ActivityImpl.cpp +++ b/src/kernel/activity/ActivityImpl.cpp @@ -5,12 +5,56 @@ #include "src/kernel/activity/ActivityImpl.hpp" +XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process); + namespace simgrid { namespace kernel { namespace activity { -ActivityImpl::ActivityImpl() = default; -ActivityImpl::~ActivityImpl() = default; +ActivityImpl::~ActivityImpl() +{ + clean_action(); + XBT_DEBUG("Destroy activity %p", this); +} + +void ActivityImpl::clean_action() +{ + if (surf_action_) { + surf_action_->unref(); + surf_action_ = nullptr; + } +} + +double ActivityImpl::get_remaining() const +{ + return surf_action_ ? surf_action_->get_remains() : 0; +} + +void ActivityImpl::suspend() +{ + if (surf_action_ == nullptr) + return; + XBT_VERB("This activity is suspended (remain: %f)", surf_action_->get_remains()); + surf_action_->suspend(); + on_suspended(*this); +} + +void ActivityImpl::resume() +{ + if (surf_action_ == nullptr) + return; + XBT_VERB("This activity is resumed (remain: %f)", surf_action_->get_remains()); + surf_action_->resume(); + on_resumed(*this); +} + +void ActivityImpl::cancel() +{ + XBT_VERB("Activity %p is canceled", this); + if (surf_action_ != nullptr) + surf_action_->cancel(); + state_ = SIMIX_CANCELED; +} // boost::intrusive_ptr support: void intrusive_ptr_add_ref(simgrid::kernel::activity::ActivityImpl* activity) @@ -25,6 +69,8 @@ void intrusive_ptr_release(simgrid::kernel::activity::ActivityImpl* activity) delete activity; } } +xbt::signal ActivityImpl::on_resumed; +xbt::signal ActivityImpl::on_suspended; } } } // namespace simgrid::kernel::activity::