X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f646472eb2d52b33a9be7450259564ac890ea99..3fc07005abb54bbceec067c73455b50f96e5d908:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 112e18527a..f67e1a6e78 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -9,6 +9,7 @@ #include "xbt/str.h" #include "xbt/dict.h" #include "xbt/RngStream.h" +#include #include #include "src/surf/HostImpl.hpp" #include "surf/surf.h" @@ -26,6 +27,7 @@ #include "src/surf/AsCluster.hpp" #include "src/surf/AsClusterTorus.hpp" #include "src/surf/AsClusterFatTree.hpp" +#include "src/surf/AsClusterDragonfly.hpp" #include "src/surf/AsDijkstra.hpp" #include "src/surf/AsFloyd.hpp" #include "src/surf/AsFull.hpp" @@ -34,7 +36,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse); -XBT_PRIVATE xbt_dynar_t mount_list = NULL; +XBT_PRIVATE xbt_dynar_t mount_list = nullptr; namespace simgrid { namespace surf { @@ -86,7 +88,7 @@ static std::vector *explodesRadical(const char*radicals){ /** The current AS in the parsing */ -static simgrid::surf::AsImpl *current_routing = NULL; +static simgrid::surf::AsImpl *current_routing = nullptr; static simgrid::surf::AsImpl* routing_get_current() { return current_routing; @@ -110,7 +112,7 @@ 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) == nullptr, "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) @@ -122,9 +124,9 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) sg_host_t h = simgrid::s4u::Host::by_name_or_create(host->id); h->pimpl_netcard = netcard; - if(mount_list){ + if(mount_list) { xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); - mount_list = NULL; + mount_list = nullptr; } if (host->coord && strcmp(host->coord, "")) { @@ -136,7 +138,7 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) 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),NULL); + 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); @@ -154,10 +156,11 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) surf_host_model->createHost(host->id, netcard, cpu)->attach(h); if (host->properties) { - xbt_dict_cursor_t cursor=NULL; + 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); } if (host->pstate != 0) @@ -179,10 +182,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 = + 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()); + 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; @@ -192,7 +195,7 @@ void sg_platf_new_router(sg_platf_router_cbarg_t router) /* 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),NULL); + 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); @@ -235,6 +238,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) { using simgrid::surf::AsCluster; using simgrid::surf::AsClusterTorus; + using simgrid::surf::AsClusterDragonfly; using simgrid::surf::AsClusterFatTree; int rankId=0; @@ -248,6 +252,9 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) 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; @@ -260,13 +267,13 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) current_as->parse_specific_arguments(cluster); if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ - current_as->nb_links_per_node_++; - current_as->has_loopback_ = 1; + current_as->linkCountPerNode_++; + current_as->hasLoopback_ = 1; } if(cluster->limiter_link!=0){ - current_as->nb_links_per_node_++; - current_as->has_limiter_ = 1; + current_as->linkCountPerNode_++; + current_as->hasLimiter_ = 1; } std::vector *radicals = explodesRadical(cluster->radical); @@ -279,8 +286,8 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) s_sg_platf_host_cbarg_t host; memset(&host, 0, sizeof(host)); host.id = host_id; - if ((cluster->properties != NULL) && (!xbt_dict_is_empty(cluster->properties))) { - xbt_dict_cursor_t cursor=NULL; + if ((cluster->properties != nullptr) && (!xbt_dict_is_empty(cluster->properties))) { + xbt_dict_cursor_t cursor=nullptr; char *key,*data; host.properties = xbt_dict_new(); @@ -289,7 +296,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) } } - host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); + host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr); xbt_dynar_push(host.speed_per_pstate,&cluster->speed); host.pstate = 0; host.core_amount = cluster->core_amount; @@ -302,8 +309,7 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) s_surf_parsing_link_up_down_t info_lim, info_loop; // All links are saved in a matrix; - // every row describes a single node; every node - // may have multiple links. + // 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 @@ -319,10 +325,10 @@ 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.link_up = info_loop.link_down = Link::byName(tmp_link); + info_loop.linkUp = info_loop.linkDown = Link::byName(tmp_link); free(tmp_link); auto as_cluster = static_cast(current_as); - xbt_dynar_set(as_cluster->privateLinks_, rankId*as_cluster->nb_links_per_node_, &info_loop); + xbt_dynar_set(as_cluster->privateLinks_, rankId*as_cluster->linkCountPerNode_, &info_loop); } //add a limiter link (shared link to account for maximal bandwidth of the node) @@ -336,9 +342,9 @@ 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.link_up = info_lim.link_down = Link::byName(tmp_link); + info_lim.linkUp = info_lim.linkDown = Link::byName(tmp_link); free(tmp_link); - xbt_dynar_set(current_as->privateLinks_, rankId * current_as->nb_links_per_node_ + current_as->has_loopback_ , &info_lim); + xbt_dynar_set(current_as->privateLinks_, rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_ , &info_lim); } //call the cluster function that adds the others links @@ -347,18 +353,19 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) } else { current_as->create_links_for_node(cluster, i, rankId, - rankId*current_as->nb_links_per_node_ + current_as->has_loopback_ + current_as->has_limiter_ ); + rankId*current_as->linkCountPerNode_ + current_as->hasLoopback_ + current_as->hasLimiter_ ); } xbt_free(link_id); xbt_free(host_id); rankId++; } + delete radicals; // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written, // and it's very useful to connect clusters together XBT_DEBUG(" "); XBT_DEBUG("", cluster->router_id); - char *newid = NULL; + char *newid = nullptr; s_sg_platf_router_cbarg_t router; memset(&router, 0, sizeof(router)); router.id = cluster->router_id; @@ -410,7 +417,7 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) host.pstate = 0; host.core_amount = 1; host.id = hostname; - host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); + host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr); xbt_dynar_push(host.speed_per_pstate,&cabinet->speed); sg_platf_new_host(&host); xbt_dynar_free(&host.speed_per_pstate); @@ -541,8 +548,6 @@ void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) void sg_platf_new_process(sg_platf_process_cbarg_t process) { - xbt_assert(simix_global,"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 @@ -572,66 +577,67 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) 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; + std::function code = simgrid::xbt::wrapMain(parse_code, process->argc, process->argv); + + smx_process_arg_t arg = nullptr; + smx_process_t process_created = nullptr; - arg = xbt_new0(s_smx_process_arg_t, 1); - arg->code = parse_code; - arg->data = NULL; + arg = new simgrid::simix::ProcessArg(); + arg->name = std::string(process->argv[0]); + arg->code = code; + arg->data = nullptr; 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]); arg->kill_time = kill_time; arg->properties = current_property_set; - if (!sg_host_simix(host)->boot_processes) { + 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); 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 = new simgrid::simix::ProcessArg(); + arg->name = std::string(process->argv[0]); + arg->code = std::move(code); + arg->data = nullptr; arg->hostname = sg_host_get_name(host); - arg->argc = process->argc; - arg->argv = (char**)(process->argv); 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->hostname, start_time); + SIMIX_timer_set(start_time, [=]() { + simix_global->create_process_function( + arg->name.c_str(), + std::move(arg->code), + arg->data, + arg->hostname, + arg->kill_time, + arg->properties, + arg->auto_restart, + nullptr); + delete arg; + }); } else { // start_time <= SIMIX_get_clock() - XBT_DEBUG("Starting Process %s(%s) right now", arg->name, sg_host_get_name(host)); + XBT_DEBUG("Starting Process %s(%s) right now", + arg->name.c_str(), 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); + arg->name.c_str(), std::move(code), nullptr, + sg_host_get_name(host), kill_time, + current_property_set, auto_restart, nullptr); 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); + process_created = simcall_process_create( + arg->name.c_str(), std::move(code), nullptr, sg_host_get_name(host), kill_time, + current_property_set,auto_restart); /* verify if process has been created (won't be the case if the host is currently dead, but that's fine) */ if (!process_created) { return; } } - current_property_set = NULL; + current_property_set = nullptr; } void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) @@ -655,7 +661,7 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) memset(&host, 0, sizeof(host)); host.id = host_id; - host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); + host.speed_per_pstate = xbt_dynar_new(sizeof(double), nullptr); xbt_dynar_push(host.speed_per_pstate,&peer->speed); host.pstate = 0; host.speed_trace = peer->availability_trace; @@ -720,10 +726,10 @@ static void surf_config_models_setup() const char *vm_model_name; int host_id = -1; int vm_id = -1; - char *network_model_name = NULL; - char *cpu_model_name = NULL; + char *network_model_name = nullptr; + char *cpu_model_name = nullptr; int storage_id = -1; - char *storage_model_name = NULL; + char *storage_model_name = nullptr; host_model_name = xbt_cfg_get_string("host/model"); vm_model_name = xbt_cfg_get_string("vm/model"); @@ -792,8 +798,7 @@ static void surf_config_models_setup() * Once this function was called, the configuration concerning the used * models cannot be changed anymore. * - * @param AS_id name of this autonomous system. Must be unique in the platform - * @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c + * @param AS the parameters defining the AS to build. */ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) { @@ -817,10 +822,11 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) /* search the routing model */ - simgrid::surf::AsImpl *new_as = NULL; + simgrid::surf::AsImpl *new_as = nullptr; switch(AS->routing){ case A_surfxml_AS_routing_Cluster: new_as = new simgrid::surf::AsCluster(AS->id); break; case A_surfxml_AS_routing_ClusterTorus: new_as = new simgrid::surf::AsClusterTorus(AS->id); break; + case A_surfxml_AS_routing_ClusterDragonfly: new_as = new simgrid::surf::AsClusterDragonfly(AS->id); break; case A_surfxml_AS_routing_ClusterFatTree: new_as = new simgrid::surf::AsClusterFatTree(AS->id); break; case A_surfxml_AS_routing_Dijkstra: new_as = new simgrid::surf::AsDijkstra(AS->id, 0); break; case A_surfxml_AS_routing_DijkstraCache: new_as = new simgrid::surf::AsDijkstra(AS->id, 1); break; @@ -834,9 +840,9 @@ simgrid::s4u::As * 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(), simgrid::surf::NetCard::Type::As, current_routing); - if (current_routing == NULL && routing_platf->root_ == NULL) { /* it is the first one */ + if (current_routing == nullptr && routing_platf->root_ == nullptr) { /* it is the first one */ routing_platf->root_ = new_as; - } else if (current_routing != NULL && routing_platf->root_ != NULL) { + } else if (current_routing != nullptr && routing_platf->root_ != nullptr) { xbt_assert(!xbt_dict_get_or_null(current_routing->children(), AS->id), "The AS \"%s\" already exists", AS->id); @@ -846,7 +852,7 @@ simgrid::s4u::As * sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) if (current_routing->hierarchy_ == simgrid::surf::AsImpl::RoutingMode::unset) 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); + 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"); } @@ -890,11 +896,11 @@ void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t hostlink) "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(hostlink->link_up); - link_up_down.link_down = Link::byName(hostlink->link_down); + link_up_down.linkUp = Link::byName(hostlink->link_up); + link_up_down.linkDown = Link::byName(hostlink->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); + 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); // If dynar is is greater than netcard id and if the host_link is already defined auto as_cluster = static_cast(current_routing);