X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..c410a25c399db07e7d6635890772bb7bd5f804fb:/examples/msg/gtnets/gtnets.c

diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index bd00faf78e..93ce019481 100644
--- a/examples/msg/gtnets/gtnets.c
+++ b/examples/msg/gtnets/gtnets.c
@@ -15,9 +15,12 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
 
 int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);
+int timer(int argc, char *argv[]);
 MSG_error_t test_all(const char *platform_file,
                      const char *application_file);
 
+int timer_start = 1;
+
 typedef enum {
   PORT_22 = 0,
   MAX_CHANNEL
@@ -32,6 +35,7 @@ m_task_t gl_task_array[NTASKS];
 const char *slavenames[NTASKS];
 const char *masternames[NTASKS];
 int gl_task_array_id = 0;
+int count_finished = 0;
 
 #define FINALIZE ((void*)221297)        /* a magic number to tell people to stop working */
 
@@ -51,8 +55,9 @@ int master(int argc, char *argv[])
   }
 
   /* data size */
-  xbt_assert1(sscanf(argv[1], "%lg", &task_comm_size),
-              "Invalid argument %s\n", argv[1]);
+  int read;
+  read = sscanf(argv[1], "%lg", &task_comm_size);
+  xbt_assert(read, "Invalid argument %s\n", argv[1]);
 
   /* slave name */
   slavename = argv[2];
@@ -76,6 +81,8 @@ int master(int argc, char *argv[])
     slave = MSG_get_host_by_name(slavename);
   }
 
+  count_finished++;
+
   /* time measurement */
   sprintf(id_alias, "%d", id);
   start_time = MSG_get_clock();
@@ -86,6 +93,31 @@ int master(int argc, char *argv[])
   return 0;
 }                               /* end_of_master */
 
+
+/** Timer function  */
+int timer(int argc, char *argv[])
+{
+  int sleep_time;
+  int first_sleep;
+
+  if (argc != 3) {
+    XBT_INFO("Strange number of arguments expected 2 got %d", argc - 1);
+  }
+
+  sscanf(argv[1], "%d", &first_sleep);
+  sscanf(argv[2], "%d", &sleep_time);
+
+  if(first_sleep){
+      MSG_process_sleep(first_sleep);
+  }
+
+  while(timer_start){
+      MSG_process_sleep(sleep_time);
+  }
+
+  return 0;
+}
+
 /** Receiver function  */
 int slave(int argc, char *argv[])
 {
@@ -109,9 +141,16 @@ int slave(int argc, char *argv[])
 
   a = MSG_task_receive(&(task), id_alias);
 
+  count_finished--;
+  if(count_finished == 0){
+      timer_start = 0;
+  }
+
+
+
   if (a != MSG_OK) {
     XBT_INFO("Hey?! What's up?");
-    xbt_assert0(0, "Unexpected behavior.");
+    xbt_die("Unexpected behavior.");
   }
 
   elapsed_time = MSG_get_clock() - start_time;
@@ -156,6 +195,7 @@ int slave(int argc, char *argv[])
   TRACE_mark("endmark", mark);
 
   MSG_task_destroy(task);
+
   return 0;
 }                               /* end_of_slave */
 
@@ -171,9 +211,14 @@ MSG_error_t test_all(const char *platform_file,
     MSG_set_channel_number(MAX_CHANNEL);
     MSG_create_environment(platform_file);
   }
+
+  TRACE_declare_mark("endmark");
+
   {                             /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);
+    MSG_function_register("timer", timer);
+
     MSG_launch_application(application_file);
   }
   res = MSG_main();
@@ -192,8 +237,6 @@ int main(int argc, char *argv[])
     exit(1);
   }
 
-  TRACE_declare_mark("endmark");
-
   res = test_all(argv[1], argv[2]);
 
   MSG_clean();