-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2021. 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. */
void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs* trace_connect)
{
- xbt_assert(traces_set_list.find(trace_connect->trace) != traces_set_list.end(),
- "Cannot connect trace %s to %s: trace unknown", trace_connect->trace.c_str(),
- trace_connect->element.c_str());
+ surf_parse_assert(traces_set_list.find(trace_connect->trace) != traces_set_list.end(),
+ std::string("Cannot connect trace ")+ trace_connect->trace+ " to "+trace_connect->element+": trace unknown");
switch (trace_connect->kind) {
case simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL:
default:
surf_parse_error(std::string("Cannot connect trace ") + trace_connect->trace + " to " + trace_connect->element +
": unknown kind of trace");
- break;
}
}
void parse_platform_file(const std::string& file)
{
const char* cfile = file.c_str();
- int len = strlen(cfile);
- int is_lua = len > 3 && file[len - 3] == 'l' && file[len - 2] == 'u' && file[len - 1] == 'a';
+ size_t len = strlen(cfile);
+ bool is_lua = len > 3 && file[len - 3] == 'l' && file[len - 2] == 'u' && file[len - 1] == 'a';
sg_platf_init();
*/
if (is_lua) {
#if SIMGRID_HAVE_LUA
+ static bool already_warned = false;
+ if (not already_warned) { // XBT_ATTRIB_DEPRECATED_v332
+ XBT_WARN("You are using a lua platform file. This feature is deprecated and will disappear after SimGrid v3.31.");
+ already_warned = true;
+ }
lua_State* L = luaL_newstate();
luaL_openlibs(L);
luaL_loadfile(L, cfile); // This loads the file without executing it.
/* Run the script */
- if (lua_pcall(L, 0, 0, 0)) {
- XBT_ERROR("FATAL ERROR:\n %s: %s\n\n", "Lua call failed. Error message:", lua_tostring(L, -1));
- xbt_die("Lua call failed. See Log");
- }
+ xbt_assert(lua_pcall(L, 0, 0, 0) == 0, "FATAL ERROR:\n %s: %s\n\n", "Lua call failed. Error message:",
+ lua_tostring(L, -1));
lua_close(L);
return;
#else
// 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* profile = traces_set_list.at(elm.first);
-
- simgrid::s4u::Host* host = sg_host_by_name(elm.second.c_str());
- xbt_assert(host, "Host %s undefined", elm.second.c_str());
- simgrid::surf::Cpu* cpu = host->pimpl_cpu;
+ surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"HOST_AVAIL\">: Trace ")+elm.first+" undefined.");
+ auto profile = traces_set_list.at(elm.first);
- cpu->set_state_profile(profile);
+ auto host = simgrid::s4u::Host::by_name_or_null(elm.second);
+ surf_parse_assert(host, std::string("<trace_connect kind=\"HOST_AVAIL\">: Host ") + elm.second + " undefined.");
+ 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* profile = traces_set_list.at(elm.first);
+ surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"SPEED\">: Trace ")+elm.first+" undefined.");
+ auto profile = traces_set_list.at(elm.first);
- simgrid::s4u::Host* host = sg_host_by_name(elm.second.c_str());
- xbt_assert(host, "Host %s undefined", elm.second.c_str());
- simgrid::surf::Cpu* cpu = host->pimpl_cpu;
-
- cpu->set_speed_profile(profile);
+ auto host = simgrid::s4u::Host::by_name_or_null(elm.second);
+ surf_parse_assert(host, std::string("<trace_connect kind=\"SPEED\">: Host ") + elm.second + " undefined.");
+ 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* profile = traces_set_list.at(elm.first);
+ surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"LINK_AVAIL\">: Trace ")+elm.first+" undefined.");
+ auto profile = traces_set_list.at(elm.first);
- sg_link_t link = simgrid::s4u::Link::by_name(elm.second.c_str());
- xbt_assert(link, "Link %s undefined", elm.second.c_str());
+ auto link = simgrid::s4u::Link::by_name_or_null(elm.second);
+ surf_parse_assert(link, std::string("<trace_connect kind=\"LINK_AVAIL\">: Link ") + elm.second + " undefined.");
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* profile = traces_set_list.at(elm.first);
- sg_link_t link = simgrid::s4u::Link::by_name(elm.second.c_str());
- xbt_assert(link, "Link %s undefined", elm.second.c_str());
+ surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"BANDWIDTH\">: Trace ")+elm.first+" undefined.");
+ auto profile = traces_set_list.at(elm.first);
+
+ auto link = simgrid::s4u::Link::by_name_or_null(elm.second);
+ surf_parse_assert(link, std::string("<trace_connect kind=\"BANDWIDTH\">: Link ") + elm.second + " undefined.");
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* profile = traces_set_list.at(elm.first);
- sg_link_t link = simgrid::s4u::Link::by_name(elm.second.c_str());
- xbt_assert(link, "Link %s undefined", elm.second.c_str());
+ surf_parse_assert(traces_set_list.find(elm.first) != traces_set_list.end(), std::string("<trace_connect kind=\"LATENCY\">: Trace ")+elm.first+" undefined.");
+ auto profile = traces_set_list.at(elm.first);
+
+ auto link = simgrid::s4u::Link::by_name_or_null(elm.second);
+ surf_parse_assert(link, std::string("<trace_connect kind=\"LATENCY\">: Link ") + elm.second + " undefined.");
link->set_latency_profile(profile);
}
surf_parse_close();
-
- if (parse_status)
- surf_parse_error(std::string("Parse error in ") + file);
}
