Skip to content

Commit 2e59d9d

Browse files
committed
Fix some random comments
Signed-off-by: Brice Goglin <[email protected]>
1 parent 0ba3239 commit 2e59d9d

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

hwloc/topology.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ static const hwloc_obj_type_t obj_order_type[] = {
804804
HWLOC_OBJ_PCI_DEVICE,
805805
HWLOC_OBJ_OS_DEVICE,
806806
HWLOC_OBJ_PU,
807-
HWLOC_OBJ_MISC,
807+
HWLOC_OBJ_MISC, /* Misc is always a leaf */
808808
};
809809
/***** Make sure you update obj_type_priority[] below as well. *****/
810810

include/hwloc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ HWLOC_DECLSPEC unsigned hwloc_topology_get_depth(hwloc_topology_t __hwloc_restri
686686
* If ::HWLOC_OBJ_GROUP is given, the function may return ::HWLOC_TYPE_DEPTH_MULTIPLE
687687
* if multiple levels of Groups exist.
688688
*
689-
* If an I/O or Misc object type or is given, the function returns a virtual value
689+
* If an I/O or Misc object type is given, the function returns a virtual value
690690
* because these objects are stored in special levels that are not CPU-related.
691691
* This virtual depth may be passed to other hwloc functions such as
692692
* hwloc_get_obj_by_depth() but it should not be considered as an actual

include/private/misc.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* Copyright © 2009 CNRS
3-
* Copyright © 2009-2016 Inria. All rights reserved.
3+
* Copyright © 2009-2017 Inria. All rights reserved.
44
* Copyright © 2009-2012 Université Bordeaux
55
* Copyright © 2011 Cisco Systems, Inc. All rights reserved.
66
* See COPYING in top-level directory.
@@ -396,11 +396,13 @@ static __hwloc_inline hwloc_obj_type_t hwloc_cache_type_by_depth_type(unsigned d
396396
}
397397
}
398398

399+
/* I/O or Misc object, without cpusets or nodesets. */
399400
static __hwloc_inline int hwloc_obj_type_is_special (hwloc_obj_type_t type)
400401
{
401402
/* type contiguity is asserted in topology_check() */
402403
return type >= HWLOC_OBJ_MISC && type <= HWLOC_OBJ_OS_DEVICE;
403404
}
405+
404406
static __hwloc_inline int hwloc_obj_type_is_io (hwloc_obj_type_t type)
405407
{
406408
/* type contiguity is asserted in topology_check() */

0 commit comments

Comments
 (0)