get rid of some useless deployment files

[simgrid.git] / teshsuite / msg / host_on_off / host_on_off_recv.c

diff --git a/teshsuite/msg/host_on_off/host_on_off_recv.c b/teshsuite/msg/host_on_off/host_on_off_recv.c
index 937396b..92e4ec0 100644 (file)
--- a/teshsuite/msg/host_on_off/host_on_off_recv.c
+++ b/teshsuite/msg/host_on_off/host_on_off_recv.c
@@ -4,24 +4,13 @@
 /* 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 "simgrid/msg.h"            /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
-#include "xbt/sysdep.h"         /* calloc, printf */
-#include "xbt/ex.h"
 
-/* Create a log channel to have nice outputs. */
-#include "xbt/log.h"
-#include "xbt/asserts.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
-                             "Messages specific for this msg example");
-
-int master(int argc, char *argv[]);
-int slave(int argc, char *argv[]);
+XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test, "Messages specific for this msg example");
 
 static const char* mailbox = "comm";
 
-/** Emitter function  */
-int master(int argc, char *argv[])
+static int master(int argc, char *argv[])
 {
   xbt_ex_t e;
   TRY {
@@ -54,8 +43,7 @@ int master(int argc, char *argv[])
   return 0;
 }
 
-/** Receiver function  */
-int slave(int argc, char *argv[])
+static int slave(int argc, char *argv[])
 {
   xbt_ex_t e;
   TRY {
@@ -77,31 +65,21 @@ int slave(int argc, char *argv[])
   return 0;
 }
 
-/** Main function */
 int main(int argc, char *argv[])
 {
   msg_error_t res;
-  const char *platform_file;
-  const char *application_file;
 
   MSG_init(&argc, argv);
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
-       "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
+  xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
-  platform_file = argv[1];
-  application_file = argv[2];
+  MSG_create_environment(argv[1]);
 
-  /*  Simulation setting */
-  MSG_create_environment(platform_file);
-  
-  /*   Application deployment */
-  MSG_function_register("master", master);
-  MSG_function_register("slave", slave);
-  MSG_launch_application(application_file);
+  MSG_process_create("master", master, NULL, MSG_get_host_by_name("Tremblay"));
+  MSG_process_create("slave", slave, NULL, MSG_get_host_by_name("Jupiter"));
 
   res = MSG_main();
 
   XBT_INFO("Simulation time %g", MSG_get_clock());
 
   return res != MSG_OK;
-}                               /* end_of_main */
+}