X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..4365fa8e81736673eae923310a05cdbf78ec88d8:/examples/msg/masterslave/masterslave_failure.c diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c index 901d08c229..cc8398a1ea 100644 --- a/examples/msg/masterslave/masterslave_failure.c +++ b/examples/msg/masterslave/masterslave_failure.c @@ -1,11 +1,11 @@ -/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team. +/* Copyright (c) 2007-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 "xbt/sysdep.h" /* calloc, printf */ /* Create a log channel to have nice outputs. */ @@ -16,39 +16,32 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, 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, +msg_error_t test_all(const char *platform_file, const char *application_file); -typedef enum { - PORT_22 = 0, - MAX_CHANNEL -} channel_t; - #define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */ /** Emitter function */ int master(int argc, char *argv[]) { int slaves_count = 0; - m_host_t *slaves = NULL; + msg_host_t *slaves = 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]); { /* 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]); @@ -61,18 +54,18 @@ int master(int argc, char *argv[]) XBT_INFO("Got %d slave(s) :", slaves_count); for (i = 0; i < slaves_count; i++) - XBT_INFO("%s", slaves[i]->name); + XBT_INFO("%s", MSG_host_get_name(slaves[i])); XBT_INFO("Got %d task to process :", number_of_tasks); for (i = 0; i < number_of_tasks; i++) { - m_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size, + msg_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size, xbt_new0(double, 1)); - int a; + msg_error_t a; *((double *) task->data) = MSG_get_clock(); - a = MSG_task_put_with_timeout(task, slaves[i % slaves_count], PORT_22, - 10.0); + 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) { @@ -85,26 +78,26 @@ int master(int argc, char *argv[]) } else if (a == MSG_TRANSFER_FAILURE) { XBT_INFO ("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!", - slaves[i % slaves_count]->name); + 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!", - slaves[i % slaves_count]->name); + MSG_host_get_name(slaves[i % slaves_count])); free(task->data); MSG_task_destroy(task); } else { XBT_INFO("Hey ?! What's up ? "); - xbt_assert0(0, "Unexpected behavior"); + xbt_die( "Unexpected behavior"); } } XBT_INFO ("All tasks have been dispatched. Let's tell everybody the computation is over."); for (i = 0; i < slaves_count; i++) { - m_task_t task = MSG_task_create("finalize", 0, 0, FINALIZE); - int a = MSG_task_put_with_timeout(task, slaves[i], PORT_22, 1.0); + 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) { @@ -115,17 +108,16 @@ int master(int argc, char *argv[]) return 0; } else if (a == MSG_TRANSFER_FAILURE) { XBT_INFO("Mmh. Can't reach '%s'! Nevermind. Let's keep going!", - slaves[i]->name); + 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!", - slaves[i % slaves_count]->name); + MSG_host_get_name(slaves[i % slaves_count])); MSG_task_destroy(task); } else { XBT_INFO("Hey ?! What's up ? "); - xbt_assert2(0, "Unexpected behavior with '%s': %d", slaves[i]->name, - a); + xbt_die("Unexpected behavior with '%s': %d", MSG_host_get_name(slaves[i]), a); } } @@ -138,12 +130,12 @@ int master(int argc, char *argv[]) int slave(int argc, char *argv[]) { while (1) { - m_task_t task = NULL; + msg_task_t task = NULL; int a; double time1, time2; time1 = MSG_get_clock(); - a = MSG_task_get(&(task), PORT_22); + a = MSG_task_receive( &(task), MSG_host_get_name(MSG_host_self()) ); time2 = MSG_get_clock(); if (a == MSG_OK) { XBT_INFO("Received \"%s\"", MSG_task_get_name(task)); @@ -163,10 +155,12 @@ int slave(int argc, char *argv[]) } else if (a == MSG_HOST_FAILURE) { 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_assert0(0, "Unexpected behavior"); + xbt_die("Unexpected behavior"); } } else if (a == MSG_HOST_FAILURE) { XBT_INFO @@ -176,7 +170,7 @@ int slave(int argc, char *argv[]) XBT_INFO("Mmh. Something went wrong. Nevermind. Let's keep going!"); } else { XBT_INFO("Hey ?! What's up ? "); - xbt_assert0(0, "Unexpected behavior"); + xbt_die("Unexpected behavior"); } } XBT_INFO("I'm done. See you!"); @@ -184,14 +178,12 @@ int slave(int argc, char *argv[]) } /* end_of_slave */ /** Test function */ -MSG_error_t test_all(const char *platform_file, +msg_error_t test_all(const char *platform_file, const char *application_file) { - MSG_error_t res = MSG_OK; + msg_error_t res = MSG_OK; - /* MSG_config("workstation/model","KCCFLN05"); */ { /* Simulation setting */ - MSG_set_channel_number(MAX_CHANNEL); MSG_create_environment(platform_file); } { /* Application deployment */ @@ -209,16 +201,15 @@ MSG_error_t test_all(const char *platform_file, /** 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); + 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]); - MSG_clean(); if (res == MSG_OK) return 0;