convert S4U to my current coding convention

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

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 4f1d8cd..c8bb311 100644 (file)
--- a/src/simix/libsmx.cpp
+++ b/src/simix/libsmx.cpp
@@ -11,13 +11,14 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 

+#include <cmath>         /* std::isfinite() */
+

 #include <functional>
 
 #include "src/mc/mc_replay.h"
 #include "smx_private.h"
 #include "src/mc/mc_forward.h"
 #include "xbt/ex.h"
 #include <functional>
 
 #include "src/mc/mc_replay.h"
 #include "smx_private.h"
 #include "src/mc/mc_forward.h"
 #include "xbt/ex.h"

-#include <math.h>         /* isfinite() */

 #include "mc/mc.h"
 #include "src/simix/smx_host_private.h"
 #include "src/simix/smx_private.hpp"
 #include "mc/mc.h"
 #include "src/simix/smx_host_private.h"
 #include "src/simix/smx_private.hpp"


@@ -46,61 +47,47 @@ void simcall_call(smx_process_t process)
  * \deprecated */
 xbt_swag_t simcall_host_get_process_list(sg_host_t host)
 {
  * \deprecated */
 xbt_swag_t simcall_host_get_process_list(sg_host_t host)
 {

-  return host->getProcessList();
+  return host->processes();

 }
 
 /** \ingroup simix_host_management
  * \deprecated */
 double simcall_host_get_current_power_peak(sg_host_t host)
 {
 }
 
 /** \ingroup simix_host_management
  * \deprecated */
 double simcall_host_get_current_power_peak(sg_host_t host)
 {

-  return host->getCurrentPowerPeak();
+  return host->currentPowerPeak();

 }
 
 /** \ingroup simix_host_management
  * \deprecated */
 double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
 {
 }
 
 /** \ingroup simix_host_management
  * \deprecated */
 double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
 {

-  return host->getPowerPeakAt(pstate_index);
-}
-
-/** \ingroup simix_host_management
- * \deprecated */
-double simcall_host_get_wattmin_at(msg_host_t host, int pstate)
-{
-  return host->getWattMinAt(pstate);
-}
-
-/** \ingroup simix_host_management
- *  \deprecated */
-double simcall_host_get_wattmax_at(msg_host_t host, int pstate)
-{
-  return host->getWattMaxAt(pstate);
+  return host->powerPeakAt(pstate_index);

 }
 
 /** \deprecated */
 void simcall_host_get_params(sg_host_t vm, vm_params_t params)
 {
 }
 
 /** \deprecated */
 void simcall_host_get_params(sg_host_t vm, vm_params_t params)
 {

-  vm->getParams(params);
+  vm->parameters(params);

 }
 
 /** \deprecated */
 void simcall_host_set_params(sg_host_t vm, vm_params_t params)
 {
 }
 
 /** \deprecated */
 void simcall_host_set_params(sg_host_t vm, vm_params_t params)
 {

-  vm->setParams(params);
+  vm->setParameters(params);

 }
 
 /** \ingroup simix_storage_management
  *  \deprecated */
 xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
 {
 }
 
 /** \ingroup simix_storage_management
  *  \deprecated */
 xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
 {

-  return host->getMountedStorageList();
+  return host->mountedStoragesAsDict();

 }
 
 /** \ingroup simix_storage_management
  *  \deprecated */
 xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
 {
 }
 
 /** \ingroup simix_storage_management
  *  \deprecated */
 xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
 {

-  return host->getAttachedStorageList();
+  return host->attachedStorages();

 }
 
 // ***** Other simcalls
 }
 
 // ***** Other simcalls


@@ -131,15 +118,15 @@ xbt_dict_t simcall_asr_get_properties(const char *name)
  * \param affinity_mask
  * \return A new SIMIX execution synchronization
  */
  * \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)
 {
   /* checking for infinite values */
                                     double flops_amount,
                                     double priority, double bound, unsigned long affinity_mask)
 {
   /* checking for infinite values */

-  xbt_assert(isfinite(flops_amount), "flops_amount is not finite!");
-  xbt_assert(isfinite(priority), "priority is not finite!");
+  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);

 }
 
 /**
 }
 
 /**


@@ -157,7 +144,7 @@ smx_synchro_t simcall_process_execute(const char *name,
  * \param rate the SURF action rate
  * \return A new SIMIX execution synchronization
  */
  * \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,
                                          int host_nb,
                                          sg_host_t *host_list,
                                          double *flops_amount,


