Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
kill a seriously braindead example
authorMartin Quinson <martin.quinson@loria.fr>
Sat, 20 Feb 2016 22:52:08 +0000 (23:52 +0100)
committerMartin Quinson <martin.quinson@loria.fr>
Sat, 20 Feb 2016 22:52:08 +0000 (23:52 +0100)
examples/msg/masterslave/CMakeLists.txt
examples/msg/masterslave/masterslave_cluster.c [deleted file]

index 9291a4f..8e54c3e 100644 (file)
@@ -3,7 +3,6 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 add_executable(masterslave_failure "masterslave_failure.c")
 add_executable(masterslave_forwarder "masterslave_forwarder.c")
 add_executable(masterslave_mailbox "masterslave_mailbox.c")
 add_executable(masterslave_failure "masterslave_failure.c")
 add_executable(masterslave_forwarder "masterslave_forwarder.c")
 add_executable(masterslave_mailbox "masterslave_mailbox.c")
-add_executable(masterslave_cluster "masterslave_cluster.c")
 add_executable(masterslave_kill "masterslave_kill.c")
 add_executable(masterslave_arg "masterslave_arg.c")
 
 add_executable(masterslave_kill "masterslave_kill.c")
 add_executable(masterslave_arg "masterslave_arg.c")
 
@@ -12,7 +11,6 @@ target_link_libraries(masterslave_failure simgrid )
 target_link_libraries(masterslave_mailbox simgrid )
 target_link_libraries(masterslave_kill simgrid )
 target_link_libraries(masterslave_arg simgrid )
 target_link_libraries(masterslave_mailbox simgrid )
 target_link_libraries(masterslave_kill simgrid )
 target_link_libraries(masterslave_arg simgrid )
