use the new way of declaring the periodicity of state_file and avail_file

And remove a test that is hard to work with, soon replaced with
something better.

And revalidate the tesh output of tests that are hard to diagnose and
improve

diff --git a/examples/platforms/trace/jupiter_speed.trace b/examples/platforms/trace/jupiter_speed.trace
index 8550f51..33719c8 100644 (file)
--- a/examples/platforms/trace/jupiter_speed.trace
+++ b/examples/platforms/trace/jupiter_speed.trace
@@ -1,2 +1,2 @@
-0.0 0.5
-2.0 1.0
\ No newline at end of file
+0 0.5
+2 1.0
\ No newline at end of file

diff --git a/examples/platforms/trace/jupiter_state.trace b/examples/platforms/trace/jupiter_state.trace
index ef3bd0f..ce9743c 100644 (file)
--- a/examples/platforms/trace/jupiter_state.trace
+++ b/examples/platforms/trace/jupiter_state.trace
@@ -1,2 +1,2 @@
-1.0 0
+1 0
 2 1

diff --git a/examples/platforms/trace/link1_avail.trace b/examples/platforms/trace/link1_avail.trace
index 0514220..86c68ac 100644 (file)
--- a/examples/platforms/trace/link1_avail.trace
+++ b/examples/platforms/trace/link1_avail.trace
@@ -1,3 +1,3 @@
-PERIODICITY 6.0
-2.0 62500000
-4.0 31250000
+2 62500000
+4 31250000
+WAITFOR 6

diff --git a/examples/platforms/trace/linkBandwidth7.bw b/examples/platforms/trace/linkBandwidth7.bw
index 34a24c3..25ccce5 100644 (file)
--- a/examples/platforms/trace/linkBandwidth7.bw
+++ b/examples/platforms/trace/linkBandwidth7.bw
@@ -1,5 +1,6 @@
-PERIODICITY 8.0
 1.007044263744508 6.846527733924368E7
 4.199387092709633 1.0335587797993976E8
 5.319464737378834 1.0591433767387845E7
 7.237437222882919 7.037797434537312E7
+WAITFOR 0.76256277712
+# Wait until t=8

diff --git a/examples/platforms/trace/trace_A.txt b/examples/platforms/trace/trace_A.txt
index 73f8eb8..9487874 100644 (file)
--- a/examples/platforms/trace/trace_A.txt
+++ b/examples/platforms/trace/trace_A.txt
@@ -1,4 +1,4 @@
-PERIODICITY 1.0
-0.0 1.0
-11.0 0.5
-20.0 0.9
+0 1.0
+11 0.5
+20 0.9
+WAITFOR 1

diff --git a/examples/platforms/trace/trace_A_failure.txt b/examples/platforms/trace/trace_A_failure.txt
index 0610bcf..a32f277 100644 (file)
--- a/examples/platforms/trace/trace_A_failure.txt
+++ b/examples/platforms/trace/trace_A_failure.txt
@@ -1,3 +1,3 @@
-PERIODICITY 10.0
-1.0 -1.0
-2.0 1.0
+1 -1.0
+2 1.0
+WAITFOR 8

diff --git a/examples/platforms/trace/trace_B.txt b/examples/platforms/trace/trace_B.txt
index e94c255..ba0b41d 100644 (file)
--- a/examples/platforms/trace/trace_B.txt
+++ b/examples/platforms/trace/trace_B.txt
@@ -1,4 +1,4 @@
-PERIODICITY 10.00
-0.0 1.0
-10.0 0.8
-20.0 0.4
+0 1.0
+10 0.8
+20 0.4
+WAITFOR 10

diff --git a/examples/simdag/availability/sd_availability.tesh b/examples/simdag/availability/sd_availability.tesh
index 279f364..4d667c6 100644 (file)
--- a/examples/simdag/availability/sd_availability.tesh
+++ b/examples/simdag/availability/sd_availability.tesh
@@ -28,7 +28,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/availability/sd_availability ${srcdir:=.}/../platf
 > [9.000400] [sd_avail/INFO] Jupiter: speed=25000000
 > [9.000400] [sd_avail/INFO] Tremblay: speed=25000000
 > [9.000400] [sd_avail/INFO] Task 'c3' start time: 8.000300, finish time: 9.000400
-> [10.000800] [sd_avail/INFO] link1: bw=62500000, lat=0.000100
-> [10.000800] [sd_avail/INFO] Jupiter: speed=25000000
-> [10.000800] [sd_avail/INFO] Tremblay: speed=12500000
-> [10.000800] [sd_avail/INFO] Task 't4' start time: 9.000400, finish time: 10.000800
+> [10.000400] [sd_avail/INFO] link1: bw=31250000, lat=0.000100
+> [10.000400] [sd_avail/INFO] Jupiter: speed=25000000
+> [10.000400] [sd_avail/INFO] Tremblay: speed=25000000
+> [10.000400] [sd_avail/INFO] Task 't4' start time: 9.000400, finish time: 10.000400

