X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8688440179193bedb5d9b4dcd3430d04168a4740..2b1ec461e8edc3e49d545abe907fe1ffc995ea47:/examples/msg/masterslave/masterslave_cluster.c diff --git a/examples/msg/masterslave/masterslave_cluster.c b/examples/msg/masterslave/masterslave_cluster.c index d985c9e837..74a7493df5 100644 --- a/examples/msg/masterslave/masterslave_cluster.c +++ b/examples/msg/masterslave/masterslave_cluster.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010. The SimGrid Team. +/* Copyright (c) 2010-2012. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -16,41 +16,35 @@ 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[]); int slave(int argc, char *argv[]); -typedef enum { - PORT_22 = 0, - MAX_CHANNEL -} channel_t; - /** Emitter function */ 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; - - int i; + _XBT_GNUC_UNUSED int read; - xbt_assert1(sscanf(argv[1], "%d", &number_of_tasks), - "Invalid argument %s\n", argv[1]); - xbt_assert1(sscanf(argv[2], "%lg", &task_comp_size), - "Invalid argument %s\n", argv[2]); - xbt_assert1(sscanf(argv[3], "%lg", &task_comm_size), - "Invalid argument %s\n", argv[3]); + read = sscanf(argv[1], "%d", &number_of_tasks); + xbt_assert(read, "Invalid argument %s\n", argv[1]); + read = sscanf(argv[2], "%lg", &task_comp_size); + xbt_assert(read, "Invalid argument %s\n", argv[2]); + read = sscanf(argv[3], "%lg", &task_comm_size); + xbt_assert(read, "Invalid argument %s\n", argv[3]); { /* 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); @@ -62,43 +56,43 @@ 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]); if (slaves[i - 4] == NULL) { - INFO1("Unknown host %s. Stopping Now! ", argv[i]); + XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]); abort(); } } } - INFO1("Got %d slave(s) :", slaves_count); + XBT_INFO("Got %d slave(s) :", slaves_count); for (i = 0; i < slaves_count; i++) - INFO1("\t %s", slaves[i]->name); + XBT_INFO("\t %s", MSG_host_get_name(slaves[i])); - INFO1("Got %d task to process :", number_of_tasks); + XBT_INFO("Got %d task to process :", number_of_tasks); for (i = 0; i < number_of_tasks; i++) - INFO1("\t\"%s\"", todo[i]->name); + XBT_INFO("\t\"%s\"", todo[i]->name); for (i = 0; i < number_of_tasks; i++) { - INFO2("Sending \"%s\" to \"%s\"", - todo[i]->name, slaves[i % slaves_count]->name); + XBT_INFO("Sending \"%s\" to \"%s\"", + todo[i]->name, MSG_host_get_name(slaves[i % slaves_count])); if (MSG_host_self() == slaves[i % slaves_count]) { - INFO0("Hey ! It's me ! :)"); + XBT_INFO("Hey ! It's me ! :)"); } - MSG_task_put(todo[i], slaves[i % slaves_count], PORT_22); - INFO0("Send completed"); + MSG_task_send(todo[i], MSG_host_get_name(slaves[i % slaves_count])); + XBT_INFO("Send completed"); } - INFO0 + XBT_INFO ("All tasks have been dispatched. Let's tell everybody the computation is over."); for (i = 0; i < slaves_count; i++) - MSG_task_put(MSG_task_create("finalize", 0, 0, FINALIZE), - slaves[i], PORT_22); + MSG_task_send(MSG_task_create("finalize", 0, 0, FINALIZE), + MSG_host_get_name(slaves[i])); - INFO0("Goodbye now!"); + XBT_INFO("Goodbye now!"); free(slaves); free(todo); return 0; @@ -107,27 +101,27 @@ int master(int argc, char *argv[]) /** Receiver function */ int slave(int argc, char *argv[]) { - INFO0("I'm a slave"); + XBT_INFO("I'm a slave"); while (1) { - m_task_t task = NULL; + msg_task_t task = NULL; int a; - a = MSG_task_get(&(task), PORT_22); + a = MSG_task_receive(&(task), MSG_host_get_name(MSG_host_self())); if (a == MSG_OK) { - INFO1("Received \"%s\" ", MSG_task_get_name(task)); + XBT_INFO("Received \"%s\" ", MSG_task_get_name(task)); if (MSG_task_get_data(task) == FINALIZE) { MSG_task_destroy(task); break; } - INFO1("Processing \"%s\" ", MSG_task_get_name(task)); + XBT_INFO("Processing \"%s\" ", MSG_task_get_name(task)); MSG_task_execute(task); - INFO1("\"%s\" done ", MSG_task_get_name(task)); + XBT_INFO("\"%s\" done ", MSG_task_get_name(task)); MSG_task_destroy(task); } else { - INFO0("Hey ?! What's up ? "); - xbt_assert0(0, "Unexpected behavior"); - } + XBT_INFO("Hey ?! What's up ? "); + xbt_die("Unexpected behavior"); + } } - INFO0("I'm done. See you!"); + XBT_INFO("I'm done. See you!"); return 0; } /* end_of_slave */ @@ -135,99 +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]; - /* allocating memory to the buffer, I think 2MB should be enough */ - surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size); - nb_host = MSG_get_host_number(); - - /* */ - SURFXML_BUFFER_SET(platform_version, "3"); - SURFXML_START_TAG(platform); - DEBUG0(""); - - DEBUG0(" "); - 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); - - DEBUG1(" ",bprintf("%d",nb_host-1)); - SURFXML_BUFFER_SET(argument_value, bprintf("%d",nb_host-1)); - SURFXML_START_TAG(argument); - SURFXML_END_TAG(argument); - - DEBUG0(" "); - SURFXML_BUFFER_SET(argument_value, "5000000"); - SURFXML_START_TAG(argument); - SURFXML_END_TAG(argument); - - DEBUG0(" "); - 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); - } - DEBUG0(" "); - 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); - } - - DEBUG0(""); - 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_set_channel_number(MAX_CHANNEL); - 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(); - - INFO1("Simulation time %g", MSG_get_clock()); - return res; + 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(); + + 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 */