@@ -168,17 +155,19 @@ smx_synchro_t simcall_process_parallel_execute(const char *name,
   int i,j;
   /* checking for infinite values */
   for (i = 0 ; i < host_nb ; ++i) {
   int i,j;
   /* checking for infinite values */
   for (i = 0 ; i < host_nb ; ++i) {

-     xbt_assert(isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i);
-     for (j = 0 ; j < host_nb ; ++j) {
-        xbt_assert(isfinite(bytes_amount[i + host_nb * j]),
-             "bytes_amount[%d+%d*%d] is not finite!", i, host_nb, j);
-     }
+    xbt_assert(std::isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i);
+    if (bytes_amount != NULL) {
+      for (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(isfinite(amount), "amount is not finite!");
-  xbt_assert(isfinite(rate), "rate is not finite!");
+  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);
                                             flops_amount,
                                             bytes_amount,
                                             amount, rate);


@@ -192,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
  */
  * 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);

 }
 
 /**
 }
 
 /**


@@ -204,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
  */
  * 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);

 }
 
 /**
 }
 
 /**


@@ -216,9 +205,9 @@ void simcall_process_execution_cancel(smx_synchro_t execution)
  * \param execution The execution synchro
  * \return The remaining amount
  */
  * \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);

 }
 
 /**
 }
 
 /**


@@ -228,9 +217,9 @@ double simcall_process_execution_get_remains(smx_synchro_t execution)
  * \param execution The execution synchro
  * \return The state
  */
  * \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);

 }
 
 /**
 }
 
 /**


@@ -241,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
  */
  * \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 */
 {
   /* checking for infinite values */

-  xbt_assert(isfinite(priority), "priority is not finite!");
+  xbt_assert(std::isfinite(priority), "priority is not finite!");

 
 

-  simcall_BODY_process_execution_set_priority(execution, priority);
+  simcall_BODY_execution_set_priority(execution, priority);

 }
 
 /**
 }
 
 /**


@@ -257,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
  */
  * \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);

 }
 
 /**
 }
 
 /**


@@ -271,9 +260,9 @@ void simcall_process_execution_set_bound(smx_synchro_t execution, double bound)
  * \param host Host
  * \param mask Affinity mask
  */
  * \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);

 }
 
 /**
 }
 
 /**


@@ -282,9 +271,9 @@ void simcall_process_execution_set_affinity(smx_synchro_t execution, sg_host_t h
  *
  * \param execution The execution synchro
  */
  *
  * \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);

 }
 
 
 }
 
 


@@ -639,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) {
  * \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);

 }
 
 /**
 }
 
 /**


@@ -734,7 +723,7 @@ XBT_PUBLIC(smx_process_t) simcall_process_restart(smx_process_t process)
 e_smx_state_t simcall_process_sleep(double duration)
 {
   /* checking for infinite values */
 e_smx_state_t simcall_process_sleep(double duration)
 {
   /* checking for infinite values */

-  xbt_assert(isfinite(duration), "duration is not finite!");
+  xbt_assert(std::isfinite(duration), "duration is not finite!");

   return (e_smx_state_t) simcall_BODY_process_sleep(duration);
 }
 
   return (e_smx_state_t) simcall_BODY_process_sleep(duration);
 }
 


