X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3c1ebdb5d5e4370a0efd5f4c0dd4f7131fe8370..0c13871d73e933c1847faf8debea7b7745a3ff44:/examples/msg/masterslave/masterslave_bypass.c
diff --git a/examples/msg/masterslave/masterslave_bypass.c b/examples/msg/masterslave/masterslave_bypass.c
index 62a86bd3c8..a5e71eab61 100644
--- a/examples/msg/masterslave/masterslave_bypass.c
+++ b/examples/msg/masterslave/masterslave_bypass.c
@@ -35,10 +35,10 @@ static int surf_parse_bypass_platform(void)
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, "");
+ SURFXML_BUFFER_SET(host_availability___file, "");
SURFXML_BUFFER_SET(host_core, "1");
A_surfxml_host_state = A_surfxml_host_state_ON;
- SURFXML_BUFFER_SET(host_state_file, "");
+ SURFXML_BUFFER_SET(host_state___file, "");
SURFXML_BUFFER_SET(host_coordinates, "");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
@@ -47,10 +47,10 @@ static int surf_parse_bypass_platform(void)
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, "");
+ SURFXML_BUFFER_SET(host_availability___file, "");
SURFXML_BUFFER_SET(host_core, "1");
A_surfxml_host_state = A_surfxml_host_state_ON;
- SURFXML_BUFFER_SET(host_state_file, "");
+ SURFXML_BUFFER_SET(host_state___file, "");
SURFXML_BUFFER_SET(host_coordinates, "");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
@@ -58,12 +58,12 @@ static int surf_parse_bypass_platform(void)
XBT_DEBUG("");
SURFXML_BUFFER_SET(link_id, "LinkA");
SURFXML_BUFFER_SET(link_bandwidth, "10000000.0");
- SURFXML_BUFFER_SET(link_bandwidth_file, "");
+ SURFXML_BUFFER_SET(link_bandwidth___file, "");
SURFXML_BUFFER_SET(link_latency, "0.2");
- SURFXML_BUFFER_SET(link_latency_file, "");
+ 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_BUFFER_SET(link_state___file, "");
+ A_surfxml_link_sharing___policy = A_surfxml_link_sharing___policy_SHARED;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
@@ -73,10 +73,10 @@ static int surf_parse_bypass_platform(void)
A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_YES;
SURFXML_START_TAG(route);
XBT_DEBUG(" ");
- SURFXML_BUFFER_SET(link_ctn_id, "LinkA");
- A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
- SURFXML_START_TAG(link_ctn);
- SURFXML_END_TAG(link_ctn);
+ SURFXML_BUFFER_SET(link___ctn_id, "LinkA");
+ A_surfxml_link___ctn_direction = A_surfxml_link___ctn_direction_NONE;
+ SURFXML_START_TAG(link___ctn);
+ SURFXML_END_TAG(link___ctn);
XBT_DEBUG("");
SURFXML_END_TAG(route);
@@ -106,8 +106,8 @@ static int surf_parse_bypass_application(void)
/* */
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");
+ SURFXML_BUFFER_SET(process_start___time, "-1.0");
+ SURFXML_BUFFER_SET(process_kill___time, "-1.0");
SURFXML_START_TAG(process);
/* */
@@ -136,8 +136,8 @@ static int surf_parse_bypass_application(void)
/* */
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");
+ SURFXML_BUFFER_SET(process_start___time, "-1.0");
+ SURFXML_BUFFER_SET(process_kill___time, "-1.0");
SURFXML_START_TAG(process);
SURFXML_END_TAG(process);
@@ -150,14 +150,14 @@ static int surf_parse_bypass_application(void)
int master(int argc, char *argv[]);
int slave(int argc, char *argv[]);
-MSG_error_t test_all(void);
+msg_error_t test_all(void);
/** Emitter function */
int master(int argc, char *argv[])
{
int slaves_count = 0;
- m_host_t *slaves = NULL;
- m_task_t *todo = NULL;
+ msg_host_t *slaves = NULL;
+ msg_task_t *todo = NULL;
int number_of_tasks = 0;
double task_comp_size = 0;
double task_comm_size = 0;
@@ -174,7 +174,7 @@ int master(int argc, char *argv[])
{ /* Task creation */
char sprintf_buffer[64];
- todo = xbt_new0(m_task_t, number_of_tasks);
+ todo = xbt_new0(msg_task_t, number_of_tasks);
for (i = 0; i < number_of_tasks; i++) {
sprintf(sprintf_buffer, "Task_%d", i);
@@ -186,7 +186,7 @@ int master(int argc, char *argv[])
{ /* Process organisation */
slaves_count = argc - 4;
- slaves = xbt_new0(m_host_t, slaves_count);
+ slaves = xbt_new0(msg_host_t, slaves_count);
for (i = 4; i < argc; i++) {
slaves[i - 4] = MSG_get_host_by_name(argv[i]);
@@ -233,7 +233,7 @@ int slave(int argc, char *argv[])
{
XBT_INFO("I'm a slave");
while (1) {
- m_task_t task = NULL;
+ msg_task_t task = NULL;
int a;
a = MSG_task_receive(&task, MSG_host_get_name(MSG_host_self()));
if (a == MSG_OK) {
@@ -256,9 +256,9 @@ int slave(int argc, char *argv[])
} /* end_of_slave */
/** Test function */
-MSG_error_t test_all(void)
+msg_error_t test_all(void)
{
- MSG_error_t res = MSG_OK;
+ msg_error_t res = MSG_OK;
/* Simulation setting */
surf_parse = surf_parse_bypass_platform;
@@ -279,11 +279,10 @@ MSG_error_t test_all(void)
/** Main function */
int main(int argc, char *argv[])
{
- MSG_error_t res = MSG_OK;
+ msg_error_t res = MSG_OK;
MSG_init(&argc, argv);
res = test_all();
- MSG_clean();
if (res == MSG_OK)
return 0;