A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
simcall_execution_test returns a bool not a state
[simgrid.git]
/
src
/
kernel
/
activity
/
ExecImpl.cpp
diff --git
a/src/kernel/activity/ExecImpl.cpp
b/src/kernel/activity/ExecImpl.cpp
index
07b3c4e
..
a2ca6a8
100644
(file)
--- a/
src/kernel/activity/ExecImpl.cpp
+++ b/
src/kernel/activity/ExecImpl.cpp
@@
-37,7
+37,7
@@
void simcall_HANDLER_execution_wait(smx_simcall_t simcall, simgrid::kernel::acti
void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro)
{
void simcall_HANDLER_execution_test(smx_simcall_t simcall, simgrid::kernel::activity::ExecImpl* synchro)
{
-
int
res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING);
+
bool
res = (synchro->state_ != SIMIX_WAITING && synchro->state_ != SIMIX_RUNNING);
if (res) {
synchro->simcalls_.push_back(simcall);
synchro->finish();
if (res) {
synchro->simcalls_.push_back(simcall);
synchro->finish();
@@
-72,23
+72,11
@@
ExecImpl& ExecImpl::set_hosts(const std::vector<s4u::Host*>& hosts)
return *this;
}
return *this;
}
-ExecImpl& ExecImpl::set_name(const std::string& name)
-{
- ActivityImpl::set_name(name);
- return *this;
-}
-
-ExecImpl& ExecImpl::set_tracing_category(const std::string& category)
-{
- ActivityImpl::set_category(category);
- return *this;
-}
-
ExecImpl& ExecImpl::set_timeout(double timeout)
{
if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) {
timeout_detector_ = hosts_.front()->pimpl_cpu->sleep(timeout);
ExecImpl& ExecImpl::set_timeout(double timeout)
{
if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) {
timeout_detector_ = hosts_.front()->pimpl_cpu->sleep(timeout);
- timeout_detector_->set_
data
(this);
+ timeout_detector_->set_
activity
(this);
}
return *this;
}
}
return *this;
}
@@
-121,12
+109,14
@@
ExecImpl* ExecImpl::start()
if (hosts_.size() == 1) {
surf_action_ = hosts_.front()->pimpl_cpu->execution_start(flops_amounts_.front());
surf_action_->set_priority(priority_);
if (hosts_.size() == 1) {
surf_action_ = hosts_.front()->pimpl_cpu->execution_start(flops_amounts_.front());
surf_action_->set_priority(priority_);
+ surf_action_->set_category(get_tracing_category());
+
if (bound_ > 0)
surf_action_->set_bound(bound_);
} else {
surf_action_ = surf_host_model->execute_parallel(hosts_, flops_amounts_.data(), bytes_amounts_.data(), -1);
}
if (bound_ > 0)
surf_action_->set_bound(bound_);
} else {
surf_action_ = surf_host_model->execute_parallel(hosts_, flops_amounts_.data(), bytes_amounts_.data(), -1);
}
- surf_action_->set_
data
(this);
+ surf_action_->set_
activity
(this);
}
XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
}
XBT_DEBUG("Create execute synchro %p: %s", this, get_cname());
@@
-134,18
+124,6
@@
ExecImpl* ExecImpl::start()
return this;
}
return this;
}
-void ExecImpl::cancel()
-{
- XBT_VERB("This exec %p is canceled", this);
- if (surf_action_ != nullptr)
- surf_action_->cancel();
-}
-
-double ExecImpl::get_remaining() const
-{
- return surf_action_ ? surf_action_->get_remains() : 0;
-}
-
double ExecImpl::get_seq_remaining_ratio()
{
return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost();
double ExecImpl::get_seq_remaining_ratio()
{
return (surf_action_ == nullptr) ? 0 : surf_action_->get_remains() / surf_action_->get_cost();
@@
-186,10
+164,8
@@
void ExecImpl::post()
on_completion(*this);
on_completion(*this);
- if (surf_action_) {
- surf_action_->unref();
- surf_action_ = nullptr;
- }
+ clean_action();
+
if (timeout_detector_) {
timeout_detector_->unref();
timeout_detector_ = nullptr;
if (timeout_detector_) {
timeout_detector_->unref();
timeout_detector_ = nullptr;
@@
-253,13
+229,13
@@
ActivityImpl* ExecImpl::migrate(s4u::Host* to)
resource::Action* old_action = this->surf_action_;
resource::Action* new_action = to->pimpl_cpu->execution_start(old_action->get_cost());
new_action->set_remains(old_action->get_remains());
resource::Action* old_action = this->surf_action_;
resource::Action* new_action = to->pimpl_cpu->execution_start(old_action->get_cost());
new_action->set_remains(old_action->get_remains());
- new_action->set_
data
(this);
+ new_action->set_
activity
(this);
new_action->set_priority(old_action->get_priority());
// FIXME: the user-defined bound seem to not be kept by LMM, that seem to overwrite it for the multi-core modeling.
// I hope that the user did not provide any.
new_action->set_priority(old_action->get_priority());
// FIXME: the user-defined bound seem to not be kept by LMM, that seem to overwrite it for the multi-core modeling.
// I hope that the user did not provide any.
- old_action->set_
data
(nullptr);
+ old_action->set_
activity
(nullptr);
old_action->cancel();
old_action->unref();
this->surf_action_ = new_action;
old_action->cancel();
old_action->unref();
this->surf_action_ = new_action;