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
Specify visibility (hide warning).
[simgrid.git]
/
src
/
s4u
/
s4u_Actor.cpp
diff --git
a/src/s4u/s4u_Actor.cpp
b/src/s4u/s4u_Actor.cpp
index 953763c3e1aac58cc6189326a15a130bc4ba83f3..0db6b207591ed66d6caaef0eb88da33463d8f506 100644
(file)
--- a/
src/s4u/s4u_Actor.cpp
+++ b/
src/s4u/s4u_Actor.cpp
@@
-232,7
+232,7
@@
void Actor::kill_all()
simix::simcall([self] { self->kill_all(); });
}
simix::simcall([self] { self->kill_all(); });
}
-std::unordered_map<std::string, std::string>* Actor::get_properties() const
+
const
std::unordered_map<std::string, std::string>* Actor::get_properties() const
{
return pimpl_->get_properties();
}
{
return pimpl_->get_properties();
}
@@
-289,11
+289,11
@@
void yield()
simix::simcall([] { /* do nothing*/ });
}
simix::simcall([] { /* do nothing*/ });
}
-XBT_PUBLIC void sleep_until(double
timeout
)
+XBT_PUBLIC void sleep_until(double
wakeup_time
)
{
double now = SIMIX_get_clock();
{
double now = SIMIX_get_clock();
- if (
timeout
> now)
- sleep_for(
timeout
- now);
+ if (
wakeup_time
> now)
+ sleep_for(
wakeup_time
- now);
}
void execute(double flops)
}
void execute(double flops)
@@
-442,11
+442,6
@@
void migrate(Host* new_host)
SIMIX_process_self()->iface()->migrate(new_host);
}
SIMIX_process_self()->iface()->migrate(new_host);
}
-void kill() /* deprecated */
-{
- exit();
-}
-
} // namespace this_actor
} // namespace s4u
} // namespace simgrid
} // namespace this_actor
} // namespace s4u
} // namespace simgrid
@@
-525,7
+520,7
@@
xbt_dict_t sg_actor_get_properties(sg_actor_t actor)
{
xbt_assert(actor != nullptr, "Invalid parameter: First argument must not be nullptr");
xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
{
xbt_assert(actor != nullptr, "Invalid parameter: First argument must not be nullptr");
xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f);
- std::unordered_map<std::string, std::string>* props = actor->get_properties();
+
const
std::unordered_map<std::string, std::string>* props = actor->get_properties();
if (props == nullptr)
return nullptr;
for (auto const& kv : *props) {
if (props == nullptr)
return nullptr;
for (auto const& kv : *props) {