X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d749060f107933bf2a39cdfee01b9b1885fc6b0b..b5b953be4c43bad172a39f8917200ed84b534ec5:/examples/msg/chainsend/chainsend.c

diff --git a/examples/msg/chainsend/chainsend.c b/examples/msg/chainsend/chainsend.c
index 80ea6fe9ee..e7316ac581 100644
--- a/examples/msg/chainsend/chainsend.c
+++ b/examples/msg/chainsend/chainsend.c
@@ -1,20 +1,10 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
- * Copyright (c) 2012. Maximiliano Geier.
+/* Copyright (c) 2007-2010, 2012-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 "msg/msg.h"            /* Yeah! If you want to use msg, you need to include msg/msg.h */
-#include "xbt/sysdep.h"         /* calloc */
-
-/* Create a log channel to have nice outputs. */
-#include "xbt/log.h"
-#include "xbt/asserts.h"
-
+#include "simgrid/msg.h"
 #include "iterator.h"
 #include "messages.h"
 #include "broadcaster.h"
@@ -22,35 +12,18 @@
 
 /** @addtogroup MSG_examples
  * 
- *  - <b>chainsend/chainsend.c: Chainsend implementation</b>.
- */
-
-
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_chainsend,
-                             "Messages specific for chainsend");
-
-/*
- Data structures
+ *  - <b>chainsend: MSG implementation of a file broadcasting system, similar to Kastafior (from Kadeploy).</b>.
  */
 
-/* Initialization stuff */
-msg_error_t test_all(const char *platform_file,
-                     const char *application_file);
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_chainsend, "Messages specific for chainsend");
 
-
-/** Test function */
-msg_error_t test_all(const char *platform_file,
-                     const char *application_file)
+int main(int argc, char *argv[])
 {
-
   msg_error_t res = MSG_OK;
 
+  MSG_init(&argc, argv);
 
-
-  XBT_INFO("test_all");
-
-  /*  Simulation setting */
-  MSG_create_environment(platform_file);
+  MSG_create_environment(argv[1]);
 
   /* Trace categories */
   TRACE_category_with_color("host0", "0 0 1");
@@ -67,54 +40,11 @@ msg_error_t test_all(const char *platform_file,
   MSG_function_register("broadcaster", broadcaster);
   MSG_function_register("peer", peer);
 
-  MSG_launch_application(application_file);
+  MSG_launch_application(argv[2]);
 
   res = MSG_main();
 
-  return res;
-}                               /* end_of_test_all */
-
-
-/** Main function */
-int main(int argc, char *argv[])
-{
-  msg_error_t res = MSG_OK;
-
-#ifdef _MSC_VER
-  unsigned int prev_exponent_format =
-      _set_output_format(_TWO_DIGIT_EXPONENT);
-#endif
-
-  MSG_init(&argc, argv);
-
-  /*if (argc <= 3) {
-    XBT_CRITICAL("Usage: %s platform_file deployment_file <model>\n",
-              argv[0]);
-    XBT_CRITICAL
-        ("example: %s msg_platform.xml msg_deployment.xml KCCFLN05_Vegas\n",
-         argv[0]);
-    exit(1);
-  }*/
-
-  /* Options for the workstation/model:
-
-     KCCFLN05              => for maxmin
-     KCCFLN05_proportional => for proportional (Vegas)
-     KCCFLN05_Vegas        => for TCP Vegas
-     KCCFLN05_Reno         => for TCP Reno
-   */
-  //MSG_config("workstation/model", argv[3]);
-
-  res = test_all(argv[1], argv[2]);
-
-  XBT_INFO("Total simulation time: %le", MSG_get_clock());
-
-#ifdef _MSC_VER
-  _set_output_format(prev_exponent_format);
-#endif
+  XBT_INFO("Total simulation time: %e", MSG_get_clock());
 
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-}                               /* end_of_main */
+  return res != MSG_OK;
+}