X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4937aa0ad4627d301682b278527aef71f2095e55..559d7b23dc0315a3d8ee12878458b176773ed689:/examples/msg/sendrecv/sendrecv.c diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c index 038697c600..ca12844df9 100644 --- a/examples/msg/sendrecv/sendrecv.c +++ b/examples/msg/sendrecv/sendrecv.c @@ -1,12 +1,12 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-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 -#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#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. */ @@ -14,7 +14,7 @@ #include "xbt/asserts.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). @@ -29,7 +29,7 @@ int receiver(int argc, char *argv[]); msg_error_t test_all(const char *platform_file, const char *application_file); -double task_comm_size_lat = 10e0; +double task_comm_size_lat = 1; double task_comm_size_bw = 10e8; /** Emitter function */ @@ -48,12 +48,9 @@ int sender(int argc, char *argv[]) XBT_INFO("host = %s", argv[1]); - host = MSG_get_host_by_name(argv[1]); + host = MSG_host_by_name(argv[1]); - if (host == NULL) { - XBT_INFO("Unknown host %s. Stopping Now! ", argv[1]); - abort(); - } + xbt_assert(host != NULL, "Unknown host %s. Stopping Now! ", argv[1]); /* Latency */ time = MSG_get_clock(); @@ -62,7 +59,7 @@ int sender(int argc, char *argv[]) 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 = %le", *((double *) task_la->data)); + XBT_INFO("task_la->data = %e", *((double *) task_la->data)); MSG_task_send(task_la, argv[1]); /* Bandwidth */ @@ -72,7 +69,7 @@ int sender(int argc, char *argv[]) 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 = %le", *((double *) task_bw->data)); + XBT_INFO("task_bw->data = %e", *((double *) task_bw->data)); MSG_task_send(task_bw, argv[1]); return 0; @@ -89,41 +86,35 @@ int receiver(int argc, char *argv[]) XBT_INFO("receiver"); - time = MSG_get_clock(); - /* 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 %le", communication_time); - XBT_INFO("--- la %f ----", communication_time); - } else { - xbt_die("Unexpected behavior"); - } + xbt_assert(a == MSG_OK, "Unexpected behavior"); + + 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); /* 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 %le", 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 */ @@ -133,11 +124,8 @@ int receiver(int argc, char *argv[]) msg_error_t test_all(const char *platform_file, const char *application_file) { - msg_error_t res = MSG_OK; - - XBT_INFO("test_all"); /* Simulation setting */ @@ -167,35 +155,16 @@ 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 - ("example: %s msg_platform.xml msg_deployment.xml KCCFLN05_Vegas\n", - argv[0]); - exit(1); - } - - /* Options for the workstation/model: - - KCCFLN05 => for maxmin - KCCFLN05_proportional => for proportional (Vegas) - KCCFLN05_Vegas => for TCP Vegas - KCCFLN05_Reno => for TCP Reno - */ - //MSG_config("workstation/model", argv[3]); + xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n" + "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]); res = test_all(argv[1], argv[2]); - XBT_INFO("Total simulation time: %le", MSG_get_clock()); + 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; + return res != MSG_OK; } /* end_of_main */