From: Frederic Suter Date: Thu, 21 Apr 2016 07:43:37 +0000 (+0200) Subject: end of unalvinifaction of msg tutorial X-Git-Tag: v3_13~39 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/6618b4c21b3d7204e322539b0ff831267ff00a56 end of unalvinifaction of msg tutorial --- diff --git a/doc/msg-tuto-src/masterworker0.c b/doc/msg-tuto-src/masterworker0.c index 918a59711e..6cf173fb80 100644 --- a/doc/msg-tuto-src/masterworker0.c +++ b/doc/msg-tuto-src/masterworker0.c @@ -4,7 +4,7 @@ /* 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 "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ +#include "simgrid/msg.h" XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example"); diff --git a/doc/msg-tuto-src/masterworker2.c b/doc/msg-tuto-src/masterworker2.c index e3c2826c50..346953a57b 100644 --- a/doc/msg-tuto-src/masterworker2.c +++ b/doc/msg-tuto-src/masterworker2.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 */ @@ -29,45 +18,37 @@ static char * build_channel_name(char *buffer, const char *sender, const char* r return buffer; } -/** Emitter function */ -int master(int argc, char *argv[]) +/** Master function */ +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); - double task_comp_size = 0; - double task_comm_size = 0; char channel[1024]; - double timeout = -1; int i; - - XBT_ATTRIB_UNUSED int res = sscanf(argv[1], "%lg", &timeout); - 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]); + double timeout = xbt_str_parse_double(argv[1], "Invalid timeout: %s"); /** - timeout */ + 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 */ { /* 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]); + MSG_process_create("worker", worker, master_name, workers[i]); } - XBT_INFO("Got %d workers and will send tasks for %g seconds!", - workers_count, timeout); + XBT_INFO("Got %d workers and will send tasks for %g seconds!", workers_count, timeout); for (i = 0; 1; i++) { char sprintf_buffer[64]; @@ -76,11 +57,9 @@ int master(int argc, char *argv[]) if(MSG_get_clock()>timeout) break; sprintf(sprintf_buffer, "Task_%d", i); - task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, - NULL); + task = MSG_task_create(sprintf_buffer, comp_size, comm_size, NULL); - 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_DEBUG("Sending \"%s\" to channel \"%s\"", task->name, channel); MSG_task_send(task, channel); @@ -89,8 +68,7 @@ int master(int argc, char *argv[]) int task_num = i; - XBT_DEBUG - ("All tasks have been dispatched. Let's tell everybody the computation is over."); + XBT_DEBUG ("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, @@ -103,15 +81,14 @@ int master(int argc, char *argv[]) return 0; } /* end_of_master */ -/** Receiver function */ -int worker(int argc, char *argv[]) +/** Worker function */ +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_DEBUG("Receiving on channel \"%s\"", channel); @@ -135,42 +112,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/masterworker3.c b/doc/msg-tuto-src/masterworker3.c index e5e9726f6e..3761a26afb 100644 --- a/doc/msg-tuto-src/masterworker3.c +++ b/doc/msg-tuto-src/masterworker3.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 */ @@ -29,47 +18,40 @@ static char * build_channel_name(char *buffer, const char *sender, const char* r return buffer; } -/** Emitter function */ -int master(int argc, char *argv[]) +/** Master function */ +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); - double task_comp_size = 0; - double task_comm_size = 0; char channel[1024]; - double timeout = -1; int i; TRACE_category(master_name); - XBT_ATTRIB_UNUSED int res = sscanf(argv[1], "%lg", &timeout); - 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]); + double timeout = xbt_str_parse_double(argv[1], "Invalid timeout: %s"); /** - timeout */ + 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 */ { /* 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]); + MSG_process_create("worker", worker, master_name, workers[i]); } - XBT_INFO("Got %d workers and will send tasks for %g seconds!", - workers_count, timeout); + XBT_INFO("Got %d workers and will send tasks for %g seconds!", workers_count, timeout); for (i = 0; 1; i++) { char sprintf_buffer[64]; @@ -78,13 +60,11 @@ int master(int argc, char *argv[]) if(MSG_get_clock()>timeout) break; sprintf(sprintf_buffer, "Task_%d", i); - task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, - NULL); + task = MSG_task_create(sprintf_buffer, comp_size, comm_size, NULL); MSG_task_set_category(task, master_name); - 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_DEBUG("Sending \"%s\" to channel \"%s\"", task->name, channel); MSG_task_send(task, channel); XBT_DEBUG("Sent"); @@ -92,12 +72,10 @@ int master(int argc, char *argv[]) int task_num = i; - XBT_DEBUG - ("All tasks have been dispatched. Let's tell everybody the computation is over."); + XBT_DEBUG ("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("Sent %d tasks in total!", task_num); @@ -106,15 +84,14 @@ int master(int argc, char *argv[]) return 0; } /* end_of_master */ -/** Receiver function */ -int worker(int argc, char *argv[]) +/** Worker function */ +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_DEBUG("Receiving on channel \"%s\"", channel); @@ -138,42 +115,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/masterworker4.c b/doc/msg-tuto-src/masterworker4.c index 029ceb9135..c8f76193d8 100644 --- a/doc/msg-tuto-src/masterworker4.c +++ b/doc/msg-tuto-src/masterworker4.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 */ @@ -29,29 +18,24 @@ static char * build_channel_name(char *buffer, const char *sender, const char* r return buffer; } -/** Emitter function */ -int master(int argc, char *argv[]) +/** Worker function */ +static int master(int argc, char *argv[]) { int workers_count = 0; + XBT_ATTRIB_UNUSED int res; 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); - double task_comp_size = 0; - double task_comm_size = 0; char channel[1024]; - double timeout = -1; int i; TRACE_category(master_name); - XBT_ATTRIB_UNUSED int res = sscanf(argv[1], "%lg", &timeout); - 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]); + double timeout = xbt_str_parse_double(argv[1], "Invalid timeout: %s"); /** - timeout */ + 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 */ { /* Process organization */ workers_count = MSG_get_host_number(); @@ -59,17 +43,16 @@ int master(int argc, char *argv[]) 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]); + MSG_process_create("worker", worker, master_name, workers[i]); } - XBT_INFO("Got %d workers and will send tasks for %g seconds!", - workers_count, timeout); + XBT_INFO("Got %d workers and will send tasks for %g seconds!", workers_count, timeout); xbt_dynar_t idle_hosts = xbt_dynar_new(sizeof(msg_host_t), NULL); msg_host_t request_host = NULL; @@ -90,11 +73,11 @@ int master(int argc, char *argv[]) if(MSG_get_clock()>timeout) { if(xbt_dynar_length(idle_hosts) == workers_count) break; else { - MSG_process_sleep(.1); - continue; + MSG_process_sleep(.1); + continue; } } - + if(xbt_dynar_length(idle_hosts)<=0) { /* No request. Let's wait... */ MSG_process_sleep(.1); @@ -102,14 +85,13 @@ int master(int argc, char *argv[]) } sprintf(sprintf_buffer, "Task_%d", i); - task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, - NULL); + task = MSG_task_create(sprintf_buffer, comp_size, comm_size, NULL); MSG_task_set_category(task, master_name); xbt_dynar_shift(idle_hosts, &request_host); build_channel_name(channel,master_name, MSG_host_get_name(request_host)); - + XBT_DEBUG("Sending \"%s\" to channel \"%s\"", task->name, channel); MSG_task_send(task, channel); XBT_DEBUG("Sent"); @@ -118,12 +100,10 @@ int master(int argc, char *argv[]) int task_num = i; - XBT_DEBUG - ("All tasks have been dispatched. Let's tell everybody the computation is over."); + XBT_DEBUG ("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("Sent %d tasks in total!", task_num); @@ -132,8 +112,8 @@ int master(int argc, char *argv[]) return 0; } /* end_of_master */ -/** Receiver function */ -int worker(int argc, char *argv[]) +/** Worker function */ +static int worker(int argc, char *argv[]) { msg_task_t task = NULL; XBT_ATTRIB_UNUSED int res; @@ -168,42 +148,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 */