#include "mc/mc.h"
#include "src/simix/smx_host_private.h"
#include "src/kernel/activity/SynchroComm.hpp"
+#include "src/surf/virtual_machine.hpp"
+
#include <simgrid/simix.hpp>
#include "popping_bodies.cpp"
-void simcall_call(smx_process_t process)
+void simcall_call(smx_actor_t process)
{
if (process != simix_global->maestro_process) {
XBT_DEBUG("Yield process '%s' on simcall %s (%d)", process->name.c_str(),
* \param flops_amount amount Computation amount (in flops)
* \param priority computation priority
* \param bound
- * \param affinity_mask
* \return A new SIMIX execution synchronization
*/
-smx_synchro_t simcall_execution_start(const char *name,
+smx_activity_t simcall_execution_start(const char *name,
double flops_amount,
- double priority, double bound, unsigned long affinity_mask)
+ double priority, double bound)
{
/* checking for infinite values */
xbt_assert(std::isfinite(flops_amount), "flops_amount is not finite!");
xbt_assert(std::isfinite(priority), "priority is not finite!");
- return simcall_BODY_execution_start(name, flops_amount, priority, bound, affinity_mask);
+ return simcall_BODY_execution_start(name, flops_amount, priority, bound);
}
/**
* \param rate the SURF action rate
* \return A new SIMIX execution synchronization
*/
-smx_synchro_t simcall_execution_parallel_start(const char *name,
+smx_activity_t simcall_execution_parallel_start(const char *name,
int host_nb,
sg_host_t *host_list,
double *flops_amount,
* This functions stops the execution. It calls a surf function.
* \param execution The execution synchro to cancel
*/
-void simcall_execution_cancel(smx_synchro_t execution)
+void simcall_execution_cancel(smx_activity_t execution)
{
simcall_BODY_execution_cancel(execution);
}
* \param execution The execution synchro
* \param priority The new priority
*/
-void simcall_execution_set_priority(smx_synchro_t execution, double priority)
+void simcall_execution_set_priority(smx_activity_t execution, double priority)
{
/* checking for infinite values */
xbt_assert(std::isfinite(priority), "priority is not finite!");
* \param execution The execution synchro
* \param bound The new bound
*/
-void simcall_execution_set_bound(smx_synchro_t execution, double bound)
+void simcall_execution_set_bound(smx_activity_t execution, double bound)
{
simcall_BODY_execution_set_bound(execution, bound);
}
-/**
- * \ingroup simix_process_management
- * \brief Changes the CPU affinity of an execution synchro.
- *
- * This functions changes the CPU affinity of an execution synchro. See taskset(1) on Linux.
- * \param execution The execution synchro
- * \param host Host
- * \param mask Affinity mask
- */
-void simcall_execution_set_affinity(smx_synchro_t execution, sg_host_t host, unsigned long mask)
-{
- simcall_BODY_execution_set_affinity(execution, host, mask);
-}
-
/**
* \ingroup simix_host_management
* \brief Waits for the completion of an execution synchro and destroy it.
*
* \param execution The execution synchro
*/
-e_smx_state_t simcall_execution_wait(smx_synchro_t execution)
+e_smx_state_t simcall_execution_wait(smx_activity_t 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)
+sg_host_t simcall_vm_create(const char *name, sg_host_t phys_host)
{
- return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_create, name, phys_host));
+ return simgrid::simix::kernelImmediate([&name, &phys_host] {
+ sg_host_t host = surf_vm_model->createVM(name, phys_host);
+ host->extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
+
+ return host;
+ });
}
/**
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::kernelImmediate(std::bind(SIMIX_vm_set_affinity, vm, pm, mask));
-}
-
/**
* \ingroup simix_vm_management
* \brief Migrate the given VM to the given physical host
* \ingroup simix_vm_management
* \brief Encompassing simcall to prevent the removal of the src or the dst node at the end of a VM migration
* The simcall actually invokes the following calls:
- * simcall_vm_set_affinity(vm, src_pm, 0);
* simcall_vm_migrate(vm, dst_pm);
* simcall_vm_resume(vm);
*
*
* \param process poor victim
*/
-void simcall_process_kill(smx_process_t process)
+void simcall_process_kill(smx_actor_t process)
{
simcall_BODY_process_kill(process);
}
* \brief Cleans up a SIMIX process.
* \param process poor victim (must have already been killed)
*/
-void simcall_process_cleanup(smx_process_t process)
+void simcall_process_cleanup(smx_actor_t process)
{
simcall_BODY_process_cleanup(process);
}
* \param process the process to migrate
* \param dest name of the new host
*/
-void simcall_process_set_host(smx_process_t process, sg_host_t dest)
+void simcall_process_set_host(smx_actor_t process, sg_host_t dest)
{
simcall_BODY_process_set_host(process, dest);
}
-void simcall_process_join(smx_process_t process, double timeout)
+void simcall_process_join(smx_actor_t process, double timeout)
{
simcall_BODY_process_join(process, timeout);
}
*
* \param process a SIMIX process
*/
-void simcall_process_suspend(smx_process_t process)
+void simcall_process_suspend(smx_actor_t process)
{
xbt_assert(process, "Invalid parameters");
*
* \param process a SIMIX process
*/
-void simcall_process_resume(smx_process_t process)
+void simcall_process_resume(smx_actor_t process)
{
simcall_BODY_process_resume(process);
}
*
* Maestro internal process is not counted, only user code processes are
*/
-int simcall_process_count(void)
+int simcall_process_count()
{
return simgrid::simix::kernelImmediate(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);
-}
-
-/**
- * \ingroup simix_process_management
- * \brief Return the user data of a #smx_process_t.
+ * \brief Return the user data of a #smx_actor_t.
* \param process a SIMIX process
* \return the user data of this process
*/
-void* simcall_process_get_data(smx_process_t process)
+void* simcall_process_get_data(smx_actor_t process)
{
return SIMIX_process_get_data(process);
}
/**
* \ingroup simix_process_management
- * \brief Set the user data of a #smx_process_t.
+ * \brief Set the user data of a #smx_actor_t.
*
* This functions sets the user data associated to \a process.
* \param process SIMIX process
* \param data User data
*/
-void simcall_process_set_data(smx_process_t process, void *data)
+void simcall_process_set_data(smx_actor_t process, void *data)
{
simgrid::simix::kernelImmediate(std::bind(SIMIX_process_set_data, process, data));
}
* \ingroup simix_process_management
* \brief Set the kill time of a process.
*/
-void simcall_process_set_kill_time(smx_process_t process, double kill_time)
+void simcall_process_set_kill_time(smx_actor_t process, double kill_time)
{
if (kill_time <= SIMIX_get_clock() || simix_global->kill_process_function == nullptr)
* \ingroup simix_process_management
* \brief Get the kill time of a process (or 0 if unset).
*/
-double simcall_process_get_kill_time(smx_process_t process) {
+double simcall_process_get_kill_time(smx_actor_t process) {
return SIMIX_timer_get_date(process->kill_timer);
}
* \param process SIMIX process
* \return 1, if the process is suspended, else 0.
*/
-int simcall_process_is_suspended(smx_process_t process)
+int simcall_process_is_suspended(smx_actor_t process)
{
return simcall_BODY_process_is_suspended(process);
}
*
* This functions returns the properties associated with this process
*/
-xbt_dict_t simcall_process_get_properties(smx_process_t process)
+xbt_dict_t simcall_process_get_properties(smx_actor_t process)
{
return SIMIX_process_get_properties(process);
}
* \brief Add an on_exit function
* Add an on_exit function which will be executed when the process exits/is killed.
*/
-XBT_PUBLIC(void) simcall_process_on_exit(smx_process_t process, int_f_pvoid_pvoid_t fun, void *data)
+XBT_PUBLIC(void) simcall_process_on_exit(smx_actor_t process, int_f_pvoid_pvoid_t fun, void *data)
{
simcall_BODY_process_on_exit(process, fun, data);
}
* Will restart the process when the host comes back up if auto_restart is set to 1.
*/
-XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_process_t process, int auto_restart)
+XBT_PUBLIC(void) simcall_process_auto_restart_set(smx_actor_t process, int auto_restart)
{
simcall_BODY_process_auto_restart_set(process, auto_restart);
}
* \ingroup simix_process_management
* \brief Restarts the process, killing it and starting it again from scratch.
*/
-XBT_PUBLIC(smx_process_t) simcall_process_restart(smx_process_t process)
+XBT_PUBLIC(smx_actor_t) simcall_process_restart(smx_actor_t process)
{
- return (smx_process_t) simcall_BODY_process_restart(process);
+ return (smx_actor_t) simcall_BODY_process_restart(process);
}
/**
* \ingroup simix_process_management
return simcall_BODY_mbox_create(name);
}
-void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t process)
+void simcall_mbox_set_receiver(smx_mailbox_t mbox, smx_actor_t process)
{
simcall_BODY_mbox_set_receiver(mbox, process);
}
/**
* \ingroup simix_comm_management
*/
-void simcall_comm_send(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate,
+void simcall_comm_send(smx_actor_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,
+ int (*match_fun)(void *, void *, smx_activity_t),
+ void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data,
double timeout)
{
/* checking for infinite values */
if (MC_is_active() || MC_record_replay_is_active()) {
/* the model-checker wants two separate simcalls */
- smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */
+ smx_activity_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);
/**
* \ingroup simix_comm_management
*/
-smx_synchro_t simcall_comm_isend(smx_process_t sender, smx_mailbox_t mbox, double task_size, double rate,
+smx_activity_t simcall_comm_isend(smx_actor_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),
+ int (*match_fun)(void *, void *, smx_activity_t),
void (*clean_fun)(void *),
- void (*copy_data_fun)(smx_synchro_t, void*, size_t),
+ void (*copy_data_fun)(smx_activity_t, void*, size_t),
void *data,
int detached)
{
/**
* \ingroup simix_comm_management
*/
-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 simcall_comm_recv(smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t * dst_buff_size,
+ int (*match_fun)(void *, void *, smx_activity_t),
+ void (*copy_data_fun)(smx_activity_t, void*, size_t),
void *data, double timeout, double rate)
{
xbt_assert(std::isfinite(timeout), "timeout is not finite!");
if (MC_is_active() || MC_record_replay_is_active()) {
/* the model-checker wants two separate simcalls */
- smx_synchro_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simcall */
+ smx_activity_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);
/**
* \ingroup simix_comm_management
*/
-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),
+smx_activity_t simcall_comm_irecv(smx_actor_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size,
+ int (*match_fun)(void *, void *, smx_activity_t),
+ void (*copy_data_fun)(smx_activity_t, void*, size_t),
void *data, double rate)
{
xbt_assert(mbox, "No rendez-vous point defined for irecv");
/**
* \ingroup simix_comm_management
*/
-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)
+smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int tag,
+ int (*match_fun)(void *, void *, smx_activity_t), void *data)
{
xbt_assert(mbox, "No rendez-vous point defined for iprobe");
/**
* \ingroup simix_comm_management
*/
-void simcall_comm_cancel(smx_synchro_t synchro)
+void simcall_comm_cancel(smx_activity_t synchro)
{
simgrid::simix::kernelImmediate([synchro]{
simgrid::kernel::activity::Comm *comm = static_cast<simgrid::kernel::activity::Comm*>(synchro);
/**
* \ingroup simix_comm_management
*/
-int simcall_comm_testany(smx_synchro_t* comms, size_t count)
+int simcall_comm_testany(smx_activity_t* comms, size_t count)
{
if (count == 0)
return -1;
/**
* \ingroup simix_comm_management
*/
-void simcall_comm_wait(smx_synchro_t comm, double timeout)
+void simcall_comm_wait(smx_activity_t comm, double timeout)
{
xbt_assert(std::isfinite(timeout), "timeout is not finite!");
simcall_BODY_comm_wait(comm, timeout);
* \param execution The execution synchro
* \param category The tracing category
*/
-void simcall_set_category(smx_synchro_t synchro, const char *category)
+void simcall_set_category(smx_activity_t synchro, const char *category)
{
if (category == nullptr) {
return;
* \ingroup simix_comm_management
*
*/
-int simcall_comm_test(smx_synchro_t comm)
+int simcall_comm_test(smx_activity_t comm)
{
return simcall_BODY_comm_test(comm);
}
* \ingroup simix_synchro_management
*
*/
-smx_mutex_t simcall_mutex_init(void)
+smx_mutex_t simcall_mutex_init()
{
if(!simix_global) {
fprintf(stderr,"You must run MSG_init before using MSG\n"); // We can't use xbt_die since we may get there before the initialization
* \ingroup simix_synchro_management
*
*/
-smx_cond_t simcall_cond_init(void)
+smx_cond_t simcall_cond_init()
{
return simcall_BODY_cond_init();
}
namespace simgrid {
namespace simix {
-void unblock(smx_process_t process)
+void unblock(smx_actor_t process)
{
xbt_assert(SIMIX_is_maestro());
SIMIX_simcall_answer(&process->simcall);
