X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/39b6ed28636c4d67a0127d8526bf10dbc212cdc9..4365fa8e81736673eae923310a05cdbf78ec88d8:/examples/msg/ns3/ns3.c diff --git a/examples/msg/ns3/ns3.c b/examples/msg/ns3/ns3.c index a40a8d5ff6..c06d04bb73 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-2014. 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 = 1; - -typedef enum { - PORT_22 = 0, - MAX_CHANNEL -} channel_t; +int timer_start; //set as 1 in the master process //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; @@ -44,14 +58,14 @@ int master(int argc, char *argv[]) { char *slavename = NULL; double task_comm_size = 0; - m_task_t todo; + msg_task_t todo; char id_alias[10]; //unique id to control statistics int id = -1; - if (argc != 4) { - XBT_INFO("Strange number of arguments expected 3 got %d", argc - 1); - } + xbt_assert(argc==4,"Strange number of arguments expected 3 got %d", argc - 1); + + XBT_DEBUG ("Master started"); /* data size */ int read; @@ -70,7 +84,7 @@ int master(int argc, char *argv[]) { /* 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); + MSG_task_set_category(todo, id_alias); //keep track of running tasks gl_task_array[id] = todo; gl_data_size[id] = task_comm_size; @@ -81,6 +95,7 @@ int master(int argc, char *argv[]) } count_finished++; + timer_start = 1 ; /* time measurement */ sprintf(id_alias, "%d", id); @@ -89,7 +104,7 @@ int master(int argc, char *argv[]) MSG_task_send(todo, id_alias); end_time = MSG_get_clock(); - + XBT_DEBUG ("Finished"); return 0; } /* end_of_master */ @@ -97,24 +112,26 @@ int master(int argc, char *argv[]) /** Timer function */ int timer(int argc, char *argv[]) { - int sleep_time; - int first_sleep; + double sleep_time; + double first_sleep; - if (argc != 3) { - XBT_INFO("Strange number of arguments expected 2 got %d", argc - 1); - } + xbt_assert(argc==3,"Strange number of arguments expected 2 got %d", argc - 1); - sscanf(argv[1], "%d", &first_sleep); - sscanf(argv[2], "%d", &sleep_time); + sscanf(argv[1], "%lf", &first_sleep); + sscanf(argv[2], "%lf", &sleep_time); + + XBT_DEBUG ("Timer started"); if(first_sleep){ MSG_process_sleep(first_sleep); } - while(timer_start){ + do { + XBT_DEBUG ("Get sleep"); MSG_process_sleep(sleep_time); - } + } while(timer_start); + XBT_DEBUG ("Finished"); return 0; } @@ -122,14 +139,14 @@ 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]; - if (argc != 2) { - XBT_INFO("Strange number of arguments expected 1 got %d", argc - 1); - } + xbt_assert(argc==2,"Strange number of arguments expected 1 got %d", argc - 1); + + XBT_DEBUG ("Slave started"); id = atoi(argv[1]); sprintf(id_alias, "%d", id); @@ -151,26 +168,24 @@ 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); MSG_task_destroy(task); + XBT_DEBUG ("Finished"); return 0; } /* 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); } @@ -190,10 +205,10 @@ 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); + MSG_init(&argc, argv); if (argc < 3) { printf("Usage: %s platform_file deployment_file\n", argv[0]); exit(1); @@ -201,8 +216,6 @@ int main(int argc, char *argv[]) res = test_all(argv[1], argv[2]); - MSG_clean(); - if (res == MSG_OK) return 0; else