-/* 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. */
-#include "src/instr/instr_private.hpp" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals
+#include "surf/surf.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
-#include "xbt/log.h"
-#include "xbt/misc.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.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;
-extern "C" {
-void sg_platf_trace_connect(TraceConnectCreationArgs* 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.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;
- }
-}
-
-static int after_config_done;
-void parse_after_config() {
- if (not after_config_done) {
- TRACE_start();
-
- /* Register classical callbacks */
- storage_register_callbacks();
-
- after_config_done = 1;
+ 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;
}
}
/* This function acts as a main in the parsing area. */
-void parse_platform_file(const char *file)
+void parse_platform_file(std::string file)
{
#if SIMGRID_HAVE_LUA
- int len = (file == nullptr ? 0 : strlen(file));
- int is_lua = (file != nullptr && len > 3 && file[len - 3] == 'l' && file[len - 2] == 'u' && file[len - 1] == 'a');
+ 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';
#endif
sg_platf_init();
lua_State* L = luaL_newstate();
luaL_openlibs(L);
- luaL_loadfile(L, file); // This loads the file without executing it.
+ luaL_loadfile(L, cfile); // This loads the file without executing it.
/* Run the script */
if (lua_pcall(L, 0, 0, 0)) {
int parse_status;
/* init the flex parser */
- after_config_done = 0;
surf_parse_open(file);
/* Do the actual parsing */
xbt_assert(host, "Host %s undefined", elm.second.c_str());
simgrid::surf::Cpu* cpu = host->pimpl_cpu;
- cpu->setStateTrace(trace);
+ cpu->set_state_trace(trace);
}
for (auto const& elm : trace_connect_list_host_speed) {
xbt_assert(host, "Host %s undefined", elm.second.c_str());
simgrid::surf::Cpu* cpu = host->pimpl_cpu;
- cpu->setSpeedTrace(trace);
+ cpu->set_speed_trace(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);
- sg_link_t link = simgrid::s4u::Link::byName(elm.second.c_str());
+ 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);
+ link->set_state_trace(trace);
}
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::byName(elm.second.c_str());
+ 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);
+ link->set_bandwidth_trace(trace);
}
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::byName(elm.second.c_str());
+ 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);
+ link->set_latency_trace(trace);
}
surf_parse_close();
if (parse_status)
surf_parse_error(std::string("Parse error in ") + file);
}
-}