diff --git a/teshsuite/simdag/availability/availability.tesh b/teshsuite/simdag/availability/availability.tesh
index df3f8ca..ec79ca1 100644 (file)
--- a/teshsuite/simdag/availability/availability.tesh
+++ b/teshsuite/simdag/availability/availability.tesh
@@ -30,5 +30,5 @@ $ ${bindir:=.}/availability ../../../examples/platforms/simulacrum_7_hosts.xml
 > [0.000000] [test/INFO] Scheduling ID00024@mJPEG to node: Host 30
 > [0.000000] [test/INFO] Scheduling end to node: Host 26
 > [0.000000] [test/INFO] DAX scheduled
-> [164.052870] [test/INFO] Simulation done.
+> [164.054322] [test/INFO] Simulation done.
 

diff --git a/teshsuite/simdag/platforms/bob.trace b/teshsuite/simdag/platforms/bob.trace
index 019c2c8..053f1e5 100644 (file)
--- a/teshsuite/simdag/platforms/bob.trace
+++ b/teshsuite/simdag/platforms/bob.trace
@@ -1,4 +1,4 @@
-PERIODICITY 1.0
-0.0 1.0
-11.0 0.5
-20.0 0.8
+ 0 1.0
+11 0.5
+20 0.8
+WAITFOR 1

diff --git a/teshsuite/simdag/platforms/carol.fail b/teshsuite/simdag/platforms/carol.fail
index 0610bcf..f5b00f2 100644 (file)
--- a/teshsuite/simdag/platforms/carol.fail
+++ b/teshsuite/simdag/platforms/carol.fail
@@ -1,3 +1,3 @@
-PERIODICITY 10.0
-1.0 -1.0
-2.0 1.0
+1  -1.0
+2  1.0
+WAITFOR 10

diff --git a/teshsuite/simdag/platforms/erin.avail b/teshsuite/simdag/platforms/erin.avail
index 3f3d3a2..b74fe35 100644 (file)
--- a/teshsuite/simdag/platforms/erin.avail
+++ b/teshsuite/simdag/platforms/erin.avail
@@ -1,4 +1,4 @@
-PERIODICITY 1.0
-0.0 1.0
-9.0 0.7
-15.0 0.4
+ 0 1.0
+ 9 0.7
+15 0.4
+WAITFOR 1

diff --git a/teshsuite/simdag/platforms/link.bw b/teshsuite/simdag/platforms/link.bw
index ac0d5aa..f858489 100644 (file)
--- a/teshsuite/simdag/platforms/link.bw
+++ b/teshsuite/simdag/platforms/link.bw
@@ -1,3 +1,3 @@
-PERIODICITY 12.0
-4.0 40000000
-8.0 60000000
+ 4 40000000
+ 8 60000000
+WAITFOR 12

diff --git a/teshsuite/simdag/platforms/link.fail b/teshsuite/simdag/platforms/link.fail
index 0610bcf..ee22219 100644 (file)
--- a/teshsuite/simdag/platforms/link.fail
+++ b/teshsuite/simdag/platforms/link.fail
@@ -1,3 +1,3 @@
-PERIODICITY 10.0
-1.0 -1.0
-2.0 1.0
+1 -1.0
+2 1.0
+WAITFOR 10

diff --git a/teshsuite/simdag/platforms/link.lat b/teshsuite/simdag/platforms/link.lat
index f4a4bb3..5e2eb9a 100644 (file)
--- a/teshsuite/simdag/platforms/link.lat
+++ b/teshsuite/simdag/platforms/link.lat
@@ -1,4 +1,4 @@
-PERIODICITY 5.0
-1.0 0.001
-2.0 0.01
-3.0 0.001
+1 0.001
+2 0.01
+3 0.001
+WAITFOR 5

