X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/abc6c695d534ee87fe91c84038ebbf6b9226575d..693f30b46244c152cd79cdf3ad35d4a79b866c9c:/examples/msg/masterslave/masterslave_forwarder.c diff --git a/examples/msg/masterslave/masterslave_forwarder.c b/examples/msg/masterslave/masterslave_forwarder.c index 1e0d779dcb..e0bfee0450 100644 --- a/examples/msg/masterslave/masterslave_forwarder.c +++ b/examples/msg/masterslave/masterslave_forwarder.c @@ -77,11 +77,11 @@ int master(int argc, char *argv[]) XBT_INFO("Got %d slaves and %d tasks to process", slaves_count, number_of_tasks); for (i = 0; i < slaves_count; i++) - XBT_DEBUG("%s", slaves[i]->name); + XBT_DEBUG("%s", MSG_host_get_name(slaves[i])); for (i = 0; i < number_of_tasks; i++) { XBT_INFO("Sending \"%s\" to \"%s\"", - todo[i]->name, slaves[i % slaves_count]->name); + todo[i]->name, MSG_host_get_name(slaves[i % slaves_count])); if (MSG_host_self() == slaves[i % slaves_count]) { XBT_INFO("Hey ! It's me ! :)"); } @@ -160,12 +160,12 @@ int forwarder(int argc, char *argv[]) ("All tasks have been dispatched. Let's tell everybody the computation is over."); for (i = 0; i < slaves_count; i++) MSG_task_send(MSG_task_create("finalize", 0, 0, FINALIZE), - MSG_host_get_name(slaves[i])); + MSG_host_get_name(slaves[i])); MSG_task_destroy(task); break; } XBT_INFO("Sending \"%s\" to \"%s\"", - MSG_task_get_name(task), slaves[i % slaves_count]->name); + MSG_task_get_name(task), MSG_host_get_name(slaves[i % slaves_count])); MSG_task_send(task, MSG_host_get_name(slaves[i % slaves_count])); i++; } else { @@ -207,7 +207,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]);