X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e873a4d59b40ce9ecc436f20012e43a859adc35f..a511865336e83ac3654632265ed00b8f0bf0eccc:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 7277a49b15..35cd58ed2c 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -48,9 +48,9 @@ simgrid::xbt::signal on_postparse; static int surf_parse_models_setup_already_called = 0; -/* Build the list of hostnames in a cluster or in a cabinet */ -static std::vector *makeHostnames(const char*prefix, const char*radicals, const char *suffix){ - std::vector *hostnames = new std::vector(); +/* Turn something like "1-4,6,9-11" into the vector {1,2,3,4,6,9,10,11} */ +static std::vector *explodesRadical(const char*radicals){ + std::vector *exploded = new std::vector(); char *groups; unsigned int iter; @@ -75,13 +75,13 @@ static std::vector *makeHostnames(const char*prefix, const char*radicals, } for (int i = start; i <= end; i++) - hostnames->push_back( bprintf("%s%d%s",prefix,i,suffix) ); + exploded->push_back( i ); xbt_dynar_free(&radical_ends); } xbt_dynar_free(&radical_elements); - return hostnames; + return exploded; } @@ -151,7 +151,15 @@ void sg_platf_new_host(sg_platf_host_cbarg_t host) 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); + surf_host_model->createHost(host->id, netcard, cpu)->attach(h); + + if (host->properties) { + xbt_dict_cursor_t cursor=NULL; + char *key,*data; + xbt_dict_foreach(host->properties,cursor,key,data) + h->setProperty(key,data); + xbt_dict_free(&host->properties); + } if (host->pstate != 0) cpu->setPState(host->pstate); @@ -230,19 +238,13 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) using simgrid::surf::AsClusterTorus; using simgrid::surf::AsClusterFatTree; - char *host_id, *groups, *link_id = NULL; - xbt_dict_t patterns = NULL; int rankId=0; s_sg_platf_link_cbarg_t link; - unsigned int iter; - - /* Parse the topology attributes. - * Nothing to do in a vanilla cluster, but that's another story for torus and flat_trees */ + // 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; @@ -254,8 +256,6 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) AS.routing = A_surfxml_AS_routing_Cluster; break; } - - // What an inventive way of initializing the AS that I have as ancestor :-( sg_platf_new_AS_begin(&AS); simgrid::surf::AsCluster *current_as = static_cast(routing_get_current()); current_as->parse_specific_arguments(cluster); @@ -270,119 +270,92 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) current_as->has_limiter_ = 1; } - //Make all hosts - xbt_dynar_t radical_elements = xbt_str_split(cluster->radical, ","); - xbt_dynar_foreach(radical_elements, iter, groups) { + std::vector *radicals = explodesRadical(cluster->radical); + for (int i : *radicals) { + char * host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); + char * link_id = bprintf("%s_link_%d", cluster->id, i); - xbt_dynar_t radical_ends = xbt_str_split(groups, "-"); - int start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); - int end; + XBT_DEBUG("", host_id, cluster->speed); - switch (xbt_dynar_length(radical_ends)) { - case 1: - end = start; - break; - case 2: - end = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 1, char *)); - break; - default: - surf_parse_error("Malformed radical"); - break; - } - for (int i = start; i <= end; i++) { - host_id = bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); - 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 != NULL) && (!xbt_dict_is_empty(cluster->properties))) { - xbt_dict_cursor_t cursor=NULL; - char *key,*data; - host.properties = xbt_dict_new(); - - xbt_dict_foreach(cluster->properties,cursor,key,data) { - xbt_dict_set(host.properties, key, xbt_strdup(data),free); - } + 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; + char *key,*data; + host.properties = xbt_dict_new(); + + xbt_dict_foreach(cluster->properties,cursor,key,data) { + xbt_dict_set(host.properties, key, xbt_strdup(data),free); } + } - 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_per_pstate); - XBT_DEBUG(""); - - XBT_DEBUG("", link_id, cluster->bw, cluster->lat); - - 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. - // 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 - if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ - char *tmp_link = bprintf("%s_loopback", link_id); - XBT_DEBUG("", tmp_link, cluster->limiter_link); - - 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); - info_loop.link_up = info_loop.link_down = 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); - } + host.speed_per_pstate = xbt_dynar_new(sizeof(double), NULL); + xbt_dynar_push(host.speed_per_pstate,&cluster->speed); + host.pstate = 0; + host.core_amount = cluster->core_amount; + host.coord = ""; + sg_platf_new_host(&host); + xbt_dynar_free(&host.speed_per_pstate); + XBT_DEBUG(""); + + XBT_DEBUG("", link_id, cluster->bw, cluster->lat); + + 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. + // 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 + if(cluster->loopback_bw!=0 || cluster->loopback_lat!=0){ + char *tmp_link = bprintf("%s_loopback", link_id); + XBT_DEBUG("", tmp_link, cluster->limiter_link); + + 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); + info_loop.link_up = info_loop.link_down = 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); + } - //add a limiter link (shared link to account for maximal bandwidth of the node) - 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); - info_lim.link_up = info_lim.link_down = 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); - } + //add a limiter link (shared link to account for maximal bandwidth of the node) + 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); + info_lim.link_up = info_lim.link_down = 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); + } - //call the cluster function that adds the others links - if (cluster->topology == SURF_CLUSTER_FAT_TREE) { - ((AsClusterFatTree*) current_as)->addProcessingNode(i); - } - else { + //call the cluster function that adds the others links + if (cluster->topology == SURF_CLUSTER_FAT_TREE) { + ((AsClusterFatTree*) current_as)->addProcessingNode(i); + } + 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_ ); - } - xbt_free(link_id); - xbt_free(host_id); - rankId++; } - - xbt_dynar_free(&radical_ends); + xbt_free(link_id); + xbt_free(host_id); + rankId++; } - xbt_dynar_free(&radical_elements); + delete radicals; - // For fat trees, the links must be created once all nodes have been added - if(cluster->topology == SURF_CLUSTER_FAT_TREE) { - static_cast(current_as)->create_links(); - } // 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(" "); @@ -391,7 +364,6 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) s_sg_platf_router_cbarg_t router; memset(&router, 0, sizeof(router)); router.id = cluster->router_id; - router.coord = ""; if (!router.id || !strcmp(router.id, "")) router.id = newid = bprintf("%s%s_router%s", cluster->prefix, cluster->id, cluster->suffix); sg_platf_new_router(&router); @@ -400,26 +372,22 @@ void sg_platf_new_cluster(sg_platf_cluster_cbarg_t cluster) //Make the backbone if ((cluster->bb_bw != 0) || (cluster->bb_lat != 0)) { - char *link_backbone = bprintf("%s_backbone", cluster->id); - XBT_DEBUG("", link_backbone, cluster->bb_bw, cluster->bb_lat); memset(&link, 0, sizeof(link)); - link.id = link_backbone; + 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(Link::byName(link_backbone)); - - free(link_backbone); + routing_cluster_add_backbone(Link::byName(link.id)); + free((char*)link.id); } XBT_DEBUG(""); - sg_platf_new_AS_end(); - XBT_DEBUG(" "); - xbt_dict_free(&patterns); // no op if it were never set + sg_platf_new_AS_seal(); simgrid::surf::on_cluster(cluster); } @@ -435,9 +403,10 @@ void routing_cluster_add_backbone(simgrid::surf::Link* bb) { void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) { - std::vector *hostnames = makeHostnames(cabinet->prefix, cabinet->radical, cabinet->suffix); + std::vector *radicals = explodesRadical(cabinet->radical); - for (char* hostname : *hostnames) { + for (int radical : *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; @@ -468,7 +437,7 @@ void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet) free(hostname); } - delete(hostnames); + delete(radicals); } void sg_platf_new_storage(sg_platf_storage_cbarg_t storage) @@ -574,8 +543,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 @@ -608,56 +575,63 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) smx_process_arg_t arg = NULL; smx_process_t process_created = NULL; - arg = xbt_new0(s_smx_process_arg_t, 1); + arg = new simgrid::simix::ProcessArg(); + arg->name = std::string(process->argv[0]); 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]); + arg->args.assign(process->argc, process->argv); 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 = new simgrid::simix::ProcessArg(); + arg->name = std::string(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->args.assign(process->argc, 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); + XBT_DEBUG("Process %s(%s) will be started at time %f", + arg->name.c_str(), arg->hostname, start_time); + SIMIX_timer_set(start_time, [](void* p) { + smx_process_arg_t arg = static_cast(p); + simix_global->create_process_function( + arg->name.c_str(), + arg->code, + arg->data, + arg->hostname, + arg->kill_time, + std::move(arg->args), + arg->properties, + arg->auto_restart, + NULL); + delete arg; }, 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, + arg->name.c_str(), parse_code, NULL, sg_host_get_name(host), kill_time, - process->argc, - (char**)(process->argv), + arg->args, 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); + process_created = simcall_process_create( + arg->name.c_str(), parse_code, NULL, sg_host_get_name(host), kill_time, + arg->args, 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) { @@ -733,7 +707,7 @@ void sg_platf_new_peer(sg_platf_peer_cbarg_t peer) static_cast(current_routing)->router_ = static_cast(xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL)); XBT_DEBUG(""); - sg_platf_new_AS_end(); + sg_platf_new_AS_seal(); XBT_DEBUG(" "); free(router_id); @@ -758,22 +732,22 @@ static void surf_config_models_setup() int storage_id = -1; char *storage_model_name = NULL; - host_model_name = xbt_cfg_get_string(_sg_cfg_set, "host/model"); - vm_model_name = xbt_cfg_get_string(_sg_cfg_set, "vm/model"); - network_model_name = xbt_cfg_get_string(_sg_cfg_set, "network/model"); - cpu_model_name = xbt_cfg_get_string(_sg_cfg_set, "cpu/model"); - storage_model_name = xbt_cfg_get_string(_sg_cfg_set, "storage/model"); + host_model_name = xbt_cfg_get_string("host/model"); + vm_model_name = xbt_cfg_get_string("vm/model"); + network_model_name = xbt_cfg_get_string("network/model"); + cpu_model_name = xbt_cfg_get_string("cpu/model"); + storage_model_name = xbt_cfg_get_string("storage/model"); /* Check whether we use a net/cpu model differing from the default ones, in which case * we should switch to the "compound" host model to correctly dispatch stuff to * the right net/cpu models. */ - if ((!xbt_cfg_is_default_value(_sg_cfg_set, "network/model") || - !xbt_cfg_is_default_value(_sg_cfg_set, "cpu/model")) && - xbt_cfg_is_default_value(_sg_cfg_set, "host/model")) { + 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(_sg_cfg_set, "host/model", host_model_name); + xbt_cfg_set_string("host/model", host_model_name); } XBT_DEBUG("host model: %s", host_model_name); @@ -820,15 +794,14 @@ static void surf_config_models_setup() * * 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_close() will be added to this AS. + * 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_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. */ -void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) +simgrid::s4u::As * 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. @@ -894,15 +867,17 @@ void sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS) simgrid::surf::asCreatedCallbacks(new_as); if (TRACE_is_enabled()) sg_instr_AS_begin(AS); + + return new_as; } /** - * \brief Specify that the current description of AS is finished + * \brief Specify that the description of the current AS is finished * - * Once you've declared all the content of your AS, you have to close + * 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_end() +void sg_platf_new_AS_seal() { xbt_assert(current_routing, "Cannot seal the current AS: none under construction"); current_routing->seal();