really put 'network/crosstraffic' to yes by default, and fix the teshes

diff --git a/examples/msg/sendrecv/sendrecv_CLM03.tesh b/examples/msg/sendrecv/sendrecv_CLM03.tesh
index 1012f2f..fb32644 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_CLM03.tesh
+++ b/examples/msg/sendrecv/sendrecv_CLM03.tesh
@@ -2,7 +2,6 @@
 
 p Testing the deprecated CM02 network model
 
-! output sort 19
 $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
@@ -11,10 +10,10 @@ $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platfo
 > [  0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00
 > [  0.000000] (2:receiver@Jupiter) receiver
 > [  0.001462] (2:receiver@Jupiter) Task received : latency task
-> [  0.001462] (2:receiver@Jupiter) Communic. time 1.461656e-03
+> [  0.001462] (2:receiver@Jupiter) Communic. time 1.461663e-03
 > [  0.001462] (2:receiver@Jupiter) --- la 0.001462 ----
-> [  0.001462] (1:sender@Tremblay) task_bw->data = 1.461656e-03
-> [138.703988] (0:maestro@) Total simulation time: 1.387040e+02
-> [138.703988] (2:receiver@Jupiter) Task received : bandwidth task
-> [138.703988] (2:receiver@Jupiter) Communic. time 1.387025e+02
-> [138.703988] (2:receiver@Jupiter) --- bw 7209674.030423 ----
+> [  0.001462] (1:sender@Tremblay) task_bw->data = 1.461663e-03
+> [145.639041] (2:receiver@Jupiter) Task received : bandwidth task
+> [145.639041] (2:receiver@Jupiter) Communic. time 1.456376e+02
+> [145.639041] (2:receiver@Jupiter) --- bw 6866359.664748 ----
+> [145.639041] (0:maestro@) Total simulation time: 1.456390e+02

diff --git a/examples/msg/sendrecv/sendrecv_Reno.tesh b/examples/msg/sendrecv/sendrecv_Reno.tesh
index cd6a6ac..9227592 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_Reno.tesh
+++ b/examples/msg/sendrecv/sendrecv_Reno.tesh
@@ -2,7 +2,6 @@
 
 p Testing the surf network Reno fairness model using lagrangian approach
 
-! output sort 19
 $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
@@ -12,10 +11,10 @@ $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platfo
 > [  0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00
 > [  0.000000] (2:receiver@Jupiter) receiver
 > [  0.015200] (2:receiver@Jupiter) Task received : latency task
-> [  0.015200] (2:receiver@Jupiter) Communic. time 1.519993e-02
+> [  0.015200] (2:receiver@Jupiter) Communic. time 1.519994e-02
 > [  0.015200] (2:receiver@Jupiter) --- la 0.015200 ----
-> [  0.015200] (1:sender@Tremblay) task_bw->data = 1.519993e-02
-> [150.792426] (2:receiver@Jupiter) Task received : bandwidth task
-> [150.792426] (2:receiver@Jupiter) Communic. time 1.507772e+02
-> [150.792426] (2:receiver@Jupiter) --- bw 6632301.333611 ----
-> [150.792426] (0:maestro@) Total simulation time: 1.507924e+02
+> [  0.015200] (1:sender@Tremblay) task_bw->data = 1.519994e-02
+> [158.330528] (2:receiver@Jupiter) Task received : bandwidth task
+> [158.330528] (2:receiver@Jupiter) Communic. time 1.583153e+02
+> [158.330528] (2:receiver@Jupiter) --- bw 6316507.782677 ----
+> [158.330528] (0:maestro@) Total simulation time: 1.583305e+02

diff --git a/examples/msg/sendrecv/sendrecv_Vegas.tesh b/examples/msg/sendrecv/sendrecv_Vegas.tesh
index 3f8202b..20a2f5c 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_Vegas.tesh
+++ b/examples/msg/sendrecv/sendrecv_Vegas.tesh
@@ -2,7 +2,6 @@
 
 p Testing the surf network Vegas fairness model using lagrangian approach
 
-! output sort 19
 $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=host/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'host/model' to 'compound'
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
@@ -12,10 +11,10 @@ $ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/../platforms/small_platfo
 > [  0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00
 > [  0.000000] (2:receiver@Jupiter) receiver
 > [  0.015200] (2:receiver@Jupiter) Task received : latency task
-> [  0.015200] (2:receiver@Jupiter) Communic. time 1.519993e-02
+> [  0.015200] (2:receiver@Jupiter) Communic. time 1.519994e-02
 > [  0.015200] (2:receiver@Jupiter) --- la 0.015200 ----
-> [  0.015200] (1:sender@Tremblay) task_bw->data = 1.519993e-02
-> [150.792426] (2:receiver@Jupiter) Task received : bandwidth task
-> [150.792426] (2:receiver@Jupiter) Communic. time 1.507772e+02
-> [150.792426] (2:receiver@Jupiter) --- bw 6632301.333611 ----
-> [150.792426] (0:maestro@) Total simulation time: 1.507924e+02
+> [  0.015200] (1:sender@Tremblay) task_bw->data = 1.519994e-02
+> [158.330528] (2:receiver@Jupiter) Task received : bandwidth task
+> [158.330528] (2:receiver@Jupiter) Communic. time 1.583153e+02
+> [158.330528] (2:receiver@Jupiter) --- bw 6316507.782677 ----
+> [158.330528] (0:maestro@) Total simulation time: 1.583305e+02

diff --git a/examples/smpi/replay/smpi_replay.tesh b/examples/smpi/replay/smpi_replay.tesh
index 008fe23..8ea4b36 100644 (file)
--- a/examples/smpi/replay/smpi_replay.tesh
+++ b/examples/smpi/replay/smpi_replay.tesh
@@ -368,10 +368,10 @@ $ ../../smpi_script/bin/smpirun -ext smpi_replay --log=replay.thresh:critical --
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1'
-> [Tremblay:0:(1) 0.841244] [smpi_replay/VERBOSE] 0 allGatherV 275427 275427 275427 275427 204020 0 0 0.841244
-> [Fafard:2:(3) 1.239482] [smpi_replay/VERBOSE] 2 allGatherV 275427 275427 275427 275427 204020 0 0 1.239482
-> [Jupiter:1:(2) 1.239482] [smpi_replay/VERBOSE] 1 allGatherV 275427 275427 275427 275427 204020 0 0 1.239482
-> [Jupiter:1:(2) 1.239482] [smpi_replay/INFO] Simulation time 1.239482
+> [Tremblay:0:(1) 0.882872] [smpi_replay/VERBOSE] 0 allGatherV 275427 275427 275427 275427 204020 0 0 0.882872
+> [Fafard:2:(3) 1.300605] [smpi_replay/VERBOSE] 2 allGatherV 275427 275427 275427 275427 204020 0 0 1.300605
+> [Jupiter:1:(2) 1.300605] [smpi_replay/VERBOSE] 1 allGatherV 275427 275427 275427 275427 204020 0 0 1.300605
+> [Jupiter:1:(2) 1.300605] [smpi_replay/INFO] Simulation time 1.300605
 
 $ rm -f replay/one_trace
 

diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c
index 899f452..da271c8 100644 (file)
--- a/src/simgrid/sg_config.c
+++ b/src/simgrid/sg_config.c
@@ -759,7 +759,7 @@ void sg_config_init(int *argc, char **argv)
     xbt_cfg_register(&_sg_cfg_set, "network/crosstraffic",
                      "Activate the interferences between uploads and downloads for fluid max-min models (LV08, CM02)",
                      xbt_cfgelm_boolean, 1, 1, _sg_cfg_cb__surf_network_crosstraffic);
-    xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "no");
+    xbt_cfg_setdefault_boolean(_sg_cfg_set, "network/crosstraffic", "yes");
 
 #if HAVE_NS3
     xbt_cfg_register(&_sg_cfg_set, "ns3/TcpModel",

diff --git a/teshsuite/bug-17132/bug-17132.tesh b/teshsuite/bug-17132/bug-17132.tesh
index 7df9544..02351ba 100644 (file)
--- a/teshsuite/bug-17132/bug-17132.tesh
+++ b/teshsuite/bug-17132/bug-17132.tesh
@@ -4,4 +4,4 @@ $ ../../smpi_script/bin/smpirun -np 16 -platform ${srcdir:=.}/../../examples/pla
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'smpi/cpu_threshold' to '-1'
-> Walltime = 0.402239
+> Walltime = 0.420419

diff --git a/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh b/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh
index 923d2b4..eb5a4ed 100644 (file)
--- a/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh
+++ b/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh
@@ -1,70 +1,69 @@
 # Smpi Allreduce collectives tests
 ! setenv LD_LIBRARY_PATH=../../lib
-! output sort 19
 
 p Test allreduce
 $ ${bindir:=.}/../../../bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-allreduce --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error --cfg=smpi/allreduce:automatic --cfg=smpi/async_small_thresh:65536 --cfg=smpi/send_is_detached_thresh:128000 --cfg=smpi/running_power:-1 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.420130] (5:4@Jupiter) The quickest allreduce was redbcast on rank 4 and took 0.007482
-> [  0.420130] (6:5@Jupiter) The quickest allreduce was redbcast on rank 5 and took 0.007513
-> [  0.420130] (7:6@Jupiter) The quickest allreduce was redbcast on rank 6 and took 0.007513
-> [  0.420130] (8:7@Jupiter) The quickest allreduce was redbcast on rank 7 and took 0.007543
-> [  0.420342] (13:12@Ginette) The quickest allreduce was mvapich2_two_level on rank 12 and took 0.007247
-> [  0.420342] (14:13@Ginette) The quickest allreduce was mvapich2_two_level on rank 13 and took 0.007278
-> [  0.420342] (15:14@Ginette) The quickest allreduce was mvapich2_two_level on rank 14 and took 0.007278
-> [  0.420342] (16:15@Ginette) The quickest allreduce was ompi on rank 15 and took 0.007263
-> [  0.421734] (2:1@Tremblay) The quickest allreduce was redbcast on rank 1 and took 0.006004
-> [  0.421734] (3:2@Tremblay) The quickest allreduce was redbcast on rank 2 and took 0.006004
-> [  0.421734] (4:3@Tremblay) The quickest allreduce was redbcast on rank 3 and took 0.006034
-> [  0.422884] (10:9@Fafard) The quickest allreduce was mvapich2_two_level on rank 9 and took 0.006492
-> [  0.422884] (11:10@Fafard) The quickest allreduce was mvapich2_two_level on rank 10 and took 0.006492
-> [  0.422884] (12:11@Fafard) The quickest allreduce was mvapich2_two_level on rank 11 and took 0.006523
-> [  0.422884] (9:8@Fafard) The quickest allreduce was mvapich2_two_level on rank 8 and took 0.006462
-> [  0.426869] (1:0@Tremblay) For rank 0, the quickest was redbcast : 0.005988 , but global was mvapich2_two_level : 0.008672 at max
-> [0] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [rank 0] -> Tremblay
+> [rank 1] -> Tremblay
+> [rank 2] -> Tremblay
+> [rank 3] -> Tremblay
+> [rank 4] -> Jupiter
+> [rank 5] -> Jupiter
+> [rank 6] -> Jupiter
+> [rank 7] -> Jupiter
+> [rank 8] -> Fafard
+> [rank 9] -> Fafard
+> [rank 10] -> Fafard
+> [rank 11] -> Fafard
+> [rank 12] -> Ginette
+> [rank 13] -> Ginette
+> [rank 14] -> Ginette
+> [rank 15] -> Ginette
+> [  0.420156] (8:7@Jupiter) The quickest allreduce was redbcast on rank 7 and took 0.007545
+> [  0.420156] (5:4@Jupiter) The quickest allreduce was redbcast on rank 4 and took 0.007484
+> [  0.420156] (7:6@Jupiter) The quickest allreduce was redbcast on rank 6 and took 0.007514
+> [  0.420156] (6:5@Jupiter) The quickest allreduce was redbcast on rank 5 and took 0.007514
+> [  0.420368] (14:13@Ginette) The quickest allreduce was mvapich2_two_level on rank 13 and took 0.007278
+> [  0.420368] (13:12@Ginette) The quickest allreduce was mvapich2_two_level on rank 12 and took 0.007247
+> [  0.420368] (16:15@Ginette) The quickest allreduce was ompi on rank 15 and took 0.007263
+> [  0.420368] (15:14@Ginette) The quickest allreduce was mvapich2_two_level on rank 14 and took 0.007278
+> [  0.421760] (2:1@Tremblay) The quickest allreduce was redbcast on rank 1 and took 0.006005
+> [  0.421760] (3:2@Tremblay) The quickest allreduce was redbcast on rank 2 and took 0.006005
+> [  0.421760] (4:3@Tremblay) The quickest allreduce was redbcast on rank 3 and took 0.006036
+> [  0.422911] (12:11@Fafard) The quickest allreduce was mvapich2_two_level on rank 11 and took 0.006523
+> [  0.422911] (10:9@Fafard) The quickest allreduce was mvapich2_two_level on rank 9 and took 0.006492
+> [  0.422911] (9:8@Fafard) The quickest allreduce was mvapich2_two_level on rank 8 and took 0.006462
+> [  0.422911] (11:10@Fafard) The quickest allreduce was mvapich2_two_level on rank 10 and took 0.006492
+> [  0.426896] (1:0@Tremblay) For rank 0, the quickest was redbcast : 0.005990 , but global was mvapich2_two_level : 0.008672 at max
 > [0] sndbuf=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 ]
-> [10] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [1] sndbuf=[16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 ]
+> [2] sndbuf=[32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 ]
+> [3] sndbuf=[48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 ]
+> [4] sndbuf=[64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 ]
+> [5] sndbuf=[80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 ]
+> [6] sndbuf=[96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 ]
+> [7] sndbuf=[112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 ]
+> [8] sndbuf=[128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 ]
+> [9] sndbuf=[144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 ]
 > [10] sndbuf=[160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 ]
-> [11] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
 > [11] sndbuf=[176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 ]
-> [12] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
 > [12] sndbuf=[192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 ]
-> [13] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
 > [13] sndbuf=[208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 ]
-> [14] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
 > [14] sndbuf=[224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 ]
-> [15] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
 > [15] sndbuf=[240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 ]
+> [7] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [4] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [6] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [5] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [13] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [12] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [15] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [14] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
 > [1] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
-> [1] sndbuf=[16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 ]
 > [2] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
-> [2] sndbuf=[32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 ]
 > [3] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
-> [3] sndbuf=[48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 ]
-> [4] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
-> [4] sndbuf=[64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 ]
-> [5] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
-> [5] sndbuf=[80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 ]
-> [6] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
-> [6] sndbuf=[96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 ]
-> [7] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
-> [7] sndbuf=[112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 ]
-> [8] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
-> [8] sndbuf=[128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 ]
+> [11] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
 > [9] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
-> [9] sndbuf=[144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 ]
-> [rank 0] -> Tremblay
-> [rank 10] -> Fafard
-> [rank 11] -> Fafard
-> [rank 12] -> Ginette
-> [rank 13] -> Ginette
-> [rank 14] -> Ginette
-> [rank 15] -> Ginette
-> [rank 1] -> Tremblay
-> [rank 2] -> Tremblay
-> [rank 3] -> Tremblay
-> [rank 4] -> Jupiter
-> [rank 5] -> Jupiter
-> [rank 6] -> Jupiter
-> [rank 7] -> Jupiter
-> [rank 8] -> Fafard
-> [rank 9] -> Fafard
+> [8] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [10] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]
+> [0] rcvbuf=[1920 1936 1952 1968 1984 2000 2016 2032 2048 2064 2080 2096 2112 2128 2144 2160 ]

