X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0afab0e550e09d35a4aaaae802c7f2ea17d2b860..077d899a2c6627b30846e848b4a029da720b7ea0:/examples/msg/masterslave/masterslave_failure.c diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c index 6a4f5e324a..070d75af8f 100644 --- a/examples/msg/masterslave/masterslave_failure.c +++ b/examples/msg/masterslave/masterslave_failure.c @@ -1,29 +1,16 @@ -/* 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 * 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 "xbt/sysdep.h" /* calloc, printf */ +#include "simgrid/msg.h" -/* Create a log channel to have nice outputs. */ -#include "xbt/log.h" -#include "xbt/asserts.h" -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[]); -int forwarder(int argc, char *argv[]); -msg_error_t test_all(const char *platform_file, - const char *application_file); +XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example"); #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ -/** Emitter function */ -int master(int argc, char *argv[]) +static int master(int argc, char *argv[]) { int slaves_count = 0; msg_host_t *slaves = NULL; @@ -31,7 +18,7 @@ int master(int argc, char *argv[]) double task_comp_size = 0; double task_comm_size = 0; int i; - _XBT_GNUC_UNUSED int read; + XBT_ATTRIB_UNUSED int read; read = sscanf(argv[1], "%d", &number_of_tasks); xbt_assert(read, "Invalid argument %s\n", argv[1]); @@ -40,12 +27,12 @@ int master(int argc, char *argv[]) read = sscanf(argv[3], "%lg", &task_comm_size); xbt_assert(read, "Invalid argument %s\n", argv[3]); - { /* Process organisation */ + { /* Process organization */ slaves_count = argc - 4; slaves = xbt_new0(msg_host_t, slaves_count); for (i = 4; i < argc; i++) { - slaves[i - 4] = MSG_get_host_by_name(argv[i]); + slaves[i - 4] = MSG_host_by_name(argv[i]); if (slaves[i - 4] == NULL) { XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]); abort(); @@ -60,31 +47,26 @@ int master(int argc, char *argv[]) XBT_INFO("Got %d task to process :", number_of_tasks); for (i = 0; i < number_of_tasks; i++) { - msg_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size, - xbt_new0(double, 1)); - int a; + msg_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size, xbt_new0(double, 1)); *((double *) task->data) = MSG_get_clock(); - a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i % slaves_count]),10.0); + msg_error_t a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i % slaves_count]),10.0); if (a == MSG_OK) { XBT_INFO("Send completed"); } else if (a == MSG_HOST_FAILURE) { - XBT_INFO - ("Gloups. The cpu on which I'm running just turned off!. See you!"); + XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!"); free(task->data); MSG_task_destroy(task); free(slaves); return 0; } else if (a == MSG_TRANSFER_FAILURE) { - XBT_INFO - ("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", - MSG_host_get_name(slaves[i % slaves_count])); + XBT_INFO("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", + MSG_host_get_name(slaves[i % slaves_count])); free(task->data); MSG_task_destroy(task); } else if (a == MSG_TIMEOUT) { - XBT_INFO - ("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", + XBT_INFO ("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", MSG_host_get_name(slaves[i % slaves_count])); free(task->data); MSG_task_destroy(task); @@ -94,27 +76,23 @@ int master(int argc, char *argv[]) } } - XBT_INFO - ("All tasks have been dispatched. Let's tell everybody the computation is over."); + XBT_INFO("All tasks have been dispatched. Let's tell everybody the computation is over."); for (i = 0; i < slaves_count; i++) { msg_task_t task = MSG_task_create("finalize", 0, 0, FINALIZE); int a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i]),1.0); if (a == MSG_OK) continue; if (a == MSG_HOST_FAILURE) { - XBT_INFO - ("Gloups. The cpu on which I'm running just turned off!. See you!"); + XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!"); MSG_task_destroy(task); free(slaves); return 0; } else if (a == MSG_TRANSFER_FAILURE) { - XBT_INFO("Mmh. Can't reach '%s'! Nevermind. Let's keep going!", - MSG_host_get_name(slaves[i])); + XBT_INFO("Mmh. Can't reach '%s'! Nevermind. Let's keep going!", MSG_host_get_name(slaves[i])); MSG_task_destroy(task); } else if (a == MSG_TIMEOUT) { - XBT_INFO - ("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", - MSG_host_get_name(slaves[i % slaves_count])); + XBT_INFO("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!", + MSG_host_get_name(slaves[i % slaves_count])); MSG_task_destroy(task); } else { XBT_INFO("Hey ?! What's up ? "); @@ -125,10 +103,9 @@ int master(int argc, char *argv[]) XBT_INFO("Goodbye now!"); free(slaves); return 0; -} /* end_of_master */ +} -/** Receiver function */ -int slave(int argc, char *argv[]) +static int slave(int argc, char *argv[]) { while (1) { msg_task_t task = NULL; @@ -154,16 +131,16 @@ int slave(int argc, char *argv[]) free(task->data); MSG_task_destroy(task); } else if (a == MSG_HOST_FAILURE) { - XBT_INFO - ("Gloups. The cpu on which I'm running just turned off!. See you!"); + XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!"); + free(task->data); + MSG_task_destroy(task); return 0; } else { XBT_INFO("Hey ?! What's up ? "); xbt_die("Unexpected behavior"); } } else if (a == MSG_HOST_FAILURE) { - XBT_INFO - ("Gloups. The cpu on which I'm running just turned off!. See you!"); + XBT_INFO("Gloups. The cpu on which I'm running just turned off!. See you!"); return 0; } else if (a == MSG_TRANSFER_FAILURE) { XBT_INFO("Mmh. Something went wrong. Nevermind. Let's keep going!"); @@ -174,45 +151,25 @@ int slave(int argc, char *argv[]) } XBT_INFO("I'm done. See you!"); return 0; -} /* end_of_slave */ +} -/** Test function */ -msg_error_t test_all(const char *platform_file, - const char *application_file) +int main(int argc, char *argv[]) { msg_error_t res = MSG_OK; - /* MSG_config("workstation/model","KCCFLN05"); */ - { /* Simulation setting */ - MSG_create_environment(platform_file); - } - { /* Application deployment */ - MSG_function_register("master", master); - MSG_function_register("slave", slave); - MSG_launch_application(application_file); - } - res = MSG_main(); + MSG_init(&argc, argv); + xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n" + "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]); - XBT_INFO("Simulation time %g", MSG_get_clock()); - return res; -} /* end_of_test_all */ + MSG_create_environment(argv[1]); + MSG_function_register("master", master); + MSG_function_register("slave", slave); + MSG_launch_application(argv[2]); -/** Main function */ -int main(int argc, char *argv[]) -{ - msg_error_t res = MSG_OK; + res = MSG_main(); - MSG_init(&argc, argv); - if (argc < 3) { - printf("Usage: %s platform_file deployment_file\n", argv[0]); - printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]); - exit(1); - } - res = test_all(argv[1], argv[2]); + XBT_INFO("Simulation time %g", MSG_get_clock()); - if (res == MSG_OK) - return 0; - else - return 1; -} /* end_of_main */ + return res != MSG_OK; +}