X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2eccd8b07aad6831e902b9749f8f5c23163b249..2d882c1ac3c6eb891f8eb26a84ec2d6890a67730:/src/msg/msg_vm.c diff --git a/src/msg/msg_vm.c b/src/msg/msg_vm.c index 9ec992333e..a814aa7a58 100644 --- a/src/msg/msg_vm.c +++ b/src/msg/msg_vm.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2012. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2012-2013. The SimGrid Team. + * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -20,6 +21,7 @@ #include "msg_private.h" #include "xbt/sysdep.h" #include "xbt/log.h" +#include "simgrid/platf.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg, "Cloud-oriented parts of the MSG API"); @@ -166,24 +168,33 @@ int MSG_vm_is_restoring(msg_vm_t vm) /** @brief Create a new VM with specified parameters. * @ingroup msg_VMs* + * All parameters are in MBytes * */ -msg_vm_t MSG_vm_create(msg_host_t ind_pm, const char *name, - int ncpus, int ramsize, int net_cap, char *disk_path, int disksize) +msg_vm_t MSG_vm_create(msg_host_t ind_pm, const char *name, int ncpus, int ramsize, + int net_cap, char *disk_path, int disksize, + int mig_netspeed, int dp_intensity) { - msg_vm_t vm = MSG_vm_create_core(ind_pm, name); - - { - s_ws_params_t params; - memset(¶ms, 0, sizeof(params)); - params.ramsize = ramsize; - //params.overcommit = 0; - simcall_host_set_params(vm, ¶ms); - } - - /* TODO: Limit net capability, take into account disk considerations. */ - - return vm; + /* For the moment, intensity_rate is the percentage against the migration bandwidth */ + double host_speed = MSG_get_host_speed(ind_pm); + double update_speed = ((double)dp_intensity/100) * mig_netspeed; + + msg_vm_t vm = MSG_vm_create_core(ind_pm, name); + s_ws_params_t params; + memset(¶ms, 0, sizeof(params)); + params.ramsize = 1L * 1024 * 1024 * ramsize; + //params.overcommit = 0; + params.devsize = 0; + params.skip_stage2 = 0; + params.max_downtime = 0.03; + params.dp_rate = (update_speed * 1L * 1024 * 1024 ) / host_speed; + params.dp_cap = params.ramsize / 0.9; // working set memory is 90% + params.mig_speed = 1L * 1024 * 1024 * mig_netspeed; // mig_speed + + //XBT_INFO("dp rate %f migspeed : %f intensity mem : %d, updatespeed %f, hostspeed %f",params.dp_rate, params.mig_speed, dp_intensity, update_speed, host_speed); + simcall_host_set_params(vm, ¶ms); + + return vm; } @@ -308,11 +319,10 @@ static inline char *get_mig_task_name(const char *vm_name, const char *src_pm_na return bprintf("__task_mig_stage%d:%s(%s-%s)", stage, vm_name, src_pm_name, dst_pm_name); } +static void launch_deferred_exec_process(msg_host_t host, double computation, double prio); + static int migration_rx_fun(int argc, char *argv[]) { - const char *pr_name = MSG_process_get_name(MSG_process_self()); - const char *host_name = MSG_host_get_name(MSG_host_self()); - XBT_DEBUG("mig: rx_start"); xbt_assert(argc == 4); @@ -320,7 +330,14 @@ static int migration_rx_fun(int argc, char *argv[]) const char *src_pm_name = argv[2]; const char *dst_pm_name = argv[3]; msg_vm_t vm = MSG_get_host_by_name(vm_name); - msg_vm_t dst_pm = MSG_get_host_by_name(dst_pm_name); + msg_host_t src_pm = MSG_get_host_by_name(src_pm_name); + msg_host_t dst_pm = MSG_get_host_by_name(dst_pm_name); + + + s_ws_params_t params; + simcall_host_get_params(vm, ¶ms); + const double xfer_cpu_overhead = params.xfer_cpu_overhead; + int need_exit = 0; @@ -331,6 +348,12 @@ static int migration_rx_fun(int argc, char *argv[]) for (;;) { msg_task_t task = NULL; MSG_task_recv(&task, mbox); + { + double received = MSG_task_get_data_size(task); + /* TODO: clean up */ + // const double alpha = 0.22L * 1.0E8 / (80L * 1024 * 1024); + launch_deferred_exec_process(vm, received * xfer_cpu_overhead, 1); + } if (strcmp(task->name, finalize_task_name) == 0) need_exit = 1; @@ -342,9 +365,21 @@ static int migration_rx_fun(int argc, char *argv[]) } + /* deinstall the current affinity setting */ + simcall_vm_set_affinity(vm, src_pm, 0); + simcall_vm_migrate(vm, dst_pm); simcall_vm_resume(vm); + /* install the affinity setting of the VM on the destination pm */ + { + msg_host_priv_t priv = msg_host_resource_priv(vm); + + unsigned long affinity_mask = (unsigned long) 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_INFO("set affinity(0x%04lx@%s) for %s", affinity_mask, MSG_host_get_name(dst_pm), MSG_host_get_name(vm)); + } + { char *task_name = get_mig_task_name(vm_name, src_pm_name, dst_pm_name, 4); @@ -365,14 +400,6 @@ static int migration_rx_fun(int argc, char *argv[]) return 0; } - -typedef struct dirty_page { - double prev_clock; - double prev_remaining; - msg_task_t task; -} s_dirty_page, *dirty_page_t; - - static void reset_dirty_pages(msg_vm_t vm) { msg_host_priv_t priv = msg_host_resource_priv(vm); @@ -422,7 +449,7 @@ double calc_updated_pages(char *key, msg_vm_t vm, dirty_page_t dp, double remain } #endif -double get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remaining, double clock) +static double get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remaining, double clock) { double computed = dp->prev_remaining - remaining; double duration = clock - dp->prev_clock; @@ -433,7 +460,7 @@ double get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remaining, d return computed; } -static double lookup_computed_flop_counts(msg_vm_t vm, int stage2_round_for_fancy_debug) +static double lookup_computed_flop_counts(msg_vm_t vm, int stage_for_fancy_debug, int stage2_round_for_fancy_debug) { msg_host_priv_t priv = msg_host_resource_priv(vm); double total = 0; @@ -443,7 +470,8 @@ static double lookup_computed_flop_counts(msg_vm_t vm, int stage2_round_for_fanc dirty_page_t dp = NULL; xbt_dict_foreach(priv->dp_objs, cursor, key, dp) { double remaining = MSG_task_get_remaining_computation(dp->task); - double clock = MSG_get_clock(); + + double clock = MSG_get_clock(); // total += calc_updated_pages(key, vm, dp, remaining, clock); total += get_computed(key, vm, dp, remaining, clock); @@ -454,7 +482,8 @@ static double lookup_computed_flop_counts(msg_vm_t vm, int stage2_round_for_fanc total += priv->dp_updated_by_deleted_tasks; - XBT_INFO("mig-stage2.%d: computed %f flop_counts (including %f by deleted tasks)", + XBT_DEBUG("mig-stage%d.%d: computed %f flop_counts (including %f by deleted tasks)", + stage_for_fancy_debug, stage2_round_for_fancy_debug, total, priv->dp_updated_by_deleted_tasks); @@ -520,28 +549,375 @@ void MSG_host_del_task(msg_host_t host, msg_task_t task) } +static int deferred_exec_fun(int argc, char *argv[]) +{ + xbt_assert(argc == 3); + const char *comp_str = argv[1]; + double computaion = atof(comp_str); + const char *prio_str = argv[2]; + double prio = atof(prio_str); + + msg_task_t task = MSG_task_create("__task_deferred", computaion, 0, NULL); + // XBT_INFO("exec deferred %f", computaion); + + /* dpt is the results of the VM activity */ + MSG_task_set_priority(task, prio); + MSG_task_execute(task); + + + + MSG_task_destroy(task); + + return 0; +} + +static void launch_deferred_exec_process(msg_host_t host, double computation, double prio) +{ + char *pr_name = bprintf("__pr_deferred_exec_%s", MSG_host_get_name(host)); + + int nargvs = 4; + char **argv = xbt_new(char *, nargvs); + argv[0] = xbt_strdup(pr_name); + argv[1] = bprintf("%lf", computation); + argv[2] = bprintf("%lf", prio); + argv[3] = NULL; + + MSG_process_create_with_arguments(pr_name, deferred_exec_fun, NULL, host, nargvs - 1, argv); + + xbt_free(pr_name); +} + + +static int task_tx_overhead_fun(int argc, char *argv[]) +{ + xbt_assert(argc == 2); + const char *mbox = argv[1]; + + int need_exit = 0; + + // XBT_INFO("start %s", mbox); + + for (;;) { + msg_task_t task = NULL; + MSG_task_recv(&task, mbox); + + // XBT_INFO("task->name %s", task->name); + + if (strcmp(task->name, "finalize_making_overhead") == 0) + need_exit = 1; + + // XBT_INFO("exec"); + // MSG_task_set_priority(task, 1000000); + MSG_task_execute(task); + MSG_task_destroy(task); + + if (need_exit) + break; + } + + // XBT_INFO("bye"); + + return 0; +} + +static void start_overhead_process(msg_task_t comm_task) +{ + char *pr_name = bprintf("__pr_task_tx_overhead_%s", MSG_task_get_name(comm_task)); + char *mbox = bprintf("__mb_task_tx_overhead_%s", MSG_task_get_name(comm_task)); + + int nargvs = 3; + char **argv = xbt_new(char *, nargvs); + argv[0] = xbt_strdup(pr_name); + argv[1] = xbt_strdup(mbox); + argv[2] = NULL; + + // XBT_INFO("micro start: mbox %s", mbox); + MSG_process_create_with_arguments(pr_name, task_tx_overhead_fun, NULL, MSG_host_self(), nargvs - 1, argv); + + xbt_free(pr_name); + xbt_free(mbox); +} + +static void shutdown_overhead_process(msg_task_t comm_task) +{ + char *mbox = bprintf("__mb_task_tx_overhead_%s", MSG_task_get_name(comm_task)); + + msg_task_t task = MSG_task_create("finalize_making_overhead", 0, 0, NULL); + + // XBT_INFO("micro shutdown: mbox %s", mbox); + msg_error_t ret = MSG_task_send(task, mbox); + xbt_assert(ret == MSG_OK); + + xbt_free(mbox); + // XBT_INFO("shutdown done"); +} + +static void request_overhead(msg_task_t comm_task, double computation) +{ + char *mbox = bprintf("__mb_task_tx_overhead_%s", MSG_task_get_name(comm_task)); + + msg_task_t task = MSG_task_create("micro", computation, 0, NULL); + + // XBT_INFO("req overhead"); + msg_error_t ret = MSG_task_send(task, mbox); + xbt_assert(ret == MSG_OK); + + xbt_free(mbox); +} + +/* alpha is (floating_operations / bytes). + * + * When actual migration traffic was 32 mbytes/s, we observed the CPU + * utilization of the main thread of the Qemu process was 10 %. + * alpha = 0.1 * C / (32 * 1024 * 1024) + * where the CPU capacity of the PM is C flops/s. + * + * */ +static void task_send_bounded_with_cpu_overhead(msg_task_t comm_task, char *mbox, double mig_speed, double alpha) +{ + const double chunk_size = 1024 * 1024 * 10; + double remaining = MSG_task_get_data_size(comm_task); + + start_overhead_process(comm_task); + + + while (remaining > 0) { + double data_size = chunk_size; + if (remaining < chunk_size) + data_size = remaining; + + remaining -= data_size; + + // XBT_INFO("remaining %f bytes", remaining); + + + double clock_sta = MSG_get_clock(); + + /* create a micro task */ + { + char *mtask_name = bprintf("__micro_%s", MSG_task_get_name(comm_task)); + msg_task_t mtask = MSG_task_create(mtask_name, 0, data_size, NULL); + + request_overhead(comm_task, data_size * alpha); + + msg_error_t ret = MSG_task_send(mtask, mbox); + xbt_assert(ret == MSG_OK); + + xbt_free(mtask_name); + } + +#if 0 + { + /* In the real world, sending data involves small CPU computation. */ + char *mtask_name = bprintf("__micro_%s", MSG_task_get_name(comm_task)); + msg_task_t mtask = MSG_task_create(mtask_name, data_size * alpha, data_size, NULL); + MSG_task_execute(mtask); + MSG_task_destroy(mtask); + xbt_free(mtask_name); + } +#endif + + /* TODO */ + + double clock_end = MSG_get_clock(); + + + if (mig_speed > 0) { + /* + * (max bandwidth) > data_size / ((elapsed time) + time_to_sleep) + * + * Thus, we get + * time_to_sleep > data_size / (max bandwidth) - (elapsed time) + * + * If time_to_sleep is smaller than zero, the elapsed time was too big. We + * do not need a micro sleep. + **/ + double time_to_sleep = data_size / mig_speed - (clock_end - clock_sta); + if (time_to_sleep > 0) + MSG_process_sleep(time_to_sleep); + + + //XBT_INFO("duration %f", clock_end - clock_sta); + //XBT_INFO("time_to_sleep %f", time_to_sleep); + } + } + + // XBT_INFO("%s", MSG_task_get_name(comm_task)); + shutdown_overhead_process(comm_task); + +} + + +#if 0 +static void make_cpu_overhead_of_data_transfer(msg_task_t comm_task, double init_comm_size) +{ + double prev_remaining = init_comm_size; + + for (;;) { + double remaining = MSG_task_get_remaining_communication(comm_task); + if (remaining == 0) + need_exit = 1; + + double sent = prev_remaining - remaining; + double comp_size = sent * overhead; + + + char *comp_task_name = bprintf("__sender_overhead%s", MSG_task_get_name(comm_task)); + msg_task_t comp_task = MSG_task_create(comp_task_name, comp_size, 0, NULL); + MSG_task_execute(comp_task); + MSG_task_destroy(comp_task); + + if (need_exit) + break; + + prev_remaining = remaining; + + } + + xbt_free(comp_task_name); +} +#endif + +// #define USE_MICRO_TASK 1 + +#if 0 +// const double alpha = 0.1L * 1.0E8 / (32L * 1024 * 1024); +// const double alpha = 0.25L * 1.0E8 / (85L * 1024 * 1024); +// const double alpha = 0.20L * 1.0E8 / (85L * 1024 * 1024); +// const double alpha = 0.25L * 1.0E8 / (85L * 1024 * 1024); +// const double alpha = 0.32L * 1.0E8 / (24L * 1024 * 1024); // makes super good values for 32 mbytes/s +//const double alpha = 0.32L * 1.0E8 / (32L * 1024 * 1024); +// const double alpha = 0.56L * 1.0E8 / (80L * 1024 * 1024); +////const double alpha = 0.20L * 1.0E8 / (80L * 1024 * 1024); +// const double alpha = 0.56L * 1.0E8 / (90L * 1024 * 1024); +// const double alpha = 0.66L * 1.0E8 / (90L * 1024 * 1024); +// const double alpha = 0.20L * 1.0E8 / (80L * 1024 * 1024); + +/* CPU 22% when 80Mbyte/s */ +const double alpha = 0.22L * 1.0E8 / (80L * 1024 * 1024); +#endif + + static void send_migration_data(const char *vm_name, const char *src_pm_name, const char *dst_pm_name, - double size, char *mbox, int stage, int stage2_round) + sg_size_t size, char *mbox, int stage, int stage2_round, double mig_speed, double xfer_cpu_overhead) { char *task_name = get_mig_task_name(vm_name, src_pm_name, dst_pm_name, stage); msg_task_t task = MSG_task_create(task_name, 0, size, NULL); - msg_error_t ret = MSG_task_send(task, mbox); - xbt_assert(ret == MSG_OK); - if (stage == 2) - XBT_INFO("mig-stage%d.%d: sent %f", stage, stage2_round, size); + /* TODO: clean up */ + + double clock_sta = MSG_get_clock(); + +#ifdef USE_MICRO_TASK + + task_send_bounded_with_cpu_overhead(task, mbox, mig_speed, xfer_cpu_overhead); + +#else + msg_error_t ret; + if (mig_speed > 0) + ret = MSG_task_send_bounded(task, mbox, mig_speed); else - XBT_INFO("mig-stage%d: sent %f", stage, size); + ret = MSG_task_send(task, mbox); + xbt_assert(ret == MSG_OK); +#endif + + double clock_end = MSG_get_clock(); + double duration = clock_end - clock_sta; + double actual_speed = size / duration; +#ifdef USE_MICRO_TASK + double cpu_utilization = size * xfer_cpu_overhead / duration / 1.0E8; +#else + double cpu_utilization = 0; +#endif + + + + + if (stage == 2){ + XBT_DEBUG("mig-stage%d.%d: sent %" PRIu64 " duration %f actual_speed %f (target %f) cpu %f", stage, stage2_round, size, duration, actual_speed, mig_speed, cpu_utilization);} + else{ + XBT_DEBUG("mig-stage%d: sent %" PRIu64 " duration %f actual_speed %f (target %f) cpu %f", stage, size, duration, actual_speed, mig_speed, cpu_utilization); + } xbt_free(task_name); + + + +#ifdef USE_MICRO_TASK + /* The name of a micro task starts with __micro, which does not match the + * special name that finalizes the receiver loop. Thus, we send the special task. + **/ + { + if (stage == 3) { + char *task_name = get_mig_task_name(vm_name, src_pm_name, dst_pm_name, stage); + msg_task_t task = MSG_task_create(task_name, 0, 0, NULL); + msg_error_t ret = MSG_task_send(task, mbox); + xbt_assert(ret == MSG_OK); + xbt_free(task_name); + } + } +#endif } +static double get_updated_size(double computed, double dp_rate, double dp_cap) +{ + double updated_size = computed * dp_rate; + XBT_DEBUG("updated_size %f dp_rate %f", updated_size, dp_rate); + if (updated_size > dp_cap) { + // XBT_INFO("mig-stage2.%d: %f bytes updated, but cap it with the working set size %f", stage2_round, updated_size, dp_cap); + updated_size = dp_cap; + } -static int migration_tx_fun(int argc, char *argv[]) + return updated_size; +} + +static double send_stage1(msg_host_t vm, const char *src_pm_name, const char *dst_pm_name, + sg_size_t ramsize, double mig_speed, double xfer_cpu_overhead, double dp_rate, double dp_cap, double dpt_cpu_overhead) { - const char *pr_name = MSG_process_get_name(MSG_process_self()); - const char *host_name = MSG_host_get_name(MSG_host_self()); + const char *vm_name = MSG_host_get_name(vm); + char *mbox = get_mig_mbox_src_dst(vm_name, src_pm_name, dst_pm_name); + + // const long chunksize = 1024 * 1024 * 100; + const sg_size_t chunksize = 1024L * 1024 * 100000; + sg_size_t remaining = ramsize; + double computed_total = 0; + + while (remaining > 0) { + sg_size_t datasize = chunksize; + if (remaining < chunksize) + datasize = remaining; + remaining -= datasize; + + send_migration_data(vm_name, src_pm_name, dst_pm_name, datasize, mbox, 1, 0, mig_speed, xfer_cpu_overhead); + + double computed = lookup_computed_flop_counts(vm, 1, 0); + computed_total += computed; + + // { + // double updated_size = get_updated_size(computed, dp_rate, dp_cap); + + // double overhead = dpt_cpu_overhead * updated_size; + // launch_deferred_exec_process(vm, overhead, 10000); + // } + } + + return computed_total; +} + + + +static double get_threshold_value(double bandwidth, double max_downtime) +{ + /* This value assumes the network link is 1Gbps. */ + // double threshold = max_downtime * 125 * 1024 * 1024; + double threshold = max_downtime * bandwidth; + + return threshold; +} + +static int migration_tx_fun(int argc, char *argv[]) +{ XBT_DEBUG("mig: tx_start"); xbt_assert(argc == 4); @@ -553,14 +929,27 @@ static int migration_tx_fun(int argc, char *argv[]) s_ws_params_t params; simcall_host_get_params(vm, ¶ms); - const long ramsize = params.ramsize; + const sg_size_t ramsize = params.ramsize; const long devsize = params.devsize; + const int skip_stage1 = params.skip_stage1; const int skip_stage2 = params.skip_stage2; - const double max_downtime = params.max_downtime; const double dp_rate = params.dp_rate; const double dp_cap = params.dp_cap; + const double mig_speed = params.mig_speed; + const double xfer_cpu_overhead = params.xfer_cpu_overhead; + const double dpt_cpu_overhead = params.dpt_cpu_overhead; + double remaining_size = ramsize + devsize; - double threshold = max_downtime * 125 * 1000 * 1000; + + double max_downtime = params.max_downtime; + if (max_downtime == 0) { + XBT_WARN("use the default max_downtime value 30ms"); + max_downtime = 0.03; + } + + double threshold = 0.00001; /* TODO: cleanup */ + + /* setting up parameters has done */ if (ramsize == 0) @@ -573,10 +962,21 @@ static int migration_tx_fun(int argc, char *argv[]) /* Stage1: send all memory pages to the destination. */ start_dirty_page_tracking(vm); - send_migration_data(vm_name, src_pm_name, dst_pm_name, ramsize, mbox, 1, 0); + double computed_during_stage1 = 0; + if (!skip_stage1) { + // send_migration_data(vm_name, src_pm_name, dst_pm_name, ramsize, mbox, 1, 0, mig_speed, xfer_cpu_overhead); - remaining_size -= ramsize; + /* send ramsize, but split it */ + double clock_prev_send = MSG_get_clock(); + computed_during_stage1 = send_stage1(vm, src_pm_name, dst_pm_name, ramsize, mig_speed, xfer_cpu_overhead, dp_rate, dp_cap, dpt_cpu_overhead); + remaining_size -= ramsize; + + double clock_post_send = MSG_get_clock(); + double bandwidth = ramsize / (clock_post_send - clock_prev_send); + threshold = get_threshold_value(bandwidth, max_downtime); + XBT_INFO("actual banwdidth %f, threshold %f", bandwidth / 1024 / 1024, threshold); + } /* Stage2: send update pages iteratively until the size of remaining states @@ -591,23 +991,53 @@ static int migration_tx_fun(int argc, char *argv[]) int stage2_round = 0; for (;;) { - // long updated_size = lookup_dirty_pages(vm); - double updated_size = lookup_computed_flop_counts(vm, stage2_round) * dp_rate; - if (updated_size > dp_cap) { - XBT_INFO("mig-stage2.%d: %f bytes updated, but cap it with the working set size %f", - stage2_round, updated_size, dp_cap); - updated_size = dp_cap; + + double updated_size = 0; + if (stage2_round == 0) { + /* just after stage1, nothing has been updated. But, we have to send the data updated during stage1 */ + updated_size = get_updated_size(computed_during_stage1, dp_rate, dp_cap); + } else { + double computed = lookup_computed_flop_counts(vm, 2, stage2_round); + updated_size = get_updated_size(computed, dp_rate, dp_cap); } - remaining_size += updated_size; + XBT_INFO("mig-stage 2:%d updated_size %f computed_during_stage1 %f dp_rate %f dp_cap %f", + stage2_round, updated_size, computed_during_stage1, dp_rate, dp_cap); + + + // if (stage2_round != 0) { + // /* during stage1, we have already created overhead tasks */ + // double overhead = dpt_cpu_overhead * updated_size; + // XBT_DEBUG("updated %f overhead %f", updated_size, overhead); + // launch_deferred_exec_process(vm, overhead, 10000); + // } + + + { + remaining_size += updated_size; + + XBT_INFO("mig-stage2.%d: remaining_size %f (%s threshold %f)", stage2_round, + remaining_size, (remaining_size < threshold) ? "<" : ">", threshold); + + if (remaining_size < threshold) + break; + } + + double clock_prev_send = MSG_get_clock(); + + send_migration_data(vm_name, src_pm_name, dst_pm_name, updated_size, mbox, 2, stage2_round, mig_speed, xfer_cpu_overhead); + + double clock_post_send = MSG_get_clock(); + + double bandwidth = updated_size / (clock_post_send - clock_prev_send); + threshold = get_threshold_value(bandwidth, max_downtime); + XBT_INFO("actual banwdidth %f, threshold %f", bandwidth / 1024 / 1024, threshold); + + + - XBT_INFO("mig-stage2.%d: remaining_size %f (%s threshold %f)", stage2_round, - remaining_size, (remaining_size < threshold) ? "<" : ">", threshold); - if (remaining_size < threshold) - break; - send_migration_data(vm_name, src_pm_name, dst_pm_name, updated_size, mbox, 2, stage2_round); remaining_size -= updated_size; stage2_round += 1; @@ -620,7 +1050,7 @@ stage3: simcall_vm_suspend(vm); stop_dirty_page_tracking(vm); - send_migration_data(vm_name, src_pm_name, dst_pm_name, remaining_size, mbox, 3, 0); + send_migration_data(vm_name, src_pm_name, dst_pm_name, remaining_size, mbox, 3, 0, mig_speed, xfer_cpu_overhead); xbt_free(mbox); @@ -645,7 +1075,7 @@ static void do_migration(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm) argv[3] = xbt_strdup(sg_host_name(dst_pm)); argv[4] = NULL; - msg_process_t pr = MSG_process_create_with_arguments(pr_name, migration_rx_fun, NULL, dst_pm, nargvs - 1, argv); + MSG_process_create_with_arguments(pr_name, migration_rx_fun, NULL, dst_pm, nargvs - 1, argv); xbt_free(pr_name); } @@ -659,7 +1089,7 @@ static void do_migration(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm) argv[2] = xbt_strdup(sg_host_name(src_pm)); argv[3] = xbt_strdup(sg_host_name(dst_pm)); argv[4] = NULL; - msg_process_t pr = MSG_process_create_with_arguments(pr_name, migration_tx_fun, NULL, src_pm, nargvs - 1, argv); + MSG_process_create_with_arguments(pr_name, migration_tx_fun, NULL, src_pm, nargvs - 1, argv); xbt_free(pr_name); } @@ -796,8 +1226,6 @@ void MSG_vm_restore(msg_vm_t vm) } - - /** @brief Get the physical host of a given VM. * @ingroup msg_VMs */ @@ -805,3 +1233,67 @@ msg_host_t MSG_vm_get_pm(msg_vm_t vm) { return simcall_vm_get_pm(vm); } + + +/** @brief Set a CPU bound for a given VM. + * @ingroup msg_VMs + * + * 1. + * Note that in some cases MSG_task_set_bound() may not intuitively work for VMs. + * + * For example, + * On PM0, there are Task1 and VM0. + * On VM0, there is Task2. + * Now we bound 75% to Task1@PM0 and bound 25% to Task2@VM0. + * Then, + * Task1@PM0 gets 50%. + * Task2@VM0 gets 25%. + * This is NOT 75% for Task1@PM0 and 25% for Task2@VM0, respectively. + * + * This is because a VM has the dummy CPU action in the PM layer. Putting a + * task on the VM does not affect the bound of the dummy CPU action. The bound + * of the dummy CPU action is unlimited. + * + * There are some solutions for this problem. One option is to update the bound + * of the dummy CPU action automatically. It should be the sum of all tasks on + * the VM. But, this solution might be costy, because we have to scan all tasks + * on the VM in share_resource() or we have to trap both the start and end of + * task execution. + * + * The current solution is to use MSG_vm_set_bound(), which allows us to + * directly set the bound of the dummy CPU action. + * + * + * 2. + * Note that bound == 0 means no bound (i.e., unlimited). But, if a host has + * multiple CPU cores, the CPU share of a computation task (or a VM) never + * exceeds the capacity of a CPU core. + */ +void MSG_vm_set_bound(msg_vm_t vm, double bound) +{ + return 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 = msg_host_resource_priv(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 *) mask, NULL); + + msg_host_t pm_now = MSG_vm_get_pm(vm); + if (pm_now == pm) { + XBT_INFO("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_INFO("set affinity(0x%04lx@%s) for %s (not active now)", mask, MSG_host_get_name(pm), MSG_host_get_name(vm)); +}