X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f8b0942aa4f7c8d5e86d72eb06ab1fe5f6c09cd..7e2b05b2e2ec6a745966f800121782a684166f6f:/examples/msg/gtnets/gtnets.c diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c index 4247ef736a..43b2826c29 100644 --- a/examples/msg/gtnets/gtnets.c +++ b/examples/msg/gtnets/gtnets.c @@ -4,7 +4,8 @@ #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"); int master(int argc, char *argv[]); int slave(int argc, char *argv[]); @@ -16,14 +17,16 @@ typedef enum { } channel_t; //keep a pointer to all surf running tasks. -#define NTASKS 2 -int bool_printed=0; +#define NTASKS 1500 +int bool_printed = 0; double start_time, end_time, elapsed_time; -double gl_data_size[NTASKS]; +double gl_data_size[NTASKS]; m_task_t gl_task_array[NTASKS]; -int gl_task_array_id=0; +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 */ +#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ /** master */ int master(int argc, char *argv[]) @@ -32,95 +35,128 @@ int master(int argc, char *argv[]) double task_comm_size = 0; m_task_t todo; m_host_t slave; + char id_alias[10]; //unique id to control statistics - int id=gl_task_array_id++; + int id = -1; + + if (argc != 4) { + INFO1("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]); + xbt_assert1(sscanf(argv[1], "%lg", &task_comm_size), + "Invalid argument %s\n", argv[1]); /* slave name */ slavename = argv[2]; - - { /* Task creation. */ + id = atoi(argv[3]); + sprintf(id_alias, "%d", id); + slavenames[id] = slavename; + + masternames[id] = MSG_host_get_name(MSG_host_self()); + + { /* Task creation. */ char sprintf_buffer[64] = "Task_0"; todo = MSG_task_create(sprintf_buffer, 0, task_comm_size, NULL); //keep track of running tasks gl_task_array[id] = todo; - gl_data_size[id]=task_comm_size; + gl_data_size[id] = task_comm_size; } - { /* Process organisation */ + { /* Process organisation */ slave = MSG_get_host_by_name(slavename); } /* time measurement */ start_time = MSG_get_clock(); - MSG_task_put(todo, slave, PORT_22); + MSG_task_send(todo, id_alias); + end_time = MSG_get_clock(); INFO3("Send completed (to %s). Transfer time: %f\t Agregate bandwidth: %f", - slave->name, (end_time - start_time), task_comm_size/(end_time-start_time)); - INFO2("Completed peer: %s time: %f", slave->name, (end_time-start_time)); + slave->name, (end_time - start_time), + task_comm_size / (end_time - start_time)); + INFO2("Completed peer: %s time: %f", slave->name, (end_time - start_time)); return 0; -} /* end_of_master */ +} /* end_of_master */ /** Receiver function */ int slave(int argc, char *argv[]) { - char flow='A'; + m_task_t task = NULL; int a; - int id=0; - double remaining=0; - a = MSG_task_get(&(task), PORT_22); + int id = 0; + double remaining = 0; + char id_alias[10]; + + if (argc != 2) { + INFO1("Strange number of arguments expected 1 got %d", argc - 1); + } + + id = atoi(argv[1]); + sprintf(id_alias, "%d", id); + + a = MSG_task_receive(&(task), id_alias); + if (a != MSG_OK) { INFO0("Hey?! What's up?"); - xbt_assert0(0,"Unexpected behavior."); + xbt_assert0(0, "Unexpected behavior."); } - + elapsed_time = MSG_get_clock() - start_time; - if(!bool_printed){ - bool_printed=1; - for(id=0; id Task already done, skipping print statistics"); - }else if(gl_task_array[id] == task){ - INFO2("===> Estimated Bw of FLOW%c : %f", flow+id, gl_data_size[id]/elapsed_time); - }else{ - remaining = MSG_task_get_remaining_communication(gl_task_array[id]); - INFO3("===> Estimated Bw of FLOW%c : %f , with remaining %f", flow+id, (gl_data_size[id]-remaining)/elapsed_time, remaining); + 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) { + INFO5 + ("===> 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); + } else { + remaining = MSG_task_get_remaining_communication(gl_task_array[id]); + INFO5 + ("===> 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); } } + exit(0); } - MSG_task_destroy(task); + for (id = 0; id < NTASKS; id++) { + if (gl_task_array[id] == task) { + MSG_task_destroy(task); + gl_task_array[id] = NULL; + return 0; + } + } return 0; -} /* end_of_slave */ +} /* end_of_slave */ /** Test function */ -MSG_error_t test_all(const char *platform_file, - const char *application_file) +MSG_error_t test_all(const char *platform_file, const char *application_file) { MSG_error_t res = MSG_OK; /* MSG_config("workstation_model", "GTNETS"); */ /* MSG_config("workstation_model","KCCFLN05"); */ - { /* Simulation setting */ + { /* Simulation setting */ MSG_set_channel_number(MAX_CHANNEL); //MSG_paje_output("msg_test.trace"); MSG_create_environment(platform_file); } - { /* Application deployment */ + { /* Application deployment */ MSG_function_register("master", master); MSG_function_register("slave", slave); MSG_launch_application(application_file); } res = MSG_main(); return res; -} /* end_of_test_all */ +} /* end_of_test_all */ /** Main function */ int main(int argc, char *argv[]) @@ -128,15 +164,17 @@ int main(int argc, char *argv[]) MSG_error_t res = MSG_OK; bool_printed = 0; - MSG_global_init(&argc,argv); + MSG_global_init(&argc, argv); if (argc < 3) { - printf ("Usage: %s platform_file deployment_file\n",argv[0]); - exit(1); + printf("Usage: %s platform_file deployment_file\n", argv[0]); + exit(1); } - res = test_all(argv[1],argv[2]); + res = test_all(argv[1], argv[2]); MSG_clean(); - if(res==MSG_OK) return 0; - else return 1; -} /* end_of_main */ + if (res == MSG_OK) + return 0; + else + return 1; +} /* end_of_main */