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
Avoid unnecessary copy of parameters for parallel_execute.
[simgrid.git]
/
src
/
s4u
/
s4u_Actor.cpp
diff --git
a/src/s4u/s4u_Actor.cpp
b/src/s4u/s4u_Actor.cpp
index
3869be9
..
ec1085f
100644
(file)
--- a/
src/s4u/s4u_Actor.cpp
+++ b/
src/s4u/s4u_Actor.cpp
@@
-35,7
+35,7
@@
ActorPtr Actor::self()
if (self_context == nullptr)
return simgrid::s4u::ActorPtr();
if (self_context == nullptr)
return simgrid::s4u::ActorPtr();
- return self_context->
process
()->iface();
+ return self_context->
get_actor
()->iface();
}
ActorPtr Actor::create(std::string name, s4u::Host* host, std::function<void()> code)
}
ActorPtr Actor::create(std::string name, s4u::Host* host, std::function<void()> code)
@@
-106,7
+106,7
@@
void Actor::migrate(Host* new_host)
xbt_assert(exec.get() != nullptr, "We can only migrate blocked actors when they are blocked on executions.");
exec->migrate(new_host);
}
xbt_assert(exec.get() != nullptr, "We can only migrate blocked actors when they are blocked on executions.");
exec->migrate(new_host);
}
-
SIMIX_process_change_host(this->pimpl_,
new_host);
+
this->pimpl_->set_host(
new_host);
});
s4u::Actor::on_migration_end(this);
});
s4u::Actor::on_migration_end(this);
@@
-164,9
+164,9
@@
bool Actor::is_suspended()
return simgrid::simix::simcall([this] { return pimpl_->suspended_; });
}
return simgrid::simix::simcall([this] { return pimpl_->suspended_; });
}
-void Actor::set_kill_time(double time)
+void Actor::set_kill_time(double
kill_
time)
{
{
- sim
call_process_set_kill_time(pimpl_, time
);
+ sim
grid::simix::simcall([this, kill_time] { pimpl_->set_kill_time(kill_time); }
);
}
/** @brief Get the kill time of an actor(or 0 if unset). */
}
/** @brief Get the kill time of an actor(or 0 if unset). */
@@
-178,9
+178,9
@@
double Actor::get_kill_time()
void Actor::kill(aid_t pid) // deprecated
{
smx_actor_t killer = SIMIX_process_self();
void Actor::kill(aid_t pid) // deprecated
{
smx_actor_t killer = SIMIX_process_self();
- smx_actor_t
process
= SIMIX_process_from_PID(pid);
- if (
process
!= nullptr) {
- simgrid::simix::simcall([killer,
process] { SIMIX_process_kill(process, killer
); });
+ smx_actor_t
victim
= SIMIX_process_from_PID(pid);
+ if (
victim
!= nullptr) {
+ simgrid::simix::simcall([killer,
victim] { killer->kill(victim
); });
} else {
std::ostringstream oss;
oss << "kill: (" << pid << ") - No such actor" << std::endl;
} else {
std::ostringstream oss;
oss << "kill: (" << pid << ") - No such actor" << std::endl;
@@
-191,8
+191,12
@@
void Actor::kill(aid_t pid) // deprecated
void Actor::kill()
{
smx_actor_t process = SIMIX_process_self();
void Actor::kill()
{
smx_actor_t process = SIMIX_process_self();
- simgrid::simix::simcall(
- [this, process] { SIMIX_process_kill(pimpl_, (pimpl_ == simix_global->maestro_process) ? pimpl_ : process); });
+ simgrid::simix::simcall([this, process] {
+ if (pimpl_ == simix_global->maestro_process)
+ pimpl_->exit();
+ else
+ process->kill(pimpl_);
+ });
}
smx_actor_t Actor::get_impl()
}
smx_actor_t Actor::get_impl()
@@
-214,7
+218,7
@@
ActorPtr Actor::by_pid(aid_t pid)
void Actor::kill_all()
{
smx_actor_t self = SIMIX_process_self();
void Actor::kill_all()
{
smx_actor_t self = SIMIX_process_self();
- simgrid::simix::simcall([
&self] { SIMIX_process_killall(self
); });
+ simgrid::simix::simcall([
self] { self->kill_all(
); });
}
std::unordered_map<std::string, std::string>* Actor::get_properties()
}
std::unordered_map<std::string, std::string>* Actor::get_properties()
@@
-291,13
+295,13
@@
void execute(double flops, double priority)
exec_init(flops)->set_priority(priority)->start()->wait();
}
exec_init(flops)->set_priority(priority)->start()->wait();
}
-void parallel_execute(
std::vector<s4u::Host*> hosts, std::vector<double>
flops_amounts,
-
std::vector<double>
bytes_amounts)
+void parallel_execute(
const std::vector<s4u::Host*>& hosts, const std::vector<double>&
flops_amounts,
+
const std::vector<double>&
bytes_amounts)
{
parallel_execute(hosts, flops_amounts, bytes_amounts, -1);
}
{
parallel_execute(hosts, flops_amounts, bytes_amounts, -1);
}
-void parallel_execute(
std::vector<s4u::Host*> hosts, std::vector<double>
flops_amounts,
-
std::vector<double>
bytes_amounts, double timeout)
+void parallel_execute(
const std::vector<s4u::Host*>& hosts, const std::vector<double>&
flops_amounts,
+
const std::vector<double>&
bytes_amounts, double timeout)
{
xbt_assert(hosts.size() > 0, "Your parallel executions must span over at least one host.");
xbt_assert(hosts.size() == flops_amounts.size() || flops_amounts.empty(),
{
xbt_assert(hosts.size() > 0, "Your parallel executions must span over at least one host.");
xbt_assert(hosts.size() == flops_amounts.size() || flops_amounts.empty(),
@@
-317,7
+321,8
@@
void parallel_execute(std::vector<s4u::Host*> hosts, std::vector<double> flops_a
}
// deprecated
}
// deprecated
-void parallel_execute(int host_nb, s4u::Host** host_list, double* flops_amount, double* bytes_amount, double timeout)
+void parallel_execute(int host_nb, s4u::Host* const* host_list, const double* flops_amount, const double* bytes_amount,
+ double timeout)
{
smx_activity_t s =
simcall_execution_parallel_start("", host_nb, host_list, flops_amount, bytes_amount, /* rate */ -1, timeout);
{
smx_activity_t s =
simcall_execution_parallel_start("", host_nb, host_list, flops_amount, bytes_amount, /* rate */ -1, timeout);
@@
-327,7
+332,7
@@
void parallel_execute(int host_nb, s4u::Host** host_list, double* flops_amount,
}
// deprecated
}
// deprecated
-void parallel_execute(int host_nb, s
g_host_t* host_list, double* flops_amount,
double* bytes_amount)
+void parallel_execute(int host_nb, s
4u::Host* const* host_list, const double* flops_amount, const
double* bytes_amount)
{
smx_activity_t s = simcall_execution_parallel_start("", host_nb, host_list, flops_amount, bytes_amount,
/* rate */ -1, /*timeout*/ -1);
{
smx_activity_t s = simcall_execution_parallel_start("", host_nb, host_list, flops_amount, bytes_amount,
/* rate */ -1, /*timeout*/ -1);
@@
-338,11
+343,7
@@
void parallel_execute(int host_nb, sg_host_t* host_list, double* flops_amount, d
ExecPtr exec_init(double flops_amount)
{
ExecPtr exec_init(double flops_amount)
{
- ExecPtr res = ExecPtr(new Exec());
- res->host_ = get_host();
- res->flops_amount_ = flops_amount;
- res->set_remaining(flops_amount);
- return res;
+ return ExecPtr(new Exec(get_host(), flops_amount));
}
ExecPtr exec_async(double flops)
}
ExecPtr exec_async(double flops)
@@
-394,8
+395,8
@@
void resume()
void exit()
{
void exit()
{
- smx_actor_t
process
= SIMIX_process_self();
- simgrid::simix::simcall([
process] { SIMIX_process_kill(process, process
); });
+ smx_actor_t
actor
= SIMIX_process_self();
+ simgrid::simix::simcall([
actor] { actor->exit(
); });
}
void on_exit(std::function<void(int, void*)> fun, void* data)
}
void on_exit(std::function<void(int, void*)> fun, void* data)
@@
-642,3
+643,8
@@
void sg_actor_yield()
{
simgrid::s4u::this_actor::yield();
}
{
simgrid::s4u::this_actor::yield();
}
+
+void sg_actor_sleep_for(double duration)
+{
+ simgrid::s4u::this_actor::sleep_for(duration);
+}