/* 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 <math.h> /* isfinite() */
#include "mc/mc.h"
#include "src/simix/smx_host_private.h"
+#include "src/simix/smx_private.hpp"
#include <simgrid/simix.hpp>
#include "popping_bodies.cpp"
-/**
- * \ingroup simix_host_management
- * \brief Start the host if it is off
- *
- * \param host A SIMIX host
- */
-void simcall_host_on(sg_host_t host)
+void simcall_call(smx_process_t process)
{
- return simgrid::simix::kernel(std::bind(SIMIX_host_on, host));
+ if (process != simix_global->maestro_process) {
+ XBT_DEBUG("Yield process '%s' on simcall %s (%d)", process->name,
+ SIMIX_simcall_name(process->simcall.call), (int)process->simcall.call);
+ SIMIX_process_yield(process);
+ } else {
+ SIMIX_simcall_handle(&process->simcall, 0);
+ }
}
-/**
- * \ingroup simix_host_management
- * \brief Stop the host if it is on
- *
- * \param host A SIMIX host
- */
-void simcall_host_off(sg_host_t host)
-{
- simcall_BODY_host_off(host);
-}
+// ***** Host simcalls
+// Those functions are replaced by methods on the Host object.
-/**
- * \ingroup simix_host_management
- * \brief Returns a dict of the properties assigned to a host.
- *
- * \param host A host
- * \return The properties of this host
- */
-xbt_dict_t simcall_host_get_properties(sg_host_t host)
+/** \ingroup simix_host_management
+ * \deprecated */
+xbt_swag_t simcall_host_get_process_list(sg_host_t host)
{
- return simgrid::simix::kernel(std::bind(SIMIX_host_get_properties, host));
+ return host->getProcessList();
}
-/**
- * \ingroup simix_host_management
- * \brief Returns a dict of the properties assigned to a router or AS.
- *
- * \param name The name of the router or AS
- * \return The properties
- */
-xbt_dict_t simcall_asr_get_properties(const char *name)
+/** \ingroup simix_host_management
+ * \deprecated */
+double simcall_host_get_current_power_peak(sg_host_t host)
{
- return simcall_BODY_asr_get_properties(name);
+ return host->getCurrentPowerPeak();
}
-/**
- * \ingroup simix_host_management
- * \brief Returns the list of processes attached to the host.
- *
- * \param host A SIMIX host
- * \return the swag of attached processes
- */
-xbt_swag_t simcall_host_get_process_list(sg_host_t host)
+/** \ingroup simix_host_management
+ * \deprecated */
+double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
{
- return simgrid::simix::kernel(std::bind(SIMIX_host_get_process_list, host));
+ return host->getPowerPeakAt(pstate_index);
}
-/**
- * \ingroup simix_host_management
- * \brief Returns the power peak of a host.
- *
- * \param host A SIMIX host
- * \return the current power peak value (double)
- */
-double simcall_host_get_current_power_peak(sg_host_t host)
+/** \deprecated */
+void simcall_host_get_params(sg_host_t vm, vm_params_t params)
{
- return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_current_power_peak, host));
+ vm->getParams(params);
}
-/**
- * \ingroup simix_host_management
- * \brief Returns one power peak (in flops/s) of a host at a given pstate
- *
- * \param host A SIMIX host
- * \param pstate_index pstate to test
- * \return the current power peak value (double) for pstate_index
- */
-double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
+/** \deprecated */
+void simcall_host_set_params(sg_host_t vm, vm_params_t params)
{
- return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_power_peak_at, host, pstate_index));
+ vm->setParams(params);
}
-/**
- * \ingroup simix_host_management
- * \brief Sets the pstate at which the host should run
- *
- * \param host A SIMIX host
- * \param pstate_index The pstate to which the CPU power will be set
- */
-void simcall_host_set_pstate(sg_host_t host, int pstate_index)
+/** \ingroup simix_storage_management
+ * \deprecated */
+xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
{
- simgrid::simix::kernel(
- std::bind(SIMIX_host_set_pstate, host, pstate_index));
+ return host->getMountedStorageList();
}
-/** \ingroup simix_host_management
- * \brief Returns the amount of watt dissipated at the given pstate when the host is idling
- */
-double simcall_host_get_wattmin_at(msg_host_t host, int pstate)
+/** \ingroup simix_storage_management
+ * \deprecated */
+xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
{
- return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_wattmin_at, host, pstate));
+ return host->getAttachedStorageList();
}
-/** \ingroup simix_host_management
- * \brief Returns the amount of watt dissipated at the given pstate when the host burns CPU at 100%
+// ***** Other simcalls
+
+/**
+ * \ingroup simix_host_management
+ * \brief Returns a dict of the properties assigned to a router or AS.
+ *
+ * \param name The name of the router or AS
+ * \return The properties
*/
-double simcall_host_get_wattmax_at(msg_host_t host, int pstate)
+xbt_dict_t simcall_asr_get_properties(const char *name)
{
- return simgrid::simix::kernel(
- std::bind(SIMIX_host_get_wattmax_at, host, pstate));
+ return simcall_BODY_asr_get_properties(name);
}
-
-
/**
* \ingroup simix_process_management
* \brief Creates a synchro that executes some computation of an host.
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);
}
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);
+ xbt_assert(std::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]),
+ 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,
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);
}
simgrid::simix::kernel(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
}
-void simcall_host_get_params(sg_host_t vm, vm_params_t params)
-{
- simgrid::simix::kernel(std::bind(SIMIX_host_get_params, vm, params));
-}
-
-void simcall_host_set_params(sg_host_t vm, vm_params_t params)
-{
- simgrid::simix::kernel(std::bind(SIMIX_host_set_params, vm, params));
-}
-
/**
* \ingroup simix_vm_management
* \brief Migrate the given VM to the given physical host
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);
}
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");
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");
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()) {
*/
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);
}
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);
}
*/
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);
}
return simcall_BODY_storage_get_used_size(storage);
}
-/**
- * \ingroup simix_storage_management
- * \brief Returns the list of storages mounted on an host.
- * \param host A SIMIX host
- * \return a dict containing all storages mounted on the host
- */
-xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
-{
- return simgrid::simix::kernel(std::bind(
- SIMIX_host_get_mounted_storage_list, host
- ));
-}
-
-/**
- * \ingroup simix_storage_management
- * \brief Returns the list of storages attached to an host.
- * \param host A SIMIX host
- * \return a dict containing all storages attached to the host
- */
-xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
-{
- return simgrid::simix::kernel(std::bind(
- SIMIX_host_get_attached_storage_list, host
- ));
-}
-
/**
* \ingroup simix_storage_management
* \brief Returns a dict of the properties assigned to a storage element.