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
fix a bug in an error message
[simgrid.git]
/
src
/
s4u
/
s4u_Actor.cpp
diff --git
a/src/s4u/s4u_Actor.cpp
b/src/s4u/s4u_Actor.cpp
index d6d6ae77cd5a33c77920e4cee5d4d6faf3820490..d6a2499b2e036aa75bec65e269b6cc63ecfa37e1 100644
(file)
--- a/
src/s4u/s4u_Actor.cpp
+++ b/
src/s4u/s4u_Actor.cpp
@@
-96,7
+96,7
@@
void intrusive_ptr_release(const Actor* actor)
{
intrusive_ptr_release(actor->pimpl_);
}
-int Actor::get_refcount()
+int Actor::get_refcount()
const
{
return pimpl_->get_refcount();
}
@@
-118,7
+118,7
@@
void Actor::join(double timeout)
issuer->simcall_answer();
} else {
kernel::activity::ActivityImplPtr sync = issuer->join(target, timeout);
- sync->register_simcall(&issuer->simcall);
+ sync->register_simcall(&issuer->simcall
_
);
}
});
}
@@
-129,7
+129,7
@@
void Actor::set_auto_restart(bool autorestart)
xbt_assert(autorestart && not pimpl_->has_to_auto_restart()); // FIXME: handle all cases
pimpl_->set_auto_restart(autorestart);
-
kernel::actor::ProcessArg
* arg = new kernel::actor::ProcessArg(pimpl_->get_host(), pimpl_);
+
auto
* arg = new kernel::actor::ProcessArg(pimpl_->get_host(), pimpl_);
XBT_DEBUG("Adding %s to the actors_at_boot_ list of Host %s", arg->name.c_str(), arg->host->get_cname());
pimpl_->get_host()->pimpl_->add_actor_at_boot(arg);
});
@@
-155,11
+155,11
@@
void Actor::set_host(Host* new_host)
const s4u::Host* previous_location = get_host();
kernel::actor::simcall([this, new_host]() {
- if (pimpl_->waiting_synchro != nullptr) {
+ if (pimpl_->waiting_synchro
_
!= nullptr) {
// The actor is blocked on an activity. If it's an exec, migrate it too.
// FIXME: implement the migration of other kinds of activities
kernel::activity::ExecImplPtr exec =
- boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(pimpl_->waiting_synchro);
+ boost::dynamic_pointer_cast<kernel::activity::ExecImpl>(pimpl_->waiting_synchro
_
);
xbt_assert(exec.get() != nullptr, "We can only migrate blocked actors when they are blocked on executions.");
exec->migrate(new_host);
}
@@
-234,7
+234,7
@@
void Actor::resume()
s4u::Actor::on_resume(*this);
}
-bool Actor::is_suspended()
+bool Actor::is_suspended()
const
{
return pimpl_->is_suspended();
}
@@
-245,7
+245,7
@@
void Actor::set_kill_time(double kill_time)
}
/** @brief Get the kill time of an actor(or 0 if unset). */
-double Actor::get_kill_time()
+double Actor::get_kill_time()
const
{
return pimpl_->get_kill_time();
}
@@
-327,7
+327,7
@@
void sleep_for(double duration)
return;
}
kernel::activity::ActivityImplPtr sync = issuer->sleep(duration);
- sync->register_simcall(&issuer->simcall);
+ sync->register_simcall(&issuer->simcall
_
);
});
Actor::on_wake_up(*issuer->ciface());
@@
-370,7
+370,7
@@
void parallel_execute(const std::vector<s4u::Host*>& hosts, const std::vector<do
ExecPtr exec_init(double flops_amount)
{
- ExecPtr exec
= ExecPtr
(new Exec());
+ ExecPtr exec(new Exec());
exec->set_flops_amount(flops_amount)->set_host(get_host());
return exec;
}
@@
-383,7
+383,7
@@
ExecPtr exec_init(const std::vector<s4u::Host*>& hosts, const std::vector<double
"Host count (%zu) does not match flops_amount count (%zu).", hosts.size(), flops_amounts.size());
xbt_assert(hosts.size() * hosts.size() == bytes_amounts.size() || bytes_amounts.empty(),
"bytes_amounts must be a matrix of size host_count * host_count (%zu*%zu), but it's of size %zu.",
- hosts.size(), hosts.size(),
flop
s_amounts.size());
+ hosts.size(), hosts.size(),
byte
s_amounts.size());
/* Check that we are not mixing VMs and PMs in the parallel task */
bool is_a_vm = (nullptr != dynamic_cast<VirtualMachine*>(hosts.front()));
xbt_assert(std::all_of(hosts.begin(), hosts.end(),
@@
-398,7
+398,7
@@
ExecPtr exec_init(const std::vector<s4u::Host*>& hosts, const std::vector<double
xbt_assert(std::all_of(bytes_amounts.begin(), bytes_amounts.end(), [](double elm) { return std::isfinite(elm); }),
"flops_amounts comprises infinite values!");
- ExecPtr exec
= ExecPtr
(new Exec());
+ ExecPtr exec(new Exec());
exec->set_flops_amounts(flops_amounts)->set_bytes_amounts(bytes_amounts)->set_hosts(hosts);
return exec;
}
@@
-478,7
+478,7
@@
size_t sg_actor_count()
sg_actor_t* sg_actor_list()
{
- simgrid::s4u::Engine* e = simgrid::s4u::Engine::get_instance();
+
const
simgrid::s4u::Engine* e = simgrid::s4u::Engine::get_instance();
size_t actor_count = e->get_actor_count();
xbt_assert(actor_count > 0, "There is no actor!");
std::vector<simgrid::s4u::ActorPtr> actors = e->get_all_actors();
@@
-624,7
+624,7
@@
void sg_actor_resume(sg_actor_t actor)
*
* This checks whether an actor is suspended or not by inspecting the task on which it was waiting for the completion.
*/
-int sg_actor_is_suspended(sg_actor_t actor)
+int sg_actor_is_suspended(
const_
sg_actor_t actor)
{
return actor->is_suspended();
}
@@
-828,7
+828,7
@@
void sg_actor_data_set(sg_actor_t actor, void* userdata)
* The on_exit functions are the functions executed when your process is killed.
* You should use them to free the data used by your process.
*/
-void sg_actor_on_exit(
int
_f_int_pvoid_t fun, void* data)
+void sg_actor_on_exit(
void
_f_int_pvoid_t fun, void* data)
{
simgrid::s4u::this_actor::on_exit([fun, data](bool failed) { fun(failed ? 1 /*FAILURE*/ : 0 /*SUCCESS*/, data); });
}
@@
-851,7
+851,7
@@
sg_exec_t sg_actor_parallel_exec_init(int host_nb, const sg_host_t* host_list, d
if (bytes_amount != nullptr)
bytes = std::vector<double>(bytes_amount, bytes_amount + host_nb * host_nb);
- simgrid::s4u::ExecPtr exec
= simgrid::s4u::ExecPtr
(new simgrid::s4u::Exec());
+ simgrid::s4u::ExecPtr exec(new simgrid::s4u::Exec());
exec->set_flops_amounts(flops)->set_bytes_amounts(bytes)->set_hosts(hosts);
exec->add_ref();
return exec.get();