X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2807fde4fd1f59c230d69a934634c5dfb77905f2..aec830b8423c13c5c31e3db71361a449bfacd8ed:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index 81a15d0189..da184ba94f 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2018. 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. */ @@ -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; @@ -123,7 +116,7 @@ void sg_platf_new_link(LinkCreationArgs* link) { std::vector names; - if (link->policy == SURF_LINK_FULLDUPLEX) { + if (link->policy == SURF_LINK_SPLITDUPLEX) { names.push_back(link->id+ "_UP"); names.push_back(link->id+ "_DOWN"); } else { @@ -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()); @@ -234,7 +227,7 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) linkUp = simgrid::surf::LinkImpl::byName(tmp_link); linkDown = simgrid::surf::LinkImpl::byName(tmp_link); - auto as_cluster = static_cast(current_as); + auto* as_cluster = static_cast(current_as); as_cluster->privateLinks_.insert({as_cluster->nodePosition(rankId), {linkUp, linkDown}}); } @@ -257,7 +250,7 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) } //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, current_as->nodePositionWithLimiter(rankId)); @@ -322,7 +315,7 @@ void sg_platf_new_cabinet(CabinetCreationArgs* cabinet) sg_platf_new_host(&host); LinkCreationArgs link; - link.policy = SURF_LINK_FULLDUPLEX; + link.policy = SURF_LINK_SPLITDUPLEX; link.latency = cabinet->lat; link.bandwidth = cabinet->bw; link.id = "link_" + hostname; @@ -401,28 +394,32 @@ void sg_platf_new_mount(MountCreationArgs* mount) if (mount_list.empty()) XBT_DEBUG("Create a Mount list for %s", A_surfxml_host_id); - mount_list.insert({mount->name, simgrid::surf::StorageImpl::byName(mount->storageId.c_str())}); + mount_list.insert({mount->name, simgrid::s4u::Engine::getInstance()->storageByName(mount->storageId)->getImpl()}); } -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()->getAllHosts(); + + for (auto const& host : list) { msg += host->getName(); msg += "', '"; if (msg.length() > 1024) { @@ -433,38 +430,25 @@ 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::string process_name = process->args[0]; - std::function code = factory(std::move(process->args)); - std::shared_ptr> properties(process->properties); + 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 = process_name; - arg->code = code; - arg->data = nullptr; - arg->host = host; - arg->kill_time = kill_time; - arg->properties = 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 = process_name; - arg->code = std::move(code); - arg->data = nullptr; - arg->host = host; - arg->kill_time = kill_time; - arg->properties = 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]() { @@ -669,7 +653,7 @@ void sg_platf_new_hostlink(HostLinkCreationArgs* hostlink) xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str()); xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str()); - auto as_cluster = static_cast(current_routing); + auto* as_cluster = static_cast(current_routing); 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!");