Merge branch 'factor_in_actions' into 'master'

New implementation for bandwidth factors

See merge request simgrid/simgrid!64

diff --git a/ChangeLog b/ChangeLog
index 3a014b7..6c779f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,30 @@ LUA:
 Simix:
  - Legacy functions deprecated in this release: SIMIX_get_clock(), SIMIX_run().
 
+Models:
+ - Changed internal implementation of bandwidth factors in network models.
+   Models affected: CM02, LV08 (default), SMPI, IB.
+   Configuration affected: "network/bandwidth-factors" and "smpi/bw-factors".
+   Bandwidth factors are applied to communications to describe that users
+   cannot use 100% of the available bandwidth. For example, the default network model,
+   LV08, applies a factor of 0.97 to the bandwidth. In older versions, this
+   behavior was implemented by limiting the bandwidth available in the LMM
+   system for this flow. This may give the false impression that there is
+   bandwidth available for other flows due to its underutilization, especially
+   for the dynamic bandwidth factors used in SMPI models.
+   To avoid this, we have modified the implementation so that each flow uses the
+   maximum physical bandwidth according to the LMM system.
+   However, the actual throughput of the flow seen by the user is defined by
+   the physical bandwidth multiplied by the bandwidth factor.
+   This change impacts on the simulation results for all network models on
+   which we have bandwidth factors configured.
+   *****************************************
+   *DO NOT MIX 3.28 RESULTS WITH OLDER ONES*
+   *****************************************
+   This change may impact on the timing of your simulation results.
+   Take care when comparing simulations from different SimGrid's
+   versions. Sorry for the inconvenience.
+
 XBT:
  - xbt_assert is not disabled anymore, even when built with enable_debug=off.
 

diff --git a/examples/c/app-token-ring/app-token-ring.tesh b/examples/c/app-token-ring/app-token-ring.tesh
index 8f68d1d..802b90d 100644 (file)
--- a/examples/c/app-token-ring/app-token-ring.tesh
+++ b/examples/c/app-token-ring/app-token-ring.tesh
@@ -19,10 +19,11 @@ $ ${bindir:=.}/c-app-token-ring ${platfdir}/routing_cluster.xml "--log=root.fmt:
 $ ${bindir:=.}/c-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%a@%h)%e%m%n"
 > [    0.000000] (maestro@) Number of hosts '2'
 > [    0.000000] (0@100030591) Host "0" send 'Token' to Host "1"
-> [    0.624423] (1@100036570) Host "1" received "Token"
-> [    0.624423] (1@100036570) Host "1" send 'Token' to Host "0"
-> [    1.248846] (0@100030591) Host "0" received "Token"
-> [    1.248846] (maestro@) Simulation time 1.24885
+> [    0.625106] (1@100036570) Host "1" received "Token"
+> [    0.625106] (1@100036570) Host "1" send 'Token' to Host "0"
+> [    1.250212] (0@100030591) Host "0" received "Token"
+> [    1.250212] (maestro@) Simulation time 1.25021
+
 
 $ ${bindir:=.}/c-app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n"
 > [  0.000000] (maestro@) Number of hosts '60'

diff --git a/examples/cpp/app-token-ring/s4u-app-token-ring.tesh b/examples/cpp/app-token-ring/s4u-app-token-ring.tesh
index 56d7535..08a28c2 100644 (file)
--- a/examples/cpp/app-token-ring/s4u-app-token-ring.tesh
+++ b/examples/cpp/app-token-ring/s4u-app-token-ring.tesh
@@ -35,10 +35,10 @@ $ ${bindir:=.}/s4u-app-token-ring ${libdir}/librouting_cluster.so "--log=root.fm
 $ ${bindir:=.}/s4u-app-token-ring ${platfdir}/two_peers.xml "--log=root.fmt:[%12.6r]%e(%a@%h)%e%m%n"
 > [    0.000000] (maestro@) Number of hosts '2'
 > [    0.000000] (0@100030591) Host "0" send 'Token' to Host "1"
-> [    0.624423] (1@100036570) Host "1" received "Token"
-> [    0.624423] (1@100036570) Host "1" send 'Token' to Host "0"
-> [    1.248846] (0@100030591) Host "0" received "Token"
-> [    1.248846] (maestro@) Simulation time 1.24885
+> [    0.625106] (1@100036570) Host "1" received "Token"
+> [    0.625106] (1@100036570) Host "1" send 'Token' to Host "0"
+> [    1.250212] (0@100030591) Host "0" received "Token"
+> [    1.250212] (maestro@) Simulation time 1.25021
 
 $ ${bindir:=.}/s4u-app-token-ring ${platfdir}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%a@%h)%e%m%n"
 > [  0.000000] (maestro@) Number of hosts '60'

