#include "msg_private.h"
#include "xbt/sysdep.h"
#include "xbt/log.h"
-#include "simgrid/platf.h"
#include "simgrid/host.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_vm, msg,
xbt_dict_t MSG_vm_get_properties(msg_vm_t vm)
{
xbt_assert((vm != NULL), "Invalid parameters (vm is NULL)");
-
- return (simcall_host_get_properties(vm));
+ return vm->properties();
}
/** \ingroup m_host_management
/** @brief Create a new VM with specified parameters.
* @ingroup msg_VMs*
* @param pm Physical machine that will host the VM
+ * @param name [TODO]
+ * @param ncpus [TODO]
+ * @param ramsize [TODO]
* @param net_cap Maximal bandwidth that the VM can consume (in MByte/s)
* @param disk_path (unused) Path to the image that boots
* @param disksize (unused) will represent the size of the VM (will be used during migrations)
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);
+ vm->setParameters(¶ms);
return vm;
}
{
/* make sure the VM of the same name does not exit */
{
- xbt_dictelm_t ind_host_tmp = xbt_lib_get_elm_or_null(host_lib, name);
- if (ind_host_tmp && sg_host_simix(ind_host_tmp) != NULL) {
+ simgrid::s4u::Host* ind_host_tmp =
+ (simgrid::s4u::Host*) xbt_dict_get_or_null(host_list, name);
+ if (ind_host_tmp != nullptr && sg_host_simix(ind_host_tmp) != nullptr) {
XBT_ERROR("host %s already exits", name);
- return NULL;
+ return nullptr;
}
}
/* Then, destroy the VM object */
simcall_vm_destroy(vm);
- __MSG_host_destroy(vm);
-
TRACE_msg_vm_end(vm);
}
* migration. The names of these mailboxes must not conflict with others. */
static inline char *get_mig_mbox_src_dst(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm)
{
- char *vm_name = sg_host_get_name(vm);
- char *src_pm_name = sg_host_get_name(src_pm);
- char *dst_pm_name = sg_host_get_name(dst_pm);
+ const char *vm_name = sg_host_get_name(vm);
+ const char *src_pm_name = sg_host_get_name(src_pm);
+ const char *dst_pm_name = sg_host_get_name(dst_pm);
return bprintf("__mbox_mig_src_dst:%s(%s-%s)", vm_name, src_pm_name, dst_pm_name);
}
static inline char *get_mig_mbox_ctl(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm)
{
- char *vm_name = sg_host_get_name(vm);
- char *src_pm_name = sg_host_get_name(src_pm);
- char *dst_pm_name = sg_host_get_name(dst_pm);
+ const char *vm_name = sg_host_get_name(vm);
+ const char *src_pm_name = sg_host_get_name(src_pm);
+ const char *dst_pm_name = sg_host_get_name(dst_pm);
return bprintf("__mbox_mig_ctl:%s(%s-%s)", vm_name, src_pm_name, dst_pm_name);
}
static inline char *get_mig_process_tx_name(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm)
{
- char *vm_name = sg_host_get_name(vm);
- char *src_pm_name = sg_host_get_name(src_pm);
- char *dst_pm_name = sg_host_get_name(dst_pm);
+ const char *vm_name = sg_host_get_name(vm);
+ const char *src_pm_name = sg_host_get_name(src_pm);
+ const char *dst_pm_name = sg_host_get_name(dst_pm);
return bprintf("__pr_mig_tx:%s(%s-%s)", vm_name, src_pm_name, dst_pm_name);
}
static inline char *get_mig_process_rx_name(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm)
{
- char *vm_name = sg_host_get_name(vm);
- char *src_pm_name = sg_host_get_name(src_pm);
- char *dst_pm_name = sg_host_get_name(dst_pm);
+ const char *vm_name = sg_host_get_name(vm);
+ const char *src_pm_name = sg_host_get_name(src_pm);
+ const char *dst_pm_name = sg_host_get_name(dst_pm);
return bprintf("__pr_mig_rx:%s(%s-%s)", vm_name, src_pm_name, dst_pm_name);
}
static inline char *get_mig_task_name(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm, int stage)
{
- char *vm_name = sg_host_get_name(vm);
- char *src_pm_name = sg_host_get_name(src_pm);
- char *dst_pm_name = sg_host_get_name(dst_pm);
+ const char *vm_name = sg_host_get_name(vm);
+ const char *src_pm_name = sg_host_get_name(src_pm);
+ const char *dst_pm_name = sg_host_get_name(dst_pm);
return bprintf("__task_mig_stage%d:%s(%s-%s)", stage, vm_name, src_pm_name, dst_pm_name);
}
struct migration_session *ms = (migration_session *) MSG_process_get_data(MSG_process_self());
s_vm_params_t params;
- simcall_host_get_params(ms->vm, ¶ms);
+ ms->vm->parameters(¶ms);
int need_exit = 0;
// 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);
priv->is_migrating = 0;
- XBT_DEBUG("VM(%s) moved from PM(%s) to PM(%s)", ms->vm->key, ms->src_pm->key, ms->dst_pm->key);
+ XBT_DEBUG("VM(%s) moved from PM(%s) to PM(%s)",
+ sg_host_get_name(ms->vm), sg_host_get_name(ms->src_pm),
+ sg_host_get_name(ms->dst_pm));
TRACE_msg_vm_change_host(ms->vm, ms->src_pm, ms->dst_pm);
}
// Inform the SRC that the migration has been correctly performed
priv->dp_enabled = 0;
}
-#if 0
-/* It might be natural that we define dp_rate for each task. But, we will also
- * have to care about how each task behavior affects the memory update behavior
- * at the operating system level. It may not be easy to model it with a simple algorithm. */
-double calc_updated_pages(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;
- double updated = dp->task->dp_rate * computed;
-
- XBT_INFO("%s@%s: computated %f ops (remaining %f -> %f) in %f secs (%f -> %f)",
- key, sg_host_name(vm), computed, dp->prev_remaining, remaining, duration, dp->prev_clock, clock);
- XBT_INFO("%s@%s: updated %f bytes, %f Mbytes/s",
- key, sg_host_name(vm), updated, updated / duration / 1000 / 1000);
-
- return updated;
-}
-#endif
-
static double get_computed(char *key, msg_vm_t vm, dirty_page_t dp, double remaining, double clock)
{
double computed = dp->prev_remaining - remaining;
} else if (ret == MSG_TIMEOUT) {
sg_size_t remaining = (sg_size_t)MSG_task_get_remaining_communication(task);
sent = size - remaining;
- XBT_INFO("timeout (%lf s) in sending_migration_data, remaining %llu bytes of %llu",
+ XBT_VERB("timeout (%lf s) in sending_migration_data, remaining %llu bytes of %llu",
timeout, remaining, size);
}
/* FIXME: why try-and-catch is used here? */
if(ret == MSG_HOST_FAILURE){
- //XBT_INFO("SRC host failed during migration of %s (stage %d)", sg_host_name(vm), stage);
+ //XBT_DEBUG("SRC host failed during migration of %s (stage %d)", sg_host_name(vm), stage);
MSG_task_destroy(task);
THROWF(host_error, 0, "SRC host failed during migration of %s (stage %d)", sg_host_get_name(vm), stage);
}else if(ret == MSG_TRANSFER_FAILURE){
- //XBT_INFO("DST host failed during migration of %s (stage %d)", sg_host_name(vm), stage);
+ //XBT_DEBUG("DST host failed during migration of %s (stage %d)", sg_host_name(vm), stage);
MSG_task_destroy(task);
THROWF(host_error, 0, "DST host failed during migration of %s (stage %d)", sg_host_get_name(vm), stage);
}
(migration_session *) MSG_process_get_data(MSG_process_self());
s_vm_params_t params;
- simcall_host_get_params(ms->vm, ¶ms);
+ ms->vm->parameters(¶ms);
const sg_size_t ramsize = params.ramsize;
const sg_size_t devsize = params.devsize;
const int skip_stage1 = params.skip_stage1;
/* At stage 1, we do not need timeout. We have to send all the memory
* pages even though the duration of this tranfer exceeds the timeout
* value. */
- XBT_INFO("Stage 1: Gonna send %llu", ramsize);
+ XBT_VERB("Stage 1: Gonna send %llu", ramsize);
sg_size_t sent = send_migration_data(ms->vm, ms->src_pm, ms->dst_pm, ramsize, ms->mbox, 1, 0, mig_speed, -1);
remaining_size -= sent;
computed_during_stage1 = lookup_computed_flop_counts(ms->vm, 1, 0);
if (sent < ramsize) {
- XBT_INFO("mig-stage1: timeout, force moving to stage 3");
+ XBT_VERB("mig-stage1: timeout, force moving to stage 3");
skip_stage2 = 1;
} else if (sent > ramsize)
XBT_CRITICAL("bug");
double clock_post_send = MSG_get_clock();
mig_timeout -= (clock_post_send - clock_prev_send);
if (mig_timeout < 0) {
- XBT_INFO("The duration of stage 1 exceeds the timeout value (%lf > %lf), skip stage 2",
+ XBT_VERB("The duration of stage 1 exceeds the timeout value (%lf > %lf), skip stage 2",
(clock_post_send - clock_prev_send), MIGRATION_TIMEOUT_DO_NOT_HARDCODE_ME);
skip_stage2 = 1;
}
} else if (sent < updated_size) {
/* When timeout happens, we move to stage 3. The size of memory pages
* updated before timeout must be added to the remaining size. */
- XBT_INFO("mig-stage2.%d: timeout, force moving to stage 3. sent %llu / %llu, eta %lf",
+ XBT_VERB("mig-stage2.%d: timeout, force moving to stage 3. sent %llu / %llu, eta %lf",
stage2_round, sent, updated_size, (clock_post_send - clock_prev_send));
remaining_size -= sent;
if(ret == MSG_HOST_FAILURE){
// Note that since the communication failed, the owner did not change and the task should be destroyed on the other side.
// Hence, just throw the execption
- XBT_INFO("SRC crashes, throw an exception (m-control)");
+ XBT_ERROR("SRC crashes, throw an exception (m-control)");
//MSG_process_kill(tx_process); // Adrien, I made a merge on Nov 28th 2014, I'm not sure whether this line is required or not
return -1;
}
else if((ret == MSG_TRANSFER_FAILURE) || (ret == MSG_TIMEOUT)){ // MSG_TIMEOUT here means that MSG_host_is_avail() returned false.
- XBT_INFO("DST crashes, throw an exception (m-control)");
+ XBT_ERROR("DST crashes, throw an exception (m-control)");
return -2;
}
