X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3a6228d1e65a6f7eea5b97ae0fa2668af06d59d..077d899a2c6627b30846e848b4a029da720b7ea0:/examples/msg/masterslave/masterslave_failure.c

diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c
index 57502fa0bb..070d75af8f 100644
--- a/examples/msg/masterslave/masterslave_failure.c
+++ b/examples/msg/masterslave/masterslave_failure.c
@@ -1,202 +1,175 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* 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 <stdio.h>
-#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */
-#include "xbt/sysdep.h" /* calloc, printf */
-
-/* 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");
+#include "simgrid/msg.h"
 
-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");
 
-typedef enum {
-  PORT_22 = 0,
-  MAX_CHANNEL
-} channel_t;
+#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 */
-
-/** Emitter function  */
-int master(int argc, char *argv[])
+static 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_ATTRIB_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 */
+  {                             /* Process organization */
     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]);
-	abort();
+      slaves[i - 4] = MSG_host_by_name(argv[i]);
+      if (slaves[i - 4] == NULL) {
+        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("%s", slaves[i]->name);
+    XBT_INFO("%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++) {
-    m_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size, 
-				    xbt_new0(double,1));
-    int a;
-    *((double*) task->data) = MSG_get_clock();
-    
-    a = MSG_task_put_with_timeout(task, slaves[i % slaves_count], PORT_22,10.0);
+    msg_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size, xbt_new0(double, 1));
+    *((double *) task->data) = MSG_get_clock();
+
+    msg_error_t a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i % slaves_count]),10.0);
+
     if (a == MSG_OK) {
-      INFO0("Send completed");
+      XBT_INFO("Send completed");
     } else if (a == MSG_HOST_FAILURE) {
-      INFO0("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) {
-      INFO1("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!",
-	    slaves[i % slaves_count]->name);
+      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!",
+              MSG_host_get_name(slaves[i % slaves_count]));
+      free(task->data);
       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("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++) {
-    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); 
-    if (a == MSG_OK) continue;
+    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) {
-      INFO0("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) {
-      INFO1("Mmh. Can't reach '%s'! Nevermind. Let's keep going!",
-	    slaves[i]->name);
+      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]));
       MSG_task_destroy(task);
     } else {
-      INFO0("Hey ?! What's up ? ");
-      xbt_assert2(0,"Unexpected behavior with '%s': %d",slaves[i]->name,a);
-    }    
+      XBT_INFO("Hey ?! What's up ? ");
+      xbt_die("Unexpected behavior with '%s': %d", MSG_host_get_name(slaves[i]), a);
+    }
   }
-  
-  INFO0("Goodbye now!");
+
+  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) {
-    m_task_t task = NULL;
+  while (1) {
+    msg_task_t task = NULL;
     int a;
-    double time1,time2;
+    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) {
-      INFO1("Received \"%s\"", MSG_task_get_name(task));
-      if(MSG_task_get_data(task)==FINALIZE) {
-	MSG_task_destroy(task);
-	break;
+      XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
+      if (MSG_task_get_data(task) == FINALIZE) {
+        MSG_task_destroy(task);
+        break;
       }
-      if(time1<*((double *)task->data))
-	time1 = *((double *) task->data);
-      INFO1("Communication time : \"%f\"", time2-time1);
-      INFO1("Processing \"%s\"", MSG_task_get_name(task));
+      if (time1 < *((double *) task->data))
+        time1 = *((double *) task->data);
+      XBT_INFO("Communication time : \"%f\"", time2 - time1);
+      XBT_INFO("Processing \"%s\"", MSG_task_get_name(task));
       a = MSG_task_execute(task);
       if (a == MSG_OK) {
-      INFO1("\"%s\" done", MSG_task_get_name(task));
-      free(task->data);
-      MSG_task_destroy(task);
+        XBT_INFO("\"%s\" done", MSG_task_get_name(task));
+        free(task->data);
+        MSG_task_destroy(task);
       } else if (a == MSG_HOST_FAILURE) {
-	INFO0("Gloups. The cpu on which I'm running just turned off!. See you!");
-	return 0;
+        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 {
-	INFO0("Hey ?! What's up ? ");
-	xbt_assert0(0,"Unexpected behavior");
+        XBT_INFO("Hey ?! What's up ? ");
+        xbt_die("Unexpected behavior");
       }
     } else if (a == MSG_HOST_FAILURE) {
-      INFO0("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) {
-      INFO0("Mmh. Something went wrong. Nevermind. Let's keep going!");      
+      XBT_INFO("Mmh. Something went wrong. Nevermind. Let's keep going!");
     } 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 */
+}
 
-/** 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_error_t res = MSG_OK;
 
-  /* MSG_config("workstation_model","KCCFLN05"); */
-  {				/*  Simulation setting */
-    MSG_set_channel_number(MAX_CHANNEL);
-    MSG_paje_output("msg_test.trace");
-    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();
-  
-  INFO1("Simulation time %g",MSG_get_clock());
-  return res;
-} /* end_of_test_all */
+  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]);
 
+  MSG_create_environment(argv[1]);
 
-/** Main function */
-int main(int argc, char *argv[])
-{
-  MSG_error_t res = MSG_OK;
+  MSG_function_register("master", master);
+  MSG_function_register("slave", slave);
+  MSG_launch_application(argv[2]);
 
-  MSG_global_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;
-  else
-    return 1;
-} /* end_of_main */
+  res = MSG_main();
+
+  XBT_INFO("Simulation time %g", MSG_get_clock());
+
+  return res != MSG_OK;
+}