X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/48a6c50a85f2d0d71990bd4a57d23fb6d763f64a..3356a5d7d4ab2de2e1454a42718319754bb3c68f:/examples/msg/sendrecv/sendrecv.c diff --git a/examples/msg/sendrecv/sendrecv.c b/examples/msg/sendrecv/sendrecv.c index 56bd3751ba..038697c600 100644 --- a/examples/msg/sendrecv/sendrecv.c +++ b/examples/msg/sendrecv/sendrecv.c @@ -13,13 +13,20 @@ #include "xbt/log.h" #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). + */ + 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[]); -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; @@ -28,16 +35,16 @@ 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]); @@ -75,8 +82,8 @@ 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; @@ -123,11 +130,11 @@ 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; @@ -151,14 +158,14 @@ 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 = _set_output_format(_TWO_DIGIT_EXPONENT); #endif - MSG_global_init(&argc, argv); + MSG_init(&argc, argv); if (argc != 3) { @@ -183,8 +190,6 @@ int main(int argc, char *argv[]) XBT_INFO("Total simulation time: %le", MSG_get_clock()); - MSG_clean(); - #ifdef _MSC_VER _set_output_format(prev_exponent_format); #endif