X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2f810149832a2d855c33d0df5b02d736c2081e41..d2e206d0539afade3722f7aa9f7a65ad8a714253:/examples/msg/ns3/ns3.c diff --git a/examples/msg/ns3/ns3.c b/examples/msg/ns3/ns3.c index d0c7456e4b..42fa9d1594 100644 --- a/examples/msg/ns3/ns3.c +++ b/examples/msg/ns3/ns3.c @@ -1,4 +1,4 @@ -/* 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 @@ -6,32 +6,46 @@ #include #include -#include "msg/msg.h" +#include "simgrid/msg.h" #include "xbt/log.h" #include "xbt/asserts.h" XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example"); + +/** @addtogroup MSG_examples + * + * @section MSG_ex_models Models-related examples + * + * @subsection MSG_ex_PLS Packet level simulators + * + * These examples demonstrate how to use the bindings to classical + * Packet-Level Simulators (PLS), as explained in \ref pls. The most + * interesting is probably not the C files since they are unchanged + * from the other simulations, but the associated files, such as the + * platform files to see how to declare a platform to be used with + * the PLS bindings of SimGrid and the tesh files to see how to + * actually start a simulation in these settings. + * + * - ns3: Simple ping-pong using ns3 instead of the SimGrid network models. + * + */ + int master(int argc, char *argv[]); int slave(int argc, char *argv[]); int timer(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); int timer_start; //set as 1 in the master process -typedef enum { - PORT_22 = 0, - MAX_CHANNEL -} channel_t; - //keep a pointer to all surf running tasks. #define NTASKS 1500 int bool_printed = 0; double start_time, end_time, elapsed_time; double gl_data_size[NTASKS]; -m_task_t gl_task_array[NTASKS]; +msg_task_t gl_task_array[NTASKS]; const char *slavenames[NTASKS]; const char *masternames[NTASKS]; int gl_task_array_id = 0; @@ -42,42 +56,34 @@ int count_finished = 0; /** master */ int master(int argc, char *argv[]) { - char *slavename = NULL; - double task_comm_size = 0; - m_task_t todo; - char id_alias[10]; - //unique id to control statistics - int id = -1; + msg_task_t todo; xbt_assert(argc==4,"Strange number of arguments expected 3 got %d", argc - 1); XBT_DEBUG ("Master started"); /* data size */ - int read; - read = sscanf(argv[1], "%lg", &task_comm_size); - xbt_assert(read, "Invalid argument %s\n", argv[1]); + double task_comm_size = xbt_str_parse_double(argv[1], "Invalid task communication size: %s"); /* slave name */ - slavename = argv[2]; - id = atoi(argv[3]); - sprintf(id_alias, "flow_%d", id); + char *slavename = argv[2]; + int id = xbt_str_parse_int(argv[3], "Invalid ID as argument 3: %s"); //unique id to control statistics + char *id_alias = bprintf("flow_%d", id); slavenames[id] = slavename; TRACE_category(id_alias); masternames[id] = MSG_host_get_name(MSG_host_self()); { /* Task creation. */ - char sprintf_buffer[64] = "Task_0"; - todo = MSG_task_create(sprintf_buffer, 100*task_comm_size, task_comm_size, NULL); - TRACE_msg_set_task_category(todo, id_alias); + todo = MSG_task_create("Task_0", 100*task_comm_size, task_comm_size, NULL); + MSG_task_set_category(todo, id_alias); //keep track of running tasks gl_task_array[id] = todo; gl_data_size[id] = task_comm_size; } - { /* Process organisation */ - MSG_get_host_by_name(slavename); + { /* Process organization */ + MSG_host_by_name(slavename); } count_finished++; @@ -86,11 +92,11 @@ int master(int argc, char *argv[]) /* time measurement */ sprintf(id_alias, "%d", id); start_time = MSG_get_clock(); - //MSG_task_execute(todo); MSG_task_send(todo, id_alias); end_time = MSG_get_clock(); XBT_DEBUG ("Finished"); + xbt_free(id_alias); return 0; } /* end_of_master */ @@ -125,7 +131,7 @@ int timer(int argc, char *argv[]) int slave(int argc, char *argv[]) { - m_task_t task = NULL; + msg_task_t task = NULL; int a = MSG_OK; int id = 0; char id_alias[10]; @@ -134,7 +140,7 @@ int slave(int argc, char *argv[]) XBT_DEBUG ("Slave started"); - id = atoi(argv[1]); + id = xbt_str_parse_int(argv[1], "Invalid id: %s"); sprintf(id_alias, "%d", id); a = MSG_task_receive(&(task), id_alias); @@ -154,8 +160,8 @@ int slave(int argc, char *argv[]) elapsed_time = MSG_get_clock() - start_time; XBT_INFO("FLOW[%d] : Receive %.0f bytes from %s to %s", - id, - MSG_task_get_data_size(task), + id, + MSG_task_get_bytes_amount(task), masternames[id], slavenames[id]); // MSG_task_execute(task); @@ -166,15 +172,12 @@ int slave(int argc, char *argv[]) } /* end_of_slave */ /** 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; - /* MSG_config("workstation/model", "GTNETS"); */ - /* MSG_config("workstation/model","KCCFLN05"); */ { /* Simulation setting */ - MSG_set_channel_number(MAX_CHANNEL); MSG_create_environment(platform_file); } @@ -194,21 +197,16 @@ 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; bool_printed = 0; - MSG_global_init(&argc, argv); - if (argc < 3) { - printf("Usage: %s platform_file deployment_file\n", argv[0]); - exit(1); - } + MSG_init(&argc, argv); + xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n" + "\tExample: %s platform.xml deployment.xml\n", + argv[0], argv[0]); + res = test_all(argv[1], argv[2]); - MSG_clean(); - - if (res == MSG_OK) - return 0; - else - return 1; -} /* end_of_main */ + return res != MSG_OK; +}