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
Deprecate e_smx_state_t.
[simgrid.git]
/
src
/
simix
/
libsmx.cpp
diff --git
a/src/simix/libsmx.cpp
b/src/simix/libsmx.cpp
index
d0646d9
..
8d915db
100644
(file)
--- a/
src/simix/libsmx.cpp
+++ b/
src/simix/libsmx.cpp
@@
-29,8
+29,8
@@
*
* @param execution The execution synchro
*/
*
* @param execution The execution synchro
*/
-
e_smx_state_t
simcall_execution_wait(simgrid::kernel::activity::ActivityImpl* execution,
- double timeout) // XBT_ATTRIB_DEPRECATED_v330
+
simgrid::kernel::activity::State
simcall_execution_wait(simgrid::kernel::activity::ActivityImpl* execution,
+
double timeout) // XBT_ATTRIB_DEPRECATED_v330
{
simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
simgrid::kernel::actor::simcall_blocking<void>(
{
simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
simgrid::kernel::actor::simcall_blocking<void>(
@@
-38,8
+38,8
@@
e_smx_state_t simcall_execution_wait(simgrid::kernel::activity::ActivityImpl* ex
return simgrid::kernel::activity::State::DONE;
}
return simgrid::kernel::activity::State::DONE;
}
-
e_smx_state_t
simcall_execution_wait(const simgrid::kernel::activity::ActivityImplPtr& execution,
- double timeout) // XBT_ATTRIB_DEPRECATED_v330
+
simgrid::kernel::activity::State
simcall_execution_wait(const simgrid::kernel::activity::ActivityImplPtr& execution,
+
double timeout) // XBT_ATTRIB_DEPRECATED_v330
{
simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
simgrid::kernel::actor::simcall_blocking<void>(
{
simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
simgrid::kernel::actor::simcall_blocking<void>(
@@
-72,7
+72,7
@@
void simcall_process_suspend(smx_actor_t process) // XBT_DEPRECATED_v328
process->iface()->suspend();
}
process->iface()->suspend();
}
-
e_smx_state_t simcall_process_sleep(double duration) // XBT
_DEPRECATED_v329
+
simgrid::kernel::activity::State simcall_process_sleep(double duration) // XBT_ATTRIB
_DEPRECATED_v329
{
simgrid::kernel::actor::ActorImpl::self()->sleep(duration);
return simgrid::kernel::activity::State::DONE;
{
simgrid::kernel::actor::ActorImpl::self()->sleep(duration);
return simgrid::kernel::activity::State::DONE;
@@
-323,15
+323,16
@@
int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout)
return simcall_BODY_sem_acquire_timeout(sem, timeout);
}
return simcall_BODY_sem_acquire_timeout(sem, timeout);
}
-e_smx_state_t simcall_io_wait(simgrid::kernel::activity::ActivityImpl* io, double timeout) // XBT_ATTRIB_DEPRECATED_v330
+simgrid::kernel::activity::State simcall_io_wait(simgrid::kernel::activity::ActivityImpl* io,
+ double timeout) // XBT_ATTRIB_DEPRECATED_v330
{
simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
simgrid::kernel::actor::simcall_blocking<void>([io, issuer, timeout] { io->wait_for(issuer, timeout); });
return simgrid::kernel::activity::State::DONE;
}
{
simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
simgrid::kernel::actor::simcall_blocking<void>([io, issuer, timeout] { io->wait_for(issuer, timeout); });
return simgrid::kernel::activity::State::DONE;
}
-
e_smx_state_t
simcall_io_wait(const simgrid::kernel::activity::ActivityImplPtr& io,
- double timeout) // XBT_ATTRIB_DEPRECATED_v330
+
simgrid::kernel::activity::State
simcall_io_wait(const simgrid::kernel::activity::ActivityImplPtr& io,
+
double timeout) // XBT_ATTRIB_DEPRECATED_v330
{
simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
simgrid::kernel::actor::simcall_blocking<void>([io, issuer, timeout] { io->wait_for(issuer, timeout); });
{
simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
simgrid::kernel::actor::simcall_blocking<void>([io, issuer, timeout] { io->wait_for(issuer, timeout); });