Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/sonar-project.properties b/sonar-project.properties
index cbec4f8..2170a5e 100644 (file)
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -81,6 +81,10 @@ sonar.cfamily.build-wrapper-output=bw-outputs
 # Where the coverage files are located
 # See https://docs.sonarqube.org/pages/viewpage.action?pageId=5312222
 sonar.cfamily.gcov.reportsPath=Testing/CoverageInfo
+# Files to ignore from coverage analysis:
+#   - foreign test suites
+#   - xml files
+sonar.coverage.exclusions=teshsuite/smpi/isp/**,teshsuite/smpi/mpich3-test/**,**/*.xml
 
 # Encoding of the source files
 sonar.sourceEncoding=UTF-8

diff --git a/src/kernel/routing/TorusZone.cpp b/src/kernel/routing/TorusZone.cpp
index f0445d2..cbea25d 100644 (file)
--- a/src/kernel/routing/TorusZone.cpp
+++ b/src/kernel/routing/TorusZone.cpp
@@ -90,13 +90,11 @@ void TorusZone::parse_specific_arguments(sg_platf_cluster_cbarg_t cluster)
 
   if (!xbt_dynar_is_empty(dimensions)) {
     /* We are in a torus cluster
-     * Parse attribute dimensions="dim1,dim2,dim3,...,dimN"
-     * and safe it in a dynarray.
+     * Parse attribute dimensions="dim1,dim2,dim3,...,dimN" and safe it in a vector.
      * Additionally, we need to know how many ranks we have in total
      */
     xbt_dynar_foreach (dimensions, iter, groups) {
-      int tmp = surf_parse_get_int(xbt_dynar_get_as(dimensions, iter, char*));
-      dimensions_.push_back(tmp);
+      dimensions_.push_back(surf_parse_get_int(groups));
     }
 
     linkCountPerNode_ = dimensions_.size();