default:
surf_parse_error(std::string("Cannot connect trace ") + trace_connect->trace + " to " + trace_connect->element +
": unknown kind of trace");
- break;
}
}
/* This function acts as a main in the parsing area. */
-void parse_platform_file(std::string file)
+void parse_platform_file(const std::string& file)
{
const char* cfile = file.c_str();
int len = strlen(cfile);
// Use XML parser
- int parse_status;
-
/* init the flex parser */
surf_parse_open(file);
/* Do the actual parsing */
- parse_status = surf_parse();
+ surf_parse();
/* connect all profiles relative to hosts */
for (auto const& elm : trace_connect_list_host_avail) {
xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
- simgrid::kernel::profile::Profile* trace = traces_set_list.at(elm.first);
+ simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
- simgrid::s4u::Host* host = sg_host_by_name(elm.second.c_str());
+ simgrid::s4u::Host* host = simgrid::s4u::Host::by_name_or_null(elm.second);
xbt_assert(host, "Host %s undefined", elm.second.c_str());
- simgrid::surf::Cpu* cpu = host->pimpl_cpu;
-
- cpu->set_state_trace(trace);
+ host->set_state_profile(profile);
}
for (auto const& elm : trace_connect_list_host_speed) {
xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
- simgrid::kernel::profile::Profile* trace = traces_set_list.at(elm.first);
+ simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
- simgrid::s4u::Host* host = sg_host_by_name(elm.second.c_str());
+ simgrid::s4u::Host* host = simgrid::s4u::Host::by_name_or_null(elm.second);
xbt_assert(host, "Host %s undefined", elm.second.c_str());
- simgrid::surf::Cpu* cpu = host->pimpl_cpu;
-
- cpu->set_speed_trace(trace);
+ host->set_speed_profile(profile);
}
for (auto const& elm : trace_connect_list_link_avail) {
xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
- simgrid::kernel::profile::Profile* trace = traces_set_list.at(elm.first);
+ simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
- sg_link_t link = simgrid::s4u::Link::by_name(elm.second.c_str());
+ sg_link_t link = simgrid::s4u::Link::by_name(elm.second);
xbt_assert(link, "Link %s undefined", elm.second.c_str());
- link->set_state_trace(trace);
+ link->set_state_profile(profile);
}
for (auto const& elm : trace_connect_list_link_bw) {
xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
- simgrid::kernel::profile::Profile* trace = traces_set_list.at(elm.first);
- sg_link_t link = simgrid::s4u::Link::by_name(elm.second.c_str());
+ simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
+ sg_link_t link = simgrid::s4u::Link::by_name(elm.second);
xbt_assert(link, "Link %s undefined", elm.second.c_str());
- link->set_bandwidth_trace(trace);
+ link->set_bandwidth_profile(profile);
}
for (auto const& elm : trace_connect_list_link_lat) {
xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
- simgrid::kernel::profile::Profile* trace = traces_set_list.at(elm.first);
- sg_link_t link = simgrid::s4u::Link::by_name(elm.second.c_str());
+ simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
+ sg_link_t link = simgrid::s4u::Link::by_name(elm.second);
xbt_assert(link, "Link %s undefined", elm.second.c_str());
- link->set_latency_trace(trace);
+ link->set_latency_profile(profile);
}
surf_parse_close();
-
- if (parse_status)
- surf_parse_error(std::string("Parse error in ") + file);
}