X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09591e452f1ad241ba2b790bae40a166cee8285e..18bee871381a6ce670d9da211f43ab9b55fdc350:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 632ae08bd6..09d488ec9e 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -14,25 +14,28 @@ #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" #include "src/surf/xml/platf_private.hpp" +#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); @@ -72,73 +75,42 @@ void sg_platf_exit() { surf_parse_lex_destroy(); } -/** @brief Add an "host" to the current AS */ -void sg_platf_new_host(sg_platf_host_cbarg_t host) +/** @brief Add an host to the current AS */ +void sg_platf_new_host(sg_platf_host_cbarg_t args) { - xbt_assert(sg_host_by_name(host->id) == nullptr, "Refusing to create a second host named '%s'.", host->id); - - simgrid::kernel::routing::AsImpl* current_routing = routing_get_current(); - if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset) - current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::base; - - simgrid::kernel::routing::NetCard *netcard = - new simgrid::kernel::routing::NetCardImpl(host->id, simgrid::kernel::routing::NetCard::Type::Host, current_routing); + simgrid::s4u::Host* host = routing_get_current()->createHost(args->id, &args->speed_per_pstate, args->core_amount); - sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id); - h->pimpl_netcard = netcard; + new simgrid::surf::HostImpl(host, mount_list); + xbt_lib_set(storage_lib, args->id, ROUTING_STORAGE_HOST_LEVEL, static_cast(mount_list)); + mount_list = nullptr; - if(mount_list) { - xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); - mount_list = nullptr; - } - - if (host->coord && strcmp(host->coord, "")) { - unsigned int cursor; - char*str; - - xbt_assert(COORD_HOST_LEVEL, "To use host coordinates, please add --cfg=network/coordinates:yes to your command line"); - /* Pre-parse the host coordinates -- FIXME factorize with routers by overloading the routing->parse_PU function*/ - xbt_dynar_t ctn_str = xbt_str_split_str(host->coord, " "); - xbt_assert(xbt_dynar_length(ctn_str)==3,"Coordinates of %s must have 3 dimensions", host->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); - h->extension_set(COORD_HOST_LEVEL, (void *) ctn); - } - - simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h, &host->speed_per_pstate, host->core_amount); - if (host->state_trace) - cpu->setStateTrace(host->state_trace); - if (host->speed_trace) - cpu->setSpeedTrace(host->speed_trace); - surf_host_model->createHost(host->id, netcard, cpu)->attach(h); - - if (host->properties) { + if (args->properties) { xbt_dict_cursor_t cursor=nullptr; char *key,*data; - xbt_dict_foreach(host->properties,cursor,key,data) - h->setProperty(key,data); - xbt_dict_free(&host->properties); + xbt_dict_foreach (args->properties, cursor, key, data) + host->setProperty(key, data); + xbt_dict_free(&args->properties); } - if (host->pstate != 0) - cpu->setPState(host->pstate); + /* Change from the defaults */ + if (args->state_trace) + host->pimpl_cpu->setStateTrace(args->state_trace); + if (args->speed_trace) + host->pimpl_cpu->setSpeedTrace(args->speed_trace); + if (args->pstate != 0) + host->pimpl_cpu->setPState(args->pstate); + if (args->coord && strcmp(args->coord, "")) + new simgrid::kernel::routing::vivaldi::Coords(host->pimpl_netcard, args->coord); - simgrid::s4u::Host::onCreation(*h); + simgrid::s4u::Host::onCreation(*host); if (TRACE_is_enabled() && TRACE_needs_platform()) - sg_instr_new_host(host); + sg_instr_new_host(*host); } /** @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) @@ -147,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)); @@ -187,7 +144,15 @@ void sg_platf_new_link(sg_platf_link_cbarg_t link){ names.push_back(xbt_strdup(link->id)); } for (auto link_name : names) { - Link *l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy, link->properties); + Link* l = surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); + + if (link->properties) { + xbt_dict_cursor_t cursor = nullptr; + char *key, *data; + xbt_dict_foreach (link->properties, cursor, key, data) + l->setProperty(key, data); + xbt_dict_free(&link->properties); + } if (link->latency_trace) l->setLatencyTrace(link->latency_trace); @@ -256,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); } } @@ -272,8 +237,6 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) XBT_DEBUG("", link_id, cluster->bw, cluster->lat); - s_surf_parsing_link_up_down_t info_lim; - s_surf_parsing_link_up_down_t info_loop; // All links are saved in a matrix; // every row describes a single node; every node may have multiple links. // the first column may store a link from x to x if p_has_loopback is set @@ -281,6 +244,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) // other columns are to store one or more link for the node //add a loopback link + Link* linkUp = nullptr; + Link* linkDown = nullptr; if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ char *tmp_link = bprintf("%s_loopback", link_id); XBT_DEBUG("", tmp_link, cluster->loopback_bw); @@ -291,15 +256,17 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) link.latency = cluster->loopback_lat; link.policy = SURF_LINK_FATPIPE; sg_platf_new_link(&link); - info_loop.linkUp = Link::byName(tmp_link); - info_loop.linkDown = Link::byName(tmp_link); + linkUp = Link::byName(tmp_link); + linkDown = Link::byName(tmp_link); free(tmp_link); auto as_cluster = static_cast(current_as); - as_cluster->privateLinks_.insert({rankId*as_cluster->linkCountPerNode_, info_loop}); + as_cluster->privateLinks_.insert({rankId * as_cluster->linkCountPerNode_, {linkUp, linkDown}}); } //add a limiter link (shared link to account for maximal bandwidth of the node) + linkUp = nullptr; + linkDown = nullptr; if(cluster->limiter_link!=0){ char *tmp_link = bprintf("%s_limiter", link_id); XBT_DEBUG("", tmp_link, cluster->limiter_link); @@ -310,10 +277,10 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) link.latency = 0; link.policy = SURF_LINK_SHARED; sg_platf_new_link(&link); - info_lim.linkUp = info_lim.linkDown = Link::byName(tmp_link); + linkUp = linkDown = Link::byName(tmp_link); free(tmp_link); current_as->privateLinks_.insert( - {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_ , info_lim}); + {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}}); } //call the cluster function that adds the others links @@ -444,12 +411,16 @@ void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) storage->content_type, storage->properties); - surf_storage_model->createStorage(storage->id, - ((storage_type_t) stype)->type_id, - storage->content, - storage->content_type, - storage->properties, - storage->attach); + auto s = surf_storage_model->createStorage(storage->id, ((storage_type_t)stype)->type_id, storage->content, + storage->content_type, storage->attach); + + if (storage->properties) { + xbt_dict_cursor_t cursor = nullptr; + char *key, *data; + xbt_dict_foreach (storage->properties, cursor, key, data) + s->setProperty(key, data); + xbt_dict_free(&storage->properties); + } } void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){ @@ -523,7 +494,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) simgrid::s4u::Host* host; unsigned int cursor; xbt_dynar_foreach(all_hosts,cursor, host) { - xbt_strbuff_append(msg,host->name().c_str()); + xbt_strbuff_append(msg, host->cname()); xbt_strbuff_append(msg,"', '"); if (msg->used > 1024) { msg->data[msg->used-3]='\0'; @@ -569,8 +540,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) arg->kill_time = kill_time; arg->properties = current_property_set; - XBT_DEBUG("Process %s@%s will be started at time %f", - arg->name.c_str(), arg->host->name().c_str(), start_time); + XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->cname(), start_time); SIMIX_timer_set(start_time, [=]() { simix_global->create_process_function( arg->name.c_str(), @@ -584,8 +554,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) delete arg; }); } else { // start_time <= SIMIX_get_clock() - XBT_DEBUG("Starting Process %s(%s) right now", - arg->name.c_str(), sg_host_get_name(host)); + XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->cname()); process_created = simix_global->create_process_function( arg->name.c_str(), std::move(code), nullptr, @@ -602,72 +571,21 @@ 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(" "); - - 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; + simgrid::kernel::routing::AsVivaldi* as = dynamic_cast(current_routing); + xbt_assert(as, " tag can only be used in Vivaldi ASes"); - 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); + std::vector speedPerPstate; + speedPerPstate.push_back(peer->speed); + simgrid::s4u::Host* host = as->createHost(peer->id, &speedPerPstate, 1); - 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); - - XBT_DEBUG(""); - sg_platf_new_AS_seal(); - XBT_DEBUG(" "); + 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->speed_trace) + host->pimpl_cpu->setSpeedTrace(peer->speed_trace); } void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ } @@ -680,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"); @@ -709,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); @@ -785,25 +701,22 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) break; } + if (current_routing == nullptr) { /* it is the first one */ + 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; - if (current_routing == nullptr && routing_platf->root_ == nullptr) { /* it is the first one */ - routing_platf->root_ = new_as; - - } else if (current_routing != nullptr && routing_platf->root_ != nullptr) { + } else { /* set the father behavior */ if (current_routing->hierarchy_ == simgrid::kernel::routing::AsImpl::RoutingMode::unset) current_routing->hierarchy_ = simgrid::kernel::routing::AsImpl::RoutingMode::recursive; /* add to the sons dictionary */ xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, nullptr); - - } else { - THROWF(arg_error, 0, "All defined components must belong to a AS"); } /* set the new current component of the tree */ current_routing = new_as; - simgrid::kernel::routing::asCreatedCallbacks(new_as); if (TRACE_is_enabled()) sg_instr_AS_begin(AS); @@ -834,18 +747,17 @@ void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink) xbt_assert(dynamic_cast(current_routing), "Only hosts from Cluster and Vivaldi ASes can get an host_link."); - s_surf_parsing_link_up_down_t link_up_down; - link_up_down.linkUp = Link::byName(hostlink->link_up); - link_up_down.linkDown = Link::byName(hostlink->link_down); + simgrid::surf::Link* linkUp = Link::byName(hostlink->link_up); + simgrid::surf::Link* linkDown = Link::byName(hostlink->link_down); - xbt_assert(link_up_down.linkUp, "Link '%s' not found!",hostlink->link_up); - xbt_assert(link_up_down.linkDown, "Link '%s' not found!",hostlink->link_down); + xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up); + xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down); auto as_cluster = static_cast(current_routing); if (as_cluster->privateLinks_.find(netcard->id()) != as_cluster->privateLinks_.end()) surf_parse_error("Host_link for '%s' is already defined!",hostlink->id); - XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->name(), netcard->id()); - as_cluster->privateLinks_.insert({netcard->id(), link_up_down}); + XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->cname(), netcard->id()); + as_cluster->privateLinks_.insert({netcard->id(), {linkUp, linkDown}}); }