X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea5ba71aa6e9e92becf2763c71c92fed3228c794..df0464c2ffa61d7fab01a54732b01368886013aa:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index e1aecbce80..c33ed89a18 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -14,6 +14,8 @@ #include "src/surf/HostImpl.hpp" #include "surf/surf.h" +#include "simgrid/s4u/engine.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/simix/smx_private.h" #include "src/include/simgrid/sg_config.h" @@ -22,18 +24,18 @@ #include "src/surf/HostImpl.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" -#include "surf/surf_routing.h" // FIXME: brain dead public header -#include "src/kernel/routing/AsImpl.hpp" #include "src/kernel/routing/AsCluster.hpp" -#include "src/kernel/routing/AsClusterTorus.hpp" -#include "src/kernel/routing/AsClusterFatTree.hpp" #include "src/kernel/routing/AsClusterDragonfly.hpp" +#include "src/kernel/routing/AsClusterFatTree.hpp" +#include "src/kernel/routing/AsClusterTorus.hpp" #include "src/kernel/routing/AsDijkstra.hpp" #include "src/kernel/routing/AsFloyd.hpp" #include "src/kernel/routing/AsFull.hpp" +#include "src/kernel/routing/AsImpl.hpp" #include "src/kernel/routing/AsNone.hpp" #include "src/kernel/routing/AsVivaldi.hpp" +#include "src/kernel/routing/NetCard.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); @@ -98,7 +100,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args) if (args->pstate != 0) host->pimpl_cpu->setPState(args->pstate); if (args->coord && strcmp(args->coord, "")) - new simgrid::kernel::routing::vivaldi::Coords(host, args->coord); + new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netcard, args->coord); simgrid::s4u::Host::onCreation(*host); @@ -109,7 +111,6 @@ void sg_platf_new_host(sg_platf_host_cbarg_t args) /** @brief Add a "router" to the network element list */ void sg_platf_new_router(sg_platf_router_cbarg_t router) { - using simgrid::kernel::routing::AsCluster; simgrid::kernel::routing::AsImpl* current_routing = routing_get_current(); if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset) @@ -118,29 +119,14 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) "Refusing to create a router named '%s': this name already describes a node.", router->id); simgrid::kernel::routing::NetCard* netcard = - new simgrid::kernel::routing::NetCardImpl(router->id, simgrid::kernel::routing::NetCard::Type::Router, current_routing); + new simgrid::kernel::routing::NetCard(router->id, simgrid::kernel::routing::NetCard::Type::Router, current_routing); xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, netcard); XBT_DEBUG("Router '%s' has the id %d", router->id, netcard->id()); - if (router->coord && strcmp(router->coord, "")) { - unsigned int cursor; - char*str; - - xbt_assert(COORD_ASR_LEVEL, "To use host coordinates, please add --cfg=network/coordinates:yes to your command line"); - /* Pre-parse the host coordinates */ - xbt_dynar_t ctn_str = xbt_str_split_str(router->coord, " "); - xbt_assert(xbt_dynar_length(ctn_str)==3,"Coordinates of %s must have 3 dimensions", router->id); - xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),nullptr); - xbt_dynar_foreach(ctn_str,cursor, str) { - double val = xbt_str_parse_double(str, "Invalid coordinate: %s"); - xbt_dynar_push(ctn,&val); - } - xbt_dynar_free(&ctn_str); - xbt_dynar_shrink(ctn, 0); - xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn); - } + if (router->coord && strcmp(router->coord, "")) + new simgrid::kernel::routing::vivaldi::Coords(netcard, router->coord); - auto cluster = dynamic_cast(current_routing); + auto cluster = dynamic_cast(current_routing); if(cluster != nullptr) cluster->router_ = static_cast(xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL)); @@ -235,10 +221,10 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) { xbt_dict_cursor_t cursor=nullptr; char *key,*data; - host.properties = xbt_dict_new(); + host.properties = xbt_dict_new_homogeneous(free); xbt_dict_foreach(cluster->properties,cursor,key,data) { - xbt_dict_set(host.properties, key, xbt_strdup(data),free); + xbt_dict_set(host.properties, key, xbt_strdup(data), nullptr); } } @@ -584,72 +570,22 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) { - using simgrid::kernel::routing::NetCard; - using simgrid::kernel::routing::AsCluster; - - char *host_id = bprintf("peer_%s", peer->id); - char *router_id = bprintf("router_%s", peer->id); - - XBT_DEBUG(" "); + using simgrid::kernel::routing::AsVivaldi; - XBT_DEBUG("", peer->id); - s_sg_platf_AS_cbarg_t AS; - AS.id = peer->id; - AS.routing = A_surfxml_AS_routing_Cluster; - sg_platf_new_AS_begin(&AS); - - XBT_DEBUG("", host_id, peer->speed); - s_sg_platf_host_cbarg_t host; - memset(&host, 0, sizeof(host)); - host.id = host_id; - - host.speed_per_pstate.push_back(peer->speed); - host.pstate = 0; - host.speed_trace = peer->availability_trace; - host.state_trace = peer->state_trace; - host.core_amount = 1; - sg_platf_new_host(&host); - - s_sg_platf_link_cbarg_t link; - memset(&link, 0, sizeof(link)); - link.policy = SURF_LINK_SHARED; - link.latency = peer->lat; - - char* link_up = bprintf("link_%s_UP",peer->id); - XBT_DEBUG("", link_up, peer->bw_out, peer->lat); - link.id = link_up; - link.bandwidth = peer->bw_out; - sg_platf_new_link(&link); - - char* link_down = bprintf("link_%s_DOWN",peer->id); - XBT_DEBUG("", link_down, peer->bw_in, peer->lat); - link.id = link_down; - link.bandwidth = peer->bw_in; - sg_platf_new_link(&link); - - XBT_DEBUG("", host_id,link_up,link_down); - s_sg_platf_host_link_cbarg_t host_link; - memset(&host_link, 0, sizeof(host_link)); - host_link.id = host_id; - host_link.link_up = link_up; - host_link.link_down = link_down; - sg_platf_new_hostlink(&host_link); - free(link_up); - free(link_down); - - XBT_DEBUG("", router_id); - s_sg_platf_router_cbarg_t router; - memset(&router, 0, sizeof(router)); - router.id = router_id; - router.coord = peer->coord; - sg_platf_new_router(&router); + AsVivaldi* as = dynamic_cast(current_routing); + xbt_assert(as, " tag can only be used in Vivaldi ASes"); - XBT_DEBUG(""); - sg_platf_new_AS_seal(); - XBT_DEBUG(" "); + std::vector speedPerPstate; + speedPerPstate.push_back(peer->speed); + simgrid::s4u::Host* host = as->createHost(peer->id, &speedPerPstate, 1); + as->setPeerLink(host->pimpl_netcard, peer->bw_in, peer->bw_out, peer->lat, peer->coord); + simgrid::s4u::Host::onCreation(*host); - free(router_id); - free(host_id); + /* Change from the defaults */ + if (peer->state_trace) + host->pimpl_cpu->setStateTrace(peer->state_trace); + if (peer->availability_trace) + host->pimpl_cpu->setSpeedTrace(peer->availability_trace); } void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ } @@ -662,7 +598,6 @@ void sg_platf_end() { static void surf_config_models_setup() { const char* host_model_name = xbt_cfg_get_string("host/model"); - const char* vm_model_name = xbt_cfg_get_string("vm/model"); const char* network_model_name = xbt_cfg_get_string("network/model"); const char* cpu_model_name = xbt_cfg_get_string("cpu/model"); const char* storage_model_name = xbt_cfg_get_string("storage/model"); @@ -691,8 +626,7 @@ static void surf_config_models_setup() surf_host_model_description[host_id].model_init_preparse(); XBT_DEBUG("Call vm_model_init"); - int vm_id = find_model_description(surf_vm_model_description, vm_model_name); - surf_vm_model_description[vm_id].model_init_preparse(); + surf_vm_model_init_HL13(); XBT_DEBUG("Call storage_model_init"); int storage_id = find_model_description(surf_storage_model_description, storage_model_name); @@ -768,8 +702,9 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) } if (current_routing == nullptr) { /* it is the first one */ - xbt_assert(routing_platf->root_ == nullptr, "All defined components must belong to a AS"); - routing_platf->root_ = new_as; + xbt_assert(simgrid::s4u::Engine::instance()->pimpl->rootAs_ == nullptr, + "All defined components must belong to a AS"); + simgrid::s4u::Engine::instance()->pimpl->rootAs_ = new_as; } else { /* set the father behavior */