X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/94f91fddf6aa49b80b881571a2575f1ab3c67755..b35d70d6818026204833410d2e3917252fa35127:/src/surf/host_interface.cpp diff --git a/src/surf/host_interface.cpp b/src/surf/host_interface.cpp index 1a67830624..a639622920 100644 --- a/src/surf/host_interface.cpp +++ b/src/surf/host_interface.cpp @@ -36,7 +36,7 @@ simgrid::xbt::Extension Host::EXTENSION_ID; /********* * Model * *********/ -Host *HostModel::createHost(const char *name,RoutingEdge *netElm, Cpu *cpu, xbt_dict_t props){ +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); @@ -92,12 +92,11 @@ void Host::classInit() EXTENSION_ID = simgrid::Host::extension_create([](void *h) { static_cast(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) @@ -106,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)