X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ca0df6f5bb17b5708c11a19846c0e90e25b7889..8efeb3a6aa2c201800a3ba19416ea9728af3bff6:/src/simix/libsmx.cpp

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 2a3adc8985..3647e351e8 100644
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -20,6 +20,7 @@
 #include "simgrid/simix/blocking_simcall.hpp"
 #include "smx_private.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/activity/ConditionVariableImpl.hpp"
 #include "src/kernel/activity/MutexImpl.hpp"
 #include "src/mc/mc_forward.hpp"
 #include "src/mc/mc_replay.hpp"
@@ -35,7 +36,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
 void simcall_call(smx_actor_t actor)
 {
   if (actor != simix_global->maestro_process) {
-    XBT_DEBUG("Yield actor '%s' on simcall %s (%d)", actor->getCname(), SIMIX_simcall_name(actor->simcall.call),
+    XBT_DEBUG("Yield actor '%s' on simcall %s (%d)", actor->get_cname(), SIMIX_simcall_name(actor->simcall.call),
               (int)actor->simcall.call);
     SIMIX_process_yield(actor);
   } else {
@@ -54,6 +55,7 @@ void simcall_call(smx_actor_t actor)
  * \param flops_amount amount Computation amount (in flops)
  * \param priority computation priority
  * \param bound
+ * \param host host where the synchro will be executed
  * \return A new SIMIX execution synchronization
  */
 smx_activity_t simcall_execution_start(const char* name, double flops_amount, double priority, double bound,
@@ -63,7 +65,9 @@ smx_activity_t simcall_execution_start(const char* name, double flops_amount, do
   xbt_assert(std::isfinite(flops_amount), "flops_amount is not finite!");
   xbt_assert(std::isfinite(priority), "priority is not finite!");
 
-  return simcall_BODY_execution_start(name, flops_amount, priority, bound, host);
+  return simgrid::simix::kernelImmediate([name, flops_amount, priority, bound, host] {
+    return SIMIX_execution_start(name, flops_amount, priority, bound, host);
+  });
 }
 
 /**
@@ -77,7 +81,6 @@ smx_activity_t simcall_execution_start(const char* name, double flops_amount, do
  * \param flops_amount Array (of size host_nb) of computation amount of hosts (in bytes)
  * \param bytes_amount Array (of size host_nb * host_nb) representing the communication
  * amount between each pair of hosts
- * \param amount the SURF action amount
  * \param rate the SURF action rate
  * \param timeout timeout
  * \return A new SIMIX execution synchronization
@@ -98,7 +101,9 @@ smx_activity_t simcall_execution_parallel_start(const char* name, int host_nb, s
 
   xbt_assert(std::isfinite(rate), "rate is not finite!");
 
-  return simcall_BODY_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout);
+  return simgrid::simix::kernelImmediate([name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout] {
+    return SIMIX_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, rate, timeout);
+  });
 }
 
 /**
@@ -138,7 +143,7 @@ void simcall_execution_set_priority(smx_activity_t execution, double priority)
     simgrid::kernel::activity::ExecImplPtr exec =
         boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(execution);
     if (exec->surfAction_)
-      exec->surfAction_->setSharingWeight(priority);
+      exec->surfAction_->set_priority(priority);
   });
 }
 
@@ -176,25 +181,6 @@ e_smx_state_t simcall_execution_test(smx_activity_t execution)
   return (e_smx_state_t)simcall_BODY_execution_test(execution);
 }
 
-/**
- * \ingroup simix_process_management
- * \brief Kills all SIMIX processes.
- */
-void simcall_process_killall()
-{
-  simcall_BODY_process_killall();
-}
-
-/**
- * \ingroup simix_process_management
- * \brief Cleans up a SIMIX process.
- * \param process poor victim (must have already been killed)
- */
-void simcall_process_cleanup(smx_actor_t process)
-{
-  simcall_BODY_process_cleanup(process);
-}
-
 void simcall_process_join(smx_actor_t process, double timeout)
 {
   simcall_BODY_process_join(process, timeout);
@@ -214,17 +200,6 @@ void simcall_process_suspend(smx_actor_t process)
   simcall_BODY_process_suspend(process);
 }
 
-/**
- * \ingroup simix_process_management
- * \brief Returns the amount of SIMIX processes in the system
- *
- * Maestro internal process is not counted, only user code processes are
- */
-int simcall_process_count()
-{
-  return simgrid::simix::kernelImmediate(SIMIX_process_count);
-}
-
 /**
  * \ingroup simix_process_management
  * \brief Set the user data of a #smx_actor_t.
@@ -247,23 +222,13 @@ void simcall_process_set_kill_time(smx_actor_t process, double kill_time)
 
   if (kill_time <= SIMIX_get_clock() || simix_global->kill_process_function == nullptr)
     return;
-  XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->getCname(), process->host->getCname());
+  XBT_DEBUG("Set kill time %f for process %s@%s", kill_time, process->get_cname(), process->host->get_cname());
   process->kill_timer = SIMIX_timer_set(kill_time, [process] {
     simix_global->kill_process_function(process);
     process->kill_timer=nullptr;
   });
 }
 
-/**
- * \ingroup simix_process_management
- * \brief Add an on_exit function
- * Add an on_exit function which will be executed when the process exits/is killed.
- */
-XBT_PUBLIC void simcall_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void* data)
-{
-  simcall_BODY_process_on_exit(process, fun, data);
-}
-
 /**
  * \ingroup simix_process_management
  * \brief Creates a new sleep SIMIX synchro.
@@ -428,7 +393,7 @@ void simcall_set_category(smx_activity_t synchro, const char *category)
   if (category == nullptr) {
     return;
   }
-  simcall_BODY_set_category(synchro, category);
+  simgrid::simix::kernelImmediate([synchro, category] { SIMIX_set_category(synchro, category); });
 }
 
 /**
@@ -486,16 +451,7 @@ void simcall_mutex_unlock(smx_mutex_t mutex)
  */
 smx_cond_t simcall_cond_init()
 {
-  return simcall_BODY_cond_init();
-}
-
-/**
- * \ingroup simix_synchro_management
- *
- */
-void simcall_cond_signal(smx_cond_t cond)
-{
-  simcall_BODY_cond_signal(cond);
+  return simgrid::simix::kernelImmediate([] { return new simgrid::kernel::activity::ConditionVariableImpl(); });
 }
 
 /**
@@ -511,19 +467,10 @@ void simcall_cond_wait(smx_cond_t cond, smx_mutex_t mutex)
  * \ingroup simix_synchro_management
  *
  */
-void simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout)
+int simcall_cond_wait_timeout(smx_cond_t cond, smx_mutex_t mutex, double timeout)
 {
   xbt_assert(std::isfinite(timeout), "timeout is not finite!");
-  simcall_BODY_cond_wait_timeout(cond, mutex, timeout);
-}
-
-/**
- * \ingroup simix_synchro_management
- *
- */
-void simcall_cond_broadcast(smx_cond_t cond)
-{
-  simcall_BODY_cond_broadcast(cond);
+  return simcall_BODY_cond_wait_timeout(cond, mutex, timeout);
 }
 
 /**
@@ -539,10 +486,10 @@ void simcall_sem_acquire(smx_sem_t sem)
  * \ingroup simix_synchro_management
  *
  */
-void simcall_sem_acquire_timeout(smx_sem_t sem, double timeout)
+int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout)
 {
   xbt_assert(std::isfinite(timeout), "timeout is not finite!");
-  simcall_BODY_sem_acquire_timeout(sem, timeout);
+  return simcall_BODY_sem_acquire_timeout(sem, timeout);
 }
 
 sg_size_t simcall_storage_read(surf_storage_t st, sg_size_t size)