From: Frederic Suter Date: Mon, 18 Apr 2016 21:38:32 +0000 (+0200) Subject: wip... unalvining the tutorial X-Git-Tag: v3_13~65 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b1dfbcb15b4a2b87a06482ebaebd9f1951af3d43 wip... unalvining the tutorial --- diff --git a/doc/msg-tuto-src/masterworker0.c b/doc/msg-tuto-src/masterworker0.c index 3526b42d2d..918a59711e 100644 --- a/doc/msg-tuto-src/masterworker0.c +++ b/doc/msg-tuto-src/masterworker0.c @@ -4,41 +4,24 @@ /* 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 "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/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 worker(int argc, char *argv[]); -msg_error_t test_all(const char *platform_file, - const char *application_file); +XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example"); #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ -/** Emitter function */ -int master(int argc, char *argv[]) +/** Master expects 3+ arguments given in the XML deployment file: */ +static int master(int argc, char *argv[]) { int workers_count = 0; msg_host_t *workers = NULL; msg_task_t *todo = NULL; - int number_of_tasks = 0; - double task_comp_size = 0; - double task_comm_size = 0; int i; - XBT_ATTRIB_UNUSED int res = sscanf(argv[1], "%d", &number_of_tasks); - xbt_assert(res,"Invalid argument %s\n", argv[1]); - res = sscanf(argv[2], "%lg", &task_comp_size); - xbt_assert(res, "Invalid argument %s\n", argv[2]); - res = sscanf(argv[3], "%lg", &task_comm_size); - xbt_assert(res, "Invalid argument %s\n", argv[3]); + long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s"); /** - Number of tasks */ + double comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s"); /** - Task compute cost */ + double comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); /** - Task communication size */ { /* Task creation */ char sprintf_buffer[64]; @@ -47,9 +30,7 @@ int master(int argc, char *argv[]) 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); } } @@ -59,17 +40,14 @@ int master(int argc, char *argv[]) for (i = 4; i < argc; i++) { workers[i - 4] = MSG_get_host_by_name(argv[i]); - xbt_assert(workers[i - 4] != NULL, "Unknown host %s. Stopping Now! ", - argv[i]); + xbt_assert(workers[i - 4] != NULL, "Unknown host %s. Stopping Now! ", argv[i]); } } - XBT_INFO("Got %d workers and %d tasks to process", workers_count, - number_of_tasks); + XBT_INFO("Got %d workers and %ld tasks to process", workers_count, number_of_tasks); for (i = 0; i < number_of_tasks; i++) { - XBT_INFO("Sending \"%s\" to \"%s\"", - todo[i]->name, MSG_host_get_name(workers[i % workers_count])); + XBT_INFO("Sending \"%s\" to \"%s\"", todo[i]->name, MSG_host_get_name(workers[i % workers_count])); if (MSG_host_self() == workers[i % workers_count]) { XBT_INFO("Hey ! It's me ! :)"); } @@ -78,8 +56,7 @@ int master(int argc, char *argv[]) XBT_INFO("Sent"); } - XBT_INFO - ("All tasks have been dispatched. Let's tell everybody the computation is over."); + XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over."); for (i = 0; i < workers_count; i++) { msg_task_t finalize = MSG_task_create("finalize", 0, 0, FINALIZE); MSG_task_send(finalize, MSG_host_get_name(workers[i])); @@ -91,8 +68,8 @@ int master(int argc, char *argv[]) return 0; } /* end_of_master */ -/** Receiver function */ -int worker(int argc, char *argv[]) +/** Worker expects a single argument given in the XML deployment file: */ +static int worker(int argc, char *argv[]) { msg_task_t task = NULL; XBT_ATTRIB_UNUSED int res; @@ -116,42 +93,24 @@ int worker(int argc, char *argv[]) return 0; } /* end_of_worker */ -/** Test function */ -msg_error_t test_all(const char *platform_file, - const char *application_file) +/** Main function */ +int main(int argc, char *argv[]) { msg_error_t res = MSG_OK; + MSG_init(&argc, argv); + xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n" + "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]); { /* Simulation setting */ - MSG_create_environment(platform_file); + MSG_create_environment(argv[1]); } { /* Application deployment */ MSG_function_register("master", master); MSG_function_register("worker", worker); - MSG_launch_application(application_file); + MSG_launch_application(argv[2]); } res = MSG_main(); XBT_INFO("Simulation time %g", MSG_get_clock()); - return res; -} /* end_of_test_all */ - - -/** Main function */ -int main(int argc, char *argv[]) -{ - msg_error_t res = MSG_OK; - - 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]); - exit(1); - } - res = test_all(argv[1], argv[2]); - - if (res == MSG_OK) - return 0; - else - return 1; + return (res != MSG_OK); } /* end_of_main */ diff --git a/doc/msg-tuto-src/masterworker1.c b/doc/msg-tuto-src/masterworker1.c index c5d7877bf4..4c4306507f 100644 --- a/doc/msg-tuto-src/masterworker1.c +++ b/doc/msg-tuto-src/masterworker1.c @@ -4,20 +4,9 @@ /* 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 "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ -#include "xbt/sysdep.h" /* calloc, printf */ +#include "simgrid/msg.h" -/* 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 worker(int argc, char *argv[]); -msg_error_t test_all(const char *platform_file, - const char *application_file); +XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example"); #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ @@ -30,26 +19,20 @@ static char * build_channel_name(char *buffer, const char *sender, const char* r } /** Emitter function */ -int master(int argc, char *argv[]) +static int master(int argc, char *argv[]) { int workers_count = 0; msg_host_t *workers = NULL; msg_task_t *todo = NULL; msg_host_t host_self = MSG_host_self(); char *master_name = (char *) MSG_host_get_name(host_self); - int number_of_tasks = 0; - double task_comp_size = 0; - double task_comm_size = 0; char channel[1024]; int i; - XBT_ATTRIB_UNUSED int res = sscanf(argv[1], "%d", &number_of_tasks); - xbt_assert(res,"Invalid argument %s\n", argv[1]); - res = sscanf(argv[2], "%lg", &task_comp_size); - xbt_assert(res, "Invalid argument %s\n", argv[2]); - res = sscanf(argv[3], "%lg", &task_comm_size); - xbt_assert(res, "Invalid argument %s\n", argv[3]); + long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s"); /** - Number of tasks */ + double comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s"); /** - Task compute cost */ + double comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); /** - Task communication size */ { /* Task creation */ char sprintf_buffer[64]; @@ -58,33 +41,29 @@ int master(int argc, char *argv[]) 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); } } { /* Process organization */ workers_count = MSG_get_host_number(); workers = xbt_dynar_to_array(MSG_hosts_as_dynar()); - + for (i = 0; i < workers_count; i++) if(host_self == workers[i]) { - workers[i] = workers[workers_count-1]; - workers_count--; - break; + workers[i] = workers[workers_count-1]; + workers_count--; + break; } for (i = 0; i < workers_count; i++) MSG_process_create("worker", worker, master_name, workers[i]); } - XBT_INFO("Got %d workers and %d tasks to process", workers_count, - number_of_tasks); + XBT_INFO("Got %d workers and %Ld tasks to process", workers_count, number_of_tasks); for (i = 0; i < number_of_tasks; i++) { - build_channel_name(channel,master_name, - MSG_host_get_name(workers[i % workers_count])); + build_channel_name(channel,master_name, MSG_host_get_name(workers[i % workers_count])); XBT_INFO("Sending \"%s\" to channel \"%s\"", todo[i]->name, channel); @@ -92,12 +71,10 @@ int master(int argc, char *argv[]) XBT_INFO("Sent"); } - XBT_INFO - ("All tasks have been dispatched. Let's tell everybody the computation is over."); + XBT_INFO ("All tasks have been dispatched. Let's tell everybody the computation is over."); for (i = 0; i < workers_count; i++) { msg_task_t finalize = MSG_task_create("finalize", 0, 0, FINALIZE); - MSG_task_send(finalize, build_channel_name(channel,master_name, - MSG_host_get_name(workers[i % workers_count]))); + MSG_task_send(finalize, build_channel_name(channel,master_name, MSG_host_get_name(workers[i % workers_count]))); } XBT_INFO("Goodbye now!"); @@ -107,14 +84,13 @@ int master(int argc, char *argv[]) } /* end_of_master */ /** Receiver function */ -int worker(int argc, char *argv[]) +static int worker(int argc, char *argv[]) { msg_task_t task = NULL; XBT_ATTRIB_UNUSED int res; char channel[1024]; - build_channel_name(channel,MSG_process_get_data(MSG_process_self()), - MSG_host_get_name(MSG_host_self())); + build_channel_name(channel,MSG_process_get_data(MSG_process_self()), MSG_host_get_name(MSG_host_self())); XBT_INFO("Receiving on channel \"%s\"", channel); @@ -138,42 +114,24 @@ int worker(int argc, char *argv[]) return 0; } /* end_of_worker */ -/** Test function */ -msg_error_t test_all(const char *platform_file, - const char *application_file) +/** Main function */ +int main(int argc, char *argv[]) { msg_error_t res = MSG_OK; + MSG_init(&argc, argv); + xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n" + "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]); { /* Simulation setting */ - MSG_create_environment(platform_file); + MSG_create_environment(argv[1]); } { /* Application deployment */ MSG_function_register("master", master); MSG_function_register("worker", worker); - MSG_launch_application(application_file); + MSG_launch_application(argv[2]); } res = MSG_main(); XBT_INFO("Simulation time %g", MSG_get_clock()); - return res; -} /* end_of_test_all */ - - -/** Main function */ -int main(int argc, char *argv[]) -{ - msg_error_t res = MSG_OK; - - 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]); - exit(1); - } - res = test_all(argv[1], argv[2]); - - if (res == MSG_OK) - return 0; - else - return 1; + return (res != MSG_OK); } /* end_of_main */