X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..d02dbd433ce9e3f66bdc8b67f36a31d0f7b925fa:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index e3e5253eab..a3b956a687 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2019. 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. */ @@ -63,7 +63,7 @@ void sg_platf_exit() { surf_parse_lex_destroy(); } -/** @brief Add an host to the current AS */ +/** @brief Add a host to the current AS */ void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) { std::map props; @@ -81,9 +81,9 @@ void sg_platf_new_host(simgrid::kernel::routing::HostCreationArgs* args) /* Change from the defaults */ if (args->state_trace) - host->pimpl_cpu->set_state_trace(args->state_trace); + host->pimpl_cpu->set_state_profile(args->state_trace); if (args->speed_trace) - host->pimpl_cpu->set_speed_trace(args->speed_trace); + host->pimpl_cpu->set_speed_profile(args->speed_trace); if (args->pstate != 0) host->pimpl_cpu->set_pstate(args->pstate); if (args->coord && strcmp(args->coord, "")) @@ -111,31 +111,31 @@ simgrid::kernel::routing::NetPoint* sg_platf_new_router(std::string name, const return netpoint; } -void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) +static void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link, const std::string& link_name) { - std::vector names; + simgrid::kernel::resource::LinkImpl* l = + surf_network_model->create_link(link_name, link->bandwidth, link->latency, link->policy); - if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { - names.push_back(link->id+ "_UP"); - names.push_back(link->id+ "_DOWN"); - } else { - names.push_back(link->id); + if (link->properties) { + for (auto const& elm : *link->properties) + l->set_property(elm.first, elm.second); } - for (auto const& link_name : names) { - simgrid::kernel::resource::LinkImpl* l = - surf_network_model->create_link(link_name, link->bandwidth, link->latency, link->policy); - if (link->properties) { - for (auto const& elm : *link->properties) - l->set_property(elm.first, elm.second); - } + if (link->latency_trace) + l->set_latency_profile(link->latency_trace); + if (link->bandwidth_trace) + l->set_bandwidth_profile(link->bandwidth_trace); + if (link->state_trace) + l->set_state_profile(link->state_trace); +} - if (link->latency_trace) - l->set_latency_trace(link->latency_trace); - if (link->bandwidth_trace) - l->set_bandwidth_trace(link->bandwidth_trace); - if (link->state_trace) - l->set_state_trace(link->state_trace); +void sg_platf_new_link(simgrid::kernel::routing::LinkCreationArgs* link) +{ + if (link->policy == simgrid::s4u::Link::SharingPolicy::SPLITDUPLEX) { + sg_platf_new_link(link, link->id + "_UP"); + sg_platf_new_link(link, link->id + "_DOWN"); + } else { + sg_platf_new_link(link, link->id); } delete link->properties; } @@ -452,10 +452,10 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) XBT_DEBUG("Process %s@%s will be started at time %f", arg->name.c_str(), arg->host->get_cname(), 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.get(), nullptr); + simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create( + arg->name.c_str(), std::move(arg->code), arg->data, arg->host, arg->properties.get(), nullptr); if (arg->kill_time >= 0) - simcall_process_set_kill_time(actor, arg->kill_time); + actor->set_kill_time(arg->kill_time); if (auto_restart) actor->set_auto_restart(auto_restart); delete arg; @@ -463,13 +463,13 @@ void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor) } else { // start_time <= SIMIX_get_clock() XBT_DEBUG("Starting Process %s(%s) right now", arg->name.c_str(), host->get_cname()); - smx_actor_t actor = simix_global->create_process_function(arg->name.c_str(), std::move(code), nullptr, host, - arg->properties.get(), nullptr); + simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create( + arg->name.c_str(), std::move(code), nullptr, host, arg->properties.get(), nullptr); /* The actor creation will fail if the host is currently dead, but that's fine */ if (actor != nullptr) { if (arg->kill_time >= 0) - simcall_process_set_kill_time(actor, arg->kill_time); + actor->set_kill_time(arg->kill_time); if (auto_restart) actor->set_auto_restart(auto_restart); } @@ -489,9 +489,9 @@ void sg_platf_new_peer(simgrid::kernel::routing::PeerCreationArgs* peer) /* Change from the defaults */ if (peer->state_trace) - host->pimpl_cpu->set_state_trace(peer->state_trace); + host->pimpl_cpu->set_state_profile(peer->state_trace); if (peer->speed_trace) - host->pimpl_cpu->set_speed_trace(peer->speed_trace); + host->pimpl_cpu->set_speed_profile(peer->speed_trace); } /* Pick the right models for CPU, net and host, and call their model_init_preparse */ @@ -633,13 +633,13 @@ void sg_platf_new_Zone_seal() current_routing = static_cast(current_routing->get_father()); } -/** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */ +/** @brief Add a link connecting a host to the rest of its AS (which must be cluster or vivaldi) */ void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostlink) { simgrid::kernel::routing::NetPoint* netpoint = sg_host_by_name(hostlink->id.c_str())->pimpl_netpoint; xbt_assert(netpoint, "Host '%s' not found!", hostlink->id.c_str()); xbt_assert(dynamic_cast(current_routing), - "Only hosts from Cluster and Vivaldi ASes can get an host_link."); + "Only hosts from Cluster and Vivaldi ASes can get a host_link."); simgrid::s4u::Link* linkUp = simgrid::s4u::Link::by_name_or_null(hostlink->link_up); simgrid::s4u::Link* linkDown = simgrid::s4u::Link::by_name_or_null(hostlink->link_down); @@ -656,15 +656,15 @@ void sg_platf_new_hostlink(simgrid::kernel::routing::HostLinkCreationArgs* hostl as_cluster->private_links_.insert({netpoint->id(), {linkUp->get_impl(), linkDown->get_impl()}}); } -void sg_platf_new_trace(simgrid::kernel::routing::TraceCreationArgs* trace) +void sg_platf_new_trace(simgrid::kernel::routing::ProfileCreationArgs* profile) { - tmgr_trace_t tmgr_trace; - if (not trace->file.empty()) { - tmgr_trace = tmgr_trace_new_from_file(trace->file); + simgrid::kernel::profile::Profile* mgr_profile; + if (not profile->file.empty()) { + mgr_profile = simgrid::kernel::profile::Profile::from_file(profile->file); } else { - xbt_assert(not trace->pc_data.empty(), "Trace '%s' must have either a content, or point to a file on disk.", - trace->id.c_str()); - tmgr_trace = tmgr_trace_new_from_string(trace->id, trace->pc_data, trace->periodicity); + xbt_assert(not profile->pc_data.empty(), "Trace '%s' must have either a content, or point to a file on disk.", + profile->id.c_str()); + mgr_profile = simgrid::kernel::profile::Profile::from_string(profile->id, profile->pc_data, profile->periodicity); } - traces_set_list.insert({trace->id, tmgr_trace}); + traces_set_list.insert({profile->id, mgr_profile}); }