X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/24e3d7b3bb3312445ad0986fc67853995031bea0..314ed39f22e6e2f30248a673df4371c842cc3660:/src/surf/vm_hl13.cpp

diff --git a/src/surf/vm_hl13.cpp b/src/surf/vm_hl13.cpp
index 2c25d80a71..6e6e1f8585 100644
--- a/src/surf/vm_hl13.cpp
+++ b/src/surf/vm_hl13.cpp
@@ -42,11 +42,6 @@ VirtualMachine *VMHL13Model::createVM(const char *name, sg_host_t host_PM)
   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
@@ -91,7 +86,7 @@ double VMHL13Model::shareResources(double now)
     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->name().c_str());
 
@@ -127,39 +122,6 @@ double VMHL13Model::shareResources(double now)
   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 host_list[0]->pimpl_cpu->execute(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 *
  ************/