/* 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"
* \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)
{
- 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)
{
- 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)
{
- vm->getParams(params);
+ vm->parameters(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)
{
- return host->getMountedStorageList();
+ return host->mountedStoragesAsDict();
}
/** \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
* \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);
}
* \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);
}
/**
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);
}
* \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);
}
* \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);
}
* \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)");
* \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);
}
* \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);
}
/**
* \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,
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");
/**
* \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 *),
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");
/**
* \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)
{
- 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()) {
/**
* \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)
/**
* \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");
*/
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);
}