Remove testsuite/simdag.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8779 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 21427d3..7429f0b 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -287,10 +287,6 @@ add_test(test-surf-usage   ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage  --cf
 add_test(test-surf_usage2      ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage2  --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)
 add_test(test-surf-trace       ${CMAKE_HOME_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/)
 
-add_test(test-simdag-1 ${CMAKE_HOME_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml)
-add_test(test-simdag-2 ${CMAKE_HOME_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml)
-add_test(test-simdag-3 ${CMAKE_HOME_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml)
-
 add_test(testall               ${CMAKE_HOME_DIRECTORY}/src/testall)
 
 include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake)

diff --git a/buildtools/Cmake/AddTestsWin.cmake b/buildtools/Cmake/AddTestsWin.cmake
index 971e3c5..28b3f52 100644 (file)
--- a/buildtools/Cmake/AddTestsWin.cmake
+++ b/buildtools/Cmake/AddTestsWin.cmake
@@ -145,10 +145,6 @@ add_test(test-surf-usage   ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage  --cf
 add_test(test-surf_usage2      ${CMAKE_HOME_DIRECTORY}/testsuite/surf/surf_usage2  --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/ platform.xml)\r
 add_test(test-surf-trace       ${CMAKE_HOME_DIRECTORY}/testsuite/surf/trace_usage --cfg=path:${PROJECT_DIRECTORY}/testsuite/surf/)\r
 \r
-add_test(test-simdag-1 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag small_platform_variable.xml)\r
-add_test(test-simdag-2 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml)\r
-add_test(test-simdag-3 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml)\r
-\r
 add_test(testall               ${PROJECT_DIRECTORY}/src/testall)\r
 \r
 \r

diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 0445d4c..e0b96c8 100644 (file)
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -167,7 +167,6 @@ add_subdirectory(${PROJECT_DIRECTORY}/tools/tesh)
 
 add_subdirectory(${PROJECT_DIRECTORY}/testsuite/xbt)
 add_subdirectory(${PROJECT_DIRECTORY}/testsuite/surf)
-add_subdirectory(${PROJECT_DIRECTORY}/testsuite/simdag)
 add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/xbt)
 add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/datadesc)
 add_subdirectory(${PROJECT_DIRECTORY}/teshsuite/gras/msg_handle)

diff --git a/testsuite/simdag/.gitignore b/testsuite/simdag/.gitignore
deleted file mode 100644 (file)
index 936c241..0000000
--- a/testsuite/simdag/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-sd_test

diff --git a/testsuite/simdag/CMakeLists.txt b/testsuite/simdag/CMakeLists.txt
deleted file mode 100644 (file)
index 6b303b8..0000000
--- a/testsuite/simdag/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-cmake_minimum_required(VERSION 2.6)
-
-set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
-
-add_executable(sd_test sd_test.c)
-
-### Add definitions for compile
-if(NOT WIN32)
-target_link_libraries(sd_test simgrid m ) 
-else(NOT WIN32)
-target_link_libraries(sd_test simgrid ) 
-endif(NOT WIN32)

diff --git a/testsuite/simdag/availability_tremblay.txt b/testsuite/simdag/availability_tremblay.txt
deleted file mode 100644 (file)
index 460c782..0000000
--- a/testsuite/simdag/availability_tremblay.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-PERIODICITY 2.0
-0.0 0.42
-5.0 1.0
\ No newline at end of file

diff --git a/testsuite/simdag/sd_test.c b/testsuite/simdag/sd_test.c
deleted file mode 100644 (file)
index 5f3451b..0000000
--- a/testsuite/simdag/sd_test.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. 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 "simdag/simdag.h"
-#include "xbt/ex.h"
-#include "xbt/log.h"
-
-XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test,
-                             "Logging specific to this SimDag example");
-
-int main(int argc, char **argv)
-{
-  int i;
-  const char *platform_file;
-
-  const SD_workstation_t *workstations;
-  SD_workstation_t w1;
-  SD_workstation_t w2;
-  const char *name1 = NULL;
-  const char *name2 = NULL;
-  const double computation_amount1 = 2000000;
-  const double computation_amount2 = 1000000;
-  const double communication_amount12 = 2000000;
-  const double communication_amount21 = 3000000;
-  const SD_link_t *route;
-  int route_size;
-  SD_task_t taskA;
-  SD_task_t taskB, checkB;
-  SD_task_t taskC, checkC;
-  SD_task_t taskD, checkD;
-  xbt_ex_t ex;
-
-  /* initialisation of SD */
-  SD_init(&argc, argv);
-
-  if (argc < 2) {
-    INFO1("Usage: %s platform_file", argv[0]);
-    INFO1("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 (use small_platform.xml) */
-  workstations = SD_workstation_get_list();
-
-
-  for (i = 0; i < SD_workstation_get_number(); i++) {
-    INFO1("name : %s", SD_workstation_get_name(workstations[i]));
-  }
-
-  w1 = workstations[0];
-  w2 = workstations[1];
-  name1 = SD_workstation_get_name(w1);
-  name2 = SD_workstation_get_name(w2);
-
-  route = SD_route_get_list(w1, w2);
-
-  route_size = SD_route_get_size(w1, w2);
-
-  taskA = SD_task_create("Task A", NULL, 10.0);
-  taskB = SD_task_create("Task B", NULL, 40.0);
-  taskC = SD_task_create("Task C", NULL, 30.0);
-  taskD = SD_task_create("Task D", NULL, 60.0);
-
-  INFO3("Computation time for %f flops on %s: %f", computation_amount1,
-        name1, SD_workstation_get_computation_time(w1,
-                                                   computation_amount1));
-  INFO3("Computation time for %f flops on %s: %f", computation_amount2,
-        name2, SD_workstation_get_computation_time(w2,
-                                                   computation_amount2));
-
-  INFO2("Route between %s and %s:", name1, name2);
-  for (i = 0; i < route_size; i++) {
-    INFO3("\tLink %s: latency = %f, bandwidth = %f",
-          SD_link_get_name(route[i]),
-          SD_link_get_current_latency(route[i]),
-          SD_link_get_current_bandwidth(route[i]));
-  }
-  INFO2("Route latency = %f, route bandwidth = %f",
-        SD_route_get_current_latency(w1, w2),
-        SD_route_get_current_bandwidth(w1, w2));
-  INFO4("Communication time for %f bytes between %s and %s: %f",
-        communication_amount12, name1, name2,
-        SD_route_get_communication_time(w1, w2, communication_amount12));
-  INFO4("Communication time for %f bytes between %s and %s: %f",
-        communication_amount21, name2, name1,
-        SD_route_get_communication_time(w2, w1, communication_amount21));
-
-  /* creation of the tasks and their dependencies */
-
-  SD_task_dependency_add(NULL, NULL, taskB, taskA);
-  SD_task_dependency_add(NULL, NULL, taskC, taskA);
-  SD_task_dependency_add(NULL, NULL, taskD, taskB);
-  SD_task_dependency_add(NULL, NULL, taskD, taskC);
-  /*  SD_task_dependency_add(NULL, NULL, taskA, taskD); /\* deadlock */
-
-  TRY {
-    SD_task_dependency_add(NULL, NULL, taskA, taskA);   /* shouldn't work and must raise an exception */
-    xbt_assert0(0,
-                "Hey, I can add a dependency between Task A and Task A!");
-  }
-  CATCH(ex) {
-  }
-
-  TRY {
-    SD_task_dependency_add(NULL, NULL, taskA, taskB);   /* shouldn't work and must raise an exception */
-    xbt_assert0(0, "Oh oh, I can add an already existing dependency!");
-  }
-  CATCH(ex) {
-  }
-
-  SD_task_dependency_remove(taskA, taskB);
-
-  TRY {
-    SD_task_dependency_remove(taskC, taskA);    /* shouldn't work and must raise an exception */
-    xbt_assert0(0, "Dude, I can remove an unknown dependency!");
-  }
-  CATCH(ex) {
-  }
-
-  TRY {
-    SD_task_dependency_remove(taskC, taskC);    /* shouldn't work and must raise an exception */
-    xbt_assert0(0,
-                "Wow, I can remove a dependency between Task C and itself!");
-  }
-  CATCH(ex) {
-  }
-
-
-  /* if everything is ok, no exception is forwarded or rethrown by main() */
-
-  /* watch points */
-  SD_task_watch(taskD, SD_DONE);
-  SD_task_watch(taskB, SD_DONE);
-  SD_task_unwatch(taskD, SD_DONE);
-
-
-  /* scheduling parameters */
-  {
-    const int workstation_number = 2;
-    const SD_workstation_t workstation_list[] = { w1, w2 };
-    double computation_amount[] =
-        { computation_amount1, computation_amount2 };
-    double communication_amount[] = {
-      0, communication_amount12,
-      communication_amount21, 0
-    };
-    xbt_dynar_t changed_tasks;
-    double rate = -1.0;
-
-    /* estimated time */
-    SD_task_t task = taskD;
-    INFO2("Estimated time for '%s': %f", SD_task_get_name(task),
-          SD_task_get_execution_time(task, workstation_number,
-                                     workstation_list, computation_amount,
-                                     communication_amount));
-
-    /* let's launch the simulation! */
-
-    SD_task_schedule(taskA, workstation_number, workstation_list,
-                     computation_amount, communication_amount, rate);
-    SD_task_schedule(taskB, workstation_number, workstation_list,
-                     computation_amount, communication_amount, rate);
-    SD_task_schedule(taskC, workstation_number, workstation_list,
-                     computation_amount, communication_amount, rate);
-    SD_task_schedule(taskD, workstation_number, workstation_list,
-                     computation_amount, communication_amount, rate);
-
-    changed_tasks = SD_simulate(-1.0);
-
-    xbt_dynar_get_cpy(changed_tasks, 0, &checkD);
-    xbt_dynar_get_cpy(changed_tasks, 1, &checkC);
-    xbt_dynar_get_cpy(changed_tasks, 2, &checkB);
-
-    xbt_assert0(checkD == taskD &&
-                checkC == taskC &&
-                checkB == taskB, "Unexpected simulation results");
-
-    xbt_dynar_free_container(&changed_tasks);
-  }
-  DEBUG0("Destroying tasks...");
-
-  SD_task_destroy(taskA);
-  SD_task_destroy(taskB);
-  SD_task_destroy(taskC);
-  SD_task_destroy(taskD);
-
-  DEBUG0("Tasks destroyed. Exiting SimDag...");
-
-  SD_exit();
-  return 0;
-}

diff --git a/testsuite/simdag/small_platform_variable.xml b/testsuite/simdag/small_platform_variable.xml
deleted file mode 100644 (file)
index e3c34b0..0000000
--- a/testsuite/simdag/small_platform_variable.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version='1.0'?>
- <!DOCTYPE platform SYSTEM "simgrid.dtd">
- <platform version="3">
- <AS  id="AS0"  routing="Full">
-   <!-- ljlkj -->
-   <host id="Tremblay" power="98095000" availability_file="availability_tremblay.txt"/>
-   <host id="Jupiter" power="76296000"/>
-   <host id="Fafard" power="76296000"/>
-   <host id="Ginette" power="48492000"/>
-   <host id="Bourassa" power="48492000"/>
-   <link id="6" bandwidth="41279125" latency="5.9904e-05"/>
-   <link id="11" bandwidth="252750" latency="0.00570455"/>
-   <link id="3" bandwidth="34285625" latency="0.000514433"/>
-   <link id="7" bandwidth="11618875" latency="0.00018998"/>
-   <link id="9" bandwidth="7209750" latency="0.001461517"/>
-   <link id="12" bandwidth="1792625" latency="0.007877863"/>
-   <link id="2" bandwidth="118682500" latency="0.000136931"/>
-   <link id="8" bandwidth="8158000" latency="0.000270544"/>
-   <link id="1" bandwidth="34285625" latency="0.000514433"/>
-   <link id="4" bandwidth="10099625" latency="0.00047978"/>
-   <link id="0" bandwidth="41279125" latency="5.9904e-05"/>
-   <link id="10" bandwidth="4679750" latency="0.000848712"/>
-   <link id="5" bandwidth="27946250" latency="0.000278066"/>
-   <link id="loopback_FATPIPE" bandwidth="10000000" latency="0.1" sharing_policy="FATPIPE"/>
-   <link id="loopback" bandwidth="498000000" latency="0.000015"/>
-   <route src="Tremblay" dst="Tremblay"><link_ctn id="loopback"/></route>
-   <route src="Jupiter" dst="Jupiter"><link_ctn id="loopback"/></route>
-   <route src="Fafard" dst="Fafard"><link_ctn id="loopback"/></route>
-   <route src="Ginette" dst="Ginette"><link_ctn id="loopback"/></route>
-   <route src="Bourassa" dst="Bourassa"><link_ctn id="loopback"/></route>
-   <route src="Tremblay" dst="Jupiter">
-     <link_ctn id="9"/>
-   </route>
-   <route src="Tremblay" dst="Fafard">
-     <link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/>
-   </route>
-   <route src="Tremblay" dst="Ginette">
-     <link_ctn id="4"/><link_ctn id="3"/><link_ctn id="5"/>
-   </route>
-   <route src="Tremblay" dst="Bourassa">
-     <link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
-   </route>
-   <route src="Jupiter" dst="Tremblay">
-     <link_ctn id="9"/>
-   </route>
-   <route src="Jupiter" dst="Fafard">
-     <link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/>
-   </route>
-   <route src="Jupiter" dst="Ginette">
-     <link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="5"/>
-   </route>
-   <route src="Jupiter" dst="Bourassa">
-     <link_ctn id="9"/><link_ctn id="4"/><link_ctn id="3"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
-   </route>
-   <route src="Fafard" dst="Tremblay">
-     <link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="3"/><link_ctn id="4"/>
-   </route>
-   <route src="Fafard" dst="Jupiter">
-     <link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="3"/><link_ctn id="4"/><link_ctn id="9"/>
-   </route>
-   <route src="Fafard" dst="Ginette">
-     <link_ctn id="8"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="5"/>
-   </route>
-   <route src="Fafard" dst="Bourassa">
-     <link_ctn id="8"/><link_ctn id="6"/><link_ctn id="7"/>
-   </route>
-   <route src="Ginette" dst="Tremblay">
-     <link_ctn id="5"/><link_ctn id="3"/><link_ctn id="4"/>
-   </route>
-   <route src="Ginette" dst="Jupiter">
-     <link_ctn id="5"/><link_ctn id="3"/><link_ctn id="4"/><link_ctn id="9"/>
-   </route>
-   <route src="Ginette" dst="Fafard">
-     <link_ctn id="5"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="8"/>
-   </route>
-   <route src="Ginette" dst="Bourassa">
-     <link_ctn id="5"/><link_ctn id="2"/><link_ctn id="0"/><link_ctn id="1"/><link_ctn id="6"/><link_ctn id="7"/>
-   </route>
-   <route src="Bourassa" dst="Tremblay">
-     <link_ctn id="7"/><link_ctn id="6"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="3"/><link_ctn id="4"/>
-   </route>
-   <route src="Bourassa" dst="Jupiter">
-     <link_ctn id="7"/><link_ctn id="6"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="3"/><link_ctn id="4"/><link_ctn id="9"/>
-   </route>
-   <route src="Bourassa" dst="Fafard">
-     <link_ctn id="7"/><link_ctn id="6"/><link_ctn id="8"/>
-   </route>
-   <route src="Bourassa" dst="Ginette">
-     <link_ctn id="7"/><link_ctn id="6"/><link_ctn id="1"/><link_ctn id="0"/><link_ctn id="2"/><link_ctn id="5"/>
-   </route>
- </AS>
- </platform>