X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48a6c50a85f2d0d71990bd4a57d23fb6d763f64a..f3c1ebdb5d5e4370a0efd5f4c0dd4f7131fe8370:/examples/msg/masterslave/masterslave_failure.c?ds=sidebyside diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c index c882244eea..c567f4c9b1 100644 --- a/examples/msg/masterslave/masterslave_failure.c +++ b/examples/msg/masterslave/masterslave_failure.c @@ -55,7 +55,7 @@ int master(int argc, char *argv[]) XBT_INFO("Got %d slave(s) :", slaves_count); for (i = 0; i < slaves_count; i++) - XBT_INFO("%s", slaves[i]->name); + XBT_INFO("%s", MSG_host_get_name(slaves[i])); XBT_INFO("Got %d task to process :", number_of_tasks); @@ -79,13 +79,13 @@ int master(int argc, char *argv[]) } else if (a == MSG_TRANSFER_FAILURE) { XBT_INFO ("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", - slaves[i % slaves_count]->name); + MSG_host_get_name(slaves[i % slaves_count])); free(task->data); MSG_task_destroy(task); } else if (a == MSG_TIMEOUT) { XBT_INFO ("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", - slaves[i % slaves_count]->name); + MSG_host_get_name(slaves[i % slaves_count])); free(task->data); MSG_task_destroy(task); } else { @@ -109,16 +109,16 @@ int master(int argc, char *argv[]) return 0; } else if (a == MSG_TRANSFER_FAILURE) { XBT_INFO("Mmh. Can't reach '%s'! Nevermind. Let's keep going!", - slaves[i]->name); + MSG_host_get_name(slaves[i])); MSG_task_destroy(task); } else if (a == MSG_TIMEOUT) { XBT_INFO ("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", - slaves[i % slaves_count]->name); + MSG_host_get_name(slaves[i % slaves_count])); MSG_task_destroy(task); } else { XBT_INFO("Hey ?! What's up ? "); - xbt_die("Unexpected behavior with '%s': %d", slaves[i]->name, a); + xbt_die("Unexpected behavior with '%s': %d", MSG_host_get_name(slaves[i]), a); } } @@ -203,7 +203,7 @@ int main(int argc, char *argv[]) { MSG_error_t res = MSG_OK; - MSG_global_init(&argc, argv); + MSG_init(&argc, argv); if (argc < 3) { printf("Usage: %s platform_file deployment_file\n", argv[0]); printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);