diff --git a/examples/cpp/network-factors/s4u-network-factors.cpp b/examples/cpp/network-factors/s4u-network-factors.cpp
index e4235a0..0e2d09d 100644 (file)
--- a/examples/cpp/network-factors/s4u-network-factors.cpp
+++ b/examples/cpp/network-factors/s4u-network-factors.cpp
@@ -151,9 +151,14 @@ static double bandwidth_factor_cb(double size, const sg4::Host* src, const sg4::
 /*************************************************************************************************/
 class Sender {
   std::vector<sg4::Host*> hosts_;
+  double crosstraffic_ = 1.0;
 
 public:
-  explicit Sender(const std::vector<sg4::Host*>& hosts) : hosts_{hosts} {}
+  explicit Sender(const std::vector<sg4::Host*>& hosts, bool crosstraffic) : hosts_{hosts}
+  {
+    if (crosstraffic)
+      crosstraffic_ = 1.05; // add crosstraffic load if it is enabled
+  }
   void operator()() const
   {
     const std::vector<double> msg_sizes = {64e3, 64e6, 64e9}; // 64KB, 64MB, 64GB
@@ -165,7 +170,11 @@ public:
         if (host->get_name() == sg4::this_actor::get_host()->get_name()) {
           double lat_factor = get_factor_from_map(LOCAL_LAT_FACTOR, size);
           double bw_factor  = get_factor_from_map(LOCAL_BW_FACTOR, size);
-          double est_time   = sg4::Engine::get_clock() + size / (BW_LOCAL * bw_factor) + LATENCY * lat_factor;
+          /* Account for crosstraffic on local communications
+           * local communications use only a single link and crosstraffic impact on resource sharing
+           * on remote communications, we don't see this effect since we have split-duplex links */
+          double est_time =
+              sg4::Engine::get_clock() + size / (BW_LOCAL * bw_factor / crosstraffic_) + LATENCY * lat_factor;
 
           msg = "Local communication: size=" + std::to_string(size) + ". Use bw_factor=" + std::to_string(bw_factor) +
                 " lat_factor=" + std::to_string(lat_factor) + ". Estimated finished time=" + std::to_string(est_time);
@@ -211,10 +220,17 @@ public:
 /*************************************************************************************************/
 int main(int argc, char* argv[])
 {
+  bool crosstraffic = true;
   sg4::Engine e(&argc, argv);
   /* setting network model to default one */
   sg4::Engine::set_config("network/model:CM02");
 
+  /* test with crosstraffic disabled */
+  if (argc == 2 && std::string(argv[1]) == "disable_crosstraffic") {
+    sg4::Engine::set_config("network/crosstraffic:0");
+    crosstraffic = false;
+  }
+
   /* create platform */
   load_platform();
   /* setting network factors callbacks */
@@ -226,7 +242,8 @@ int main(int argc, char* argv[])
   sg4::Host* host_remote = e.host_by_name("dahu-10.grid5000.fr");
   sg4::Actor::create(std::string("receiver-local"), host, Receiver());
   sg4::Actor::create(std::string("receiver-remote"), host_remote, Receiver());
-  sg4::Actor::create(std::string("sender") + std::string(host->get_name()), host, Sender({host, host_remote}));
+  sg4::Actor::create(std::string("sender") + std::string(host->get_name()), host,
+                     Sender({host, host_remote}, crosstraffic));
 
   /* runs the simulation */
   e.run();

diff --git a/examples/cpp/network-factors/s4u-network-factors.tesh b/examples/cpp/network-factors/s4u-network-factors.tesh
index 86d7a07..22f1b03 100644 (file)
--- a/examples/cpp/network-factors/s4u-network-factors.tesh
+++ b/examples/cpp/network-factors/s4u-network-factors.tesh
@@ -1,5 +1,6 @@
-$ ${bindir:=.}/s4u-network-factors "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n"
+$ ${bindir:=.}/s4u-network-factors disable_crosstraffic "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
+> [  0.000000] (0:maestro@) Configuration change: Set 'network/crosstraffic' to '0'
 > [  0.000086] (1:receiver-local@dahu-1.grid5000.fr) I got a 'Local communication: size=64000.000000. Use bw_factor=0.121192 lat_factor=650.221238. Estimated finished time=0.000086'.
 > [  0.000455] (2:receiver-remote@dahu-10.grid5000.fr) I got a 'Remote communication: size=64000.000000. Use bw_factor=0.316335 lat_factor=1761.478483. Estimated finished time=0.000455'.
 > [  0.060247] (1:receiver-local@dahu-1.grid5000.fr) I got a 'Local communication: size=64000000.000000. Use bw_factor=0.042815 lat_factor=0.000000. Estimated finished time=0.060247'.
@@ -9,3 +10,15 @@ $ ${bindir:=.}/s4u-network-factors "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n"
 > [ 27.801800] (3:senderdahu-1.grid5000.fr@dahu-1.grid5000.fr) Done dispatching all messages
 > [ 27.801800] (1:receiver-local@dahu-1.grid5000.fr) I got a 'finalize'.
 > [ 27.801800] (2:receiver-remote@dahu-10.grid5000.fr) I got a 'finalize'.
+
+$ ${bindir:=.}/s4u-network-factors "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
+> [  0.000087] (1:receiver-local@dahu-1.grid5000.fr) I got a 'Local communication: size=64000.000000. Use bw_factor=0.121192 lat_factor=650.221238. Estimated finished time=0.000087'.
+> [  0.000456] (2:receiver-remote@dahu-10.grid5000.fr) I got a 'Remote communication: size=64000.000000. Use bw_factor=0.316335 lat_factor=1761.478483. Estimated finished time=0.000456'.
+> [  0.063237] (1:receiver-local@dahu-1.grid5000.fr) I got a 'Local communication: size=64000000.000000. Use bw_factor=0.042815 lat_factor=0.000000. Estimated finished time=0.063237'.
+> [  0.112683] (2:receiver-remote@dahu-10.grid5000.fr) I got a 'Remote communication: size=64000000.000000. Use bw_factor=0.103547 lat_factor=0.000000. Estimated finished time=0.112683'.
+> [ 15.626857] (1:receiver-local@dahu-1.grid5000.fr) I got a 'Local communication: size=64000000000.000000. Use bw_factor=0.174405 lat_factor=1017885.351877. Estimated finished time=15.626857'.
+> [ 28.538713] (2:receiver-remote@dahu-10.grid5000.fr) I got a 'Remote communication: size=64000000000.000000. Use bw_factor=0.402589 lat_factor=970913.455816. Estimated finished time=28.538713'.
+> [ 28.538713] (3:senderdahu-1.grid5000.fr@dahu-1.grid5000.fr) Done dispatching all messages
+> [ 28.538713] (1:receiver-local@dahu-1.grid5000.fr) I got a 'finalize'.
+> [ 28.538713] (2:receiver-remote@dahu-10.grid5000.fr) I got a 'finalize'.

diff --git a/examples/cpp/network-wifi/s4u-network-wifi.tesh b/examples/cpp/network-wifi/s4u-network-wifi.tesh
index 0cb06ba..980f6bd 100644 (file)
--- a/examples/cpp/network-wifi/s4u-network-wifi.tesh
+++ b/examples/cpp/network-wifi/s4u-network-wifi.tesh
@@ -1,6 +1,7 @@
 #!/usr/bin/env tesh
 
-$ ${bindir:=.}/s4u-network-wifi ${platfdir}/wifi.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n"
+$ ${bindir:=.}/s4u-network-wifi ${platfdir}/wifi.xml "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n" --cfg=network/model:CM02
+> [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
 > [  0.000000] (1:sender@Station 1) Send a message to the other station.
 > [  0.000000] (2:receiver@Station 2) Wait for a message.
 > [  3.888889] (1:sender@Station 1) Done.

diff --git a/examples/cpp/plugin-link-load/s4u-plugin-link-load.tesh b/examples/cpp/plugin-link-load/s4u-plugin-link-load.tesh
index a2df7c4..06f3d46 100644 (file)
--- a/examples/cpp/plugin-link-load/s4u-plugin-link-load.tesh
+++ b/examples/cpp/plugin-link-load/s4u-plugin-link-load.tesh
@@ -7,62 +7,62 @@ $ ${bindir:=.}/s4u-plugin-link-load ${platfdir}/cluster_backbone.xml "--log=root
 > [  0.000000] (2:monitor@node-51.simgrid.org) Backbone link load (cum, avg, min, max): (0, 0, 0, 0)
 > [  1.000000] (2:monitor@node-51.simgrid.org) Backbone link load (cum, avg, min, max): (0, 0, 0, 0)
 > [  1.000000] (1:load_test@node-42.simgrid.org) Launching the transfer of 1000000000 bytes
-> [  2.000000] (2:monitor@node-51.simgrid.org) Backbone link load (cum, avg, min, max): (1.27312e+08, 6.36562e+07, 0, 1.27312e+08)
-> [  3.000000] (2:monitor@node-51.simgrid.org) Backbone link load (cum, avg, min, max): (2.54625e+08, 8.4875e+07, 0, 1.27312e+08)
-> [  4.000000] (2:monitor@node-51.simgrid.org) Backbone link load (cum, avg, min, max): (3.81938e+08, 9.54844e+07, 0, 1.27312e+08)
-> [  5.000000] (2:monitor@node-51.simgrid.org) Backbone link load (cum, avg, min, max): (5.0925e+08, 1.0185e+08, 0, 1.27312e+08)
+> [  2.000000] (2:monitor@node-51.simgrid.org) Backbone link load (cum, avg, min, max): (1.3125e+08, 6.5625e+07, 0, 1.3125e+08)
+> [  3.000000] (2:monitor@node-51.simgrid.org) Backbone link load (cum, avg, min, max): (2.625e+08, 8.75e+07, 0, 1.3125e+08)
+> [  4.000000] (2:monitor@node-51.simgrid.org) Backbone link load (cum, avg, min, max): (3.9375e+08, 9.84375e+07, 0, 1.3125e+08)
+> [  5.000000] (2:monitor@node-51.simgrid.org) Backbone link load (cum, avg, min, max): (5.25e+08, 1.05e+08, 0, 1.3125e+08)
 > [  5.000000] (2:monitor@node-51.simgrid.org) Untracking the backbone link
-> [  5.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (4.85e+08, 9.7e+07, 0, 1.2125e+08)
-> [  5.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (4.85e+08, 9.7e+07, 0, 1.2125e+08)
+> [  5.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (5e+08, 1e+08, 0, 1.25e+08)
+> [  5.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (5e+08, 1e+08, 0, 1.25e+08)
 > [  5.000000] (2:monitor@node-51.simgrid.org) Now resetting and probing host links each second.
-> [  6.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [  6.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [  7.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [  7.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [  8.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [  8.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [  9.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [  9.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 10.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (3.09465e+07, 3.09465e+07, 0, 1.2125e+08)
-> [ 10.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (3.09465e+07, 3.09465e+07, 0, 1.2125e+08)
+> [  6.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [  6.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [  7.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [  7.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [  8.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [  8.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [  9.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [  9.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 10.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (3.19036e+07, 3.19036e+07, 0, 1.25e+08)
+> [ 10.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (3.19036e+07, 3.19036e+07, 0, 1.25e+08)
 > [ 11.000000] (1:load_test@node-42.simgrid.org) Launching the transfer of 1000000000 bytes
 > [ 11.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (0, 0, 0, 0)
 > [ 11.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (0, 0, 0, 0)
-> [ 12.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 0, 1.2125e+08)
-> [ 12.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 0, 1.2125e+08)
-> [ 13.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 13.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
+> [ 12.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 0, 1.25e+08)
+> [ 12.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 0, 1.25e+08)
+> [ 13.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 13.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
 > [ 14.000000] (1:load_test@node-42.simgrid.org) Launching the transfer of 1000000000 bytes
-> [ 14.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 14.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 15.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 15.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 16.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 16.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 17.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 17.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 18.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 18.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 19.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 19.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 20.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 20.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 21.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 21.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 22.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 22.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 23.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 23.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 24.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 24.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 25.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 25.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 26.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 26.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 27.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 27.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.2125e+08, 1.2125e+08, 1.2125e+08, 1.2125e+08)
-> [ 28.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (6.09465e+07, 6.09465e+07, 0, 1.2125e+08)
-> [ 28.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (6.09465e+07, 6.09465e+07, 0, 1.2125e+08)
+> [ 14.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 14.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 15.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 15.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 16.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 16.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 17.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 17.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 18.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 18.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 19.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 19.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 20.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 20.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 21.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 21.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 22.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 22.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 23.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 23.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 24.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 24.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 25.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 25.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 26.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 26.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 27.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 27.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (1.25e+08, 1.25e+08, 1.25e+08, 1.25e+08)
+> [ 28.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (6.28314e+07, 6.28314e+07, 0, 1.25e+08)
+> [ 28.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (6.28314e+07, 6.28314e+07, 0, 1.25e+08)
 > [ 29.000000] (2:monitor@node-51.simgrid.org) Host0_UP link load (cum, avg, min, max): (0, 0, 0, 0)
 > [ 29.000000] (2:monitor@node-51.simgrid.org) Host1_UP link load (cum, avg, min, max): (0, 0, 0, 0)
 > [ 29.000000] (0:maestro@) Total simulation time: 29.00

diff --git a/examples/deprecated/java/app/tokenring/app-tokenring.tesh b/examples/deprecated/java/app/tokenring/app-tokenring.tesh
index 1b0626d..3972847 100644 (file)
--- a/examples/deprecated/java/app/tokenring/app-tokenring.tesh
+++ b/examples/deprecated/java/app/tokenring/app-tokenring.tesh
@@ -22,11 +22,11 @@ $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/..
 > [    0.000000] (0:maestro@) Using regular java threads.
 > [    0.000000] (0:maestro@) Number of hosts '2'
 > [    0.000000] (1:0@100030591) Host '0' send 'Token' to Host '1'
-> [    0.624423] (2:1@100036570) Host '1' received 'Token'
-> [    0.624423] (2:1@100036570) Host '1' send 'Token' to Host '0'
-> [    1.248846] (1:0@100030591) Host '0' received 'Token'
-> [    1.248846] (0:maestro@) Terminating the simulation...
-> [    1.248846] (0:maestro@) Simulation time 1.2488464578972847
+> [    0.625106] (2:1@100036570) Host '1' received 'Token'
+> [    0.625106] (2:1@100036570) Host '1' send 'Token' to Host '0'
+> [    1.250212] (1:0@100030591) Host '0' received 'Token'
+> [    1.250212] (0:maestro@) Terminating the simulation...
+> [    1.250212] (0:maestro@) Simulation time 1.250212042288475
 
 $ ${javacmd:=java} -classpath ${classpath:=.} app/tokenring/Main ${srcdir:=.}/../../platforms/meta_cluster.xml '--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n'
 > [  0.000000] (0:maestro@) Using regular java threads.

diff --git a/examples/smpi/gemm/gemm.tesh b/examples/smpi/gemm/gemm.tesh
index 3978602..0a46ea3 100644 (file)
--- a/examples/smpi/gemm/gemm.tesh
+++ b/examples/smpi/gemm/gemm.tesh
@@ -8,10 +8,10 @@ $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ${srcdir:=.}/../hostfi
 > You requested to use 8 ranks, but there is only 5 processes in your hostfile...
 > Matrix Size : 1000x1000
 > Native mode
-> Performance= 227.29 GFlop/s, Time= 8.799 sec, Size= 2000000000 Ops
+> Performance= 220.56 GFlop/s, Time= 9.068 sec, Size= 2000000000 Ops
 
 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ${srcdir:=.}/../hostfile -platform ${platfdir:=.}/small_platform.xml --cfg=path:${srcdir:=.}/../msg --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/host-speed:1f -np 8 ${bindir:=.}/smpi_gemm 1000 sampling
 > You requested to use 8 ranks, but there is only 5 processes in your hostfile...
 > Matrix Size : 1000x1000
 > Sampling mode
-> Performance= 227.29 GFlop/s, Time= 8.799 sec, Size= 2000000000 Ops
+> Performance= 220.56 GFlop/s, Time= 9.068 sec, Size= 2000000000 Ops

diff --git a/examples/smpi/replay/replay-override-replayer.tesh b/examples/smpi/replay/replay-override-replayer.tesh
index 75e8e7a..83ba491 100644 (file)
--- a/examples/smpi/replay/replay-override-replayer.tesh
+++ b/examples/smpi/replay/replay-override-replayer.tesh
@@ -10,21 +10,21 @@ $ mkfile replay/one_trace_override
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace_override --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
 > [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 bcast 5e4 0.000000
-> [Jupiter:1:(2) 0.015039] [smpi_replay/VERBOSE] 1 bcast 5e4 0.015039
-> [Fafard:2:(3) 0.015678] [smpi_replay/VERBOSE] 2 bcast 5e4 0.015678
-> [Jupiter:1:(2) 2.636409] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
+> [Jupiter:1:(2) 0.015536] [smpi_replay/VERBOSE] 1 bcast 5e4 0.015536
+> [Fafard:2:(3) 0.016118] [smpi_replay/VERBOSE] 2 bcast 5e4 0.016118
+> [Jupiter:1:(2) 2.636906] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
 > [Tremblay:0:(1) 5.097100] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
 > [Tremblay:0:(1) 5.097100] [smpi_replay/VERBOSE] 0 bcast 5e4 0.000000
-> [Jupiter:1:(2) 5.112139] [smpi_replay/VERBOSE] 1 bcast 5e4 2.475730
-> [Fafard:2:(3) 6.569102] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
-> [Fafard:2:(3) 6.584781] [smpi_replay/VERBOSE] 2 bcast 5e4 0.015678
-> [Jupiter:1:(2) 7.733508] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
+> [Jupiter:1:(2) 5.112636] [smpi_replay/VERBOSE] 1 bcast 5e4 2.475730
+> [Fafard:2:(3) 6.569541] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
+> [Fafard:2:(3) 6.585659] [smpi_replay/VERBOSE] 2 bcast 5e4 0.016118
+> [Jupiter:1:(2) 7.734005] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
 > [Tremblay:0:(1) 10.194200] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
-> [Fafard:2:(3) 13.138204] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
-> [Jupiter:1:(2) 14.286932] [smpi_replay/VERBOSE] 1 reduce 5e4 5e8 6.553424
-> [Tremblay:0:(1) 18.250982] [smpi_replay/VERBOSE] 0 reduce 5e4 5e8 8.056783
-> [Fafard:2:(3) 19.691628] [smpi_replay/VERBOSE] 2 reduce 5e4 5e8 6.553424
-> [Fafard:2:(3) 19.691628] [smpi_replay/INFO] Simulation time 19.691628
+> [Fafard:2:(3) 13.139083] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
+> [Jupiter:1:(2) 14.287429] [smpi_replay/VERBOSE] 1 reduce 5e4 5e8 6.553424
+> [Tremblay:0:(1) 18.252300] [smpi_replay/VERBOSE] 0 reduce 5e4 5e8 8.058101
+> [Fafard:2:(3) 19.692506] [smpi_replay/VERBOSE] 2 reduce 5e4 5e8 6.553424
+> [Fafard:2:(3) 19.692506] [smpi_replay/INFO] Simulation time 19.692506
 
 $ rm -f replay/one_trace_override
 
@@ -34,7 +34,7 @@ p The same with tracing activated
 $ mkfile replay/one_trace_override
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace_override --log=replay.thresh:critical --log=no_loc  --cfg=tracing:yes --cfg=tracing/smpi:yes --cfg=tracing/smpi/computing:yes --cfg=tracing/filename:./simgrid_override.trace  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile  --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Fafard:2:(3) 19.691628] [smpi_replay/INFO] Simulation time 19.691628
+> [Fafard:2:(3) 19.692506] [smpi_replay/INFO] Simulation time 19.692506
 
 # $ rm -f replay/one_trace_override
 
@@ -171,46 +171,46 @@ $ tail -n +3 ./simgrid_override.trace
 > 12 0.000000 2 1 7
 > 5 9 2 action_reduce "0 1 0"
 > 5 10 2 smpi_replay_run_finalize "0 1 0"
-> 13 0.015039 2 2
-> 12 0.015039 2 2 7
-> 13 0.015678 2 3
-> 12 0.015678 2 3 7
-> 13 2.636409 2 2
-> 12 2.636409 2 2 8
+> 13 0.015536 2 2
+> 12 0.015536 2 2 7
+> 13 0.016118 2 3
+> 12 0.016118 2 3 7
+> 13 2.636906 2 2
+> 12 2.636906 2 2 8
 > 13 5.097100 2 1
 > 12 5.097100 2 1 8
 > 13 5.097100 2 1
 > 12 5.097100 2 1 7
-> 13 5.112139 2 2
-> 12 5.112139 2 2 7
-> 13 6.569102 2 3
-> 12 6.569102 2 3 8
-> 13 6.584781 2 3
-> 12 6.584781 2 3 7
-> 13 7.733508 2 2
-> 12 7.733508 2 2 9
-> 12 7.733508 2 2 7
+> 13 5.112636 2 2
+> 12 5.112636 2 2 7
+> 13 6.569541 2 3
+> 12 6.569541 2 3 8
+> 13 6.585659 2 3
+> 12 6.585659 2 3 7
+> 13 7.734005 2 2
+> 12 7.734005 2 2 9
+> 12 7.734005 2 2 7
 > 13 10.194200 2 1
 > 12 10.194200 2 1 9
-> 13 13.138204 2 3
-> 12 13.138204 2 3 9
-> 12 13.138204 2 3 7
-> 12 13.153883 2 1 7
-> 13 14.286932 2 2
-> 13 14.286932 2 2
-> 12 14.286932 2 2 10
-> 13 14.286932 2 2
-> 7 14.286932 1 2
-> 13 18.250982 2 1
-> 13 18.250982 2 1
-> 12 18.250982 2 1 10
-> 13 18.250982 2 1
-> 7 18.250982 1 1
-> 13 19.691628 2 3
-> 13 19.691628 2 3
-> 12 19.691628 2 3 10
-> 13 19.691628 2 3
-> 7 19.691628 1 3
+> 13 13.139083 2 3
+> 12 13.139083 2 3 9
+> 12 13.139083 2 3 7
+> 12 13.155200 2 1 7
+> 13 14.287429 2 2
+> 13 14.287429 2 2
+> 12 14.287429 2 2 10
+> 13 14.287429 2 2
+> 7 14.287429 1 2
+> 13 18.252300 2 1
+> 13 18.252300 2 1
+> 12 18.252300 2 1 10
+> 13 18.252300 2 1
+> 7 18.252300 1 1
+> 13 19.692506 2 3
+> 13 19.692506 2 3
+> 12 19.692506 2 3 10
+> 13 19.692506 2 3
+> 7 19.692506 1 3
 
 $ rm -f ./simgrid_override.trace
 
@@ -221,15 +221,15 @@ p Another test of trace replay with SMPI (one trace per process)
 $ mkfile ./split_traces_tesh_override
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay ./split_traces_tesh_override --log=smpi_replay.thresh:verbose --log=no_loc  -np 2 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 0.167160] [smpi_replay/VERBOSE] 0 send 1 0 1e6 0.167160
-> [Jupiter:1:(2) 0.167160] [smpi_replay/VERBOSE] 1 recv 0 0 1e6 0.167160
-> [Jupiter:1:(2) 13.274007] [smpi_replay/VERBOSE] 1 compute 1e9 13.106847
-> [Jupiter:1:(2) 13.274007] [smpi_replay/VERBOSE] 1 isend 0 1 1e6 0.000000
-> [Jupiter:1:(2) 13.274007] [smpi_replay/VERBOSE] 1 irecv 0 2 1e6 0.000000
-> [Tremblay:0:(1) 13.441167] [smpi_replay/VERBOSE] 0 recv 1 1 1e6 13.274007
-> [Jupiter:1:(2) 13.608327] [smpi_replay/VERBOSE] 1 wait 0 1 2 0.334320
-> [Tremblay:0:(1) 13.608327] [smpi_replay/VERBOSE] 0 send 1 2 1e6 0.167160
-> [Jupiter:1:(2) 13.608327] [smpi_replay/INFO] Simulation time 13.608327
+> [Tremblay:0:(1) 0.171838] [smpi_replay/VERBOSE] 0 send 1 0 1e6 0.171838
+> [Jupiter:1:(2) 0.171838] [smpi_replay/VERBOSE] 1 recv 0 0 1e6 0.171838
+> [Jupiter:1:(2) 13.278685] [smpi_replay/VERBOSE] 1 compute 1e9 13.106847
+> [Jupiter:1:(2) 13.278685] [smpi_replay/VERBOSE] 1 isend 0 1 1e6 0.000000
+> [Jupiter:1:(2) 13.278685] [smpi_replay/VERBOSE] 1 irecv 0 2 1e6 0.000000
+> [Tremblay:0:(1) 13.450522] [smpi_replay/VERBOSE] 0 recv 1 1 1e6 13.278685
+> [Jupiter:1:(2) 13.622360] [smpi_replay/VERBOSE] 1 wait 0 1 2 0.343675
+> [Tremblay:0:(1) 13.622360] [smpi_replay/VERBOSE] 0 send 1 2 1e6 0.171838
+> [Jupiter:1:(2) 13.622360] [smpi_replay/INFO] Simulation time 13.622360
 
 $ rm -f ./split_traces_tesh_override
 
@@ -239,15 +239,15 @@ p Test of barrier replay with SMPI (one trace for all processes)
 $ mkfile replay/one_trace_override
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace_override --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 1.518423] [smpi_replay/VERBOSE] 0 send 1 0 1e7 1.518423
-> [Jupiter:1:(2) 1.518423] [smpi_replay/VERBOSE] 1 recv 0 0 1e7 1.518423
-> [Tremblay:0:(1) 1.522406] [smpi_replay/VERBOSE] 0 barrier 0.003983
-> [Jupiter:1:(2) 1.525354] [smpi_replay/VERBOSE] 1 barrier 0.006931
-> [Fafard:2:(3) 1.526390] [smpi_replay/VERBOSE] 2 barrier 1.526390
-> [Tremblay:0:(1) 2.522406] [smpi_replay/VERBOSE] 0 compute 98095000 1.000000
-> [Jupiter:1:(2) 2.525354] [smpi_replay/VERBOSE] 1 compute 76296000 1.000000
-> [Fafard:2:(3) 2.526390] [smpi_replay/VERBOSE] 2 compute 76296000 1.000000
-> [Fafard:2:(3) 2.526390] [smpi_replay/INFO] Simulation time 2.526390
+> [Tremblay:0:(1) 1.565197] [smpi_replay/VERBOSE] 0 send 1 0 1e7 1.565197
+> [Jupiter:1:(2) 1.565197] [smpi_replay/VERBOSE] 1 recv 0 0 1e7 1.565197
+> [Tremblay:0:(1) 1.569181] [smpi_replay/VERBOSE] 0 barrier 0.003984
+> [Jupiter:1:(2) 1.572128] [smpi_replay/VERBOSE] 1 barrier 0.006931
+> [Fafard:2:(3) 1.573164] [smpi_replay/VERBOSE] 2 barrier 1.573164
+> [Tremblay:0:(1) 2.569181] [smpi_replay/VERBOSE] 0 compute 98095000 1.000000
+> [Jupiter:1:(2) 2.572128] [smpi_replay/VERBOSE] 1 compute 76296000 1.000000
+> [Fafard:2:(3) 2.573164] [smpi_replay/VERBOSE] 2 compute 76296000 1.000000
+> [Fafard:2:(3) 2.573164] [smpi_replay/INFO] Simulation time 2.573164
 
 $ rm -f replay/one_trace_override
 
@@ -261,19 +261,19 @@ $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace_override
 > [Jupiter:1:(2) 6.553424] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424
 > [Jupiter:1:(2) 6.553524] [smpi_replay/VERBOSE] 1 test 0 1 0 0.000100
 > [Tremblay:0:(1) 10.194200] [smpi_replay/VERBOSE] 0 compute 1e9 10.194200
-> [Tremblay:0:(1) 10.361360] [smpi_replay/VERBOSE] 0 send 1 0 1e6 0.167160
+> [Tremblay:0:(1) 10.366037] [smpi_replay/VERBOSE] 0 send 1 0 1e6 0.171838
 > [Jupiter:1:(2) 13.106947] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424
 > [Jupiter:1:(2) 13.106947] [smpi_replay/VERBOSE] 1 wait 0 1 0 0.000000
-> [Tremblay:0:(1) 20.555559] [smpi_replay/VERBOSE] 0 compute 1e9 10.194200
+> [Tremblay:0:(1) 20.560237] [smpi_replay/VERBOSE] 0 compute 1e9 10.194200
 > [Fafard:2:(3) 26.213694] [smpi_replay/VERBOSE] 2 compute 2e9 26.213694
 > [Fafard:2:(3) 26.213694] [smpi_replay/VERBOSE] 2 irecv 1 1 1e6 0.000000
-> [Jupiter:1:(2) 26.403862] [smpi_replay/VERBOSE] 1 send 2 1 1e6 13.296915
+> [Jupiter:1:(2) 26.408540] [smpi_replay/VERBOSE] 1 send 2 1 1e6 13.301593
 > [Fafard:2:(3) 29.490406] [smpi_replay/VERBOSE] 2 compute 2.5e8 3.276712
 > [Fafard:2:(3) 29.490606] [smpi_replay/VERBOSE] 2 test 1 2 1 0.000200
 > [Fafard:2:(3) 32.767318] [smpi_replay/VERBOSE] 2 compute 2.5e8 3.276712
 > [Fafard:2:(3) 32.767318] [smpi_replay/VERBOSE] 2 wait 1 2 1 0.000000
 > [Fafard:2:(3) 32.767318] [smpi_replay/VERBOSE] 2 isend 0 2 1e6 0.000000
-> [Tremblay:0:(1) 32.923016] [smpi_replay/VERBOSE] 0 recv 2 2 1e6 12.367457
+> [Tremblay:0:(1) 32.927150] [smpi_replay/VERBOSE] 0 recv 2 2 1e6 12.366914
 > [Fafard:2:(3) 39.320741] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
 > [Fafard:2:(3) 39.320741] [smpi_replay/INFO] Simulation time 39.320741
 
@@ -285,13 +285,13 @@ p Test of AllReduce replay with SMPI (one trace for all processes)
 $ mkfile replay/one_trace_override
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace_override --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 5.112778] [smpi_replay/VERBOSE] 0 allreduce 5e4 5e8 5.112778
-> [Jupiter:1:(2) 6.584141] [smpi_replay/VERBOSE] 1 allreduce 5e4 5e8 6.584141
-> [Fafard:2:(3) 6.584781] [smpi_replay/VERBOSE] 2 allreduce 5e4 5e8 6.584781
-> [Tremblay:0:(1) 10.209878] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
-> [Jupiter:1:(2) 13.137565] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424
-> [Fafard:2:(3) 13.138204] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
-> [Fafard:2:(3) 13.138204] [smpi_replay/INFO] Simulation time 13.138204
+> [Tremblay:0:(1) 5.113218] [smpi_replay/VERBOSE] 0 allreduce 5e4 5e8 5.113218
+> [Jupiter:1:(2) 6.585077] [smpi_replay/VERBOSE] 1 allreduce 5e4 5e8 6.585077
+> [Fafard:2:(3) 6.585659] [smpi_replay/VERBOSE] 2 allreduce 5e4 5e8 6.585659
+> [Tremblay:0:(1) 10.210317] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
+> [Jupiter:1:(2) 13.138501] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424
+> [Fafard:2:(3) 13.139083] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
+> [Fafard:2:(3) 13.139083] [smpi_replay/INFO] Simulation time 13.139083
 
 $ rm -f replay/one_trace_override
 
@@ -301,11 +301,10 @@ p Test of AllToAll replay with SMPI (one trace for all processes)
 $ mkfile replay/one_trace_override
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace_override --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 0.004047] [smpi_replay/VERBOSE] 0 alltoall 500 500 0.004047
-> [Fafard:2:(3) 0.006927] [smpi_replay/VERBOSE] 2 alltoall 500 500 0.006927
-> [Jupiter:1:(2) 0.006927] [smpi_replay/VERBOSE] 1 alltoall 500 500 0.006927
-> [Jupiter:1:(2) 0.006927] [smpi_replay/INFO] Simulation time 0.006927
-
+> [Tremblay:0:(1) 0.004253] [smpi_replay/VERBOSE] 0 alltoall 500 500 0.004253
+> [Fafard:2:(3) 0.007159] [smpi_replay/VERBOSE] 2 alltoall 500 500 0.007159
+> [Jupiter:1:(2) 0.007159] [smpi_replay/VERBOSE] 1 alltoall 500 500 0.007159
+> [Jupiter:1:(2) 0.007159] [smpi_replay/INFO] Simulation time 0.007159
 
 $ rm -f replay/one_trace_override
 
@@ -315,10 +314,10 @@ p Test of AllToAllv replay with SMPI (one trace for all processes)
 $ mkfile replay/one_trace_override
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace_override --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 0.004004] [smpi_replay/VERBOSE] 0 alltoallv 100 1 40 30 1000 1 80 100 0.004004
-> [Jupiter:1:(2) 0.006939] [smpi_replay/VERBOSE] 1 alltoallv 1000 80 1 40 1000 40 1 30 0.006939
-> [Fafard:2:(3) 0.006941] [smpi_replay/VERBOSE] 2 alltoallv 1000 100 30 1 1000 30 40 1 0.006941
-> [Fafard:2:(3) 0.006941] [smpi_replay/INFO] Simulation time 0.006941
+> [Tremblay:0:(1) 0.004007] [smpi_replay/VERBOSE] 0 alltoallv 100 1 40 30 1000 1 80 100 0.004007
+> [Jupiter:1:(2) 0.006942] [smpi_replay/VERBOSE] 1 alltoallv 1000 80 1 40 1000 40 1 30 0.006942
+> [Fafard:2:(3) 0.006944] [smpi_replay/VERBOSE] 2 alltoallv 1000 100 30 1 1000 30 40 1 0.006944
+> [Fafard:2:(3) 0.006944] [smpi_replay/INFO] Simulation time 0.006944
 
 $ rm -f replay/one_trace_override
 
@@ -328,11 +327,11 @@ p Test of AllGatherv replay with SMPI (one trace for all processes)
 $ mkfile replay/one_trace_override
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace_override --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 4 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 1.397272] [smpi_replay/VERBOSE] 0 allgatherv 275427 275427 275427 275427 204020 0 0 1.397272
-> [Ginette:3:(4) 1.760434] [smpi_replay/VERBOSE] 3 allgatherv 204020 275427 275427 275427 204020 0 0 1.760434
-> [Fafard:2:(3) 1.942001] [smpi_replay/VERBOSE] 2 allgatherv 275427 275427 275427 275427 204020 0 0 1.942001
-> [Jupiter:1:(2) 1.942001] [smpi_replay/VERBOSE] 1 allgatherv 275427 275427 275427 275427 204020 0 0 1.942001
-> [Jupiter:1:(2) 1.942001] [smpi_replay/INFO] Simulation time 1.942001
+> [Tremblay:0:(1) 1.440359] [smpi_replay/VERBOSE] 0 allgatherv 275427 275427 275427 275427 204020 0 0 1.440359
+> [Ginette:3:(4) 1.814751] [smpi_replay/VERBOSE] 3 allgatherv 204020 275427 275427 275427 204020 0 0 1.814751
+> [Fafard:2:(3) 2.001913] [smpi_replay/VERBOSE] 2 allgatherv 275427 275427 275427 275427 204020 0 0 2.001913
+> [Jupiter:1:(2) 2.001913] [smpi_replay/VERBOSE] 1 allgatherv 275427 275427 275427 275427 204020 0 0 2.001913
+> [Jupiter:1:(2) 2.001913] [smpi_replay/INFO] Simulation time 2.001913
 
 $ rm -f replay/one_trace_override
 
@@ -343,15 +342,15 @@ $ mkfile replay/one_trace_override
 
 ! output sort 19
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace_override --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 irecv 1 1 3000 0.000000
-> [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 isend 0 2 3000 0.000000
-> [Fafard:2:(3) 0.006224] [smpi_replay/VERBOSE] 2 waitall 0.006224
-> [Fafard:2:(3) 0.006224] [smpi_replay/INFO] Simulation time 0.006224
+> [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 irecv 1 0 2000 0.000000
 > [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 isend 0 0 2000 0.000000
+> [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 irecv 1 1 3000 0.000000
+> [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 irecv 2 2 3000 0.000000
 > [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 isend 2 1 3000 0.000000
 > [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 waitall 0.000000
-> [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 irecv 1 0 2000 0.000000
-> [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 irecv 2 2 3000 0.000000
-> [Tremblay:0:(1) 0.003790] [smpi_replay/VERBOSE] 0 waitall 0.003790
+> [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 isend 0 2 3000 0.000000
+> [Tremblay:0:(1) 0.003820] [smpi_replay/VERBOSE] 0 waitall 0.003820
+> [Fafard:2:(3) 0.006258] [smpi_replay/VERBOSE] 2 waitall 0.006258
+> [Fafard:2:(3) 0.006258] [smpi_replay/INFO] Simulation time 0.006258
 
 $ rm -f replay/one_trace_override

diff --git a/examples/smpi/replay/replay.tesh b/examples/smpi/replay/replay.tesh
index a148441..df33116 100644 (file)
--- a/examples/smpi/replay/replay.tesh
+++ b/examples/smpi/replay/replay.tesh
@@ -10,21 +10,21 @@ $ mkfile replay/one_trace
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
 > [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 bcast 5e4 0.000000
-> [Jupiter:1:(2) 0.015039] [smpi_replay/VERBOSE] 1 bcast 5e4 0.015039
-> [Fafard:2:(3) 0.015678] [smpi_replay/VERBOSE] 2 bcast 5e4 0.015678
-> [Jupiter:1:(2) 2.636409] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
+> [Jupiter:1:(2) 0.015536] [smpi_replay/VERBOSE] 1 bcast 5e4 0.015536
+> [Fafard:2:(3) 0.016118] [smpi_replay/VERBOSE] 2 bcast 5e4 0.016118
+> [Jupiter:1:(2) 2.636906] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
 > [Tremblay:0:(1) 5.097100] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
 > [Tremblay:0:(1) 5.097100] [smpi_replay/VERBOSE] 0 bcast 5e4 0.000000
-> [Jupiter:1:(2) 5.112139] [smpi_replay/VERBOSE] 1 bcast 5e4 2.475730
-> [Fafard:2:(3) 6.569102] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
-> [Fafard:2:(3) 6.584781] [smpi_replay/VERBOSE] 2 bcast 5e4 0.015678
-> [Jupiter:1:(2) 7.733508] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
+> [Jupiter:1:(2) 5.112636] [smpi_replay/VERBOSE] 1 bcast 5e4 2.475730
+> [Fafard:2:(3) 6.569541] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
+> [Fafard:2:(3) 6.585659] [smpi_replay/VERBOSE] 2 bcast 5e4 0.016118
+> [Jupiter:1:(2) 7.734005] [smpi_replay/VERBOSE] 1 compute 2e8 2.621369
 > [Tremblay:0:(1) 10.194200] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
-> [Fafard:2:(3) 13.138204] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
-> [Jupiter:1:(2) 14.286932] [smpi_replay/VERBOSE] 1 reduce 5e4 5e8 6.553424
-> [Tremblay:0:(1) 18.250982] [smpi_replay/VERBOSE] 0 reduce 5e4 5e8 8.056783
-> [Fafard:2:(3) 19.691628] [smpi_replay/VERBOSE] 2 reduce 5e4 5e8 6.553424
-> [Fafard:2:(3) 19.691628] [smpi_replay/INFO] Simulation time 19.691628
+> [Fafard:2:(3) 13.139083] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
+> [Jupiter:1:(2) 14.287429] [smpi_replay/VERBOSE] 1 reduce 5e4 5e8 6.553424
+> [Tremblay:0:(1) 18.252300] [smpi_replay/VERBOSE] 0 reduce 5e4 5e8 8.058101
+> [Fafard:2:(3) 19.692506] [smpi_replay/VERBOSE] 2 reduce 5e4 5e8 6.553424
+> [Fafard:2:(3) 19.692506] [smpi_replay/INFO] Simulation time 19.692506
 
 $ rm -f replay/one_trace
 
@@ -34,7 +34,7 @@ p The same with tracing activated
 $ mkfile replay/one_trace
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace --log=replay.thresh:critical --log=no_loc  --cfg=tracing:yes --cfg=tracing/smpi:yes --cfg=tracing/smpi/computing:yes  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay  --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Fafard:2:(3) 19.691628] [smpi_replay/INFO] Simulation time 19.691628
+> [Fafard:2:(3) 19.692506] [smpi_replay/INFO] Simulation time 19.692506
 
 $ rm -f replay/one_trace
 
@@ -171,46 +171,46 @@ $ tail -n +3 ./simgrid.trace
 > 12 0.000000 2 1 7
 > 5 9 2 action_reduce "0 1 0"
 > 5 10 2 smpi_replay_run_finalize "0 1 0"
-> 13 0.015039 2 2
-> 12 0.015039 2 2 7
-> 13 0.015678 2 3
-> 12 0.015678 2 3 7
-> 13 2.636409 2 2
-> 12 2.636409 2 2 8
+> 13 0.015536 2 2
+> 12 0.015536 2 2 7
+> 13 0.016118 2 3
+> 12 0.016118 2 3 7
+> 13 2.636906 2 2
+> 12 2.636906 2 2 8
 > 13 5.097100 2 1
 > 12 5.097100 2 1 8
 > 13 5.097100 2 1
 > 12 5.097100 2 1 7
-> 13 5.112139 2 2
-> 12 5.112139 2 2 7
-> 13 6.569102 2 3
-> 12 6.569102 2 3 8
-> 13 6.584781 2 3
-> 12 6.584781 2 3 7
-> 13 7.733508 2 2
-> 12 7.733508 2 2 9
-> 12 7.733508 2 2 7
+> 13 5.112636 2 2
+> 12 5.112636 2 2 7
+> 13 6.569541 2 3
+> 12 6.569541 2 3 8
+> 13 6.585659 2 3
+> 12 6.585659 2 3 7
+> 13 7.734005 2 2
+> 12 7.734005 2 2 9
+> 12 7.734005 2 2 7
 > 13 10.194200 2 1
 > 12 10.194200 2 1 9
-> 13 13.138204 2 3
-> 12 13.138204 2 3 9
-> 12 13.138204 2 3 7
-> 12 13.153883 2 1 7
-> 13 14.286932 2 2
-> 13 14.286932 2 2
-> 12 14.286932 2 2 10
-> 13 14.286932 2 2
-> 7 14.286932 1 2
-> 13 18.250982 2 1
-> 13 18.250982 2 1
-> 12 18.250982 2 1 10
-> 13 18.250982 2 1
-> 7 18.250982 1 1
-> 13 19.691628 2 3
-> 13 19.691628 2 3
-> 12 19.691628 2 3 10
-> 13 19.691628 2 3
-> 7 19.691628 1 3
+> 13 13.139083 2 3
+> 12 13.139083 2 3 9
+> 12 13.139083 2 3 7
+> 12 13.155200 2 1 7
+> 13 14.287429 2 2
+> 13 14.287429 2 2
+> 12 14.287429 2 2 10
+> 13 14.287429 2 2
+> 7 14.287429 1 2
+> 13 18.252300 2 1
+> 13 18.252300 2 1
+> 12 18.252300 2 1 10
+> 13 18.252300 2 1
+> 7 18.252300 1 1
+> 13 19.692506 2 3
+> 13 19.692506 2 3
+> 12 19.692506 2 3 10
+> 13 19.692506 2 3
+> 7 19.692506 1 3
 
 $ rm -f ./simgrid.trace
 
@@ -221,15 +221,15 @@ p Another test of trace replay with SMPI (one trace per process)
 $ mkfile ./split_traces_tesh
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay ./split_traces_tesh --log=smpi_replay.thresh:verbose --log=no_loc  -np 2 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 0.167160] [smpi_replay/VERBOSE] 0 send 1 0 1e6 0.167160
-> [Jupiter:1:(2) 0.167160] [smpi_replay/VERBOSE] 1 recv 0 0 1e6 0.167160
-> [Jupiter:1:(2) 13.274007] [smpi_replay/VERBOSE] 1 compute 1e9 13.106847
-> [Jupiter:1:(2) 13.274007] [smpi_replay/VERBOSE] 1 isend 0 1 1e6 0.000000
-> [Jupiter:1:(2) 13.274007] [smpi_replay/VERBOSE] 1 irecv 0 2 1e6 0.000000
-> [Tremblay:0:(1) 13.441167] [smpi_replay/VERBOSE] 0 recv 1 1 1e6 13.274007
-> [Jupiter:1:(2) 13.608327] [smpi_replay/VERBOSE] 1 wait 0 1 2 0.334320
-> [Tremblay:0:(1) 13.608327] [smpi_replay/VERBOSE] 0 send 1 2 1e6 0.167160
-> [Jupiter:1:(2) 13.608327] [smpi_replay/INFO] Simulation time 13.608327
+> [Tremblay:0:(1) 0.171838] [smpi_replay/VERBOSE] 0 send 1 0 1e6 0.171838
+> [Jupiter:1:(2) 0.171838] [smpi_replay/VERBOSE] 1 recv 0 0 1e6 0.171838
+> [Jupiter:1:(2) 13.278685] [smpi_replay/VERBOSE] 1 compute 1e9 13.106847
+> [Jupiter:1:(2) 13.278685] [smpi_replay/VERBOSE] 1 isend 0 1 1e6 0.000000
+> [Jupiter:1:(2) 13.278685] [smpi_replay/VERBOSE] 1 irecv 0 2 1e6 0.000000
+> [Tremblay:0:(1) 13.450522] [smpi_replay/VERBOSE] 0 recv 1 1 1e6 13.278685
+> [Jupiter:1:(2) 13.622360] [smpi_replay/VERBOSE] 1 wait 0 1 2 0.343675
+> [Tremblay:0:(1) 13.622360] [smpi_replay/VERBOSE] 0 send 1 2 1e6 0.171838
+> [Jupiter:1:(2) 13.622360] [smpi_replay/INFO] Simulation time 13.622360
 
 $ rm -f ./split_traces_tesh
 
@@ -239,15 +239,15 @@ p Test of barrier replay with SMPI (one trace for all processes)
 $ mkfile replay/one_trace
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 1.518423] [smpi_replay/VERBOSE] 0 send 1 0 1e7 1.518423
-> [Jupiter:1:(2) 1.518423] [smpi_replay/VERBOSE] 1 recv 0 0 1e7 1.518423
-> [Tremblay:0:(1) 1.522406] [smpi_replay/VERBOSE] 0 barrier 0.003983
-> [Jupiter:1:(2) 1.525354] [smpi_replay/VERBOSE] 1 barrier 0.006931
-> [Fafard:2:(3) 1.526390] [smpi_replay/VERBOSE] 2 barrier 1.526390
-> [Tremblay:0:(1) 2.522406] [smpi_replay/VERBOSE] 0 compute 98095000 1.000000
-> [Jupiter:1:(2) 2.525354] [smpi_replay/VERBOSE] 1 compute 76296000 1.000000
-> [Fafard:2:(3) 2.526390] [smpi_replay/VERBOSE] 2 compute 76296000 1.000000
-> [Fafard:2:(3) 2.526390] [smpi_replay/INFO] Simulation time 2.526390
+> [Tremblay:0:(1) 1.565197] [smpi_replay/VERBOSE] 0 send 1 0 1e7 1.565197
+> [Jupiter:1:(2) 1.565197] [smpi_replay/VERBOSE] 1 recv 0 0 1e7 1.565197
+> [Tremblay:0:(1) 1.569181] [smpi_replay/VERBOSE] 0 barrier 0.003984
+> [Jupiter:1:(2) 1.572128] [smpi_replay/VERBOSE] 1 barrier 0.006931
+> [Fafard:2:(3) 1.573164] [smpi_replay/VERBOSE] 2 barrier 1.573164
+> [Tremblay:0:(1) 2.569181] [smpi_replay/VERBOSE] 0 compute 98095000 1.000000
+> [Jupiter:1:(2) 2.572128] [smpi_replay/VERBOSE] 1 compute 76296000 1.000000
+> [Fafard:2:(3) 2.573164] [smpi_replay/VERBOSE] 2 compute 76296000 1.000000
+> [Fafard:2:(3) 2.573164] [smpi_replay/INFO] Simulation time 2.573164
 
 $ rm -f replay/one_trace
 
@@ -261,19 +261,19 @@ $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace --log=rep
 > [Jupiter:1:(2) 6.553424] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424
 > [Jupiter:1:(2) 6.553524] [smpi_replay/VERBOSE] 1 test 0 1 0 0.000100
 > [Tremblay:0:(1) 10.194200] [smpi_replay/VERBOSE] 0 compute 1e9 10.194200
-> [Tremblay:0:(1) 10.361360] [smpi_replay/VERBOSE] 0 send 1 0 1e6 0.167160
+> [Tremblay:0:(1) 10.366037] [smpi_replay/VERBOSE] 0 send 1 0 1e6 0.171838
 > [Jupiter:1:(2) 13.106947] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424
 > [Jupiter:1:(2) 13.106947] [smpi_replay/VERBOSE] 1 wait 0 1 0 0.000000
-> [Tremblay:0:(1) 20.555559] [smpi_replay/VERBOSE] 0 compute 1e9 10.194200
+> [Tremblay:0:(1) 20.560237] [smpi_replay/VERBOSE] 0 compute 1e9 10.194200
 > [Fafard:2:(3) 26.213694] [smpi_replay/VERBOSE] 2 compute 2e9 26.213694
 > [Fafard:2:(3) 26.213694] [smpi_replay/VERBOSE] 2 irecv 1 1 1e6 0.000000
-> [Jupiter:1:(2) 26.403862] [smpi_replay/VERBOSE] 1 send 2 1 1e6 13.296915
+> [Jupiter:1:(2) 26.408540] [smpi_replay/VERBOSE] 1 send 2 1 1e6 13.301593
 > [Fafard:2:(3) 29.490406] [smpi_replay/VERBOSE] 2 compute 2.5e8 3.276712
 > [Fafard:2:(3) 29.490606] [smpi_replay/VERBOSE] 2 test 1 2 1 0.000200
 > [Fafard:2:(3) 32.767318] [smpi_replay/VERBOSE] 2 compute 2.5e8 3.276712
 > [Fafard:2:(3) 32.767318] [smpi_replay/VERBOSE] 2 wait 1 2 1 0.000000
 > [Fafard:2:(3) 32.767318] [smpi_replay/VERBOSE] 2 isend 0 2 1e6 0.000000
-> [Tremblay:0:(1) 32.923016] [smpi_replay/VERBOSE] 0 recv 2 2 1e6 12.367457
+> [Tremblay:0:(1) 32.927150] [smpi_replay/VERBOSE] 0 recv 2 2 1e6 12.366914
 > [Fafard:2:(3) 39.320741] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
 > [Fafard:2:(3) 39.320741] [smpi_replay/INFO] Simulation time 39.320741
 
@@ -285,13 +285,13 @@ p Test of AllReduce replay with SMPI (one trace for all processes)
 $ mkfile replay/one_trace
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 5.112778] [smpi_replay/VERBOSE] 0 allreduce 5e4 5e8 5.112778
-> [Jupiter:1:(2) 6.584141] [smpi_replay/VERBOSE] 1 allreduce 5e4 5e8 6.584141
-> [Fafard:2:(3) 6.584781] [smpi_replay/VERBOSE] 2 allreduce 5e4 5e8 6.584781
-> [Tremblay:0:(1) 10.209878] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
-> [Jupiter:1:(2) 13.137565] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424
-> [Fafard:2:(3) 13.138204] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
-> [Fafard:2:(3) 13.138204] [smpi_replay/INFO] Simulation time 13.138204
+> [Tremblay:0:(1) 5.113218] [smpi_replay/VERBOSE] 0 allreduce 5e4 5e8 5.113218
+> [Jupiter:1:(2) 6.585077] [smpi_replay/VERBOSE] 1 allreduce 5e4 5e8 6.585077
+> [Fafard:2:(3) 6.585659] [smpi_replay/VERBOSE] 2 allreduce 5e4 5e8 6.585659
+> [Tremblay:0:(1) 10.210317] [smpi_replay/VERBOSE] 0 compute 5e8 5.097100
+> [Jupiter:1:(2) 13.138501] [smpi_replay/VERBOSE] 1 compute 5e8 6.553424
+> [Fafard:2:(3) 13.139083] [smpi_replay/VERBOSE] 2 compute 5e8 6.553424
+> [Fafard:2:(3) 13.139083] [smpi_replay/INFO] Simulation time 13.139083
 
 $ rm -f replay/one_trace
 
@@ -301,10 +301,10 @@ p Test of AllToAll replay with SMPI (one trace for all processes)
 $ mkfile replay/one_trace
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 0.004047] [smpi_replay/VERBOSE] 0 alltoall 500 500 0.004047
-> [Fafard:2:(3) 0.006927] [smpi_replay/VERBOSE] 2 alltoall 500 500 0.006927
-> [Jupiter:1:(2) 0.006927] [smpi_replay/VERBOSE] 1 alltoall 500 500 0.006927
-> [Jupiter:1:(2) 0.006927] [smpi_replay/INFO] Simulation time 0.006927
+> [Tremblay:0:(1) 0.004253] [smpi_replay/VERBOSE] 0 alltoall 500 500 0.004253
+> [Fafard:2:(3) 0.007159] [smpi_replay/VERBOSE] 2 alltoall 500 500 0.007159
+> [Jupiter:1:(2) 0.007159] [smpi_replay/VERBOSE] 1 alltoall 500 500 0.007159
+> [Jupiter:1:(2) 0.007159] [smpi_replay/INFO] Simulation time 0.007159
 
 $ rm -f replay/one_trace
 
@@ -314,10 +314,11 @@ p Test of AllToAllv replay with SMPI (one trace for all processes)
 $ mkfile replay/one_trace
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 0.004004] [smpi_replay/VERBOSE] 0 alltoallv 100 1 40 30 1000 1 80 100 0.004004
-> [Jupiter:1:(2) 0.006939] [smpi_replay/VERBOSE] 1 alltoallv 1000 80 1 40 1000 40 1 30 0.006939
-> [Fafard:2:(3) 0.006941] [smpi_replay/VERBOSE] 2 alltoallv 1000 100 30 1 1000 30 40 1 0.006941
-> [Fafard:2:(3) 0.006941] [smpi_replay/INFO] Simulation time 0.006941
+> [Tremblay:0:(1) 0.004007] [smpi_replay/VERBOSE] 0 alltoallv 100 1 40 30 1000 1 80 100 0.004007
+> [Jupiter:1:(2) 0.006942] [smpi_replay/VERBOSE] 1 alltoallv 1000 80 1 40 1000 40 1 30 0.006942
+> [Fafard:2:(3) 0.006944] [smpi_replay/VERBOSE] 2 alltoallv 1000 100 30 1 1000 30 40 1 0.006944
+> [Fafard:2:(3) 0.006944] [smpi_replay/INFO] Simulation time 0.006944
+
 $ rm -f replay/one_trace
 
 p Test of AllGatherv replay with SMPI (one trace for all processes)
@@ -326,11 +327,11 @@ p Test of AllGatherv replay with SMPI (one trace for all processes)
 $ mkfile replay/one_trace
 
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 4 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Tremblay:0:(1) 1.397272] [smpi_replay/VERBOSE] 0 allgatherv 275427 275427 275427 275427 204020 0 0 1.397272
-> [Ginette:3:(4) 1.760434] [smpi_replay/VERBOSE] 3 allgatherv 204020 275427 275427 275427 204020 0 0 1.760434
-> [Fafard:2:(3) 1.942001] [smpi_replay/VERBOSE] 2 allgatherv 275427 275427 275427 275427 204020 0 0 1.942001
-> [Jupiter:1:(2) 1.942001] [smpi_replay/VERBOSE] 1 allgatherv 275427 275427 275427 275427 204020 0 0 1.942001
-> [Jupiter:1:(2) 1.942001] [smpi_replay/INFO] Simulation time 1.942001
+> [Tremblay:0:(1) 1.440359] [smpi_replay/VERBOSE] 0 allgatherv 275427 275427 275427 275427 204020 0 0 1.440359
+> [Ginette:3:(4) 1.814751] [smpi_replay/VERBOSE] 3 allgatherv 204020 275427 275427 275427 204020 0 0 1.814751
+> [Fafard:2:(3) 2.001913] [smpi_replay/VERBOSE] 2 allgatherv 275427 275427 275427 275427 204020 0 0 2.001913
+> [Jupiter:1:(2) 2.001913] [smpi_replay/VERBOSE] 1 allgatherv 275427 275427 275427 275427 204020 0 0 2.001913
+> [Jupiter:1:(2) 2.001913] [smpi_replay/INFO] Simulation time 2.001913
 
 $ rm -f replay/one_trace
 
@@ -341,15 +342,15 @@ $ mkfile replay/one_trace
 
 ! output sort 19
 $ ../../smpi_script/bin/smpirun -no-privatize -replay replay/one_trace --log=replay.thresh:critical --log=smpi_replay.thresh:verbose --log=no_loc  -np 3 -platform ${srcdir:=.}/../platforms/small_platform.xml -hostfile ${srcdir:=.}/hostfile ./replay/smpi_replay --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
-> [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 irecv 1 1 3000 0.000000
-> [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 isend 0 2 3000 0.000000
-> [Fafard:2:(3) 0.006224] [smpi_replay/VERBOSE] 2 waitall 0.006224
-> [Fafard:2:(3) 0.006224] [smpi_replay/INFO] Simulation time 0.006224
+> [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 irecv 1 0 2000 0.000000
 > [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 isend 0 0 2000 0.000000
+> [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 irecv 1 1 3000 0.000000
+> [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 irecv 2 2 3000 0.000000
 > [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 isend 2 1 3000 0.000000
 > [Jupiter:1:(2) 0.000000] [smpi_replay/VERBOSE] 1 waitall 0.000000
-> [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 irecv 1 0 2000 0.000000
-> [Tremblay:0:(1) 0.000000] [smpi_replay/VERBOSE] 0 irecv 2 2 3000 0.000000
-> [Tremblay:0:(1) 0.003790] [smpi_replay/VERBOSE] 0 waitall 0.003790
+> [Fafard:2:(3) 0.000000] [smpi_replay/VERBOSE] 2 isend 0 2 3000 0.000000
+> [Tremblay:0:(1) 0.003820] [smpi_replay/VERBOSE] 0 waitall 0.003820
+> [Fafard:2:(3) 0.006258] [smpi_replay/VERBOSE] 2 waitall 0.006258
+> [Fafard:2:(3) 0.006258] [smpi_replay/INFO] Simulation time 0.006258
 
 $ rm -f replay/one_trace

diff --git a/examples/smpi/trace/trace.tesh b/examples/smpi/trace/trace.tesh
index 2103ff5..9a0cbdc 100644 (file)
--- a/examples/smpi/trace/trace.tesh
+++ b/examples/smpi/trace/trace.tesh
@@ -153,1195 +153,1195 @@ $ tail -n +3 ${bindir:=.}/smpi_trace.trace
 > 5 18 2 PMPI_Finalize "0 1 0"
 > 13 1.000000 2 2
 > 12 1.000000 2 2 11
-> 13 1.077076 2 1
-> 12 1.077076 2 1 12
-> 16 1.077076 3 0 PTP 2 1_2_12345_1
-> 13 1.077076 2 2
-> 12 1.077076 2 2 12
+> 13 1.078947 2 1
+> 12 1.078947 2 1 12
+> 16 1.078947 3 0 PTP 2 1_2_12345_1
+> 13 1.078947 2 2
+> 12 1.078947 2 2 12
 > 13 2.000000 2 3
 > 12 2.000000 2 3 12
-> 13 2.003983 2 1
-> 12 2.003983 2 1 13
-> 15 2.003983 3 0 PTP 1 1_2_12345_2
+> 13 2.003984 2 1
+> 12 2.003984 2 1 13
+> 15 2.003984 3 0 PTP 1 1_2_12345_2
 > 13 2.006931 2 2
 > 12 2.006931 2 2 14
 > 13 2.006931 2 2
 > 12 2.006931 2 2 10
 > 13 2.007967 2 3
 > 12 2.007967 2 3 12
-> 13 2.084007 2 1
-> 12 2.084007 2 1 12
-> 13 2.084007 2 2
-> 16 2.084007 3 0 PTP 2 1_2_12345_2
-> 12 2.084007 2 2 12
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_3
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_4
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_5
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_6
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_7
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_8
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_9
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_10
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_11
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_12
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_13
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_14
-> 13 2.087990 2 1
-> 12 2.087990 2 1 9
-> 15 2.087990 3 0 PTP 1 1_2_12345_15
-> 13 2.087990 2 1
-> 12 2.087990 2 1 10
-> 13 2.090937 2 2
-> 12 2.090937 2 2 11
-> 13 2.091973 2 3
-> 12 2.091973 2 3 12
-> 13 2.168013 2 1
-> 12 2.168013 2 1 10
-> 16 2.168013 3 0 PTP 2 1_2_12345_3
-> 13 2.168013 2 2
-> 12 2.168013 2 2 11
-> 13 2.245089 2 1
-> 12 2.245089 2 1 10
-> 16 2.245089 3 0 PTP 2 1_2_12345_4
-> 13 2.245089 2 2
-> 12 2.245089 2 2 11
-> 13 2.322165 2 1
-> 12 2.322165 2 1 10
-> 16 2.322165 3 0 PTP 2 1_2_12345_5
-> 13 2.322165 2 2
-> 12 2.322165 2 2 11
-> 13 2.399241 2 1
-> 12 2.399241 2 1 10
-> 16 2.399241 3 0 PTP 2 1_2_12345_6
-> 13 2.399241 2 2
-> 12 2.399241 2 2 11
-> 13 2.476316 2 1
-> 12 2.476316 2 1 10
-> 16 2.476316 3 0 PTP 2 1_2_12345_7
-> 13 2.476316 2 2
-> 12 2.476316 2 2 11
-> 13 2.553392 2 1
-> 12 2.553392 2 1 10
-> 16 2.553392 3 0 PTP 2 1_2_12345_8
-> 13 2.553392 2 2
-> 12 2.553392 2 2 11
-> 13 2.630468 2 1
-> 12 2.630468 2 1 10
-> 16 2.630468 3 0 PTP 2 1_2_12345_9
-> 13 2.630468 2 2
-> 12 2.630468 2 2 11
-> 13 2.707544 2 1
-> 12 2.707544 2 1 10
-> 16 2.707544 3 0 PTP 2 1_2_12345_10
-> 13 2.707544 2 2
-> 12 2.707544 2 2 11
-> 13 2.784620 2 1
-> 12 2.784620 2 1 10
-> 16 2.784620 3 0 PTP 2 1_2_12345_11
-> 13 2.784620 2 2
-> 12 2.784620 2 2 11
-> 13 2.861696 2 1
-> 12 2.861696 2 1 10
-> 16 2.861696 3 0 PTP 2 1_2_12345_12
-> 13 2.861696 2 2
-> 12 2.861696 2 2 11
-> 13 2.938772 2 1
-> 12 2.938772 2 1 10
-> 16 2.938772 3 0 PTP 2 1_2_12345_13
-> 13 2.938772 2 2
-> 12 2.938772 2 2 11
-> 13 3.015847 2 1
-> 12 3.015847 2 1 10
-> 16 3.015847 3 0 PTP 2 1_2_12345_14
-> 13 3.015847 2 2
-> 12 3.015847 2 2 11
-> 13 3.092923 2 1
-> 12 3.092923 2 1 12
-> 16 3.092923 3 0 PTP 2 1_2_12345_15
-> 13 3.092923 2 2
-> 12 3.092923 2 2 12
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_16
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_17
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_18
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_19
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_20
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_21
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_22
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_23
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_24
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_25
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_26
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_27
-> 13 3.096907 2 1
-> 12 3.096907 2 1 9
-> 15 3.096907 3 0 PTP 1 1_2_12345_28
-> 13 3.096907 2 1
-> 12 3.096907 2 1 15
-> 13 3.099854 2 2
-> 12 3.099854 2 2 11
-> 13 3.100890 2 3
-> 12 3.100890 2 3 12
-> 13 3.176930 2 1
-> 12 3.176930 2 1 15
-> 16 3.176930 3 0 PTP 2 1_2_12345_16
-> 13 3.176930 2 2
-> 12 3.176930 2 2 11
-> 13 3.254006 2 1
-> 12 3.254006 2 1 15
-> 16 3.254006 3 0 PTP 2 1_2_12345_17
-> 13 3.254006 2 2
-> 12 3.254006 2 2 11
-> 13 3.331081 2 1
-> 12 3.331081 2 1 15
-> 16 3.331081 3 0 PTP 2 1_2_12345_18
-> 13 3.331081 2 2
-> 12 3.331081 2 2 11
-> 13 3.408157 2 1
-> 12 3.408157 2 1 15
-> 16 3.408157 3 0 PTP 2 1_2_12345_19
-> 13 3.408157 2 2
-> 12 3.408157 2 2 11
-> 13 3.485233 2 1
-> 12 3.485233 2 1 15
-> 16 3.485233 3 0 PTP 2 1_2_12345_20
-> 13 3.485233 2 2
-> 12 3.485233 2 2 11
-> 13 3.562309 2 1
-> 12 3.562309 2 1 15
-> 16 3.562309 3 0 PTP 2 1_2_12345_21
-> 13 3.562309 2 2
-> 12 3.562309 2 2 11
-> 13 3.639385 2 1
-> 12 3.639385 2 1 15
-> 16 3.639385 3 0 PTP 2 1_2_12345_22
-> 13 3.639385 2 2
-> 12 3.639385 2 2 11
-> 13 3.716461 2 1
-> 12 3.716461 2 1 15
-> 16 3.716461 3 0 PTP 2 1_2_12345_23
-> 13 3.716461 2 2
-> 12 3.716461 2 2 11
-> 13 3.793537 2 1
-> 12 3.793537 2 1 15
-> 16 3.793537 3 0 PTP 2 1_2_12345_24
-> 13 3.793537 2 2
-> 12 3.793537 2 2 11
-> 13 3.870612 2 1
-> 12 3.870612 2 1 15
-> 16 3.870612 3 0 PTP 2 1_2_12345_25
-> 13 3.870612 2 2
-> 12 3.870612 2 2 11
-> 13 3.947688 2 1
-> 12 3.947688 2 1 15
-> 16 3.947688 3 0 PTP 2 1_2_12345_26
-> 13 3.947688 2 2
-> 12 3.947688 2 2 11
-> 13 4.024764 2 1
-> 12 4.024764 2 1 15
-> 16 4.024764 3 0 PTP 2 1_2_12345_27
-> 13 4.024764 2 2
-> 12 4.024764 2 2 11
-> 13 4.101840 2 1
-> 12 4.101840 2 1 12
-> 16 4.101840 3 0 PTP 2 1_2_12345_28
-> 13 4.101840 2 2
-> 12 4.101840 2 2 12
-> 13 4.105823 2 1
-> 12 4.105823 2 1 13
-> 15 4.105823 3 0 PTP 1 1_2_12345_29
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 14
-> 13 4.108771 2 2
-> 12 4.108771 2 2 10
-> 13 4.109807 2 3
-> 12 4.109807 2 3 12
-> 13 4.185847 2 1
-> 12 4.185847 2 1 13
-> 15 4.185847 3 0 PTP 1 1_2_12345_30
-> 13 4.185847 2 2
-> 16 4.185847 3 0 PTP 2 1_2_12345_29
-> 12 4.185847 2 2 10
-> 13 4.262922 2 2
-> 16 4.262922 3 0 PTP 2 1_2_12345_30
-> 12 4.262922 2 2 10
-> 13 4.262922 2 1
-> 12 4.262922 2 1 13
-> 15 4.262922 3 0 PTP 1 1_2_12345_31
-> 13 4.339998 2 2
-> 16 4.339998 3 0 PTP 2 1_2_12345_31
-> 12 4.339998 2 2 10
-> 13 4.339998 2 1
-> 12 4.339998 2 1 13
-> 15 4.339998 3 0 PTP 1 1_2_12345_32
-> 13 4.417074 2 2
-> 16 4.417074 3 0 PTP 2 1_2_12345_32
-> 12 4.417074 2 2 10
-> 13 4.417074 2 1
-> 12 4.417074 2 1 13
-> 15 4.417074 3 0 PTP 1 1_2_12345_33
-> 13 4.494150 2 2
-> 16 4.494150 3 0 PTP 2 1_2_12345_33
-> 12 4.494150 2 2 10
-> 13 4.494150 2 1
-> 12 4.494150 2 1 13
-> 15 4.494150 3 0 PTP 1 1_2_12345_34
-> 13 4.571226 2 2
-> 16 4.571226 3 0 PTP 2 1_2_12345_34
-> 12 4.571226 2 2 10
-> 13 4.571226 2 1
-> 12 4.571226 2 1 13
-> 15 4.571226 3 0 PTP 1 1_2_12345_35
-> 13 4.648302 2 2
-> 16 4.648302 3 0 PTP 2 1_2_12345_35
-> 12 4.648302 2 2 10
-> 13 4.648302 2 1
-> 12 4.648302 2 1 13
-> 15 4.648302 3 0 PTP 1 1_2_12345_36
-> 13 4.725377 2 2
-> 16 4.725377 3 0 PTP 2 1_2_12345_36
-> 12 4.725377 2 2 10
-> 13 4.725377 2 1
-> 12 4.725377 2 1 13
-> 15 4.725377 3 0 PTP 1 1_2_12345_37
-> 13 4.802453 2 2
-> 16 4.802453 3 0 PTP 2 1_2_12345_37
-> 12 4.802453 2 2 10
-> 13 4.802453 2 1
-> 12 4.802453 2 1 13
-> 15 4.802453 3 0 PTP 1 1_2_12345_38
-> 13 4.879529 2 2
-> 16 4.879529 3 0 PTP 2 1_2_12345_38
-> 12 4.879529 2 2 10
-> 13 4.879529 2 1
-> 12 4.879529 2 1 13
-> 15 4.879529 3 0 PTP 1 1_2_12345_39
-> 13 4.956605 2 2
-> 16 4.956605 3 0 PTP 2 1_2_12345_39
-> 12 4.956605 2 2 10
-> 13 4.956605 2 1
-> 12 4.956605 2 1 13
-> 15 4.956605 3 0 PTP 1 1_2_12345_40
-> 13 5.033681 2 2
-> 16 5.033681 3 0 PTP 2 1_2_12345_40
-> 12 5.033681 2 2 10
-> 13 5.033681 2 1
-> 12 5.033681 2 1 13
-> 15 5.033681 3 0 PTP 1 1_2_12345_41
-> 13 5.110757 2 2
-> 16 5.110757 3 0 PTP 2 1_2_12345_41
-> 12 5.110757 2 2 12
-> 13 5.110757 2 1
-> 12 5.110757 2 1 12
-> 13 5.114740 2 1
-> 12 5.114740 2 1 13
-> 15 5.114740 3 0 PTP 1 1_2_12345_42
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 14
-> 13 5.117687 2 2
-> 12 5.117687 2 2 15
-> 13 5.118724 2 3
-> 12 5.118724 2 3 12
-> 13 5.194763 2 1
-> 12 5.194763 2 1 13
-> 15 5.194763 3 0 PTP 1 1_2_12345_43
-> 16 5.194763 3 0 PTP 2 1_2_12345_42
-> 13 5.194763 2 2
-> 12 5.194763 2 2 15
-> 16 5.271839 3 0 PTP 2 1_2_12345_43
-> 13 5.271839 2 2
-> 12 5.271839 2 2 15
-> 13 5.271839 2 1
-> 12 5.271839 2 1 13
-> 15 5.271839 3 0 PTP 1 1_2_12345_44
-> 16 5.348915 3 0 PTP 2 1_2_12345_44
-> 13 5.348915 2 2
-> 12 5.348915 2 2 15
-> 13 5.348915 2 1
-> 12 5.348915 2 1 13
-> 15 5.348915 3 0 PTP 1 1_2_12345_45
-> 16 5.425991 3 0 PTP 2 1_2_12345_45
-> 13 5.425991 2 2
-> 12 5.425991 2 2 15
-> 13 5.425991 2 1
-> 12 5.425991 2 1 13
-> 15 5.425991 3 0 PTP 1 1_2_12345_46
-> 16 5.503067 3 0 PTP 2 1_2_12345_46
-> 13 5.503067 2 2
-> 12 5.503067 2 2 15
-> 13 5.503067 2 1
-> 12 5.503067 2 1 13
-> 15 5.503067 3 0 PTP 1 1_2_12345_47
-> 16 5.580143 3 0 PTP 2 1_2_12345_47
-> 13 5.580143 2 2
-> 12 5.580143 2 2 15
-> 13 5.580143 2 1
-> 12 5.580143 2 1 13
-> 15 5.580143 3 0 PTP 1 1_2_12345_48
-> 16 5.657218 3 0 PTP 2 1_2_12345_48
-> 13 5.657218 2 2
-> 12 5.657218 2 2 15
-> 13 5.657218 2 1
-> 12 5.657218 2 1 13
-> 15 5.657218 3 0 PTP 1 1_2_12345_49
-> 16 5.734294 3 0 PTP 2 1_2_12345_49
-> 13 5.734294 2 2
-> 12 5.734294 2 2 15
-> 13 5.734294 2 1
-> 12 5.734294 2 1 13
-> 15 5.734294 3 0 PTP 1 1_2_12345_50
-> 16 5.811370 3 0 PTP 2 1_2_12345_50
-> 13 5.811370 2 2
-> 12 5.811370 2 2 15
-> 13 5.811370 2 1
-> 12 5.811370 2 1 13
-> 15 5.811370 3 0 PTP 1 1_2_12345_51
-> 16 5.888446 3 0 PTP 2 1_2_12345_51
-> 13 5.888446 2 2
-> 12 5.888446 2 2 15
-> 13 5.888446 2 1
-> 12 5.888446 2 1 13
-> 15 5.888446 3 0 PTP 1 1_2_12345_52
-> 16 5.965522 3 0 PTP 2 1_2_12345_52
-> 13 5.965522 2 2
-> 12 5.965522 2 2 15
-> 13 5.965522 2 1
-> 12 5.965522 2 1 13
-> 15 5.965522 3 0 PTP 1 1_2_12345_53
-> 16 6.042598 3 0 PTP 2 1_2_12345_53
-> 13 6.042598 2 2
-> 12 6.042598 2 2 15
-> 13 6.042598 2 1
-> 12 6.042598 2 1 13
-> 15 6.042598 3 0 PTP 1 1_2_12345_54
-> 16 6.119673 3 0 PTP 2 1_2_12345_54
-> 13 6.119673 2 2
-> 12 6.119673 2 2 12
-> 13 6.119673 2 1
-> 12 6.119673 2 1 12
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_55
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_56
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_57
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_58
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_59
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_60
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_61
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_62
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_63
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_64
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_65
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_66
-> 13 6.123657 2 1
-> 12 6.123657 2 1 9
-> 15 6.123657 3 0 PTP 1 1_2_12345_67
-> 13 6.123657 2 1
-> 12 6.123657 2 1 16
-> 13 6.126604 2 2
-> 12 6.126604 2 2 11
-> 13 6.127640 2 3
-> 12 6.127640 2 3 12
-> 16 6.203680 3 0 PTP 2 1_2_12345_55
-> 13 6.203680 2 2
-> 12 6.203680 2 2 11
-> 16 6.280756 3 0 PTP 2 1_2_12345_56
-> 13 6.280756 2 2
-> 12 6.280756 2 2 11
-> 16 6.357832 3 0 PTP 2 1_2_12345_57
-> 13 6.357832 2 2
-> 12 6.357832 2 2 11
-> 16 6.434908 3 0 PTP 2 1_2_12345_58
-> 13 6.434908 2 2
-> 12 6.434908 2 2 11
-> 16 6.511983 3 0 PTP 2 1_2_12345_59
-> 13 6.511983 2 2
-> 12 6.511983 2 2 11
-> 16 6.589059 3 0 PTP 2 1_2_12345_60
-> 13 6.589059 2 2
-> 12 6.589059 2 2 11
-> 16 6.666135 3 0 PTP 2 1_2_12345_61
-> 13 6.666135 2 2
-> 12 6.666135 2 2 11
-> 16 6.743211 3 0 PTP 2 1_2_12345_62
-> 13 6.743211 2 2
-> 12 6.743211 2 2 11
-> 16 6.820287 3 0 PTP 2 1_2_12345_63
-> 13 6.820287 2 2
-> 12 6.820287 2 2 11
-> 16 6.897363 3 0 PTP 2 1_2_12345_64
-> 13 6.897363 2 2
-> 12 6.897363 2 2 11
-> 16 6.974439 3 0 PTP 2 1_2_12345_65
-> 13 6.974439 2 2
-> 12 6.974439 2 2 11
-> 16 7.051514 3 0 PTP 2 1_2_12345_66
-> 13 7.051514 2 2
-> 12 7.051514 2 2 11
-> 13 7.128590 2 1
-> 12 7.128590 2 1 12
-> 16 7.128590 3 0 PTP 2 1_2_12345_67
-> 13 7.128590 2 2
-> 12 7.128590 2 2 12
-> 13 7.132574 2 1
-> 12 7.132574 2 1 13
-> 15 7.132574 3 0 PTP 1 1_2_12345_68
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 14
-> 13 7.135521 2 2
-> 12 7.135521 2 2 16
-> 13 7.136557 2 3
-> 12 7.136557 2 3 12
-> 13 7.212597 2 1
-> 12 7.212597 2 1 13
-> 15 7.212597 3 0 PTP 1 1_2_12345_69
-> 13 7.289673 2 1
-> 12 7.289673 2 1 13
-> 15 7.289673 3 0 PTP 1 1_2_12345_70
-> 13 7.366748 2 1
-> 12 7.366748 2 1 13
-> 15 7.366748 3 0 PTP 1 1_2_12345_71
-> 13 7.443824 2 1
-> 12 7.443824 2 1 13
-> 15 7.443824 3 0 PTP 1 1_2_12345_72
-> 13 7.520900 2 1
-> 12 7.520900 2 1 13
-> 15 7.520900 3 0 PTP 1 1_2_12345_73
-> 13 7.597976 2 1
-> 12 7.597976 2 1 13
-> 15 7.597976 3 0 PTP 1 1_2_12345_74
-> 13 7.675052 2 1
-> 12 7.675052 2 1 13
-> 15 7.675052 3 0 PTP 1 1_2_12345_75
-> 13 7.752128 2 1
-> 12 7.752128 2 1 13
-> 15 7.752128 3 0 PTP 1 1_2_12345_76
-> 13 7.829204 2 1
-> 12 7.829204 2 1 13
-> 15 7.829204 3 0 PTP 1 1_2_12345_77
-> 13 7.906279 2 1
-> 12 7.906279 2 1 13
-> 15 7.906279 3 0 PTP 1 1_2_12345_78
-> 13 7.983355 2 1
-> 12 7.983355 2 1 13
-> 15 7.983355 3 0 PTP 1 1_2_12345_79
-> 13 8.060431 2 1
-> 12 8.060431 2 1 13
-> 15 8.060431 3 0 PTP 1 1_2_12345_80
-> 16 8.137507 3 0 PTP 2 1_2_12345_68
-> 16 8.137507 3 0 PTP 2 1_2_12345_69
-> 16 8.137507 3 0 PTP 2 1_2_12345_70
-> 16 8.137507 3 0 PTP 2 1_2_12345_71
-> 16 8.137507 3 0 PTP 2 1_2_12345_72
-> 16 8.137507 3 0 PTP 2 1_2_12345_73
-> 16 8.137507 3 0 PTP 2 1_2_12345_74
-> 16 8.137507 3 0 PTP 2 1_2_12345_75
-> 16 8.137507 3 0 PTP 2 1_2_12345_76
-> 16 8.137507 3 0 PTP 2 1_2_12345_77
-> 16 8.137507 3 0 PTP 2 1_2_12345_78
-> 16 8.137507 3 0 PTP 2 1_2_12345_79
-> 16 8.137507 3 0 PTP 2 1_2_12345_80
-> 13 8.137507 2 2
-> 12 8.137507 2 2 12
-> 13 8.137507 2 1
-> 12 8.137507 2 1 12
-> 13 8.141490 2 1
-> 12 8.141490 2 1 13
-> 15 8.141490 3 0 PTP 1 1_3_12345_81
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 14
-> 13 8.144438 2 2
-> 12 8.144438 2 2 16
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 14
-> 13 8.145474 2 3
-> 12 8.145474 2 3 15
-> 13 8.221560 2 1
-> 12 8.221560 2 1 13
-> 15 8.221560 3 0 PTP 1 1_3_12345_82
-> 16 8.221560 3 0 PTP 3 1_3_12345_81
-> 13 8.221560 2 3
-> 12 8.221560 2 3 15
-> 16 8.297645 3 0 PTP 3 1_3_12345_82
-> 13 8.297645 2 3
-> 12 8.297645 2 3 15
-> 13 8.297645 2 1
-> 12 8.297645 2 1 13
-> 15 8.297645 3 0 PTP 1 1_3_12345_83
-> 16 8.373731 3 0 PTP 3 1_3_12345_83
-> 13 8.373731 2 3
-> 12 8.373731 2 3 15
-> 13 8.373731 2 1
-> 12 8.373731 2 1 13
-> 15 8.373731 3 0 PTP 1 1_3_12345_84
-> 16 8.449816 3 0 PTP 3 1_3_12345_84
-> 13 8.449816 2 3
-> 12 8.449816 2 3 15
-> 13 8.449816 2 1
-> 12 8.449816 2 1 13
-> 15 8.449816 3 0 PTP 1 1_3_12345_85
-> 16 8.525902 3 0 PTP 3 1_3_12345_85
-> 13 8.525902 2 3
-> 12 8.525902 2 3 15
-> 13 8.525902 2 1
-> 12 8.525902 2 1 13
-> 15 8.525902 3 0 PTP 1 1_3_12345_86
-> 16 8.601988 3 0 PTP 3 1_3_12345_86
-> 13 8.601988 2 3
-> 12 8.601988 2 3 15
-> 13 8.601988 2 1
-> 12 8.601988 2 1 13
-> 15 8.601988 3 0 PTP 1 1_3_12345_87
-> 16 8.678073 3 0 PTP 3 1_3_12345_87
-> 13 8.678073 2 3
-> 12 8.678073 2 3 15
-> 13 8.678073 2 1
-> 12 8.678073 2 1 13
-> 15 8.678073 3 0 PTP 1 1_3_12345_88
-> 16 8.754159 3 0 PTP 3 1_3_12345_88
-> 13 8.754159 2 3
-> 12 8.754159 2 3 15
-> 13 8.754159 2 1
-> 12 8.754159 2 1 13
-> 15 8.754159 3 0 PTP 1 1_3_12345_89
-> 16 8.830245 3 0 PTP 3 1_3_12345_89
-> 13 8.830245 2 3
-> 12 8.830245 2 3 15
-> 13 8.830245 2 1
-> 12 8.830245 2 1 13
-> 15 8.830245 3 0 PTP 1 1_3_12345_90
-> 16 8.906330 3 0 PTP 3 1_3_12345_90
-> 13 8.906330 2 3
-> 12 8.906330 2 3 15
-> 13 8.906330 2 1
-> 12 8.906330 2 1 13
-> 15 8.906330 3 0 PTP 1 1_3_12345_91
-> 16 8.982416 3 0 PTP 3 1_3_12345_91
-> 13 8.982416 2 3
-> 12 8.982416 2 3 15
-> 13 8.982416 2 1
-> 12 8.982416 2 1 13
-> 15 8.982416 3 0 PTP 1 1_3_12345_92
-> 16 9.058502 3 0 PTP 3 1_3_12345_92
-> 13 9.058502 2 3
-> 12 9.058502 2 3 15
-> 13 9.058502 2 1
-> 12 9.058502 2 1 13
-> 15 9.058502 3 0 PTP 1 1_3_12345_93
-> 16 9.134587 3 0 PTP 3 1_3_12345_93
-> 13 9.134587 2 3
-> 12 9.134587 2 3 12
-> 13 9.134587 2 1
-> 12 9.134587 2 1 13
-> 15 9.134587 3 0 PTP 1 1_2_12345_94
-> 13 9.211663 2 1
-> 12 9.211663 2 1 13
-> 15 9.211663 3 0 PTP 1 1_2_12345_95
-> 13 9.288739 2 1
-> 12 9.288739 2 1 13
-> 15 9.288739 3 0 PTP 1 1_2_12345_96
-> 13 9.365815 2 1
-> 12 9.365815 2 1 13
-> 15 9.365815 3 0 PTP 1 1_2_12345_97
-> 13 9.442891 2 1
-> 12 9.442891 2 1 13
-> 15 9.442891 3 0 PTP 1 1_2_12345_98
-> 13 9.519966 2 1
-> 12 9.519966 2 1 13
-> 15 9.519966 3 0 PTP 1 1_2_12345_99
-> 13 9.597042 2 1
-> 12 9.597042 2 1 13
-> 15 9.597042 3 0 PTP 1 1_2_12345_100
-> 13 9.674118 2 1
-> 12 9.674118 2 1 13
-> 15 9.674118 3 0 PTP 1 1_2_12345_101
-> 13 9.751194 2 1
-> 12 9.751194 2 1 13
-> 15 9.751194 3 0 PTP 1 1_2_12345_102
-> 13 9.828270 2 1
-> 12 9.828270 2 1 13
-> 15 9.828270 3 0 PTP 1 1_2_12345_103
-> 13 9.905346 2 1
-> 12 9.905346 2 1 13
-> 15 9.905346 3 0 PTP 1 1_2_12345_104
-> 13 9.982422 2 1
-> 12 9.982422 2 1 13
-> 15 9.982422 3 0 PTP 1 1_2_12345_105
-> 13 10.059497 2 1
-> 12 10.059497 2 1 13
-> 15 10.059497 3 0 PTP 1 1_2_12345_106
-> 16 10.136573 3 0 PTP 2 1_2_12345_94
-> 16 10.136573 3 0 PTP 2 1_2_12345_95
-> 16 10.136573 3 0 PTP 2 1_2_12345_96
-> 16 10.136573 3 0 PTP 2 1_2_12345_97
-> 16 10.136573 3 0 PTP 2 1_2_12345_98
-> 16 10.136573 3 0 PTP 2 1_2_12345_99
-> 16 10.136573 3 0 PTP 2 1_2_12345_100
-> 16 10.136573 3 0 PTP 2 1_2_12345_101
-> 16 10.136573 3 0 PTP 2 1_2_12345_102
-> 16 10.136573 3 0 PTP 2 1_2_12345_103
-> 16 10.136573 3 0 PTP 2 1_2_12345_104
-> 16 10.136573 3 0 PTP 2 1_2_12345_105
-> 16 10.136573 3 0 PTP 2 1_2_12345_106
-> 13 10.136573 2 2
-> 12 10.136573 2 2 12
-> 13 10.136573 2 1
-> 12 10.136573 2 1 12
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 14
-> 13 10.140557 2 1
-> 12 10.140557 2 1 16
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_107
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_108
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_109
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_110
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_111
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_112
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_113
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_114
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_115
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_116
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_117
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_118
-> 13 10.143504 2 2
-> 12 10.143504 2 2 9
-> 15 10.143504 3 0 PTP 2 2_1_12345_119
-> 13 10.143504 2 2
-> 12 10.143504 2 2 16
-> 13 10.144540 2 3
-> 12 10.144540 2 3 13
-> 15 10.144540 3 0 PTP 3 3_1_12345_120
-> 13 10.220626 2 3
-> 12 10.220626 2 3 13
-> 15 10.220626 3 0 PTP 3 3_1_12345_121
-> 13 10.296711 2 3
-> 12 10.296711 2 3 13
-> 15 10.296711 3 0 PTP 3 3_1_12345_122
-> 13 10.372797 2 3
-> 12 10.372797 2 3 13
-> 15 10.372797 3 0 PTP 3 3_1_12345_123
-> 13 10.448883 2 3
-> 12 10.448883 2 3 13
-> 15 10.448883 3 0 PTP 3 3_1_12345_124
-> 13 10.524968 2 3
-> 12 10.524968 2 3 13
-> 15 10.524968 3 0 PTP 3 3_1_12345_125
-> 13 10.601054 2 3
-> 12 10.601054 2 3 13
-> 15 10.601054 3 0 PTP 3 3_1_12345_126
-> 13 10.677140 2 3
-> 12 10.677140 2 3 13
-> 15 10.677140 3 0 PTP 3 3_1_12345_127
-> 13 10.753225 2 3
-> 12 10.753225 2 3 13
-> 15 10.753225 3 0 PTP 3 3_1_12345_128
-> 13 10.829311 2 3
-> 12 10.829311 2 3 13
-> 15 10.829311 3 0 PTP 3 3_1_12345_129
-> 13 10.905397 2 3
-> 12 10.905397 2 3 13
-> 15 10.905397 3 0 PTP 3 3_1_12345_130
-> 13 10.941282 2 2
-> 12 10.941282 2 2 12
-> 13 10.981482 2 3
-> 12 10.981482 2 3 13
-> 15 10.981482 3 0 PTP 3 3_1_12345_131
-> 13 11.057568 2 3
-> 12 11.057568 2 3 13
-> 15 11.057568 3 0 PTP 3 3_1_12345_132
-> 16 11.133653 3 0 PTP 1 2_1_12345_107
-> 16 11.133653 3 0 PTP 1 2_1_12345_108
-> 16 11.133653 3 0 PTP 1 2_1_12345_109
-> 16 11.133653 3 0 PTP 1 2_1_12345_110
-> 16 11.133653 3 0 PTP 1 2_1_12345_111
-> 16 11.133653 3 0 PTP 1 2_1_12345_112
-> 16 11.133653 3 0 PTP 1 2_1_12345_113
-> 16 11.133653 3 0 PTP 1 2_1_12345_114
-> 16 11.133653 3 0 PTP 1 2_1_12345_115
-> 16 11.133653 3 0 PTP 1 2_1_12345_116
-> 16 11.133653 3 0 PTP 1 2_1_12345_117
-> 16 11.133653 3 0 PTP 1 2_1_12345_118
-> 16 11.133653 3 0 PTP 1 2_1_12345_119
-> 16 11.133653 3 0 PTP 1 3_1_12345_120
-> 16 11.133653 3 0 PTP 1 3_1_12345_121
-> 16 11.133653 3 0 PTP 1 3_1_12345_122
-> 16 11.133653 3 0 PTP 1 3_1_12345_123
-> 16 11.133653 3 0 PTP 1 3_1_12345_124
-> 16 11.133653 3 0 PTP 1 3_1_12345_125
-> 16 11.133653 3 0 PTP 1 3_1_12345_126
-> 16 11.133653 3 0 PTP 1 3_1_12345_127
-> 16 11.133653 3 0 PTP 1 3_1_12345_128
-> 16 11.133653 3 0 PTP 1 3_1_12345_129
-> 16 11.133653 3 0 PTP 1 3_1_12345_130
-> 16 11.133653 3 0 PTP 1 3_1_12345_131
-> 16 11.133653 3 0 PTP 1 3_1_12345_132
-> 13 11.133653 2 1
-> 12 11.133653 2 1 12
-> 13 11.133653 2 3
-> 12 11.133653 2 3 12
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_133
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_134
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_135
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_136
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_137
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_138
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_139
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_140
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_141
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_142
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_143
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_144
-> 13 11.137637 2 1
-> 12 11.137637 2 1 9
-> 15 11.137637 3 0 PTP 1 1_2_12345_145
-> 13 11.137637 2 1
-> 12 11.137637 2 1 17
-> 13 11.137737 2 1
-> 12 11.137737 2 1 17
-> 13 11.137937 2 1
-> 12 11.137937 2 1 17
-> 13 11.138237 2 1
-> 12 11.138237 2 1 17
-> 13 11.138637 2 1
-> 12 11.138637 2 1 17
-> 13 11.139137 2 1
-> 12 11.139137 2 1 17
-> 13 11.139737 2 1
-> 12 11.139737 2 1 17
-> 13 11.140437 2 1
-> 12 11.140437 2 1 17
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 14
-> 13 11.140584 2 2
-> 12 11.140584 2 2 17
-> 13 11.141237 2 1
-> 12 11.141237 2 1 17
-> 13 11.141384 2 2
-> 12 11.141384 2 2 17
-> 13 11.141620 2 3
-> 12 11.141620 2 3 12
-> 13 11.142137 2 1
-> 12 11.142137 2 1 17
-> 13 11.142384 2 2
-> 12 11.142384 2 2 17
-> 13 11.143237 2 1
-> 12 11.143237 2 1 17
-> 13 11.143584 2 2
-> 12 11.143584 2 2 17
-> 13 11.144537 2 1
-> 12 11.144537 2 1 17
-> 13 11.144984 2 2
-> 12 11.144984 2 2 17
-> 13 11.146037 2 1
-> 12 11.146037 2 1 17
-> 13 11.146584 2 2
-> 12 11.146584 2 2 17
-> 13 11.147737 2 1
-> 12 11.147737 2 1 10
-> 13 11.148384 2 2
-> 12 11.148384 2 2 17
-> 13 11.150384 2 2
-> 12 11.150384 2 2 17
-> 13 11.152484 2 2
-> 12 11.152484 2 2 17
-> 13 11.154684 2 2
-> 12 11.154684 2 2 17
-> 13 11.156984 2 2
-> 12 11.156984 2 2 17
-> 13 11.159384 2 2
-> 12 11.159384 2 2 17
-> 13 11.161884 2 2
-> 12 11.161884 2 2 17
-> 13 11.164484 2 2
-> 12 11.164484 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 10
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_133
-> 12 11.938362 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 10
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_134
-> 12 11.938362 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 10
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_135
-> 12 11.938362 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 10
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_136
-> 12 11.938362 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 10
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_137
-> 12 11.938362 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 10
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_138
-> 12 11.938362 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 10
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_139
-> 12 11.938362 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 10
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_140
-> 12 11.938362 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 10
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_141
-> 12 11.938362 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 10
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_142
-> 12 11.938362 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 10
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_143
-> 12 11.938362 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 10
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_144
-> 12 11.938362 2 2 10
-> 13 11.938362 2 1
-> 12 11.938362 2 1 12
-> 13 11.938362 2 2
-> 16 11.938362 3 0 PTP 2 1_2_12345_145
-> 12 11.938362 2 2 12
-> 13 11.942346 2 1
-> 12 11.942346 2 1 18
-> 13 11.942346 2 1
-> 7 11.942346 1 1
-> 13 11.945293 2 2
-> 12 11.945293 2 2 18
-> 13 11.945293 2 2
-> 7 11.945293 1 2
-> 13 11.946329 2 3
-> 12 11.946329 2 3 18
-> 13 11.946329 2 3
-> 7 11.946329 1 3
+> 13 2.085878 2 1
+> 12 2.085878 2 1 12
+> 13 2.085878 2 2
+> 16 2.085878 3 0 PTP 2 1_2_12345_2
+> 12 2.085878 2 2 12
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_3
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_4
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_5
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_6
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_7
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_8
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_9
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_10
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_11
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_12
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_13
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_14
+> 13 2.089861 2 1
+> 12 2.089861 2 1 9
+> 15 2.089861 3 0 PTP 1 1_2_12345_15
+> 13 2.089861 2 1
+> 12 2.089861 2 1 10
+> 13 2.092809 2 2
+> 12 2.092809 2 2 11
+> 13 2.093845 2 3
+> 12 2.093845 2 3 12
+> 13 2.171756 2 1
+> 12 2.171756 2 1 10
+> 16 2.171756 3 0 PTP 2 1_2_12345_3
+> 13 2.171756 2 2
+> 12 2.171756 2 2 11
+> 13 2.250703 2 1
+> 12 2.250703 2 1 10
+> 16 2.250703 3 0 PTP 2 1_2_12345_4
+> 13 2.250703 2 2
+> 12 2.250703 2 2 11
+> 13 2.329649 2 1
+> 12 2.329649 2 1 10
+> 16 2.329649 3 0 PTP 2 1_2_12345_5
+> 13 2.329649 2 2
+> 12 2.329649 2 2 11
+> 13 2.408596 2 1
+> 12 2.408596 2 1 10
+> 16 2.408596 3 0 PTP 2 1_2_12345_6
+> 13 2.408596 2 2
+> 12 2.408596 2 2 11
+> 13 2.487543 2 1
+> 12 2.487543 2 1 10
+> 16 2.487543 3 0 PTP 2 1_2_12345_7
+> 13 2.487543 2 2
+> 12 2.487543 2 2 11
+> 13 2.566490 2 1
+> 12 2.566490 2 1 10
+> 16 2.566490 3 0 PTP 2 1_2_12345_8
+> 13 2.566490 2 2
+> 12 2.566490 2 2 11
+> 13 2.645437 2 1
+> 12 2.645437 2 1 10
+> 16 2.645437 3 0 PTP 2 1_2_12345_9
+> 13 2.645437 2 2
+> 12 2.645437 2 2 11
+> 13 2.724384 2 1
+> 12 2.724384 2 1 10
+> 16 2.724384 3 0 PTP 2 1_2_12345_10
+> 13 2.724384 2 2
+> 12 2.724384 2 2 11
+> 13 2.803331 2 1
+> 12 2.803331 2 1 10
+> 16 2.803331 3 0 PTP 2 1_2_12345_11
+> 13 2.803331 2 2
+> 12 2.803331 2 2 11
+> 13 2.882278 2 1
+> 12 2.882278 2 1 10
+> 16 2.882278 3 0 PTP 2 1_2_12345_12
+> 13 2.882278 2 2
+> 12 2.882278 2 2 11
+> 13 2.961225 2 1
+> 12 2.961225 2 1 10
+> 16 2.961225 3 0 PTP 2 1_2_12345_13
+> 13 2.961225 2 2
+> 12 2.961225 2 2 11
+> 13 3.040171 2 1
+> 12 3.040171 2 1 10
+> 16 3.040171 3 0 PTP 2 1_2_12345_14
+> 13 3.040171 2 2
+> 12 3.040171 2 2 11
+> 13 3.119118 2 1
+> 12 3.119118 2 1 12
+> 16 3.119118 3 0 PTP 2 1_2_12345_15
+> 13 3.119118 2 2
+> 12 3.119118 2 2 12
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_16
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_17
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_18
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_19
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_20
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_21
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_22
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_23
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_24
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_25
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_26
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_27
+> 13 3.123102 2 1
+> 12 3.123102 2 1 9
+> 15 3.123102 3 0 PTP 1 1_2_12345_28
+> 13 3.123102 2 1
+> 12 3.123102 2 1 15
+> 13 3.126049 2 2
+> 12 3.126049 2 2 11
+> 13 3.127085 2 3
+> 12 3.127085 2 3 12
+> 13 3.204996 2 1
+> 12 3.204996 2 1 15
+> 16 3.204996 3 0 PTP 2 1_2_12345_16
+> 13 3.204996 2 2
+> 12 3.204996 2 2 11
+> 13 3.283943 2 1
+> 12 3.283943 2 1 15
+> 16 3.283943 3 0 PTP 2 1_2_12345_17
+> 13 3.283943 2 2
+> 12 3.283943 2 2 11
+> 13 3.362890 2 1
+> 12 3.362890 2 1 15
+> 16 3.362890 3 0 PTP 2 1_2_12345_18
+> 13 3.362890 2 2
+> 12 3.362890 2 2 11
+> 13 3.441837 2 1
+> 12 3.441837 2 1 15
+> 16 3.441837 3 0 PTP 2 1_2_12345_19
+> 13 3.441837 2 2
+> 12 3.441837 2 2 11
+> 13 3.520784 2 1
+> 12 3.520784 2 1 15
+> 16 3.520784 3 0 PTP 2 1_2_12345_20
+> 13 3.520784 2 2
+> 12 3.520784 2 2 11
+> 13 3.599731 2 1
+> 12 3.599731 2 1 15
+> 16 3.599731 3 0 PTP 2 1_2_12345_21
+> 13 3.599731 2 2
+> 12 3.599731 2 2 11
+> 13 3.678677 2 1
+> 12 3.678677 2 1 15
+> 16 3.678677 3 0 PTP 2 1_2_12345_22
+> 13 3.678677 2 2
+> 12 3.678677 2 2 11
+> 13 3.757624 2 1
+> 12 3.757624 2 1 15
+> 16 3.757624 3 0 PTP 2 1_2_12345_23
+> 13 3.757624 2 2
+> 12 3.757624 2 2 11
+> 13 3.836571 2 1
+> 12 3.836571 2 1 15
+> 16 3.836571 3 0 PTP 2 1_2_12345_24
+> 13 3.836571 2 2
+> 12 3.836571 2 2 11
+> 13 3.915518 2 1
+> 12 3.915518 2 1 15
+> 16 3.915518 3 0 PTP 2 1_2_12345_25
+> 13 3.915518 2 2
+> 12 3.915518 2 2 11
+> 13 3.994465 2 1
+> 12 3.994465 2 1 15
+> 16 3.994465 3 0 PTP 2 1_2_12345_26
+> 13 3.994465 2 2
+> 12 3.994465 2 2 11
+> 13 4.073412 2 1
+> 12 4.073412 2 1 15
+> 16 4.073412 3 0 PTP 2 1_2_12345_27
+> 13 4.073412 2 2
+> 12 4.073412 2 2 11
+> 13 4.152359 2 1
+> 12 4.152359 2 1 12
+> 16 4.152359 3 0 PTP 2 1_2_12345_28
+> 13 4.152359 2 2
+> 12 4.152359 2 2 12
+> 13 4.156342 2 1
+> 12 4.156342 2 1 13
+> 15 4.156342 3 0 PTP 1 1_2_12345_29
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 14
+> 13 4.159290 2 2
+> 12 4.159290 2 2 10
+> 13 4.160326 2 3
+> 12 4.160326 2 3 12
+> 13 4.238237 2 1
+> 12 4.238237 2 1 13
+> 15 4.238237 3 0 PTP 1 1_2_12345_30
+> 13 4.238237 2 2
+> 16 4.238237 3 0 PTP 2 1_2_12345_29
+> 12 4.238237 2 2 10
+> 13 4.317184 2 2
+> 16 4.317184 3 0 PTP 2 1_2_12345_30
+> 12 4.317184 2 2 10
+> 13 4.317184 2 1
+> 12 4.317184 2 1 13
+> 15 4.317184 3 0 PTP 1 1_2_12345_31
+> 13 4.396130 2 2
+> 16 4.396130 3 0 PTP 2 1_2_12345_31
+> 12 4.396130 2 2 10
+> 13 4.396130 2 1
+> 12 4.396130 2 1 13
+> 15 4.396130 3 0 PTP 1 1_2_12345_32
+> 13 4.475077 2 2
+> 16 4.475077 3 0 PTP 2 1_2_12345_32
+> 12 4.475077 2 2 10
+> 13 4.475077 2 1
+> 12 4.475077 2 1 13
+> 15 4.475077 3 0 PTP 1 1_2_12345_33
+> 13 4.554024 2 2
+> 16 4.554024 3 0 PTP 2 1_2_12345_33
+> 12 4.554024 2 2 10
+> 13 4.554024 2 1
+> 12 4.554024 2 1 13
+> 15 4.554024 3 0 PTP 1 1_2_12345_34
+> 13 4.632971 2 2
+> 16 4.632971 3 0 PTP 2 1_2_12345_34
+> 12 4.632971 2 2 10
+> 13 4.632971 2 1
+> 12 4.632971 2 1 13
+> 15 4.632971 3 0 PTP 1 1_2_12345_35
+> 13 4.711918 2 2
+> 16 4.711918 3 0 PTP 2 1_2_12345_35
+> 12 4.711918 2 2 10
+> 13 4.711918 2 1
+> 12 4.711918 2 1 13
+> 15 4.711918 3 0 PTP 1 1_2_12345_36
+> 13 4.790865 2 2
+> 16 4.790865 3 0 PTP 2 1_2_12345_36
+> 12 4.790865 2 2 10
+> 13 4.790865 2 1
+> 12 4.790865 2 1 13
+> 15 4.790865 3 0 PTP 1 1_2_12345_37
+> 13 4.869812 2 2
+> 16 4.869812 3 0 PTP 2 1_2_12345_37
+> 12 4.869812 2 2 10
+> 13 4.869812 2 1
+> 12 4.869812 2 1 13
+> 15 4.869812 3 0 PTP 1 1_2_12345_38
+> 13 4.948759 2 2
+> 16 4.948759 3 0 PTP 2 1_2_12345_38
+> 12 4.948759 2 2 10
+> 13 4.948759 2 1
+> 12 4.948759 2 1 13
+> 15 4.948759 3 0 PTP 1 1_2_12345_39
+> 13 5.027706 2 2
+> 16 5.027706 3 0 PTP 2 1_2_12345_39
+> 12 5.027706 2 2 10
+> 13 5.027706 2 1
+> 12 5.027706 2 1 13
+> 15 5.027706 3 0 PTP 1 1_2_12345_40
+> 13 5.106652 2 2
+> 16 5.106652 3 0 PTP 2 1_2_12345_40
+> 12 5.106652 2 2 10
+> 13 5.106652 2 1
+> 12 5.106652 2 1 13
+> 15 5.106652 3 0 PTP 1 1_2_12345_41
+> 13 5.185599 2 2
+> 16 5.185599 3 0 PTP 2 1_2_12345_41
+> 12 5.185599 2 2 12
+> 13 5.185599 2 1
+> 12 5.185599 2 1 12
+> 13 5.189583 2 1
+> 12 5.189583 2 1 13
+> 15 5.189583 3 0 PTP 1 1_2_12345_42
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 14
+> 13 5.192530 2 2
+> 12 5.192530 2 2 15
+> 13 5.193566 2 3
+> 12 5.193566 2 3 12
+> 13 5.271477 2 1
+> 12 5.271477 2 1 13
+> 15 5.271477 3 0 PTP 1 1_2_12345_43
+> 16 5.271477 3 0 PTP 2 1_2_12345_42
+> 13 5.271477 2 2
+> 12 5.271477 2 2 15
+> 16 5.350424 3 0 PTP 2 1_2_12345_43
+> 13 5.350424 2 2
+> 12 5.350424 2 2 15
+> 13 5.350424 2 1
+> 12 5.350424 2 1 13
+> 15 5.350424 3 0 PTP 1 1_2_12345_44
+> 16 5.429371 3 0 PTP 2 1_2_12345_44
+> 13 5.429371 2 2
+> 12 5.429371 2 2 15
+> 13 5.429371 2 1
+> 12 5.429371 2 1 13
+> 15 5.429371 3 0 PTP 1 1_2_12345_45
+> 16 5.508318 3 0 PTP 2 1_2_12345_45
+> 13 5.508318 2 2
+> 12 5.508318 2 2 15
+> 13 5.508318 2 1
+> 12 5.508318 2 1 13
+> 15 5.508318 3 0 PTP 1 1_2_12345_46
+> 16 5.587265 3 0 PTP 2 1_2_12345_46
+> 13 5.587265 2 2
+> 12 5.587265 2 2 15
+> 13 5.587265 2 1
+> 12 5.587265 2 1 13
+> 15 5.587265 3 0 PTP 1 1_2_12345_47
+> 16 5.666212 3 0 PTP 2 1_2_12345_47
+> 13 5.666212 2 2
+> 12 5.666212 2 2 15
+> 13 5.666212 2 1
+> 12 5.666212 2 1 13
+> 15 5.666212 3 0 PTP 1 1_2_12345_48
+> 16 5.745159 3 0 PTP 2 1_2_12345_48
+> 13 5.745159 2 2
+> 12 5.745159 2 2 15
+> 13 5.745159 2 1
+> 12 5.745159 2 1 13
+> 15 5.745159 3 0 PTP 1 1_2_12345_49
+> 16 5.824105 3 0 PTP 2 1_2_12345_49
+> 13 5.824105 2 2
+> 12 5.824105 2 2 15
+> 13 5.824105 2 1
+> 12 5.824105 2 1 13
+> 15 5.824105 3 0 PTP 1 1_2_12345_50
+> 16 5.903052 3 0 PTP 2 1_2_12345_50
+> 13 5.903052 2 2
+> 12 5.903052 2 2 15
+> 13 5.903052 2 1
+> 12 5.903052 2 1 13
+> 15 5.903052 3 0 PTP 1 1_2_12345_51
+> 16 5.981999 3 0 PTP 2 1_2_12345_51
+> 13 5.981999 2 2
+> 12 5.981999 2 2 15
+> 13 5.981999 2 1
+> 12 5.981999 2 1 13
+> 15 5.981999 3 0 PTP 1 1_2_12345_52
+> 16 6.060946 3 0 PTP 2 1_2_12345_52
+> 13 6.060946 2 2
+> 12 6.060946 2 2 15
+> 13 6.060946 2 1
+> 12 6.060946 2 1 13
+> 15 6.060946 3 0 PTP 1 1_2_12345_53
+> 16 6.139893 3 0 PTP 2 1_2_12345_53
+> 13 6.139893 2 2
+> 12 6.139893 2 2 15
+> 13 6.139893 2 1
+> 12 6.139893 2 1 13
+> 15 6.139893 3 0 PTP 1 1_2_12345_54
+> 16 6.218840 3 0 PTP 2 1_2_12345_54
+> 13 6.218840 2 2
+> 12 6.218840 2 2 12
+> 13 6.218840 2 1
+> 12 6.218840 2 1 12
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_55
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_56
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_57
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_58
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_59
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_60
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_61
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_62
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_63
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_64
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_65
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_66
+> 13 6.222823 2 1
+> 12 6.222823 2 1 9
+> 15 6.222823 3 0 PTP 1 1_2_12345_67
+> 13 6.222823 2 1
+> 12 6.222823 2 1 16
+> 13 6.225771 2 2
+> 12 6.225771 2 2 11
+> 13 6.226807 2 3
+> 12 6.226807 2 3 12
+> 16 6.304718 3 0 PTP 2 1_2_12345_55
+> 13 6.304718 2 2
+> 12 6.304718 2 2 11
+> 16 6.383665 3 0 PTP 2 1_2_12345_56
+> 13 6.383665 2 2
+> 12 6.383665 2 2 11
+> 16 6.462611 3 0 PTP 2 1_2_12345_57
+> 13 6.462611 2 2
+> 12 6.462611 2 2 11
+> 16 6.541558 3 0 PTP 2 1_2_12345_58
+> 13 6.541558 2 2
+> 12 6.541558 2 2 11
+> 16 6.620505 3 0 PTP 2 1_2_12345_59
+> 13 6.620505 2 2
+> 12 6.620505 2 2 11
+> 16 6.699452 3 0 PTP 2 1_2_12345_60
+> 13 6.699452 2 2
+> 12 6.699452 2 2 11
+> 16 6.778399 3 0 PTP 2 1_2_12345_61
+> 13 6.778399 2 2
+> 12 6.778399 2 2 11
+> 16 6.857346 3 0 PTP 2 1_2_12345_62
+> 13 6.857346 2 2
+> 12 6.857346 2 2 11
+> 16 6.936293 3 0 PTP 2 1_2_12345_63
+> 13 6.936293 2 2
+> 12 6.936293 2 2 11
+> 16 7.015240 3 0 PTP 2 1_2_12345_64
+> 13 7.015240 2 2
+> 12 7.015240 2 2 11
+> 16 7.094187 3 0 PTP 2 1_2_12345_65
+> 13 7.094187 2 2
+> 12 7.094187 2 2 11
+> 16 7.173133 3 0 PTP 2 1_2_12345_66
+> 13 7.173133 2 2
+> 12 7.173133 2 2 11
+> 13 7.252080 2 1
+> 12 7.252080 2 1 12
+> 16 7.252080 3 0 PTP 2 1_2_12345_67
+> 13 7.252080 2 2
+> 12 7.252080 2 2 12
+> 13 7.256064 2 1
+> 12 7.256064 2 1 13
+> 15 7.256064 3 0 PTP 1 1_2_12345_68
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 14
+> 13 7.259011 2 2
+> 12 7.259011 2 2 16
+> 13 7.260048 2 3
+> 12 7.260048 2 3 12
+> 13 7.337958 2 1
+> 12 7.337958 2 1 13
+> 15 7.337958 3 0 PTP 1 1_2_12345_69
+> 13 7.416905 2 1
+> 12 7.416905 2 1 13
+> 15 7.416905 3 0 PTP 1 1_2_12345_70
+> 13 7.495852 2 1
+> 12 7.495852 2 1 13
+> 15 7.495852 3 0 PTP 1 1_2_12345_71
+> 13 7.574799 2 1
+> 12 7.574799 2 1 13
+> 15 7.574799 3 0 PTP 1 1_2_12345_72
+> 13 7.653746 2 1
+> 12 7.653746 2 1 13
+> 15 7.653746 3 0 PTP 1 1_2_12345_73
+> 13 7.732693 2 1
+> 12 7.732693 2 1 13
+> 15 7.732693 3 0 PTP 1 1_2_12345_74
+> 13 7.811640 2 1
+> 12 7.811640 2 1 13
+> 15 7.811640 3 0 PTP 1 1_2_12345_75
+> 13 7.890586 2 1
+> 12 7.890586 2 1 13
+> 15 7.890586 3 0 PTP 1 1_2_12345_76
+> 13 7.969533 2 1
+> 12 7.969533 2 1 13
+> 15 7.969533 3 0 PTP 1 1_2_12345_77
+> 13 8.048480 2 1
+> 12 8.048480 2 1 13
+> 15 8.048480 3 0 PTP 1 1_2_12345_78
+> 13 8.127427 2 1
+> 12 8.127427 2 1 13
+> 15 8.127427 3 0 PTP 1 1_2_12345_79
+> 13 8.206374 2 1
+> 12 8.206374 2 1 13
+> 15 8.206374 3 0 PTP 1 1_2_12345_80
+> 16 8.285321 3 0 PTP 2 1_2_12345_68
+> 16 8.285321 3 0 PTP 2 1_2_12345_69
+> 16 8.285321 3 0 PTP 2 1_2_12345_70
+> 16 8.285321 3 0 PTP 2 1_2_12345_71
+> 16 8.285321 3 0 PTP 2 1_2_12345_72
+> 16 8.285321 3 0 PTP 2 1_2_12345_73
+> 16 8.285321 3 0 PTP 2 1_2_12345_74
+> 16 8.285321 3 0 PTP 2 1_2_12345_75
+> 16 8.285321 3 0 PTP 2 1_2_12345_76
+> 16 8.285321 3 0 PTP 2 1_2_12345_77
+> 16 8.285321 3 0 PTP 2 1_2_12345_78
+> 16 8.285321 3 0 PTP 2 1_2_12345_79
+> 16 8.285321 3 0 PTP 2 1_2_12345_80
+> 13 8.285321 2 2
+> 12 8.285321 2 2 12
+> 13 8.285321 2 1
+> 12 8.285321 2 1 12
+> 13 8.289304 2 1
+> 12 8.289304 2 1 13
+> 15 8.289304 3 0 PTP 1 1_3_12345_81
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 14
+> 13 8.292252 2 2
+> 12 8.292252 2 2 16
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 14
+> 13 8.293288 2 3
+> 12 8.293288 2 3 15
+> 13 8.371027 2 1
+> 12 8.371027 2 1 13
+> 15 8.371027 3 0 PTP 1 1_3_12345_82
+> 16 8.371027 3 0 PTP 3 1_3_12345_81
+> 13 8.371027 2 3
+> 12 8.371027 2 3 15
+> 16 8.448766 3 0 PTP 3 1_3_12345_82
+> 13 8.448766 2 3
+> 12 8.448766 2 3 15
+> 13 8.448766 2 1
+> 12 8.448766 2 1 13
+> 15 8.448766 3 0 PTP 1 1_3_12345_83
+> 16 8.526506 3 0 PTP 3 1_3_12345_83
+> 13 8.526506 2 3
+> 12 8.526506 2 3 15
+> 13 8.526506 2 1
+> 12 8.526506 2 1 13
+> 15 8.526506 3 0 PTP 1 1_3_12345_84
+> 16 8.604245 3 0 PTP 3 1_3_12345_84
+> 13 8.604245 2 3
+> 12 8.604245 2 3 15
+> 13 8.604245 2 1
+> 12 8.604245 2 1 13
+> 15 8.604245 3 0 PTP 1 1_3_12345_85
+> 16 8.681984 3 0 PTP 3 1_3_12345_85
+> 13 8.681984 2 3
+> 12 8.681984 2 3 15
+> 13 8.681984 2 1
+> 12 8.681984 2 1 13
+> 15 8.681984 3 0 PTP 1 1_3_12345_86
+> 16 8.759723 3 0 PTP 3 1_3_12345_86
+> 13 8.759723 2 3
+> 12 8.759723 2 3 15
+> 13 8.759723 2 1
+> 12 8.759723 2 1 13
+> 15 8.759723 3 0 PTP 1 1_3_12345_87
+> 16 8.837462 3 0 PTP 3 1_3_12345_87
+> 13 8.837462 2 3
+> 12 8.837462 2 3 15
+> 13 8.837462 2 1
+> 12 8.837462 2 1 13
+> 15 8.837462 3 0 PTP 1 1_3_12345_88
+> 16 8.915202 3 0 PTP 3 1_3_12345_88
+> 13 8.915202 2 3
+> 12 8.915202 2 3 15
+> 13 8.915202 2 1
+> 12 8.915202 2 1 13
+> 15 8.915202 3 0 PTP 1 1_3_12345_89
+> 16 8.992941 3 0 PTP 3 1_3_12345_89
+> 13 8.992941 2 3
+> 12 8.992941 2 3 15
+> 13 8.992941 2 1
+> 12 8.992941 2 1 13
+> 15 8.992941 3 0 PTP 1 1_3_12345_90
+> 16 9.070680 3 0 PTP 3 1_3_12345_90
+> 13 9.070680 2 3
+> 12 9.070680 2 3 15
+> 13 9.070680 2 1
+> 12 9.070680 2 1 13
+> 15 9.070680 3 0 PTP 1 1_3_12345_91
+> 16 9.148419 3 0 PTP 3 1_3_12345_91
+> 13 9.148419 2 3
+> 12 9.148419 2 3 15
+> 13 9.148419 2 1
+> 12 9.148419 2 1 13
+> 15 9.148419 3 0 PTP 1 1_3_12345_92
+> 16 9.226158 3 0 PTP 3 1_3_12345_92
+> 13 9.226158 2 3
+> 12 9.226158 2 3 15
+> 13 9.226158 2 1
+> 12 9.226158 2 1 13
+> 15 9.226158 3 0 PTP 1 1_3_12345_93
+> 16 9.303898 3 0 PTP 3 1_3_12345_93
+> 13 9.303898 2 3
+> 12 9.303898 2 3 12
+> 13 9.303898 2 1
+> 12 9.303898 2 1 13
+> 15 9.303898 3 0 PTP 1 1_2_12345_94
+> 13 9.382844 2 1
+> 12 9.382844 2 1 13
+> 15 9.382844 3 0 PTP 1 1_2_12345_95
+> 13 9.461791 2 1
+> 12 9.461791 2 1 13
+> 15 9.461791 3 0 PTP 1 1_2_12345_96
+> 13 9.540738 2 1
+> 12 9.540738 2 1 13
+> 15 9.540738 3 0 PTP 1 1_2_12345_97
+> 13 9.619685 2 1
+> 12 9.619685 2 1 13
+> 15 9.619685 3 0 PTP 1 1_2_12345_98
+> 13 9.698632 2 1
+> 12 9.698632 2 1 13
+> 15 9.698632 3 0 PTP 1 1_2_12345_99
+> 13 9.777579 2 1
+> 12 9.777579 2 1 13
+> 15 9.777579 3 0 PTP 1 1_2_12345_100
+> 13 9.856526 2 1
+> 12 9.856526 2 1 13
+> 15 9.856526 3 0 PTP 1 1_2_12345_101
+> 13 9.935473 2 1
+> 12 9.935473 2 1 13
+> 15 9.935473 3 0 PTP 1 1_2_12345_102
+> 13 10.014420 2 1
+> 12 10.014420 2 1 13
+> 15 10.014420 3 0 PTP 1 1_2_12345_103
+> 13 10.093367 2 1
+> 12 10.093367 2 1 13
+> 15 10.093367 3 0 PTP 1 1_2_12345_104
+> 13 10.172313 2 1
+> 12 10.172313 2 1 13
+> 15 10.172313 3 0 PTP 1 1_2_12345_105
+> 13 10.251260 2 1
+> 12 10.251260 2 1 13
+> 15 10.251260 3 0 PTP 1 1_2_12345_106
+> 16 10.330207 3 0 PTP 2 1_2_12345_94
+> 16 10.330207 3 0 PTP 2 1_2_12345_95
+> 16 10.330207 3 0 PTP 2 1_2_12345_96
+> 16 10.330207 3 0 PTP 2 1_2_12345_97
+> 16 10.330207 3 0 PTP 2 1_2_12345_98
+> 16 10.330207 3 0 PTP 2 1_2_12345_99
+> 16 10.330207 3 0 PTP 2 1_2_12345_100
+> 16 10.330207 3 0 PTP 2 1_2_12345_101
+> 16 10.330207 3 0 PTP 2 1_2_12345_102
+> 16 10.330207 3 0 PTP 2 1_2_12345_103
+> 16 10.330207 3 0 PTP 2 1_2_12345_104
+> 16 10.330207 3 0 PTP 2 1_2_12345_105
+> 16 10.330207 3 0 PTP 2 1_2_12345_106
+> 13 10.330207 2 2
+> 12 10.330207 2 2 12
+> 13 10.330207 2 1
+> 12 10.330207 2 1 12
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 14
+> 13 10.334191 2 1
+> 12 10.334191 2 1 16
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_107
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_108
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_109
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_110
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_111
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_112
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_113
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_114
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_115
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_116
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_117
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_118
+> 13 10.337138 2 2
+> 12 10.337138 2 2 9
+> 15 10.337138 3 0 PTP 2 2_1_12345_119
+> 13 10.337138 2 2
+> 12 10.337138 2 2 16
+> 13 10.338174 2 3
+> 12 10.338174 2 3 13
+> 15 10.338174 3 0 PTP 3 3_1_12345_120
+> 13 10.415914 2 3
+> 12 10.415914 2 3 13
+> 15 10.415914 3 0 PTP 3 3_1_12345_121
+> 13 10.493653 2 3
+> 12 10.493653 2 3 13
+> 15 10.493653 3 0 PTP 3 3_1_12345_122
+> 13 10.571392 2 3
+> 12 10.571392 2 3 13
+> 15 10.571392 3 0 PTP 3 3_1_12345_123
+> 13 10.649131 2 3
+> 12 10.649131 2 3 13
+> 15 10.649131 3 0 PTP 3 3_1_12345_124
+> 13 10.726870 2 3
+> 12 10.726870 2 3 13
+> 15 10.726870 3 0 PTP 3 3_1_12345_125
+> 13 10.804610 2 3
+> 12 10.804610 2 3 13
+> 15 10.804610 3 0 PTP 3 3_1_12345_126
+> 13 10.882349 2 3
+> 12 10.882349 2 3 13
+> 15 10.882349 3 0 PTP 3 3_1_12345_127
+> 13 10.960088 2 3
+> 12 10.960088 2 3 13
+> 15 10.960088 3 0 PTP 3 3_1_12345_128
+> 13 11.037827 2 3
+> 12 11.037827 2 3 13
+> 15 11.037827 3 0 PTP 3 3_1_12345_129
+> 13 11.115566 2 3
+> 12 11.115566 2 3 13
+> 15 11.115566 3 0 PTP 3 3_1_12345_130
+> 13 11.159240 2 2
+> 12 11.159240 2 2 12
+> 13 11.193305 2 3
+> 12 11.193305 2 3 13
+> 15 11.193305 3 0 PTP 3 3_1_12345_131
+> 13 11.271045 2 3
+> 12 11.271045 2 3 13
+> 15 11.271045 3 0 PTP 3 3_1_12345_132
+> 16 11.348784 3 0 PTP 1 2_1_12345_107
+> 16 11.348784 3 0 PTP 1 2_1_12345_108
+> 16 11.348784 3 0 PTP 1 2_1_12345_109
+> 16 11.348784 3 0 PTP 1 2_1_12345_110
+> 16 11.348784 3 0 PTP 1 2_1_12345_111
+> 16 11.348784 3 0 PTP 1 2_1_12345_112
+> 16 11.348784 3 0 PTP 1 2_1_12345_113
+> 16 11.348784 3 0 PTP 1 2_1_12345_114
+> 16 11.348784 3 0 PTP 1 2_1_12345_115
+> 16 11.348784 3 0 PTP 1 2_1_12345_116
+> 16 11.348784 3 0 PTP 1 2_1_12345_117
+> 16 11.348784 3 0 PTP 1 2_1_12345_118
+> 16 11.348784 3 0 PTP 1 2_1_12345_119
+> 16 11.348784 3 0 PTP 1 3_1_12345_120
+> 16 11.348784 3 0 PTP 1 3_1_12345_121
+> 16 11.348784 3 0 PTP 1 3_1_12345_122
+> 16 11.348784 3 0 PTP 1 3_1_12345_123
+> 16 11.348784 3 0 PTP 1 3_1_12345_124
+> 16 11.348784 3 0 PTP 1 3_1_12345_125
+> 16 11.348784 3 0 PTP 1 3_1_12345_126
+> 16 11.348784 3 0 PTP 1 3_1_12345_127
+> 16 11.348784 3 0 PTP 1 3_1_12345_128
+> 16 11.348784 3 0 PTP 1 3_1_12345_129
+> 16 11.348784 3 0 PTP 1 3_1_12345_130
+> 16 11.348784 3 0 PTP 1 3_1_12345_131
+> 16 11.348784 3 0 PTP 1 3_1_12345_132
+> 13 11.348784 2 1
+> 12 11.348784 2 1 12
+> 13 11.348784 2 3
+> 12 11.348784 2 3 12
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_133
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_134
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_135
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_136
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_137
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_138
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_139
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_140
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_141
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_142
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_143
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_144
+> 13 11.352767 2 1
+> 12 11.352767 2 1 9
+> 15 11.352767 3 0 PTP 1 1_2_12345_145
+> 13 11.352767 2 1
+> 12 11.352767 2 1 17
+> 13 11.352867 2 1
+> 12 11.352867 2 1 17
+> 13 11.353067 2 1
+> 12 11.353067 2 1 17
+> 13 11.353367 2 1
+> 12 11.353367 2 1 17
+> 13 11.353767 2 1
+> 12 11.353767 2 1 17
+> 13 11.354267 2 1
+> 12 11.354267 2 1 17
+> 13 11.354867 2 1
+> 12 11.354867 2 1 17
+> 13 11.355567 2 1
+> 12 11.355567 2 1 17
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 14
+> 13 11.355715 2 2
+> 12 11.355715 2 2 17
+> 13 11.356367 2 1
+> 12 11.356367 2 1 17
+> 13 11.356515 2 2
+> 12 11.356515 2 2 17
+> 13 11.356751 2 3
+> 12 11.356751 2 3 12
+> 13 11.357267 2 1
+> 12 11.357267 2 1 17
+> 13 11.357515 2 2
+> 12 11.357515 2 2 17
+> 13 11.358367 2 1
+> 12 11.358367 2 1 17
+> 13 11.358715 2 2
+> 12 11.358715 2 2 17
+> 13 11.359667 2 1
+> 12 11.359667 2 1 17
+> 13 11.360115 2 2
+> 12 11.360115 2 2 17
+> 13 11.361167 2 1
+> 12 11.361167 2 1 17
+> 13 11.361715 2 2
+> 12 11.361715 2 2 17
+> 13 11.362867 2 1
+> 12 11.362867 2 1 10
+> 13 11.363515 2 2
+> 12 11.363515 2 2 17
+> 13 11.365515 2 2
+> 12 11.365515 2 2 17
+> 13 11.367615 2 2
+> 12 11.367615 2 2 17
+> 13 11.369815 2 2
+> 12 11.369815 2 2 17
+> 13 11.372115 2 2
+> 12 11.372115 2 2 17
+> 13 11.374515 2 2
+> 12 11.374515 2 2 17
+> 13 11.377015 2 2
+> 12 11.377015 2 2 17
+> 13 11.379615 2 2
+> 12 11.379615 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 10
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_133
+> 12 12.177817 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 10
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_134
+> 12 12.177817 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 10
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_135
+> 12 12.177817 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 10
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_136
+> 12 12.177817 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 10
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_137
+> 12 12.177817 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 10
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_138
+> 12 12.177817 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 10
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_139
+> 12 12.177817 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 10
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_140
+> 12 12.177817 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 10
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_141
+> 12 12.177817 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 10
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_142
+> 12 12.177817 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 10
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_143
+> 12 12.177817 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 10
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_144
+> 12 12.177817 2 2 10
+> 13 12.177817 2 1
+> 12 12.177817 2 1 12
+> 13 12.177817 2 2
+> 16 12.177817 3 0 PTP 2 1_2_12345_145
+> 12 12.177817 2 2 12
+> 13 12.181800 2 1
+> 12 12.181800 2 1 18
+> 13 12.181800 2 1
+> 7 12.181800 1 1
+> 13 12.184747 2 2
+> 12 12.184747 2 2 18
+> 13 12.184747 2 2
+> 7 12.184747 1 2
+> 13 12.185784 2 3
+> 12 12.185784 2 3 18
+> 13 12.185784 2 3
+> 7 12.185784 1 3
 
 $ rm -f ${bindir:=.}/smpi_trace.trace
 

diff --git a/include/simgrid/kernel/resource/Action.hpp b/include/simgrid/kernel/resource/Action.hpp
index fb24935..aac2b9e 100644 (file)
--- a/include/simgrid/kernel/resource/Action.hpp
+++ b/include/simgrid/kernel/resource/Action.hpp
@@ -72,6 +72,7 @@ class XBT_PUBLIC Action {
   activity::ActivityImpl* activity_ = nullptr;
 
   /* LMM */
+  double factor_           = 1.0; /**< Factor for effective rate = var->get_value() * factor_ */
   double last_update_      = 0;
   double last_value_       = 0;
   lmm::Variable* variable_ = nullptr;
@@ -244,6 +245,23 @@ public:
   double get_last_update() const { return last_update_; }
   void set_last_update();
 
+  /**
+   * @brief Set a factor for this action
+   *
+   * Defines a multiplicative factor for the consumption of the underlying resource.
+   *
+   * @param factor Multiplicative factor for this action (e.g. 0.97)
+   */
+  void set_rate_factor(double factor) { factor_ = factor; }
+  /**
+   * @brief Get the effective consumption rate of the resource
+   *
+   * The rate is based on the sharing given by the maxmin system underneath.
+   * However, it depends on the factor defined for this action.
+   *
+   * So, the effective rate is equal to var->get_value() * factor_
+   */
+  double get_rate() const;
   double get_last_value() const { return last_value_; }
   void set_last_value(double val) { last_value_ = val; }
   void set_suspend_state(Action::SuspendStates state) { suspended_ = state; }

diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp
index 08b0fb1..6db1c3b 100644 (file)
--- a/src/instr/instr_platform.cpp
+++ b/src/instr/instr_platform.cpp
@@ -336,7 +336,7 @@ static void on_action_state_change(kernel::resource::Action const& action,
   auto n = static_cast<unsigned>(action.get_variable()->get_number_of_constraint());
 
   for (unsigned i = 0; i < n; i++) {
-    double value = action.get_variable()->get_value() * action.get_variable()->get_constraint_weight(i);
+    double value = action.get_rate() * action.get_variable()->get_constraint_weight(i);
     /* Beware of composite actions: ptasks put links and cpus together. Extra pb: we cannot dynamic_cast from void* */
     kernel::resource::Resource* resource = action.get_variable()->get_constraint(i)->get_id();
     const kernel::resource::CpuImpl* cpu = dynamic_cast<kernel::resource::CpuImpl*>(resource);

diff --git a/src/kernel/resource/Action.cpp b/src/kernel/resource/Action.cpp
index 338a5ab..825578b 100644 (file)
--- a/src/kernel/resource/Action.cpp
+++ b/src/kernel/resource/Action.cpp
@@ -96,6 +96,11 @@ double Action::get_bound() const
   return variable_ ? variable_->get_bound() : 0;
 }
 
+double Action::get_rate() const
+{
+  return variable_ ? variable_->get_value() * factor_ : 0;
+}
+
 void Action::set_bound(double bound)
 {
   XBT_IN("(%p,%g)", this, bound);

diff --git a/src/kernel/resource/Model.cpp b/src/kernel/resource/Model.cpp
index b37c3b8..905ac2d 100644 (file)
--- a/src/kernel/resource/Model.cpp
+++ b/src/kernel/resource/Model.cpp
@@ -68,7 +68,7 @@ double Model::next_occurring_event_lazy(double now)
     action->update_remains_lazy(now);
 
     double min   = -1;
-    double share = action->get_variable()->get_value();
+    double share = action->get_rate();
 
     if (share > 0) {
       double time_to_completion;
@@ -117,7 +117,7 @@ double Model::next_occurring_event_full(double /*now*/)
   double min = -1;
 
   for (Action& action : *get_started_action_set()) {
-    double value = action.get_variable()->get_value();
+    double value = action.get_rate();
     if (value > 0) {
       if (action.get_remains() > 0)
         value = action.get_remains_no_update() / value;

diff --git a/src/plugins/link_energy_wifi.cpp b/src/plugins/link_energy_wifi.cpp
index 8a227c3..f9332d1 100644 (file)
--- a/src/plugins/link_energy_wifi.cpp
+++ b/src/plugins/link_energy_wifi.cpp
@@ -143,11 +143,10 @@ void LinkEnergyWifi::update(const kernel::resource::NetworkAction&)
   double durUsage = 0;
   while (const auto* var = wifi_link->get_constraint()->get_variable(&elem)) {
     auto* action = static_cast<kernel::resource::NetworkWifiAction*>(var->get_id());
-    XBT_DEBUG("cost: %f action value: %f link rate 1: %f link rate 2: %f", action->get_cost(),
-              action->get_variable()->get_value(), wifi_link->get_host_rate(&action->get_src()),
-              wifi_link->get_host_rate(&action->get_dst()));
+    XBT_DEBUG("cost: %f action value: %f link rate 1: %f link rate 2: %f", action->get_cost(), action->get_rate(),
+              wifi_link->get_host_rate(&action->get_src()), wifi_link->get_host_rate(&action->get_dst()));
 
-    if (action->get_variable()->get_value() != 0.0) {
+    if (action->get_rate() != 0.0) {
       auto it = flowTmp.find(action);
 
       // if the flow has not been registered, initialize it: 0 bytes sent, and not updated since its creation timestamp
@@ -161,7 +160,7 @@ void LinkEnergyWifi::update(const kernel::resource::NetworkAction&)
        * If this is longer than the duration since the previous update, active duration = now - previous_update
        */
       double du = // durUsage on the current flow
-          (action->get_cost() - it->second.first) / action->get_variable()->get_value();
+          (action->get_cost() - it->second.first) / action->get_rate();
 
       if(du > surf_get_clock()-it->second.second)
         du = surf_get_clock()-it->second.second;
@@ -171,7 +170,7 @@ void LinkEnergyWifi::update(const kernel::resource::NetworkAction&)
         durUsage = du;
 
       // update the amount of data already sent by the flow
-      it->second.first += du*action->get_variable()->get_value();
+      it->second.first += du * action->get_rate();
       it->second.second =  surf_get_clock();
 
       // important: if the transmission finished, remove it (needed for performance and multi-message flows)

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index 08ea671..61e2e33 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -159,7 +159,7 @@ double VMModel::next_occurring_event(double now)
     const kernel::resource::CpuImpl* cpu = ws_vm->pimpl_cpu;
 
     // solved_value below is X1 in comment above: what this VM got in the sharing on the PM
-    double solved_value = ws_vm->get_vm_impl()->get_action()->get_variable()->get_value();
+    double solved_value = ws_vm->get_vm_impl()->get_action()->get_rate();
     XBT_DEBUG("assign %f to vm %s @ pm %s", solved_value, ws_vm->get_cname(), ws_vm->get_pm()->get_cname());
 
     kernel::lmm::System* vcpu_system = cpu->get_model()->get_maxmin_system();

diff --git a/src/surf/cpu_interface.cpp b/src/surf/cpu_interface.cpp
index bfa0af4..24f37a8 100644 (file)
--- a/src/surf/cpu_interface.cpp
+++ b/src/surf/cpu_interface.cpp
@@ -36,7 +36,7 @@ void CpuModel::update_actions_state_full(double /*now*/, double delta)
     auto& action = static_cast<CpuAction&>(*it);
     ++it; // increment iterator here since the following calls to action.finish() may invalidate it
 
-    action.update_remains(action.get_variable()->get_value() * delta);
+    action.update_remains(action.get_rate() * delta);
     action.update_max_duration(delta);
 
     if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) ||
@@ -159,7 +159,7 @@ void CpuAction::update_remains_lazy(double now)
   }
 
   set_last_update();
-  set_last_value(get_variable()->get_value());
+  set_last_value(get_rate());
 }
 
 xbt::signal<void(CpuAction const&, Action::State)> CpuAction::on_state_change;

diff --git a/src/surf/disk_s19.cpp b/src/surf/disk_s19.cpp
index 22d9dbd..aa2d0ec 100644 (file)
--- a/src/surf/disk_s19.cpp
+++ b/src/surf/disk_s19.cpp
@@ -41,7 +41,7 @@ void DiskS19Model::update_actions_state(double /*now*/, double delta)
   for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
     auto& action = *it;
     ++it; // increment iterator here since the following calls to action.finish() may invalidate it
-    action.update_remains(rint(action.get_variable()->get_value() * delta));
+    action.update_remains(rint(action.get_rate() * delta));
     action.update_max_duration(delta);
 
     if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) ||

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 8e1c76d..a11156a 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -187,7 +187,7 @@ void NetworkCm02Model::update_actions_state_full(double /*now*/, double delta)
        */
       action.update_remains(action.get_remains());
     }
-    action.update_remains(action.get_variable()->get_value() * delta);
+    action.update_remains(action.get_rate() * delta);
 
     if (action.get_max_duration() != NO_MAX_DURATION)
       action.update_max_duration(delta);
@@ -338,6 +338,10 @@ void NetworkCm02Model::comm_action_set_bounds(const s4u::Host* src, const s4u::H
   } else {
     bw_factor = get_bandwidth_factor(size);
   }
+  xbt_assert(bw_factor != 0, "Invalid param for comm %s -> %s. Bandwidth factor cannot be 0", src->get_cname(),
+             dst->get_cname());
+  action->set_rate_factor(bw_factor);
+
   /* get mininum bandwidth among links in the route and multiply by correct factor
    * ignore wi-fi links, they're not considered for bw_factors */
   double bandwidth_bound = -1.0;
@@ -347,12 +351,13 @@ void NetworkCm02Model::comm_action_set_bounds(const s4u::Host* src, const s4u::H
     if (bandwidth_bound == -1.0 || l->get_bandwidth() < bandwidth_bound)
       bandwidth_bound = l->get_bandwidth();
   }
-  bandwidth_bound *= bw_factor;
 
+  /* increase rate given by user considering the factor, since the actual rate will be
+   * modified by it */
+  rate = rate / bw_factor;
   /* the bandwidth is determined by the minimum between flow and user's defined rate */
   if (rate >= 0 && rate < bandwidth_bound)
     bandwidth_bound = rate;
-
   action->set_user_bound(bandwidth_bound);
 
   action->lat_current_ = action->latency_;
@@ -439,7 +444,7 @@ NetworkCm02Link::NetworkCm02Link(const std::string& name, double bandwidth, kern
 {
   bandwidth_.scale = 1.0;
   bandwidth_.peak  = bandwidth;
-  this->set_constraint(system->constraint_new(this, sg_bandwidth_factor * bandwidth));
+  this->set_constraint(system->constraint_new(this, bandwidth));
 }
 
 void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double value)
@@ -471,8 +476,7 @@ void NetworkCm02Link::set_bandwidth(double value)
 {
   bandwidth_.peak = value;
 
-  get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(),
-                                                            sg_bandwidth_factor * (bandwidth_.peak * bandwidth_.scale));
+  get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), (bandwidth_.peak * bandwidth_.scale));
 
   LinkImpl::on_bandwidth_change();
 
@@ -555,7 +559,7 @@ void NetworkCm02Action::update_remains_lazy(double now)
   }
 
   set_last_update();
-  set_last_value(get_variable()->get_value());
+  set_last_value(get_rate());
 }
 
 } // namespace resource

diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp
index e6e51fc..30a4f9e 100644 (file)
--- a/src/surf/ptask_L07.cpp
+++ b/src/surf/ptask_L07.cpp
@@ -105,9 +105,8 @@ void HostL07Model::update_actions_state(double /*now*/, double delta)
         action.set_last_update();
       }
     }
-    XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", &action, action.get_remains(),
-              action.get_variable()->get_value() * delta);
-    action.update_remains(action.get_variable()->get_value() * delta);
+    XBT_DEBUG("Action (%p) : remains (%g) updated by %g.", &action, action.get_remains(), action.get_rate() * delta);
+    action.update_remains(action.get_rate() * delta);
     action.update_max_duration(delta);
 
     XBT_DEBUG("Action (%p) : remains (%g).", &action, action.get_remains());

diff --git a/teshsuite/models/wifi_usage/wifi_usage.tesh b/teshsuite/models/wifi_usage/wifi_usage.tesh
index 68e67a5..8b96647 100644 (file)
--- a/teshsuite/models/wifi_usage/wifi_usage.tesh
+++ b/teshsuite/models/wifi_usage/wifi_usage.tesh
@@ -1,7 +1,8 @@
 #!/usr/bin/env tesh
 
 p Test WITH crosstraffic
-$ ${bindir:=.}/wifi_usage ${platfdir}/wifi.xml --log=root.fmt=%m%n
+$ ${bindir:=.}/wifi_usage ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=network/model:CM02
+> Configuration change: Set 'network/model' to 'CM02'
 > TEST: Send from a station to a node on the wired network after the AP.
 > ----------------------------------------------------------------------
 > Since AP1 is the limiting link, we have the following constraint for AP1:
@@ -22,8 +23,9 @@ $ ${bindir:=.}/wifi_usage ${platfdir}/wifi.xml --log=root.fmt=%m%n
 > Actual result: Sending 1000 bytes from 'Station 1' to 'Station 2' takes 0.000311 seconds.
 
 p Test WITHOUT crosstraffic
-$ ${bindir:=.}/wifi_usage ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=network/crosstraffic:0
+$ ${bindir:=.}/wifi_usage ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=network/crosstraffic:0 --cfg=network/model:CM02
 > Configuration change: Set 'network/crosstraffic' to '0'
+> Configuration change: Set 'network/model' to 'CM02'
 > TEST: Send from a station to a node on the wired network after the AP.
 > ----------------------------------------------------------------------
 > Since AP1 is the limiting link, we have the following constraint for AP1:

diff --git a/teshsuite/models/wifi_usage_decay/wifi_usage_decay.tesh b/teshsuite/models/wifi_usage_decay/wifi_usage_decay.tesh
index f1208fd..b2fa6a9 100644 (file)
--- a/teshsuite/models/wifi_usage_decay/wifi_usage_decay.tesh
+++ b/teshsuite/models/wifi_usage_decay/wifi_usage_decay.tesh
@@ -1,7 +1,8 @@
 #!/usr/bin/env tesh
 
 p Test WITH crosstraffic
-$ ${bindir:=.}/wifi_usage_decay ${platfdir}/wifi.xml --log=root.fmt=%m%n
+$ ${bindir:=.}/wifi_usage_decay ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=network/model:CM02
+> Configuration change: Set 'network/model' to 'CM02'
 > TEST: Send from a station to a node on the wired network after the AP.
 > ----------------------------------------------------------------------
 > Since AP1 is the limiting link, we have the following constraint for AP1:
@@ -24,8 +25,9 @@ $ ${bindir:=.}/wifi_usage_decay ${platfdir}/wifi.xml --log=root.fmt=%m%n
 > Actual result: Sending 1000 bytes from 'Station 1' to 'Station 2' takes 0.000343 seconds.
 
 p Test WITHOUT crosstraffic
-$ ${bindir:=.}/wifi_usage_decay ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=network/crosstraffic:0
+$ ${bindir:=.}/wifi_usage_decay ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=network/crosstraffic:0 --cfg=network/model:CM02
 > Configuration change: Set 'network/crosstraffic' to '0'
+> Configuration change: Set 'network/model' to 'CM02'
 > TEST: Send from a station to a node on the wired network after the AP.
 > ----------------------------------------------------------------------
 > Since AP1 is the limiting link, we have the following constraint for AP1:
@@ -44,4 +46,4 @@ $ ${bindir:=.}/wifi_usage_decay ${platfdir}/wifi.xml --log=root.fmt=%m%n --cfg=n
 > However, decay model specify that for 2 stations, we have 54Mbps become 49.00487
 >   mu = 1 / [ 1/2 * 1/49.00487Mbps + 1/49.00487Mbps ] = 49004870
 >   simulation_time = 1000*8 / [ mu / 2 ] =  0.0003264982s (rounded to 0.000326s in SimGrid)
-> Actual result: Sending 1000 bytes from 'Station 1' to 'Station 2' takes 0.000326 seconds.
\ No newline at end of file
+> Actual result: Sending 1000 bytes from 'Station 1' to 'Station 2' takes 0.000326 seconds.

diff --git a/teshsuite/smpi/bug-17132/bug-17132.tesh b/teshsuite/smpi/bug-17132/bug-17132.tesh
index 1f529a7..a1a2f8f 100644 (file)
--- a/teshsuite/smpi/bug-17132/bug-17132.tesh
+++ b/teshsuite/smpi/bug-17132/bug-17132.tesh
@@ -1,3 +1,3 @@
 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -np 16 -platform ${platfdir:=.}/small_platform.xml -hostfile ../hostfile ${bindir:=.}/bug-17132 --cfg=smpi/simulate-computation:no --log=smpi_config.thres:warning --log=xbt_cfg.thres:warning
 > You requested to use 16 ranks, but there is only 5 processes in your hostfile...
-> Walltime = 0.478832
+> Walltime = 0.489366

diff --git a/teshsuite/smpi/coll-allreduce-with-leaks/coll-allreduce-with-leaks.tesh b/teshsuite/smpi/coll-allreduce-with-leaks/coll-allreduce-with-leaks.tesh
index 82bba27..bedb5a9 100644 (file)
--- a/teshsuite/smpi/coll-allreduce-with-leaks/coll-allreduce-with-leaks.tesh
+++ b/teshsuite/smpi/coll-allreduce-with-leaks/coll-allreduce-with-leaks.tesh
@@ -18,13 +18,13 @@ $ $VALGRIND_NO_LEAK_CHECK ${bindir:=.}/../../../smpi_script/bin/smpirun -map -ho
 > [rank 13] -> Ginette
 > [rank 14] -> Ginette
 > [rank 15] -> Ginette
-> [0.023768] [smpi_utils/INFO] Probable memory leaks in your code: SMPI detected 32 unfreed MPI handles :
-> [0.023768] [smpi_utils/INFO] 16 leaked handles of type MPI_Comm at coll-allreduce-with-leaks.c:23
-> [0.023768] [smpi_utils/INFO] 16 leaked handles of type MPI_Group at coll-allreduce-with-leaks.c:23
-> [0.023768] [smpi_utils/INFO] Probable memory leaks in your code: SMPI detected 32 unfreed buffers :
-> [0.023768] [smpi_utils/INFO] coll-allreduce-with-leaks.c:28 : leaked allocations of total size 1504, called 16 times, with minimum size 64 and maximum size 124
-> [0.023768] [smpi_utils/INFO] coll-allreduce-with-leaks.c:27 : leaked allocations of total size 1024, called 16 times, each with size 64
-> [0.023768] [smpi_utils/INFO] Memory Usage: Simulated application allocated 2528 bytes during its lifetime through malloc/calloc calls.
+> [0.023780] [smpi_utils/INFO] Probable memory leaks in your code: SMPI detected 32 unfreed MPI handles :
+> [0.023780] [smpi_utils/INFO] 16 leaked handles of type MPI_Comm at coll-allreduce-with-leaks.c:23
+> [0.023780] [smpi_utils/INFO] 16 leaked handles of type MPI_Group at coll-allreduce-with-leaks.c:23
+> [0.023780] [smpi_utils/INFO] Probable memory leaks in your code: SMPI detected 32 unfreed buffers :
+> [0.023780] [smpi_utils/INFO] coll-allreduce-with-leaks.c:28 : leaked allocations of total size 1504, called 16 times, with minimum size 64 and maximum size 124
+> [0.023780] [smpi_utils/INFO] coll-allreduce-with-leaks.c:27 : leaked allocations of total size 1024, called 16 times, each with size 64
+> [0.023780] [smpi_utils/INFO] Memory Usage: Simulated application allocated 2528 bytes during its lifetime through malloc/calloc calls.
 > Largest allocation at once from a single process was 124 bytes, at coll-allreduce-with-leaks.c:28. It was called 1 times during the whole simulation.
 > If this is too much, consider sharing allocations for computation buffers.
 > This can be done automatically by setting --cfg=smpi/auto-shared-malloc-thresh to the minimum size wanted size (this can alter execution if data content is necessary)

diff --git a/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh b/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh
index ae895e1..fff9f7d 100644 (file)
--- a/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh
+++ b/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh
@@ -19,22 +19,22 @@ $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_coll
 > [rank 13] -> Ginette
 > [rank 14] -> Ginette
 > [rank 15] -> Ginette
-> [  0.515984] (5:4@Jupiter) The quickest allreduce was redbcast on rank 4 and took 0.008017
-> [  0.515984] (6:5@Jupiter) The quickest allreduce was redbcast on rank 5 and took 0.008048
-> [  0.515984] (7:6@Jupiter) The quickest allreduce was redbcast on rank 6 and took 0.008048
-> [  0.515984] (8:7@Jupiter) The quickest allreduce was redbcast on rank 7 and took 0.008078
-> [  0.516103] (2:1@Tremblay) The quickest allreduce was redbcast on rank 1 and took 0.008013
-> [  0.516103] (3:2@Tremblay) The quickest allreduce was redbcast on rank 2 and took 0.008013
-> [  0.516103] (4:3@Tremblay) The quickest allreduce was redbcast on rank 3 and took 0.008044
-> [  0.516709] (13:12@Ginette) The quickest allreduce was mvapich2 on rank 12 and took 0.005970
-> [  0.516709] (14:13@Ginette) The quickest allreduce was mvapich2 on rank 13 and took 0.006001
-> [  0.516709] (15:14@Ginette) The quickest allreduce was mvapich2 on rank 14 and took 0.006001
-> [  0.516709] (16:15@Ginette) The quickest allreduce was ompi on rank 15 and took 0.005970
-> [  0.519260] (10:9@Fafard) The quickest allreduce was mvapich2 on rank 9 and took 0.005977
-> [  0.519260] (11:10@Fafard) The quickest allreduce was mvapich2 on rank 10 and took 0.005977
-> [  0.519260] (12:11@Fafard) The quickest allreduce was mvapich2 on rank 11 and took 0.006007
-> [  0.519260] (9:8@Fafard) The quickest allreduce was mvapich2 on rank 8 and took 0.005946
-> [  0.523253] (1:0@Tremblay) For rank 0, the quickest was redbcast : 0.008013 , but global was mvapich2 : 0.009198 at max
+> [  0.516218] (8:7@Jupiter) The quickest allreduce was redbcast on rank 7 and took 0.008087
+> [  0.516218] (7:6@Jupiter) The quickest allreduce was redbcast on rank 6 and took 0.008056
+> [  0.516218] (6:5@Jupiter) The quickest allreduce was redbcast on rank 5 and took 0.008056
+> [  0.516218] (5:4@Jupiter) The quickest allreduce was redbcast on rank 4 and took 0.008026
+> [  0.516333] (4:3@Tremblay) The quickest allreduce was redbcast on rank 3 and took 0.008054
+> [  0.516333] (3:2@Tremblay) The quickest allreduce was redbcast on rank 2 and took 0.008023
+> [  0.516333] (2:1@Tremblay) The quickest allreduce was redbcast on rank 1 and took 0.008023
+> [  0.516940] (13:12@Ginette) The quickest allreduce was mvapich2 on rank 12 and took 0.005970
+> [  0.516940] (14:13@Ginette) The quickest allreduce was mvapich2 on rank 13 and took 0.006001
+> [  0.516940] (15:14@Ginette) The quickest allreduce was mvapich2 on rank 14 and took 0.006001
+> [  0.516940] (16:15@Ginette) The quickest allreduce was ompi on rank 15 and took 0.005970
+> [  0.519494] (12:11@Fafard) The quickest allreduce was mvapich2 on rank 11 and took 0.006009
+> [  0.519494] (11:10@Fafard) The quickest allreduce was mvapich2 on rank 10 and took 0.005978
+> [  0.519494] (10:9@Fafard) The quickest allreduce was mvapich2 on rank 9 and took 0.005978
+> [  0.519494] (9:8@Fafard) The quickest allreduce was mvapich2 on rank 8 and took 0.005948
+> [  0.523490] (1:0@Tremblay) For rank 0, the quickest was redbcast : 0.008023 , but global was mvapich2 : 0.009199 at max
 > [0] sndbuf=[0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 ]
 > [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 ]

diff --git a/teshsuite/smpi/gh-139/gh-139.tesh b/teshsuite/smpi/gh-139/gh-139.tesh
index 3a4252b..322cc30 100644 (file)
--- a/teshsuite/smpi/gh-139/gh-139.tesh
+++ b/teshsuite/smpi/gh-139/gh-139.tesh
@@ -9,7 +9,7 @@ $ ${bindir:=.}/../../../smpi_script/bin/smpirun -np 2 -platform ${platfdir:=.}/s
 > [Jupiter:wait recv:(4) 0.000000] [smpi_test/INFO] new thread has parameter rank 1 and global variable rank 1
 > [Jupiter:wait recv:(4) 0.000000] [smpi_test/INFO] 1 has MPI rank 1 and global variable rank 1
 > [Jupiter:wait recv:(4) 0.000000] [smpi_test/INFO] 1 waiting request
-> [Jupiter:wait recv:(4) 0.002947] [smpi_test/INFO] 1 request done, return MPI_SUCCESS
-> [Jupiter:wait recv:(4) 0.002947] [smpi_test/INFO] 1 still has MPI rank 1 and global variable 1
+> [Jupiter:wait recv:(4) 0.002948] [smpi_test/INFO] 1 request done, return MPI_SUCCESS
+> [Jupiter:wait recv:(4) 0.002948] [smpi_test/INFO] 1 still has MPI rank 1 and global variable 1
 > [Tremblay:0:(1) 1.000000] [smpi_test/INFO] finally 42
 > [Jupiter:1:(2) 2.000000] [smpi_test/INFO] finally 42