X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c714798d5c146946f9ccce06da87bc1707b2de2d..4365fa8e81736673eae923310a05cdbf78ec88d8:/examples/msg/masterslave/masterslave_cluster.c diff --git a/examples/msg/masterslave/masterslave_cluster.c b/examples/msg/masterslave/masterslave_cluster.c index 6f871fdec6..dbb760c2ff 100644 --- a/examples/msg/masterslave/masterslave_cluster.c +++ b/examples/msg/masterslave/masterslave_cluster.c @@ -1,11 +1,11 @@ -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010-2014. 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 "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */ +#include "simgrid/msg.h" /* Yeah! If you want to use msg, you need to include simgrid/msg.h */ #include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */ /* Create a log channel to have nice outputs. */ @@ -16,7 +16,7 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ -MSG_error_t test_all(const char *platform_file); +msg_error_t test_all(const char *platform_file); int master(int argc, char *argv[]); @@ -26,8 +26,8 @@ int slave(int argc, char *argv[]); int master(int argc, char *argv[]) { int slaves_count = 0; - m_host_t *slaves = NULL; - m_task_t *todo = NULL; + msg_host_t *slaves = NULL; + msg_task_t *todo = NULL; int number_of_tasks = 0; double task_comp_size = 0; double task_comm_size = 0; @@ -44,7 +44,7 @@ int master(int argc, char *argv[]) { /* Task creation */ char sprintf_buffer[64]; - todo = xbt_new0(m_task_t, number_of_tasks); + todo = xbt_new0(msg_task_t, number_of_tasks); for (i = 0; i < number_of_tasks; i++) { sprintf(sprintf_buffer, "Task_%d", i); @@ -56,7 +56,7 @@ int master(int argc, char *argv[]) { /* Process organisation */ slaves_count = argc - 4; - slaves = xbt_new0(m_host_t, slaves_count); + slaves = xbt_new0(msg_host_t, slaves_count); for (i = 4; i < argc; i++) { slaves[i - 4] = MSG_get_host_by_name(argv[i]); @@ -69,7 +69,7 @@ int master(int argc, char *argv[]) XBT_INFO("Got %d slave(s) :", slaves_count); for (i = 0; i < slaves_count; i++) - XBT_INFO("\t %s", slaves[i]->name); + XBT_INFO("\t %s", MSG_host_get_name(slaves[i])); XBT_INFO("Got %d task to process :", number_of_tasks); @@ -78,7 +78,7 @@ int master(int argc, char *argv[]) for (i = 0; i < number_of_tasks; i++) { XBT_INFO("Sending \"%s\" to \"%s\"", - todo[i]->name, slaves[i % slaves_count]->name); + todo[i]->name, MSG_host_get_name(slaves[i % slaves_count])); if (MSG_host_self() == slaves[i % slaves_count]) { XBT_INFO("Hey ! It's me ! :)"); } @@ -90,7 +90,7 @@ int master(int argc, char *argv[]) ("All tasks have been dispatched. Let's tell everybody the computation is over."); for (i = 0; i < slaves_count; i++) MSG_task_send(MSG_task_create("finalize", 0, 0, FINALIZE), - MSG_host_get_name(slaves[i])); + MSG_host_get_name(slaves[i])); XBT_INFO("Goodbye now!"); free(slaves); @@ -103,7 +103,7 @@ int slave(int argc, char *argv[]) { XBT_INFO("I'm a slave"); while (1) { - m_task_t task = NULL; + msg_task_t task = NULL; int a; a = MSG_task_receive(&(task), MSG_host_get_name(MSG_host_self())); if (a == MSG_OK) { @@ -119,7 +119,7 @@ int slave(int argc, char *argv[]) } else { XBT_INFO("Hey ?! What's up ? "); xbt_die("Unexpected behavior"); - } + } } XBT_INFO("I'm done. See you!"); return 0; @@ -129,101 +129,100 @@ int slave(int argc, char *argv[]) /** Bypass deployment **/ static int bypass_deployment(void) { - int nb_host,i; - static int AX_ptr; - static int surfxml_bufferstack_size = 2048; - static int surfxml_buffer_stack_stack_ptr = 0; - static int surfxml_buffer_stack_stack[1024]; - xbt_dynar_t hosts = MSG_hosts_as_dynar(); - /* allocating memory to the buffer, I think 2MB should be enough */ - surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); - - nb_host = xbt_dynar_length(hosts); - xbt_dynar_free(&hosts); - - /* */ - SURFXML_BUFFER_SET(platform_version, "3"); - SURFXML_START_TAG(platform); - XBT_DEBUG(""); - - XBT_DEBUG(" "); - SURFXML_BUFFER_SET(process_host, "c-0.me"); - SURFXML_BUFFER_SET(process_function, "master"); - SURFXML_BUFFER_SET(process_start_time, "-1.0"); - SURFXML_BUFFER_SET(process_kill_time, "-1.0"); - SURFXML_START_TAG(process); - - XBT_DEBUG(" ",bprintf("%d",nb_host-1)); - SURFXML_BUFFER_SET(argument_value, bprintf("%d",nb_host-1)); - SURFXML_START_TAG(argument); - SURFXML_END_TAG(argument); - - XBT_DEBUG(" "); - SURFXML_BUFFER_SET(argument_value, "5000000"); - SURFXML_START_TAG(argument); - SURFXML_END_TAG(argument); - - XBT_DEBUG(" "); - SURFXML_BUFFER_SET(argument_value, "100000"); - SURFXML_START_TAG(argument); - SURFXML_END_TAG(argument); - - for(i=1 ; i",bprintf("c-%d",i)); - SURFXML_BUFFER_SET(argument_value, bprintf("c-%d.me",i)); - SURFXML_START_TAG(argument); - SURFXML_END_TAG(argument); - } - XBT_DEBUG(" "); - SURFXML_END_TAG(process); - - for(i=1 ; i",bprintf("c-%d",i)); - SURFXML_BUFFER_SET(process_host, bprintf("c-%d.me",i)); - SURFXML_BUFFER_SET(process_function, "slave"); - SURFXML_BUFFER_SET(process_start_time, "-1.0"); - SURFXML_BUFFER_SET(process_kill_time, "-1.0"); - SURFXML_START_TAG(process); - SURFXML_END_TAG(process); - } - - XBT_DEBUG(""); - SURFXML_END_TAG(platform); - - free(surfxml_bufferstack); - return 0; + int nb_host,i; + static int AX_ptr; + static int surfxml_bufferstack_size = 2048; + static int surfxml_buffer_stack_stack_ptr = 0; + static int surfxml_buffer_stack_stack[1024]; + xbt_dynar_t hosts = MSG_hosts_as_dynar(); + /* allocating memory to the buffer, I think 2MB should be enough */ + surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); + + nb_host = xbt_dynar_length(hosts); + xbt_dynar_free(&hosts); + + /* */ + SURFXML_BUFFER_SET(platform_version, "3"); + SURFXML_START_TAG(platform); + XBT_DEBUG(""); + + XBT_DEBUG(" "); + SURFXML_BUFFER_SET(process_host, "c-0.me"); + SURFXML_BUFFER_SET(process_function, "master"); + SURFXML_BUFFER_SET(process_start___time, "-1.0"); + SURFXML_BUFFER_SET(process_kill___time, "-1.0"); + SURFXML_START_TAG(process); + + XBT_DEBUG(" ",bprintf("%d",nb_host-1)); + SURFXML_BUFFER_SET(argument_value, bprintf("%d",nb_host-1)); + SURFXML_START_TAG(argument); + SURFXML_END_TAG(argument); + + XBT_DEBUG(" "); + SURFXML_BUFFER_SET(argument_value, "5000000"); + SURFXML_START_TAG(argument); + SURFXML_END_TAG(argument); + + XBT_DEBUG(" "); + SURFXML_BUFFER_SET(argument_value, "100000"); + SURFXML_START_TAG(argument); + SURFXML_END_TAG(argument); + + for(i=1 ; i",bprintf("c-%d",i)); + SURFXML_BUFFER_SET(argument_value, bprintf("c-%d.me",i)); + SURFXML_START_TAG(argument); + SURFXML_END_TAG(argument); + } + XBT_DEBUG(" "); + SURFXML_END_TAG(process); + + for(i=1 ; i",bprintf("c-%d",i)); + SURFXML_BUFFER_SET(process_host, bprintf("c-%d.me",i)); + SURFXML_BUFFER_SET(process_function, "slave"); + SURFXML_BUFFER_SET(process_start___time, "-1.0"); + SURFXML_BUFFER_SET(process_kill___time, "-1.0"); + SURFXML_START_TAG(process); + SURFXML_END_TAG(process); + } + + XBT_DEBUG(""); + SURFXML_END_TAG(platform); + + free(surfxml_bufferstack); + return 0; } /** Test function */ -MSG_error_t test_all(const char *platform_file) +msg_error_t test_all(const char *platform_file) { - MSG_error_t res = MSG_OK; - MSG_create_environment(platform_file); - MSG_function_register("master", master); - MSG_function_register("slave", slave); - surf_parse = bypass_deployment; - MSG_launch_application(NULL); + msg_error_t res = MSG_OK; + MSG_create_environment(platform_file); + MSG_function_register("master", master); + MSG_function_register("slave", slave); + surf_parse = bypass_deployment; + MSG_launch_application(NULL); - res = MSG_main(); + res = MSG_main(); - XBT_INFO("Simulation time %g", MSG_get_clock()); - return res; + XBT_INFO("Simulation time %g", MSG_get_clock()); + return res; } /* end_of_test_all */ /** Main function */ int main(int argc, char *argv[]) { - MSG_error_t res = MSG_OK; + msg_error_t res = MSG_OK; - MSG_global_init(&argc, argv); - res = test_all(argv[1]); - MSG_clean(); + MSG_init(&argc, argv); + res = test_all(argv[1]); - if (res == MSG_OK) - return 0; - else - return 1; + if (res == MSG_OK) + return 0; + else + return 1; } /* end_of_main */