X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ecbb4c88462e9ec9be0c830a257da6e9b774a25..a2f610814708b3f2d6fcde566a37a845c94b1d97:/examples/msg/gtnets/gtnets.c diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c index f63ab5828e..839d4a79bc 100644 --- a/examples/msg/gtnets/gtnets.c +++ b/examples/msg/gtnets/gtnets.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,53 +6,53 @@ #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 + * + * - gtnets Simple ping-pong using GTNeTs instead of the SimGrid network models. + */ + int master(int argc, char *argv[]); int slave(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); -typedef enum { - PORT_22 = 0, - MAX_CHANNEL -} channel_t; +int timer_start = 1; //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; - -#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ +int count_finished = 0; /** master */ int master(int argc, char *argv[]) { char *slavename = NULL; double task_comm_size = 0; - m_task_t todo; - m_host_t slave; + 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); /* data size */ - xbt_assert1(sscanf(argv[1], "%lg", &task_comm_size), - "Invalid argument %s\n", argv[1]); + int read; + read = sscanf(argv[1], "%lg", &task_comm_size); + xbt_assert(read, "Invalid argument %s\n", argv[1]); /* slave name */ slavename = argv[2]; @@ -66,15 +66,13 @@ int master(int argc, char *argv[]) { /* Task creation. */ char sprintf_buffer[64] = "Task_0"; todo = MSG_task_create(sprintf_buffer, 0, 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; } - { /* Process organisation */ - slave = MSG_get_host_by_name(slavename); - } + count_finished++; /* time measurement */ sprintf(id_alias, "%d", id); @@ -90,7 +88,7 @@ int master(int argc, char *argv[]) int slave(int argc, char *argv[]) { - m_task_t task = NULL; + msg_task_t task = NULL; int a; int id = 0; #ifdef HAVE_LATENCY_BOUND_TRACKING @@ -99,9 +97,8 @@ int slave(int argc, char *argv[]) double remaining = 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); id = atoi(argv[1]); sprintf(id_alias, "%d", id); @@ -109,20 +106,21 @@ int slave(int argc, char *argv[]) a = MSG_task_receive(&(task), id_alias); - if (a != MSG_OK) { - XBT_INFO("Hey?! What's up?"); - xbt_die("Unexpected behavior."); + count_finished--; + if(count_finished == 0){ + timer_start = 0; } + xbt_assert(a == MSG_OK,"Hey?! What's up? Unexpected behavior"); + elapsed_time = MSG_get_clock() - start_time; - - + if (!bool_printed) { bool_printed = 1; - + for (id = 0; id < NTASKS; id++) { - if (gl_task_array[id] == NULL) { - } else if (gl_task_array[id] == task) { + if (gl_task_array[id] == NULL) continue; + if (gl_task_array[id] == task) { #ifdef HAVE_LATENCY_BOUND_TRACKING limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]); if (limited_latency) { @@ -133,6 +131,8 @@ int slave(int argc, char *argv[]) ("===> Estimated Bw of FLOW[%d] : %f ; message from %s to %s with remaining : %f", id, gl_data_size[id] / elapsed_time, masternames[id], slavenames[id], 0.0); + MSG_task_destroy(gl_task_array[id]); + gl_task_array[id]=NULL; } else { remaining = MSG_task_get_remaining_communication(gl_task_array[id]); @@ -147,33 +147,39 @@ int slave(int argc, char *argv[]) ("===> Estimated Bw of FLOW[%d] : %f ; message from %s to %s with remaining : %f", id, (gl_data_size[id] - remaining) / elapsed_time, masternames[id], slavenames[id], remaining); + if(remaining==0) { + MSG_task_destroy(gl_task_array[id]); + gl_task_array[id]=NULL; + } } - } + bool_printed = 2; } char mark[100]; snprintf(mark, 100, "flow_%d_finished", trace_id); TRACE_mark("endmark", mark); - MSG_task_destroy(task); + if(bool_printed==2 && gl_task_array[trace_id]) MSG_task_destroy(gl_task_array[trace_id]); + 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); } + + TRACE_declare_mark("endmark"); + { /* Application deployment */ MSG_function_register("master", master); MSG_function_register("slave", slave); + MSG_launch_application(application_file); } res = MSG_main(); @@ -183,23 +189,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); - } - - TRACE_declare_mark("endmark"); - + 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; +} +