File tree Expand file tree Collapse file tree 3 files changed +5
-3
lines changed Expand file tree Collapse file tree 3 files changed +5
-3
lines changed Original file line number Diff line number Diff line change @@ -804,7 +804,7 @@ static const hwloc_obj_type_t obj_order_type[] = {
804
804
HWLOC_OBJ_PCI_DEVICE ,
805
805
HWLOC_OBJ_OS_DEVICE ,
806
806
HWLOC_OBJ_PU ,
807
- HWLOC_OBJ_MISC ,
807
+ HWLOC_OBJ_MISC , /* Misc is always a leaf */
808
808
};
809
809
/***** Make sure you update obj_type_priority[] below as well. *****/
810
810
Original file line number Diff line number Diff line change @@ -686,7 +686,7 @@ HWLOC_DECLSPEC unsigned hwloc_topology_get_depth(hwloc_topology_t __hwloc_restri
686
686
* If ::HWLOC_OBJ_GROUP is given, the function may return ::HWLOC_TYPE_DEPTH_MULTIPLE
687
687
* if multiple levels of Groups exist.
688
688
*
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
690
690
* because these objects are stored in special levels that are not CPU-related.
691
691
* This virtual depth may be passed to other hwloc functions such as
692
692
* hwloc_get_obj_by_depth() but it should not be considered as an actual
Original file line number Diff line number Diff line change 1
1
/*
2
2
* Copyright © 2009 CNRS
3
- * Copyright © 2009-2016 Inria. All rights reserved.
3
+ * Copyright © 2009-2017 Inria. All rights reserved.
4
4
* Copyright © 2009-2012 Université Bordeaux
5
5
* Copyright © 2011 Cisco Systems, Inc. All rights reserved.
6
6
* 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
396
396
}
397
397
}
398
398
399
+ /* I/O or Misc object, without cpusets or nodesets. */
399
400
static __hwloc_inline int hwloc_obj_type_is_special (hwloc_obj_type_t type )
400
401
{
401
402
/* type contiguity is asserted in topology_check() */
402
403
return type >= HWLOC_OBJ_MISC && type <= HWLOC_OBJ_OS_DEVICE ;
403
404
}
405
+
404
406
static __hwloc_inline int hwloc_obj_type_is_io (hwloc_obj_type_t type )
405
407
{
406
408
/* type contiguity is asserted in topology_check() */
You can’t perform that action at this time.
0 commit comments