X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/097befdbebacea302be3a7442afce30ae1a26937..772bc61dbf607370584a58f7342df76d7bbc3b56:/src/simix/libsmx.cpp

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 0625177fcc..5eacc32a52 100644
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -54,40 +54,40 @@ xbt_swag_t simcall_host_get_process_list(sg_host_t host)
  * \deprecated */
 double simcall_host_get_current_power_peak(sg_host_t host)
 {
-  return host->current_power_peak();
+  return host->currentPowerPeak();
 }
 
 /** \ingroup simix_host_management
  * \deprecated */
 double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
 {
-  return host->power_peak_at(pstate_index);
+  return host->powerPeakAt(pstate_index);
 }
 
 /** \deprecated */
 void simcall_host_get_params(sg_host_t vm, vm_params_t params)
 {
-  vm->get_parameters(params);
+  vm->parameters(params);
 }
 
 /** \deprecated */
 void simcall_host_set_params(sg_host_t vm, vm_params_t params)
 {
-  vm->set_parameters(params);
+  vm->setParameters(params);
 }
 
 /** \ingroup simix_storage_management
  *  \deprecated */
 xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
 {
-  return host->mounted_storages_as_dict();
+  return host->mountedStoragesAsDict();
 }
 
 /** \ingroup simix_storage_management
  *  \deprecated */
 xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
 {
-  return host->attached_storages();
+  return host->attachedStorages();
 }
 
 // ***** Other simcalls
@@ -118,7 +118,7 @@ xbt_dict_t simcall_asr_get_properties(const char *name)
  * \param affinity_mask
  * \return A new SIMIX execution synchronization
  */
