#include "src/mc/mc_replay.h"
#include "smx_private.h"
-#include "src/mc/mc_forward.h"
+#include "src/mc/mc_forward.hpp"
#include "xbt/ex.h"
#include "mc/mc.h"
#include "src/simix/smx_host_private.h"
}
}
-// ***** 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)
-{
- return host->processes();
-}
-
-/** \ingroup simix_host_management
- * \deprecated */
-double simcall_host_get_current_power_peak(sg_host_t host)
-{
- return host->current_power_peak();
-}
-
-/** \ingroup simix_host_management
- * \deprecated */
-double simcall_host_get_power_peak_at(sg_host_t host, int pstate_index)
-{
- return host->power_peak_at(pstate_index);
-}
-
-/** \deprecated */
-void simcall_host_get_params(sg_host_t vm, vm_params_t params)
-{
- vm->get_parameters(params);
-}
-
-/** \deprecated */
-void simcall_host_set_params(sg_host_t vm, vm_params_t params)
-{
- vm->set_parameters(params);
-}
-
-/** \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 host->attached_storages();
-}
-
-// ***** Other simcalls
+// ***** AS simcalls
/**
* \ingroup simix_host_management
simgrid::simix::kernel(std::bind(SIMIX_process_set_data, process, data));
}
-static void kill_process(void* arg)
+static void kill_process_from_timer(void* arg)
{
- simix_global->kill_process_function((smx_process_t) arg);
+ smx_process_t process = (smx_process_t) arg;
+ simix_global->kill_process_function(process);
+ process->kill_timer=NULL;
}
/**
if (simix_global->kill_process_function) {
XBT_DEBUG("Set kill time %f for process %s(%s)",kill_time, process->name,
sg_host_get_name(process->host));
- process->kill_timer = SIMIX_timer_set(kill_time, kill_process, process);
+ process->kill_timer = SIMIX_timer_set(kill_time, kill_process_from_timer, 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);
}
/**
}
/**
- * \ingroup simix_rdv_management
+ * \ingroup simix_mbox_management
* \brief Creates a new rendez-vous point
* \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_mbox_create(const char *name)
{
- return simcall_BODY_rdv_create(name);
+ return simcall_BODY_mbox_create(name);
}
-
-/**
- * \ingroup simix_rdv_management
- * \brief Destroy a rendez-vous point
- * \param rdv The rendez-vous point to destroy
- */
-void simcall_rdv_destroy(smx_rdv_t rdv)
-{
- simcall_BODY_rdv_destroy(rdv);
-}
/**
- * \ingroup simix_rdv_management
+ * \ingroup simix_mbox_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_mbox_get_by_name(const char *name)
{
- xbt_assert(name != NULL, "Invalid parameter for simcall_rdv_get_by_name (name is NULL)");
-
/* FIXME: this is a horrible loss of performance, so we hack it out by
* skipping the simcall (for now). It works in parallel, it won't work on
* distributed but probably we will change MSG for that. */
- return SIMIX_rdv_get_by_name(name);
+ return SIMIX_mbox_get_by_name(name);
}
/**
- * \ingroup simix_rdv_management
- * \brief Counts the number of communication synchros of a given host pending
- * on a rendez-vous point.
- * \param rdv The rendez-vous point
- * \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)
-{
- return simcall_BODY_rdv_comm_count_by_host(rdv, host);
-}
-
-/**
- * \ingroup simix_rdv_management
+ * \ingroup simix_mbox_management
* \brief returns the communication at the head of the rendez-vous
- * \param rdv The rendez-vous point
+ * \param mbox 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_mbox_get_head(smx_mailbox_t mbox)
{
- return simcall_BODY_rdv_get_head(rdv);
+ return simcall_BODY_mbox_get_head(mbox);
}
-void simcall_rdv_set_receiver(smx_rdv_t rdv, smx_process_t process)
+void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process)
{
- simcall_BODY_rdv_set_receiver(rdv, process);
+ simcall_BODY_mbox_set_receiver(mbox, process);
}
-smx_process_t simcall_rdv_get_receiver(smx_rdv_t rdv)
+smx_process_t simcall_mbox_get_receiver(smx_mailbox_t mbox)
{
- return simcall_BODY_rdv_get_receiver(rdv);
+ return simcall_BODY_mbox_get_receiver(mbox);
}
/**
* \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 mbox, 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,
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(mbox, "No rendez-vous point defined for send");
if (MC_is_active() || MC_record_replay_is_active()) {
/* the model-checker wants two separate simcalls */
smx_synchro_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
- comm = simcall_comm_isend(sender, rdv, task_size, rate,
+ comm = simcall_comm_isend(sender, mbox, task_size, rate,
src_buff, src_buff_size, match_fun, NULL, copy_data_fun, data, 0);
simcall_comm_wait(comm, timeout);
comm = NULL;
}
else {
- simcall_BODY_comm_send(sender, rdv, task_size, rate, src_buff, src_buff_size,
+ simcall_BODY_comm_send(sender, mbox, task_size, rate, src_buff, src_buff_size,
match_fun, copy_data_fun, data, timeout);
}
}
/**
* \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 mbox, 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 *),
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(mbox, "No rendez-vous point defined for isend");
- return simcall_BODY_comm_isend(sender, rdv, task_size, rate, src_buff,
+ return simcall_BODY_comm_isend(sender, mbox, task_size, rate, src_buff,
src_buff_size, match_fun,
clean_fun, copy_data_fun, data, detached);
}
/**
* \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 mbox, 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(std::isfinite(timeout), "timeout is not finite!");
- xbt_assert(rdv, "No rendez-vous point defined for recv");
+ xbt_assert(mbox, "No rendez-vous point defined for recv");
if (MC_is_active() || MC_record_replay_is_active()) {
/* the model-checker wants two separate simcalls */
smx_synchro_t comm = NULL; /* MC needs the comm to be set to NULL during the simcall */
- comm = simcall_comm_irecv(receiver, rdv, dst_buff, dst_buff_size,
+ comm = simcall_comm_irecv(receiver, mbox, dst_buff, dst_buff_size,
match_fun, copy_data_fun, data, rate);
simcall_comm_wait(comm, timeout);
comm = NULL;
}
else {
- simcall_BODY_comm_recv(receiver, rdv, dst_buff, dst_buff_size,
+ simcall_BODY_comm_recv(receiver, mbox, dst_buff, dst_buff_size,
match_fun, copy_data_fun, data, timeout, rate);
}
}
/**
* \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 mbox, 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)
{
- xbt_assert(rdv, "No rendez-vous point defined for irecv");
+ xbt_assert(mbox, "No rendez-vous point defined for irecv");
- return simcall_BODY_comm_irecv(receiver, rdv, dst_buff, dst_buff_size,
+ return simcall_BODY_comm_irecv(receiver, mbox, dst_buff, dst_buff_size,
match_fun, copy_data_fun, data, 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 mbox, 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");
+ xbt_assert(mbox, "No rendez-vous point defined for iprobe");
- return simcall_BODY_comm_iprobe(rdv, type, src, tag, match_fun, data);
+ return simcall_BODY_comm_iprobe(mbox, type, src, tag, match_fun, data);
}
/**
return simcall_BODY_comm_get_dst_proc(comm);
}
-#ifdef HAVE_LATENCY_BOUND_TRACKING
-int simcall_comm_is_latency_bounded(smx_synchro_t comm)
-{
- return simcall_BODY_comm_is_latency_bounded(comm);
-}
-#endif
-
/**
* \ingroup simix_synchro_management
*
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
*
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
*
return simcall_BODY_run_kernel((void*) &code);
}
-#ifdef HAVE_MC
-
-void *simcall_mc_snapshot(void) {
- return simcall_BODY_mc_snapshot();
-}
-
-int simcall_mc_compare_snapshots(void *s1, void *s2) {
- return simcall_BODY_mc_compare_snapshots((simgrid::mc::Snapshot*)s1, (simgrid::mc::Snapshot*)s2);
-}
-
-#endif /* HAVE_MC */
-
int simcall_mc_random(int min, int max) {
return simcall_BODY_mc_random(min, max);
}
