X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae811896a4746542e8de1616e8bc95a3ee6320f2..417742f1c7f6545db82079acd702fde03547d400:/examples/msg/icomms/peer2.c diff --git a/examples/msg/icomms/peer2.c b/examples/msg/icomms/peer2.c index 8de9a03fcf..73823ea377 100644 --- a/examples/msg/icomms/peer2.c +++ b/examples/msg/icomms/peer2.c @@ -1,39 +1,26 @@ -/* 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"); /** @addtogroup MSG_examples * * - msg/icomms/peer2.c: demonstrates the @ref MSG_comm_waitall function */ -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]); + 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 receivers_count = xbt_str_parse_int(argv[4], "Invalid amount of receivers: %s"); - xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); + msg_comm_t *comm = xbt_new(msg_comm_t, number_of_tasks + receivers_count); int i; msg_task_t task = NULL; for (i = 0; i < number_of_tasks; i++) { @@ -44,34 +31,35 @@ int sender(int argc, char *argv[]) task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size, NULL); - xbt_dynar_push_as(comms, msg_comm_t, MSG_task_isend(task, mailbox)); + comm[i] = MSG_task_isend(task, mailbox); XBT_INFO("Send to receiver-%ld Task_%d", i % receivers_count, i); } for (i = 0; i < receivers_count; i++) { char mailbox[80]; sprintf(mailbox, "receiver-%ld", i % receivers_count); task = MSG_task_create("finalize", 0, 0, 0); - xbt_dynar_push_as(comms, msg_comm_t, MSG_task_isend(task, mailbox)); + comm[i + number_of_tasks] = MSG_task_isend(task, mailbox); XBT_INFO("Send to receiver-%ld finalize", i % receivers_count); } /* Here we are waiting for the completion of all communications */ - MSG_comm_waitall(comms, -1); + MSG_comm_waitall(comm, (number_of_tasks + receivers_count), -1); + for (i = 0; i < number_of_tasks + receivers_count; i++) + MSG_comm_destroy(comm[i]); XBT_INFO("Goodbye now!"); - xbt_dynar_free(&comms); + xbt_free(comm); 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; - _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]); MSG_process_sleep(10); @@ -80,6 +68,7 @@ int receiver(int argc, char *argv[]) res_irecv = MSG_task_irecv(&(task), mailbox); XBT_INFO("Wait to receive a task"); res = MSG_comm_wait(res_irecv, -1); + MSG_comm_destroy(res_irecv); 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")) { @@ -95,45 +84,24 @@ 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(); - - XBT_INFO("Simulation time %g", MSG_get_clock()); - return res; -} /* end_of_test_all */ + 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_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; +}