return vm;
}
-static inline double get_solved_value(CpuAction *cpu_action)
-{
- return cpu_action->getVariable()->value;
-}
-
/* In the real world, processes on the guest operating system will be somewhat
* degraded due to virtualization overhead. The total CPU share that these
* processes get is smaller than that of the VM process gets on a host
Cpu *cpu = ws_vm->p_cpu;
xbt_assert(cpu, "cpu-less host");
- double solved_value = get_solved_value(ws_vm->p_action);
+ double solved_value = ws_vm->p_action->getVariable()->value;
XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value,
- ws_vm->getName(), ws_vm->p_hostPM->getName().c_str());
+ ws_vm->getName(), ws_vm->p_hostPM->name().c_str());
// TODO: check lmm_update_constraint_bound() works fine instead of the below manual substitution.
// cpu_cas01->constraint->bound = solved_value;
return ret;
}
-Action *VMHL13Model::executeParallelTask(int host_nb,
- sg_host_t *host_list,
- double *flops_amount,
- double *bytes_amount,
- double rate){
-#define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0)
- if ((host_nb == 1)
- && (cost_or_zero(bytes_amount, 0) == 0.0))
- return surf_host_execute(host_list[0], flops_amount[0]);
- else if ((host_nb == 1)
- && (cost_or_zero(flops_amount, 0) == 0.0))
- return surf_network_model_communicate(surf_network_model, host_list[0], host_list[0],bytes_amount[0], rate);
- else if ((host_nb == 2)
- && (cost_or_zero(flops_amount, 0) == 0.0)
- && (cost_or_zero(flops_amount, 1) == 0.0)) {
- int i,nb = 0;
- double value = 0.0;
-
- for (i = 0; i < host_nb * host_nb; i++) {
- if (cost_or_zero(bytes_amount, i) > 0.0) {
- nb++;
- value = cost_or_zero(bytes_amount, i);
- }
- }
- if (nb == 1)
- return surf_network_model_communicate(surf_network_model, host_list[0], host_list[1], value, rate);
- }
-#undef cost_or_zero
-
- THROW_UNIMPLEMENTED; /* This model does not implement parallel tasks for more than 2 hosts. */
- return NULL;
-}
-
/************
* Resource *
************/
* from the VM name, we have to make sure that the system does not call the
* free callback for the network resource object. The network resource object
* is still used by the physical machine. */
- p_netElm = new RoutingEdgeWrapper(sg_host_edge(host_PM));
- sg_host_t host = sg_host_by_name_or_create(name);
- sg_host_edge_set(host, p_netElm);
+ sg_host_t host_VM = sg_host_by_name_or_create(name);
+ host_VM->pimpl_netcard = host_PM->pimpl_netcard;
- p_currentState = SURF_VM_STATE_CREATED;
+ p_vm_state = SURF_VM_STATE_CREATED;
// //// CPU RELATED STUFF ////
// Roughly, create a vcpu resource by using the values of the sub_cpu one.
- CpuCas01 *sub_cpu = static_cast<CpuCas01*>(sg_host_surfcpu(host_PM));
+ CpuCas01 *sub_cpu = static_cast<CpuCas01*>(host_PM->pimpl_cpu);
- p_cpu = surf_cpu_model_vm->createCpu(name, // name
+ p_cpu = surf_cpu_model_vm->createCpu(host_VM, // the machine hosting the VM
sub_cpu->getSpeedPeakList(), // host->power_peak,
sub_cpu->getPState(),
1, // host->power_scale,
NULL, // host->power_trace,
1, // host->core_amount,
- SURF_RESOURCE_ON, // host->initial_state,
+ 1/*ON*/, // host->initiallyOn,
NULL); // host->state_trace,
- p_cpu->plug(host);
/* We create cpu_action corresponding to a VM process on the host operating system. */
/* FIXME: TODO: we have to periodically input GUESTOS_NOISE to the system? how ? */
// vm_ws->cpu_action = surf_cpu_model_pm->extension.cpu.execute(host_PM, GUESTOS_NOISE);
p_action = sub_cpu->execute(0);
- XBT_INFO("Create VM(%s)@PM(%s) with %ld mounted disks", name, p_hostPM->getName().c_str(), xbt_dynar_length(p_storage));
-}
-
-/*
- * A physical host does not disappear in the current SimGrid code, but a VM may
- * disappear during a simulation.
- */
-VMHL13::~VMHL13()
-{
- /* Free the cpu_action of the VM. */
- XBT_ATTRIB_UNUSED int ret = p_action->unref();
- xbt_assert(ret == 1, "Bug: some resource still remains");
-}
-
-void VMHL13::updateState(tmgr_trace_event_t /*event_type*/, double /*value*/, double /*date*/) {
- THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
-}
-
-bool VMHL13::isUsed() {
- THROW_IMPOSSIBLE; /* This model does not implement parallel tasks */
- return -1;
-}
-
-e_surf_resource_state_t VMHL13::getState()
-{
- return (e_surf_resource_state_t) p_currentState;
-}
-
-void VMHL13::setState(e_surf_resource_state_t state)
-{
- p_currentState = (e_surf_vm_state_t) state;
+ XBT_INFO("Create VM(%s)@PM(%s) with %ld mounted disks",
+ name, p_hostPM->name().c_str(), xbt_dynar_length(p_storage));
}
void VMHL13::suspend()
{
p_action->suspend();
- p_currentState = SURF_VM_STATE_SUSPENDED;
+ p_vm_state = SURF_VM_STATE_SUSPENDED;
}
void VMHL13::resume()
{
p_action->resume();
- p_currentState = SURF_VM_STATE_RUNNING;
+ p_vm_state = SURF_VM_STATE_RUNNING;
}
void VMHL13::save()
{
- p_currentState = SURF_VM_STATE_SAVING;
+ p_vm_state = SURF_VM_STATE_SAVING;
/* FIXME: do something here */
p_action->suspend();
- p_currentState = SURF_VM_STATE_SAVED;
+ p_vm_state = SURF_VM_STATE_SAVED;
}
void VMHL13::restore()
{
- p_currentState = SURF_VM_STATE_RESTORING;
+ p_vm_state = SURF_VM_STATE_RESTORING;
/* FIXME: do something here */
p_action->resume();
- p_currentState = SURF_VM_STATE_RUNNING;
+ p_vm_state = SURF_VM_STATE_RUNNING;
}
/*
*/
void VMHL13::migrate(sg_host_t host_dest)
{
- /* ind_dst_pm equals to smx_host_t */
- Host *surfHost_dst = static_cast<Host*>(surf_host_resource_priv(host_dest));
+ Host *surfHost_dst = host_dest->extension<Host>();
const char *vm_name = getName();
- const char *pm_name_src = p_hostPM->getName().c_str();
+ const char *pm_name_src = p_hostPM->name().c_str();
const char *pm_name_dst = surfHost_dst->getName();
- xbt_assert(surfHost_dst);
-
/* update net_elm with that of the destination physical host */
- RoutingEdge *old_net_elm = p_netElm;
- RoutingEdge *new_net_elm = new RoutingEdgeWrapper(sg_host_edge(sg_host_by_name(pm_name_dst)));
- xbt_assert(new_net_elm);
-
- /* Unregister the current net_elm from host_lib. Do not call the free callback. */
- sg_host_edge_destroy(sg_host_by_name(vm_name), 0);
-
- /* Then, resister the new one. */
- p_netElm = new_net_elm;
- sg_host_edge_set(sg_host_by_name(vm_name), p_netElm);
+ sg_host_by_name(vm_name)->pimpl_netcard = sg_host_by_name(pm_name_dst)->pimpl_netcard;
p_hostPM = host_dest;
/* Update vcpu's action for the new pm */
{
/* create a cpu action bound to the pm model at the destination. */
- CpuAction *new_cpu_action = static_cast<CpuAction*>(
- static_cast<Cpu*>(sg_host_surfcpu(host_dest))->execute(0));
+ CpuAction *new_cpu_action = static_cast<CpuAction*>(host_dest->pimpl_cpu->execute(0));
e_surf_action_state_t state = p_action->getState();
if (state != SURF_ACTION_DONE)
p_action = new_cpu_action;
}
- XBT_DEBUG("migrate VM(%s): change net_elm (%p to %p)", vm_name, old_net_elm, new_net_elm);
XBT_DEBUG("migrate VM(%s): change PM (%s to %s)", vm_name, pm_name_src, pm_name_dst);
- delete old_net_elm;
}
void VMHL13::setBound(double bound){
p_action->setAffinity(cpu, mask);
}
-/*
- * A surf level object will be useless in the upper layer. Returning the
- * dict_elm of the host.
- **/
-sg_host_t VMHL13::getPm()
-{
- return p_hostPM;
-}
-
-/* Adding a task to a VM updates the VCPU task on its physical machine. */
-Action *VMHL13::execute(double size)
-{
- double old_cost = p_action->getCost();
- double new_cost = old_cost + size;
-
- XBT_DEBUG("VM(%s)@PM(%s): update dummy action's cost (%f -> %f)",
- getName(), p_hostPM->getName().c_str(),
- old_cost, new_cost);
-
- p_action->setCost(new_cost);
-
- return p_cpu->execute(size);
-}
-
-Action *VMHL13::sleep(double duration) {
- return p_cpu->sleep(duration);
-}
}
}