Merge remote-tracking branch 'github/master'

(fixed comment in NativeLib.java)

diff --git a/MANIFEST.in b/MANIFEST.in
index d2ec587..d29c4d9 100644 (file)
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -543,6 +543,7 @@ include src/surf/cpu_cas01.cpp
 include src/surf/cpu_interface.cpp
 include src/surf/cpu_ti.cpp
 include src/surf/network_cm02.cpp
+include src/surf/link_wifi.cpp
 include src/surf/network_constant.cpp
 include src/surf/network_interface.cpp
 include src/surf/PropertyHolder.cpp

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index b67462e..9592f82 100644 (file)
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -163,7 +163,7 @@ public final class NativeLib {
                public void run() {
                        try {
                                for (File f : dir.listFiles())
-                                       if (! f.delete() && !f.getAbsolutePath().contains("travis")) // Be silent on AppVeyor to not break the tests. Ugly trick :)
+                                       if (! f.delete() && !f.getAbsolutePath().contains("travis")) // Be silent on Travis to not break the tests. Ugly trick :)
                                                System.out.println("Unable to clean temporary file "+f.getAbsolutePath()+" during shutdown.");
                                if (! dir.delete() && !dir.getAbsolutePath().contains("travis") )
                                        System.out.println("Unable to clean temporary file "+dir.getAbsolutePath()+" during shutdown.");                                

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 7a47fa4..883578b 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -267,16 +267,6 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam
   simgrid::s4u::Link::on_creation(this->piface_);
 }
 
-NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
-                                 s4u::Link::SharingPolicy policy, lmm::System* system)
-    : NetworkCm02Link(model, name, 0, 0, policy, system)
-{
-  /* Setup Metrics for bandwidths_ */
-  for (auto bandwidth : bandwidths) {
-    bandwidths_.push_back({bandwidth, 1.0, nullptr});
-  }
-}
-
 void NetworkCm02Link::apply_event(kernel::profile::Event* triggered, double value)
 {
   /* Find out which of my iterators was triggered, and react accordingly */

diff --git a/src/surf/network_cm02.hpp b/src/surf/network_cm02.hpp
index 8cfa9ff..cd576d6 100644 (file)
--- a/src/surf/network_cm02.hpp
+++ b/src/surf/network_cm02.hpp
@@ -47,8 +47,6 @@ class NetworkCm02Link : public LinkImpl {
 public:
   NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency,
                   s4u::Link::SharingPolicy policy, lmm::System* system);
-  NetworkCm02Link(NetworkCm02Model* model, const std::string& name, std::vector<double> bandwidths,
-                  s4u::Link::SharingPolicy policy, lmm::System* system);
   virtual ~NetworkCm02Link() = default;
   void apply_event(kernel::profile::Event* event, double value) override;
   void set_bandwidth(double value) override;

diff --git a/src/surf/network_interface.hpp b/src/surf/network_interface.hpp
index e0cb080..79103fd 100644 (file)
--- a/src/surf/network_interface.hpp
+++ b/src/surf/network_interface.hpp
@@ -160,8 +160,6 @@ public:
   Metric latency_                   = {1.0, 0, nullptr};
   Metric bandwidth_                 = {1.0, 0, nullptr};
 
-  /** @brief A link can have several bandwith attach to it (mostly use by wifi model) */
-  std::vector<Metric> bandwidths_;
 };
 
 /**********

diff --git a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
index 11feb0c..70e0fc8 100644 (file)
--- a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
+++ b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
@@ -482,7 +482,7 @@ static void test_link_off_during_wait_any()
   const double start = simgrid::s4u::Engine::get_clock();
 
   simgrid::s4u::ActorPtr receiver = simgrid::s4u::Actor::create("receiver", all_hosts[1], [&start]() {
-    assert_exit(false, 2);
+    assert_exit(false, start + 2);
     bool receiver_got_network_failure_execution = false;
     bool receiver_got_base_execution = false;
     int *data;
@@ -503,7 +503,7 @@ static void test_link_off_during_wait_any()
   });
 
   simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[2], [&start]() {
-    assert_exit(false, 2);
+    assert_exit(false, start + 2);
     int data = 42;
     bool sender_got_network_failure_execution = false;
     bool sender_got_base_execution = false;