Merge branch 'master' of framagit.org:simgrid/simgrid

diff --git a/ChangeLog b/ChangeLog
index 2ef1975..5f1cbdf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,7 @@ Fixed bugs (FG#.. -> FramaGit bugs; FG!.. -> FG merge requests)
  (FG: issues on Framagit; GH: issues on GitHub)
  - FG#105: "Variable penalty should not be negative!" with in-flight messages and bandwidth profiles
  - FG#109: Application time reported by --cfg=smpi/display-timing:yes is wrong
+ - FG#110: Wait_any does not trigger new model solve when host events occur
 
 ----------------------------------------------------------------------------
 

diff --git a/examples/cpp/platform-failures/s4u-platform-failures.tesh b/examples/cpp/platform-failures/s4u-platform-failures.tesh
index ad22b13..8a7311f 100644 (file)
--- a/examples/cpp/platform-failures/s4u-platform-failures.tesh
+++ b/examples/cpp/platform-failures/s4u-platform-failures.tesh
@@ -19,12 +19,12 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [  1.000000] (0:maestro@) Restart actors on host Fafard
 > [  1.000000] (1:master@Tremblay) Mmh. The communication with 'worker-1' failed. Nevermind. Let's keep going!
 > [  1.000000] (7:sleeper@Lilibeth) done sleeping.
-> [  1.000000] (8:worker@Fafard) Waiting a message on worker-2
 > [  1.000000] (1:master@Tremblay) Send a message to worker-2
+> [  1.000000] (8:worker@Fafard) Waiting a message on worker-2
 > [  2.000000] (0:maestro@) Restart actors on host Jupiter
 > [  2.000000] (1:master@Tremblay) Mmh. The communication with 'worker-2' failed. Nevermind. Let's keep going!
-> [  2.000000] (1:master@Tremblay) Send a message to worker-3
 > [  2.000000] (9:worker@Jupiter) Waiting a message on worker-1
+> [  2.000000] (1:master@Tremblay) Send a message to worker-3
 > [  2.010309] (2:worker@Tremblay) Execution complete.
 > [  2.010309] (2:worker@Tremblay) Waiting a message on worker-0
 > [  3.030928] (5:worker@Ginette) Start execution...
@@ -37,13 +37,13 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [  4.072165] (1:master@Tremblay) Send to worker-0 completed
 > [  4.072165] (1:master@Tremblay) Send a message to worker-1
 > [  5.000000] (0:maestro@) Restart actors on host Lilibeth
-> [  5.030928] (10:sleeper@Lilibeth) Start sleeping...
+> [  5.000000] (10:sleeper@Lilibeth) Start sleeping...
 > [  5.030928] (5:worker@Ginette) Execution complete.
 > [  5.030928] (5:worker@Ginette) Waiting a message on worker-3
 > [  5.103093] (9:worker@Jupiter) Start execution...
 > [  5.103093] (1:master@Tremblay) Send to worker-1 completed
 > [  5.103093] (1:master@Tremblay) Send a message to worker-2
-> [  6.030928] (10:sleeper@Lilibeth) done sleeping.
+> [  6.000000] (10:sleeper@Lilibeth) done sleeping.
 > [  6.061856] (6:worker@Bourassa) Execution complete.
 > [  6.061856] (6:worker@Bourassa) Waiting a message on worker-4
 > [  6.072165] (2:worker@Tremblay) Execution complete.
@@ -51,14 +51,14 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [  7.103093] (9:worker@Jupiter) Execution complete.
 > [  7.103093] (9:worker@Jupiter) Waiting a message on worker-1
 > [ 15.000000] (0:maestro@) Restart actors on host Lilibeth
-> [ 15.103093] (11:sleeper@Lilibeth) Start sleeping...
+> [ 15.000000] (11:sleeper@Lilibeth) Start sleeping...
 > [ 15.103093] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'worker-2'. Nevermind. Let's keep going!
 > [ 15.103093] (1:master@Tremblay) Send a message to worker-3
 > [ 15.103093] (5:worker@Ginette) Mmh. Something went wrong. Nevermind. Let's keep going!
 > [ 15.103093] (5:worker@Ginette) Waiting a message on worker-3
 > [ 15.103093] (1:master@Tremblay) Mmh. The communication with 'worker-3' failed. Nevermind. Let's keep going!
 > [ 15.103093] (1:master@Tremblay) Send a message to worker-4
-> [ 16.103093] (11:sleeper@Lilibeth) done sleeping.
+> [ 16.000000] (11:sleeper@Lilibeth) done sleeping.
 > [ 16.134021] (6:worker@Bourassa) Start execution...
 > [ 16.134021] (1:master@Tremblay) Send to worker-4 completed
 > [ 16.134021] (1:master@Tremblay) Send a message to worker-0
@@ -75,10 +75,10 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [ 19.175258] (9:worker@Jupiter) Execution complete.
 > [ 19.175258] (9:worker@Jupiter) Waiting a message on worker-1
 > [ 25.000000] (0:maestro@) Restart actors on host Lilibeth
-> [ 27.175258] (12:sleeper@Lilibeth) Start sleeping...
+> [ 25.000000] (12:sleeper@Lilibeth) Start sleeping...
+> [ 26.000000] (12:sleeper@Lilibeth) done sleeping.
 > [ 27.175258] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'worker-2'. Nevermind. Let's keep going!
 > [ 27.175258] (1:master@Tremblay) Send a message to worker-3
-> [ 28.175258] (12:sleeper@Lilibeth) done sleeping.
 > [ 28.206186] (5:worker@Ginette) Start execution...
 > [ 28.206186] (1:master@Tremblay) Send to worker-3 completed
 > [ 28.206186] (1:master@Tremblay) Send a message to worker-4
@@ -99,10 +99,10 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [ 31.247423] (9:worker@Jupiter) Execution complete.
 > [ 31.247423] (9:worker@Jupiter) Waiting a message on worker-1
 > [ 35.000000] (0:maestro@) Restart actors on host Lilibeth
-> [ 39.247423] (13:sleeper@Lilibeth) Start sleeping...
+> [ 35.000000] (13:sleeper@Lilibeth) Start sleeping...
+> [ 36.000000] (13:sleeper@Lilibeth) done sleeping.
 > [ 39.247423] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'worker-2'. Nevermind. Let's keep going!
 > [ 39.247423] (1:master@Tremblay) Send a message to worker-3
-> [ 40.247423] (13:sleeper@Lilibeth) done sleeping.
 > [ 40.278351] (5:worker@Ginette) Start execution...
 > [ 40.278351] (1:master@Tremblay) Send to worker-3 completed
 > [ 40.278351] (1:master@Tremblay) Send a message to worker-4
@@ -119,6 +119,7 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [ 43.309278] (1:master@Tremblay) Goodbye now!
 > [ 43.309278] (0:maestro@) Simulation time 43.3093
 
+
 p Testing a simple master/worker example application handling failures. TCP crosstraffic ENABLED
 
 ! output sort 19
@@ -138,12 +139,12 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [  1.000000] (0:maestro@) Restart actors on host Fafard
 > [  1.000000] (1:master@Tremblay) Mmh. The communication with 'worker-1' failed. Nevermind. Let's keep going!
 > [  1.000000] (7:sleeper@Lilibeth) done sleeping.
-> [  1.000000] (8:worker@Fafard) Waiting a message on worker-2
 > [  1.000000] (1:master@Tremblay) Send a message to worker-2
+> [  1.000000] (8:worker@Fafard) Waiting a message on worker-2
 > [  2.000000] (0:maestro@) Restart actors on host Jupiter
 > [  2.000000] (1:master@Tremblay) Mmh. The communication with 'worker-2' failed. Nevermind. Let's keep going!
-> [  2.000000] (1:master@Tremblay) Send a message to worker-3
 > [  2.000000] (9:worker@Jupiter) Waiting a message on worker-1
+> [  2.000000] (1:master@Tremblay) Send a message to worker-3
 > [  2.010825] (2:worker@Tremblay) Execution complete.
 > [  2.010825] (2:worker@Tremblay) Waiting a message on worker-0
 > [  3.082474] (5:worker@Ginette) Start execution...
@@ -156,13 +157,13 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [  4.175773] (1:master@Tremblay) Send to worker-0 completed
 > [  4.175773] (1:master@Tremblay) Send a message to worker-1
 > [  5.000000] (0:maestro@) Restart actors on host Lilibeth
-> [  5.082474] (10:sleeper@Lilibeth) Start sleeping...
+> [  5.000000] (10:sleeper@Lilibeth) Start sleeping...
 > [  5.082474] (5:worker@Ginette) Execution complete.
 > [  5.082474] (5:worker@Ginette) Waiting a message on worker-3
 > [  5.258247] (9:worker@Jupiter) Start execution...
 > [  5.258247] (1:master@Tremblay) Send to worker-1 completed
 > [  5.258247] (1:master@Tremblay) Send a message to worker-2
-> [  6.082474] (10:sleeper@Lilibeth) done sleeping.
+> [  6.000000] (10:sleeper@Lilibeth) done sleeping.
 > [  6.164948] (6:worker@Bourassa) Execution complete.
 > [  6.164948] (6:worker@Bourassa) Waiting a message on worker-4
 > [  6.175773] (2:worker@Tremblay) Execution complete.
@@ -170,14 +171,14 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [  7.258247] (9:worker@Jupiter) Execution complete.
 > [  7.258247] (9:worker@Jupiter) Waiting a message on worker-1
 > [ 15.000000] (0:maestro@) Restart actors on host Lilibeth
-> [ 15.258247] (11:sleeper@Lilibeth) Start sleeping...
+> [ 15.000000] (11:sleeper@Lilibeth) Start sleeping...
 > [ 15.258247] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'worker-2'. Nevermind. Let's keep going!
 > [ 15.258247] (1:master@Tremblay) Send a message to worker-3
 > [ 15.258247] (5:worker@Ginette) Mmh. Something went wrong. Nevermind. Let's keep going!
 > [ 15.258247] (5:worker@Ginette) Waiting a message on worker-3
 > [ 15.258247] (1:master@Tremblay) Mmh. The communication with 'worker-3' failed. Nevermind. Let's keep going!
 > [ 15.258247] (1:master@Tremblay) Send a message to worker-4
-> [ 16.258247] (11:sleeper@Lilibeth) done sleeping.
+> [ 16.000000] (11:sleeper@Lilibeth) done sleeping.
 > [ 16.340722] (6:worker@Bourassa) Start execution...
 > [ 16.340722] (1:master@Tremblay) Send to worker-4 completed
 > [ 16.340722] (1:master@Tremblay) Send a message to worker-0
@@ -194,10 +195,10 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [ 19.434021] (9:worker@Jupiter) Execution complete.
 > [ 19.434021] (9:worker@Jupiter) Waiting a message on worker-1
 > [ 25.000000] (0:maestro@) Restart actors on host Lilibeth
-> [ 27.434021] (12:sleeper@Lilibeth) Start sleeping...
+> [ 25.000000] (12:sleeper@Lilibeth) Start sleeping...
+> [ 26.000000] (12:sleeper@Lilibeth) done sleeping.
 > [ 27.434021] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'worker-2'. Nevermind. Let's keep going!
 > [ 27.434021] (1:master@Tremblay) Send a message to worker-3
-> [ 28.434021] (12:sleeper@Lilibeth) done sleeping.
 > [ 28.516495] (5:worker@Ginette) Start execution...
 > [ 28.516495] (1:master@Tremblay) Send to worker-3 completed
 > [ 28.516495] (1:master@Tremblay) Send a message to worker-4
@@ -218,10 +219,10 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [ 31.609794] (9:worker@Jupiter) Execution complete.
 > [ 31.609794] (9:worker@Jupiter) Waiting a message on worker-1
 > [ 35.000000] (0:maestro@) Restart actors on host Lilibeth
-> [ 39.609794] (13:sleeper@Lilibeth) Start sleeping...
+> [ 35.000000] (13:sleeper@Lilibeth) Start sleeping...
+> [ 36.000000] (13:sleeper@Lilibeth) done sleeping.
 > [ 39.609794] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'worker-2'. Nevermind. Let's keep going!
 > [ 39.609794] (1:master@Tremblay) Send a message to worker-3
-> [ 40.609794] (13:sleeper@Lilibeth) done sleeping.
 > [ 40.692268] (5:worker@Ginette) Start execution...
 > [ 40.692268] (1:master@Tremblay) Send to worker-3 completed
 > [ 40.692268] (1:master@Tremblay) Send a message to worker-4
@@ -237,3 +238,4 @@ $ ${bindir:=.}/s4u-platform-failures --log=xbt_cfg.thres:critical --log=no_loc $
 > [ 43.774742] (6:worker@Bourassa) I'm done. See you!
 > [ 43.774742] (1:master@Tremblay) Goodbye now!
 > [ 43.774742] (0:maestro@) Simulation time 43.7747
+

diff --git a/examples/python/platform-failures/platform-failures.tesh b/examples/python/platform-failures/platform-failures.tesh
index b3c5d50..54bfd27 100644 (file)
--- a/examples/python/platform-failures/platform-failures.tesh
+++ b/examples/python/platform-failures/platform-failures.tesh
@@ -37,13 +37,13 @@ $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/platform-failures.
 > [  4.072165] (1:master@Tremblay) Send to worker-0 completed
 > [  4.072165] (1:master@Tremblay) Send a message to worker-1
 > [  5.000000] (0:maestro@) Restart actors on host Lilibeth
-> [  5.030928] (10:sleeper@Lilibeth) Start sleeping...
+> [  5.000000] (10:sleeper@Lilibeth) Start sleeping...
 > [  5.030928] (5:worker@Ginette) Execution complete.
 > [  5.030928] (5:worker@Ginette) Waiting a message on worker-3
 > [  5.103093] (9:worker@Jupiter) Start execution...
 > [  5.103093] (1:master@Tremblay) Send to worker-1 completed
 > [  5.103093] (1:master@Tremblay) Send a message to worker-2
-> [  6.030928] (10:sleeper@Lilibeth) done sleeping.
+> [  6.000000] (10:sleeper@Lilibeth) done sleeping.
 > [  6.061856] (6:worker@Bourassa) Execution complete.
 > [  6.061856] (6:worker@Bourassa) Waiting a message on worker-4
 > [  6.072165] (2:worker@Tremblay) Execution complete.
@@ -51,14 +51,14 @@ $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/platform-failures.
 > [  7.103093] (9:worker@Jupiter) Execution complete.
 > [  7.103093] (9:worker@Jupiter) Waiting a message on worker-1
 > [ 15.000000] (0:maestro@) Restart actors on host Lilibeth
-> [ 15.103093] (11:sleeper@Lilibeth) Start sleeping...
+> [ 15.000000] (11:sleeper@Lilibeth) Start sleeping...
 > [ 15.103093] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'worker-2'. Nevermind. Let's keep going!
 > [ 15.103093] (1:master@Tremblay) Send a message to worker-3
 > [ 15.103093] (5:worker@Ginette) Mmh. Something went wrong. Nevermind. Let's keep going!
 > [ 15.103093] (5:worker@Ginette) Waiting a message on worker-3
 > [ 15.103093] (1:master@Tremblay) Mmh. The communication with 'worker-3' failed. Nevermind. Let's keep going!
 > [ 15.103093] (1:master@Tremblay) Send a message to worker-4
-> [ 16.103093] (11:sleeper@Lilibeth) done sleeping.
+> [ 16.000000] (11:sleeper@Lilibeth) done sleeping.
 > [ 16.134021] (6:worker@Bourassa) Start execution...
 > [ 16.134021] (1:master@Tremblay) Send to worker-4 completed
 > [ 16.134021] (1:master@Tremblay) Send a message to worker-0
@@ -75,10 +75,10 @@ $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/platform-failures.
 > [ 19.175258] (9:worker@Jupiter) Execution complete.
 > [ 19.175258] (9:worker@Jupiter) Waiting a message on worker-1
 > [ 25.000000] (0:maestro@) Restart actors on host Lilibeth
-> [ 27.175258] (12:sleeper@Lilibeth) Start sleeping...
+> [ 25.000000] (12:sleeper@Lilibeth) Start sleeping...
+> [ 26.000000] (12:sleeper@Lilibeth) done sleeping.
 > [ 27.175258] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'worker-2'. Nevermind. Let's keep going!
 > [ 27.175258] (1:master@Tremblay) Send a message to worker-3
-> [ 28.175258] (12:sleeper@Lilibeth) done sleeping.
 > [ 28.206186] (5:worker@Ginette) Start execution...
 > [ 28.206186] (1:master@Tremblay) Send to worker-3 completed
 > [ 28.206186] (1:master@Tremblay) Send a message to worker-4
@@ -99,10 +99,10 @@ $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/platform-failures.
 > [ 31.247423] (9:worker@Jupiter) Execution complete.
 > [ 31.247423] (9:worker@Jupiter) Waiting a message on worker-1
 > [ 35.000000] (0:maestro@) Restart actors on host Lilibeth
-> [ 39.247423] (13:sleeper@Lilibeth) Start sleeping...
+> [ 35.000000] (13:sleeper@Lilibeth) Start sleeping...
+> [ 36.000000] (13:sleeper@Lilibeth) done sleeping.
 > [ 39.247423] (1:master@Tremblay) Mmh. Got timeouted while speaking to 'worker-2'. Nevermind. Let's keep going!
 > [ 39.247423] (1:master@Tremblay) Send a message to worker-3
-> [ 40.247423] (13:sleeper@Lilibeth) done sleeping.
 > [ 40.278351] (5:worker@Ginette) Start execution...
 > [ 40.278351] (1:master@Tremblay) Send to worker-3 completed
 > [ 40.278351] (1:master@Tremblay) Send a message to worker-4
@@ -118,3 +118,4 @@ $ ${pythoncmd:=python3} ${PYTHON_TOOL_OPTIONS:=} ${bindir:=.}/platform-failures.
 > [ 43.309278] (6:worker@Bourassa) I'm done. See you!
 > [ 43.309278] (1:master@Tremblay) Goodbye now!
 > [ 43.309278] (0:maestro@) Simulation time 43.3093
+

diff --git a/src/bindings/python/simgrid_python.cpp b/src/bindings/python/simgrid_python.cpp
index db71ba4..9d86a99 100644 (file)
--- a/src/bindings/python/simgrid_python.cpp
+++ b/src/bindings/python/simgrid_python.cpp
@@ -659,28 +659,28 @@ PYBIND11_MODULE(simgrid, m)
                              "Check if there is a communication ready to be consumed from a mailbox.")
       .def(
           "put",
-          [](Mailbox* self, py::object data, int size, double timeout) {
+          [](Mailbox* self, py::object data, uint64_t size, double timeout) {
             data.inc_ref();
             self->put(data.ptr(), size, timeout);
           },
           py::call_guard<py::gil_scoped_release>(), "Blocking data transmission with a timeout")
       .def(
           "put",
-          [](Mailbox* self, py::object data, int size) {
+          [](Mailbox* self, py::object data, uint64_t size) {
             data.inc_ref();
             self->put(data.ptr(), size);
           },
           py::call_guard<py::gil_scoped_release>(), "Blocking data transmission")
       .def(
           "put_async",
-          [](Mailbox* self, py::object data, int size) {
+          [](Mailbox* self, py::object data, uint64_t size) {
             data.inc_ref();
             return self->put_async(data.ptr(), size);
           },
           py::call_guard<py::gil_scoped_release>(), "Non-blocking data transmission")
       .def(
           "put_init",
-          [](Mailbox* self, py::object data, int size) {
+          [](Mailbox* self, py::object data, uint64_t size) {
             data.inc_ref();
             return self->put_init(data.ptr(), size);
           },

diff --git a/src/kernel/resource/CpuImpl.hpp b/src/kernel/resource/CpuImpl.hpp
index a7f094c..aff4172 100644 (file)
--- a/src/kernel/resource/CpuImpl.hpp
+++ b/src/kernel/resource/CpuImpl.hpp
@@ -77,6 +77,8 @@ public:
   CpuImpl* set_core_count(int core_count);
   virtual int get_core_count() const { return core_count_; }
 
+  bool is_used() const override { return true; }
+
   void seal() override;
 
   /** @brief Get a forecast of the speed (in flops/s) if the load were as provided.

diff --git a/src/mc/transition/TransitionComm.hpp b/src/mc/transition/TransitionComm.hpp
index e5d0a7a..5a8a1e6 100644 (file)
--- a/src/mc/transition/TransitionComm.hpp
+++ b/src/mc/transition/TransitionComm.hpp
@@ -9,6 +9,7 @@
 #include "src/kernel/actor/SimcallObserver.hpp"
 #include "src/mc/transition/Transition.hpp"
 
+#include <cstdint>
 #include <sstream>
 #include <string>
 

diff --git a/src/mc/transition/TransitionSynchro.hpp b/src/mc/transition/TransitionSynchro.hpp
index 9f53a3a..6a4d51e 100644 (file)
--- a/src/mc/transition/TransitionSynchro.hpp
+++ b/src/mc/transition/TransitionSynchro.hpp
@@ -8,6 +8,8 @@
 
 #include "src/mc/transition/Transition.hpp"
 
+#include <cstdint>
+
 namespace simgrid::mc {
 
 class BarrierTransition : public Transition {

diff --git a/teshsuite/surf/surf_usage/surf_usage.tesh b/teshsuite/surf/surf_usage/surf_usage.tesh
index 29fbac9..083d552 100644 (file)
--- a/teshsuite/surf/surf_usage/surf_usage.tesh
+++ b/teshsuite/surf/surf_usage/surf_usage.tesh
@@ -11,20 +11,58 @@ $ ${bindir:=.}/surf_usage ${platfdir}/two_hosts_profiles.xml
 > [0.200016] [surf_test/INFO]    Network Done action
 > [1.000000] [surf_test/INFO] Next Event : 1
 > [1.000000] [surf_test/INFO]    CPU Failed action
+> [2.000000] [surf_test/INFO] Next Event : 2
 > [7.320000] [surf_test/INFO] Next Event : 7.32
 > [7.320000] [surf_test/INFO]    CPU Done action
 > [10.000000] [surf_test/INFO] Next Event : 10
+> [11.000000] [surf_test/INFO] Next Event : 11
+> [12.000000] [surf_test/INFO] Next Event : 12
 > [20.000000] [surf_test/INFO] Next Event : 20
+> [21.000000] [surf_test/INFO] Next Event : 21
+> [22.000000] [surf_test/INFO] Next Event : 22
 > [30.000000] [surf_test/INFO] Next Event : 30
+> [31.000000] [surf_test/INFO] Next Event : 31
+> [32.000000] [surf_test/INFO] Next Event : 32
 > [40.000000] [surf_test/INFO] Next Event : 40
+> [41.000000] [surf_test/INFO] Next Event : 41
+> [42.000000] [surf_test/INFO] Next Event : 42
 > [50.000000] [surf_test/INFO] Next Event : 50
+> [51.000000] [surf_test/INFO] Next Event : 51
+> [52.000000] [surf_test/INFO] Next Event : 52
+> [53.000000] [surf_test/INFO] Next Event : 53
 > [60.000000] [surf_test/INFO] Next Event : 60
+> [61.000000] [surf_test/INFO] Next Event : 61
+> [62.000000] [surf_test/INFO] Next Event : 62
+> [63.000000] [surf_test/INFO] Next Event : 63
 > [70.000000] [surf_test/INFO] Next Event : 70
+> [71.000000] [surf_test/INFO] Next Event : 71
+> [72.000000] [surf_test/INFO] Next Event : 72
+> [74.000000] [surf_test/INFO] Next Event : 74
 > [80.000000] [surf_test/INFO] Next Event : 80
+> [81.000000] [surf_test/INFO] Next Event : 81
+> [82.000000] [surf_test/INFO] Next Event : 82
+> [83.000000] [surf_test/INFO] Next Event : 83
+> [84.000000] [surf_test/INFO] Next Event : 84
 > [90.000000] [surf_test/INFO] Next Event : 90
+> [91.000000] [surf_test/INFO] Next Event : 91
+> [92.000000] [surf_test/INFO] Next Event : 92
+> [95.000000] [surf_test/INFO] Next Event : 95
 > [100.000000] [surf_test/INFO] Next Event : 100
+> [101.000000] [surf_test/INFO] Next Event : 101
+> [102.000000] [surf_test/INFO] Next Event : 102
+> [104.000000] [surf_test/INFO] Next Event : 104
+> [105.000000] [surf_test/INFO] Next Event : 105
 > [110.000000] [surf_test/INFO] Next Event : 110
+> [111.000000] [surf_test/INFO] Next Event : 111
+> [112.000000] [surf_test/INFO] Next Event : 112
+> [116.000000] [surf_test/INFO] Next Event : 116
 > [120.000000] [surf_test/INFO] Next Event : 120
+> [121.000000] [surf_test/INFO] Next Event : 121
+> [122.000000] [surf_test/INFO] Next Event : 122
+> [125.000000] [surf_test/INFO] Next Event : 125
+> [126.000000] [surf_test/INFO] Next Event : 126
 > [130.000000] [surf_test/INFO] Next Event : 130
+> [131.000000] [surf_test/INFO] Next Event : 131
+> [132.000000] [surf_test/INFO] Next Event : 132
 > [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 935bb53..a89c4fe 100644 (file)
--- a/teshsuite/surf/surf_usage2/surf_usage2.tesh
+++ b/teshsuite/surf/surf_usage2/surf_usage2.tesh
@@ -8,21 +8,59 @@ $ ${bindir:=.}/surf_usage2 ${platfdir}/two_hosts_profiles.xml
 > [0.200016] [surf_test/INFO]    * Done Action
 > [1.000000] [surf_test/INFO] Next Event : 1
 > [1.000000] [surf_test/INFO]    * Done Action
+> [2.000000] [surf_test/INFO] Next Event : 2
 > [7.320000] [surf_test/INFO] Next Event : 7.32
 > [7.320000] [surf_test/INFO]    * Done Action
 > [10.000000] [surf_test/INFO] Next Event : 10
+> [11.000000] [surf_test/INFO] Next Event : 11
+> [12.000000] [surf_test/INFO] Next Event : 12
 > [20.000000] [surf_test/INFO] Next Event : 20
+> [21.000000] [surf_test/INFO] Next Event : 21
+> [22.000000] [surf_test/INFO] Next Event : 22
 > [30.000000] [surf_test/INFO] Next Event : 30
+> [31.000000] [surf_test/INFO] Next Event : 31
+> [32.000000] [surf_test/INFO] Next Event : 32
 > [40.000000] [surf_test/INFO] Next Event : 40
+> [41.000000] [surf_test/INFO] Next Event : 41
+> [42.000000] [surf_test/INFO] Next Event : 42
 > [50.000000] [surf_test/INFO] Next Event : 50
+> [51.000000] [surf_test/INFO] Next Event : 51
+> [52.000000] [surf_test/INFO] Next Event : 52
+> [53.000000] [surf_test/INFO] Next Event : 53
 > [60.000000] [surf_test/INFO] Next Event : 60
+> [61.000000] [surf_test/INFO] Next Event : 61
+> [62.000000] [surf_test/INFO] Next Event : 62
+> [63.000000] [surf_test/INFO] Next Event : 63
 > [70.000000] [surf_test/INFO] Next Event : 70
+> [71.000000] [surf_test/INFO] Next Event : 71
+> [72.000000] [surf_test/INFO] Next Event : 72
+> [74.000000] [surf_test/INFO] Next Event : 74
 > [80.000000] [surf_test/INFO] Next Event : 80
+> [81.000000] [surf_test/INFO] Next Event : 81
+> [82.000000] [surf_test/INFO] Next Event : 82
+> [83.000000] [surf_test/INFO] Next Event : 83
+> [84.000000] [surf_test/INFO] Next Event : 84
 > [90.000000] [surf_test/INFO] Next Event : 90
+> [91.000000] [surf_test/INFO] Next Event : 91
+> [92.000000] [surf_test/INFO] Next Event : 92
+> [95.000000] [surf_test/INFO] Next Event : 95
 > [100.000000] [surf_test/INFO] Next Event : 100
+> [101.000000] [surf_test/INFO] Next Event : 101
+> [102.000000] [surf_test/INFO] Next Event : 102
+> [104.000000] [surf_test/INFO] Next Event : 104
+> [105.000000] [surf_test/INFO] Next Event : 105
 > [110.000000] [surf_test/INFO] Next Event : 110
+> [111.000000] [surf_test/INFO] Next Event : 111
+> [112.000000] [surf_test/INFO] Next Event : 112
+> [116.000000] [surf_test/INFO] Next Event : 116
 > [120.000000] [surf_test/INFO] Next Event : 120
+> [121.000000] [surf_test/INFO] Next Event : 121
+> [122.000000] [surf_test/INFO] Next Event : 122
+> [125.000000] [surf_test/INFO] Next Event : 125
+> [126.000000] [surf_test/INFO] Next Event : 126
 > [130.000000] [surf_test/INFO] Next Event : 130
+> [131.000000] [surf_test/INFO] Next Event : 131
+> [132.000000] [surf_test/INFO] Next Event : 132
 > [132.500000] [surf_test/INFO] Next Event : 132.5
 > [132.500000] [surf_test/INFO]    * Done Action
 > [132.500000] [surf_test/INFO] Simulation Terminated