Use isend instead of send to set the simdata->comm so that get_remaining can work.

[simgrid.git] / examples / msg / gtnets / gtnets.c

diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index 8153d9b..18c1b74 100644 (file)
--- 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 */
 
@@ -41,7 +45,6 @@ int master(int argc, char *argv[])
   char *slavename = NULL;
   double task_comm_size = 0;
   m_task_t todo;
-  m_host_t slave;
   char id_alias[10];
   //unique id to control statistics
   int id = -1;
@@ -73,9 +76,7 @@ int master(int argc, char *argv[])
     gl_data_size[id] = task_comm_size;
   }
 
-  {                             /* Process organisation */
-    slave = MSG_get_host_by_name(slavename);
-  }
+  count_finished++;
 
   /* time measurement */
   sprintf(id_alias, "%d", id);
@@ -87,6 +88,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[])
 {
@@ -110,6 +136,13 @@ 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_die("Unexpected behavior.");
@@ -157,6 +190,7 @@ int slave(int argc, char *argv[])
   TRACE_mark("endmark", mark);
 
   MSG_task_destroy(task);
+
   return 0;
 }                               /* end_of_slave */
 
@@ -172,9 +206,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();
@@ -193,8 +232,6 @@ int main(int argc, char *argv[])
     exit(1);
   }
 
-  TRACE_declare_mark("endmark");
-
   res = test_all(argv[1], argv[2]);
 
   MSG_clean();