/* 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>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
#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)
{
- simcall_BODY_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)
+// ***** Host simcalls
+// Those functions are replaced by methods on the Host object.
+
+/** \ingroup simix_host_management
+ * \deprecated */
+xbt_swag_t simcall_host_get_process_list(sg_host_t host)
{
- simcall_BODY_host_off(host);
+ return host->processes();
}
-/**
- * \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 */
+double simcall_host_get_current_power_peak(sg_host_t host)
{
- return simcall_BODY_host_get_properties(host);
+ return host->current_power_peak();
}
-/**
- * \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_power_peak_at(sg_host_t host, int pstate_index)
{
- return simcall_BODY_asr_get_properties(name);
+ return host->power_peak_at(pstate_index);
}
-/**
- * \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)
+/** \deprecated */
+void simcall_host_get_params(sg_host_t vm, vm_params_t params)
{
- return simcall_BODY_host_get_process_list(host);
+ vm->get_parameters(params);
}
-/**
- * \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_set_params(sg_host_t vm, vm_params_t params)
{
- return simcall_BODY_host_get_current_power_peak(host);
+ vm->set_parameters(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)
+/** \ingroup simix_storage_management
+ * \deprecated */
+xbt_dict_t simcall_host_get_mounted_storage_list(sg_host_t host)
+{
+ return host->mounted_storages_as_dict();
+}
+
+/** \ingroup simix_storage_management
+ * \deprecated */
+xbt_dynar_t simcall_host_get_attached_storage_list(sg_host_t host)
{
- return simcall_BODY_host_get_power_peak_at(host, pstate_index);
+ return host->attached_storages();
}
+// ***** Other simcalls
+
/**
* \ingroup simix_host_management
- * \brief Sets the pstate at which the host should run
+ * \brief Returns a dict of the properties assigned to a router or AS.
*
- * \param host A SIMIX host
- * \param pstate_index The pstate to which the CPU power will be set
+ * \param name The name of the router or AS
+ * \return The properties
*/
-void simcall_host_set_pstate(sg_host_t host, int pstate_index)
+xbt_dict_t simcall_asr_get_properties(const char *name)
{
- simcall_BODY_host_set_pstate(host, pstate_index);
-}
-
-/** \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){
- return simcall_BODY_host_get_wattmin_at(host, pstate);
-}
-/** \ingroup simix_host_management
- * \brief Returns the amount of watt dissipated at the given pstate when the host burns CPU at 100%
- */
-double simcall_host_get_wattmax_at(msg_host_t host, int pstate){
- return simcall_BODY_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.
* \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 */
- 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);
}
/**
* \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 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);
* 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);
}
/**
* 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);
}
/**
* \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);
}
/**
* \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);
}
/**
* \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(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);
}
/**
* \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);
}
/**
* \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);
}
/**
*
* \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);
}
*
* \return The host object of the VM
*/
-void* simcall_vm_create(const char *name, sg_host_t phys_host){
- return simcall_BODY_vm_create(name, phys_host);
+void* simcall_vm_create(const char *name, sg_host_t phys_host)
+{
+ return simgrid::simix::kernel(std::bind(SIMIX_vm_create, name, phys_host));
}
/**
*/
void simcall_vm_start(sg_host_t vm)
{
- simcall_BODY_vm_start(vm);
+ return simgrid::simix::kernel(std::bind(SIMIX_vm_start, vm));
}
/**
*/
int simcall_vm_get_state(sg_host_t vm)
{
- return simcall_BODY_vm_get_state(vm);
+ return simgrid::simix::kernel(std::bind(SIMIX_vm_get_state, vm));
}
/**
*/
void *simcall_vm_get_pm(sg_host_t vm)
{
- return simcall_BODY_vm_get_pm(vm);
+ return simgrid::simix::kernel(std::bind(SIMIX_vm_get_pm, vm));
}
void simcall_vm_set_bound(sg_host_t vm, double bound)
{
- simcall_BODY_vm_set_bound(vm, bound);
+ simgrid::simix::kernel(std::bind(SIMIX_vm_set_bound, vm, bound));
}
void simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask)
{
- simcall_BODY_vm_set_affinity(vm, pm, mask);
-}
-
-void simcall_host_get_params(sg_host_t vm, vm_params_t params)
-{
- simcall_BODY_host_get_params(vm, params);
-}
-
-void simcall_host_set_params(sg_host_t vm, vm_params_t params)
-{
- simcall_BODY_host_set_params(vm, params);
+ simgrid::simix::kernel(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
}
/**
*/
void simcall_vm_migrate(sg_host_t vm, sg_host_t host)
{
- simcall_BODY_vm_migrate(vm, host);
+ return simgrid::simix::kernel(std::bind(SIMIX_vm_migrate, vm, host));
}
/**
*/
void simcall_vm_destroy(sg_host_t vm)
{
- simcall_BODY_vm_destroy(vm);
+ simgrid::simix::kernel(std::bind(SIMIX_vm_destroy, vm));
}
/**
*/
void simcall_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm)
{
- simcall_BODY_vm_migratefrom_resumeto(vm, src_pm, dst_pm);
+ simgrid::simix::kernel(std::bind(
+ SIMIX_vm_migratefrom_resumeto, vm, src_pm, dst_pm));
}
/**
*/
int simcall_process_count(void)
{
- return simcall_BODY_process_count();
+ return simgrid::simix::kernel(SIMIX_process_count);
}
/**
*/
int simcall_process_get_PID(smx_process_t process)
{
- if (process == SIMIX_process_self()) {
- /* avoid a simcall if this function is called by the process itself */
- return SIMIX_process_get_PID(process);
- }
-
- return simcall_BODY_process_get_PID(process);
+ return SIMIX_process_get_PID(process);
}
/**
*/
int simcall_process_get_PPID(smx_process_t process)
{
- if (process == SIMIX_process_self()) {
- /* avoid a simcall if this function is called by the process itself */
- return SIMIX_process_get_PPID(process);
- }
-
- return simcall_BODY_process_get_PPID(process);
+ return SIMIX_process_get_PPID(process);
}
/**
*/
void* simcall_process_get_data(smx_process_t process)
{
- if (process == SIMIX_process_self()) {
- /* avoid a simcall if this function is called by the process itself */
- return SIMIX_process_get_data(process);
- }
-
- return simcall_BODY_process_get_data(process);
+ return SIMIX_process_get_data(process);
}
/**
*/
void simcall_process_set_data(smx_process_t process, void *data)
{
- if (process == SIMIX_process_self()) {
- /* avoid a simcall if this function is called by the process itself */
- SIMIX_process_self_set_data(process, data);
- }
- else {
- simcall_BODY_process_set_data(process, data);
- }
+ simgrid::simix::kernel(std::bind(SIMIX_process_set_data, process, data));
}
static void kill_process(void* arg)
*/
sg_host_t simcall_process_get_host(smx_process_t process)
{
- return simcall_BODY_process_get_host(process);
+ return SIMIX_process_get_host(process);
}
/**
*/
const char* simcall_process_get_name(smx_process_t process)
{
- if (process == SIMIX_process_self()) {
- /* avoid a simcall if this function is called by the process itself */
- return process->name;
- }
- return simcall_BODY_process_get_name(process);
+ return SIMIX_process_get_name(process);
}
/**
*/
int simcall_process_is_suspended(smx_process_t process)
{
- return simcall_BODY_process_is_suspended(process);
+ return simcall_BODY_process_is_suspended(process);
}
/**
*/
xbt_dict_t simcall_process_get_properties(smx_process_t process)
{
- return simcall_BODY_process_get_properties(process);
+ return SIMIX_process_get_properties(process);
}
/**
* \ingroup simix_process_management
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);
}
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
*
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
*
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);
}
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
*
*/
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 simcall_BODY_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 simcall_BODY_host_get_attached_storage_list(host);
-}
-
/**
* \ingroup simix_storage_management
* \brief Returns a dict of the properties assigned to a storage element.
