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
Merge branch 'master' of https://framagit.org/simgrid/simgrid
[simgrid.git]
/
src
/
s4u
/
s4u_Actor.cpp
diff --git
a/src/s4u/s4u_Actor.cpp
b/src/s4u/s4u_Actor.cpp
index
816540b
..
7619d44
100644
(file)
--- a/
src/s4u/s4u_Actor.cpp
+++ b/
src/s4u/s4u_Actor.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-201
9
. 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. */
/* 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. */
@@
-31,23
+31,24
@@
simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Actor::on_destruction;
// ***** Actor creation *****
ActorPtr Actor::self()
{
// ***** Actor creation *****
ActorPtr Actor::self()
{
- smx_context_t self_context =
SIMIX_context_
self();
+ smx_context_t self_context =
simgrid::kernel::context::Context::
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)
{
- simgrid::kernel::actor::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
+ simgrid::kernel::actor::ActorImpl* actor =
+ simcall_process_create(std::move(name), std::move(code), nullptr, host, nullptr);
return actor->iface();
}
return actor->iface();
}
-ActorPtr Actor::create(std::string name, s4u::Host* host,
std::string
function, std::vector<std::string> args)
+ActorPtr Actor::create(std::string name, s4u::Host* host,
const std::string&
function, std::vector<std::string> args)
{
simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
{
simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
- return create(
name, host, std::move(factory(std::move(args)
)));
+ return create(
std::move(name), host, factory(std::move(args
)));
}
void intrusive_ptr_add_ref(Actor* actor)
}
void intrusive_ptr_add_ref(Actor* actor)
@@
-74,12
+75,12
@@
void Actor::join(double timeout)
void Actor::set_auto_restart(bool autorestart)
{
simgrid::simix::simcall([this, autorestart]() {
void Actor::set_auto_restart(bool autorestart)
{
simgrid::simix::simcall([this, autorestart]() {
- xbt_assert(autorestart && not pimpl_->
auto_restart_
); // FIXME: handle all cases
+ xbt_assert(autorestart && not pimpl_->
has_to_auto_restart()
); // FIXME: handle all cases
pimpl_->set_auto_restart(autorestart);
pimpl_->set_auto_restart(autorestart);
- simgrid::kernel::actor::ProcessArg* arg = new simgrid::kernel::actor::ProcessArg(pimpl_->
host_
, pimpl_);
+ simgrid::kernel::actor::ProcessArg* arg = new simgrid::kernel::actor::ProcessArg(pimpl_->
get_host()
, pimpl_);
XBT_DEBUG("Adding Process %s to the actors_at_boot_ list of Host %s", arg->name.c_str(), arg->host->get_cname());
XBT_DEBUG("Adding Process %s to the actors_at_boot_ list of Host %s", arg->name.c_str(), arg->host->get_cname());
- pimpl_->
host_
->pimpl_->actors_at_boot_.emplace_back(arg);
+ pimpl_->
get_host()
->pimpl_->actors_at_boot_.emplace_back(arg);
});
}
});
}
@@
-106,7
+107,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);
@@
-114,7
+115,7
@@
void Actor::migrate(Host* new_host)
s4u::Host* Actor::get_host()
{
s4u::Host* Actor::get_host()
{
- return this->pimpl_->
host_
;
+ return this->pimpl_->
get_host()
;
}
void Actor::daemonize()
}
void Actor::daemonize()
@@
-139,12
+140,12
@@
const char* Actor::get_cname() const
aid_t Actor::get_pid() const
{
aid_t Actor::get_pid() const
{
- return this->pimpl_->
pid_
;
+ return this->pimpl_->
get_pid()
;
}
aid_t Actor::get_ppid() const
{
}
aid_t Actor::get_ppid() const
{
- return this->pimpl_->
ppid_
;
+ return this->pimpl_->
get_ppid()
;
}
void Actor::suspend()
}
void Actor::suspend()
@@
-161,26
+162,26
@@
void Actor::resume()
bool Actor::is_suspended()
{
bool Actor::is_suspended()
{
- return simgrid::simix::simcall([this] { return pimpl_->
suspended_
; });
+ return simgrid::simix::simcall([this] { return pimpl_->
is_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). */
double Actor::get_kill_time()
{
}
/** @brief Get the kill time of an actor(or 0 if unset). */
double Actor::get_kill_time()
{
- return
SIMIX_timer_get_date(pimpl_->kill_timer
);
+ return
pimpl_->get_kill_time(
);
}
}
-void Actor::kill(aid_t pid)
+void Actor::kill(aid_t pid)
// deprecated
{
smx_actor_t killer = SIMIX_process_self();
{
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
+192,12
@@
void Actor::kill(aid_t pid)
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
+219,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()
@@
-223,14
+228,14
@@
std::unordered_map<std::string, std::string>* Actor::get_properties()
}
/** Retrieve the property value (or nullptr if not set) */
}
/** Retrieve the property value (or nullptr if not set) */
-const char* Actor::get_property(
std::string
key)
+const char* Actor::get_property(
const std::string&
key)
{
return simgrid::simix::simcall([this, key] { return pimpl_->get_property(key); });
}
{
return simgrid::simix::simcall([this, key] { return pimpl_->get_property(key); });
}
-void Actor::set_property(
std::string
key, std::string value)
+void Actor::set_property(
const std::string&
key, std::string value)
{
{
- simgrid::simix::simcall([this, key, value] { pimpl_->set_property(key,
value
); });
+ simgrid::simix::simcall([this, key, value] { pimpl_->set_property(key,
std::move(value)
); });
}
Actor* Actor::restart()
}
Actor* Actor::restart()
@@
-291,13
+296,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
+322,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
+333,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
+344,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)
@@
-354,12
+356,12
@@
ExecPtr exec_async(double flops)
aid_t get_pid()
{
aid_t get_pid()
{
- return SIMIX_process_self()->
pid_
;
+ return SIMIX_process_self()->
get_pid()
;
}
aid_t get_ppid()
{
}
aid_t get_ppid()
{
- return SIMIX_process_self()->
ppid_
;
+ return SIMIX_process_self()->
get_ppid()
;
}
std::string get_name()
}
std::string get_name()
@@
-374,7
+376,7
@@
const char* get_cname()
Host* get_host()
{
Host* get_host()
{
- return SIMIX_process_self()->
host_
;
+ return SIMIX_process_self()->
get_host()
;
}
void suspend()
}
void suspend()
@@
-392,16
+394,10
@@
void resume()
simgrid::s4u::Actor::on_resume(process->iface());
}
simgrid::s4u::Actor::on_resume(process->iface());
}
-bool is_suspended()
-{
- smx_actor_t process = SIMIX_process_self();
- return simgrid::simix::simcall([process] { return process->suspended_; });
-}
-
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)
@@
-442,10
+438,6
@@
Host* getHost() /* deprecated */
{
return get_host();
}
{
return get_host();
}
-bool isSuspended() /* deprecated */
-{
- return is_suspended();
-}
void on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */
{
SIMIX_process_self()->iface()->on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
void on_exit(int_f_pvoid_pvoid_t fun, void* data) /* deprecated */
{
SIMIX_process_self()->iface()->on_exit([fun](int a, void* b) { fun((void*)(intptr_t)a, b); }, data);
@@
-470,7
+462,7
@@
void kill() /* deprecated */
*
* This function checks whether @a actor is a valid pointer and return its PID (or 0 in case of problem).
*/
*
* This function checks whether @a actor is a valid pointer and return its PID (or 0 in case of problem).
*/
-
in
t sg_actor_get_PID(sg_actor_t actor)
+
aid_
t sg_actor_get_PID(sg_actor_t actor)
{
/* Do not raise an exception here: this function is called by the logs
* and the exceptions, so it would be called back again and again */
{
/* Do not raise an exception here: this function is called by the logs
* and the exceptions, so it would be called back again and again */
@@
-485,7
+477,7
@@
int sg_actor_get_PID(sg_actor_t actor)
* This function checks whether @a actor is a valid pointer and return its parent's PID.
* Returns -1 if the actor has not been created by any other actor.
*/
* This function checks whether @a actor is a valid pointer and return its parent's PID.
* Returns -1 if the actor has not been created by any other actor.
*/
-
in
t sg_actor_get_PPID(sg_actor_t actor)
+
aid_
t sg_actor_get_PPID(sg_actor_t actor)
{
return actor->get_ppid();
}
{
return actor->get_ppid();
}
@@
-652,3
+644,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);
+}