X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/151516a621d5672ec2ff0c4aeab7600b44ee7080..c5b6984a0236437d46945ee28731a6a072f6a2fb:/examples/msg/msg_test.c diff --git a/examples/msg/msg_test.c b/examples/msg/msg_test.c index 5fa18e1b6b..388e0878ec 100644 --- a/examples/msg/msg_test.c +++ b/examples/msg/msg_test.c @@ -82,20 +82,23 @@ int master(int argc, char *argv[]) INFO1("Got %d slave(s) :", slaves_count); for (i = 0; i < slaves_count; i++) - VERB1("\t %s", slaves[i]->name); + INFO1("\t %s", slaves[i]->name); INFO1("Got %d task to process :", number_of_tasks); for (i = 0; i < number_of_tasks; i++) - VERB1("\t\"%s\"", todo[i]->name); + INFO1("\t\"%s\"", todo[i]->name); for (i = 0; i < number_of_tasks; i++) { - VERB2("Sending \"%s\" to \"%s\"", + INFO2("Sending \"%s\" to \"%s\"", todo[i]->name, slaves[i % slaves_count]->name); + if(MSG_host_self()==slaves[i % slaves_count]) { + INFO0("Hey ! It's me ! :)"); + } MSG_task_put(todo[i], slaves[i % slaves_count], PORT_22); - DEBUG0("Send completed"); + INFO0("Send completed"); } INFO0("All tasks have been dispatched. Bye!"); @@ -115,9 +118,9 @@ int slave(int argc, char *argv[]) a = MSG_task_get(&(task), PORT_22); if (a == MSG_OK) { INFO1("Received \"%s\" ", task->name); - DEBUG1("Processing \"%s\" ", task->name); + INFO1("Processing \"%s\" ", task->name); MSG_task_execute(task); - VERB1("\"%s\" done ", task->name); + INFO1("\"%s\" done ", task->name); MSG_task_destroy(task); } else { INFO0("Hey ?! What's up ? "); @@ -177,7 +180,7 @@ int forwarder(int argc, char *argv[]) void test_all(const char *platform_file,const char *application_file) { - MSG_config("surf_workstation_model","KCCFLN05"); + /* MSG_config("surf_workstation_model","KCCFLN05"); */ { /* Simulation setting */ MSG_set_channel_number(MAX_CHANNEL); MSG_paje_output("msg_test.trace"); @@ -198,7 +201,7 @@ void test_all(const char *platform_file,const char *application_file) /** Main function */ int main(int argc, char *argv[]) { - MSG_global_init_args(&argc,argv); + MSG_global_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]);