@@ -818,9 +807,9 @@ void simcall_comm_send(smx_process_t sender, smx_rdv_t rdv, double task_size, do
                          double timeout)
 {
   /* checking for infinite values */
                          double timeout)
 {
   /* checking for infinite values */

-  xbt_assert(isfinite(task_size), "task_size is not finite!");
-  xbt_assert(isfinite(rate), "rate is not finite!");
-  xbt_assert(isfinite(timeout), "timeout is not finite!");
+  xbt_assert(std::isfinite(task_size), "task_size is not finite!");
+  xbt_assert(std::isfinite(rate), "rate is not finite!");
+  xbt_assert(std::isfinite(timeout), "timeout is not finite!");

 
   xbt_assert(rdv, "No rendez-vous point defined for send");
 
 
   xbt_assert(rdv, "No rendez-vous point defined for send");
 


@@ -850,8 +839,8 @@ smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_rdv_t rdv, double tas
                               int detached)
 {
   /* checking for infinite values */
                               int detached)
 {
   /* checking for infinite values */

-  xbt_assert(isfinite(task_size), "task_size is not finite!");
-  xbt_assert(isfinite(rate), "rate is not finite!");
+  xbt_assert(std::isfinite(task_size), "task_size is not finite!");
+  xbt_assert(std::isfinite(rate), "rate is not finite!");

 
   xbt_assert(rdv, "No rendez-vous point defined for isend");
 
 
   xbt_assert(rdv, "No rendez-vous point defined for isend");
 


@@ -868,7 +857,7 @@ void simcall_comm_recv(smx_process_t receiver, smx_rdv_t rdv, void *dst_buff, si
                        void (*copy_data_fun)(smx_synchro_t, void*, size_t),
                        void *data, double timeout, double rate)
 {
                        void (*copy_data_fun)(smx_synchro_t, void*, size_t),
                        void *data, double timeout, double rate)
 {

-  xbt_assert(isfinite(timeout), "timeout is not finite!");
+  xbt_assert(std::isfinite(timeout), "timeout is not finite!");

   xbt_assert(rdv, "No rendez-vous point defined for recv");
 
   if (MC_is_active() || MC_record_replay_is_active()) {
   xbt_assert(rdv, "No rendez-vous point defined for recv");
 
   if (MC_is_active() || MC_record_replay_is_active()) {


@@ -940,7 +929,7 @@ int simcall_comm_testany(xbt_dynar_t comms)
  */
 void simcall_comm_wait(smx_synchro_t comm, double timeout)
 {
  */
 void simcall_comm_wait(smx_synchro_t comm, double timeout)
 {

-  xbt_assert(isfinite(timeout), "timeout is not finite!");
+  xbt_assert(std::isfinite(timeout), "timeout is not finite!");

   simcall_BODY_comm_wait(comm, timeout);
 }
 
   simcall_BODY_comm_wait(comm, timeout);
 }
 


@@ -1042,15 +1031,6 @@ smx_mutex_t simcall_mutex_init(void)
   return simcall_BODY_mutex_init();
 }
 
   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
  *
 /**
  * \ingroup simix_synchro_management
  *


@@ -1087,15 +1067,6 @@ smx_cond_t simcall_cond_init(void)
   return simcall_BODY_cond_init();
 }
 
   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
  *
 /**
  * \ingroup simix_synchro_management
  *


@@ -1122,7 +1093,7 @@ void simcall_cond_wait_timeout(smx_cond_t cond,
                                  smx_mutex_t mutex,
                                  double timeout)
 {
                                  smx_mutex_t mutex,
                                  double timeout)
 {

-  xbt_assert(isfinite(timeout), "timeout is not finite!");
+  xbt_assert(std::isfinite(timeout), "timeout is not finite!");

   simcall_BODY_cond_wait_timeout(cond, mutex, timeout);
 }
 
   simcall_BODY_cond_wait_timeout(cond, mutex, timeout);
 }
 


@@ -1144,15 +1115,6 @@ smx_sem_t simcall_sem_init(int capacity)
   return simcall_BODY_sem_init(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
  *
 /**
  * \ingroup simix_synchro_management
  *


@@ -1186,7 +1148,7 @@ void simcall_sem_acquire(smx_sem_t sem)
  */
 void simcall_sem_acquire_timeout(smx_sem_t sem, double timeout)
 {
  */
 void simcall_sem_acquire_timeout(smx_sem_t sem, double timeout)
 {

-  xbt_assert(isfinite(timeout), "timeout is not finite!");
+  xbt_assert(std::isfinite(timeout), "timeout is not finite!");

   simcall_BODY_sem_acquire_timeout(sem, timeout);
 }
 
   simcall_BODY_sem_acquire_timeout(sem, timeout);
 }