X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e9ecc268a45db21daf49b37edb7df76987f798b..0a95c78251f3ecbf1dfcb3ebe7904e44acf1beef:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 0c7df96202..94fb072984 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,163 +1,359 @@ -/* Copyright (c) 2006-2014. The SimGrid Team. - * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "xbt/misc.h" -#include "xbt/log.h" -#include "xbt/str.h" -#include "xbt/dict.h" -#include "xbt/RngStream.h" -#include -#include "simgrid/platf_interface.h" -#include "surf/surf_routing.h" -#include "surf/surf.h" +#include "simgrid/s4u/engine.hpp" +#include "src/kernel/EngineImpl.hpp" #include "src/simix/smx_private.h" -#include "src/surf/platform.hpp" -#include "cpu_interface.hpp" -#include "host_interface.hpp" +#include "src/include/simgrid/sg_config.h" + +#include "src/surf/HostImpl.hpp" +#include "src/surf/cpu_interface.hpp" +#include "src/surf/network_interface.hpp" + +#include "src/kernel/routing/ClusterZone.hpp" +#include "src/kernel/routing/DijkstraZone.hpp" +#include "src/kernel/routing/DragonflyZone.hpp" +#include "src/kernel/routing/EmptyZone.hpp" +#include "src/kernel/routing/FatTreeZone.hpp" +#include "src/kernel/routing/FloydZone.hpp" +#include "src/kernel/routing/FullZone.hpp" +#include "src/kernel/routing/NetPoint.hpp" +#include "src/kernel/routing/NetZoneImpl.hpp" +#include "src/kernel/routing/TorusZone.hpp" +#include "src/kernel/routing/VivaldiZone.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); +XBT_PRIVATE xbt_dynar_t mount_list = nullptr; + namespace simgrid { namespace surf { -simgrid::xbt::signal on_link; simgrid::xbt::signal on_cluster; -simgrid::xbt::signal on_postparse; } } static int surf_parse_models_setup_already_called = 0; -/* one RngStream for the platform, to respect some statistic rules */ -static RngStream sg_platf_rng_stream = NULL; +/** The current AS in the parsing */ +static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr; +static simgrid::kernel::routing::NetZoneImpl* routing_get_current() +{ + return current_routing; +} /** Module management function: creates all internal data structures */ -void sg_platf_init(void) { +void sg_platf_init() { } /** Module management function: frees all internal data structures */ -void sg_platf_exit(void) { - simgrid::surf::on_link.disconnect_all_slots(); +void sg_platf_exit() { simgrid::surf::on_cluster.disconnect_all_slots(); - simgrid::surf::on_postparse.disconnect_all_slots(); + simgrid::s4u::onPlatformCreated.disconnect_all_slots(); /* make sure that we will reinit the models while loading the platf once reinited */ surf_parse_models_setup_already_called = 0; + 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), - "Refusing to create a second host named '%s'.", host->id); + std::unordered_map props; + if (args->properties) { + xbt_dict_cursor_t cursor=nullptr; + char *key,*data; + xbt_dict_foreach (args->properties, cursor, key, data) + props[key] = data; + xbt_dict_free(&args->properties); + } - simgrid::surf::As* current_routing = routing_get_current(); - if (current_routing->p_hierarchy == SURF_ROUTING_NULL) - current_routing->p_hierarchy = SURF_ROUTING_BASE; + simgrid::s4u::Host* host = + routing_get_current()->createHost(args->id, &args->speed_per_pstate, args->core_amount, &props); - simgrid::surf::NetCard *netcard = - new simgrid::surf::NetCardImpl(xbt_strdup(host->id), -1, SURF_NETWORK_ELEMENT_HOST, current_routing); + host->pimpl_->storage_ = mount_list; + xbt_lib_set(storage_lib, args->id, ROUTING_STORAGE_HOST_LEVEL, static_cast(mount_list)); + mount_list = nullptr; - netcard->setId(current_routing->parsePU(netcard)); - sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id); - h->pimpl_netcard = netcard; - simgrid::surf::netcardCreatedCallbacks(netcard); + /* 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_netpoint, args->coord); - if(mount_list){ - xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); - mount_list = NULL; - } + if (TRACE_is_enabled() && TRACE_needs_platform()) + sg_instr_new_host(*host); +} - if (host->coord && strcmp(host->coord, "")) { - 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"); - /* 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); - xbt_dynar_foreach(ctn_str,cursor, str) { - double val = xbt_str_parse_double(str, "Invalid coordinate: %s"); - xbt_dynar_push(ctn,&val); - } - xbt_dynar_shrink(ctn, 0); - xbt_dynar_free(&ctn_str); - h->extension_set(COORD_HOST_LEVEL, (void *) ctn); - XBT_DEBUG("Having set host coordinates for '%s'",host->id); - } +/** @brief Add a "router" to the network element list */ +simgrid::kernel::routing::NetPoint* sg_platf_new_router(const char* name, const char* coords) +{ + simgrid::kernel::routing::NetZoneImpl* current_routing = routing_get_current(); + if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) + current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::base; + xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netpointByNameOrNull(name), + "Refusing to create a router named '%s': this name already describes a node.", name); - simgrid::surf::Cpu *cpu = surf_cpu_model_pm->createCpu( h, - host->speed_peak, - host->pstate, - host->speed_scale, host->speed_trace, - host->core_amount, - host->initiallyOn, host->state_trace); - surf_host_model->createHost(host->id, netcard, cpu, host->properties)->attach(h); - simgrid::s4u::Host::onCreation(*h); + simgrid::kernel::routing::NetPoint* netpoint = + new simgrid::kernel::routing::NetPoint(name, simgrid::kernel::routing::NetPoint::Type::Router, current_routing); + XBT_DEBUG("Router '%s' has the id %d", name, netpoint->id()); - if (TRACE_is_enabled() && TRACE_needs_platform()) - sg_instr_new_host(host); + if (coords && strcmp(coords, "")) + new simgrid::kernel::routing::vivaldi::Coords(netpoint, coords); + + sg_instr_new_router(name); + + return netpoint; } -/** - * \brief Add a "router" to the network element list - */ -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) { + simgrid::surf::LinkImpl* 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); + if (link->bandwidth_trace) + l->setBandwidthTrace(link->bandwidth_trace); + if (link->state_trace) + l->setStateTrace(link->state_trace); + + xbt_free(link_name); + } +} + +void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) { - simgrid::surf::As* current_routing = routing_get_current(); - - if (current_routing->p_hierarchy == SURF_ROUTING_NULL) - current_routing->p_hierarchy = SURF_ROUTING_BASE; - xbt_assert(!xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL), - "Reading a router, processing unit \"%s\" already exists", - router->id); - - simgrid::surf::NetCard *info = new simgrid::surf::NetCardImpl( - xbt_strdup(router->id), -1, SURF_NETWORK_ELEMENT_ROUTER, current_routing); - info->setId(current_routing->parsePU(info)); - xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info); - XBT_DEBUG("Having set name '%s' id '%d'", router->id, info->getId()); - simgrid::surf::netcardCreatedCallbacks(info); - - if (router->coord && strcmp(router->coord, "")) { - unsigned int cursor; - char*str; - - if (!COORD_ASR_LEVEL) - xbt_die ("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_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL); - xbt_dynar_foreach(ctn_str,cursor, str) { - double val = xbt_str_parse_double(str, "Invalid coordinate: %s"); - xbt_dynar_push(ctn,&val); + using simgrid::kernel::routing::ClusterZone; + using simgrid::kernel::routing::DragonflyZone; + using simgrid::kernel::routing::FatTreeZone; + using simgrid::kernel::routing::TorusZone; + + int rankId=0; + + s_sg_platf_link_cbarg_t link; + + // What an inventive way of initializing the AS that I have as ancestor :-( + s_sg_platf_AS_cbarg_t AS; + AS.id = cluster->id; + switch (cluster->topology) { + case SURF_CLUSTER_TORUS: + AS.routing = A_surfxml_AS_routing_ClusterTorus; + break; + case SURF_CLUSTER_DRAGONFLY: + AS.routing = A_surfxml_AS_routing_ClusterDragonfly; + break; + case SURF_CLUSTER_FAT_TREE: + AS.routing = A_surfxml_AS_routing_ClusterFatTree; + break; + default: + AS.routing = A_surfxml_AS_routing_Cluster; + break; + } + sg_platf_new_AS_begin(&AS); + simgrid::kernel::routing::ClusterZone* current_as = static_cast(routing_get_current()); + current_as->parse_specific_arguments(cluster); + + if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ + current_as->linkCountPerNode_++; + current_as->hasLoopback_ = 1; + } + + if(cluster->limiter_link!=0){ + current_as->linkCountPerNode_++; + current_as->hasLimiter_ = 1; + } + + for (int i : *cluster->radicals) { + char * host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); + char * link_id = bprintf("%s_link_%d", cluster->id, i); + + XBT_DEBUG("", host_id, cluster->speed); + + s_sg_platf_host_cbarg_t host; + memset(&host, 0, sizeof(host)); + host.id = host_id; + if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) { + xbt_dict_cursor_t cursor=nullptr; + char *key,*data; + host.properties = xbt_dict_new_homogeneous(free); + + xbt_dict_foreach(cluster->properties,cursor,key,data) { + xbt_dict_set(host.properties, key, xbt_strdup(data), nullptr); + } + } + + host.speed_per_pstate.push_back(cluster->speed); + host.pstate = 0; + host.core_amount = cluster->core_amount; + host.coord = ""; + sg_platf_new_host(&host); + XBT_DEBUG(""); + + XBT_DEBUG("", link_id, cluster->bw, cluster->lat); + + // 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 + // the second column may store a limiter link if p_has_limiter is set + // other columns are to store one or more link for the node + + //add a loopback link + simgrid::surf::LinkImpl* linkUp = nullptr; + simgrid::surf::LinkImpl* 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); + + memset(&link, 0, sizeof(link)); + link.id = tmp_link; + link.bandwidth = cluster->loopback_bw; + link.latency = cluster->loopback_lat; + link.policy = SURF_LINK_FATPIPE; + sg_platf_new_link(&link); + linkUp = simgrid::surf::LinkImpl::byName(tmp_link); + linkDown = simgrid::surf::LinkImpl::byName(tmp_link); + free(tmp_link); + + auto as_cluster = static_cast(current_as); + 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); + + memset(&link, 0, sizeof(link)); + link.id = tmp_link; + link.bandwidth = cluster->limiter_link; + link.latency = 0; + link.policy = SURF_LINK_SHARED; + sg_platf_new_link(&link); + linkUp = linkDown = simgrid::surf::LinkImpl::byName(tmp_link); + free(tmp_link); + current_as->privateLinks_.insert( + {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}}); + } + + //call the cluster function that adds the others links + if (cluster->topology == SURF_CLUSTER_FAT_TREE) { + static_cast(current_as)->addProcessingNode(i); } - xbt_dynar_shrink(ctn, 0); - xbt_dynar_free(&ctn_str); - xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn); - XBT_DEBUG("Having set router coordinates for '%s'",router->id); + else { + current_as->create_links_for_node(cluster, i, rankId, + rankId*current_as->linkCountPerNode_ + current_as->hasLoopback_ + current_as->hasLimiter_ ); + } + xbt_free(link_id); + xbt_free(host_id); + rankId++; } - if (TRACE_is_enabled() && TRACE_needs_platform()) - sg_instr_new_router(router); + // Add a router. + XBT_DEBUG(" "); + XBT_DEBUG("", cluster->router_id); + if (!cluster->router_id || !strcmp(cluster->router_id, "")) { + char* newid = bprintf("%s%s_router%s", cluster->prefix, cluster->id, cluster->suffix); + current_as->router_ = sg_platf_new_router(newid, NULL); + free(newid); + } else { + current_as->router_ = sg_platf_new_router(cluster->router_id, NULL); + } + + //Make the backbone + if ((cluster->bb_bw != 0) || (cluster->bb_lat != 0)) { + + memset(&link, 0, sizeof(link)); + link.id = bprintf("%s_backbone", cluster->id); + link.bandwidth = cluster->bb_bw; + link.latency = cluster->bb_lat; + link.policy = cluster->bb_sharing_policy; + + XBT_DEBUG("", link.id, cluster->bb_bw, cluster->bb_lat); + sg_platf_new_link(&link); + + routing_cluster_add_backbone(simgrid::surf::LinkImpl::byName(link.id)); + free((char*)link.id); + } + + XBT_DEBUG(""); + sg_platf_new_AS_seal(); + + simgrid::surf::on_cluster(cluster); + delete cluster->radicals; } +void routing_cluster_add_backbone(simgrid::surf::LinkImpl* bb) +{ + simgrid::kernel::routing::ClusterZone* cluster = + dynamic_cast(current_routing); -void sg_platf_new_link(sg_platf_link_cbarg_t link){ - simgrid::surf::on_link(link); + xbt_assert(cluster, "Only hosts from Cluster can get a backbone."); + xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->name()); + + cluster->backbone_ = bb; + XBT_DEBUG("Add a backbone to AS '%s'", current_routing->name()); } -void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) +void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) { - routing_new_cluster(cluster); - simgrid::surf::on_cluster(cluster); + for (int radical : *cabinet->radicals) { + char *hostname = bprintf("%s%d%s", cabinet->prefix, radical, cabinet->suffix); + s_sg_platf_host_cbarg_t host; + memset(&host, 0, sizeof(host)); + host.pstate = 0; + host.core_amount = 1; + host.id = hostname; + host.speed_per_pstate.push_back(cabinet->speed); + sg_platf_new_host(&host); + + s_sg_platf_link_cbarg_t link; + memset(&link, 0, sizeof(link)); + link.policy = SURF_LINK_FULLDUPLEX; + link.latency = cabinet->lat; + link.bandwidth = cabinet->bw; + link.id = bprintf("link_%s",hostname); + sg_platf_new_link(&link); + free((char*)link.id); + + s_sg_platf_host_link_cbarg_t host_link; + memset(&host_link, 0, sizeof(host_link)); + host_link.id = hostname; + host_link.link_up = bprintf("link_%s_UP",hostname); + host_link.link_down = bprintf("link_%s_DOWN",hostname); + sg_platf_new_hostlink(&host_link); + free((char*)host_link.link_up); + free((char*)host_link.link_down); + + free(hostname); + } + delete cabinet->radicals; } void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) @@ -173,10 +369,7 @@ void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) storage->type_id, storage->content); - xbt_lib_set(storage_lib, - storage->id, - ROUTING_STORAGE_LEVEL, - (void *) xbt_strdup(storage->type_id)); + xbt_lib_set(storage_lib, storage->id, ROUTING_STORAGE_LEVEL, (void *) xbt_strdup(storage->type_id)); // if storage content is not specified use the content of storage_type if any if(!strcmp(storage->content,"") && strcmp(((storage_type_t) stype)->content,"")){ @@ -197,12 +390,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){ @@ -230,23 +427,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; -// mount_t mnt = xbt_new0(s_mount_t, 1); -// mnt->id = xbt_strdup(mstorage->type_id); -// mnt->name = xbt_strdup(mstorage->name); -// -// if(!mount_list){ -// XBT_DEBUG("Creata a Mount list for %s",A_surfxml_host_id); -// mount_list = xbt_dynar_new(sizeof(char *), NULL); -// } -// xbt_dynar_push(mount_list,(void *) mnt); -// free(mnt->id); -// free(mnt->name); -// xbt_free(mnt); -// XBT_DEBUG("ROUTING Mount a storage name '%s' with type_id '%s'",mstorage->name, mstorage->id); -} static void mount_free(void *p) { @@ -255,11 +435,8 @@ static void mount_free(void *p) } void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){ - // Verification of an existing storage -#ifndef NDEBUG - void* storage = xbt_lib_get_or_null(storage_lib, mount->storageId, ROUTING_STORAGE_LEVEL); -#endif - xbt_assert(storage,"Disk id \"%s\" does not exists", mount->storageId); + xbt_assert(xbt_lib_get_or_null(storage_lib, mount->storageId, ROUTING_STORAGE_LEVEL), + "Cannot mount non-existent disk \"%s\"", mount->storageId); XBT_DEBUG("ROUTING Mount '%s' on '%s'",mount->storageId, mount->name); @@ -276,29 +453,16 @@ void sg_platf_new_mount(sg_platf_mount_cbarg_t mount){ void sg_platf_new_route(sg_platf_route_cbarg_t route) { - routing_get_current()->parseRoute(route); -} - -void sg_platf_new_ASroute(sg_platf_route_cbarg_t ASroute) -{ - routing_get_current()->parseASroute(ASroute); + routing_get_current()->addRoute(route); } void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) { - routing_get_current()->parseBypassroute(bypassRoute); -} - -void sg_platf_new_bypassASroute(sg_platf_route_cbarg_t bypassASroute) -{ - routing_get_current()->parseBypassroute(bypassASroute); + routing_get_current()->addBypassRoute(bypassRoute); } void sg_platf_new_process(sg_platf_process_cbarg_t process) { - if (!simix_global) - xbt_die("Cannot create process without SIMIX."); - sg_host_t host = sg_host_by_name(process->host); if (!host) { // The requested host does not exist. Do a nice message to the user @@ -309,117 +473,152 @@ 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'; msg->used -= 3; xbt_strbuff_append(msg," ...(list truncated)......");// That will be shortened by 3 chars when existing the loop + break; } } msg->data[msg->used-3]='\0'; xbt_die("%s", msg->data); } - xbt_main_func_t parse_code = SIMIX_get_registered_function(process->function); - xbt_assert(parse_code, "Function '%s' unknown", process->function); + simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(process->function); + xbt_assert(factory, "Function '%s' unknown", process->function); double start_time = process->start_time; double kill_time = process->kill_time; int auto_restart = process->on_failure == SURF_PROCESS_ON_FAILURE_DIE ? 0 : 1; - smx_process_arg_t arg = NULL; - smx_process_t process_created = NULL; - - arg = xbt_new0(s_smx_process_arg_t, 1); - arg->code = parse_code; - arg->data = NULL; - arg->hostname = sg_host_get_name(host); - arg->argc = process->argc; - arg->argv = xbt_new(char *,process->argc); - int i; - for (i=0; iargc; i++) - arg->argv[i] = xbt_strdup(process->argv[i]); - arg->name = xbt_strdup(arg->argv[0]); + std::vector args(process->argv, process->argv + process->argc); + std::function code = factory(std::move(args)); + + smx_process_arg_t arg = nullptr; + smx_actor_t process_created = nullptr; + + arg = new simgrid::simix::ProcessArg(); + arg->name = std::string(process->argv[0]); + arg->code = code; + arg->data = nullptr; + arg->host = host; arg->kill_time = kill_time; arg->properties = current_property_set; - if (!sg_host_simix(host)->boot_processes) { - sg_host_simix(host)->boot_processes = xbt_dynar_new(sizeof(smx_process_arg_t), _SIMIX_host_free_process_arg); - } - xbt_dynar_push_as(sg_host_simix(host)->boot_processes,smx_process_arg_t,arg); + + host->extension()->boot_processes.push_back(arg); if (start_time > SIMIX_get_clock()) { - arg = xbt_new0(s_smx_process_arg_t, 1); - arg->name = (char*)(process->argv)[0]; - arg->code = parse_code; - arg->data = NULL; - arg->hostname = sg_host_get_name(host); - arg->argc = process->argc; - arg->argv = (char**)(process->argv); + + arg = new simgrid::simix::ProcessArg(); + arg->name = std::string(process->argv[0]); + arg->code = std::move(code); + arg->data = nullptr; + arg->host = host; arg->kill_time = kill_time; arg->properties = current_property_set; - XBT_DEBUG("Process %s(%s) will be started at time %f", arg->name, - arg->hostname, start_time); - SIMIX_timer_set(start_time, [](void* arg) { - SIMIX_process_create_from_wrapper((smx_process_arg_t) arg); - }, arg); + 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, [arg]() { + smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(arg->code), arg->data, + arg->host, arg->properties, arg->auto_restart, nullptr); + if (arg->kill_time >= 0) + simcall_process_set_kill_time(actor, arg->kill_time); + delete arg; + }); } else { // start_time <= SIMIX_get_clock() - XBT_DEBUG("Starting Process %s(%s) right now", arg->name, sg_host_get_name(host)); - - if (simix_global->create_process_function) - process_created = simix_global->create_process_function( - arg->name, - parse_code, - NULL, - sg_host_get_name(host), - kill_time, - process->argc, - (char**)(process->argv), - current_property_set, - auto_restart, NULL); - else - process_created = simcall_process_create(arg->name, parse_code, NULL, sg_host_get_name(host), kill_time, process->argc, - (char**)process->argv, current_property_set,auto_restart); + 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, host, + current_property_set, auto_restart, nullptr); /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */ - if (!process_created) { + if (!process_created) return; - } + + if (arg->kill_time >= 0) + simcall_process_set_kill_time(process_created, arg->kill_time); } - current_property_set = NULL; + current_property_set = nullptr; } -void sg_platf_route_begin (sg_platf_route_cbarg_t route){ - route->link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); -} -void sg_platf_ASroute_begin (sg_platf_route_cbarg_t ASroute){ - ASroute->link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); -} +void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) +{ + simgrid::kernel::routing::VivaldiZone* as = dynamic_cast(current_routing); + xbt_assert(as, " tag can only be used in Vivaldi netzones."); -void sg_platf_route_end (sg_platf_route_cbarg_t route){ - sg_platf_new_route(route); -} -void sg_platf_ASroute_end (sg_platf_route_cbarg_t ASroute){ - sg_platf_new_ASroute(ASroute); -} + std::vector speedPerPstate; + speedPerPstate.push_back(peer->speed); + simgrid::s4u::Host* host = as->createHost(peer->id, &speedPerPstate, 1, nullptr); -void sg_platf_route_add_link (const char* link_id, sg_platf_route_cbarg_t route){ - char *link_name = xbt_strdup(link_id); - xbt_dynar_push(route->link_list, &link_name); -} -void sg_platf_ASroute_add_link (const char* link_id, sg_platf_route_cbarg_t ASroute){ - char *link_name = xbt_strdup(link_id); - xbt_dynar_push(ASroute->link_list, &link_name); + as->setPeerLink(host->pimpl_netpoint, peer->bw_in, peer->bw_out, peer->coord); + + /* 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 */ } void sg_platf_end() { - simgrid::surf::on_postparse(); + simgrid::s4u::onPlatformCreated(); +} + +/* Pick the right models for CPU, net and host, and call their model_init_preparse */ +static void surf_config_models_setup() +{ + const char* host_model_name = xbt_cfg_get_string("host/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"); + + /* The compound host model is needed when using non-default net/cpu models */ + if ((!xbt_cfg_is_default_value("network/model") || !xbt_cfg_is_default_value("cpu/model")) && + xbt_cfg_is_default_value("host/model")) { + host_model_name = "compound"; + xbt_cfg_set_string("host/model", host_model_name); + } + + XBT_DEBUG("host model: %s", host_model_name); + if (!strcmp(host_model_name, "compound")) { + xbt_assert(cpu_model_name, "Set a cpu model to use with the 'compound' host model"); + xbt_assert(network_model_name, "Set a network model to use with the 'compound' host model"); + + int cpu_id = find_model_description(surf_cpu_model_description, cpu_model_name); + surf_cpu_model_description[cpu_id].model_init_preparse(); + + int network_id = find_model_description(surf_network_model_description, network_model_name); + surf_network_model_description[network_id].model_init_preparse(); + } + + XBT_DEBUG("Call host_model_init"); + int host_id = find_model_description(surf_host_model_description, host_model_name); + surf_host_model_description[host_id].model_init_preparse(); + + XBT_DEBUG("Call vm_model_init"); + surf_vm_model_init_HL13(); + + XBT_DEBUG("Call storage_model_init"); + int storage_id = find_model_description(surf_storage_model_description, storage_model_name); + surf_storage_model_description[storage_id].model_init_preparse(); } -void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) +/** + * \brief Add an AS to the platform + * + * Add a new autonomous system to the platform. Any elements (such as host, + * router or sub-AS) added after this call and before the corresponding call + * to sg_platf_new_AS_seal() will be added to this AS. + * + * Once this function was called, the configuration concerning the used + * models cannot be changed anymore. + * + * @param AS the parameters defining the AS to build. + */ +simgrid::s4u::NetZone* sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) { if (!surf_parse_models_setup_already_called) { /* Initialize the surf models. That must be done after we got all config, and before we need the models. @@ -428,46 +627,123 @@ void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) * I'm not sure for and , there may be a bug here * (FIXME: check it out by creating a file beginning with one of these tags) * but cluster and peer create ASes internally, so putting the code in there is ok. - * - * TODO, There used to be a guard protecting here against - * xbt_dynar_length(sg_platf_AS_begin_cb_list) because we don't want to - * initialize the models if we are parsing the file to get the deployment. - * That could happen if the same file would be used for platf and deploy: - * it'd contain AS tags even during the deploy parsing. Removing that guard - * would result of the models to get re-inited when parsing for deploy. - * Currently using the same file for platform and deployment is broken - * however. This guard will have to ba adapted in order to make this feature - * work again. */ surf_parse_models_setup_already_called = 1; surf_config_models_setup(); } - routing_AS_begin(AS); + _sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent + * any further config now that we created some real content */ + + + /* search the routing model */ + simgrid::kernel::routing::NetZoneImpl* new_as = nullptr; + switch(AS->routing){ + case A_surfxml_AS_routing_Cluster: + new_as = new simgrid::kernel::routing::ClusterZone(current_routing, AS->id); + break; + case A_surfxml_AS_routing_ClusterDragonfly: + new_as = new simgrid::kernel::routing::DragonflyZone(current_routing, AS->id); + break; + case A_surfxml_AS_routing_ClusterTorus: + new_as = new simgrid::kernel::routing::TorusZone(current_routing, AS->id); + break; + case A_surfxml_AS_routing_ClusterFatTree: + new_as = new simgrid::kernel::routing::FatTreeZone(current_routing, AS->id); + break; + case A_surfxml_AS_routing_Dijkstra: + new_as = new simgrid::kernel::routing::DijkstraZone(current_routing, AS->id, 0); + break; + case A_surfxml_AS_routing_DijkstraCache: + new_as = new simgrid::kernel::routing::DijkstraZone(current_routing, AS->id, 1); + break; + case A_surfxml_AS_routing_Floyd: + new_as = new simgrid::kernel::routing::FloydZone(current_routing, AS->id); + break; + case A_surfxml_AS_routing_Full: + new_as = new simgrid::kernel::routing::FullZone(current_routing, AS->id); + break; + case A_surfxml_AS_routing_None: + new_as = new simgrid::kernel::routing::EmptyZone(current_routing, AS->id); + break; + case A_surfxml_AS_routing_Vivaldi: + new_as = new simgrid::kernel::routing::VivaldiZone(current_routing, AS->id); + break; + default: + xbt_die("Not a valid model!"); + break; + } + + if (current_routing == nullptr) { /* it is the first one */ + xbt_assert(simgrid::s4u::Engine::instance()->pimpl->netRoot_ == nullptr, + "All defined components must belong to a AS"); + simgrid::s4u::Engine::instance()->pimpl->netRoot_ = new_as; + + } else { + /* set the father behavior */ + if (current_routing->hierarchy_ == simgrid::kernel::routing::NetZoneImpl::RoutingMode::unset) + current_routing->hierarchy_ = simgrid::kernel::routing::NetZoneImpl::RoutingMode::recursive; + /* add to the sons dictionary */ + xbt_dict_set(current_routing->children(), AS->id, (void *) new_as, nullptr); + } + + /* set the new current component of the tree */ + current_routing = new_as; + if (TRACE_is_enabled()) sg_instr_AS_begin(AS); + + return new_as; } -void sg_platf_new_AS_end() +/** + * \brief Specify that the description of the current AS is finished + * + * Once you've declared all the content of your AS, you have to seal + * it with this call. Your AS is not usable until you call this function. + */ +void sg_platf_new_AS_seal() { - routing_AS_end(); + xbt_assert(current_routing, "Cannot seal the current AS: none under construction"); + current_routing->seal(); + current_routing = static_cast(current_routing->father()); + if (TRACE_is_enabled()) sg_instr_AS_end(); } -/* ***************************************** */ -void sg_platf_rng_stream_init(unsigned long seed[6]) { - RngStream_SetPackageSeed(seed); - sg_platf_rng_stream = RngStream_CreateStream(NULL); -} +/** @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 hostlink) +{ + simgrid::kernel::routing::NetPoint* netpoint = sg_host_by_name(hostlink->id)->pimpl_netpoint; + xbt_assert(netpoint, "Host '%s' not found!", hostlink->id); + xbt_assert(dynamic_cast(current_routing), + "Only hosts from Cluster and Vivaldi ASes can get an host_link."); + + simgrid::surf::LinkImpl* linkUp = simgrid::surf::LinkImpl::byName(hostlink->link_up); + simgrid::surf::LinkImpl* linkDown = simgrid::surf::LinkImpl::byName(hostlink->link_down); -RngStream sg_platf_rng_stream_get(const char* id) { - RngStream stream = NULL; - unsigned int id_hash; + xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up); + xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down); - stream = RngStream_CopyStream(sg_platf_rng_stream); - id_hash = xbt_str_hash(id); - RngStream_AdvanceState(stream, 0, (long)id_hash); + auto as_cluster = static_cast(current_routing); - return stream; + if (as_cluster->privateLinks_.find(netpoint->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", netpoint->cname(), netpoint->id()); + as_cluster->privateLinks_.insert({netpoint->id(), {linkUp, linkDown}}); +} + +void sg_platf_new_trace(sg_platf_trace_cbarg_t trace) +{ + tmgr_trace_t tmgr_trace; + if (trace->file && strcmp(trace->file, "") != 0) { + tmgr_trace = tmgr_trace_new_from_file(trace->file); + } else { + xbt_assert(strcmp(trace->pc_data, ""), + "Trace '%s' must have either a content, or point to a file on disk.",trace->id); + tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->periodicity); + } + xbt_dict_set(traces_set_list, trace->id, static_cast(tmgr_trace), nullptr); }