-/* Copyright (c) 2012-2013. The SimGrid Team.
+/* Copyright (c) 2012-2014. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#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");
/** \ingroup m_host_management
* \brief Change the value of a given host property
*
- * \param host a host
+ * \param vm a vm
* \param name a property name
* \param value what to change the property to
* \param free_ctn the freeing function to use to kill the value on need
* 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,
- int mig_netspeed, int dp_intensity)
+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)
{
- /* 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;
+ /* 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;
+ msg_vm_t vm = MSG_vm_create_core(ind_pm, name);
+ s_ws_params_t params;
+ memset(¶ms, 0, sizeof(params));
+ params.ramsize = (sg_size_t)ramsize * 1024 * 1024;
+ //params.overcommit = 0;
+ params.devsize = 0;
+ params.skip_stage2 = 0;
+ params.max_downtime = 0.03;
+ params.dp_rate = (update_speed * 1024 * 1024) / host_speed;
+ params.dp_cap = params.ramsize / 0.9; // working set memory is 90%
+ params.mig_speed = (double)mig_netspeed * 1024 * 1024; // 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;
}
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[0] = pr_name;
+ argv[1] = bprintf("%f", computation);
+ argv[2] = bprintf("%f", prio);
argv[3] = NULL;
MSG_process_create_with_arguments(pr_name, deferred_exec_fun, NULL, host, nargvs - 1, argv);
-
- xbt_free(pr_name);
}
int nargvs = 3;
char **argv = xbt_new(char *, nargvs);
- argv[0] = xbt_strdup(pr_name);
- argv[1] = xbt_strdup(mbox);
+ argv[0] = pr_name;
+ argv[1] = 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)
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, double mig_speed, double xfer_cpu_overhead)
+ 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);
if (stage == 2){
- XBT_DEBUG("mig-stage%d.%d: sent %f duration %f actual_speed %f (target %f) cpu %f", stage, stage2_round, size, duration, actual_speed, mig_speed, cpu_utilization);}
+ XBT_DEBUG("mig-stage%d.%d: sent %llu 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 %f duration %f actual_speed %f (target %f) cpu %f", stage, size, duration, actual_speed, mig_speed, cpu_utilization);
+ XBT_DEBUG("mig-stage%d: sent %llu duration %f actual_speed %f (target %f) cpu %f", stage, size, duration, actual_speed, mig_speed, cpu_utilization);
}
xbt_free(task_name);
}
static double send_stage1(msg_host_t vm, const char *src_pm_name, const char *dst_pm_name,
- long ramsize, double mig_speed, double xfer_cpu_overhead, double dp_rate, double dp_cap, double dpt_cpu_overhead)
+ sg_size_t ramsize, double mig_speed, double xfer_cpu_overhead, double dp_rate, double dp_cap, double dpt_cpu_overhead)
{
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 long chunksize = 1024L * 1024 * 100000;
- long remaining = ramsize;
+ // const long chunksize = (sg_size_t)1024 * 1024 * 100;
+ const sg_size_t chunksize = (sg_size_t)1024 * 1024 * 100000;
+ sg_size_t remaining = ramsize;
double computed_total = 0;
while (remaining > 0) {
- long datasize = chunksize;
+ 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;
// launch_deferred_exec_process(vm, overhead, 10000);
// }
}
-
+ xbt_free(mbox);
return computed_total;
}
s_ws_params_t params;
simcall_host_get_params(vm, ¶ms);
- const long ramsize = params.ramsize;
- const long devsize = params.devsize;
+ const sg_size_t ramsize = params.ramsize;
+ const sg_size_t devsize = params.devsize;
const int skip_stage1 = params.skip_stage1;
const int skip_stage2 = params.skip_stage2;
const double dp_rate = params.dp_rate;
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);
+ XBT_INFO("actual banwdidth %f (MB/s), threshold %f", bandwidth / 1024 / 1024, threshold);
}
char *pr_name = get_mig_process_rx_name(sg_host_name(vm), sg_host_name(src_pm), sg_host_name(dst_pm));
int nargvs = 5;
char **argv = xbt_new(char *, nargvs);
- argv[0] = xbt_strdup(pr_name);
+ argv[0] = pr_name;
argv[1] = xbt_strdup(sg_host_name(vm));
argv[2] = xbt_strdup(sg_host_name(src_pm));
argv[3] = xbt_strdup(sg_host_name(dst_pm));
argv[4] = NULL;
MSG_process_create_with_arguments(pr_name, migration_rx_fun, NULL, dst_pm, nargvs - 1, argv);
-
- xbt_free(pr_name);
}
{
char *pr_name = get_mig_process_tx_name(sg_host_name(vm), sg_host_name(src_pm), sg_host_name(dst_pm));
int nargvs = 5;
char **argv = xbt_new(char *, nargvs);
- argv[0] = xbt_strdup(pr_name);
+ argv[0] = pr_name;
argv[1] = xbt_strdup(sg_host_name(vm));
argv[2] = xbt_strdup(sg_host_name(src_pm));
argv[3] = xbt_strdup(sg_host_name(dst_pm));
argv[4] = NULL;
MSG_process_create_with_arguments(pr_name, migration_tx_fun, NULL, src_pm, nargvs - 1, argv);
-
- xbt_free(pr_name);
}
/* wait until the migration have finished */
{
msg_task_t task = NULL;
msg_error_t ret = MSG_task_recv(&task, mbox_ctl);
+
xbt_assert(ret == MSG_OK);
char *expected_task_name = get_mig_task_name(sg_host_name(vm), sg_host_name(src_pm), sg_host_name(dst_pm), 4);
xbt_assert(strcmp(task->name, expected_task_name) == 0);
xbt_free(expected_task_name);
+ MSG_task_destroy(task);
}
xbt_free(mbox_ctl);
* 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.
+ * 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.
+ * 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