#include <stdio.h>
#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */
-#include "surf/surfxml_parse.h" /* to override surf_parse */
+#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
#include "surf/surfxml.h" /* to hijack surf_parse_lex */
/* Create a log channel to have nice outputs. */
XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,"Messages specific for this msg example");
#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
-#define SURFXML_BUFFER_SET(key,val) do { \
- AX_surfxml_##key=AX_ptr; \
- strcpy(A_surfxml_##key,val); \
- AX_ptr+=strlen(val)+1; } while(0)
-
-#define SURFXML_BUFFER_RESET() do { \
- AX_ptr = 0; \
- memset(surfxml_bufferstack,0,surfxml_bufferstack_size); } while(0)
-
-
-static int surf_parse_bypass(void)
+static int surf_parse_bypass_platform(void)
{
- static int AX_ptr;
+ static int AX_ptr = 0;
static int surfxml_bufferstack_size = 2048;
- /* allocating memory to the buffer, I think 2MB should be enough */
+ /* allocating memory for the buffer, I think 2kB should be enough */
surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
- /* <platform_description> */
- SURFXML_BUFFER_RESET();
- SURFXML_BUFFER_SET(platform_description_version,"1");
-
- STag_surfxml_platform_description();
-
-/* <cpu name="Cpu A" power="100000000.00"/> */
- SURFXML_BUFFER_RESET();
- SURFXML_BUFFER_SET(cpu_name,"Cpu A");
- SURFXML_BUFFER_SET(cpu_power, "100000000.00");
- SURFXML_BUFFER_SET(cpu_availability, "1.0");
- SURFXML_BUFFER_SET(cpu_availability_file, "");
- A_surfxml_cpu_state = A_surfxml_cpu_state_ON;
- SURFXML_BUFFER_SET(cpu_state_file, "");
- SURFXML_BUFFER_SET(cpu_interference_send, "1.0");
- SURFXML_BUFFER_SET(cpu_interference_recv, "1.0");
- SURFXML_BUFFER_SET(cpu_interference_send_recv, "1.0");
- SURFXML_BUFFER_SET(cpu_max_outgoing_rate, "-1.0");
-
- STag_surfxml_cpu();
- ETag_surfxml_cpu();
-
-/* <cpu name="Cpu B" power="100000000.00"/> */
- SURFXML_BUFFER_RESET();
- SURFXML_BUFFER_SET(cpu_name, "Cpu B");
- SURFXML_BUFFER_SET(cpu_power, "100000000.00");
- SURFXML_BUFFER_SET(cpu_availability, "1.0");
- SURFXML_BUFFER_SET(cpu_availability_file, "");
- A_surfxml_cpu_state = A_surfxml_cpu_state_ON;
- SURFXML_BUFFER_SET(cpu_state_file, "");
- SURFXML_BUFFER_SET(cpu_interference_send, "1.0");
- SURFXML_BUFFER_SET(cpu_interference_recv, "1.0");
- SURFXML_BUFFER_SET(cpu_interference_send_recv, "1.0");
- SURFXML_BUFFER_SET(cpu_max_outgoing_rate, "-1.0");
-
- STag_surfxml_cpu();
- ETag_surfxml_cpu();
-
-/* <network_link name="LinkA" bandwidth="10000000.0" latency="0.2"/> */
- SURFXML_BUFFER_RESET();
- SURFXML_BUFFER_SET(network_link_name, "LinkA");
- SURFXML_BUFFER_SET(network_link_bandwidth, "10000000.0");
- SURFXML_BUFFER_SET(network_link_bandwidth_file, "");
- SURFXML_BUFFER_SET(network_link_latency, "0.2");
- SURFXML_BUFFER_SET(network_link_latency_file, "");
- A_surfxml_network_link_state = A_surfxml_network_link_state_ON;
- SURFXML_BUFFER_SET(network_link_state_file, "");
- A_surfxml_network_link_sharing_policy = A_surfxml_network_link_sharing_policy_SHARED;
- STag_surfxml_network_link();
- ETag_surfxml_network_link();
-
-/* <route src="Cpu A" dst="Cpu B"><route_element name="LinkA"/></route> */
- SURFXML_BUFFER_RESET();
- SURFXML_BUFFER_SET(route_src, "Cpu A");
- SURFXML_BUFFER_SET(route_dst, "Cpu B");
+ /* <platform> */
+ SURFXML_BUFFER_SET(platform_version,"2");
+
+ SURFXML_START_TAG(platform);
+
+/* <host id="host A" power="100000000.00"/> */
+ SURFXML_BUFFER_SET(host_id,"host A");
+ SURFXML_BUFFER_SET(host_power, "100000000.00");
+ SURFXML_BUFFER_SET(host_availability, "1.0");
+ SURFXML_BUFFER_SET(host_availability_file, "");
+ A_surfxml_host_state = A_surfxml_host_state_ON;
+ SURFXML_BUFFER_SET(host_state_file, "");
+ SURFXML_BUFFER_SET(host_interference_send, "1.0");
+ SURFXML_BUFFER_SET(host_interference_recv, "1.0");
+ SURFXML_BUFFER_SET(host_interference_send_recv, "1.0");
+ SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
+
+ SURFXML_START_TAG(host);
+ SURFXML_END_TAG(host);
+
+/* <host id="host B" power="100000000.00"/> */
+ SURFXML_BUFFER_SET(host_id, "host B");
+ SURFXML_BUFFER_SET(host_power, "100000000.00");
+ SURFXML_BUFFER_SET(host_availability, "1.0");
+ SURFXML_BUFFER_SET(host_availability_file, "");
+ A_surfxml_host_state = A_surfxml_host_state_ON;
+ SURFXML_BUFFER_SET(host_state_file, "");
+ SURFXML_BUFFER_SET(host_interference_send, "1.0");
+ SURFXML_BUFFER_SET(host_interference_recv, "1.0");
+ SURFXML_BUFFER_SET(host_interference_send_recv, "1.0");
+ SURFXML_BUFFER_SET(host_max_outgoing_rate, "-1.0");
+
+ SURFXML_START_TAG(host);
+ SURFXML_END_TAG(host);
+
+/* <link id="LinkA" bandwidth="10000000.0" latency="0.2"/> */
+ SURFXML_BUFFER_SET(link_id, "LinkA");
+ SURFXML_BUFFER_SET(link_bandwidth, "10000000.0");
+ SURFXML_BUFFER_SET(link_bandwidth_file, "");
+ SURFXML_BUFFER_SET(link_latency, "0.2");
+ SURFXML_BUFFER_SET(link_latency_file, "");
+ A_surfxml_link_state = A_surfxml_link_state_ON;
+ SURFXML_BUFFER_SET(link_state_file, "");
+ A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+ SURFXML_START_TAG(link);
+ SURFXML_END_TAG(link);
+
+/* <route src="host A" dst="host B"><link:ctn id="LinkA"/></route> */
+ SURFXML_BUFFER_SET(route_src, "host A");
+ SURFXML_BUFFER_SET(route_dst, "host B");
SURFXML_BUFFER_SET(route_impact_on_src, "0.0");
SURFXML_BUFFER_SET(route_impact_on_dst, "0.0");
SURFXML_BUFFER_SET(route_impact_on_src_with_other_recv, "0.0");
SURFXML_BUFFER_SET(route_impact_on_dst_with_other_send, "0.0");
- STag_surfxml_route();
+ SURFXML_START_TAG(route);
- SURFXML_BUFFER_SET(route_element_name, "LinkA");
- STag_surfxml_route_element();
- ETag_surfxml_route_element();
+ SURFXML_BUFFER_SET(link_c_ctn_id, "LinkA");
+ SURFXML_START_TAG(link_c_ctn);
+ SURFXML_END_TAG(link_c_ctn);
- ETag_surfxml_route();
+ SURFXML_END_TAG(route);
-/* <route src="Cpu B" dst="Cpu A"><route_element name="LinkA"/></route> */
- SURFXML_BUFFER_RESET();
- SURFXML_BUFFER_SET(route_src, "Cpu B");
- SURFXML_BUFFER_SET(route_dst, "Cpu A");
+/* <route src="host B" dst="host A"><link:ctn id="LinkA"/></route> */
+ SURFXML_BUFFER_SET(route_src, "host B");
+ SURFXML_BUFFER_SET(route_dst, "host A");
SURFXML_BUFFER_SET(route_impact_on_src, "0.0");
SURFXML_BUFFER_SET(route_impact_on_dst, "0.0");
SURFXML_BUFFER_SET(route_impact_on_src_with_other_recv, "0.0");
SURFXML_BUFFER_SET(route_impact_on_dst_with_other_send, "0.0");
- STag_surfxml_route();
+ SURFXML_START_TAG(route);
+
+ SURFXML_BUFFER_SET(link_c_ctn_id, "LinkA");
+ SURFXML_START_TAG(link_c_ctn);
+ SURFXML_END_TAG(link_c_ctn);
+
+ SURFXML_END_TAG(route);
+/* </platform> */
+ SURFXML_END_TAG(platform);
+
+ free(surfxml_bufferstack);
+ return 0;
+}
- SURFXML_BUFFER_SET(route_element_name, "LinkA");
- STag_surfxml_route_element();
- ETag_surfxml_route_element();
+static int surf_parse_bypass_application(void) {
+ static int AX_ptr;
+ static int surfxml_bufferstack_size = 2048;
- ETag_surfxml_route();
+ /* allocating memory to the buffer, I think 2MB should be enough */
+ surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
+
+ /* <platform> */
+ SURFXML_BUFFER_SET(platform_version,"2");
-/* <process host="Cpu A" function="master"> */
- SURFXML_BUFFER_RESET();
- SURFXML_BUFFER_SET(process_host, "Cpu A");
+ SURFXML_START_TAG(platform);
+
+/* <process host="host A" function="master"> */
+ SURFXML_BUFFER_SET(process_host, "host A");
SURFXML_BUFFER_SET(process_function, "master");
SURFXML_BUFFER_SET(process_start_time, "-1.0");
SURFXML_BUFFER_SET(process_kill_time, "-1.0");
- STag_surfxml_process();
+ SURFXML_START_TAG(process);
/* <argument value="20"/> */
SURFXML_BUFFER_SET(argument_value, "20");
- STag_surfxml_argument();
- ETag_surfxml_argument();
+ SURFXML_START_TAG(argument);
+ SURFXML_END_TAG(argument);
/* <argument value="5000000"/> */
SURFXML_BUFFER_SET(argument_value, "5000000");
- STag_surfxml_argument();
- ETag_surfxml_argument();
+ SURFXML_START_TAG(argument);
+ SURFXML_END_TAG(argument);
/* <argument value="100000"/> */
SURFXML_BUFFER_SET(argument_value, "100000");
- STag_surfxml_argument();
- ETag_surfxml_argument();
+ SURFXML_START_TAG(argument);
+ SURFXML_END_TAG(argument);
-/* <argument value="Cpu B"/> */
- SURFXML_BUFFER_SET(argument_value, "Cpu B");
- STag_surfxml_argument();
- ETag_surfxml_argument();
+/* <argument value="host B"/> */
+ SURFXML_BUFFER_SET(argument_value, "host B");
+ SURFXML_START_TAG(argument);
+ SURFXML_END_TAG(argument);
/* </process> */
- ETag_surfxml_process();
+ SURFXML_END_TAG(process);
-/* <process host="Cpu B" function="slave"/> */
- SURFXML_BUFFER_RESET();
- SURFXML_BUFFER_SET(process_host, "Cpu B");
+/* <process host="host B" function="slave"/> */
+ SURFXML_BUFFER_SET(process_host, "host B");
SURFXML_BUFFER_SET(process_function, "slave");
SURFXML_BUFFER_SET(process_start_time, "-1.0");
SURFXML_BUFFER_SET(process_kill_time, "-1.0");
- STag_surfxml_process();
- ETag_surfxml_process();
+ SURFXML_START_TAG(process);
+ SURFXML_END_TAG(process);
-/* </platform_description> */
- ETag_surfxml_platform_description();
+/* </platform> */
+ SURFXML_END_TAG(platform);
free(surfxml_bufferstack);
return 0;
/** Receiver function */
int slave(int argc, char *argv[])
{
+ INFO0("I'm a slave");
while(1) {
m_task_t task = NULL;
int a;
{
MSG_error_t res = MSG_OK;
- { /* Simulation setting */
- MSG_set_channel_number(MAX_CHANNEL);
- MSG_paje_output("msg_test.trace");
- surf_parse = surf_parse_bypass;
- MSG_create_environment(NULL);
- }
- { /* Application deployment */
- MSG_function_register("master", master);
- MSG_function_register("slave", slave);
- MSG_launch_application(NULL);
- }
- res = MSG_main();
+ /* Simulation setting */
+ MSG_set_channel_number(MAX_CHANNEL);
+ MSG_paje_output("msg_test.trace");
+ surf_parse = surf_parse_bypass_platform;
+ MSG_create_environment(NULL);
+
+ /* Application deployment */
+ MSG_function_register("master", master);
+ MSG_function_register("slave", slave);
+ surf_parse = surf_parse_bypass_application;
+ MSG_launch_application(NULL);
+
+ res = MSG_main();
INFO1("Simulation time %g",MSG_get_clock());
return res;