uncovered code in test is dead code. kill!

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

diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index 09d43c3..839d4a7 100644 (file)
--- a/examples/msg/gtnets/gtnets.c
+++ b/examples/msg/gtnets/gtnets.c
@@ -1,177 +1,204 @@
+/* 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 <stdlib.h>
 #include <stdio.h>
 #include <stdlib.h>

-#include "msg/msg.h"
+#include "simgrid/msg.h"

 #include "xbt/log.h"
 #include "xbt/asserts.h"
 
 #include "xbt/log.h"
 #include "xbt/asserts.h"
 

-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,"Messages specific for this msg example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
+                             "Messages specific for this msg example");
+
+/** @addtogroup MSG_examples
+ * 
+ * - <b>gtnets</b> Simple ping-pong using GTNeTs instead of the SimGrid network models.
+ */

 
 int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);
 
 int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);

-MSG_error_t test_all(const char *platform_file, const char *application_file);
+msg_error_t test_all(const char *platform_file,
+                     const char *application_file);

 
 

-typedef enum {
-  PORT_22 = 0,
-  MAX_CHANNEL
-} channel_t;
+int timer_start = 1;

 
 //keep a pointer to all surf running tasks.
 #define NTASKS 1500
 
 //keep a pointer to all surf running tasks.
 #define NTASKS 1500

-int bool_printed=0;
+int bool_printed = 0;

 double start_time, end_time, elapsed_time;
 double start_time, end_time, elapsed_time;

-double   gl_data_size[NTASKS];
-m_task_t gl_task_array[NTASKS];
-const char * slavenames[NTASKS];
-const char * masternames[NTASKS];
-int gl_task_array_id=0;
-
-#define FINALIZE ((void*)221297) /* a magic number to tell people to stop working */
+double gl_data_size[NTASKS];
+msg_task_t gl_task_array[NTASKS];
+const char *slavenames[NTASKS];
+const char *masternames[NTASKS];
+int gl_task_array_id = 0;
+int count_finished = 0;

 
 /** master */
 int master(int argc, char *argv[])
 {
   char *slavename = NULL;
   double task_comm_size = 0;
 
 /** master */
 int master(int argc, char *argv[])
 {
   char *slavename = NULL;
   double task_comm_size = 0;

-  m_task_t todo;
-  m_host_t slave;
+  msg_task_t todo;

   char id_alias[10];
   //unique id to control statistics
   int id = -1;
 
   char id_alias[10];
   //unique id to control statistics
   int id = -1;
 

-  if(argc != 4){
-    INFO1("Strange number of arguments expected 3 got %d", argc-1 );
-  }
+  xbt_assert(argc == 4, "Strange number of arguments expected 3 got %d",
+             argc - 1);

 
   /* data size */
 
   /* 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];
   id = atoi(argv[3]);
 
   /* slave name */
   slavename = argv[2];
   id = atoi(argv[3]);

-  sprintf(id_alias, "%d",id);
+  sprintf(id_alias, "flow_%d", id);

   slavenames[id] = slavename;
   slavenames[id] = slavename;

+  TRACE_category(id_alias);

 
   masternames[id] = MSG_host_get_name(MSG_host_self());
 
   masternames[id] = MSG_host_get_name(MSG_host_self());

-  
-  { /*  Task creation.  */
+
+  {                             /*  Task creation.  */

     char sprintf_buffer[64] = "Task_0";
     todo = MSG_task_create(sprintf_buffer, 0, task_comm_size, NULL);
     char sprintf_buffer[64] = "Task_0";
     todo = MSG_task_create(sprintf_buffer, 0, task_comm_size, NULL);

+    MSG_task_set_category(todo, id_alias);

     //keep track of running tasks
     gl_task_array[id] = todo;
     //keep track of running tasks
     gl_task_array[id] = todo;

-    gl_data_size[id]=task_comm_size;
+    gl_data_size[id] = task_comm_size;

   }
 
   }
 

-  { /* Process organisation */
-    slave = MSG_get_host_by_name(slavename);
-  }
+  count_finished++;

 
   /* time measurement */
 
   /* time measurement */

+  sprintf(id_alias, "%d", id);

   start_time = MSG_get_clock();
   start_time = MSG_get_clock();

-  //MSG_task_put(todo, slave, PORT_22);
-  INFO1("Sending to %s", id_alias);
-  MSG_task_send(todo, id_alias);  
-
+  MSG_task_send(todo, id_alias);

   end_time = MSG_get_clock();
   end_time = MSG_get_clock();

-  INFO3("Send completed (to %s). Transfer time: %f\t Agregate bandwidth: %f",
-       slave->name, (end_time - start_time), task_comm_size/(end_time-start_time));
-  INFO2("Completed peer: %s time: %f", slave->name, (end_time-start_time));
+

 
   return 0;
 
   return 0;

-} /* end_of_master */
+}                               /* end_of_master */

 
 /** Receiver function  */
 int slave(int argc, char *argv[])
 {
 
 
 /** Receiver function  */
 int slave(int argc, char *argv[])
 {
 

-  m_task_t task = NULL;
+  msg_task_t task = NULL;

   int a;
   int a;

-  int id=0;
-  double remaining=0;
+  int id = 0;
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+  int limited_latency = 0;
+#endif
+  double remaining = 0;

   char id_alias[10];
 
   char id_alias[10];
 

-  if(argc != 2){
-    INFO1("Strange number of arguments expected 1 got %d", argc-1 );
-  }
+  xbt_assert(argc == 2, "Strange number of arguments expected 1 got %d",
+             argc - 1);

 
   id = atoi(argv[1]);
 
   id = atoi(argv[1]);

-  sprintf(id_alias, "%d",id);
+  sprintf(id_alias, "%d", id);
+  int trace_id = id;

 
 

+  a = MSG_task_receive(&(task), id_alias);

 
 

-  //a = MSG_task_get(&(task), PORT_22);
-  INFO1("Receiving on %s", id_alias);
-  a = MSG_task_receive(&(task), id_alias );
-  
-
-  if (a != MSG_OK) {
-    INFO0("Hey?! What's up?");
-    xbt_assert0(0,"Unexpected behavior.");
+  count_finished--;
+  if(count_finished == 0){
+      timer_start = 0;

   }
   }

-  
+
+ xbt_assert(a == MSG_OK,"Hey?! What's up? Unexpected behavior");
+

   elapsed_time = MSG_get_clock() - start_time;
 
   elapsed_time = MSG_get_clock() - start_time;
 

-  if(!bool_printed){
-    bool_printed=1;
-    for(id=0; id<NTASKS; id++){
-      if(gl_task_array[id] == NULL){
-      }else if(gl_task_array[id] == task){
-       INFO5("===> Estimated Bw of FLOW[%d] : %f ;  message from %s to %s  with remaining : %f", id,  gl_data_size[id]/elapsed_time, masternames[id], slavenames[id],  0.0);
-      }else{
-       remaining = MSG_task_get_remaining_communication(gl_task_array[id]);
-       INFO5("===> Estimated Bw of FLOW[%d] : %f ;  message from %s to %s  with remaining : %f", id,  (gl_data_size[id]-remaining)/elapsed_time, masternames[id], slavenames[id],  remaining);
+  if (!bool_printed) {
+    bool_printed = 1;
+
+    for (id = 0; id < NTASKS; id++) {
+      if (gl_task_array[id] == NULL) continue;
+      if (gl_task_array[id] == task) {
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+        limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]);
+        if (limited_latency) {
+          XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id);
+        }
+#endif
+        XBT_INFO
+            ("===> Estimated Bw of FLOW[%d] : %f ;  message from %s to %s  with remaining : %f",
+             id, gl_data_size[id] / elapsed_time, masternames[id],
+             slavenames[id], 0.0);
+        MSG_task_destroy(gl_task_array[id]);
+        gl_task_array[id]=NULL;
+      } else {
+        remaining =
+            MSG_task_get_remaining_communication(gl_task_array[id]);
+#ifdef HAVE_LATENCY_BOUND_TRACKING
+        limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]);
+
+        if (limited_latency) {
+          XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id);
+        }
+#endif
+        XBT_INFO
+            ("===> Estimated Bw of FLOW[%d] : %f ;  message from %s to %s  with remaining : %f",
+             id, (gl_data_size[id] - remaining) / elapsed_time,
+             masternames[id], slavenames[id], remaining);
+        if(remaining==0) {
+          MSG_task_destroy(gl_task_array[id]);
+          gl_task_array[id]=NULL;
+        }

       }
     }
       }
     }

