X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/04332f1d57f5acd84209d2d601eb68f1fa70ce4a..a6459cb984bf8673ede03d6488b4f69c92c4352f:/examples/msg/msg_test.c

diff --git a/examples/msg/msg_test.c b/examples/msg/msg_test.c
index a96d282dac..01a74f3a25 100644
--- a/examples/msg/msg_test.c
+++ b/examples/msg/msg_test.c
@@ -5,32 +5,23 @@
 /* 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. */
 
-/** \file msg_test.c 
- *  \ingroup MSG_examples
- *  \brief Simulation of a master-slave application using a realistic platform 
- *  and an external description of the deployment.
-*/
+#include "msg/msg.h" /* Yeah! If you want to use msg, you need to include msg/msg.h */
 
-/** Yeah! If you want to use msg, you need to include msg/msg.h */
-#include "msg/msg.h"
-
-/** This flag enable the debugging messages from #PRINT_DEBUG_MESSAGE() */
-#define VERBOSE
-#include "messages.h"
+/* Create a log channel to have nice outputs. */
+#include "xbt/log.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[]);
 void test_all(const char *platform_file, const char *application_file);
 
-
 typedef enum {
   PORT_22 = 0,
   MAX_CHANNEL
 } channel_t;
 
-/** Print arguments
- * This function is just used so that users can check that each process
+/* This function is just used so that users can check that each process
  *  has received the arguments it was supposed to receive.
  */
 static void print_args(int argc, char** argv)
@@ -43,21 +34,7 @@ static void print_args(int argc, char** argv)
   fprintf(stderr,">\n");
 }
 
