The whole addTraces() madness should be reworked and factorized.
surf_cpu_model_vm = new simgrid::surf::CpuCas01Model();
xbt_dynar_push(all_existing_models, &surf_cpu_model_vm);
- simgrid::surf::on_postparse.connect(simgrid::surf::cpu_add_traces);
+ simgrid::surf::on_postparse.connect([]() {
+ surf_cpu_model_pm->addTraces();
+ });
}
namespace simgrid {
simgrid::xbt::signal<void(CpuAction*, e_surf_action_state_t, e_surf_action_state_t)> cpuActionStateChangedCallbacks;
-void cpu_add_traces(){
- surf_cpu_model_pm->addTraces();
-}
-
/*********
* Model *
*********/
*************/
XBT_PUBLIC(Cpu*) getActionCpu(CpuAction *action);
-XBT_PUBLIC(void) cpu_add_traces();
-
/*********
* Model *
*********/
static void cpu_ti_define_callbacks()
{
- simgrid::surf::on_postparse.connect(simgrid::surf::cpu_add_traces);
+ simgrid::surf::on_postparse.connect([]() {
+ surf_cpu_model_pm->addTraces();
+ });
}
/*********
simgrid::surf::HostModel *surf_host_model = NULL;
-void host_add_traces(){
- surf_host_model->addTraces();
-}
-
/*************
* Callbacks *
*************/
*********/
XBT_PUBLIC_DATA(simgrid::surf::HostModel*) surf_host_model;
-XBT_PUBLIC(void) host_add_traces();
/*********
* Model *
// Define the callbacks to parse the XML
simgrid::surf::on_link.connect(ptask_netlink_parse_init);
- simgrid::surf::on_postparse.connect(host_add_traces);
+ simgrid::surf::on_postparse.connect([](){
+ surf_host_model->addTraces();
+ });
surf_host_model = new simgrid::surf::HostL07Model();
xbt_dynar_push(all_existing_models, &surf_host_model);
{
/* Figuring out the network links */
simgrid::surf::on_link.connect(netlink_parse_init);
- simgrid::surf::on_postparse.connect(net_add_traces);
+ simgrid::surf::on_postparse.connect([]() {
+ surf_network_model->addTraces();
+ });
}
/*********
}
}
-void net_add_traces(){
- surf_network_model->addTraces();
-}
-
/*********
* Model *
*********/
*********/
XBT_PUBLIC(void) netlink_parse_init(sg_platf_link_cbarg_t link);
-XBT_PUBLIC(void) net_add_traces();
-
/*********
* Model *
*********/