surf_vm_model = new VMHL13Model();
Model *model = surf_vm_model;
- xbt_dynar_push(model_list, &model);
- xbt_dynar_push(model_list_invoke, &model);
+ xbt_dynar_push(all_existing_models, &model);
}
}
/* ind means ''indirect'' that this is a reference on the whole dict_elm
* structure (i.e not on the surf_resource_private infos) */
-VM *VMHL13Model::createVM(const char *name, surf_resource_t host_PM)
+VirtualMachine *VMHL13Model::createVM(const char *name, surf_resource_t host_PM)
{
- VMHL13 *ws = new VMHL13(this, name, NULL, host_PM);
-
- xbt_lib_set(host_lib, name, SURF_HOST_LEVEL, ws);
-
- /* TODO:
- * - check how network requests are scheduled between distinct processes competing for the same card.
- */
- return ws;
+ VirtualMachine* vm = new VMHL13(this, name, NULL, host_PM);
+ surf_callback_emit(VMCreatedCallbacks, vm);
+ return vm;
}
static inline double get_solved_value(CpuAction *cpu_action)
double VMHL13Model::shareResources(double now)
{
- /* TODO: udpate action's cost with the total cost of processes on the VM. */
-
-
- /* 0. Make sure that we already calculated the resource share at the physical
- * machine layer. */
- {
- XBT_ATTRIB_UNUSED Model *ws_model = surf_host_model;
- XBT_ATTRIB_UNUSED Model *vm_ws_model = surf_vm_model;
- XBT_ATTRIB_UNUSED unsigned int index_of_pm_ws_model = xbt_dynar_search(model_list_invoke, &ws_model);
- XBT_ATTRIB_UNUSED unsigned int index_of_vm_ws_model = xbt_dynar_search(model_list_invoke, &vm_ws_model);
- xbt_assert((index_of_pm_ws_model < index_of_vm_ws_model), "Cannot assume surf_host_model comes before");
-
- /* Another option is that we call sub_ws->share_resource() here. The
- * share_resource() function has no side-effect. We can call it here to
- * ensure that. */
- }
-
+ /* TODO: update action's cost with the total cost of processes on the VM. */
/* 1. Now we know how many resource should be assigned to each virtual
* machine. We update constraints of the virtual machine layer.
VMModel::ws_vms.begin();
iter != VMModel::ws_vms.end(); ++iter) {
- VM *ws_vm = &*iter;
+ VirtualMachine *ws_vm = &*iter;
Cpu *cpu = ws_vm->p_cpu;
xbt_assert(cpu, "cpu-less host");
if (min_by_sto >= 0.0 && min_by_sto < ret)
ret = min_by_sto;
- /* FIXME: 3. do we have to re-initialize our cpu_action object? */
-#if 0
- /* iterate for all virtual machines */
- for (VMModel::vm_list_t::iterator iter =
- VMModel::ws_vms.begin();
- iter != VMModel::ws_vms.end(); ++iter) {
-
- {
-#if 0
- VM2013 *ws_vm2013 = static_cast<VM2013Ptr>(&*iter);
- XBT_INFO("cost %f remains %f start %f finish %f", ws_vm2013->cpu_action->cost,
- ws_vm2013->cpu_action->remains,
- ws_vm2013->cpu_action->start,
- ws_vm2013->cpu_action->finish
- );
-#endif
-#if 0
- void *ind_sub_host = xbt_lib_get_elm_or_null(host_lib, ws_vm2013->sub_ws->generic_resource.getName);
- surf_cpu_model_pm->action_unref(ws_vm2013->cpu_action);
- /* FIXME: this means busy loop? */
- // ws_vm2013->cpu_action = surf_cpu_model_pm->extension.cpu.execute(ind_sub_host, GUESTOS_NOISE);
- ws_vm2013->cpu_action = surf_cpu_model_pm->extension.cpu.execute(ind_sub_host, 0);
-#endif
-
- }
- }
-#endif
-
-
return ret;
}
VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props,
surf_resource_t host_PM)
- : VM(model, name, props, NULL, NULL)
+ : VirtualMachine(model, name, props, NULL, NULL)
{
- Host *sub_ws = static_cast<Host*>(surf_host_resource_priv(host_PM));
+ Host *sub_ws = surf_host_resource_priv(host_PM);
/* Currently, we assume a VM has no storage. */
p_storage = NULL;
NULL, // host->state_trace,
NULL); // host->properties,
- p_cpu->setVirtual(sub_cpu);
-
/* 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_DEBUG("Create VM(%s)@PM(%s) with %ld mounted disks", name, sub_ws->getName(), xbt_dynar_length(p_storage));
+ XBT_INFO("Create VM(%s)@PM(%s) with %ld mounted disks", name, sub_ws->getName(), xbt_dynar_length(p_storage));
}
/*
/* Update vcpu's action for the new pm */
{
-#if 0
- XBT_INFO("cpu_action->remains %g", p_action->remains);
- XBT_INFO("cost %f remains %f start %f finish %f", p_action->cost,
- p_action->remains,
- p_action->start,
- p_action->finish
- );
- XBT_INFO("cpu_action state %d", surf_action_get_state(p_action));
-#endif
-
/* 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(ind_dst_pm))->execute(0));
Action *VMHL13::sleep(double duration) {
return p_cpu->sleep(duration);
}
-
-/**********
- * Action *
- **********/
-
-//FIME:: handle action cancel
-
