-/* Copyright (c) 2006-2015. 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. */
-#include "src/instr/instr_private.h" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals
+#include "surf/surf.hpp"
+#include "instr/instr_interface.hpp" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
-#include "xbt/log.h"
-#include "xbt/misc.h"
-#include "xbt/str.h"
+#include "src/surf/surf_interface.hpp"
+#include "src/surf/xml/platf_private.hpp"
+
#include <vector>
-#include "src/surf/xml/platf_private.hpp"
#if SIMGRID_HAVE_LUA
-extern "C" {
-#include "src/bindings/lua/simgrid_lua.h"
+#include "src/bindings/lua/simgrid_lua.hpp"
#include <lua.h> /* Always include this when calling Lua */
#include <lauxlib.h> /* Always include this when calling Lua */
#include <lualib.h> /* Prototype for luaL_openlibs(), */
-}
#endif
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_parse);
XBT_PRIVATE std::unordered_map<std::string, std::string> trace_connect_list_link_bw;
XBT_PRIVATE std::unordered_map<std::string, std::string> trace_connect_list_link_lat;
-SG_BEGIN_DECL()
-void sg_platf_trace_connect(sg_platf_trace_connect_cbarg_t trace_connect)
+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, trace_connect->element);
+ "Cannot connect trace %s to %s: trace unknown", trace_connect->trace.c_str(),
+ trace_connect->element.c_str());
switch (trace_connect->kind) {
- case SURF_TRACE_CONNECT_KIND_HOST_AVAIL:
- trace_connect_list_host_avail.insert({trace_connect->trace, trace_connect->element});
- break;
- case SURF_TRACE_CONNECT_KIND_SPEED:
- trace_connect_list_host_speed.insert({trace_connect->trace, trace_connect->element});
- break;
- case SURF_TRACE_CONNECT_KIND_LINK_AVAIL:
- trace_connect_list_link_avail.insert({trace_connect->trace, trace_connect->element});
- break;
- case SURF_TRACE_CONNECT_KIND_BANDWIDTH:
- trace_connect_list_link_bw.insert({trace_connect->trace, trace_connect->element});
- break;
- case SURF_TRACE_CONNECT_KIND_LATENCY:
- trace_connect_list_link_lat.insert({trace_connect->trace, trace_connect->element});
- break;
- default:
- surf_parse_error(std::string("Cannot connect trace ") + trace_connect->trace + " to " + trace_connect->element +
- ": unknown kind of trace");
- break;
+ case simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL:
+ trace_connect_list_host_avail.insert({trace_connect->trace, trace_connect->element});
+ break;
+ case simgrid::kernel::routing::TraceConnectKind::SPEED:
+ trace_connect_list_host_speed.insert({trace_connect->trace, trace_connect->element});
+ break;
+ case simgrid::kernel::routing::TraceConnectKind::LINK_AVAIL:
+ trace_connect_list_link_avail.insert({trace_connect->trace, trace_connect->element});
+ break;
+ case simgrid::kernel::routing::TraceConnectKind::BANDWIDTH:
+ trace_connect_list_link_bw.insert({trace_connect->trace, trace_connect->element});
+ break;
+ case simgrid::kernel::routing::TraceConnectKind::LATENCY:
+ trace_connect_list_link_lat.insert({trace_connect->trace, trace_connect->element});
+ break;
+ default:
+ surf_parse_error(std::string("Cannot connect trace ") + trace_connect->trace + " to " + trace_connect->element +
+ ": unknown kind of trace");
+ break;
}
}
xbt_die("Lua call failed. See Log");
}
lua_close(L);
+ return;
}
- else
#endif
- { // Use XML parser
- int parse_status;
+ // Use XML parser
- /* init the flex parser */
- after_config_done = 0;
- surf_parse_open(file);
+ int parse_status;
- /* Do the actual parsing */
- parse_status = surf_parse();
+ /* init the flex parser */
+ after_config_done = 0;
+ surf_parse_open(file);
- /* connect all traces relative to hosts */
- for (auto 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());
- tmgr_trace_t trace = traces_set_list.at(elm.first);
+ /* Do the actual parsing */
+ parse_status = surf_parse();
- 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;
+ /* connect all traces 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());
+ tmgr_trace_t trace = traces_set_list.at(elm.first);
- cpu->setStateTrace(trace);
- }
+ 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;
- for (auto 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());
- tmgr_trace_t trace = 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->setStateTrace(trace);
+ }
- cpu->setSpeedTrace(trace);
- }
+ 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());
+ tmgr_trace_t trace = traces_set_list.at(elm.first);
- for (auto 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());
- tmgr_trace_t trace = 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;
- sg_link_t link = simgrid::s4u::Link::byName(elm.second.c_str());
- xbt_assert(link, "Link %s undefined", elm.second.c_str());
- link->setStateTrace(trace);
- }
+ cpu->set_speed_trace(trace);
+ }
- for (auto 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());
- tmgr_trace_t trace = traces_set_list.at(elm.first);
- sg_link_t link = simgrid::s4u::Link::byName(elm.second.c_str());
- xbt_assert(link, "Link %s undefined", elm.second.c_str());
- link->setBandwidthTrace(trace);
- }
+ 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());
+ tmgr_trace_t trace = traces_set_list.at(elm.first);
- for (auto 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());
- tmgr_trace_t trace = traces_set_list.at(elm.first);
- sg_link_t link = simgrid::s4u::Link::byName(elm.second.c_str());
- xbt_assert(link, "Link %s undefined", elm.second.c_str());
- link->setLatencyTrace(trace);
- }
+ sg_link_t link = simgrid::s4u::Link::by_name(elm.second.c_str());
+ xbt_assert(link, "Link %s undefined", elm.second.c_str());
+ link->setStateTrace(trace);
+ }
- surf_parse_close();
+ 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());
+ tmgr_trace_t trace = 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());
+ link->setBandwidthTrace(trace);
+ }
- if (parse_status)
- surf_parse_error(std::string("Parse error in ") + file);
+ 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());
+ tmgr_trace_t trace = 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());
+ link->setLatencyTrace(trace);
}
-}
-SG_END_DECL()
+ surf_parse_close();
+
+ if (parse_status)
+ surf_parse_error(std::string("Parse error in ") + file);
+}
