#endif
#include <stdio.h>
+#include "simgrid/sg_config.h"
#include "surf/surf.h"
+#include "surf/surf_resource.h"
#include "surf/surfxml_parse.h" // for reset callback
#include "xbt/log.h"
e_surf_action_state_t stateActionB;
e_surf_action_state_t stateActionC;
double now = -1.0;
- surf_parse_reset_callbacks();
- surf_cpu_model_init_Cas01(); /* Now it is possible to use CPUs */
- surf_network_model_init_CM02(); /* Now it is possible to use eth0 */
+ xbt_cfg_set_parse(_sg_cfg_set, "cpu/model:Cas01");
+ xbt_cfg_set_parse(_sg_cfg_set, "network/model:CM02");
parse_platform_file(platform);
/*********************** CPU ***********************************/
/*********************** Network *******************************/
XBT_DEBUG("%p", surf_network_model);
- cardA = surf_network_resource_by_name("Cpu A");
- cardB = surf_network_resource_by_name("Cpu B");
+ cardA = sg_routing_edge_by_name_or_null("Cpu A");
+ cardB = sg_routing_edge_by_name_or_null("Cpu B");
/* Let's check that those two processors exist */
XBT_DEBUG("%s : %p", surf_resource_name(cardA), cardA);
XBT_DEBUG("%s : %p", surf_resource_name(cardB), cardB);
/* Let's do something on it */
- surf_network_model->extension.network.communicate("Cpu A", "Cpu B",
+ surf_network_model->extension.network.communicate(cardA, cardB,
150.0, -1.0);
surf_solve(-1.0); /* Takes traces into account. Returns 0.0 */