tests ok

Author: ndenoyelle

hwloc/distrib.c

@@ -49,10 +49,10 @@ static size_t* shuffled_range(const size_t n){
 	if ((ret = malloc(n*sizeof(*ret))) == NULL) { free(index); return NULL; }
 
 	srand(time(NULL));  
-	for(i=n-1;i>=0;i--){
-		val = rand()%(i+1);
-		ret[i] = index[val];
-		index[val] = index[i];
+	for(i=n;i>0;i--){
+		val = rand()%(i);
+		ret[i-1] = index[val];
+		index[val] = index[i-1];
   }
   free(index);
   return ret;
@@ -233,6 +233,8 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 		if ((obj->cpuset != NULL && !hwloc_bitmap_iszero(obj->cpuset)) &&
 		    hwloc_get_type_depth(topology, obj->type) >= 0)
 			n++;
+		if (obj->type == type)
+			break;
 		obj = obj->first_child;
 	}
 
@@ -245,6 +247,8 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 				levels[n-1-i] = obj->type;
 				i++;
 		}
+		if (obj->type == type)
+			break;		
 		obj = obj->first_child;
 	}
 
@@ -257,7 +261,7 @@ hwloc_distrib_iterator_scatter(hwloc_topology_t topology,
 	*it->roots = root;	
 	it->n_roots = 1;
 	it->root_coord = 0;
-	it->n_levels = 1;
+	it->n_levels = n;
 	it->levels = (struct hwloc_distrib_level **)((char*)it +
 						     sizeof(*it) +
 						     sizeof(hwloc_obj_t));

tests/hwloc/hwloc_distrib.c

@@ -138,7 +138,7 @@ static void test_scatter(hwloc_topology_t topology)
 	if ( !is_tleaf(topology) )
 		return;
 
-	ssize_t i=0, j, r, n=0, c, val, nleaves=1;
+	ssize_t i=0, j, r, n_levels=0, n=0, c, val, nleaves=1;
 	hwloc_obj_t item, obj, root = hwloc_get_obj_by_depth(topology, 0, 0);
 	struct hwloc_distrib_iterator *it;
 
@@ -172,12 +172,13 @@ static void test_scatter(hwloc_topology_t topology)
 		item = obj;
 		goto next_level;
 	}
-	
+
+	n_levels=n;
 	for (i = 0; hwloc_distrib_iterator_next(topology, it, &item); i++) {
 		c = i;
 		n = nleaves;
 		val = 0;
-		for (j = (n-2); j >= 0; j--) {
+		for (j = (n_levels-1); j > 0; j--) {
 			r = c % arities[j];
 			n = n / arities[j];
 			c = c / arities[j];

utils/hwloc/test-hwloc-distrib.sh.in

@@ -60,3 +60,4 @@ set -e
 ) > "$file"
 @DIFF@ @HWLOC_DIFF_U@ @HWLOC_DIFF_W@ $srcdir/test-hwloc-distrib.output "$file"
 rm -rf "$tmp"
+return 0