X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f4ed74ca6d4a744d2956a4f2906c897e1886cefd..cdee945b9c5436eaada21ee7b942f63d7a67df49:/src/surf/vm_hl13.cpp

diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp
index 918df46b23..3553f5d770 100644
--- a/src/surf/vm_hl13.cpp
+++ b/src/surf/vm_hl13.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2014. The SimGrid Team.
+/* Copyright (c) 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -30,16 +30,8 @@ void VMHL13Model::updateActionsState(double /*now*/, double /*delta*/) {}
 /* 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)
-{
-  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 *VMHL13Model::createVM(const char *name, surf_resource_t host_PM) {
+  return new VMHL13(this, name, NULL, host_PM);
 }
 
 static inline double get_solved_value(CpuAction *cpu_action)
@@ -56,16 +48,16 @@ const double virt_overhead = 1;
 
 double VMHL13Model::shareResources(double now)
 {
-  /* TODO: udpate action's cost with the total cost of processes on the VM. */
+  /* TODO: update 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_GNUC_UNUSED Model *ws_model = surf_host_model;
-    _XBT_GNUC_UNUSED Model *vm_ws_model = surf_vm_model;
-    _XBT_GNUC_UNUSED unsigned int index_of_pm_ws_model = xbt_dynar_search(model_list_invoke, &ws_model);
-    _XBT_GNUC_UNUSED unsigned int index_of_vm_ws_model = xbt_dynar_search(model_list_invoke, &vm_ws_model);
+    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
@@ -103,7 +95,7 @@ double VMHL13Model::shareResources(double now)
          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");
 
@@ -211,7 +203,7 @@ Action *VMHL13Model::executeParallelTask(int host_nb,
 
 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));
 
@@ -245,12 +237,15 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props,
       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_INFO("Create VM(%s)@PM(%s) with %ld mounted disks", name, sub_ws->getName(), xbt_dynar_length(p_storage));
+
 }
 
 /*
@@ -260,7 +255,7 @@ VMHL13::VMHL13(VMModel *model, const char* name, xbt_dict_t props,
 VMHL13::~VMHL13()
 {
   /* Free the cpu_action of the VM. */
-  _XBT_GNUC_UNUSED int ret = p_action->unref();
+  XBT_ATTRIB_UNUSED int ret = p_action->unref();
   xbt_assert(ret == 1, "Bug: some resource still remains");
 }
 
@@ -342,16 +337,6 @@ void VMHL13::migrate(surf_resource_t ind_dst_pm)
 
    /* 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));
@@ -369,7 +354,7 @@ void VMHL13::migrate(surf_resource_t ind_dst_pm)
        new_cpu_action->setBound(old_bound);
      }
 
-     _XBT_GNUC_UNUSED int ret = p_action->unref();
+     XBT_ATTRIB_UNUSED int ret = p_action->unref();
      xbt_assert(ret == 1, "Bug: some resource still remains");
 
      p_action = new_cpu_action;