X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9cdec68b2b54eb8f8d4761b5b0a43600532ae61e..b5b953be4c43bad172a39f8917200ed84b534ec5:/examples/msg/icomms/peer3.c diff --git a/examples/msg/icomms/peer3.c b/examples/msg/icomms/peer3.c index 93e933cf50..818f8918d6 100644 --- a/examples/msg/icomms/peer3.c +++ b/examples/msg/icomms/peer3.c @@ -1,44 +1,34 @@ -/* 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 -/* 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"); +#include "simgrid/msg.h" -int sender(int argc, char *argv[]); -int receiver(int argc, char *argv[]); +XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example"); -MSG_error_t test_all(const char *platform_file, - const char *application_file); +/** @addtogroup MSG_examples + * + * - msg/icomms/peer3.c: demonstrates the @ref MSG_comm_waitany function + */ -/** 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]); - int diff_com = atol(argv[5]); + 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"); + int diff_com = xbt_str_parse_int(argv[5], "Invalid value for diff_comm: %s"); double coef = 0; - xbt_dynar_t d = NULL; + xbt_dynar_t d = xbt_dynar_new(sizeof(msg_comm_t), NULL); int i; - m_task_t task = NULL; + msg_task_t task; char mailbox[256]; char sprintf_buffer[256]; - d = xbt_dynar_new(sizeof(msg_comm_t), NULL); - msg_comm_t *comm = xbt_new(msg_comm_t, number_of_tasks + receivers_count); - msg_comm_t res_irecv = NULL; - for (i = 0; i < (number_of_tasks); i++) { - task = NULL; + msg_comm_t comm; + + for (i = 0; i < number_of_tasks; i++) { if (diff_com == 0) coef = 1; else @@ -49,126 +39,99 @@ int sender(int argc, char *argv[]) task = MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size / coef, NULL); - comm[i] = MSG_task_isend(task, mailbox); - xbt_dynar_push_as(d, msg_comm_t, comm[i]); - INFO3("Send to receiver-%ld %s comm_size %f", i % receivers_count, - sprintf_buffer, task_comm_size / coef); + comm = MSG_task_isend(task, mailbox); + xbt_dynar_push_as(d, msg_comm_t, comm); + XBT_INFO("Send to receiver-%ld %s comm_size %f", i % receivers_count, sprintf_buffer, task_comm_size / coef); } /* Here we are waiting for the completion of all communications */ - while (d->used) { - xbt_dynar_remove_at(d, MSG_comm_waitany(d), &res_irecv); - MSG_comm_destroy(res_irecv); + while (!xbt_dynar_is_empty(d)) { + xbt_dynar_remove_at(d, MSG_comm_waitany(d), &comm); + MSG_comm_destroy(comm); } xbt_dynar_free(&d); - xbt_free(comm); /* Here we are waiting for the completion of all tasks */ sprintf(mailbox, "finalize"); + msg_comm_t res_irecv; + XBT_ATTRIB_UNUSED msg_error_t res_wait; for (i = 0; i < receivers_count; i++) { task = NULL; - res_irecv = NULL; res_irecv = MSG_task_irecv(&(task), mailbox); - xbt_assert0(MSG_comm_wait(res_irecv, -1) == MSG_OK, - "MSG_comm_wait failed"); + res_wait = MSG_comm_wait(res_irecv, -1); + xbt_assert(res_wait == MSG_OK, "MSG_comm_wait failed"); + MSG_comm_destroy(res_irecv); MSG_task_destroy(task); } - INFO0("Goodbye now!"); + XBT_INFO("Goodbye now!"); return 0; -} /* end_of_sender */ +} -/** Receiver function */ -int receiver(int argc, char *argv[]) +static int receiver(int argc, char *argv[]) { int id = -1; - int i; char mailbox[80]; - xbt_dynar_t comms = NULL; - int tasks = atof(argv[2]); - comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); + xbt_dynar_t comms = xbt_dynar_new(sizeof(msg_comm_t), NULL); + int tasks = xbt_str_parse_int(argv[2], "Invalid amount of tasks: %s"); + msg_task_t *task = xbt_new(msg_task_t, tasks); - xbt_assert1(sscanf(argv[1], "%d", &id), - "Invalid argument %s\n", argv[1]); + XBT_ATTRIB_UNUSED int read; + read = sscanf(argv[1], "%d", &id); + xbt_assert(read, "Invalid argument %s\n", argv[1]); sprintf(mailbox, "receiver-%d", id); MSG_process_sleep(10); - msg_comm_t res_irecv = NULL; - m_task_t task = NULL; - m_task_t task_com = NULL; - for (i = 0; i < tasks; i++) { - INFO1("Wait to receive task %d", i); - res_irecv = MSG_task_irecv(&task, mailbox); + msg_comm_t res_irecv; + for (int i = 0; i < tasks; i++) { + XBT_INFO("Wait to receive task %d", i); + task[i] = NULL; + res_irecv = MSG_task_irecv(&task[i], mailbox); xbt_dynar_push_as(comms, msg_comm_t, res_irecv); - task = NULL; - res_irecv = NULL; } /* Here we are waiting for the receiving of all communications */ - while (comms->used) { - task_com = NULL; - res_irecv = NULL; - MSG_error_t err = MSG_OK; - int num = MSG_comm_waitany(comms); - xbt_dynar_remove_at(comms, num, &res_irecv); + msg_task_t task_com; + while (!xbt_dynar_is_empty(comms)) { + XBT_ATTRIB_UNUSED msg_error_t err; + xbt_dynar_remove_at(comms, MSG_comm_waitany(comms), &res_irecv); task_com = MSG_comm_get_task(res_irecv); MSG_comm_destroy(res_irecv); - INFO1("Processing \"%s\"", MSG_task_get_name(task_com)); + XBT_INFO("Processing \"%s\"", MSG_task_get_name(task_com)); MSG_task_execute(task_com); - INFO1("\"%s\" done", MSG_task_get_name(task_com)); + XBT_INFO("\"%s\" done", MSG_task_get_name(task_com)); err = MSG_task_destroy(task_com); - xbt_assert0(err == MSG_OK, "MSG_task_destroy failed"); + xbt_assert(err == MSG_OK, "MSG_task_destroy failed"); } xbt_dynar_free(&comms); + xbt_free(task); /* Here we tell to sender that all tasks are done */ sprintf(mailbox, "finalize"); res_irecv = MSG_task_isend(MSG_task_create(NULL, 0, 0, NULL), mailbox); MSG_comm_wait(res_irecv, -1); - INFO0("I'm done. See you!"); + MSG_comm_destroy(res_irecv); + 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_error_t res = MSG_OK; - /* MSG_config("workstation/model","KCCFLN05"); */ - { /* Simulation setting */ - MSG_set_channel_number(0); - 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]); - INFO1("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_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]); - SIMIX_message_sizes_output("toto.txt"); - MSG_clean(); - - if (res == MSG_OK) - return 0; - else - return 1; -} /* end_of_main */ + XBT_INFO("Simulation time %g", MSG_get_clock()); + + return res != MSG_OK; +}