-/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2007-2019. 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. */
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_process);
-simgrid::kernel::activity::ExecImpl::ExecImpl(const char* name, resource::Action* surf_action,
+simgrid::kernel::activity::ExecImpl::ExecImpl(std::string name, resource::Action* surf_action,
resource::Action* timeout_detector, s4u::Host* host)
- : host_(host)
+ : ActivityImpl(name), host_(host), surf_action_(surf_action), timeout_detector_(timeout_detector)
{
- if (name)
- this->name_ = name;
this->state_ = SIMIX_RUNNING;
- surf_action_ = surf_action;
surf_action_->set_data(this);
- if (timeout_detector != nullptr) {
+ if (timeout_detector != nullptr)
timeout_detector->set_data(this);
- timeout_detector_ = timeout_detector;
- }
XBT_DEBUG("Create exec %p", this);
}
XBT_VERB("This exec is suspended (remain: %f)", surf_action_->get_remains());
if (surf_action_ != nullptr)
surf_action_->suspend();
+ on_suspended(this);
}
void simgrid::kernel::activity::ExecImpl::resume()
XBT_VERB("This exec is resumed (remain: %f)", surf_action_->get_remains());
if (surf_action_ != nullptr)
surf_action_->resume();
+ on_resumed(this);
}
void simgrid::kernel::activity::ExecImpl::cancel()
{
{
if (host_ ==
nullptr) // parallel task: their remain is already between 0 and 1 (see comment in ExecImpl::get_remaining())
- return surf_action_->get_remains();
+ return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains();
else // Actually compute the ratio for sequential tasks
- return surf_action_->get_remains() / surf_action_->get_cost();
+ return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost();
}
void simgrid::kernel::activity::ExecImpl::set_bound(double bound)
surf_action_->set_priority(priority);
}
+void simgrid::kernel::activity::ExecImpl::set_category(std::string category)
+{
+ if (surf_action_)
+ surf_action_->set_category(category);
+}
+
void simgrid::kernel::activity::ExecImpl::post()
{
if (host_ && host_->is_off()) { /* FIXME: handle resource failure for parallel tasks too */
state_ = SIMIX_DONE;
}
+ on_completion(this);
+
if (surf_action_) {
surf_action_->unref();
surf_action_ = nullptr;
timeout_detector_ = nullptr;
}
- onCompletion(this);
/* If there are simcalls associated with the synchro, then answer them */
if (not simcalls_.empty())
SIMIX_execution_finish(this);
this->surf_action_ = new_action;
}
- onMigration(this, to);
+ on_migration(this, to);
return this;
}
/*************
* Callbacks *
*************/
-simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::onCreation;
-simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::onCompletion;
-simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr, simgrid::s4u::Host*)> simgrid::kernel::activity::ExecImpl::onMigration;
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::on_creation;
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::on_completion;
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::on_resumed;
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr)> simgrid::kernel::activity::ExecImpl::on_suspended;
+simgrid::xbt::signal<void(simgrid::kernel::activity::ExecImplPtr, simgrid::s4u::Host*)>
+ simgrid::kernel::activity::ExecImpl::on_migration;