X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3c1ebdb5d5e4370a0efd5f4c0dd4f7131fe8370..7acf5dc4f0e82e30634e875e783c0af3815770ba:/examples/msg/sendrecv/sendrecv.c diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c index 1e2dc066de..63b14f713a 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). @@ -26,29 +26,29 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, int sender(int argc, char *argv[]); int receiver(int argc, char *argv[]); -MSG_error_t test_all(const char *platform_file, +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 */ int sender(int argc, char *argv[]) { - m_host_t host = NULL; + msg_host_t host = NULL; double time; - m_task_t task_la = NULL; - m_task_t task_bw = NULL; + msg_task_t task_la = NULL; + msg_task_t task_bw = NULL; char sprintf_buffer_la[64]; char sprintf_buffer_bw[64]; XBT_INFO("sender"); - /*host = xbt_new0(m_host_t,1); */ + /*host = xbt_new0(msg_host_t,1); */ 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]); @@ -62,7 +62,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 +72,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; @@ -82,15 +82,13 @@ int sender(int argc, char *argv[]) int receiver(int argc, char *argv[]) { double time, time1, sender_time; - m_task_t task_la = NULL; - m_task_t task_bw = NULL; + msg_task_t task_la = NULL; + msg_task_t task_bw = NULL; int a; double communication_time = 0; 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) { @@ -101,13 +99,12 @@ int receiver(int argc, char *argv[]) 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("Communic. time %e", communication_time); XBT_INFO("--- la %f ----", communication_time); } else { xbt_die("Unexpected behavior"); } - /* Get Bandwidth */ a = MSG_task_receive(&task_bw,MSG_host_get_name(MSG_host_self())); if (a == MSG_OK) { @@ -118,7 +115,7 @@ int receiver(int argc, char *argv[]) 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("Communic. time %e", communication_time); XBT_INFO("--- bw %f ----", task_comm_size_bw / communication_time); } else { xbt_die("Unexpected behavior"); @@ -130,13 +127,10 @@ int receiver(int argc, char *argv[]) /** Test function */ -MSG_error_t test_all(const char *platform_file, +msg_error_t test_all(const char *platform_file, const char *application_file) { - - MSG_error_t res = MSG_OK; - - + msg_error_t res = MSG_OK; XBT_INFO("test_all"); @@ -158,7 +152,7 @@ MSG_error_t test_all(const char *platform_file, /** Main function */ int main(int argc, char *argv[]) { - MSG_error_t res = MSG_OK; + msg_error_t res = MSG_OK; #ifdef _MSC_VER unsigned int prev_exponent_format = @@ -167,30 +161,15 @@ int main(int argc, char *argv[]) MSG_init(&argc, argv); - if (argc != 3) { - XBT_CRITICAL("Usage: %s platform_file deployment_file \n", + 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); + xbt_die("example: %s msg_platform.xml msg_deployment.xml\n",argv[0]); } - /* 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]); - res = test_all(argv[1], argv[2]); - XBT_INFO("Total simulation time: %le", MSG_get_clock()); - - MSG_clean(); + XBT_INFO("Total simulation time: %e", MSG_get_clock()); #ifdef _MSC_VER _set_output_format(prev_exponent_format);