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 signess that bother Qt Creator
[simgrid.git]
/
src
/
s4u
/
s4u_Actor.cpp
diff --git
a/src/s4u/s4u_Actor.cpp
b/src/s4u/s4u_Actor.cpp
index
506841b
..
3869be9
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,7
+31,7
@@
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();
@@
-47,9
+47,7
@@
ActorPtr Actor::create(std::string name, s4u::Host* host, std::function<void()>
ActorPtr Actor::create(std::string name, s4u::Host* host, std::string function, std::vector<std::string> args)
{
simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
ActorPtr Actor::create(std::string name, s4u::Host* host, std::string function, std::vector<std::string> args)
{
simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(function);
- simgrid::simix::ActorCode code = factory(std::move(args));
- simgrid::kernel::actor::ActorImpl* actor = simcall_process_create(name, std::move(code), nullptr, host, nullptr);
- return actor->iface();
+ return create(name, host, factory(std::move(args)));
}
void intrusive_ptr_add_ref(Actor* actor)
}
void intrusive_ptr_add_ref(Actor* actor)
@@
-177,7
+175,7
@@
double Actor::get_kill_time()
return SIMIX_timer_get_date(pimpl_->kill_timer);
}
return SIMIX_timer_get_date(pimpl_->kill_timer);
}
-void Actor::kill(aid_t pid)
+void Actor::kill(aid_t pid)
// deprecated
{
smx_actor_t killer = SIMIX_process_self();
smx_actor_t process = SIMIX_process_from_PID(pid);
{
smx_actor_t killer = SIMIX_process_self();
smx_actor_t process = SIMIX_process_from_PID(pid);
@@
-394,12
+392,6
@@
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()
{
smx_actor_t process = SIMIX_process_self();
void exit()
{
smx_actor_t process = SIMIX_process_self();
@@
-444,10
+436,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);
@@
-472,7
+460,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 */
@@
-487,7
+475,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();
}