From: Loic Guegan <manzerberdes@gmx.com>
Date: Thu, 4 Jul 2019 15:21:51 +0000 (+0200)
Subject: Merge branch 'master' of framagit.org:simgrid/simgrid
X-Git-Tag: v3.23.2~14
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9f7e9a5afbeed8d2a18f3f52390da42856366eb7?hp=d12cd6be9ac379a370fc0ec3d643ca1dbbf9cd1f

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

diff --git a/MANIFEST.in b/MANIFEST.in
index d2ec5879b5..d29c4d9582 100644
--- 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/kernel/activity/CommImpl.cpp b/src/kernel/activity/CommImpl.cpp
index 4020b9c22f..8d6c7e37bd 100644
--- a/src/kernel/activity/CommImpl.cpp
+++ b/src/kernel/activity/CommImpl.cpp
@@ -692,8 +692,7 @@ void CommImpl::finish()
       try {
         std::rethrow_exception(simcall->issuer->exception_);
       } catch (simgrid::Exception& e) {
-        e.value                     = rank;
-        simcall->issuer->exception_ = std::make_exception_ptr(e);
+        e.value = rank;
       }
     }
 
diff --git a/src/surf/link_wifi.hpp b/src/surf/link_wifi.hpp
index 9a64350263..20f41791cd 100644
--- a/src/surf/link_wifi.hpp
+++ b/src/surf/link_wifi.hpp
@@ -20,7 +20,7 @@ class NetworkWifiLink : public NetworkCm02Link {
   std::map<xbt::string, int> host_rates;
 
   /** @brief Hold every rates available for this Access Point */
-  double* rates;
+  // double* rates; FIXME: unused
 
 public:
   void set_host_rate(sg_host_t host, int rate_level);
diff --git a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
index 3bf1398947..70e0fc828d 100644
--- 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;
@@ -499,11 +499,11 @@ static void test_link_off_during_wait_any()
       receiver_got_base_execution = true;
     }
     xbt_assert(receiver_got_network_failure_execution, "The receiver should have gotten a NetworkFailureException");
-    xbt_assert(not receiver_got_network_failure_execution, "The receiver should not have gotten a base Exception");
+    xbt_assert(not receiver_got_base_execution, "The receiver should not have gotten a base Exception");
   });
 
   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;
@@ -517,7 +517,7 @@ static void test_link_off_during_wait_any()
       sender_got_base_execution = true;
     }
     xbt_assert(sender_got_network_failure_execution, "The sender should have gotten a NetworkFailureException");
-    xbt_assert(not sender_got_network_failure_execution, "The sender should not have gotten a base Exception");
+    xbt_assert(not sender_got_base_execution, "The sender should not have gotten a base Exception");
   });
 
     simgrid::s4u::this_actor::sleep_for(2.0);
@@ -554,7 +554,7 @@ static void main_dispatcher()
   run_test("comm turn link off before send/recv", test_link_off_before_send_recv);
   run_test("comm turn link off between send/recv", test_link_off_between_send_recv);
   run_test("comm turn link off during transfer", test_link_off_during_transfer);
-//  run_test("comm turn link off during wait_any", test_link_off_during_wait_any);
+  run_test("comm turn link off during wait_any", test_link_off_during_wait_any);
 }
 
 int main(int argc, char* argv[])
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 858fabc538..04c57b0169 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -341,6 +341,7 @@ set(SURF_SRC
   src/surf/cpu_ti.cpp
   src/surf/network_cm02.cpp
   src/surf/link_wifi.cpp
+  src/surf/link_wifi.hpp
   src/surf/network_constant.cpp
   src/surf/network_interface.cpp
   src/surf/PropertyHolder.cpp