diff --git a/teshsuite/surf/CMakeLists.txt b/teshsuite/surf/CMakeLists.txt
index e1b28ce..735efee 100644 (file)
--- a/teshsuite/surf/CMakeLists.txt
+++ b/teshsuite/surf/CMakeLists.txt
@@ -1,4 +1,4 @@
-foreach(x lmm_usage surf_usage surf_usage2 trace_usage)
+foreach(x lmm_usage surf_usage surf_usage2)
   add_executable       (${x}  ${x}/${x}.cpp)
   target_link_libraries(${x}  simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -18,7 +18,7 @@ endforeach()
 set(tesh_files     ${tesh_files}                                                               PARENT_SCOPE)
 set(teshsuite_src  ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench/maxmin_bench.cpp  PARENT_SCOPE)
 
-foreach(x lmm_usage surf_usage surf_usage2 trace_usage)
+foreach(x lmm_usage surf_usage surf_usage2)
   ADD_TESH(tesh-surf-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/${x} ${x}.tesh)
 endforeach()
 

diff --git a/teshsuite/surf/surf_usage/surf_usage.tesh b/teshsuite/surf/surf_usage/surf_usage.tesh
index 3fc8d87..4e60bff 100644 (file)
--- a/teshsuite/surf/surf_usage/surf_usage.tesh
+++ b/teshsuite/surf/surf_usage/surf_usage.tesh
@@ -26,7 +26,5 @@ $ $SG_TEST_EXENV ${bindir:=.}/surf_usage ${srcdir:=.}/../../../examples/platform
 > [110.000000] [surf_test/INFO] Next Event : 110
 > [120.000000] [surf_test/INFO] Next Event : 120
 > [130.000000] [surf_test/INFO] Next Event : 130
-> [140.000000] [surf_test/INFO] Next Event : 140
-> [150.000000] [surf_test/INFO] Next Event : 150
-> [157.500000] [surf_test/INFO] Next Event : 157.5
-> [157.500000] [surf_test/INFO]    CPU Done action
+> [132.500000] [surf_test/INFO] Next Event : 132.5
+> [132.500000] [surf_test/INFO]    CPU Done action

diff --git a/teshsuite/surf/surf_usage2/surf_usage2.tesh b/teshsuite/surf/surf_usage2/surf_usage2.tesh
index 5e025d6..12a74fb 100644 (file)
--- a/teshsuite/surf/surf_usage2/surf_usage2.tesh
+++ b/teshsuite/surf/surf_usage2/surf_usage2.tesh
@@ -23,8 +23,6 @@ $ $SG_TEST_EXENV ${bindir:=.}/surf_usage2  ${srcdir:=.}/../../../examples/platfo
 > [110.000000] [surf_test/INFO] Next Event : 110
 > [120.000000] [surf_test/INFO] Next Event : 120
 > [130.000000] [surf_test/INFO] Next Event : 130
-> [140.000000] [surf_test/INFO] Next Event : 140
-> [150.000000] [surf_test/INFO] Next Event : 150
-> [157.500000] [surf_test/INFO] Next Event : 157.5
-> [157.500000] [surf_test/INFO]    * Done Action
-> [157.500000] [surf_test/INFO] Simulation Terminated
+> [132.500000] [surf_test/INFO] Next Event : 132.5
+> [132.500000] [surf_test/INFO]    * Done Action
+> [132.500000] [surf_test/INFO] Simulation Terminated

diff --git a/teshsuite/surf/trace_usage/trace_usage.cpp b/teshsuite/surf/trace_usage/trace_usage.cpp
deleted file mode 100644 (file)
index 3bcd610..0000000
--- a/teshsuite/surf/trace_usage/trace_usage.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/* A few tests for the trace library                                       */
-
-/* Copyright (c) 2004-2006, 2009-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 "surf/surf.h"
-#include "xbt/log.h"
-#include "src/surf/network_interface.hpp"
-#include "src/surf/trace_mgr.hpp"
-
-XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");
-
-class DummyTestResource
-    : public simgrid::surf::Resource {
-public:
-  explicit DummyTestResource(const char* name) : Resource(nullptr, name, nullptr) {}
-  bool isUsed() override {return false;}
-  void apply_event(tmgr_trace_iterator_t it, double value) override {}
-};
-
-int main(int argc, char **argv)
-{
-  surf_init(&argc, argv);
-
-  simgrid::trace_mgr::future_evt_set *fes = new simgrid::trace_mgr::future_evt_set();
-  tmgr_trace_t trace_A = tmgr_trace_new_from_file("trace_A.txt");
-  tmgr_trace_t trace_B = tmgr_trace_new_from_file("trace_B.txt");
-  double value = -1.0;
-  simgrid::surf::Resource *resource = nullptr;
-  simgrid::surf::Resource *hostA = new DummyTestResource("Host A");
-  simgrid::surf::Resource *hostB = new DummyTestResource("Host B");
-
-  fes->add_trace(trace_A, 1.0, hostA);
-  fes->add_trace(trace_B, 0.0, hostB);
-
-  double next_event_date = fes->next_date();
-  while (next_event_date > -1.0) {
-    XBT_INFO("%g:", next_event_date);
-    while (fes->pop_leq(next_event_date, &value, &resource)) {
-      XBT_INFO("   %s: %g", resource->cname(), value);
-    }
-    if (next_event_date > 100)
-      break;
-    next_event_date = fes->next_date();
-  }
-
-  delete fes;
-  delete hostA;
-  delete hostB;
-
-  surf_exit();
-  return 0;
-}

diff --git a/teshsuite/surf/trace_usage/trace_usage.tesh b/teshsuite/surf/trace_usage/trace_usage.tesh
deleted file mode 100644 (file)
index 70d3e57..0000000
--- a/teshsuite/surf/trace_usage/trace_usage.tesh
+++ /dev/null
@@ -1,63 +0,0 @@
-#! ./tesh
-
-$ $SG_TEST_EXENV ${bindir:=.}/trace_usage --cfg=path:../../../examples/platforms/trace/
-> [0.000000] [surf_test/INFO] 0:
-> [0.000000] [surf_test/INFO]    Host B: 1
-> [0.000000] [surf_test/INFO] 1:
-> [0.000000] [surf_test/INFO]    Host A: 1
-> [0.000000] [surf_test/INFO] 10:
-> [0.000000] [surf_test/INFO]    Host B: 0.8
-> [0.000000] [surf_test/INFO] 12:
-> [0.000000] [surf_test/INFO]    Host A: 0.5
-> [0.000000] [surf_test/INFO] 20:
-> [0.000000] [surf_test/INFO]    Host B: 0.4
-> [0.000000] [surf_test/INFO] 21:
-> [0.000000] [surf_test/INFO]    Host A: 0.9
-> [0.000000] [surf_test/INFO] 22:
-> [0.000000] [surf_test/INFO]    Host A: 0.5
-> [0.000000] [surf_test/INFO] 30:
-> [0.000000] [surf_test/INFO]    Host B: 0.8
-> [0.000000] [surf_test/INFO] 31:
-> [0.000000] [surf_test/INFO]    Host A: 0.9
-> [0.000000] [surf_test/INFO] 32:
-> [0.000000] [surf_test/INFO]    Host A: 0.5
-> [0.000000] [surf_test/INFO] 40:
-> [0.000000] [surf_test/INFO]    Host B: 0.4
-> [0.000000] [surf_test/INFO] 41:
-> [0.000000] [surf_test/INFO]    Host A: 0.9
-> [0.000000] [surf_test/INFO] 42:
-> [0.000000] [surf_test/INFO]    Host A: 0.5
-> [0.000000] [surf_test/INFO] 50:
-> [0.000000] [surf_test/INFO]    Host B: 0.8
-> [0.000000] [surf_test/INFO] 51:
-> [0.000000] [surf_test/INFO]    Host A: 0.9
-> [0.000000] [surf_test/INFO] 52:
-> [0.000000] [surf_test/INFO]    Host A: 0.5
-> [0.000000] [surf_test/INFO] 60:
-> [0.000000] [surf_test/INFO]    Host B: 0.4
-> [0.000000] [surf_test/INFO] 61:
-> [0.000000] [surf_test/INFO]    Host A: 0.9
-> [0.000000] [surf_test/INFO] 62:
-> [0.000000] [surf_test/INFO]    Host A: 0.5
-> [0.000000] [surf_test/INFO] 70:
-> [0.000000] [surf_test/INFO]    Host B: 0.8
-> [0.000000] [surf_test/INFO] 71:
-> [0.000000] [surf_test/INFO]    Host A: 0.9
-> [0.000000] [surf_test/INFO] 72:
-> [0.000000] [surf_test/INFO]    Host A: 0.5
-> [0.000000] [surf_test/INFO] 80:
-> [0.000000] [surf_test/INFO]    Host B: 0.4
-> [0.000000] [surf_test/INFO] 81:
-> [0.000000] [surf_test/INFO]    Host A: 0.9
-> [0.000000] [surf_test/INFO] 82:
-> [0.000000] [surf_test/INFO]    Host A: 0.5
-> [0.000000] [surf_test/INFO] 90:
-> [0.000000] [surf_test/INFO]    Host B: 0.8
-> [0.000000] [surf_test/INFO] 91:
-> [0.000000] [surf_test/INFO]    Host A: 0.9
-> [0.000000] [surf_test/INFO] 92:
-> [0.000000] [surf_test/INFO]    Host A: 0.5
-> [0.000000] [surf_test/INFO] 100:
-> [0.000000] [surf_test/INFO]    Host B: 0.4
-> [0.000000] [surf_test/INFO] 101:
-> [0.000000] [surf_test/INFO]    Host A: 0.9