X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92cd12d0b61dd5a17500ef7d38f7b95a80301037..a73d204e173f35c0abb92b26e061929066b8b283:/src/simix/libsmx.cpp

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 4a0aa0ef46..49d76b5f68 100644
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -51,7 +51,7 @@ void simcall_process_join(smx_actor_t process, double timeout)
 
 void simcall_process_suspend(smx_actor_t process)
 {
-  SIMIX_process_self()->iface()->suspend();
+  process->iface()->suspend();
 }
 
 e_smx_state_t simcall_process_sleep(double duration)
@@ -307,13 +307,15 @@ e_smx_state_t simcall_io_wait(const smx_activity_t& io)
   return (e_smx_state_t)simcall_BODY_io_wait(static_cast<simgrid::kernel::activity::IoImpl*>(io.get()));
 }
 
-void simcall_run_kernel(std::function<void()> const& code)
+void simcall_run_kernel(std::function<void()> const& code, simgrid::mc::SimcallInspector* t)
 {
+  SIMIX_process_self()->simcall.inspector_ = t;
   simcall_BODY_run_kernel(&code);
 }
 
-void simcall_run_blocking(std::function<void()> const& code)
+void simcall_run_blocking(std::function<void()> const& code, simgrid::mc::SimcallInspector* t = nullptr)
 {
+  SIMIX_process_self()->simcall.inspector_ = t;
   simcall_BODY_run_blocking(&code);
 }
 
@@ -338,94 +340,3 @@ void unblock(smx_actor_t actor)
 }
 } // namespace simix
 } // namespace simgrid
-
-/* ****************************DEPRECATED CALLS******************************* */
-void simcall_process_set_kill_time(smx_actor_t process, double kill_time)
-{
-  simgrid::kernel::actor::simcall([process, kill_time] { process->set_kill_time(kill_time); });
-}
-void simcall_comm_cancel(smx_activity_t comm)
-{
-  simgrid::kernel::actor::simcall(
-      [comm] { boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(comm)->cancel(); });
-}
-void simcall_execution_cancel(smx_activity_t exec)
-{
-  simgrid::kernel::actor::simcall(
-      [exec] { boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(exec)->cancel(); });
-}
-
-void simcall_execution_set_bound(smx_activity_t exec, double bound)
-{
-  simgrid::kernel::actor::simcall(
-      [exec, bound] { boost::static_pointer_cast<simgrid::kernel::activity::ExecImpl>(exec)->set_bound(bound); });
-}
-
-// deprecated
-smx_activity_t simcall_execution_start(const std::string& name, const std::string& category, double flops_amount,
-                                       double sharing_penalty, double bound, sg_host_t host)
-{
-  return simgrid::kernel::actor::simcall([name, category, flops_amount, sharing_penalty, bound, host] {
-    simgrid::kernel::activity::ExecImpl* exec = new simgrid::kernel::activity::ExecImpl();
-    (*exec)
-        .set_name(name)
-        .set_tracing_category(category)
-        .set_host(host)
-        .set_sharing_penalty(sharing_penalty)
-        .set_bound(bound)
-        .set_flops_amount(flops_amount)
-        .start();
-    return simgrid::kernel::activity::ExecImplPtr(exec);
-  });
-}
-
-// deprecated
-smx_activity_t simcall_execution_parallel_start(const std::string& name, int host_nb, const sg_host_t* host_list,
-                                                const double* flops_amount, const double* bytes_amount, double rate,
-                                                double timeout)
-{
-  /* Check that we are not mixing VMs and PMs in the parallel task */
-  bool is_a_vm = (nullptr != dynamic_cast<simgrid::s4u::VirtualMachine*>(host_list[0]));
-  for (int i = 1; i < host_nb; i++) {
-    bool tmp_is_a_vm = (nullptr != dynamic_cast<simgrid::s4u::VirtualMachine*>(host_list[i]));
-    xbt_assert(is_a_vm == tmp_is_a_vm, "parallel_execute: mixing VMs and PMs is not supported (yet).");
-  }
-
-  /* checking for infinite values */
-  for (int i = 0; i < host_nb; ++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]), "bytes_amount[%d+%d*%d] is not finite!", i, host_nb,
-                   j);
-      }
-    }
-  }
-  xbt_assert(std::isfinite(rate), "rate is not finite!");
-
-  std::vector<simgrid::s4u::Host*> hosts(host_list, host_list + host_nb);
-  std::vector<double> flops_parallel_amount;
-  std::vector<double> bytes_parallel_amount;
-  if (flops_amount != nullptr)
-    flops_parallel_amount = std::vector<double>(flops_amount, flops_amount + host_nb);
-  if (bytes_amount != nullptr)
-    bytes_parallel_amount = std::vector<double>(bytes_amount, bytes_amount + host_nb * host_nb);
-  return simgrid::kernel::actor::simcall([name, hosts, flops_parallel_amount, bytes_parallel_amount, timeout] {
-    simgrid::kernel::activity::ExecImpl* exec = new simgrid::kernel::activity::ExecImpl();
-    (*exec)
-        .set_name(name)
-        .set_hosts(hosts)
-        .set_timeout(timeout)
-        .set_flops_amounts(flops_parallel_amount)
-        .set_bytes_amounts(bytes_parallel_amount)
-        .start();
-    return simgrid::kernel::activity::ExecImplPtr(exec);
-  });
-}
-
-// deprecated
-void SIMIX_comm_finish(smx_activity_t synchro)
-{
-  boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(synchro)->finish();
-}