X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b99ed971db29303089eb77b9235ba46d239a6133..693f30b46244c152cd79cdf3ad35d4a79b866c9c:/examples/msg/gtnets/gtnets.c diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c index 6fbb1e3ab3..8d889c6f9e 100644 --- a/examples/msg/gtnets/gtnets.c +++ b/examples/msg/gtnets/gtnets.c @@ -13,15 +13,18 @@ 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[]); +int timer(int argc, char *argv[]); 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 @@ -32,6 +35,7 @@ m_task_t gl_task_array[NTASKS]; const char *slavenames[NTASKS]; const char *masternames[NTASKS]; int gl_task_array_id = 0; +int count_finished = 0; #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ @@ -41,18 +45,18 @@ int master(int argc, char *argv[]) char *slavename = NULL; double task_comm_size = 0; m_task_t todo; - m_host_t slave; char id_alias[10]; //unique id to control statistics int id = -1; if (argc != 4) { - INFO1("Strange number of arguments expected 3 got %d", argc - 1); + XBT_INFO("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 +70,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); @@ -86,6 +88,31 @@ int master(int argc, char *argv[]) return 0; } /* end_of_master */ + +/** Timer function */ +int timer(int argc, char *argv[]) +{ + int sleep_time; + int first_sleep; + + if (argc != 3) { + XBT_INFO("Strange number of arguments expected 2 got %d", argc - 1); + } + + sscanf(argv[1], "%d", &first_sleep); + sscanf(argv[2], "%d", &sleep_time); + + if(first_sleep){ + MSG_process_sleep(first_sleep); + } + + while(timer_start){ + MSG_process_sleep(sleep_time); + } + + return 0; +} + /** Receiver function */ int slave(int argc, char *argv[]) { @@ -100,7 +127,7 @@ int slave(int argc, char *argv[]) char id_alias[10]; if (argc != 2) { - INFO1("Strange number of arguments expected 1 got %d", argc - 1); + XBT_INFO("Strange number of arguments expected 1 got %d", argc - 1); } id = atoi(argv[1]); @@ -109,9 +136,16 @@ int slave(int argc, char *argv[]) a = MSG_task_receive(&(task), id_alias); + count_finished--; + if(count_finished == 0){ + timer_start = 0; + } + + + if (a != MSG_OK) { - INFO0("Hey?! What's up?"); - xbt_assert0(0, "Unexpected behavior."); + XBT_INFO("Hey?! What's up?"); + xbt_die("Unexpected behavior."); } elapsed_time = MSG_get_clock() - start_time; @@ -121,18 +155,20 @@ int slave(int argc, char *argv[]) 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) { - INFO1("WARNING FLOW[%d] is limited by latency!!", id); + XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id); } #endif - INFO5 + XBT_INFO ("===> 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]); @@ -140,22 +176,27 @@ int slave(int argc, char *argv[]) limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]); if (limited_latency) { - INFO1("WARNING FLOW[%d] is limited by latency!!", id); + XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id); } #endif - INFO5 + XBT_INFO ("===> 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 */ @@ -168,12 +209,16 @@ MSG_error_t test_all(const char *platform_file, /* 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_function_register("timer", timer); + MSG_launch_application(application_file); } res = MSG_main(); @@ -186,14 +231,12 @@ int main(int argc, char *argv[]) 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); } - TRACE_declare_mark("endmark"); - res = test_all(argv[1], argv[2]); MSG_clean();