-smx_synchro_t simcall_process_execute(const char *name,
+smx_synchro_t simcall_execution_start(const char *name,
                                     double flops_amount,
                                     double priority, double bound, unsigned long affinity_mask)
 {
@@ -126,7 +126,7 @@ smx_synchro_t simcall_process_execute(const char *name,
   xbt_assert(std::isfinite(flops_amount), "flops_amount is not finite!");
   xbt_assert(std::isfinite(priority), "priority is not finite!");
 
-  return simcall_BODY_process_execute(name, flops_amount, priority, bound, affinity_mask);
+  return simcall_BODY_execution_start(name, flops_amount, priority, bound, affinity_mask);
 }
 
 /**
@@ -144,7 +144,7 @@ smx_synchro_t simcall_process_execute(const char *name,
  * \param rate the SURF action rate
  * \return A new SIMIX execution synchronization
  */
-smx_synchro_t simcall_process_parallel_execute(const char *name,
+smx_synchro_t simcall_execution_parallel_start(const char *name,
                                          int host_nb,
                                          sg_host_t *host_list,
                                          double *flops_amount,
@@ -167,7 +167,7 @@ smx_synchro_t simcall_process_parallel_execute(const char *name,
   xbt_assert(std::isfinite(amount), "amount is not finite!");
   xbt_assert(std::isfinite(rate), "rate is not finite!");
 
-  return simcall_BODY_process_parallel_execute(name, host_nb, host_list,
+  return simcall_BODY_execution_parallel_start(name, host_nb, host_list,
                                             flops_amount,
                                             bytes_amount,
                                             amount, rate);
@@ -181,9 +181,9 @@ smx_synchro_t simcall_process_parallel_execute(const char *name,
  * 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_process_execution_destroy(smx_synchro_t execution)
+void simcall_execution_destroy(smx_synchro_t execution)
 {
-  simcall_BODY_process_execution_destroy(execution);
+  simcall_BODY_execution_destroy(execution);
 }
 
 /**
@@ -193,9 +193,9 @@ void simcall_process_execution_destroy(smx_synchro_t execution)
  * This functions stops the execution. It calls a surf function.
  * \param execution The execution synchro to cancel
  */
-void simcall_process_execution_cancel(smx_synchro_t execution)
+void simcall_execution_cancel(smx_synchro_t execution)
 {
-  simcall_BODY_process_execution_cancel(execution);
+  simcall_BODY_execution_cancel(execution);
 }
 
 /**
@@ -205,9 +205,9 @@ void simcall_process_execution_cancel(smx_synchro_t execution)
  * \param execution The execution synchro
  * \return The remaining amount
  */
-double simcall_process_execution_get_remains(smx_synchro_t execution)
+double simcall_execution_get_remains(smx_synchro_t execution)
 {
-  return simcall_BODY_process_execution_get_remains(execution);
+  return simcall_BODY_execution_get_remains(execution);
 }
 
 /**
@@ -217,9 +217,9 @@ double simcall_process_execution_get_remains(smx_synchro_t execution)
  * \param execution The execution synchro
  * \return The state
  */
-e_smx_state_t simcall_process_execution_get_state(smx_synchro_t execution)
+e_smx_state_t simcall_execution_get_state(smx_synchro_t execution)
 {
-  return simcall_BODY_process_execution_get_state(execution);
+  return simcall_BODY_execution_get_state(execution);
 }
 
 /**
@@ -230,12 +230,12 @@ e_smx_state_t simcall_process_execution_get_state(smx_synchro_t execution)
  * \param execution The execution synchro
  * \param priority The new priority
  */
-void simcall_process_execution_set_priority(smx_synchro_t execution, double priority)
+void simcall_execution_set_priority(smx_synchro_t execution, double priority)
 {
   /* checking for infinite values */
   xbt_assert(std::isfinite(priority), "priority is not finite!");
 
-  simcall_BODY_process_execution_set_priority(execution, priority);
+  simcall_BODY_execution_set_priority(execution, priority);
 }
 
 /**
@@ -246,9 +246,9 @@ void simcall_process_execution_set_priority(smx_synchro_t execution, double prio
  * \param execution The execution synchro
  * \param bound The new bound
  */
-void simcall_process_execution_set_bound(smx_synchro_t execution, double bound)
+void simcall_execution_set_bound(smx_synchro_t execution, double bound)
 {
-  simcall_BODY_process_execution_set_bound(execution, bound);
+  simcall_BODY_execution_set_bound(execution, bound);
 }
 
 /**
@@ -260,9 +260,9 @@ void simcall_process_execution_set_bound(smx_synchro_t execution, double bound)
  * \param host Host
  * \param mask Affinity mask
  */
-void simcall_process_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask)
+void simcall_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask)
 {
-  simcall_BODY_process_execution_set_affinity(execution, host, mask);
+  simcall_BODY_execution_set_affinity(execution, host, mask);
 }
 
 /**
@@ -271,9 +271,9 @@ void simcall_process_execution_set_affinity(smx_synchro_t execution, sg_host_t h
  *
  * \param execution The execution synchro
  */
-e_smx_state_t simcall_process_execution_wait(smx_synchro_t execution)
+e_smx_state_t simcall_execution_wait(smx_synchro_t execution)
 {
-  return (e_smx_state_t) simcall_BODY_process_execution_wait(execution);
+  return (e_smx_state_t) simcall_BODY_execution_wait(execution);
 }
 
 
@@ -628,7 +628,7 @@ void simcall_process_set_kill_time(smx_process_t process, double kill_time)
  * \brief Get the kill time of a process (or 0 if unset).
  */
 double simcall_process_get_kill_time(smx_process_t process) {
-	return SIMIX_timer_get_date(process->kill_timer);
+  return SIMIX_timer_get_date(process->kill_timer);
 }
 
 /**
@@ -733,7 +733,7 @@ e_smx_state_t simcall_process_sleep(double duration)
  *  \param name The name of the rendez-vous point
  *  \return The created rendez-vous point
  */
-smx_rdv_t simcall_rdv_create(const char *name)
+smx_mailbox_t simcall_rdv_create(const char *name)
 {
   return simcall_BODY_rdv_create(name);
 }
@@ -744,7 +744,7 @@ smx_rdv_t simcall_rdv_create(const char *name)
  *  \brief Destroy a rendez-vous point
  *  \param rdv The rendez-vous point to destroy
  */
-void simcall_rdv_destroy(smx_rdv_t rdv)
+void simcall_rdv_destroy(smx_mailbox_t rdv)
 {
   simcall_BODY_rdv_destroy(rdv);
 }
@@ -752,7 +752,7 @@ void simcall_rdv_destroy(smx_rdv_t rdv)
  *  \ingroup simix_rdv_management
  *  \brief Returns a rendez-vous point knowing its name
  */
-smx_rdv_t simcall_rdv_get_by_name(const char *name)
+smx_mailbox_t simcall_rdv_get_by_name(const char *name)
 {
   xbt_assert(name != NULL, "Invalid parameter for simcall_rdv_get_by_name (name is NULL)");
 
@@ -771,7 +771,7 @@ smx_rdv_t simcall_rdv_get_by_name(const char *name)
  *  \param host The host to be counted
  *  \return The number of comm synchros pending in the rdv
  */
-int simcall_rdv_comm_count_by_host(smx_rdv_t rdv, sg_host_t host)
+int simcall_rdv_comm_count_by_host(smx_mailbox_t rdv, sg_host_t host)
 {
   return simcall_BODY_rdv_comm_count_by_host(rdv, host);
 }
@@ -782,17 +782,17 @@ int simcall_rdv_comm_count_by_host(smx_rdv_t rdv, sg_host_t host)
  *  \param rdv The rendez-vous point
  *  \return The communication or NULL if empty
  */
-smx_synchro_t simcall_rdv_get_head(smx_rdv_t rdv)
+smx_synchro_t simcall_rdv_get_head(smx_mailbox_t rdv)
 {
   return simcall_BODY_rdv_get_head(rdv);
 }
 
-void simcall_rdv_set_receiver(smx_rdv_t rdv, smx_process_t process)
+void simcall_rdv_set_receiver(smx_mailbox_t rdv, smx_process_t process)
 {
   simcall_BODY_rdv_set_receiver(rdv, process);
 }
 
-smx_process_t simcall_rdv_get_receiver(smx_rdv_t rdv)
+smx_process_t simcall_rdv_get_receiver(smx_mailbox_t rdv)
 {
   return simcall_BODY_rdv_get_receiver(rdv);
 }
@@ -800,7 +800,7 @@ smx_process_t simcall_rdv_get_receiver(smx_rdv_t rdv)
 /**
  * \ingroup simix_comm_management
  */
-void simcall_comm_send(smx_process_t sender, smx_rdv_t rdv, double task_size, double rate,
+void simcall_comm_send(smx_process_t sender, smx_mailbox_t rdv, double task_size, double rate,
                          void *src_buff, size_t src_buff_size,
                          int (*match_fun)(void *, void *, smx_synchro_t),
                          void (*copy_data_fun)(smx_synchro_t, void*, size_t), void *data,
@@ -830,7 +830,7 @@ void simcall_comm_send(smx_process_t sender, smx_rdv_t rdv, double task_size, do
 /**
  * \ingroup simix_comm_management
  */
-smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_rdv_t rdv, double task_size, double rate,
+smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_mailbox_t rdv, double task_size, double rate,
                               void *src_buff, size_t src_buff_size,
                               int (*match_fun)(void *, void *, smx_synchro_t),
                               void (*clean_fun)(void *),
@@ -852,7 +852,7 @@ smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_rdv_t rdv, double tas
 /**
  * \ingroup simix_comm_management
  */
-void simcall_comm_recv(smx_process_t receiver, smx_rdv_t rdv, void *dst_buff, size_t * dst_buff_size,
+void simcall_comm_recv(smx_process_t receiver, smx_mailbox_t rdv, void *dst_buff, size_t * dst_buff_size,
                        int (*match_fun)(void *, void *, smx_synchro_t),
                        void (*copy_data_fun)(smx_synchro_t, void*, size_t),
                        void *data, double timeout, double rate)
@@ -876,7 +876,7 @@ void simcall_comm_recv(smx_process_t receiver, smx_rdv_t rdv, void *dst_buff, si
 /**
  * \ingroup simix_comm_management
  */
-smx_synchro_t simcall_comm_irecv(smx_process_t receiver, smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_size,
+smx_synchro_t simcall_comm_irecv(smx_process_t receiver, smx_mailbox_t rdv, void *dst_buff, size_t *dst_buff_size,
                                 int (*match_fun)(void *, void *, smx_synchro_t),
                                 void (*copy_data_fun)(smx_synchro_t, void*, size_t),
                                 void *data, double rate)
@@ -890,7 +890,7 @@ smx_synchro_t simcall_comm_irecv(smx_process_t receiver, smx_rdv_t rdv, void *ds
 /**
  * \ingroup simix_comm_management
  */
-smx_synchro_t simcall_comm_iprobe(smx_rdv_t rdv, int type, int src, int tag,
+smx_synchro_t simcall_comm_iprobe(smx_mailbox_t rdv, int type, int src, int tag,
                                 int (*match_fun)(void *, void *, smx_synchro_t), void *data)
 {
   xbt_assert(rdv, "No rendez-vous point defined for iprobe");
@@ -1011,13 +1011,6 @@ smx_process_t simcall_comm_get_dst_proc(smx_synchro_t comm)
   return simcall_BODY_comm_get_dst_proc(comm);
 }
 
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-int simcall_comm_is_latency_bounded(smx_synchro_t comm)
-{
-  return simcall_BODY_comm_is_latency_bounded(comm);
-}
-#endif
-
 /**
  * \ingroup simix_synchro_management
  *
@@ -1031,15 +1024,6 @@ smx_mutex_t simcall_mutex_init(void)
   return simcall_BODY_mutex_init();
 }
 
-/**
- * \ingroup simix_synchro_management
- *
- */
-void simcall_mutex_destroy(smx_mutex_t mutex)
-{
-  simcall_BODY_mutex_destroy(mutex);
-}
-
 /**
  * \ingroup simix_synchro_management
  *
@@ -1076,15 +1060,6 @@ smx_cond_t simcall_cond_init(void)
   return simcall_BODY_cond_init();
 }
 
-/**
- * \ingroup simix_synchro_management
- *
- */
-void simcall_cond_destroy(smx_cond_t cond)
-{
-  simcall_BODY_cond_destroy(cond);
-}
-
 /**
  * \ingroup simix_synchro_management
  *
@@ -1133,15 +1108,6 @@ smx_sem_t simcall_sem_init(int capacity)
   return simcall_BODY_sem_init(capacity);
 }
 
-/**
- * \ingroup simix_synchro_management
- *
- */
-void simcall_sem_destroy(smx_sem_t sem)
-{
-  simcall_BODY_sem_destroy(sem);
-}
-
 /**
  * \ingroup simix_synchro_management
  *
@@ -1325,18 +1291,6 @@ void simcall_run_kernel(std::function<void()> const& code)
   return simcall_BODY_run_kernel((void*) &code);
 }
 
-#ifdef HAVE_MC
-
-void *simcall_mc_snapshot(void) {
-  return simcall_BODY_mc_snapshot();
-}
-
-int simcall_mc_compare_snapshots(void *s1, void *s2) {
-  return simcall_BODY_mc_compare_snapshots((simgrid::mc::Snapshot*)s1, (simgrid::mc::Snapshot*)s2);
-}
-
-#endif /* HAVE_MC */
-
 int simcall_mc_random(int min, int max) {
   return simcall_BODY_mc_random(min, max);
 }