X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2e490cd7e982eb004e8fd7f1c37b1f8154edf01a..a9113d6f217e32068b356fa249923e0c9be5a5b7:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 97ce0b11fd..da32afa883 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -7,7 +7,7 @@ #include "simgrid/s4u/Storage.hpp" #include "src/kernel/EngineImpl.hpp" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include "src/include/simgrid/sg_config.h" @@ -39,13 +39,6 @@ simgrid::xbt::signal on_cluster; } } -// FIXME: The following duplicates the content of s4u::Host -namespace simgrid { -namespace s4u { -extern std::map host_list; -} -} - static int surf_parse_models_setup_already_called = 0; std::map storage_types; @@ -63,8 +56,8 @@ void sg_platf_init() /** Module management function: frees all internal data structures */ void sg_platf_exit() { - simgrid::surf::on_cluster.disconnect_all_slots(); - simgrid::s4u::onPlatformCreated.disconnect_all_slots(); + simgrid::surf::on_cluster.disconnectSlots(); + simgrid::s4u::onPlatformCreated.disconnectSlots(); /* make sure that we will reinit the models while loading the platf once reinited */ surf_parse_models_setup_already_called = 0; @@ -131,7 +124,7 @@ void sg_platf_new_link(LinkCreationArgs* link) } for (auto const& link_name : names) { simgrid::surf::LinkImpl* l = - surf_network_model->createLink(link_name.c_str(), link->bandwidth, link->latency, link->policy); + surf_network_model->createLink(link_name, link->bandwidth, link->latency, link->policy); if (link->properties) { for (auto const& elm : *link->properties) @@ -161,18 +154,18 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) ZoneCreationArgs zone; zone.id = cluster->id; switch (cluster->topology) { - case SURF_CLUSTER_TORUS: - zone.routing = A_surfxml_AS_routing_ClusterTorus; - break; - case SURF_CLUSTER_DRAGONFLY: - zone.routing = A_surfxml_AS_routing_ClusterDragonfly; - break; - case SURF_CLUSTER_FAT_TREE: - zone.routing = A_surfxml_AS_routing_ClusterFatTree; - break; - default: - zone.routing = A_surfxml_AS_routing_Cluster; - break; + case ClusterTopology::TORUS: + zone.routing = A_surfxml_AS_routing_ClusterTorus; + break; + case ClusterTopology::DRAGONFLY: + zone.routing = A_surfxml_AS_routing_ClusterDragonfly; + break; + case ClusterTopology::FAT_TREE: + zone.routing = A_surfxml_AS_routing_ClusterFatTree; + break; + default: + zone.routing = A_surfxml_AS_routing_Cluster; + break; } sg_platf_new_Zone_begin(&zone); simgrid::kernel::routing::ClusterZone* current_as = static_cast(routing_get_current()); @@ -180,12 +173,12 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) if(cluster->loopback_bw > 0 || cluster->loopback_lat > 0){ current_as->linkCountPerNode_++; - current_as->hasLoopback_ = 1; + current_as->hasLoopback_ = true; } if(cluster->limiter_link > 0){ current_as->linkCountPerNode_++; - current_as->hasLimiter_ = 1; + current_as->hasLimiter_ = true; } for (int const& i : *cluster->radicals) { @@ -195,7 +188,6 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) XBT_DEBUG("", host_id.c_str(), cluster->speeds.front()); s_sg_platf_host_cbarg_t host; - memset(&host, 0, sizeof(host)); host.id = host_id.c_str(); if ((cluster->properties != nullptr) && (not cluster->properties->empty())) { host.properties = new std::map; @@ -236,7 +228,7 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) linkDown = simgrid::surf::LinkImpl::byName(tmp_link); auto as_cluster = static_cast(current_as); - as_cluster->privateLinks_.insert({rankId * as_cluster->linkCountPerNode_, {linkUp, linkDown}}); + as_cluster->privateLinks_.insert({as_cluster->nodePosition(rankId), {linkUp, linkDown}}); } //add a limiter link (shared link to account for maximal bandwidth of the node) @@ -254,16 +246,14 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) sg_platf_new_link(&link); linkDown = simgrid::surf::LinkImpl::byName(tmp_link); linkUp = linkDown; - current_as->privateLinks_.insert( - {rankId * current_as->linkCountPerNode_ + current_as->hasLoopback_, {linkUp, linkDown}}); + current_as->privateLinks_.insert({current_as->nodePositionWithLoopback(rankId), {linkUp, linkDown}}); } //call the cluster function that adds the others links - if (cluster->topology == SURF_CLUSTER_FAT_TREE) { + if (cluster->topology == ClusterTopology::FAT_TREE) { static_cast(current_as)->addProcessingNode(i); } else { - current_as->create_links_for_node(cluster, i, rankId, - rankId*current_as->linkCountPerNode_ + current_as->hasLoopback_ + current_as->hasLimiter_ ); + current_as->create_links_for_node(cluster, i, rankId, current_as->nodePositionWithLimiter(rankId)); } rankId++; } @@ -318,7 +308,6 @@ void sg_platf_new_cabinet(CabinetCreationArgs* cabinet) for (int const& radical : *cabinet->radicals) { std::string hostname = cabinet->prefix + std::to_string(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.c_str(); @@ -408,25 +397,30 @@ void sg_platf_new_mount(MountCreationArgs* mount) mount_list.insert({mount->name, simgrid::surf::StorageImpl::byName(mount->storageId.c_str())}); } -void sg_platf_new_route(sg_platf_route_cbarg_t route) +void sg_platf_new_route(RouteCreationArgs* route) { - routing_get_current()->addRoute(route); + routing_get_current()->addRoute(route->src, route->dst, route->gw_src, route->gw_dst, route->link_list, + route->symmetrical); } -void sg_platf_new_bypassRoute(sg_platf_route_cbarg_t bypassRoute) +void sg_platf_new_bypassRoute(RouteCreationArgs* bypassRoute) { - routing_get_current()->addBypassRoute(bypassRoute); + routing_get_current()->addBypassRoute(bypassRoute->src, bypassRoute->dst, bypassRoute->gw_src, bypassRoute->gw_dst, + bypassRoute->link_list, bypassRoute->symmetrical); } -void sg_platf_new_process(sg_platf_process_cbarg_t process) +void sg_platf_new_actor(ActorCreationArgs* actor) { - sg_host_t host = sg_host_by_name(process->host); + sg_host_t host = sg_host_by_name(actor->host); if (not host) { // The requested host does not exist. Do a nice message to the user - std::string msg = std::string("Cannot create process '") + process->function + "': host '" + process->host + + std::string msg = std::string("Cannot create actor '") + actor->function + "': host '" + actor->host + "' does not exist\nExisting hosts: '"; - for (auto const& kv : simgrid::s4u::host_list) { - simgrid::s4u::Host* host = kv.second; + + std::vector list; + simgrid::s4u::Engine::getInstance()->getHostList(&list); + + for (auto const& host : list) { msg += host->getName(); msg += "', '"; if (msg.length() > 1024) { @@ -437,42 +431,30 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) } xbt_die("%s", msg.c_str()); } - 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_ACTOR_ON_FAILURE_DIE ? 0 : 1; + simgrid::simix::ActorCodeFactory& factory = SIMIX_get_actor_code_factory(actor->function); + xbt_assert(factory, "Function '%s' unknown", actor->function); - std::vector args(process->argv, process->argv + process->argc); - std::function code = factory(std::move(args)); + double start_time = actor->start_time; + double kill_time = actor->kill_time; + bool auto_restart = actor->on_failure != ActorOnFailure::DIE; - smx_process_arg_t arg = nullptr; + std::string actor_name = actor->args[0]; + std::function code = factory(std::move(actor->args)); + std::shared_ptr> properties(actor->properties); - 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 = process->properties; + simgrid::simix::ProcessArg* arg = + new simgrid::simix::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); host->extension()->boot_processes.push_back(arg); if (start_time > SIMIX_get_clock()) { - 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 = process->properties; + arg = new simgrid::simix::ProcessArg(actor_name, code, nullptr, host, kill_time, properties, auto_restart); XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->getCname(), start_time); SIMIX_timer_set(start_time, [arg, auto_restart]() { smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(arg->code), arg->data, - arg->host, arg->properties, nullptr); + arg->host, arg->properties.get(), nullptr); if (arg->kill_time >= 0) simcall_process_set_kill_time(actor, arg->kill_time); if (auto_restart) @@ -483,7 +465,7 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->getCname()); smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host, - arg->properties, nullptr); + arg->properties.get(), nullptr); /* The actor creation will fail if the host is currently dead, but that's fine */ if (actor != nullptr) { @@ -493,7 +475,6 @@ void sg_platf_new_process(sg_platf_process_cbarg_t process) SIMIX_process_auto_restart_set(actor, auto_restart); } } - current_property_set = nullptr; } void sg_platf_new_peer(PeerCreationArgs* peer) @@ -523,22 +504,22 @@ void sg_platf_end() { /* 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"); + std::string host_model_name = xbt_cfg_get_string("host/model"); + std::string network_model_name = xbt_cfg_get_string("network/model"); + std::string cpu_model_name = xbt_cfg_get_string("cpu/model"); + std::string storage_model_name = xbt_cfg_get_string("storage/model"); /* The compound host model is needed when using non-default net/cpu models */ if ((not xbt_cfg_is_default_value("network/model") || not 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_cfg_set_string("host/model", host_model_name.c_str()); } - XBT_DEBUG("host model: %s", host_model_name); - if (not 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"); + XBT_DEBUG("host model: %s", host_model_name.c_str()); + if (host_model_name == "compound") { + xbt_assert(not cpu_model_name.empty(), "Set a cpu model to use with the 'compound' host model"); + xbt_assert(not network_model_name.empty(), "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(); @@ -602,10 +583,10 @@ simgrid::s4u::NetZone* sg_platf_new_Zone_begin(ZoneCreationArgs* zone) new_zone = new simgrid::kernel::routing::FatTreeZone(current_routing, zone->id); break; case A_surfxml_AS_routing_Dijkstra: - new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, 0); + new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, false); break; case A_surfxml_AS_routing_DijkstraCache: - new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, 1); + new_zone = new simgrid::kernel::routing::DijkstraZone(current_routing, zone->id, true); break; case A_surfxml_AS_routing_Floyd: new_zone = new simgrid::kernel::routing::FloydZone(current_routing, zone->id); @@ -678,7 +659,7 @@ void sg_platf_new_hostlink(HostLinkCreationArgs* hostlink) if (as_cluster->privateLinks_.find(netpoint->id()) != as_cluster->privateLinks_.end()) surf_parse_error(std::string("Host_link for '") + hostlink->id.c_str() + "' is already defined!"); - XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->cname(), netpoint->id()); + XBT_DEBUG("Push Host_link for host '%s' to position %u", netpoint->getCname(), netpoint->id()); as_cluster->privateLinks_.insert({netpoint->id(), {linkUp, linkDown}}); }