-target_link_libraries(masterslave_cluster simgrid)
 
 set(tesh_files
   ${tesh_files}
 
 set(tesh_files
   ${tesh_files}
@@ -43,7 +41,6 @@ set(xml_files
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_arg.c
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_arg.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_cluster.c
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_failure.c
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_forwarder.c
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_kill.c
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_failure.c
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_forwarder.c
   ${CMAKE_CURRENT_SOURCE_DIR}/masterslave_kill.c
diff --git a/examples/msg/masterslave/masterslave_cluster.c b/examples/msg/masterslave/masterslave_cluster.c
deleted file mode 100644 (file)
index 8415bdb..0000000
+++ /dev/null
@@ -1,225 +0,0 @@
-/* Copyright (c) 2010-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 "simgrid/msg.h"        /* Yeah! If you want to use msg, you need to include simgrid/msg.h */
-#include "surf/surfxml_parse.h" /* to override surf_parse and bypass the parser */
-
-/* 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");
-
-#define FINALIZE ((void*)221297)        /* a magic number to tell people to stop working */
-
-msg_error_t test_all(const char *platform_file);
-
-
-int master(int argc, char *argv[]);
-int slave(int argc, char *argv[]);
-
-/** Emitter function  */
-int master(int argc, char *argv[])
-{
-  int slaves_count = 0;
-  msg_host_t *slaves = NULL;
-  msg_task_t *todo = NULL;
-  int number_of_tasks = 0;
-  double task_comp_size = 0;
-  double task_comm_size = 0;
-  int i;
-  XBT_ATTRIB_UNUSED int read;
-
-  read = sscanf(argv[1], "%d", &number_of_tasks);
-  xbt_assert(read, "Invalid argument %s\n", argv[1]);
-  read = sscanf(argv[2], "%lg", &task_comp_size);
-  xbt_assert(read, "Invalid argument %s\n", argv[2]);
-  read = sscanf(argv[3], "%lg", &task_comm_size);
-  xbt_assert(read, "Invalid argument %s\n", argv[3]);
-
-  {                             /*  Task creation */
-    char sprintf_buffer[64];
-
-    todo = xbt_new0(msg_task_t, number_of_tasks);
-
-    for (i = 0; i < number_of_tasks; i++) {
-      sprintf(sprintf_buffer, "Task_%d", i);
-      todo[i] =
-          MSG_task_create(sprintf_buffer, task_comp_size, task_comm_size,
-                          NULL);
-    }
-  }
-
-  {                             /* Process organization */
-    slaves_count = argc - 4;
-    slaves = xbt_new0(msg_host_t, slaves_count);
-
-    for (i = 4; i < argc; i++) {
-      slaves[i - 4] = MSG_host_by_name(argv[i]);
-      if (slaves[i - 4] == NULL) {
-        XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
-        abort();
-      }
-    }
-  }
-
-  XBT_INFO("Got %d slave(s) :", slaves_count);
-  for (i = 0; i < slaves_count; i++)
-    XBT_INFO("\t %s", MSG_host_get_name(slaves[i]));
-
-  XBT_INFO("Got %d task to process :", number_of_tasks);
-
-  for (i = 0; i < number_of_tasks; i++)
-    XBT_INFO("\t\"%s\"", todo[i]->name);
-
-  for (i = 0; i < number_of_tasks; i++) {
-    XBT_INFO("Sending \"%s\" to \"%s\"",
-          todo[i]->name, MSG_host_get_name(slaves[i % slaves_count]));
-    if (MSG_host_self() == slaves[i % slaves_count]) {
-      XBT_INFO("Hey ! It's me ! :)");
-    }
-    MSG_task_send(todo[i], MSG_host_get_name(slaves[i % slaves_count]));
-    XBT_INFO("Send completed");
-  }
-
-  XBT_INFO
-      ("All tasks have been dispatched. Let's tell everybody the computation is over.");
-  for (i = 0; i < slaves_count; i++)
-    MSG_task_send(MSG_task_create("finalize", 0, 0, FINALIZE),
-        MSG_host_get_name(slaves[i]));
-
-  XBT_INFO("Goodbye now!");
-  free(slaves);
-  free(todo);
-  return 0;
-}                               /* end_of_master */
-
-/** Receiver function  */
-int slave(int argc, char *argv[])
-{
-  XBT_INFO("I'm a slave");
-  while (1) {
-    msg_task_t task = NULL;
-    int a;
-    a = MSG_task_receive(&(task), MSG_host_get_name(MSG_host_self()));
-    if (a == MSG_OK) {
-      XBT_INFO("Received \"%s\" ", MSG_task_get_name(task));
-      if (MSG_task_get_data(task) == FINALIZE) {
-        MSG_task_destroy(task);
-        break;
-      }
-      XBT_INFO("Processing \"%s\" ", MSG_task_get_name(task));
-      MSG_task_execute(task);
-      XBT_INFO("\"%s\" done ", MSG_task_get_name(task));
-      MSG_task_destroy(task);
-    } else {
-      XBT_INFO("Hey ?! What's up ? ");
-      xbt_die("Unexpected behavior");
-            }
-  }
-  XBT_INFO("I'm done. See you!");
-  return 0;
-}                               /* end_of_slave */
-
-
-/** Bypass deployment **/
-static int bypass_deployment(void)
-{
-  int nb_host,i;
-  static int AX_ptr;
-  static int surfxml_bufferstack_size = 2048;
-  static int surfxml_buffer_stack_stack_ptr = 0;
-  static int surfxml_buffer_stack_stack[1024];
-  xbt_dynar_t hosts = MSG_hosts_as_dynar();
-  /* allocating memory to the buffer, I think 2MB should be enough */
-  surfxml_bufferstack = xbt_new0(char, surfxml_bufferstack_size);
-
-  nb_host = xbt_dynar_length(hosts);
-  xbt_dynar_free(&hosts);
-
-  /* <platform> */
-  SURFXML_BUFFER_SET(platform_version, "3");
-  SURFXML_START_TAG(platform);
-  XBT_DEBUG("<platform version=\"3\">");
-
-    XBT_DEBUG("  <process host=\"c-0.me\" function=\"master\">");
-    SURFXML_BUFFER_SET(process_host, "c-0.me");
-    SURFXML_BUFFER_SET(process_function, "master");
-    SURFXML_BUFFER_SET(process_start___time, "-1.0");
-    SURFXML_BUFFER_SET(process_kill___time, "-1.0");
-    SURFXML_START_TAG(process);
-
-    XBT_DEBUG("    <argument value=\"%s\"/>",bprintf("%d",nb_host-1));
-    SURFXML_BUFFER_SET(argument_value, bprintf("%d",nb_host-1));
-    SURFXML_START_TAG(argument);
-    SURFXML_END_TAG(argument);
-
-    XBT_DEBUG("    <argument value=\"5000000\"/>");
-    SURFXML_BUFFER_SET(argument_value, "5000000");
-    SURFXML_START_TAG(argument);
-    SURFXML_END_TAG(argument);
-
-    XBT_DEBUG("    <argument value=\"100000\"/>");
-    SURFXML_BUFFER_SET(argument_value, "100000");
-    SURFXML_START_TAG(argument);
-    SURFXML_END_TAG(argument);
-
-  for(i=1 ; i<nb_host ; i++)
-  {
-    XBT_DEBUG("    <argument value=\"%s.me\"/>",bprintf("c-%d",i));
-    SURFXML_BUFFER_SET(argument_value, bprintf("c-%d.me",i));
-    SURFXML_START_TAG(argument);
-    SURFXML_END_TAG(argument);
-  }
-  XBT_DEBUG("  </process>");
-  SURFXML_END_TAG(process);
-
-  for(i=1 ; i<nb_host ; i++)
-  {
-    XBT_DEBUG("  <process host=\"%s.me\" function=\"slave\"/>",bprintf("c-%d",i));
-    SURFXML_BUFFER_SET(process_host, bprintf("c-%d.me",i));
-    SURFXML_BUFFER_SET(process_function, "slave");
-    SURFXML_BUFFER_SET(process_start___time, "-1.0");
-    SURFXML_BUFFER_SET(process_kill___time, "-1.0");
-    SURFXML_START_TAG(process);
-    SURFXML_END_TAG(process);
-  }
-
-  XBT_DEBUG("</platform>");
-  SURFXML_END_TAG(platform);
-
-  free(surfxml_bufferstack);
-  return 0;
-}
-
-/** Test function */
-msg_error_t test_all(const char *platform_file)
-{
-  msg_error_t res = MSG_OK;
-  MSG_create_environment(platform_file);
-  MSG_function_register("master", master);
-  MSG_function_register("slave", slave);
-  surf_parse = bypass_deployment;
-  MSG_launch_application(NULL);
-
-  res = MSG_main();
-
-  XBT_INFO("Simulation time %g", MSG_get_clock());
-  return res;
-}                               /* end_of_test_all */
-
-
-/** Main function */
-int main(int argc, char *argv[])
-{
-  msg_error_t res = MSG_OK;
-
-  MSG_init(&argc, argv);
-  res = test_all(argv[1]);
-
-  return res != MSG_OK;
-}