X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0bac7d0f735ac8ba47a46e1db4f6d7a7164fe0f2..45d00a93682182156762f2ca97b1f2746746c8b1:/src/msg/msg_vm.cpp diff --git a/src/msg/msg_vm.cpp b/src/msg/msg_vm.cpp index 836b25dd5c..2e11d8985e 100644 --- a/src/msg/msg_vm.cpp +++ b/src/msg/msg_vm.cpp @@ -15,7 +15,6 @@ #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, @@ -46,8 +45,7 @@ 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)"); - - return (simcall_host_get_properties(vm)); + return vm->properties(); } /** \ingroup m_host_management @@ -165,6 +163,9 @@ int MSG_vm_is_restoring(msg_vm_t vm) /** @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) @@ -179,7 +180,7 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char *name, { /* For the moment, intensity_rate is the percentage against the migration * bandwidth */ - double host_speed = MSG_get_host_speed(pm); + double host_speed = MSG_host_get_speed(pm); double update_speed = ((double)dp_intensity/100) * mig_netspeed; msg_vm_t vm = MSG_vm_create_core(pm, name); @@ -195,7 +196,7 @@ msg_vm_t MSG_vm_create(msg_host_t pm, const char *name, 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; } @@ -210,8 +211,8 @@ msg_vm_t MSG_vm_create_core(msg_host_t ind_pm, const char *name) { /* make sure the VM of the same name does not exit */ { - simgrid::Host* ind_host_tmp = - (simgrid::Host*) xbt_dict_get_or_null(host_list, name); + 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 nullptr; @@ -252,8 +253,6 @@ void MSG_vm_destroy(msg_vm_t vm) /* Then, destroy the VM object */ simcall_vm_destroy(vm); - __MSG_host_destroy(vm); - TRACE_msg_vm_end(vm); } @@ -360,7 +359,7 @@ static int migration_rx_fun(int argc, char *argv[]) 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; @@ -611,17 +610,17 @@ static sg_size_t send_migration_data(msg_vm_t vm, msg_host_t src_pm, msg_host_t } 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); } @@ -689,7 +688,7 @@ static int migration_tx_fun(int argc, char *argv[]) (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; @@ -727,13 +726,13 @@ static int migration_tx_fun(int argc, char *argv[]) /* 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"); @@ -748,7 +747,7 @@ static int migration_tx_fun(int argc, char *argv[]) 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; } @@ -816,7 +815,7 @@ static int migration_tx_fun(int argc, char *argv[]) } 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; @@ -900,12 +899,12 @@ static int do_migration(msg_vm_t vm, msg_host_t src_pm, msg_host_t dst_pm) 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; }