Merge with framagit/master

diff --git a/COPYRIGHT.template b/COPYRIGHT.template
index f9e03f6..91d9e68 100644 (file)
--- a/COPYRIGHT.template
+++ b/COPYRIGHT.template
@@ -1,4 +1,4 @@
-/* Copyright (c) 2020. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2021. The SimGrid Team. All rights reserved.               */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */

diff --git a/docs/source/conf.py b/docs/source/conf.py
index 9386f7b..ddeb2b1 100644 (file)
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -32,7 +32,7 @@ if read_the_docs_build:
 # -- Project information -----------------------------------------------------
 
 project = u'SimGrid'
-copyright = u'2002-2020, The SimGrid Team'
+copyright = u'2002-2021, The SimGrid Team'
 author = u'The SimGrid Team'
 
 # The short X.Y version

diff --git a/examples/c/dht-kademlia/node.c b/examples/c/dht-kademlia/node.c
index 5565884..7e2ff56 100644 (file)
--- a/examples/c/dht-kademlia/node.c
+++ b/examples/c/dht-kademlia/node.c
@@ -203,7 +203,6 @@ answer_t find_closest(const_node_t node, unsigned int destination_id)
 
 unsigned int find_node(node_t node, unsigned int id_to_find, unsigned int count_in_stats)
 {
-  unsigned int i = 0;
   unsigned int queries;
   unsigned int answers;
   unsigned int destination_found = 0;
@@ -240,6 +239,7 @@ unsigned int find_node(node_t node, unsigned int id_to_find, unsigned int count_
           // Handle the answer
           routing_table_update(node, msg->sender_id);
           node_contact_t contact;
+          unsigned int i;
           xbt_dynar_foreach (node_list->nodes, i, contact)
             routing_table_update(node, contact->id);
 

diff --git a/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.cpp b/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.cpp
index e1f1580..bd47083 100644 (file)
--- a/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.cpp
+++ b/examples/s4u/network-ns3-wifi/s4u-network-ns3-wifi.cpp
@@ -15,7 +15,7 @@ public:
   std::string sender;
   int size;
 
-  Message(std::string sender_, int size_) : sender(sender_), size(size_) {}
+  Message(const std::string& sender_, int size_) : sender(sender_), size(size_) {}
 };
 
 static void sender(std::string mailbox, double msg_size, unsigned sleep_time)

diff --git a/include/simgrid/disk.h b/include/simgrid/disk.h
index ef71b3f..e115609 100644 (file)
--- a/include/simgrid/disk.h
+++ b/include/simgrid/disk.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2020-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */

diff --git a/src/bindings/java/jmsg_storage.cpp b/src/bindings/java/jmsg_storage.cpp
index ebffb32..f1f0ebb 100644 (file)
--- a/src/bindings/java/jmsg_storage.cpp
+++ b/src/bindings/java/jmsg_storage.cpp
@@ -195,7 +195,6 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Storage_all(JNIEnv * env, jc
   jobjectArray jtable;
   jobject jstorage;
   jstring jname;
-  sg_storage_t storage;
 
   xbt_dynar_t table = sg_storages_as_dynar();
   int count = xbt_dynar_length(table);
@@ -214,7 +213,7 @@ JNIEXPORT jobjectArray JNICALL Java_org_simgrid_msg_Storage_all(JNIEnv * env, jc
   }
 
   for (index = 0; index < count; index++) {
-    storage = xbt_dynar_get_as(table, index, sg_storage_t);
+    sg_storage_t storage = xbt_dynar_get_as(table, index, sg_storage_t);
     if (java_storage_map.find(storage) != java_storage_map.end()) {
       jstorage = java_storage_map.at(storage);
     } else {

diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp
index 248c5ad..0c7b0bc 100644 (file)
--- a/src/kernel/routing/TorusZone.cpp
+++ b/src/kernel/routing/TorusZone.cpp
@@ -61,7 +61,6 @@ void TorusZone::create_links_for_node(ClusterCreationArgs* cluster, int id, int
     private_links_.insert({position + j, {linkUp, linkDown}});
     dim_product *= current_dimension;
   }
-  rank++;
 }
 
 void TorusZone::parse_specific_arguments(ClusterCreationArgs* cluster)

diff --git a/src/mc/checker/UdporChecker.hpp b/src/mc/checker/UdporChecker.hpp
index 1b61be7..d6541c1 100644 (file)
--- a/src/mc/checker/UdporChecker.hpp
+++ b/src/mc/checker/UdporChecker.hpp
@@ -14,7 +14,6 @@ namespace simgrid {
 namespace mc {
 
 class XBT_PRIVATE UdporChecker : public Checker {
-
 public:
   explicit UdporChecker();
   ~UdporChecker() override = default;
@@ -22,11 +21,9 @@ public:
   RecordTrace get_record_trace() override;
   std::vector<std::string> get_textual_trace() override;
   void log_state() override;
-
-  
 };
 
 } // namespace mc
 } // namespace simgrid
 
-#endif
\ No newline at end of file
+#endif

diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp
index 34f2b68..749fd2f 100644 (file)
--- a/src/smpi/internals/smpi_global.cpp
+++ b/src/smpi/internals/smpi_global.cpp
@@ -497,8 +497,10 @@ static void smpi_init_privatization_dlopen(const std::string& executable)
         for (const std::string& target_lib : target_libs)
           unlink(target_lib.c_str());
       }
-      xbt_assert(handle != nullptr, "dlopen failed: %s (errno: %d -- %s)", dlerror(), saved_errno,
-                 strerror(saved_errno));
+      xbt_assert(handle != nullptr,
+                 "dlopen failed: %s (errno: %d -- %s).\nError: Did you compile the program with a SMPI-specific "
+                 "compiler (spmicc or friends)?",
+                 dlerror(), saved_errno, strerror(saved_errno));
 
       smpi_entry_point_type entry_point = smpi_resolve_function(handle);
       xbt_assert(entry_point, "Could not resolve entry point");

diff --git a/teshsuite/s4u/actor-suspend/actor-suspend.cpp b/teshsuite/s4u/actor-suspend/actor-suspend.cpp
index 73b5336..167313e 100644 (file)
--- a/teshsuite/s4u/actor-suspend/actor-suspend.cpp
+++ b/teshsuite/s4u/actor-suspend/actor-suspend.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2020-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */

diff --git a/tools/cmake/test_prog/prog_tsan.cpp b/tools/cmake/test_prog/prog_tsan.cpp
index 41ef8ba..6b379a7 100644 (file)
--- a/tools/cmake/test_prog/prog_tsan.cpp
+++ b/tools/cmake/test_prog/prog_tsan.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2020. The SimGrid Team.
+/* Copyright (c) 2020-2021. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it