X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e0c19b51995dedb551e2f7f7af05e2f20f29845..8d777265e12b0b9c5f13fecfc719474cdd214e9e:/src/surf/host_interface.cpp

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index bc4e28650b..5b9a6f0278 100644
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -6,7 +6,7 @@
 
 #include "host_interface.hpp"
 
-#include <simgrid/Host.hpp>
+#include <simgrid/s4u/host.hpp>
 
 #include "src/simix/smx_private.h"
 #include "cpu_cas01.hpp"
@@ -20,10 +20,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf,
 
 simgrid::surf::HostModel *surf_host_model = NULL;
 
-void host_add_traces(){
-  surf_host_model->addTraces();
-}
-
 /*************
  * Callbacks *
  *************/
@@ -31,10 +27,7 @@ void host_add_traces(){
 namespace simgrid {
 namespace surf {
 
-simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID =
-		simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
-	        static_cast<simgrid::surf::Host*>(h)->destroy();
-        });
+simgrid::xbt::Extension<simgrid::s4u::Host, Host> Host::EXTENSION_ID;
 
 /*********
  * Model *
@@ -59,11 +52,9 @@ void HostModel::adjustWeightOfDummyCpuActions()
        iter !=  VMModel::ws_vms.end(); ++iter) {
 
     VirtualMachine *ws_vm = &*iter;
-    CpuCas01 *cpu_cas01 = static_cast<CpuCas01*>(ws_vm->p_cpu);
-    xbt_assert(cpu_cas01, "cpu-less host");
+    Cpu *cpu = ws_vm->p_cpu;
 
-    int is_active = lmm_constraint_used(cpu_cas01->getModel()->getMaxminSystem(), cpu_cas01->getConstraint());
-    // int is_active_old = constraint_is_active(cpu_cas01);
+    int is_active = lmm_constraint_used(cpu->getModel()->getMaxminSystem(), cpu->getConstraint());
 
     if (is_active) {
       /* some tasks exist on this VM */
@@ -82,14 +73,58 @@ void HostModel::adjustWeightOfDummyCpuActions()
   }
 }
 
+Action *HostModel::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)
+  Action *action =NULL;
+  if ((host_nb == 1)
+      && (cost_or_zero(bytes_amount, 0) == 0.0)){
+    action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]);
+  } else if ((host_nb == 1)
+           && (cost_or_zero(flops_amount, 0) == 0.0)) {
+    action = surf_network_model->communicate(host_list[0]->pimpl_netcard,
+                                         host_list[0]->pimpl_netcard,
+                       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){
+      action = surf_network_model->communicate(host_list[0]->pimpl_netcard,
+                                           host_list[1]->pimpl_netcard,
+                         value, rate);
+    }
+  } else
+    THROW_UNIMPLEMENTED;      /* This model does not implement parallel tasks for more than 2 hosts */
+#undef cost_or_zero
+  xbt_free(host_list);
+  return action;
+}
+
 /************
  * Resource *
  ************/
-simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onCreation;
-simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onDestruction;
-simgrid::surf::signal<void(simgrid::surf::Host*)> Host::onStateChange;
 
-Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
+
+void Host::classInit()
+{
+  if (!EXTENSION_ID.valid()) {
+    EXTENSION_ID = simgrid::s4u::Host::extension_create<simgrid::surf::Host>();
+  }
+}
+
+Host::Host(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props,
 		                 xbt_dynar_t storage, Cpu *cpu)
  : Resource(model, name)
  , PropertyHolder(props)
@@ -98,7 +133,7 @@ Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
   p_params.ramsize = 0;
 }
 
-Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
+Host::Host(simgrid::surf::HostModel *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
 				         xbt_dynar_t storage, Cpu *cpu)
  : Resource(model, name, constraint)
  , PropertyHolder(props)
@@ -110,32 +145,14 @@ Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_
 /** @brief use destroy() instead of this destructor */
 Host::~Host()
 {
-	xbt_assert(currentlyDestroying_, "Don't delete Hosts directly. Call destroy() instead.");
-	delete p_cpu;
-	// FIXME: VM plays strange games, leading to segfaults if I do the expected thing of next line
-	// delete p_netElm;
-	// delete p_storage;
-}
-/** @brief Fire the require callbacks and destroy the object
- *
- * Don't delete directly an Host, call h->destroy() instead.
- */
-void Host::destroy()
-{
-	if (!currentlyDestroying_) {
-		currentlyDestroying_ = true;
-		onDestruction(this);
-		delete this;
-	}
 }
 
-void Host::attach(simgrid::Host* host)
+void Host::attach(simgrid::s4u::Host* host)
 {
   if (p_host != nullptr)
-    xbt_die("Already attached to host %s", host->getName().c_str());
+    xbt_die("Already attached to host %s", host->name().c_str());
   host->extension_set(this);
   p_host = host;
-  onCreation(this);
 }
 
 bool Host::isOn() {
@@ -147,13 +164,13 @@ bool Host::isOff() {
 void Host::turnOn(){
   if (isOff()) {
     p_cpu->turnOn();
-    onStateChange(this);
+    simgrid::s4u::Host::onStateChange(*this->p_host);
   }
 }
 void Host::turnOff(){
   if (isOn()) {
     p_cpu->turnOff();
-    onStateChange(this);
+    simgrid::s4u::Host::onStateChange(*this->p_host);
   }
 }