Allows the bytes_amount argument of MSG_parallel_task_create to be null.

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

diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp
index 18ff330..0625177 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"


@@ -42,79 +43,51 @@ void simcall_call(smx_process_t process)
 // ***** Host simcalls
 // Those functions are replaced by methods on the Host object.
 
 // ***** Host simcalls
 // Those functions are replaced by methods on the Host object.
 

-/** \ingroup simix_host_management
- * \deprecated */
-xbt_dict_t simcall_host_get_properties(sg_host_t host)
-{
-  return host->getProperties();
-}
-

 /** \ingroup simix_host_management
  * \deprecated */
 xbt_swag_t simcall_host_get_process_list(sg_host_t host)
 {
 /** \ingroup simix_host_management
  * \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->current_power_peak();

 }
 
 /** \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 */
-void simcall_host_set_pstate(sg_host_t host, int pstate_index)
-{
-  host->setPstate(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->power_peak_at(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->get_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->set_parameters(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->mounted_storages_as_dict();

 }
 
 /** \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->attached_storages();

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


@@ -150,8 +123,8 @@ smx_synchro_t simcall_process_execute(const char *name,
                                     double priority, double bound, unsigned long affinity_mask)
 {
   /* checking for infinite values */
                                     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_process_execute(name, flops_amount, priority, bound, affinity_mask);
 }


@@ -182,15 +155,17 @@ 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,
                                             flops_amount,
 
   return simcall_BODY_process_parallel_execute(name, host_nb, host_list,
                                             flops_amount,


@@ -258,7 +233,7 @@ e_smx_state_t simcall_process_execution_get_state(smx_synchro_t execution)
 void simcall_process_execution_set_priority(smx_synchro_t execution, double priority)
 {
   /* checking for infinite values */
 void simcall_process_execution_set_priority(smx_synchro_t execution, double priority)
 {
   /* 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_process_execution_set_priority(execution, priority);
 }


@@ -748,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);
 }
 


@@ -832,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");
 


@@ -864,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");
 


@@ -882,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()) {


@@ -954,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);
 }
 


@@ -1136,7 +1111,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);
 }
 


@@ -1200,7 +1175,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);
 }