X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..b5b953be4c43bad172a39f8917200ed84b534ec5:/examples/msg/masterslave/masterslave_mailbox.c?ds=sidebyside diff --git a/examples/msg/masterslave/masterslave_mailbox.c b/examples/msg/masterslave/masterslave_mailbox.c index e4e6759eb5..8aed047e36 100644 --- a/examples/msg/masterslave/masterslave_mailbox.c +++ b/examples/msg/masterslave/masterslave_mailbox.c @@ -1,85 +1,66 @@ -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010-2015. 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"); +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[]); -MSG_error_t test_all(const char *platform_file, - const char *application_file); - -/** Emitter function */ -int master(int argc, char *argv[]) +static int master(int argc, char *argv[]) { - long number_of_tasks = atol(argv[1]); - double task_comp_size = atof(argv[2]); - double task_comm_size = atof(argv[3]); - long slaves_count = atol(argv[4]); + long number_of_tasks = xbt_str_parse_int(argv[1], "Invalid amount of tasks: %s"); + double task_comp_size = xbt_str_parse_double(argv[2], "Invalid computational size: %s"); + double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); + long slaves_count = xbt_str_parse_int(argv[4], "Invalid amount of slaves: %s"); int i; - XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, - number_of_tasks); + XBT_INFO("Got %ld slaves and %ld tasks to process", slaves_count, number_of_tasks); for (i = 0; i < number_of_tasks; i++) { char mailbox[256]; char sprintf_buffer[256]; - m_task_t task = NULL; + msg_task_t task = NULL; sprintf(mailbox, "slave-%ld", i % slaves_count); 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, task_comp_size, task_comm_size, NULL); if (number_of_tasks < 10000 || i % 10000 == 0) - XBT_INFO("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name, - number_of_tasks, mailbox); + XBT_INFO("Sending \"%s\" (of %ld) to mailbox \"%s\"", task->name, number_of_tasks, mailbox); MSG_task_send(task, mailbox); } - 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 < slaves_count; i++) { char mailbox[80]; sprintf(mailbox, "slave-%ld", i % slaves_count); - m_task_t finalize = MSG_task_create("finalize", 0, 0, 0); + msg_task_t finalize = MSG_task_create("finalize", 0, 0, 0); MSG_task_send(finalize, mailbox); } -// XBT_INFO("Goodbye now!"); return 0; -} /* end_of_master */ +} -/** Receiver function */ -int slave(int argc, char *argv[]) +static int slave(int argc, char *argv[]) { - m_task_t task = NULL; - int res; + msg_task_t task = NULL; + XBT_ATTRIB_UNUSED int res; int id = -1; char mailbox[80]; + XBT_ATTRIB_UNUSED int read; - xbt_assert1(sscanf(argv[1], "%d", &id), - "Invalid argument %s\n", argv[1]); + read = sscanf(argv[1], "%d", &id); + xbt_assert(read, "Invalid argument %s\n", argv[1]); sprintf(mailbox, "slave-%d", id); while (1) { res = MSG_task_receive(&(task), mailbox); - xbt_assert0(res == MSG_OK, "MSG_task_get failed"); + xbt_assert(res == MSG_OK, "MSG_task_get failed"); // XBT_INFO("Received \"%s\"", MSG_task_get_name(task)); if (!strcmp(MSG_task_get_name(task), "finalize")) { @@ -94,47 +75,23 @@ int slave(int argc, char *argv[]) } XBT_INFO("I'm done. See you!"); return 0; -} /* end_of_slave */ +} -/** Test function */ -MSG_error_t test_all(const char *platform_file, - const char *application_file) +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]); - /* MSG_config("workstation/model","KCCFLN05"); */ - { /* Simulation setting */ - MSG_set_channel_number(0); - MSG_create_environment(platform_file); - } - { /* Application deployment */ - MSG_function_register("master", master); - MSG_function_register("slave", slave); - MSG_launch_application(application_file); - } - res = MSG_main(); + MSG_create_environment(argv[1]); - XBT_INFO("Simulation time %g", MSG_get_clock()); - return res; -} /* end_of_test_all */ + MSG_function_register("master", master); + MSG_function_register("slave", slave); + MSG_launch_application(argv[2]); + msg_error_t res = MSG_main(); -/** Main function */ -int main(int argc, char *argv[]) -{ - MSG_error_t res = MSG_OK; + XBT_INFO("Simulation time %g", MSG_get_clock()); - 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); - } - res = test_all(argv[1], argv[2]); - MSG_clean(); - - if (res == MSG_OK) - return 0; - else - return 1; -} /* end_of_main */ + return res != MSG_OK; +}