-    exit(0);
+    bool_printed = 2;

   }
   }

+  char mark[100];
+  snprintf(mark, 100, "flow_%d_finished", trace_id);
+  TRACE_mark("endmark", mark);

 
 

-  for(id=0; id<NTASKS; id++){
-    if(gl_task_array[id] == task){
-      MSG_task_destroy(task);
-      gl_task_array[id] = NULL;
-      return 0;
-    }
-  }
+  if(bool_printed==2 && gl_task_array[trace_id]) MSG_task_destroy(gl_task_array[trace_id]);

 
   return 0;
 
   return 0;

-} /* end_of_slave */
+}                               /* end_of_slave */

 
 /** Test function */
 
 /** Test function */

-MSG_error_t test_all(const char *platform_file,
-                    const char *application_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", "GTNETS"); */
-  /* MSG_config("workstation_model","KCCFLN05"); */
-  {                            /*  Simulation setting */
-    MSG_set_channel_number(MAX_CHANNEL);
-    //MSG_paje_output("msg_test.trace");
+  {                             /*  Simulation setting */

     MSG_create_environment(platform_file);
   }
     MSG_create_environment(platform_file);
   }

-  {                   /*   Application deployment */
+
+  TRACE_declare_mark("endmark");
+
+  {                             /*   Application deployment */

     MSG_function_register("master", master);
     MSG_function_register("slave", slave);
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);

+

     MSG_launch_application(application_file);
   }
   res = MSG_main();
   return res;
     MSG_launch_application(application_file);
   }
   res = MSG_main();
   return res;

-} /* end_of_test_all */
+}                               /* end_of_test_all */

 
 /** Main function */
 int main(int argc, char *argv[])
 {
 
 /** Main function */
 int main(int argc, char *argv[])
 {

-  MSG_error_t res = MSG_OK;
+  msg_error_t res = MSG_OK;

   bool_printed = 0;
 
   bool_printed = 0;
 

-  MSG_global_init(&argc,argv);
-  if (argc < 3) {
-     printf ("Usage: %s platform_file deployment_file\n",argv[0]);
-     exit(1);
-  }
-  res = test_all(argv[1],argv[2]);
-
-  MSG_clean();
+  MSG_init(&argc, argv);
+  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+                 "\tExample: %s platform.xml deployment.xml\n", 
+                 argv[0], argv[0]);
+   
+  res = test_all(argv[1], argv[2]);

 
 

-  if(res==MSG_OK) return 0; 
-  else return 1;
-} /* end_of_main */
+  return res != MSG_OK;
+}
+