X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..9203fa06f28cebe61bebece905e1ec4b5d986436:/examples/msg/ns3/ns3.c diff --git a/examples/msg/ns3/ns3.c b/examples/msg/ns3/ns3.c index 42fa9d1594..9a8df98255 100644 --- a/examples/msg/ns3/ns3.c +++ b/examples/msg/ns3/ns3.c @@ -4,15 +4,9 @@ /* 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 "simgrid/msg.h" -#include "xbt/log.h" -#include "xbt/asserts.h" - -XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, - "Messages specific for this msg example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example"); /** @addtogroup MSG_examples * @@ -20,24 +14,14 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, * * @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. + * These examples demonstrate how to use the bindings to classicalPacket-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, - const char *application_file); - int timer_start; //set as 1 in the master process //keep a pointer to all surf running tasks. @@ -53,8 +37,7 @@ int count_finished = 0; #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ -/** master */ -int master(int argc, char *argv[]) +static int master(int argc, char *argv[]) { msg_task_t todo; @@ -82,9 +65,7 @@ int master(int argc, char *argv[]) gl_data_size[id] = task_comm_size; } - { /* Process organization */ - MSG_host_by_name(slavename); - } + MSG_host_by_name(slavename); count_finished++; timer_start = 1 ; @@ -98,11 +79,9 @@ int master(int argc, char *argv[]) XBT_DEBUG ("Finished"); xbt_free(id_alias); return 0; -} /* end_of_master */ - +} -/** Timer function */ -int timer(int argc, char *argv[]) +static int timer(int argc, char *argv[]) { double sleep_time; double first_sleep; @@ -120,81 +99,45 @@ int timer(int argc, char *argv[]) do { XBT_DEBUG ("Get sleep"); - MSG_process_sleep(sleep_time); + MSG_process_sleep(sleep_time); } while(timer_start); XBT_DEBUG ("Finished"); return 0; } -/** Receiver function */ -int slave(int argc, char *argv[]) +static int slave(int argc, char *argv[]) { - msg_task_t task = NULL; - int a = MSG_OK; - int id = 0; char id_alias[10]; xbt_assert(argc==2,"Strange number of arguments expected 1 got %d", argc - 1); XBT_DEBUG ("Slave started"); - id = xbt_str_parse_int(argv[1], "Invalid id: %s"); + int id = xbt_str_parse_int(argv[1], "Invalid id: %s"); sprintf(id_alias, "%d", id); - a = MSG_task_receive(&(task), id_alias); + msg_error_t a = MSG_task_receive(&(task), id_alias); count_finished--; if(count_finished == 0){ timer_start = 0; } - - - if (a != MSG_OK) { - XBT_INFO("Hey?! What's up?"); - xbt_die("Unexpected behavior."); - } + xbt_assert(a == MSG_OK,"Hey?! What's up? Unexpected behavior"); elapsed_time = MSG_get_clock() - start_time; - - XBT_INFO("FLOW[%d] : Receive %.0f bytes from %s to %s", - id, - MSG_task_get_bytes_amount(task), - masternames[id], - slavenames[id]); + + XBT_INFO("FLOW[%d] : Receive %.0f bytes from %s to %s", 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, - const char *application_file) -{ - msg_error_t res = MSG_OK; - - { /* Simulation setting */ - MSG_create_environment(platform_file); - } - - TRACE_declare_mark("endmark"); - - { /* Application deployment */ - MSG_function_register("master", master); - MSG_function_register("slave", slave); - MSG_function_register("timer", timer); - - MSG_launch_application(application_file); - } - res = MSG_main(); - return res; -} /* end_of_test_all */ +} -/** Main function */ int main(int argc, char *argv[]) { msg_error_t res = MSG_OK; @@ -202,11 +145,18 @@ int main(int argc, char *argv[]) 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]); - + "\tExample: %s platform.xml deployment.xml\n", argv[0], argv[0]); + + MSG_create_environment(argv[1]); + TRACE_declare_mark("endmark"); - res = test_all(argv[1], argv[2]); + MSG_function_register("master", master); + MSG_function_register("slave", slave); + MSG_function_register("timer", timer); + + MSG_launch_application(argv[2]); + + res = MSG_main(); return res != MSG_OK; }