X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0e9c0448c6566825b170b98ecff716b098bda10e..a2f610814708b3f2d6fcde566a37a845c94b1d97:/examples/msg/gtnets/gtnets.c

diff --git a/examples/msg/gtnets/gtnets.c b/examples/msg/gtnets/gtnets.c
index 488f40b4d0..839d4a79bc 100644
--- a/examples/msg/gtnets/gtnets.c
+++ b/examples/msg/gtnets/gtnets.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2012. The SimGrid Team.
+/* Copyright (c) 2007-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "msg/msg.h"
+#include "simgrid/msg.h"
 #include "xbt/log.h"
 #include "xbt/asserts.h"
 
@@ -20,7 +20,6 @@ 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);
 
@@ -37,8 +36,6 @@ 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 */
-
 /** master */
 int master(int argc, char *argv[])
 {
@@ -49,9 +46,8 @@ int master(int argc, char *argv[])
   //unique id to control statistics
   int id = -1;
 
-  if (argc != 4) {
-    XBT_INFO("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 */
   int read;
@@ -88,31 +84,6 @@ 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[])
 {
@@ -126,9 +97,8 @@ int slave(int argc, char *argv[])
   double remaining = 0;
   char id_alias[10];
 
-  if (argc != 2) {
-    XBT_INFO("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]);
   sprintf(id_alias, "%d", id);
@@ -141,19 +111,13 @@ int slave(int argc, char *argv[])
       timer_start = 0;
   }
 
-
-
-  if (a != MSG_OK) {
-    XBT_INFO("Hey?! What's up?");
-    xbt_die("Unexpected behavior.");
-  }
+ xbt_assert(a == MSG_OK,"Hey?! What's up? 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) continue;
       if (gl_task_array[id] == task) {
@@ -206,8 +170,6 @@ msg_error_t test_all(const char *platform_file,
 {
   msg_error_t res = MSG_OK;
 
-  /* MSG_config("workstation/model", "GTNETS"); */
-  /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
     MSG_create_environment(platform_file);
   }
@@ -217,7 +179,6 @@ msg_error_t test_all(const char *platform_file,
   {                             /*   Application deployment */
     MSG_function_register("master", master);
     MSG_function_register("slave", slave);
-    MSG_function_register("timer", timer);
 
     MSG_launch_application(application_file);
   }
@@ -232,15 +193,12 @@ int main(int argc, char *argv[])
   bool_printed = 0;
 
   MSG_init(&argc, argv);
-  if (argc < 3) {
-    printf("Usage: %s platform_file deployment_file\n", argv[0]);
-    exit(1);
-  }
-
+  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;
+}
+