Move some C++ helpers in xbt/

[simgrid.git] / src / simix / libsmx.cpp

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index b1563f0..794909f 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -15,6 +15,8 @@
 
 #include <functional>
 
+#include <xbt/functional.hpp>
+
 #include "src/mc/mc_replay.h"
 #include "smx_private.h"
 #include "src/mc/mc_forward.hpp"
@@ -33,7 +35,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
 void simcall_call(smx_process_t process)
 {
   if (process != simix_global->maestro_process) {
-    XBT_DEBUG("Yield process '%s' on simcall %s (%d)", process->name,
+    XBT_DEBUG("Yield process '%s' on simcall %s (%d)", process->name.c_str(),
               SIMIX_simcall_name(process->simcall.call), (int)process->simcall.call);
     SIMIX_process_yield(process);
   } else {
@@ -125,18 +127,6 @@ smx_synchro_t simcall_execution_parallel_start(const char *name,
 
 }
 
-/**
- * \ingroup simix_process_management
- * \brief Destroys an execution synchro.
- *
- * Destroys a synchro, freeing its memory. This function cannot be called if there are a conditional waiting for it.
- * \param execution The execution synchro to destroy
- */
-void simcall_execution_destroy(smx_synchro_t execution)
-{
-  simcall_BODY_execution_destroy(execution);
-}
-
 /**
  * \ingroup simix_process_management
  * \brief Cancels an execution synchro.
@@ -387,9 +377,16 @@ smx_process_t simcall_process_create(const char *name,
                               xbt_dict_t properties,
                               int auto_restart)
 {
-  return (smx_process_t) simcall_BODY_process_create(name, code, data, hostname,
-                              kill_time, argc, argv, properties,
-                              auto_restart);
+  if (name == nullptr)
+    name = "";
+  auto wrapped_code = simgrid::xbt::wrapMain(code, argc, argv);
+  for (int i = 0; i != argc; ++i)
+    xbt_free(argv[i]);
+  xbt_free(argv);
+  smx_process_t res = simcall_process_create(name,
+    std::move(wrapped_code),
+    data, hostname, kill_time, properties, auto_restart);
+  return res;
 }
 
 /**
@@ -530,13 +527,6 @@ void simcall_process_set_data(smx_process_t process, void *data)
   simgrid::simix::kernel(std::bind(SIMIX_process_set_data, process, data));
 }
 
-static void kill_process_from_timer(void* arg)
-{
-  smx_process_t process = (smx_process_t) arg;
-  simix_global->kill_process_function(process);
-  process->kill_timer=NULL;
-}
-
 /**
  * \ingroup simix_process_management
  * \brief Set the kill time of a process.
@@ -544,13 +534,14 @@ static void kill_process_from_timer(void* arg)
 void simcall_process_set_kill_time(smx_process_t process, double kill_time)
 {
 
-  if (kill_time > SIMIX_get_clock()) {
-    if (simix_global->kill_process_function) {
-      XBT_DEBUG("Set kill time %f for process %s(%s)",kill_time, process->name,
-          sg_host_get_name(process->host));
-      process->kill_timer = SIMIX_timer_set(kill_time, kill_process_from_timer, process);
-    }
-  }
+  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->name.c_str(), sg_host_get_name(process->host));
+  process->kill_timer = SIMIX_timer_set(kill_time, [=] {
+    simix_global->kill_process_function(process);
+    process->kill_timer=NULL;
+  });
 }
 /**
  * \ingroup simix_process_management
@@ -686,9 +677,10 @@ smx_mailbox_t simcall_mbox_get_by_name(const char *name)
  *  \param mbox The rendez-vous point
  *  \return The communication or NULL if empty
  */
-smx_synchro_t simcall_mbox_get_head(smx_mailbox_t mbox)
+smx_synchro_t simcall_mbox_front(smx_mailbox_t mbox)
 {
-  return simcall_BODY_mbox_get_head(mbox);
+
+  return mbox->comm_queue->empty()? nullptr:mbox->comm_queue->front();
 }
 
 void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process)
@@ -696,11 +688,6 @@ void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process)
   simcall_BODY_mbox_set_receiver(mbox, process);
 }
 
-smx_process_t simcall_mbox_get_receiver(smx_mailbox_t mbox)
-{
-  return simcall_BODY_mbox_get_receiver(mbox);
-}
-
 /**
  * \ingroup simix_comm_management
  */
@@ -864,42 +851,6 @@ int simcall_comm_test(smx_synchro_t comm)
   return simcall_BODY_comm_test(comm);
 }
 
-/**
- * \ingroup simix_comm_management
- *
- */
-void *simcall_comm_get_src_data(smx_synchro_t comm)
-{
-  return simcall_BODY_comm_get_src_data(comm);
-}
-
-/**
- * \ingroup simix_comm_management
- *
- */
-void *simcall_comm_get_dst_data(smx_synchro_t comm)
-{
-  return simcall_BODY_comm_get_dst_data(comm);
-}
-
-/**
- * \ingroup simix_comm_management
- *
- */
-smx_process_t simcall_comm_get_src_proc(smx_synchro_t comm)
-{
-  return simcall_BODY_comm_get_src_proc(comm);
-}
-
-/**
- * \ingroup simix_comm_management
- *
- */
-smx_process_t simcall_comm_get_dst_proc(smx_synchro_t comm)
-{
-  return simcall_BODY_comm_get_dst_proc(comm);
-}
-
 /**
  * \ingroup simix_synchro_management
  *
@@ -1177,7 +1128,7 @@ xbt_dict_t simcall_storage_get_content(smx_storage_t storage)
 
 void simcall_run_kernel(std::function<void()> const& code)
 {
-  return simcall_BODY_run_kernel((void*) &code);
+  return simcall_BODY_run_kernel(&code);
 }
 
 int simcall_mc_random(int min, int max) {