X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d0ffc37686edcc803601f76ab51fdfed5fc2f241..b5b953be4c43bad172a39f8917200ed84b534ec5:/examples/msg/icomms/peer.c diff --git a/examples/msg/icomms/peer.c b/examples/msg/icomms/peer.c index ef9e78b02a..feb2564f0f 100644 --- a/examples/msg/icomms/peer.c +++ b/examples/msg/icomms/peer.c @@ -1,18 +1,12 @@ -/* Copyright (c) 2010-2013. 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" /* Yeah! If you want to use msg, you need to 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"); /** @addtogroup MSG_examples * @@ -25,24 +19,17 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, * * - msg/icomms/peer.c: basic example of async functions (@ref MSG_task_isend, @ref MSG_task_irecv, @ref MSG_comm_wait) */ -int sender(int argc, char *argv[]); -int receiver(int argc, char *argv[]); -msg_error_t test_all(const char *platform_file, - const char *application_file); - -/** Sender function */ -int sender(int argc, char *argv[]) +static int sender(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 receivers_count = atol(argv[4]); - double sleep_start_time = atof(argv[5]); - double sleep_test_time = atof(argv[6]); + 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 compute size: %s"); + double task_comm_size = xbt_str_parse_double(argv[3], "Invalid communication size: %s"); + long receivers_count = xbt_str_parse_int(argv[4], "Invalid amount of receivers: %s"); + double sleep_start_time = xbt_str_parse_double(argv[5], "Invalid sleep start time: %s"); + double sleep_test_time = xbt_str_parse_double(argv[6], "Invalid test time: %s"); - XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time, - sleep_test_time); + XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time, sleep_test_time); msg_comm_t comm = NULL; int i; @@ -55,9 +42,7 @@ int sender(int argc, char *argv[]) sprintf(mailbox, "receiver-%ld", i % receivers_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); comm = MSG_task_isend(task, mailbox); XBT_INFO("Send to receiver-%ld Task_%d", i % receivers_count, i); @@ -69,7 +54,6 @@ int sender(int argc, char *argv[]) }; } MSG_comm_destroy(comm); - } for (i = 0; i < receivers_count; i++) { @@ -86,30 +70,26 @@ int sender(int argc, char *argv[]) }; } MSG_comm_destroy(comm); - } XBT_INFO("Goodbye now!"); return 0; -} /* end_of_sender */ +} -/** Receiver function */ -int receiver(int argc, char *argv[]) +static int receiver(int argc, char *argv[]) { msg_task_t task = NULL; - _XBT_GNUC_UNUSED msg_error_t res; + XBT_ATTRIB_UNUSED msg_error_t res; int id = -1; char mailbox[80]; msg_comm_t res_irecv; - double sleep_start_time = atof(argv[2]); - double sleep_test_time = atof(argv[3]); - XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time, - sleep_test_time); + double sleep_start_time = xbt_str_parse_double(argv[2], "Invalid sleep start parameter: %s"); + double sleep_test_time = xbt_str_parse_double(argv[3], "Invalid sleep test parameter: %s"); + XBT_INFO("sleep_start_time : %f , sleep_test_time : %f", sleep_start_time, sleep_test_time); - _XBT_GNUC_UNUSED int read; + XBT_ATTRIB_UNUSED int read; read = sscanf(argv[1], "%d", &id); - xbt_assert(read, - "Invalid argument %s\n", argv[1]); + xbt_assert(read, "Invalid argument %s\n", argv[1]); MSG_process_sleep(sleep_start_time); @@ -142,45 +122,25 @@ int receiver(int argc, char *argv[]) } XBT_INFO("I'm done. See you!"); return 0; -} /* end_of_receiver */ +} -/** 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_config("workstation/model","KCCFLN05"); */ - { /* Simulation setting */ - MSG_create_environment(platform_file); - } - { /* Application deployment */ - MSG_function_register("sender", sender); - MSG_function_register("receiver", receiver); - MSG_launch_application(application_file); - } - res = MSG_main(); + 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]); - XBT_INFO("Simulation time %g", MSG_get_clock()); - return res; -} /* end_of_test_all */ + MSG_create_environment(argv[1]); + MSG_function_register("sender", sender); + MSG_function_register("receiver", receiver); + MSG_launch_application(argv[2]); -/** Main function */ -int main(int argc, char *argv[]) -{ - msg_error_t res = MSG_OK; + res = MSG_main(); - 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_INFO("Simulation time %g", MSG_get_clock()); - if (res == MSG_OK) - return 0; - else - return 1; -} /* end_of_main */ + return res != MSG_OK; +}