X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/31cdbb05b8e60a3d47d1d688e1a35cd457a6f407..d7fb4480c24a5089ab8bbcbffec1e18a35e88b8e:/examples/msg/msg_test.c diff --git a/examples/msg/msg_test.c b/examples/msg/msg_test.c index 985baa8207..2446e3db70 100644 --- a/examples/msg/msg_test.c +++ b/examples/msg/msg_test.c @@ -5,34 +5,26 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include #include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ #include "xbt/log.h" +#include "xbt/asserts.h" XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,"Messages specific for this msg example"); int master(int argc, char *argv[]); int slave(int argc, char *argv[]); int forwarder(int argc, char *argv[]); -void test_all(const char *platform_file, const char *application_file); +MSG_error_t test_all(const char *platform_file, const char *application_file); typedef enum { PORT_22 = 0, MAX_CHANNEL } channel_t; -/* This function is just used so that users can check that each process - * has received the arguments it was supposed to receive. - */ -static void print_args(int argc, char** argv) -{ - int i ; - - fprintf(stderr,"<"); - for(i=0; i\n"); -} +#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ /** Emitter function */ int master(int argc, char *argv[]) @@ -47,8 +39,6 @@ int master(int argc, char *argv[]) int i; - print_args(argc,argv); - xbt_assert1(sscanf(argv[1],"%d", &number_of_tasks), "Invalid argument %s\n",argv[1]); xbt_assert1(sscanf(argv[2],"%lg", &task_comp_size), @@ -93,12 +83,21 @@ int master(int argc, char *argv[]) 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); INFO0("Send completed"); } - INFO0("All tasks have been dispatched. Bye!"); + INFO0("All tasks have been dispatched. Let's tell everybody the computation is over."); + for (i = 0; i < slaves_count; i++) + MSG_task_put(MSG_task_create("finalize", 0, 0, FINALIZE), + slaves[i], PORT_22); + + INFO0("Goodbye now!"); free(slaves); free(todo); return 0; @@ -107,35 +106,35 @@ int master(int argc, char *argv[]) /** Receiver function */ int slave(int argc, char *argv[]) { - print_args(argc,argv); - while(1) { m_task_t task = NULL; int a; a = MSG_task_get(&(task), PORT_22); if (a == MSG_OK) { - INFO1("Received \"%s\" ", task->name); - INFO1("Processing \"%s\" ", task->name); + INFO1("Received \"%s\" ", MSG_task_get_name(task)); + if(MSG_task_get_data(task)==FINALIZE) { + MSG_task_destroy(task); + break; + } + INFO1("Processing \"%s\" ", MSG_task_get_name(task)); MSG_task_execute(task); - INFO1("\"%s\" done ", task->name); + INFO1("\"%s\" done ", MSG_task_get_name(task)); MSG_task_destroy(task); } else { INFO0("Hey ?! What's up ? "); - xbt_assert0(0,"Unexpected behaviour"); + xbt_assert0(0,"Unexpected behavior"); } } INFO0("I'm done. See you!"); return 0; } /* end_of_slave */ -/** Receiver function */ +/** Forwarder function */ int forwarder(int argc, char *argv[]) { int i; - int slaves_count = argc - 1; - m_host_t *slaves = calloc(slaves_count, sizeof(m_host_t)); - - print_args(argc,argv); + int slaves_count; + m_host_t *slaves; { /* Process organisation */ slaves_count = argc - 1; @@ -156,15 +155,24 @@ int forwarder(int argc, char *argv[]) int a; a = MSG_task_get(&(task), PORT_22); if (a == MSG_OK) { - INFO1("Received \"%s\" ", task->name); + INFO1("Received \"%s\" ", MSG_task_get_name(task)); + if(MSG_task_get_data(task)==FINALIZE) { + INFO0("All tasks have been dispatched. Let's tell everybody the computation is over."); + for (i = 0; i < slaves_count; i++) + MSG_task_put(MSG_task_create("finalize", 0, 0, FINALIZE), + slaves[i], PORT_22); + MSG_task_destroy(task); + break; + } INFO2("Sending \"%s\" to \"%s\"", - task->name, - slaves[i % slaves_count]->name); + MSG_task_get_name(task), + slaves[i% slaves_count]->name); MSG_task_put(task, slaves[i % slaves_count], PORT_22); + i++; } else { INFO0("Hey ?! What's up ? "); - xbt_assert0(0,"Unexpected behaviour"); + xbt_assert0(0,"Unexpected behavior"); } } @@ -172,10 +180,13 @@ int forwarder(int argc, char *argv[]) return 0; } /* end_of_forwarder */ - /** Test function */ -void test_all(const char *platform_file,const char *application_file) +MSG_error_t test_all(const char *platform_file, + const char *application_file) { + MSG_error_t res = MSG_OK; + + MSG_config("workstation_model","CLM03"); { /* Simulation setting */ MSG_set_channel_number(MAX_CHANNEL); MSG_paje_output("msg_test.trace"); @@ -187,22 +198,29 @@ void test_all(const char *platform_file,const char *application_file) MSG_function_register("forwarder", forwarder); MSG_launch_application(application_file); } - MSG_main(); + res = MSG_main(); - INFO1("Simulation time %g",MSG_getClock()); + INFO1("Simulation time %g",MSG_get_clock()); + return res; } /* end_of_test_all */ /** Main function */ int main(int argc, char *argv[]) { - MSG_global_init_args(&argc,argv); + MSG_error_t res = MSG_OK; + + 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]); exit(1); } - test_all(argv[1],argv[2]); + res = test_all(argv[1],argv[2]); MSG_clean(); - return (0); + + if(res==MSG_OK) + return 0; + else + return 1; } /* end_of_main */