model-checker : add comments for the example bugged2_liveness

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

diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index da319d8..93ce019 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 */
 
@@ -47,12 +51,13 @@ int master(int argc, char *argv[])
   int id = -1;
 
   if (argc != 4) {
-    INFO1("Strange number of arguments expected 3 got %d", argc - 1);
+    XBT_INFO("Strange number of arguments expected 3 got %d", argc - 1);
   }
 
   /* 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();
@@ -83,17 +90,34 @@ int master(int argc, char *argv[])
   end_time = MSG_get_clock();
 
 
-  if (!bool_printed) {
-    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;
 }                               /* 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[])
 {
@@ -108,7 +132,7 @@ int slave(int argc, char *argv[])
   char id_alias[10];
 
   if (argc != 2) {
-    INFO1("Strange number of arguments expected 1 got %d", argc - 1);
+    XBT_INFO("Strange number of arguments expected 1 got %d", argc - 1);
   }
 
   id = atoi(argv[1]);
@@ -117,25 +141,34 @@ 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) {
-    INFO0("Hey?! What's up?");
-    xbt_assert0(0, "Unexpected behavior.");
+    XBT_INFO("Hey?! What's up?");
+    xbt_die("Unexpected behavior.");
   }
 
   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) {
 #ifdef HAVE_LATENCY_BOUND_TRACKING
         limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]);
         if (limited_latency) {
-          INFO1("WARNING FLOW[%d] is limited by latency!!", id);
+          XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id);
         }
 #endif
-        INFO5
+        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);
@@ -146,10 +179,10 @@ int slave(int argc, char *argv[])
         limited_latency = MSG_task_is_latency_bounded(gl_task_array[id]);
 
         if (limited_latency) {
-          INFO1("WARNING FLOW[%d] is limited by latency!!", id);
+          XBT_INFO("WARNING FLOW[%d] is limited by latency!!", id);
         }
 #endif
-        INFO5
+        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);
@@ -162,6 +195,7 @@ int slave(int argc, char *argv[])
   TRACE_mark("endmark", mark);
 
   MSG_task_destroy(task);
+
   return 0;
 }                               /* end_of_slave */
 
@@ -177,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();
@@ -198,8 +237,6 @@ int main(int argc, char *argv[])
     exit(1);
   }
 
-  TRACE_declare_mark("endmark");
-
   res = test_all(argv[1], argv[2]);
 
   MSG_clean();