X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c69087d11c54eee924f6870373883d6aa9ff228..99c62dd07da68e9aad9b5c6cbc91a70fec4d2547:/examples/msg/ns3/ns3.c diff --git a/examples/msg/ns3/ns3.c b/examples/msg/ns3/ns3.c index 2b10ef2c63..9d9a3f9696 100644 --- a/examples/msg/ns3/ns3.c +++ b/examples/msg/ns3/ns3.c @@ -1,17 +1,12 @@ -/* Copyright (c) 2007-2014. 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" -#include "xbt/log.h" -#include "xbt/asserts.h" +#include "simgrid/msg.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 +15,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,46 +38,35 @@ 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[]) { - char *slavename = NULL; - double task_comm_size = 0; msg_task_t todo; - char id_alias[10]; - //unique id to control statistics - int id = -1; 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); + 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); - } + MSG_host_by_name(slavename); count_finished++; timer_start = 1 ; @@ -100,17 +74,15 @@ 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 */ - +} -/** Timer function */ -int timer(int argc, char *argv[]) +static int timer(int argc, char *argv[]) { double sleep_time; double first_sleep; @@ -128,98 +100,67 @@ 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 = atoi(argv[1]); + 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."); } 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) +int main(int argc, char *argv[]) { msg_error_t res = MSG_OK; + bool_printed = 0; - /* MSG_config("workstation/model", "GTNETS"); */ - /* MSG_config("workstation/model","KCCFLN05"); */ - { /* Simulation setting */ - MSG_create_environment(platform_file); - } + 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]); + MSG_create_environment(argv[1]); TRACE_declare_mark("endmark"); - { /* Application deployment */ - MSG_function_register("master", master); - MSG_function_register("slave", slave); - MSG_function_register("timer", timer); + 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 */ + MSG_launch_application(argv[2]); -/** Main function */ -int main(int argc, char *argv[]) -{ - msg_error_t res = MSG_OK; - bool_printed = 0; - - MSG_init(&argc, argv); - if (argc < 3) { - printf("Usage: %s platform_file deployment_file\n", argv[0]); - exit(1); - } - - res = test_all(argv[1], argv[2]); + res = MSG_main(); - if (res == MSG_OK) - return 0; - else - return 1; -} /* end_of_main */ + return res != MSG_OK; +}