X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c86f2e0ead80fa2d306d5cb38201ff45f3a209c7..82f71f716643bf7c4ba1c63793439b753fcfa954:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 1932e5a89a..ef0882175d 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" @@ -151,7 +152,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); @@ -172,9 +181,9 @@ 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_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, netcard); XBT_DEBUG("Having set name '%s' id '%d'", router->id, netcard->id()); if (router->coord && strcmp(router->coord, "")) { @@ -253,13 +262,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); @@ -312,10 +321,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) @@ -329,9 +338,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 @@ -340,12 +349,13 @@ 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 @@ -534,8 +544,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 @@ -565,59 +573,60 @@ 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; + std::function code = simgrid::xbt::wrapMain(parse_code, process->argc, process->argv); + 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 = new simgrid::simix::ProcessArg(); + arg->name = std::string(process->argv[0]); + arg->code = 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->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 = new simgrid::simix::ProcessArg(); + arg->name = std::string(process->argv[0]); + arg->code = std::move(code); arg->data = NULL; 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, + NULL); + 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), NULL, + sg_host_get_name(host), kill_time, + 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(), std::move(code), NULL, 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) { @@ -718,22 +727,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); @@ -785,8 +794,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) { @@ -883,11 +891,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);