-/** Emitter function
- * This function has to be assigned to a m_process_t that will behave as the master.
-   It should not be called directly but either given as a parameter to
-   #MSG_process_create() or registered as a public function through 
-   #MSG_function_register() and then automatically assigned to a process through
-   #MSG_launch_application().
- 
-   C style arguments (argc/argv) are interpreted as 
-   \li the number of tasks to distribute
-   \li the computation size of each task
-   \li the size of the files associated to each task
-   \li a list of host that will accept those tasks.
-
-   Tasks are dumbly sent in a round-robin style.
-  */
+/** Emitter function  */
 int master(int argc, char *argv[])
 {
   int slaves_count = 0;
@@ -72,11 +49,11 @@ int master(int argc, char *argv[])
 
   print_args(argc,argv);
 
-  ASSERT(sscanf(argv[1],"%d", &number_of_tasks),
+  xbt_assert1(sscanf(argv[1],"%d", &number_of_tasks),
 	 "Invalid argument %s\n",argv[1]);
-  ASSERT(sscanf(argv[2],"%lg", &task_comp_size),
+  xbt_assert1(sscanf(argv[2],"%lg", &task_comp_size),
 	 "Invalid argument %s\n",argv[2]);
-  ASSERT(sscanf(argv[3],"%lg", &task_comm_size),
+  xbt_assert1(sscanf(argv[3],"%lg", &task_comm_size),
 	 "Invalid argument %s\n",argv[3]);
 
   {                  /*  Task creation */
@@ -97,42 +74,40 @@ int master(int argc, char *argv[])
     for (i = 4; i < argc; i++) {
       slaves[i-4] = MSG_get_host_by_name(argv[i]);
       if(slaves[i-4]==NULL) {
-	PRINT_MESSAGE("Unknown host %s. Stopping Now! \n", argv[i]);
+	INFO1("Unknown host %s. Stopping Now! ", argv[i]);
 	abort();
       }
     }
   }
 
-  PRINT_MESSAGE("Got %d slave(s) :\n", slaves_count);
+  INFO1("Got %d slave(s) :", slaves_count);
   for (i = 0; i < slaves_count; i++)
-    PRINT_MESSAGE("\t %s\n", slaves[i]->name);
+    INFO1("\t %s", slaves[i]->name);
 
-  PRINT_MESSAGE("Got %d task to process :\n", number_of_tasks);
+  INFO1("Got %d task to process :", number_of_tasks);
 
   for (i = 0; i < number_of_tasks; i++)
-    PRINT_MESSAGE("\t\"%s\"\n", todo[i]->name);
+    INFO1("\t\"%s\"", todo[i]->name);
 
   for (i = 0; i < number_of_tasks; i++) {
-    PRINT_MESSAGE("Sending \"%s\" to \"%s\"\n",
+    INFO2("Sending \"%s\" to \"%s\"",
                   todo[i]->name,
                   slaves[i % slaves_count]->name);
+    if(MSG_host_self()==slaves[i % slaves_count]) {
+      INFO0("Hey ! It's me ! :)");
+    }
     MSG_task_put(todo[i], slaves[i % slaves_count],
                  PORT_22);
-    PRINT_MESSAGE("Send completed\n");
+    INFO0("Send completed");
   }
   
-  PRINT_MESSAGE("All tasks have been dispatched. Bye!\n");
+  INFO0("All tasks have been dispatched. Bye!");
   free(slaves);
   free(todo);
   return 0;
-}
+} /* end_of_master */
 
-/** Receiver function
- * This function has to be assigned to a #m_process_t that has to behave as a slave.
-   Just like #master(), it should not be called directly.
-
-   This function keeps waiting for tasks and executes them as it receives them.
-  */
+/** Receiver function  */
 int slave(int argc, char *argv[])
 {
   print_args(argc,argv);
@@ -142,29 +117,21 @@ int slave(int argc, char *argv[])
     int a;
     a = MSG_task_get(&(task), PORT_22);
     if (a == MSG_OK) {
-      PRINT_MESSAGE("Received \"%s\" \n", task->name);
-      PRINT_MESSAGE("Processing \"%s\" \n", task->name);
+      INFO1("Received \"%s\" ", task->name);
+      INFO1("Processing \"%s\" ", task->name);
       MSG_task_execute(task);
-      PRINT_MESSAGE("\"%s\" done \n", task->name);
+      INFO1("\"%s\" done ", task->name);
       MSG_task_destroy(task);
     } else {
-      PRINT_MESSAGE("Hey ?! What's up ? \n");
-      DIE("Unexpected behaviour");
+      INFO0("Hey ?! What's up ? ");
+      xbt_assert0(0,"Unexpected behaviour");
     }
   }
-  PRINT_MESSAGE("I'm done. See you!\n");
+  INFO0("I'm done. See you!");
   return 0;
-}
-
-/** Receiver function
- * This function has to be assigned to a #m_process_t that has to behave as a forwarder.
-   Just like #master(), it should not be called directly.
-
-   C style arguments (argc/argv) are interpreted as a list of host
-   that will accept those tasks.
+} /* end_of_slave */
 
-   This function keeps waiting for tasks and dispathes them to its slaves.
-  */
+/** Receiver function */
 int forwarder(int argc, char *argv[])
 {
   int i;
@@ -180,7 +147,7 @@ int forwarder(int argc, char *argv[])
     for (i = 1; i < argc; i++) {
       slaves[i-1] = MSG_get_host_by_name(argv[i]);
       if(slaves[i-1]==NULL) {
-	PRINT_MESSAGE("Unknown host %s. Stopping Now! \n", argv[i]);
+	INFO1("Unknown host %s. Stopping Now! ", argv[i]);
 	abort();
       }
     }
@@ -192,40 +159,31 @@ int forwarder(int argc, char *argv[])
     int a;
     a = MSG_task_get(&(task), PORT_22);
     if (a == MSG_OK) {
-      PRINT_MESSAGE("Received \"%s\" \n", task->name);
-      PRINT_MESSAGE("Sending \"%s\" to \"%s\"\n",
+      INFO1("Received \"%s\" ", task->name);
+      INFO2("Sending \"%s\" to \"%s\"",
 		    task->name,
 		    slaves[i % slaves_count]->name);
       MSG_task_put(task, slaves[i % slaves_count],
 		   PORT_22);
     } else {
-      PRINT_MESSAGE("Hey ?! What's up ? \n");
-      DIE("Unexpected behaviour");
+      INFO0("Hey ?! What's up ? ");
+      xbt_assert0(0,"Unexpected behaviour");
     }
   }
 
-  PRINT_MESSAGE("I'm done. See you!\n");
+  INFO0("I'm done. See you!");
   return 0;
-}
+} /* end_of_forwarder */
 
 
-/** Test function
- * This function is the core of the simulation and is divided only into 3 parts
- * thanks to MSG_create_environment() and MSG_launch_application().
- *      -# Simulation settings : MSG_create_environment() creates a realistic 
- *         environment
- *      -# Application deployment : create the agents on the right locations with  
- *         MSG_launch_application()
- *      -# The simulation is run with #MSG_main()
- * @param platform_file the name of a file containing an valid surfxml platform 
- *        description.
- * @param application_file the name of a file containing a valid surfxml application 
- *        description
- */
+/** Test function */
 void test_all(const char *platform_file,const char *application_file)
 {
+
+  /* MSG_config("surf_workstation_model","KCCFLN05"); */
   {				/*  Simulation setting */
     MSG_set_channel_number(MAX_CHANNEL);
+    MSG_paje_output("msg_test.trace");
     MSG_create_environment(platform_file);
   }
   {                            /*   Application deployment */
@@ -235,17 +193,15 @@ void test_all(const char *platform_file,const char *application_file)
     MSG_launch_application(application_file);
   }
   MSG_main();
-  printf("Simulation time %g\n",MSG_getClock());
-}
+  
+  INFO1("Simulation time %g",MSG_get_clock());
+} /* end_of_test_all */
 
 
-/** Main function
- * This initializes MSG, runs a simulation, and free all data-structures created 
- * by MSG.
- */
+/** Main function */
 int main(int argc, char *argv[])
 {
-  MSG_global_init_args(&argc,argv);
+  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]);
@@ -254,4 +210,4 @@ int main(int argc, char *argv[])
   test_all(argv[1],argv[2]);
   MSG_clean();
   return (0);
-}
+} /* end_of_main */