X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3a6228d1e65a6f7eea5b97ae0fa2668af06d59d..98565a6c0f5af14d8b0c0104570b927a56d0845c:/examples/msg/masterslave/masterslave_forwarder.c diff --git a/examples/msg/masterslave/masterslave_forwarder.c b/examples/msg/masterslave/masterslave_forwarder.c index c3179a06ba..257b27640c 100644 --- a/examples/msg/masterslave/masterslave_forwarder.c +++ b/examples/msg/masterslave/masterslave_forwarder.c @@ -6,13 +6,14 @@ * 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 */ +#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"); +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[]); @@ -24,7 +25,7 @@ typedef enum { MAX_CHANNEL } channel_t; -#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ +#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ /** Emitter function */ int master(int argc, char *argv[]) @@ -36,81 +37,90 @@ int master(int argc, char *argv[]) double task_comp_size = 0; double task_comm_size = 0; + TRACE_host_variable_set ("is_master", 1); int i; - xbt_assert1(sscanf(argv[1],"%d", &number_of_tasks), - "Invalid argument %s\n",argv[1]); - xbt_assert1(sscanf(argv[2],"%lg", &task_comp_size), - "Invalid argument %s\n",argv[2]); - xbt_assert1(sscanf(argv[3],"%lg", &task_comm_size), - "Invalid argument %s\n",argv[3]); + xbt_assert1(sscanf(argv[1], "%d", &number_of_tasks), + "Invalid argument %s\n", argv[1]); + xbt_assert1(sscanf(argv[2], "%lg", &task_comp_size), + "Invalid argument %s\n", argv[2]); + xbt_assert1(sscanf(argv[3], "%lg", &task_comm_size), + "Invalid argument %s\n", argv[3]); - { /* Task creation */ + { /* Task creation */ char sprintf_buffer[64]; - todo = xbt_new0(m_task_t,number_of_tasks); + todo = xbt_new0(m_task_t, number_of_tasks); for (i = 0; i < number_of_tasks; i++) { sprintf(sprintf_buffer, "Task_%d", i); - todo[i] = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL); + todo[i] = + MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL); + TRACE_host_variable_set ("task_creation", i); + TRACE_msg_set_task_category (todo[i], "compute"); } } - { /* Process organisation */ + { /* Process organisation */ slaves_count = argc - 4; - slaves = xbt_new0(m_host_t,slaves_count); - + slaves = xbt_new0(m_host_t, slaves_count); + for (i = 4; i < argc; i++) { - slaves[i-4] = MSG_get_host_by_name(argv[i]); - xbt_assert1(slaves[i-4]!=NULL, "Unknown host %s. Stopping Now! ", argv[i]); + slaves[i - 4] = MSG_get_host_by_name(argv[i]); + xbt_assert1(slaves[i - 4] != NULL, "Unknown host %s. Stopping Now! ", + argv[i]); } } - INFO2("Got %d slaves and %d tasks to process", slaves_count,number_of_tasks); + INFO2("Got %d slaves and %d tasks to process", slaves_count, + number_of_tasks); for (i = 0; i < slaves_count; i++) DEBUG1("%s", slaves[i]->name); for (i = 0; i < number_of_tasks; i++) { INFO2("Sending \"%s\" to \"%s\"", - todo[i]->name, - slaves[i % slaves_count]->name); - if(MSG_host_self()==slaves[i % slaves_count]) { + 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); + MSG_task_put(todo[i], slaves[i % slaves_count], PORT_22); INFO0("Sent"); } - - 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 + ("All tasks have been dispatched. Let's tell everybody the computation is over."); + for (i = 0; i < slaves_count; i++){ + m_task_t finalize=MSG_task_create("finalize", 0, 0, FINALIZE); + TRACE_msg_set_task_category(finalize,"finalize"); + MSG_task_put(finalize, slaves[i], PORT_22); + } + INFO0("Goodbye now!"); free(slaves); free(todo); return 0; -} /* end_of_master */ +} /* end_of_master */ /** Receiver function */ int slave(int argc, char *argv[]) { m_task_t task = NULL; + TRACE_host_variable_set ("is_slave", 1); int res; - while(1) { + while (1) { res = MSG_task_get(&(task), PORT_22); xbt_assert0(res == MSG_OK, "MSG_task_get failed"); INFO1("Received \"%s\"", MSG_task_get_name(task)); - if (!strcmp(MSG_task_get_name(task),"finalize")) { - MSG_task_destroy(task); - break; + if (!strcmp(MSG_task_get_name(task), "finalize")) { + MSG_task_destroy(task); + break; } - + INFO1("Processing \"%s\"", MSG_task_get_name(task)); + TRACE_host_variable_add ("task_computation", MSG_task_get_compute_duration(task)); MSG_task_execute(task); INFO1("\"%s\" done", MSG_task_get_name(task)); MSG_task_destroy(task); @@ -118,7 +128,7 @@ int slave(int argc, char *argv[]) } INFO0("I'm done. See you!"); return 0; -} /* end_of_slave */ +} /* end_of_slave */ /** Forwarder function */ int forwarder(int argc, char *argv[]) @@ -127,91 +137,111 @@ int forwarder(int argc, char *argv[]) int slaves_count; m_host_t *slaves; - { /* Process organisation */ + { /* Process organisation */ slaves_count = argc - 1; - slaves = xbt_new0(m_host_t,slaves_count); - + slaves = xbt_new0(m_host_t, slaves_count); + for (i = 1; i < argc; i++) { - slaves[i-1] = MSG_get_host_by_name(argv[i]); - if(slaves[i-1]==NULL) { - INFO1("Unknown host %s. Stopping Now! ", argv[i]); - abort(); + slaves[i - 1] = MSG_get_host_by_name(argv[i]); + if (slaves[i - 1] == NULL) { + INFO1("Unknown host %s. Stopping Now! ", argv[i]); + abort(); } } } - i=0; - while(1) { + i = 0; + while (1) { m_task_t task = NULL; int a; a = MSG_task_get(&(task), PORT_22); if (a == MSG_OK) { 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; + 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\"", - MSG_task_get_name(task), - slaves[i% slaves_count]->name); - MSG_task_put(task, slaves[i % slaves_count], - PORT_22); + 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 behavior"); + xbt_assert0(0, "Unexpected behavior"); } } + xbt_free(slaves); INFO0("I'm done. See you!"); return 0; -} /* end_of_forwarder */ +} /* end_of_forwarder */ /** Test function */ -MSG_error_t 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("surf_workstation_model","KCCFLN05"); */ - { /* Simulation setting */ + /* MSG_config("workstation/model","KCCFLN05"); */ + { /* Simulation setting */ MSG_set_channel_number(MAX_CHANNEL); - MSG_paje_output("msg_test.trace"); MSG_create_environment(platform_file); } - { /* Application deployment */ + { /* Application deployment */ MSG_function_register("master", master); MSG_function_register("slave", slave); MSG_function_register("forwarder", forwarder); MSG_launch_application(application_file); } res = MSG_main(); - - INFO1("Simulation time %g",MSG_get_clock()); + + INFO1("Simulation time %g", MSG_get_clock()); return res; -} /* end_of_test_all */ +} /* end_of_test_all */ /** Main function */ int main(int argc, char *argv[]) { MSG_error_t res = MSG_OK; + int is_tracing = 0; + int i; + + for (i = 0; i < argc; i++){ + if (!strcmp (argv[i], "--trace")){ + is_tracing = 1; + } + } - MSG_global_init(&argc,argv); + if (is_tracing) { + //if TRACE_start is not called, all other tracing + //functions will be disabled + TRACE_start ("simulation.trace"); + } + TRACE_host_variable_declare ("is_slave"); + TRACE_host_variable_declare ("is_master"); + TRACE_host_variable_declare ("task_creation"); + TRACE_host_variable_declare ("task_computation"); + TRACE_category ("compute"); + TRACE_category ("finalize"); + + 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); + printf("Usage: %s platform_file deployment_file\n", argv[0]); + printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]); + exit(1); } - res = test_all(argv[1],argv[2]); + res = test_all(argv[1], argv[2]); MSG_clean(); - if(res==MSG_OK) + TRACE_end (); + + if (res == MSG_OK) return 0; else return 1; -} /* end_of_main */ +} /* end_of_main */