#include <xbt/functional.hpp>
+#include <simgrid/s4u/VirtualMachine.hpp>
#include <simgrid/simix/blocking_simcall.hpp>
-#include "src/mc/mc_replay.h"
+#include "mc/mc.h"
#include "smx_private.h"
+#include "src/kernel/activity/SynchroComm.hpp"
#include "src/mc/mc_forward.hpp"
-#include "xbt/ex.h"
-#include "mc/mc.h"
+#include "src/mc/mc_replay.h"
+#include "src/plugins/vm/VirtualMachineImpl.hpp"
#include "src/simix/smx_host_private.h"
-#include "src/kernel/activity/SynchroComm.hpp"
+#include "xbt/ex.h"
#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(),
* amount between each pair of hosts
* \param amount the SURF action amount
* \param rate the SURF action rate
+ * \param timeout timeout
* \return A new SIMIX execution synchronization
*/
-smx_activity_t simcall_execution_parallel_start(const char *name,
- int host_nb,
- sg_host_t *host_list,
- double *flops_amount,
- double *bytes_amount,
- double amount,
- double rate)
+smx_activity_t simcall_execution_parallel_start(const char* name, int host_nb, sg_host_t* host_list,
+ double* flops_amount, double* bytes_amount, double amount, double rate,
+ double timeout)
{
int i,j;
/* checking for infinite values */
xbt_assert(std::isfinite(amount), "amount is not finite!");
xbt_assert(std::isfinite(rate), "rate is not finite!");
- return simcall_BODY_execution_parallel_start(name, host_nb, host_list,
- flops_amount,
- bytes_amount,
- amount, rate);
-
+ return simcall_BODY_execution_parallel_start(name, host_nb, host_list, flops_amount, bytes_amount, amount, rate,
+ timeout);
}
/**
return (e_smx_state_t) simcall_BODY_execution_wait(execution);
}
-
/**
* \ingroup simix_vm_management
* \brief Create a VM on the given physical host.
*
* \param name VM name
- * \param host Physical host
+ * \param dest Physical host on which to create the VM
*
* \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 dest)
{
- return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_create, name, phys_host));
+ return simgrid::simix::kernelImmediate([&name, &dest] {
+ sg_host_t host = new simgrid::s4u::VirtualMachine(name, dest);
+ host->extension_set<simgrid::simix::Host>(new simgrid::simix::Host());
+
+ return host;
+ });
}
/**
/**
* \ingroup simix_vm_management
- * \brief Get the name of the physical host on which the given VM runs.
+ * \brief Get the physical host on which the given VM runs.
*
* \param vm VM
- * \return The name of the physical host
+ * \return The physical host
*/
void *simcall_vm_get_pm(sg_host_t vm)
{
- return simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_get_pm, vm));
+ return simgrid::simix::kernelImmediate(
+ [vm]() { return static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->getPm(); });
}
+/**
+ * @brief Function to set the CPU bound of the given SIMIX VM host.
+ *
+ * @param host the vm host (a sg_host_t)
+ * @param bound bound (a double)
+ */
void simcall_vm_set_bound(sg_host_t vm, double bound)
{
- simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_set_bound, vm, bound));
+ simgrid::simix::kernelImmediate(
+ [vm, bound]() { static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->setBound(bound); });
}
/**
*/
void simcall_vm_restore(sg_host_t vm)
{
- simcall_BODY_vm_restore(vm);
+ simgrid::simix::kernelImmediate([vm]() {
+ if (SIMIX_vm_get_state(vm) != SURF_VM_STATE_SAVED)
+ THROWF(vm_error, 0, "VM(%s) was not saved", vm->name().c_str());
+
+ XBT_DEBUG("restore VM(%s), where %d processes exist", vm->name().c_str(),
+ xbt_swag_size(sg_host_simix(vm)->process_list));
+
+ /* jump to vm_ws_restore() */
+ static_cast<simgrid::s4u::VirtualMachine*>(vm)->pimpl_vm_->restore();
+
+ smx_actor_t smx_process, smx_process_safe;
+ xbt_swag_foreach_safe(smx_process, smx_process_safe, sg_host_simix(vm)->process_list)
+ {
+ XBT_DEBUG("resume %s", smx_process->name.c_str());
+ SIMIX_process_resume(smx_process);
+ }
+ });
}
/**
*/
void simcall_vm_destroy(sg_host_t vm)
{
- simgrid::simix::kernelImmediate(std::bind(SIMIX_vm_destroy, vm));
-}
+ simgrid::simix::kernelImmediate([vm]() {
+ /* this code basically performs a similar thing like SIMIX_host_destroy() */
+ XBT_DEBUG("destroy %s", vm->name().c_str());
-/**
- * \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_migrate(vm, dst_pm);
- * simcall_vm_resume(vm);
- *
- * It is called at the end of the migration_rx_fun function from msg/msg_vm.c
- *
- * \param vm VM to migrate
- * \param src_pm Source physical host
- * \param dst_pmt Destination physical host
- */
-void simcall_vm_migratefrom_resumeto(sg_host_t vm, sg_host_t src_pm, sg_host_t dst_pm)
-{
- simgrid::simix::kernelImmediate(std::bind(
- SIMIX_vm_migratefrom_resumeto, vm, src_pm, dst_pm));
+ /* FIXME: this is really strange that everything fails if the next line is removed.
+ * This is as if we shared these data with the PM, which definitely should not be the case...
+ *
+ * We need to test that suspending a VM does not suspends the processes running on its PM, for example.
+ * Or we need to simplify this code enough to make it actually readable (but this sounds harder than testing)
+ */
+ vm->extension_set<simgrid::simix::Host>(nullptr);
+
+ /* Don't free these things twice: they are the ones of my physical host */
+ vm->pimpl_cpu = nullptr;
+ vm->pimpl_netcard = nullptr;
+
+ vm->destroy();
+ });
}
/**
*
* \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");
-
simcall_BODY_process_suspend(process);
}
*
* \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);
}
/**
* \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_activity_t),
void (*copy_data_fun)(smx_activity_t, void*, size_t), void *data,
/**
* \ingroup simix_comm_management
*/
-smx_activity_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_activity_t),
void (*clean_fun)(void *),
/**
* \ingroup simix_comm_management
*/
-void simcall_comm_recv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t * dst_buff_size,
+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)
/**
* \ingroup simix_comm_management
*/
-smx_activity_t simcall_comm_irecv(smx_process_t receiver, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size,
+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)
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);