#include <functional>
+#include <xbt/functional.hpp>
+
+#include <simgrid/simix/blocking_simcall.hpp>
+
#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"
-#include "src/simix/smx_private.hpp"
+#include "src/kernel/activity/SynchroComm.hpp"
#include <simgrid/simix.hpp>
void simcall_call(smx_process_t process)
{
if (process != simix_global->maestro_process) {
- XBT_DEBUG("Yield process '%s' on simcall %s (%d)", process->name,
+ XBT_DEBUG("Yield process '%s' on simcall %s (%d)", process->name.c_str(),
SIMIX_simcall_name(process->simcall.call), (int)process->simcall.call);
SIMIX_process_yield(process);
} else {
}
}
-// ***** 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
/* checking for infinite values */
for (i = 0 ; i < host_nb ; ++i) {
xbt_assert(std::isfinite(flops_amount[i]), "flops_amount[%d] is not finite!", i);
- if (bytes_amount != NULL) {
+ if (bytes_amount != nullptr) {
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);
}
-/**
- * \ingroup simix_process_management
- * \brief Destroys an execution synchro.
- *
- * 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_execution_destroy(smx_synchro_t execution)
-{
- simcall_BODY_execution_destroy(execution);
-}
-
/**
* \ingroup simix_process_management
* \brief Cancels an execution synchro.
simcall_BODY_execution_cancel(execution);
}
-/**
- * \ingroup simix_process_management
- * \brief Returns how much of an execution synchro remains to be done.
- *
- * \param execution The execution synchro
- * \return The remaining amount
- */
-double simcall_execution_get_remains(smx_synchro_t execution)
-{
- return simcall_BODY_execution_get_remains(execution);
-}
-
-/**
- * \ingroup simix_process_management
- * \brief Returns the state of an execution synchro.
- *
- * \param execution The execution synchro
- * \return The state
- */
-e_smx_state_t simcall_execution_get_state(smx_synchro_t execution)
-{
- return simcall_BODY_execution_get_state(execution);
-}
-
/**
* \ingroup simix_process_management
* \brief Changes the priority of an execution synchro.
*/
void* simcall_vm_create(const char *name, sg_host_t phys_host)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_create, name, phys_host));
+ return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_create, name, phys_host));
}
/**
*/
void simcall_vm_start(sg_host_t vm)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_start, vm));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_start, vm));
}
/**
*/
int simcall_vm_get_state(sg_host_t vm)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_get_state, vm));
+ return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_get_state, vm));
}
/**
*/
void *simcall_vm_get_pm(sg_host_t vm)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_get_pm, vm));
+ return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_get_pm, vm));
}
void simcall_vm_set_bound(sg_host_t vm, double bound)
{
- simgrid::simix::kernel(std::bind(SIMIX_vm_set_bound, vm, bound));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_set_bound, vm, bound));
}
void simcall_vm_set_affinity(sg_host_t vm, sg_host_t pm, unsigned long mask)
{
- simgrid::simix::kernel(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
}
/**
*/
void simcall_vm_migrate(sg_host_t vm, sg_host_t host)
{
- return simgrid::simix::kernel(std::bind(SIMIX_vm_migrate, vm, host));
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_migrate, vm, host));
}
/**
*/
void simcall_vm_destroy(sg_host_t vm)
{
- simgrid::simix::kernel(std::bind(SIMIX_vm_destroy, vm));
+ simgrid::simix::kernelImmediate(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)
{
- simgrid::simix::kernel(std::bind(
+ simgrid::simix::kernelImmediate(std::bind(
SIMIX_vm_migratefrom_resumeto, vm, src_pm, dst_pm));
}
-/**
- * \ingroup simix_process_management
- * \brief Creates and runs a new SIMIX process.
- *
- * The structure and the corresponding thread are created and put in the list of ready processes.
- *
- * \param name a name for the process. It is for user-level information and can be NULL.
- * \param code the main function of the process
- * \param data a pointer to any data one may want to attach to the new object. It is for user-level information and can be NULL.
- * It can be retrieved with the function \ref simcall_process_get_data.
- * \param hostname name of the host where the new agent is executed.
- * \param kill_time time when the process is killed
- * \param argc first argument passed to \a code
- * \param argv second argument passed to \a code
- * \param properties the properties of the process
- * \param auto_restart either it is autorestarting or not.
- */
-smx_process_t simcall_process_create(const char *name,
- xbt_main_func_t code,
- void *data,
- const char *hostname,
- double kill_time,
- int argc, char **argv,
- xbt_dict_t properties,
- int auto_restart)
-{
- return (smx_process_t) simcall_BODY_process_create(name, code, data, hostname,
- kill_time, argc, argv, properties,
- auto_restart);
-}
-
/**
* \ingroup simix_process_management
* \brief Kills a SIMIX process.
*/
int simcall_process_count(void)
{
- return simgrid::simix::kernel(SIMIX_process_count);
-}
-
-/**
- * \ingroup simix_process_management
- * \brief Return the PID of a #smx_process_t.
- * \param process a SIMIX process
- * \return the PID of this process
- */
-int simcall_process_get_PID(smx_process_t process)
-{
- return SIMIX_process_get_PID(process);
-}
-
-/**
- * \ingroup simix_process_management
- * \brief Return the parent PID of a #smx_process_t.
- * \param process a SIMIX process
- * \return the PID of this process parenrt
- */
-int simcall_process_get_PPID(smx_process_t process)
-{
- return SIMIX_process_get_PPID(process);
+ return simgrid::simix::kernelImmediate(SIMIX_process_count);
}
/**
*/
void simcall_process_set_data(smx_process_t process, void *data)
{
- simgrid::simix::kernel(std::bind(SIMIX_process_set_data, process, data));
-}
-
-static void kill_process(void* arg)
-{
- simix_global->kill_process_function((smx_process_t) arg);
+ simgrid::simix::kernelImmediate(std::bind(SIMIX_process_set_data, process, data));
}
/**
void simcall_process_set_kill_time(smx_process_t process, double kill_time)
{
- if (kill_time > SIMIX_get_clock()) {
- 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);
- }
- }
+ if (kill_time <= SIMIX_get_clock() || simix_global->kill_process_function == nullptr)
+ return;
+ XBT_DEBUG("Set kill time %f for process %s(%s)",
+ kill_time, process->name.c_str(), sg_host_get_name(process->host));
+ process->kill_timer = SIMIX_timer_set(kill_time, [=] {
+ simix_global->kill_process_function(process);
+ process->kill_timer=nullptr;
+ });
}
/**
* \ingroup simix_process_management
return SIMIX_timer_get_date(process->kill_timer);
}
-/**
- * \ingroup simix_process_management
- * \brief Return the location on which an agent is running.
- *
- * This functions returns the sg_host_t corresponding to the location on which
- * \a process is running.
- * \param process SIMIX process
- * \return SIMIX host
- */
-sg_host_t simcall_process_get_host(smx_process_t process)
-{
- return SIMIX_process_get_host(process);
-}
-
-/**
- * \ingroup simix_process_management
- * \brief Return the name of an agent.
- *
- * This functions checks whether \a process is a valid pointer or not and return its name.
- * \param process SIMIX process
- * \return The process name
- */
-const char* simcall_process_get_name(smx_process_t process)
-{
- return SIMIX_process_get_name(process);
-}
-
/**
* \ingroup simix_process_management
* \brief Returns true if the process is suspended .
}
/**
- * \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)
-{
- return simcall_BODY_rdv_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
- * \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_create(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 simcall_BODY_mbox_create(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)
+void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process)
{
- return simcall_BODY_rdv_comm_count_by_host(rdv, host);
-}
-
-/**
- * \ingroup simix_rdv_management
- * \brief returns the communication at the head of the rendez-vous
- * \param rdv The rendez-vous point
- * \return The communication or NULL if empty
- */
-smx_synchro_t simcall_rdv_get_head(smx_rdv_t rdv)
-{
- return simcall_BODY_rdv_get_head(rdv);
-}
-
-void simcall_rdv_set_receiver(smx_rdv_t rdv, smx_process_t process)
-{
- simcall_BODY_rdv_set_receiver(rdv, process);
-}
-
-smx_process_t simcall_rdv_get_receiver(smx_rdv_t rdv)
-{
- return simcall_BODY_rdv_get_receiver(rdv);
+ simcall_BODY_mbox_set_receiver(mbox, process);
}
/**
* \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,
- src_buff, src_buff_size, match_fun, NULL, copy_data_fun, data, 0);
+ smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */
+ comm = simcall_comm_isend(sender, mbox, task_size, rate,
+ src_buff, src_buff_size, match_fun, nullptr, copy_data_fun, data, 0);
simcall_comm_wait(comm, timeout);
- comm = NULL;
+ comm = nullptr;
}
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,
+ smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */
+ 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;
+ comm = nullptr;
}
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);
}
/**
* \ingroup simix_comm_management
*/
-void simcall_comm_cancel(smx_synchro_t comm)
+void simcall_comm_cancel(smx_synchro_t synchro)
{
- simcall_BODY_comm_cancel(comm);
+ simgrid::simix::kernelImmediate([synchro]{
+ simgrid::kernel::activity::Comm *comm = static_cast<simgrid::kernel::activity::Comm*>(synchro);
+ comm->cancel();
+ });
}
/**
* \ingroup simix_comm_management
*/
-unsigned int simcall_comm_waitany(xbt_dynar_t comms)
+unsigned int simcall_comm_waitany(xbt_dynar_t comms, double timeout)
{
- return simcall_BODY_comm_waitany(comms);
+ return simcall_BODY_comm_waitany(comms, timeout);
}
/**
* \ingroup simix_comm_management
*/
-int simcall_comm_testany(xbt_dynar_t comms)
+int simcall_comm_testany(smx_synchro_t* comms, size_t count)
{
- if (xbt_dynar_is_empty(comms))
+ if (count == 0)
return -1;
- return simcall_BODY_comm_testany(comms);
+ return simcall_BODY_comm_testany(comms, count);
}
/**
*/
void simcall_set_category(smx_synchro_t synchro, const char *category)
{
- if (category == NULL) {
+ if (category == nullptr) {
return;
}
simcall_BODY_set_category(synchro, category);
return simcall_BODY_comm_test(comm);
}
-/**
- * \ingroup simix_comm_management
- *
- */
-double simcall_comm_get_remains(smx_synchro_t comm)
-{
- return simcall_BODY_comm_get_remains(comm);
-}
-
-/**
- * \ingroup simix_comm_management
- *
- */
-e_smx_state_t simcall_comm_get_state(smx_synchro_t comm)
-{
- return simcall_BODY_comm_get_state(comm);
-}
-
-/**
- * \ingroup simix_comm_management
- *
- */
-void *simcall_comm_get_src_data(smx_synchro_t comm)
-{
- return simcall_BODY_comm_get_src_data(comm);
-}
-
-/**
- * \ingroup simix_comm_management
- *
- */
-void *simcall_comm_get_dst_data(smx_synchro_t comm)
-{
- return simcall_BODY_comm_get_dst_data(comm);
-}
-
-/**
- * \ingroup simix_comm_management
- *
- */
-smx_process_t simcall_comm_get_src_proc(smx_synchro_t comm)
-{
- return simcall_BODY_comm_get_src_proc(comm);
-}
-
-/**
- * \ingroup simix_comm_management
- *
- */
-smx_process_t simcall_comm_get_dst_proc(smx_synchro_t comm)
-{
- 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
*
void simcall_run_kernel(std::function<void()> const& code)
{
- return simcall_BODY_run_kernel((void*) &code);
+ simcall_BODY_run_kernel(&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);
+void simcall_run_blocking(std::function<void()> const& code)
+{
+ simcall_BODY_run_blocking(&code);
}
-#endif /* HAVE_MC */
-
int simcall_mc_random(int min, int max) {
return simcall_BODY_mc_random(min, max);
}
const char *SIMIX_simcall_name(e_smx_simcall_t kind) {
return simcall_names[kind];
}
+
+namespace simgrid {
+namespace simix {
+
+void unblock(smx_process_t process)
+{
+ xbt_assert(SIMIX_is_maestro());
+ SIMIX_simcall_answer(&process->simcall);
+}
+
+}
+}
