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
use setters
[simgrid.git]
/
src
/
kernel
/
activity
/
ExecImpl.cpp
diff --git
a/src/kernel/activity/ExecImpl.cpp
b/src/kernel/activity/ExecImpl.cpp
index
fedef08
..
844847a
100644
(file)
--- a/
src/kernel/activity/ExecImpl.cpp
+++ b/
src/kernel/activity/ExecImpl.cpp
@@
-51,14
+51,6
@@
namespace simgrid {
namespace kernel {
namespace activity {
namespace kernel {
namespace activity {
-ExecImpl::ExecImpl(const std::string& name, const std::string& tracing_category) : ActivityImpl(name)
-{
- this->state_ = SIMIX_RUNNING;
- this->set_category(tracing_category);
-
- XBT_DEBUG("Create exec %p", this);
-}
-
ExecImpl::~ExecImpl()
{
if (timeout_detector_)
ExecImpl::~ExecImpl()
{
if (timeout_detector_)
@@
-72,6
+64,18
@@
ExecImpl* ExecImpl::set_host(s4u::Host* host)
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()) {
ExecImpl* ExecImpl::set_timeout(double timeout)
{
if (timeout > 0 && not MC_is_active() && not MC_record_replay_is_active()) {
@@
-83,6
+87,7
@@
ExecImpl* ExecImpl::set_timeout(double timeout)
ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound)
{
ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound)
{
+ state_ = SIMIX_RUNNING;
if (not MC_is_active() && not MC_record_replay_is_active()) {
surf_action_ = host_->pimpl_cpu->execution_start(flops_amount);
surf_action_->set_data(this);
if (not MC_is_active() && not MC_record_replay_is_active()) {
surf_action_ = host_->pimpl_cpu->execution_start(flops_amount);
surf_action_->set_data(this);
@@
-99,6
+104,7
@@
ExecImpl* ExecImpl::start(double flops_amount, double priority, double bound)
ExecImpl* ExecImpl::start(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
const std::vector<double>& bytes_amounts)
{
ExecImpl* ExecImpl::start(const std::vector<s4u::Host*>& hosts, const std::vector<double>& flops_amounts,
const std::vector<double>& bytes_amounts)
{
+ state_ = SIMIX_RUNNING;
/* set surf's synchro */
if (not MC_is_active() && not MC_record_replay_is_active()) {
surf_action_ = surf_host_model->execute_parallel(hosts, flops_amounts.data(), bytes_amounts.data(), -1);
/* set surf's synchro */
if (not MC_is_active() && not MC_record_replay_is_active()) {
surf_action_ = surf_host_model->execute_parallel(hosts, flops_amounts.data(), bytes_amounts.data(), -1);