* 2. use parallel tasks to simulate CPU overhead and remove the experimental code generating micro computation tasks
*/
+#include <xbt/ex.hpp>
+
+#include <simgrid/s4u/host.hpp>
+
#include "msg_private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
*
* \param vm a vm
* \param name a property name
- * \return value of a property (or NULL if property not set)
+ * \return value of a property (or nullptr if property not set)
*/
const char *MSG_vm_get_property_value(msg_vm_t vm, const char *name)
{
*/
xbt_dict_t MSG_vm_get_properties(msg_vm_t vm)
{
- xbt_assert((vm != NULL), "Invalid parameters (vm is NULL)");
+ xbt_assert((vm != nullptr), "Invalid parameters (vm is nullptr)");
return vm->properties();
}
{
/* make sure the VM of the same name does not exit */
{
- simgrid::s4u::Host* ind_host_tmp = (simgrid::s4u::Host*) xbt_dict_get_or_null(host_list, name);
+ simgrid::s4u::Host* ind_host_tmp = sg_host_by_name(name);
if (ind_host_tmp != nullptr && sg_host_simix(ind_host_tmp) != nullptr) {
XBT_ERROR("host %s already exits", name);
return nullptr;
/* Note: ind_vm and vm_workstation point to the same elm object. */
/* Ask the SIMIX layer to create the surf vm resource */
- sg_host_t ind_vm_workstation = (sg_host_t) simcall_vm_create(name, ind_pm);
+ sg_host_t ind_vm_workstation = simcall_vm_create(name, ind_pm);
msg_vm_t ind_vm = (msg_vm_t) __MSG_host_create(ind_vm_workstation);
int ret = 0;
for (;;) {
- msg_task_t task = NULL;
+ msg_task_t task = nullptr;
ret = MSG_task_recv(&task, ms->mbox);
{
if (ret != MSG_OK) {
msg_vm_t vm = ms->vm;
msg_host_t src_pm = ms->src_pm;
msg_host_t dst_pm = ms-> dst_pm;
- msg_host_priv_t priv = sg_host_msg(vm);
// TODO: we have an issue, if the DST node is turning off during the three next calls, then the VM is in an inconsistent
// state. I should check with Takahiro in order to make this portion of code atomic
-// /* deinstall the current affinity setting for the CPU */
-// simcall_vm_set_affinity(vm, src_pm, 0);
//
// /* Update the vm location */
// simcall_vm_migrate(vm, dst_pm);
//
simcall_vm_migratefrom_resumeto(vm, src_pm, dst_pm);
- /* install the affinity setting of the VM on the destination pm */
- {
-
- unsigned long affinity_mask =
- (unsigned long)(uintptr_t) xbt_dict_get_or_null_ext(priv->affinity_mask_db, (char *)dst_pm, sizeof(msg_host_t));
- simcall_vm_set_affinity(vm, dst_pm, affinity_mask);
- XBT_DEBUG("set affinity(0x%04lx@%s) for %s", affinity_mask, MSG_host_get_name(dst_pm), MSG_host_get_name(vm));
- }
-
{
// Now the VM is running on the new host (the migration is completed) (even if the SRC crash)
msg_host_priv_t priv = sg_host_msg(vm);
// Inform the SRC that the migration has been correctly performed
{
char *task_name = get_mig_task_name(ms->vm, ms->src_pm, ms->dst_pm, 4);
- msg_task_t task = MSG_task_create(task_name, 0, 0, NULL);
+ msg_task_t task = MSG_task_create(task_name, 0, 0, nullptr);
msg_error_t ret = MSG_task_send(task, ms->mbox_ctl);
// xbt_assert(ret == MSG_OK);
if(ret == MSG_HOST_FAILURE){
{
msg_host_priv_t priv = sg_host_msg(vm);
- char *key = NULL;
- xbt_dict_cursor_t cursor = NULL;
- dirty_page_t dp = NULL;
+ char *key = nullptr;
+ xbt_dict_cursor_t cursor = nullptr;
+ dirty_page_t dp = nullptr;
xbt_dict_foreach(priv->dp_objs, cursor, key, dp) {
double remaining = MSG_task_get_flops_amount(dp->task);
dp->prev_clock = MSG_get_clock();
msg_host_priv_t priv = sg_host_msg(vm);
double total = 0;
- char *key = NULL;
- xbt_dict_cursor_t cursor = NULL;
- dirty_page_t dp = NULL;
+ char *key = nullptr;
+ xbt_dict_cursor_t cursor = nullptr;
+ dirty_page_t dp = nullptr;
xbt_dict_foreach(priv->dp_objs, cursor, key, dp) {
double remaining = MSG_task_get_flops_amount(dp->task);
dp->prev_remaining = remaining;
}
- xbt_assert(xbt_dict_get_or_null(priv->dp_objs, key) == NULL);
- xbt_dict_set(priv->dp_objs, key, dp, NULL);
+ xbt_assert(xbt_dict_get_or_null(priv->dp_objs, key) == nullptr);
+ xbt_dict_set(priv->dp_objs, key, dp, nullptr);
XBT_DEBUG("add %s on %s (remaining %f, dp_enabled %d)", key, sg_host_get_name(host), remaining, priv->dp_enabled);
xbt_free(key);
{
sg_size_t sent = 0;
char *task_name = get_mig_task_name(vm, src_pm, dst_pm, stage);
- msg_task_t task = MSG_task_create(task_name, 0, (double)size, NULL);
+ msg_task_t task = MSG_task_create(task_name, 0, (double)size, nullptr);
/* TODO: clean up */
if (ramsize == 0)
XBT_WARN("migrate a VM, but ramsize is zero");
- if (max_downtime == 0) {
+ if (max_downtime <= 0) {
XBT_WARN("use the default max_downtime value 30ms");
max_downtime = 0.03;
}
if (!skip_stage1) {
double clock_prev_send = MSG_get_clock();
- TRY {
+ try {
/* At stage 1, we do not need timeout. We have to send all the memory pages even though the duration of this
* transfer exceeds the timeout value. */
XBT_VERB("Stage 1: Gonna send %llu", ramsize);
} else if (sent > ramsize)
XBT_CRITICAL("bug");
- } CATCH_ANONYMOUS {
+ }
+ catch (xbt_ex& e) {
//hostfailure (if you want to know whether this is the SRC or the DST check directly in send_migration_data code)
// Stop the dirty page tracking an return (there is no memory space to release)
stop_dirty_page_tracking(ms->vm);
sg_size_t sent = 0;
double clock_prev_send = MSG_get_clock();
- TRY {
+ try {
XBT_DEBUG("Stage 2, gonna send %llu", updated_size);
sent = send_migration_data(ms->vm, ms->src_pm, ms->dst_pm, updated_size, ms->mbox, 2, stage2_round, mig_speed,
mig_timeout);
- } CATCH_ANONYMOUS {
+ }
+ catch (xbt_ex& e) {
//hostfailure (if you want to know whether this is the SRC or the DST check directly in send_migration_data code)
// Stop the dirty page tracking an return (there is no memory space to release)
stop_dirty_page_tracking(ms->vm);
simcall_vm_suspend(ms->vm);
stop_dirty_page_tracking(ms->vm);
- TRY {
+ try {
XBT_DEBUG("Stage 3: Gonna send %f", remaining_size);
send_migration_data(ms->vm, ms->src_pm, ms->dst_pm, (sg_size_t)remaining_size, ms->mbox, 3, 0, mig_speed, -1);
- } CATCH_ANONYMOUS {
+ }
+ catch(xbt_ex& e) {
//hostfailure (if you want to know whether this is the SRC or the DST check directly in send_migration_data code)
// Stop the dirty page tracking an return (there is no memory space to release)
simcall_vm_resume(ms->vm);
{
char **argv = xbt_new(char *, 2);
argv[0] = pr_rx_name;
- argv[1] = NULL;
+ argv[1] = nullptr;
/*rx_process = */ MSG_process_create_with_arguments(pr_rx_name, migration_rx_fun, ms, dst_pm, 1, argv);
}
{
char **argv = xbt_new(char *, 2);
argv[0] = pr_tx_name;
- argv[1] = NULL;
+ argv[1] = nullptr;
/* tx_process = */MSG_process_create_with_arguments(pr_tx_name, migration_tx_fun, ms, src_pm, 1, argv);
}
#endif
/* wait until the migration have finished or on error has occurred */
{
XBT_DEBUG("wait for reception of the final ACK (i.e. migration has been correctly performed");
- msg_task_t task = NULL;
+ msg_task_t task = nullptr;
msg_error_t ret = MSG_TIMEOUT;
while (ret == MSG_TIMEOUT && MSG_host_is_on(dst_pm)) //Wait while you receive the message o
ret = MSG_task_receive_with_timeout(&task, ms->mbox_ctl, 4);
{
simcall_vm_set_bound(vm, bound);
}
-
-/** @brief Set the CPU affinity of a given VM.
- * @ingroup msg_VMs
- *
- * This function changes the CPU affinity of a given VM. Usage is the same as
- * MSG_task_set_affinity(). See the MSG_task_set_affinity() for details.
- */
-void MSG_vm_set_affinity(msg_vm_t vm, msg_host_t pm, unsigned long mask)
-{
- msg_host_priv_t priv = sg_host_msg(vm);
-
- if (mask == 0)
- xbt_dict_remove_ext(priv->affinity_mask_db, (char *) pm, sizeof(pm));
- else
- xbt_dict_set_ext(priv->affinity_mask_db, (char *) pm, sizeof(pm), (void *)(uintptr_t) mask, NULL);
-
- msg_host_t pm_now = MSG_vm_get_pm(vm);
- if (pm_now == pm) {
- XBT_DEBUG("set affinity(0x%04lx@%s) for %s", mask, MSG_host_get_name(pm), MSG_host_get_name(vm));
- simcall_vm_set_affinity(vm, pm, mask);
- } else
- XBT_DEBUG("set affinity(0x%04lx@%s) for %s (not active now)", mask, MSG_host_get_name(pm), MSG_host_get_name(vm));
-}
