X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/085f3f5d8c17c1d3e0d069e64ee7c0de00ccf7e6..0d7b205e2b6bcee058760225d0bebc0da0ecaefb:/src/simix/libsmx.cpp

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 4ea0501fb8..5830d3254e 100644
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -29,10 +29,22 @@
  *
  * @param execution The execution synchro
  */
-e_smx_state_t simcall_execution_wait(simgrid::kernel::activity::ActivityImpl* execution, double timeout)
+simgrid::kernel::activity::State simcall_execution_wait(simgrid::kernel::activity::ActivityImpl* execution,
+                                                        double timeout) // XBT_ATTRIB_DEPRECATED_v330
 {
-  return (e_smx_state_t)simcall_BODY_execution_wait(static_cast<simgrid::kernel::activity::ExecImpl*>(execution),
-                                                    timeout);
+  simgrid::kernel::actor::ActorImpl* issuer = simgrid::kernel::actor::ActorImpl::self();
+  simgrid::kernel::actor::simcall_blocking<void>(
+      [execution, issuer, timeout] { execution->wait_for(issuer, timeout); });
+  return simgrid::kernel::activity::State::DONE;
+}
+
+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>(
+      [execution, issuer, timeout] { execution->wait_for(issuer, timeout); });
+  return simgrid::kernel::activity::State::DONE;
 }
 
 bool simcall_execution_test(simgrid::kernel::activity::ActivityImpl* execution) // XBT_ATTRIB_DEPRECATED_v330
@@ -60,7 +72,7 @@ void simcall_process_suspend(smx_actor_t process) // XBT_DEPRECATED_v328
   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;
@@ -311,9 +323,20 @@ int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout)
   return simcall_BODY_sem_acquire_timeout(sem, timeout);
 }
 
-e_smx_state_t simcall_io_wait(simgrid::kernel::activity::ActivityImpl* io, double timeout)
+simgrid::kernel::activity::State simcall_io_wait(simgrid::kernel::activity::ActivityImpl* io,
+                                                 double timeout) // XBT_ATTRIB_DEPRECATED_v330
 {
-  return (e_smx_state_t)simcall_BODY_io_wait(static_cast<simgrid::kernel::activity::IoImpl*>(io), 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); });
+  return simgrid::kernel::activity::State::DONE;
+}
+
+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); });
+  return simgrid::kernel::activity::State::DONE;
 }
 
 bool simcall_io_test(simgrid::kernel::activity::ActivityImpl* io) // XBT_ATTRIB_DEPRECATED_v330
@@ -328,13 +351,13 @@ bool simcall_io_test(const simgrid::kernel::activity::ActivityImplPtr& io) // XB
 
 void simcall_run_kernel(std::function<void()> const& code, simgrid::mc::SimcallInspector* t)
 {
-  simgrid::kernel::actor::ActorImpl::self()->simcall.inspector_ = t;
+  simgrid::kernel::actor::ActorImpl::self()->simcall_.inspector_ = t;
   simcall_BODY_run_kernel(&code);
 }
 
 void simcall_run_blocking(std::function<void()> const& code, simgrid::mc::SimcallInspector* t = nullptr)
 {
-  simgrid::kernel::actor::ActorImpl::self()->simcall.inspector_ = t;
+  simgrid::kernel::actor::ActorImpl::self()->simcall_.inspector_ = t;
   simcall_BODY_run_blocking(&code);
 }