X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347f9a2ca55bffc88bf965952b9be3a15535e908..b35d70d6818026204833410d2e3917252fa35127:/src/surf/host_interface.cpp

diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp
index 9d740e6ce1..a639622920 100644
--- a/src/surf/host_interface.cpp
+++ b/src/surf/host_interface.cpp
@@ -36,6 +36,13 @@ simgrid::xbt::Extension<simgrid::Host, Host> Host::EXTENSION_ID;
 /*********
  * Model *
  *********/
+Host *HostModel::createHost(const char *name,NetCard *netElm, Cpu *cpu, xbt_dict_t props){
+  Host *host = new simgrid::surf::Host(surf_host_model, name, props,
+		  (xbt_dynar_t)xbt_lib_get_or_null(storage_lib, name, ROUTING_STORAGE_HOST_LEVEL),
+		  netElm, cpu);
+  XBT_DEBUG("Create host %s with %ld mounted disks", name, xbt_dynar_length(host->p_storage));
+  return host;
+}
 
 /* Each VM has a dummy CPU action on the PM layer. This CPU action works as the
  * constraint (capacity) of the VM in the PM layer. If the VM does not have any
@@ -85,12 +92,11 @@ void Host::classInit()
     EXTENSION_ID = simgrid::Host::extension_create<simgrid::surf::Host>([](void *h) {
     	static_cast<simgrid::surf::Host*>(h)->destroy();
     });
-    SURF_HOST_LEVEL = EXTENSION_ID.id(); // FIXME: KILLME
   }
 }
 
 Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
-		                 xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu)
+		                 xbt_dynar_t storage, NetCard *netElm, Cpu *cpu)
  : Resource(model, name)
  , PropertyHolder(props)
  , p_storage(storage), p_netElm(netElm), p_cpu(cpu)
@@ -99,7 +105,7 @@ Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
 }
 
 Host::Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props, lmm_constraint_t constraint,
-				         xbt_dynar_t storage, RoutingEdge *netElm, Cpu *cpu)
+				         xbt_dynar_t storage, NetCard *netElm, Cpu *cpu)
  : Resource(model, name, constraint)
  , PropertyHolder(props)
  , p_storage(storage), p_netElm(netElm), p_cpu(cpu)
@@ -144,13 +150,6 @@ void Host::setState(e_surf_resource_state_t state){
   p_cpu->setState(state);
 }
 
-Action *Host::execute(double size) {
-  return p_cpu->execute(size);
-}
-Action *Host::sleep(double duration) {
-  return p_cpu->sleep(duration);
-}
-
 
 simgrid::surf::Storage *Host::findStorageOnMountList(const char* mount)
 {