snake casing

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

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index d9aa949..a746114 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -71,14 +71,14 @@ smx_activity_t simcall_execution_parallel_start(const std::string& name, int hos
  *
  * @param execution The execution synchro
  */
-e_smx_state_t simcall_execution_wait(smx_activity_t execution)
+e_smx_state_t simcall_execution_wait(const smx_activity_t& execution)
 {
-  return (e_smx_state_t) simcall_BODY_execution_wait(execution);
+  return (e_smx_state_t)simcall_BODY_execution_wait(static_cast<simgrid::kernel::activity::ExecImpl*>(execution.get()));
 }
 
-e_smx_state_t simcall_execution_test(smx_activity_t execution)
+e_smx_state_t simcall_execution_test(const smx_activity_t& execution)
 {
-  return (e_smx_state_t)simcall_BODY_execution_test(execution);
+  return (e_smx_state_t)simcall_BODY_execution_test(static_cast<simgrid::kernel::activity::ExecImpl*>(execution.get()));
 }
 
 void simcall_process_join(smx_actor_t process, double timeout)
@@ -215,15 +215,35 @@ smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type,
 /**
  * @ingroup simix_comm_management
  */
-unsigned int simcall_comm_waitany(xbt_dynar_t comms, double timeout)
+unsigned int simcall_comm_waitany(smx_activity_t comms[], size_t count, double timeout)
 {
-  return simcall_BODY_comm_waitany(comms, timeout);
+  std::unique_ptr<simgrid::kernel::activity::CommImpl* []> rcomms(new simgrid::kernel::activity::CommImpl*[count]);
+  std::transform(comms, comms + count, rcomms.get(), [](const smx_activity_t& comm) {
+    return static_cast<simgrid::kernel::activity::CommImpl*>(comm.get());
+  });
+  return simcall_BODY_comm_waitany(rcomms.get(), count, timeout);
+}
+
+unsigned int simcall_comm_waitany(simgrid::kernel::activity::CommImpl* comms[], size_t count, double timeout)
+{
+  return simcall_BODY_comm_waitany(comms, count, timeout);
 }
 
 /**
  * @ingroup simix_comm_management
  */
-int simcall_comm_testany(smx_activity_t* comms, size_t count)
+int simcall_comm_testany(smx_activity_t comms[], size_t count)
+{
+  if (count == 0)
+    return -1;
+  std::unique_ptr<simgrid::kernel::activity::CommImpl* []> rcomms(new simgrid::kernel::activity::CommImpl*[count]);
+  std::transform(comms, comms + count, rcomms.get(), [](const smx_activity_t& comm) {
+    return static_cast<simgrid::kernel::activity::CommImpl*>(comm.get());
+  });
+  return simcall_BODY_comm_testany(rcomms.get(), count);
+}
+
+int simcall_comm_testany(simgrid::kernel::activity::CommImpl* comms[], size_t count)
 {
   if (count == 0)
     return -1;
@@ -233,19 +253,19 @@ int simcall_comm_testany(smx_activity_t* comms, size_t count)
 /**
  * @ingroup simix_comm_management
  */
-void simcall_comm_wait(smx_activity_t comm, double timeout)
+void simcall_comm_wait(const smx_activity_t& comm, double timeout)
 {
   xbt_assert(std::isfinite(timeout), "timeout is not finite!");
-  simcall_BODY_comm_wait(comm, timeout);
+  simcall_BODY_comm_wait(static_cast<simgrid::kernel::activity::CommImpl*>(comm.get()), timeout);
 }
 
 /**
  * @ingroup simix_comm_management
  *
  */
-int simcall_comm_test(smx_activity_t comm)
+int simcall_comm_test(const smx_activity_t& comm)
 {
-  return simcall_BODY_comm_test(comm);
+  return simcall_BODY_comm_test(static_cast<simgrid::kernel::activity::CommImpl*>(comm.get()));
 }
 
 /**
@@ -336,9 +356,9 @@ 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(smx_activity_t io)
+e_smx_state_t simcall_io_wait(const smx_activity_t& io)
 {
-  return (e_smx_state_t)simcall_BODY_io_wait(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)