Skip to content

Commit a1b0f2c

Browse files
committed
distances: clarify the documentation of matrices vs distances
Functions manipulate distance matrix structures, so don't just talk about "distances" so that people aren't confused with individual distance values inside those matrices. Thanks to Thomas Gruber for the report. Signed-off-by: Brice Goglin <[email protected]>
1 parent f25f335 commit a1b0f2c

File tree

1 file changed

+17
-16
lines changed

1 file changed

+17
-16
lines changed

include/hwloc/distances.h

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2010-2017 Inria. All rights reserved.
2+
* Copyright © 2010-2019 Inria. All rights reserved.
33
* See COPYING in top-level directory.
44
*/
55

@@ -97,19 +97,20 @@ enum hwloc_distances_kind_e {
9797
* \p flags is currently unused, should be \c 0.
9898
*
9999
* \p kind serves as a filter. If \c 0, all distance matrices are returned.
100-
* If it contains some HWLOC_DISTANCES_KIND_FROM_*, only distances whose kind
101-
* matches one of these are returned.
102-
* If it contains some HWLOC_DISTANCES_KIND_MEANS_*, only distances whose kind
103-
* matches one of these are returned.
100+
* If it contains some HWLOC_DISTANCES_KIND_FROM_*, only distance matrices
101+
* whose kind matches one of these are returned.
102+
* If it contains some HWLOC_DISTANCES_KIND_MEANS_*, only distance matrices
103+
* whose kind matches one of these are returned.
104104
*
105-
* On input, \p nr points to the number of distances that may be stored in \p distances.
106-
* On output, \p nr points to the number of distances that were actually found,
107-
* even if some of them couldn't be stored in \p distances.
108-
* Distances that couldn't be stored are ignored, but the function still returns
109-
* success (\c 0). The caller may find out by comparing the value pointed by \p nr
110-
* before and after the function call.
105+
* On input, \p nr points to the number of distance matrices that may be stored
106+
* in \p distances.
107+
* On output, \p nr points to the number of distance matrices that were actually
108+
* found, even if some of them couldn't be stored in \p distances.
109+
* Distance matrices that couldn't be stored are ignored, but the function still
110+
* returns success (\c 0). The caller may find out by comparing the value pointed
111+
* by \p nr before and after the function call.
111112
*
112-
* Each distance structure returned in the \p distances array should be released
113+
* Each distance matrix returned in the \p distances array should be released
113114
* by the caller using hwloc_distances_release().
114115
*/
115116
HWLOC_DECLSPEC int
@@ -143,15 +144,15 @@ hwloc_distances_get_by_type(hwloc_topology_t topology, hwloc_obj_type_t type,
143144
return hwloc_distances_get_by_depth(topology, depth, nr, distances, kind, flags);
144145
}
145146

146-
/** \brief Release a distance structure previously returned by hwloc_distances_get(). */
147+
/** \brief Release a distance matrix structure previously returned by hwloc_distances_get(). */
147148
HWLOC_DECLSPEC void
148149
hwloc_distances_release(hwloc_topology_t topology, struct hwloc_distances_s *distances);
149150

150151
/** @} */
151152

152153

153154

154-
/** \defgroup hwlocality_distances_consult Helpers for consulting distances structures
155+
/** \defgroup hwlocality_distances_consult Helpers for consulting distance matrices
155156
* @{
156157
*/
157158

@@ -169,7 +170,7 @@ hwloc_distances_obj_index(struct hwloc_distances_s *distances, hwloc_obj_t obj)
169170
return -1;
170171
}
171172

172-
/** \brief Find the values between two objects in a distances structure.
173+
/** \brief Find the values between two objects in a distance matrices.
173174
*
174175
* The distance from \p obj1 to \p obj2 is stored in the value pointed by
175176
* \p value1to2 and reciprocally.
@@ -212,7 +213,7 @@ enum hwloc_distances_add_flag_e {
212213
HWLOC_DISTANCES_ADD_FLAG_GROUP_INACCURATE = (1UL<<1)
213214
};
214215

215-
/** \brief Provide a distance matrix.
216+
/** \brief Provide a new distance matrix.
216217
*
217218
* Provide the matrix of distances between a set of objects given by \p nbobjs
218219
* and the \p objs array. \p nbobjs must be at least 2.

0 commit comments

Comments
 (0)