never ending cleanup of the simdag world

  + This test was for foreach, sets and other deprecated tags
  + the XML file used in tesh doesn't even exist anymore

diff --git a/examples/simdag/metaxml/CMakeLists.txt b/examples/simdag/metaxml/CMakeLists.txt
deleted file mode 100644 (file)
index 2175b08..0000000
--- a/examples/simdag/metaxml/CMakeLists.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
-add_executable(sd_meta sd_meta.c)
-
-### Add definitions for compile
-if(NOT WIN32)
-  target_link_libraries(sd_meta simgrid pthread )
-else()
-  target_link_libraries(sd_meta simgrid)
-endif()
-
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/metaxml_test.tesh
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/sd_meta.c
-  PARENT_SCOPE)

diff --git a/examples/simdag/metaxml/metaxml_test.tesh b/examples/simdag/metaxml/metaxml_test.tesh
deleted file mode 100644 (file)
index 84b58d9..0000000
--- a/examples/simdag/metaxml/metaxml_test.tesh
+++ /dev/null
@@ -1,131 +0,0 @@
-#! ./tesh
-
-p Simple test of simdag with metaxml tags
-
-$ $SG_TEST_EXENV metaxml/sd_meta ${srcdir:=.}/../platforms/metaxml.xml
-> [0.000000] [sd_test/INFO] Route between lille_2_host and lille_2_host:
-> [0.000000] [sd_test/INFO]    Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_2_host and nancy_2_host:
-> [0.000000] [sd_test/INFO]    Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_2_host and lille_0_host:
-> [0.000000] [sd_test/INFO]    Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_2_host and nancy_0_host:
-> [0.000000] [sd_test/INFO]    Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_2_host and lille_1_host:
-> [0.000000] [sd_test/INFO]    Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_2_host and nancy_1_host:
-> [0.000000] [sd_test/INFO]    Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_2_host and lille_2_host:
-> [0.000000] [sd_test/INFO]    Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_2_host and nancy_2_host:
-> [0.000000] [sd_test/INFO]    Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_2_host and lille_0_host:
-> [0.000000] [sd_test/INFO]    Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_2_host and nancy_0_host:
-> [0.000000] [sd_test/INFO]    Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_2_host and lille_1_host:
-> [0.000000] [sd_test/INFO]    Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_2_host and nancy_1_host:
-> [0.000000] [sd_test/INFO]    Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and lille_2_host:
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and nancy_2_host:
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and lille_0_host:
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and nancy_0_host:
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and lille_1_host:
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_0_host and nancy_1_host:
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_0_host and lille_2_host:
-> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_0_host and nancy_2_host:
-> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_0_host and lille_0_host:
-> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_0_host and nancy_0_host:
-> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_0_host and lille_1_host:
-> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_0_host and nancy_1_host:
-> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_1_host and lille_2_host:
-> [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_1_host and nancy_2_host:
-> [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link nancy_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_1_host and lille_0_host:
-> [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_1_host and nancy_0_host:
-> [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link nancy_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_1_host and lille_1_host:
-> [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Lille_bb: latency = 0.000050, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between lille_1_host and nancy_1_host:
-> [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_1_host and lille_2_host:
-> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link lille_2_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_1_host and nancy_2_host:
-> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_1_host and lille_0_host:
-> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link lille_0_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_1_host and nancy_0_host:
-> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_1_host and lille_1_host:
-> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link INTER-bb: latency = 0.000100, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link lille_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO] Route between nancy_1_host and nancy_1_host:
-> [0.000000] [sd_test/INFO]    Link nancy_1_host: latency = 0.000050, bandwidth = 125000000.000000
-> [0.000000] [sd_test/INFO]    Link Nancy_bb: latency = 0.001000, bandwidth = 50000000.000000

diff --git a/examples/simdag/metaxml/sd_meta.c b/examples/simdag/metaxml/sd_meta.c
deleted file mode 100644 (file)
index 2b3da2a..0000000
--- a/examples/simdag/metaxml/sd_meta.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright (c) 2007-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. */
-
-/* See examples/platforms/metaxml.xml and examples/platforms/metaxml_platform.xml 
-   for examples on how to use the cluster, foreach, set, route:multi, trace and trace:connect tags
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "simgrid/simdag.h"
-#include "xbt/ex.h"
-#include "xbt/log.h"
-#include "xbt/dynar.h"
-#include "xbt/dict.h"
-
-XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test,
-                             "Logging specific to this SimDag example");
-
-int main(int argc, char **argv)
-{
-
-  const char *platform_file;
-  const sg_host_t *workstations;
-  int ws_nr;
-  sg_host_t w1 = NULL;
-  sg_host_t w2 = NULL;
-  const char *name1, *name2;
-  int i, j, k;
-
-  /* SD initialization */
-  SD_init(&argc, argv);
-
-  /*  xbt_log_control_set("sd.thres=debug"); */
-
-  if (argc < 2) {
-    XBT_INFO("Usage: %s platform_file", argv[0]);
-    XBT_INFO("example: %s sd_platform.xml", argv[0]);
-    exit(1);
-  }
-
-  /* creation of the environment */
-  platform_file = argv[1];
-  SD_create_environment(platform_file);
-
-  /* test the estimation functions */
-  workstations = sg_host_list();
-  ws_nr = sg_host_count();
-
-
-  /* Show routes between all workstation */
-
-  for (i = 0; i < ws_nr; i++) {
-    for (j = 0; j < ws_nr; j++) {
-      const SD_link_t *route;
-      int route_size;
-      w1 = workstations[i];
-      w2 = workstations[j];
-      name1 = sg_host_get_name(w1);
-      name2 = sg_host_get_name(w2);
-      XBT_INFO("Route between %s and %s:", name1, name2);
-      route = SD_route_get_list(w1, w2);
-      route_size = SD_route_get_size(w1, w2);
-      for (k = 0; k < route_size; k++) {
-        XBT_INFO("\tLink %s: latency = %f, bandwidth = %f",
-              sg_link_name(route[k]),
-              sg_link_latency(route[k]),
-              sg_link_bandwidth(route[k]));
-      }
-    }
-  }
-
-  SD_exit();
-  return 0;
-}

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index bad8e31..e73d90a 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -1022,7 +1022,6 @@ set(EXAMPLES_CMAKEFILES_TXT
   examples/simdag/dot/CMakeLists.txt
   examples/simdag/goal/CMakeLists.txt
   examples/simdag/io/CMakeLists.txt
   examples/simdag/dot/CMakeLists.txt
   examples/simdag/goal/CMakeLists.txt
   examples/simdag/io/CMakeLists.txt

-  examples/simdag/metaxml/CMakeLists.txt

   examples/simdag/properties/CMakeLists.txt
   examples/simdag/scheduling/CMakeLists.txt
   examples/smpi/CMakeLists.txt
   examples/simdag/properties/CMakeLists.txt
   examples/simdag/scheduling/CMakeLists.txt
   examples/smpi/CMakeLists.txt

diff --git a/tools/cmake/MakeExe.cmake b/tools/cmake/MakeExe.cmake
index 64d14d5..43efa54 100644 (file)
--- a/tools/cmake/MakeExe.cmake
+++ b/tools/cmake/MakeExe.cmake
@@ -64,7 +64,6 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dax)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dot)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/goal)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/io)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/dot)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/goal)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/io)

-add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/metaxml)

 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/properties)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling)