X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/939476f1fc7630eb237535b07ed0deef77ce1b24..6126924e83eded994bef252b90becedc31015a59:/src/simix/libsmx.cpp

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 0ec3f3987a..850f15defc 100644
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -31,12 +31,13 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
  * @brief Creates a synchro that executes some computation of an host.
  *
  * This function creates a SURF action and allocates the data necessary
- * to create the SIMIX synchro. It can raise a host_error exception if the host crashed.
+ * to create the SIMIX synchro. It can raise a HostFailureException exception if the host crashed.
  *
  * @param name Name of the execution synchro to create
+ * @param category Tracing category
  * @param flops_amount amount Computation amount (in flops)
  * @param priority computation priority
- * @param bound
+ * @param bound Maximal speed for this execution (in flops) or -1 if no limit
  * @param host host where the synchro will be executed
  * @return A new SIMIX execution synchronization
  */
@@ -72,7 +73,8 @@ smx_activity_t simcall_execution_parallel_start(std::string name, int host_nb, s
 {
   /* checking for infinite values */
   for (int i = 0 ; i < host_nb ; ++i) {
-    xbt_assert(std::isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i);
+    if (flops_amount != nullptr)
+      xbt_assert(std::isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i);
     if (bytes_amount != nullptr) {
       for (int j = 0 ; j < host_nb ; ++j) {
         xbt_assert(std::isfinite(bytes_amount[i + host_nb * j]),
@@ -196,11 +198,11 @@ void simcall_process_set_data(smx_actor_t process, void *data)
 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)
+  if (kill_time <= SIMIX_get_clock())
     return;
   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);
+    SIMIX_process_kill(process, nullptr);
     process->kill_timer=nullptr;
   });
 }
@@ -210,7 +212,7 @@ void simcall_process_set_kill_time(smx_actor_t process, double kill_time)
  * @brief Creates a new sleep SIMIX synchro.
  *
  * This function creates a SURF action and allocates the data necessary
- * to create the SIMIX synchro. It can raise a host_error exception if the
+ * to create the SIMIX synchro. It can raise a HostFailureException if the
  * host crashed. The default SIMIX name of the synchro is "sleep".
  *
  *   @param duration Time duration of the sleep.
@@ -468,22 +470,9 @@ int simcall_sem_acquire_timeout(smx_sem_t sem, double timeout)
   return simcall_BODY_sem_acquire_timeout(sem, timeout);
 }
 
-smx_activity_t simcall_io_start(std::string name, sg_size_t size, simgrid::s4u::Storage* storage)
+e_smx_state_t simcall_io_wait(smx_activity_t io)
 {
-  /* checking for infinite values */
-  xbt_assert(std::isfinite(size), "size is not finite!");
-
-  return simgrid::simix::simcall([name, size, storage] { return SIMIX_io_start(name, size, storage); });
-}
-
-sg_size_t simcall_storage_read(surf_storage_t st, sg_size_t size)
-{
-  return simcall_BODY_storage_read(st, size);
-}
-
-sg_size_t simcall_storage_write(surf_storage_t st, sg_size_t size)
-{
-  return simcall_BODY_storage_write(st, size);
+  return (e_smx_state_t)simcall_BODY_io_wait(io);
 }
 
 void simcall_run_kernel(std::function<void()> const& code)