diff --git a/teshsuite/surf/surf_usage/surf_usage.tesh b/teshsuite/surf/surf_usage/surf_usage.tesh
index 430a1f6..ba50b64 100644 (file)
--- a/teshsuite/surf/surf_usage/surf_usage.tesh
+++ b/teshsuite/surf/surf_usage/surf_usage.tesh
@@ -9,8 +9,8 @@ $ $SG_TEST_EXENV ${bindir:=.}/surf_usage ${srcdir:=.}/../../../examples/platform
 > [0.000000] [surf_test/INFO] Next Event : 0
 > [0.000000] [surf_test/INFO]    CPU Failed action
 > [0.200000] [surf_test/INFO] Next Event : 0.2
-> [0.200015] [surf_test/INFO] Next Event : 0.200015
-> [0.200015] [surf_test/INFO]    Network Failed action
+> [0.200016] [surf_test/INFO] Next Event : 0.200016
+> [0.200016] [surf_test/INFO]    Network Failed action
 > [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

diff --git a/teshsuite/surf/surf_usage/surf_usage2.tesh b/teshsuite/surf/surf_usage/surf_usage2.tesh
index ca0d60c..ad12700 100644 (file)
--- a/teshsuite/surf/surf_usage/surf_usage2.tesh
+++ b/teshsuite/surf/surf_usage/surf_usage2.tesh
@@ -6,8 +6,8 @@ $ $SG_TEST_EXENV ${bindir:=.}/surf_usage2  ${srcdir:=.}/../../../examples/platfo
 > [0.000000] [surf_test/INFO] Next Event : 0
 > [0.000000] [surf_test/INFO]    * Done Action
 > [0.200000] [surf_test/INFO] Next Event : 0.2
-> [0.200015] [surf_test/INFO] Next Event : 0.200015
-> [0.200015] [surf_test/INFO]    * Done Action
+> [0.200016] [surf_test/INFO] Next Event : 0.200016
+> [0.200016] [surf_test/INFO]    * Done Action
 > [7.320000] [surf_test/INFO] Next Event : 7.32
 > [7.320000] [surf_test/INFO]    * Done Action
 > [10.000000] [surf_test/INFO] Next Event : 10