X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e9c0448c6566825b170b98ecff716b098bda10e..fcc6d3f51e021943c174f678becf0b9dd01d505e:/doc/msg-tuto-src/masterworker1.c diff --git a/doc/msg-tuto-src/masterworker1.c b/doc/msg-tuto-src/masterworker1.c index 8a7acff102..35deb99254 100644 --- a/doc/msg-tuto-src/masterworker1.c +++ b/doc/msg-tuto-src/masterworker1.c @@ -1,23 +1,11 @@ -/* Copyright (c) 2007-2010, 2013. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2007-2017. The SimGrid Team. All rights reserved. */ /* 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 */ +#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,75 +17,58 @@ static char * build_channel_name(char *buffer, const char *sender, const char* r return buffer; } -/** Emitter function */ -int master(int argc, char *argv[]) +/* forward definitions */ +static int master(int argc, char* argv[]); +static int worker(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; + const char* master_name = MSG_host_get_name(host_self); char channel[1024]; - int i; + 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 */ - _XBT_GNUC_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]); + /* Create the tasks in advance */ + msg_task_t* todo = xbt_new0(msg_task_t, number_of_tasks); - { /* Task creation */ + for (int i = 0; i < number_of_tasks; i++) { char sprintf_buffer[64]; + sprintf(sprintf_buffer, "Task_%d", i); + todo[i] = MSG_task_create(sprintf_buffer, comp_size, comm_size, NULL); + } - todo = xbt_new0(msg_task_t, number_of_tasks); + /* Get the info about the worker processes (directly from SimGrid) */ + int workers_count = argc - 4; + msg_host_t* workers = xbt_dynar_to_array(MSG_hosts_as_dynar()); - 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); + for (int i = 0; i < workers_count; i++) + if (host_self == workers[i]) { + workers[i] = workers[workers_count - 1]; + workers_count--; + break; } - } - - { /* Process organisation */ - 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; - } - - 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); + for (int i = 0; i < workers_count; i++) + MSG_process_create("worker", worker, (void*)master_name, workers[i]); + 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])); + /* Dispatch the tasks */ + for (int i = 0; i < number_of_tasks; i++) { + 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); + XBT_INFO("Sending '%s' to channel '%s'", todo[i]->name, channel); MSG_task_send(todo[i], channel); XBT_INFO("Sent"); } - XBT_INFO - ("All tasks have been dispatched. Let's tell everybody the computation is over."); - for (i = 0; i < workers_count; i++) { + XBT_INFO ("All tasks have been dispatched. Let's tell everybody the computation is over."); + for (int 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,73 +78,52 @@ 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_GNUC_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); + XBT_INFO("Receiving on channel '%s'", channel); while (1) { - res = MSG_task_receive(&(task),channel); + msg_task_t task = NULL; + int res = MSG_task_receive(&(task), channel); xbt_assert(res == MSG_OK, "MSG_task_receive failed"); - - XBT_INFO("Received \"%s\"", MSG_task_get_name(task)); + + XBT_INFO("Received '%s'", MSG_task_get_name(task)); if (!strcmp(MSG_task_get_name(task), "finalize")) { MSG_task_destroy(task); break; } - XBT_INFO("Processing \"%s\"", MSG_task_get_name(task)); + XBT_INFO("Processing '%s'", MSG_task_get_name(task)); MSG_task_execute(task); - XBT_INFO("\"%s\" done", MSG_task_get_name(task)); + XBT_INFO("'%s' done", MSG_task_get_name(task)); MSG_task_destroy(task); - task = NULL; } XBT_INFO("I'm done. See you!"); return 0; } /* end_of_worker */ -/** Test function */ -msg_error_t test_all(const char *platform_file, - const char *application_file) -{ - msg_error_t res = MSG_OK; - - { /* Simulation setting */ - MSG_create_environment(platform_file); - } - { /* Application deployment */ - MSG_function_register("master", master); - MSG_function_register("worker", worker); - MSG_launch_application(application_file); - } - 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]); + xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n" + "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]); - if (res == MSG_OK) - return 0; - else - return 1; -} /* end_of_main */ + /* Create a simulated platform */ + MSG_create_environment(argv[1]); + + /* Application deployment */ + MSG_function_register("master", master); + MSG_function_register("worker", worker); + MSG_launch_application(argv[2]); + + /* Run the simulation */ + msg_error_t res = MSG_main(); + + XBT_INFO("Simulation time %g", MSG_get_clock()); + return (res != MSG_OK); +}