X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aabd69e2ec25a7e7e1b6e3d7d86f531c42f4fca9..5e3c88ee7fb6765d3a7e0b514dc5f550e9c1b996:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 3adc2e1aeb..e7057d6604 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -73,20 +73,17 @@ void sg_platf_exit(void) { /** @brief Add an "host" to the current AS */ void sg_platf_new_host(sg_platf_host_cbarg_t host) { - xbt_assert(! sg_host_by_name(host->id), - "Refusing to create a second host named '%s'.", host->id); + xbt_assert(! sg_host_by_name(host->id), "Refusing to create a second host named '%s'.", host->id); simgrid::surf::AsImpl* current_routing = routing_get_current(); if (current_routing->hierarchy_ == simgrid::surf::AsImpl::RoutingMode::unset) current_routing->hierarchy_ = simgrid::surf::AsImpl::RoutingMode::base; simgrid::surf::NetCard *netcard = - new simgrid::surf::NetCardImpl(host->id, SURF_NETWORK_ELEMENT_HOST, current_routing); + new simgrid::surf::NetCardImpl(host->id, simgrid::surf::NetCard::Type::Host, current_routing); - netcard->setId(current_routing->addComponent(netcard)); sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id); h->pimpl_netcard = netcard; - simgrid::surf::netcardCreatedCallbacks(netcard); if(mount_list){ xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); @@ -97,8 +94,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) unsigned int cursor; char*str; - if (!COORD_HOST_LEVEL) - xbt_die ("To use host coordinates, please add --cfg=network/coordinates:yes to your command line"); + 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_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL); @@ -112,12 +108,13 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) XBT_DEBUG("Having set host coordinates for '%s'",host->id); } - simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h, - host->speed_peak, - host->speed_trace, - host->core_amount, - host->state_trace); + 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, host->properties)->attach(h); if (host->pstate != 0) @@ -141,11 +138,10 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL), "Refusing to create a router named '%s': this name already describes a node.", router->id); - simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(router->id, SURF_NETWORK_ELEMENT_ROUTER, current_routing); - netcard->setId(current_routing->addComponent(netcard)); + simgrid::surf::NetCard *netcard = + new simgrid::surf::NetCardImpl(router->id, simgrid::surf::NetCard::Type::Router, current_routing); xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) netcard); XBT_DEBUG("Having set name '%s' id '%d'", router->id, netcard->id()); - simgrid::surf::netcardCreatedCallbacks(netcard); if (router->coord && strcmp(router->coord, "")) { unsigned int cursor; @@ -171,6 +167,27 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) } void sg_platf_new_link(sg_platf_link_cbarg_t link){ + std::vector names; + + if (link->policy == SURF_LINK_FULLDUPLEX) { + names.push_back(bprintf("%s_UP", link->id)); + names.push_back(bprintf("%s_DOWN", link->id)); + } else { + 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); + + if (link->latency_trace) + l->setLatencyTrace(link->latency_trace); + if (link->bandwidth_trace) + l->setBandwidthTrace(link->bandwidth_trace); + if (link->state_trace) + l->setStateTrace(link->state_trace); + + xbt_free(link_name); + } + simgrid::surf::on_link(link); } @@ -270,7 +287,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) xbt_dict_set(patterns, "radical", bprintf("%d", i), NULL); char *avail_file = xbt_str_varsubst(cluster->availability_trace, patterns); XBT_DEBUG("\tavailability_file=\"%s\"", avail_file); - host.speed_trace = tmgr_trace_new_from_file(avail_file); + if (avail_file && avail_file[0]) + host.speed_trace = tmgr_trace_new_from_file(avail_file); xbt_free(avail_file); } else { XBT_DEBUG("\tavailability_file=\"\""); @@ -279,21 +297,22 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) if (cluster->state_trace && strcmp(cluster->state_trace, "")) { char *avail_file = xbt_str_varsubst(cluster->state_trace, patterns); XBT_DEBUG("\tstate_file=\"%s\"", avail_file); - host.state_trace = tmgr_trace_new_from_file(avail_file); + if (avail_file && avail_file[0]) + host.state_trace = tmgr_trace_new_from_file(avail_file); xbt_free(avail_file); } else { XBT_DEBUG("\tstate_file=\"\""); } - host.speed_peak = xbt_dynar_new(sizeof(double), NULL); - xbt_dynar_push(host.speed_peak,&cluster->speed); + host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); + xbt_dynar_push(host.speed_per_pstate,&cluster->speed); host.pstate = 0; //host.power_peak = cluster->power; host.core_amount = cluster->core_amount; host.coord = ""; sg_platf_new_host(&host); - xbt_dynar_free(&host.speed_peak); + xbt_dynar_free(&host.speed_per_pstate); XBT_DEBUG(""); XBT_DEBUG("", link_id, @@ -324,7 +343,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) info_loop.link_up = Link::byName(tmp_link); info_loop.link_down = info_loop.link_up; free(tmp_link); - xbt_dynar_set(current_routing->upDownLinks, rankId*(static_cast(current_routing))->nb_links_per_node_, &info_loop); + auto as_cluster = static_cast(current_routing); + xbt_dynar_set(as_cluster->privateLinks_, rankId*as_cluster->nb_links_per_node_, &info_loop); } //add a limiter link (shared link to account for maximal bandwidth of the node) @@ -344,7 +364,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) info_lim.link_down = info_lim.link_up; free(tmp_link); auto as_cluster = static_cast(current_routing); - xbt_dynar_set(current_routing->upDownLinks, rankId*(as_cluster)->nb_links_per_node_ + as_cluster->has_loopback_ , &info_lim); + xbt_dynar_set(as_cluster->privateLinks_, rankId*(as_cluster)->nb_links_per_node_ + as_cluster->has_loopback_ , &info_lim); } @@ -470,10 +490,10 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) link_id = bprintf("link_%s%d%s",cabinet->prefix,i,cabinet->suffix); host.id = host_id; link.id = link_id; - host.speed_peak = xbt_dynar_new(sizeof(double), NULL); - xbt_dynar_push(host.speed_peak,&cabinet->speed); + host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); + xbt_dynar_push(host.speed_per_pstate,&cabinet->speed); sg_platf_new_host(&host); - xbt_dynar_free(&host.speed_peak); + xbt_dynar_free(&host.speed_per_pstate); sg_platf_new_link(&link); char* link_up = bprintf("%s_UP",link_id); @@ -561,10 +581,6 @@ void sg_platf_new_storage_type(sg_platf_storage_type_cbarg_t storage_type){ ROUTING_STORAGE_TYPE_LEVEL, (void *) stype); } -void sg_platf_new_mstorage(sg_platf_mstorage_cbarg_t mstorage) -{ - THROW_UNIMPLEMENTED; -} static void mount_free(void *p) { @@ -573,7 +589,6 @@ static void mount_free(void *p) } void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){ - // Verification of an existing storage xbt_assert(xbt_lib_get_or_null(storage_lib, mount->storageId, ROUTING_STORAGE_LEVEL), "Cannot mount non-existent disk \"%s\"", mount->storageId); @@ -700,14 +715,10 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) using simgrid::surf::NetCard; using simgrid::surf::AsCluster; - char *host_id = NULL; - char *link_id = NULL; - char *router_id = NULL; + char *host_id = bprintf("peer_%s", peer->id); + char *router_id = bprintf("router_%s", peer->id); XBT_DEBUG(" "); - host_id = bprintf("peer_%s", peer->id); - link_id = bprintf("link_%s", peer->id); - router_id = bprintf("router_%s", peer->id); XBT_DEBUG("", peer->id); s_sg_platf_AS_cbarg_t AS = SG_PLATF_AS_INITIALIZER; @@ -720,28 +731,27 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) memset(&host, 0, sizeof(host)); host.id = host_id; - host.speed_peak = xbt_dynar_new(sizeof(double), NULL); - xbt_dynar_push(host.speed_peak,&peer->speed); + host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); + xbt_dynar_push(host.speed_per_pstate,&peer->speed); host.pstate = 0; - //host.power_peak = peer->power; host.speed_trace = peer->availability_trace; host.state_trace = peer->state_trace; host.core_amount = 1; sg_platf_new_host(&host); - xbt_dynar_free(&host.speed_peak); + xbt_dynar_free(&host.speed_per_pstate); s_sg_platf_link_cbarg_t link = SG_PLATF_LINK_INITIALIZER; memset(&link, 0, sizeof(link)); link.policy = SURF_LINK_SHARED; link.latency = peer->lat; - char* link_up = bprintf("%s_UP",link_id); + 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("%s_DOWN",link_id); + 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; @@ -754,6 +764,8 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) 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 = SG_PLATF_ROUTER_INITIALIZER; @@ -767,12 +779,8 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) sg_platf_new_AS_end(); XBT_DEBUG(" "); - //xbt_dynar_free(&tab_elements_num); free(router_id); free(host_id); - free(link_id); - free(link_up); - free(link_down); } void sg_platf_begin() { /* Do nothing: just for symmetry of user code */ } @@ -900,12 +908,10 @@ void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) } /* make a new routing component */ - simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->name(), SURF_NETWORK_ELEMENT_AS, current_routing); + simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->name(), simgrid::surf::NetCard::Type::As, current_routing); - if (current_routing == NULL && routing_platf->root_ == NULL) { - /* it is the first one */ + if (current_routing == NULL && routing_platf->root_ == NULL) { /* it is the first one */ routing_platf->root_ = new_as; - netcard->setId(-1); } else if (current_routing != NULL && routing_platf->root_ != NULL) { xbt_assert(!xbt_dict_get_or_null(current_routing->children(), AS->id), @@ -917,8 +923,6 @@ void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) current_routing->hierarchy_ = simgrid::surf::AsImpl::RoutingMode::recursive; /* add to the sons dictionary */ xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, NULL); - /* add to the father element list */ - netcard->setId(current_routing->addComponent(netcard)); } else { THROWF(arg_error, 0, "All defined components must belong to a AS"); } @@ -930,7 +934,6 @@ void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) current_routing = new_as; current_routing->netcard_ = netcard; - simgrid::surf::netcardCreatedCallbacks(netcard); simgrid::surf::asCreatedCallbacks(new_as); if (TRACE_is_enabled()) sg_instr_AS_begin(AS); @@ -945,7 +948,7 @@ void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) void sg_platf_new_AS_end() { xbt_assert(current_routing, "Cannot seal the current AS: none under construction"); - current_routing->Seal(); + current_routing->seal(); current_routing = static_cast(current_routing->father()); if (TRACE_is_enabled()) @@ -953,26 +956,26 @@ void sg_platf_new_AS_end() } /** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */ -void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t netcard_arg) +void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink) { - simgrid::surf::NetCard *netcard = sg_host_by_name(netcard_arg->id)->pimpl_netcard; - xbt_assert(netcard, "Host '%s' not found!", netcard_arg->id); - xbt_assert(dynamic_cast(current_routing) || - dynamic_cast(current_routing), - "Only hosts from Cluster and Vivaldi ASes can get a host_link."); + simgrid::surf::NetCard *netcard = sg_host_by_name(hostlink->id)->pimpl_netcard; + xbt_assert(netcard, "Host '%s' not found!", hostlink->id); + 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.link_up = Link::byName(netcard_arg->link_up); - link_up_down.link_down = Link::byName(netcard_arg->link_down); + link_up_down.link_up = Link::byName(hostlink->link_up); + link_up_down.link_down = Link::byName(hostlink->link_down); - xbt_assert(link_up_down.link_up, "Link '%s' not found!",netcard_arg->link_up); - xbt_assert(link_up_down.link_down, "Link '%s' not found!",netcard_arg->link_down); + xbt_assert(link_up_down.link_up, "Link '%s' not found!",hostlink->link_up); + xbt_assert(link_up_down.link_down, "Link '%s' not found!",hostlink->link_down); // If dynar is is greater than netcard id and if the host_link is already defined - if((int)xbt_dynar_length(current_routing->upDownLinks) > netcard->id() && - xbt_dynar_get_as(current_routing->upDownLinks, netcard->id(), void*)) - surf_parse_error("Host_link for '%s' is already defined!",netcard_arg->id); + auto as_cluster = static_cast(current_routing); + if((int)xbt_dynar_length(as_cluster->privateLinks_) > netcard->id() && + xbt_dynar_get_as(as_cluster->privateLinks_, netcard->id(), void*)) + 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()); - xbt_dynar_set_as(current_routing->upDownLinks, netcard->id(), s_surf_parsing_link_up_down_t, link_up_down); + xbt_dynar_set_as(as_cluster->privateLinks_, netcard->id(), s_surf_parsing_link_up_down_t, link_up_down); }