#include "xbt/dict.h"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
+#include "src/instr/instr_private.h" // TRACE_start(). FIXME: remove by subscribing tracing to the surf signals
#include "src/surf/xml/platf.hpp"
-#ifdef HAVE_LUA
+#if HAVE_LUA
extern "C" {
#include "src/bindings/lua/simgrid_lua.h"
/* This function acts as a main in the parsing area. */
void parse_platform_file(const char *file)
{
-#ifdef HAVE_LUA
+#if HAVE_LUA
int is_lua = (file != NULL && strlen(file) > 3 && file[strlen(file)-3] == 'l' && file[strlen(file)-2] == 'u'
&& file[strlen(file)-1] == 'a');
#endif
sg_platf_init();
-#ifdef HAVE_LUA
+#if HAVE_LUA
/* Check if file extension is "lua". If so, we will use
* the lua bindings to parse the platform file (since it is
* written in lua). If not, we will use the (old?) XML parser
xbt_assert(host, "Host %s undefined", elm);
simgrid::surf::Cpu *cpu = host->pimpl_cpu;
- cpu->set_state_trace(trace);
+ cpu->setStateTrace(trace);
}
xbt_dict_foreach(trace_connect_list_host_speed, cursor, trace_name, elm) {
tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
xbt_assert(host, "Host %s undefined", elm);
simgrid::surf::Cpu *cpu = host->pimpl_cpu;
- cpu->set_speed_trace(trace);
+ cpu->setSpeedTrace(trace);
}
xbt_dict_foreach(trace_connect_list_link_avail, cursor, trace_name, elm) {
tmgr_trace_t trace = (tmgr_trace_t) xbt_dict_get_or_null(traces_set_list, trace_name);
xbt_assert(trace, "Trace %s undefined", trace_name);
Link *link = Link::byName(elm);
xbt_assert(link, "Link %s undefined", elm);
- link->set_state_trace(trace);
+ link->setStateTrace(trace);
}
xbt_dict_foreach(trace_connect_list_link_bw, cursor, trace_name, elm) {
xbt_assert(trace, "Trace %s undefined", trace_name);
Link *link = Link::byName(elm);
xbt_assert(link, "Link %s undefined", elm);
- link->set_bandwidth_trace(trace);
+ link->setBandwidthTrace(trace);
}
xbt_dict_foreach(trace_connect_list_link_lat, cursor, trace_name, elm) {
xbt_assert(trace, "Trace %s undefined", trace_name);
Link *link = Link::byName(elm);
xbt_assert(link, "Link %s undefined", elm);
- link->set_latency_trace(trace);
+ link->setLatencyTrace(trace);
}
/* Free my data */