X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c3cc1fe798afef50589651b016317b4d5abb74a..d14e0a5030c14d21878e74d7b40cba28c8a15534:/examples/msg/sendrecv/sendrecv_main.c diff --git a/examples/msg/sendrecv/sendrecv_main.c b/examples/msg/sendrecv/sendrecv_main.c index 684693488c..859f14536c 100644 --- a/examples/msg/sendrecv/sendrecv_main.c +++ b/examples/msg/sendrecv/sendrecv_main.c @@ -4,33 +4,20 @@ /* 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 "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ -#include "xbt/sysdep.h" /* calloc */ - -/* Create a log channel to have nice outputs. */ -#include "xbt/log.h" -#include "xbt/asserts.h" +#include "simgrid/msg.h" /** @addtogroup MSG_examples * - * - sendrecv/sendrecv.c: Ping-pong example. It's hard to - * think of a simpler example. The tesh files laying in the - * directory are instructive concerning the way to pass options to the simulators (as described in \ref options). + * - sendrecv/sendrecv.c: Ping-pong example. It's hard to think of a simpler example. The tesh files laying in + * the directory are instructive concerning the way to pass options to the simulators (as described in \ref options). */ -XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, - "Messages specific for this msg example"); - -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"); double task_comm_size_lat = 1; double task_comm_size_bw = 10e8; -/** Emitter function */ -int sender(int argc, char *argv[]) +static int sender(int argc, char *argv[]) { msg_host_t host = NULL; double time; @@ -40,9 +27,6 @@ int sender(int argc, char *argv[]) char sprintf_buffer_bw[64]; XBT_INFO("sender"); - - /*host = xbt_new0(msg_host_t,1); */ - XBT_INFO("host = %s", argv[1]); host = MSG_host_by_name(argv[1]); @@ -55,8 +39,7 @@ int sender(int argc, char *argv[]) /* Latency */ time = MSG_get_clock(); sprintf(sprintf_buffer_la, "latency task"); - task_la = - MSG_task_create(sprintf_buffer_la, 0.0, task_comm_size_lat, NULL); + task_la = MSG_task_create(sprintf_buffer_la, 0.0, task_comm_size_lat, NULL); task_la->data = xbt_new(double, 1); *(double *) task_la->data = time; XBT_INFO("task_la->data = %e", *((double *) task_la->data)); @@ -65,62 +48,51 @@ int sender(int argc, char *argv[]) /* Bandwidth */ time = MSG_get_clock(); sprintf(sprintf_buffer_bw, "bandwidth task"); - task_bw = - MSG_task_create(sprintf_buffer_bw, 0.0, task_comm_size_bw, NULL); + task_bw = MSG_task_create(sprintf_buffer_bw, 0.0, task_comm_size_bw, NULL); task_bw->data = xbt_new(double, 1); *(double *) task_bw->data = time; XBT_INFO("task_bw->data = %e", *((double *) task_bw->data)); MSG_task_send(task_bw, argv[1]); return 0; -} /* end_of_client */ +} -/** Receiver function */ -int receiver(int argc, char *argv[]) +static int receiver(int argc, char *argv[]) { - double time, time1, sender_time; msg_task_t task_la = NULL; msg_task_t task_bw = NULL; - int a; - double communication_time = 0; XBT_INFO("receiver"); /* Get Latency */ - a = MSG_task_receive(&task_la,MSG_host_get_name(MSG_host_self())); - if (a == MSG_OK) { - time1 = MSG_get_clock(); - sender_time = *((double *) (task_la->data)); - time = sender_time; - communication_time = time1 - time; - XBT_INFO("Task received : %s", task_la->name); - xbt_free(task_la->data); - MSG_task_destroy(task_la); - XBT_INFO("Communic. time %e", communication_time); - XBT_INFO("--- la %f ----", communication_time); - } else { - xbt_die("Unexpected behavior"); - } + int a = MSG_task_receive(&task_la,MSG_host_get_name(MSG_host_self())); + xbt_assert(a == MSG_OK, "Unexpected behavior"); + + double time1 = MSG_get_clock(); + double sender_time = *((double *) (task_la->data)); + double time = sender_time; + double communication_time = time1 - time; + XBT_INFO("Task received : %s", task_la->name); + xbt_free(task_la->data); + MSG_task_destroy(task_la); + XBT_INFO("Communic. time %e", communication_time); + XBT_INFO("--- la %f ----", communication_time); /* Get Bandwidth */ a = MSG_task_receive(&task_bw,MSG_host_get_name(MSG_host_self())); - if (a == MSG_OK) { - time1 = MSG_get_clock(); - sender_time = *((double *) (task_bw->data)); - time = sender_time; - communication_time = time1 - time; - XBT_INFO("Task received : %s", task_bw->name); - xbt_free(task_bw->data); - MSG_task_destroy(task_bw); - XBT_INFO("Communic. time %e", communication_time); - XBT_INFO("--- bw %f ----", task_comm_size_bw / communication_time); - } else { - xbt_die("Unexpected behavior"); - } - + xbt_assert(a == MSG_OK, "Unexpected behavior"); + time1 = MSG_get_clock(); + sender_time = *((double *) (task_bw->data)); + time = sender_time; + communication_time = time1 - time; + XBT_INFO("Task received : %s", task_bw->name); + xbt_free(task_bw->data); + MSG_task_destroy(task_bw); + XBT_INFO("Communic. time %e", communication_time); + XBT_INFO("--- bw %f ----", task_comm_size_bw / communication_time); return 0; -} /* end_of_receiver */ +} struct application { const char* platform_file; @@ -132,18 +104,13 @@ static msg_error_t test_all(struct application* app) { msg_error_t res = MSG_OK; - XBT_INFO("test_all"); - - /* Simulation setting */ MSG_create_environment(app->platform_file); /* Become one of the simulated process. * - * This must be done after the creation of the platform - * because we are depending attaching to a host.*/ + * This must be done after the creation of the platform because we are depending attaching to a host.*/ MSG_process_attach("sender", NULL, MSG_host_by_name("Tremblay"), NULL); - /* Application deployment */ MSG_function_register("receiver", receiver); MSG_launch_application(app->application_file); @@ -156,10 +123,8 @@ static msg_error_t test_all(struct application* app) return res; } /* end_of_test_all */ -static -void maestro(void* data) +static void maestro(void* data) { - // struct application* app = (struct application*) data; MSG_main(); } @@ -168,11 +133,6 @@ int main(int argc, char *argv[]) { msg_error_t res = MSG_OK; -#ifdef _MSC_VER - unsigned int prev_exponent_format = - _set_output_format(_TWO_DIGIT_EXPONENT); -#endif - struct application app; app.platform_file = argv[1]; app.application_file = argv[2]; @@ -181,21 +141,12 @@ int main(int argc, char *argv[]) MSG_init(&argc, argv); if (argc != 3) { - XBT_CRITICAL("Usage: %s platform_file deployment_file\n", - argv[0]); + XBT_CRITICAL("Usage: %s platform_file deployment_file\n", argv[0]); xbt_die("example: %s msg_platform.xml msg_deployment.xml\n",argv[0]); } res = test_all(&app); XBT_INFO("Total simulation time: %e", MSG_get_clock()); - -#ifdef _MSC_VER - _set_output_format(prev_exponent_format); -#endif - - if (res == MSG_OK) - return 0; - else - return 1; -} /* end_of_main */ + return res != MSG_OK; +}