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
Use ssize_t for Exec::wait_any and Io::wait_any too.
[simgrid.git]
/
src
/
s4u
/
s4u_Exec.cpp
diff --git
a/src/s4u/s4u_Exec.cpp
b/src/s4u/s4u_Exec.cpp
index
5cd21a2
..
71368f7
100644
(file)
--- a/
src/s4u/s4u_Exec.cpp
+++ b/
src/s4u/s4u_Exec.cpp
@@
-53,7
+53,7
@@
Exec* Exec::start()
return this;
}
return this;
}
-
in
t Exec::wait_any_for(const std::vector<ExecPtr>& execs, double timeout)
+
ssize_
t Exec::wait_any_for(const std::vector<ExecPtr>& execs, double timeout)
{
std::vector<kernel::activity::ExecImpl*> rexecs(execs.size());
std::transform(begin(execs), end(execs), begin(rexecs),
{
std::vector<kernel::activity::ExecImpl*> rexecs(execs.size());
std::transform(begin(execs), end(execs), begin(rexecs),
@@
-61,7
+61,7
@@
int Exec::wait_any_for(const std::vector<ExecPtr>& execs, double timeout)
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
kernel::actor::ExecutionWaitanySimcall observer{issuer, rexecs, timeout};
kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self();
kernel::actor::ExecutionWaitanySimcall observer{issuer, rexecs, timeout};
-
in
t changed_pos = kernel::actor::simcall_blocking(
+
ssize_
t changed_pos = kernel::actor::simcall_blocking(
[&observer] {
kernel::activity::ExecImpl::wait_any_for(observer.get_issuer(), observer.get_execs(), observer.get_timeout());
},
[&observer] {
kernel::activity::ExecImpl::wait_any_for(observer.get_issuer(), observer.get_execs(), observer.get_timeout());
},
@@
-310,20
+310,20
@@
sg_error_t sg_exec_wait_for(sg_exec_t exec, double timeout)
return status;
}
return status;
}
-
in
t sg_exec_wait_any(sg_exec_t* execs, size_t count)
+
ssize_
t sg_exec_wait_any(sg_exec_t* execs, size_t count)
{
return sg_exec_wait_any_for(execs, count, -1.0);
}
{
return sg_exec_wait_any_for(execs, count, -1.0);
}
-
in
t sg_exec_wait_any_for(sg_exec_t* execs, size_t count, double timeout)
+
ssize_
t sg_exec_wait_any_for(sg_exec_t* execs, size_t count, double timeout)
{
std::vector<simgrid::s4u::ExecPtr> s4u_execs;
{
std::vector<simgrid::s4u::ExecPtr> s4u_execs;
- for (
unsigned in
t i = 0; i < count; i++)
+ for (
size_
t i = 0; i < count; i++)
s4u_execs.emplace_back(execs[i], false);
s4u_execs.emplace_back(execs[i], false);
-
in
t pos = simgrid::s4u::Exec::wait_any_for(s4u_execs, timeout);
- for (
unsigned
i = 0; i < count; i++) {
- if (pos != -1 && static_cast<
unsigned
>(pos) != i)
+
ssize_
t pos = simgrid::s4u::Exec::wait_any_for(s4u_execs, timeout);
+ for (
size_t
i = 0; i < count; i++) {
+ if (pos != -1 && static_cast<
size_t
>(pos) != i)
s4u_execs[i]->add_ref();
}
return pos;
s4u_execs[i]->add_ref();
}
return pos;