Update to hwloc 1.5

v1.5 is a major new release series. It includes many new features and
changes over the v1.4.x series. The most noticeable changes are the
addition of the lstopo-no-graphics program (which does require any
heavy external library such as Cairo) and the discovery of instruction
caches. There are also many small improvements to all backends, and
some deprecated features have been removed.

Version 1.5.0
-------------
* Backends
  + Do not limit the number of processors to 1024 on Solaris anymore.
  + Gather total machine memory on FreeBSD.
  + XML topology files do not depend on the locale anymore. Float numbers
    such as NUMA distances or PCI link speeds now always use a dot as a
    decimal separator.
  + Add instruction caches detection on Linux, AIX, Windows and Darwin.
  + Add get_last_cpu_location() support for the current thread on AIX.
  + Support binding on AIX when threads or processes were bound with
    bindprocessor(). Thanks to Hendryk Bockelmann for reporting the issue
    and testing patches, and to Farid Parpia for explaining the binding
    interfaces.
  + Improve AMD topology detection in the x86 backend (for FreeBSD) using
    the topoext feature.
* API
  + Increase HWLOC_API_VERSION to 0x00010500 so that API changes may be
    detected at build-time.
  + Add a cache type attribute describind Data, Instruction and Unified
    caches. Caches with different types but same depth (for instance L1d
    and L1i) are placed on different levels.
  + Add hwloc_get_cache_type_depth() to retrieve the hwloc level depth of
    of the given cache depth and type, for instance L1i or L2.
    It helps disambiguating the case where hwloc_get_type_depth() returns
    HWLOC_TYPE_DEPTH_MULTIPLE.
  + Instruction caches are ignored unless HWLOC_TOPOLOGY_FLAG_ICACHES is
    passed to hwloc_topology_set_flags() before load.
  + Add hwloc_ibv_get_device_osdev_by_name() OpenFabrics helper in
    openfabrics-verbs.h to find the hwloc OS device object corresponding to
    an OpenFabrics device.
* Tools
  + Add lstopo-no-graphics, a lstopo built without graphical support to
    avoid dependencies on external libraries such as Cairo and X11. When
    supported, graphical outputs are only available in the original lstopo
    program.
    - Packagers splitting lstopo and lstopo-no-graphics into different
      packages are advised to use the alternatives system so that lstopo
      points to the best available binary.
  + Instruction caches are enabled in lstopo by default. User --no-icaches
    to disable them.
  + Add -t/--threads to show threads in hwloc-ps.
* Removal of obsolete components
  + Remove the old cpuset interface (hwloc/cpuset.h) which is deprecated and
    superseded by the bitmap API (hwloc/bitmap.h) since v1.1.
    hwloc_cpuset and nodeset types are still defined, but all hwloc_cpuset_*
    compatibility wrappers are now gone.
  + Remove Linux libnuma conversion helpers for the deprecated and
    broken nodemask_t interface.
  + Remove support for "Proc" type name, it was superseded by "PU" in v1.0.
  + Remove hwloc-mask symlinks, it was replaced by hwloc-calc in v1.0.
* Misc
  + Fix PCIe 3.0 link speed computation.
  + Non-printable characters are dropped from strings during XML export.
  + Fix importing of escaped characters with the minimalistic XML backend.
  + Assert hwloc_is_thissystem() in several I/O related helpers.
  + Fix some memory leaks in the x86 backend for FreeBSD.
  + Minor fixes to ease native builds on Windows.
  + Limit the number of retries when operating on all threads within a
    process on Linux if the list of threads is heavily getting modified.

3 files changed, 26 insertions, 17 deletions

diff --git a/parallel/hwloc/Makefile b/parallel/hwloc/Makefile
index 0709cf35254..4b32553e4a5 100644
--- a/parallel/hwloc/Makefile
+++ b/parallel/hwloc/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2012/10/02 17:11:50 tron Exp $
+# $NetBSD: Makefile,v 1.7 2012/10/17 03:11:44 asau Exp $
 
-DISTNAME=	hwloc-1.4
-PKGREVISION=	3
+DISTNAME=	hwloc-1.5
 CATEGORIES=	parallel
-MASTER_SITES=	http://www.open-mpi.org/software/hwloc/v1.4/downloads/
+MASTER_SITES=	http://www.open-mpi.org/software/hwloc/v1.5/downloads/
 
 MAINTAINER=	asau@inbox.ru
 HOMEPAGE=	http://www.open-mpi.org/projects/hwloc/
diff --git a/parallel/hwloc/PLIST b/parallel/hwloc/PLIST
index ef0ec7e5327..bd5a424a52b 100644
--- a/parallel/hwloc/PLIST
+++ b/parallel/hwloc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/03/21 13:31:35 asau Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/10/17 03:11:44 asau Exp $
 bin/hwloc-assembler
 bin/hwloc-assembler-remote
 bin/hwloc-bind
@@ -7,13 +7,12 @@ bin/hwloc-distances
 bin/hwloc-distrib
 bin/hwloc-info
 bin/hwloc-ls
-bin/hwloc-mask
 bin/hwloc-ps
 bin/lstopo
+bin/lstopo-no-graphics
 include/hwloc.h
 include/hwloc/autogen/config.h
 include/hwloc/bitmap.h
-include/hwloc/cpuset.h
 include/hwloc/cuda.h
 include/hwloc/cudart.h
 include/hwloc/helper.h
@@ -30,8 +29,8 @@ man/man1/hwloc-distances.1
 man/man1/hwloc-distrib.1
 man/man1/hwloc-info.1
 man/man1/hwloc-ls.1
-man/man1/hwloc-mask.1
 man/man1/hwloc-ps.1
+man/man1/lstopo-no-graphics.1
 man/man1/lstopo.1
 man/man3/HWLOC_API_VERSION.3
 man/man3/HWLOC_CPUBIND_NOMEMBIND.3
@@ -54,6 +53,9 @@ man/man3/HWLOC_OBJ_BRIDGE.3
 man/man3/HWLOC_OBJ_BRIDGE_HOST.3
 man/man3/HWLOC_OBJ_BRIDGE_PCI.3
 man/man3/HWLOC_OBJ_CACHE.3
+man/man3/HWLOC_OBJ_CACHE_DATA.3
+man/man3/HWLOC_OBJ_CACHE_INSTRUCTION.3
+man/man3/HWLOC_OBJ_CACHE_UNIFIED.3
 man/man3/HWLOC_OBJ_CORE.3
 man/man3/HWLOC_OBJ_GROUP.3
 man/man3/HWLOC_OBJ_MACHINE.3
@@ -73,12 +75,16 @@ man/man3/HWLOC_OBJ_TYPE_MAX.3
 man/man3/HWLOC_RESTRICT_FLAG_ADAPT_DISTANCES.3
 man/man3/HWLOC_RESTRICT_FLAG_ADAPT_IO.3
 man/man3/HWLOC_RESTRICT_FLAG_ADAPT_MISC.3
+man/man3/HWLOC_TOPOLOGY_FLAG_ICACHES.3
 man/man3/HWLOC_TOPOLOGY_FLAG_IO_BRIDGES.3
 man/man3/HWLOC_TOPOLOGY_FLAG_IO_DEVICES.3
 man/man3/HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM.3
 man/man3/HWLOC_TOPOLOGY_FLAG_WHOLE_IO.3
 man/man3/HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM.3
+man/man3/HWLOC_TYPE_DEPTH_BRIDGE.3
 man/man3/HWLOC_TYPE_DEPTH_MULTIPLE.3
+man/man3/HWLOC_TYPE_DEPTH_OS_DEVICE.3
+man/man3/HWLOC_TYPE_DEPTH_PCI_DEVICE.3
 man/man3/HWLOC_TYPE_DEPTH_UNKNOWN.3
 man/man3/HWLOC_TYPE_UNORDERED.3
 man/man3/hwloc_alloc.3
@@ -143,19 +149,21 @@ man/man3/hwloc_const_nodeset_t.3
 man/man3/hwloc_cpubind_flags_t.3
 man/man3/hwloc_cpuset_from_glibc_sched_affinity.3
 man/man3/hwloc_cpuset_from_linux_libnuma_bitmask.3
-man/man3/hwloc_cpuset_from_linux_libnuma_nodemask.3
 man/man3/hwloc_cpuset_from_linux_libnuma_ulongs.3
 man/man3/hwloc_cpuset_from_nodeset.3
 man/man3/hwloc_cpuset_from_nodeset_strict.3
 man/man3/hwloc_cpuset_t.3
 man/man3/hwloc_cpuset_to_glibc_sched_affinity.3
 man/man3/hwloc_cpuset_to_linux_libnuma_bitmask.3
-man/man3/hwloc_cpuset_to_linux_libnuma_nodemask.3
 man/man3/hwloc_cpuset_to_linux_libnuma_ulongs.3
 man/man3/hwloc_cpuset_to_nodeset.3
 man/man3/hwloc_cpuset_to_nodeset_strict.3
 man/man3/hwloc_cuda_get_device_cpuset.3
+man/man3/hwloc_cuda_get_device_pci_ids.3
+man/man3/hwloc_cuda_get_device_pcidev.3
 man/man3/hwloc_cudart_get_device_cpuset.3
+man/man3/hwloc_cudart_get_device_pci_ids.3
+man/man3/hwloc_cudart_get_device_pcidev.3
 man/man3/hwloc_custom_insert_group_object_by_parent.3
 man/man3/hwloc_custom_insert_topology.3
 man/man3/hwloc_distances_s.3
@@ -169,6 +177,7 @@ man/man3/hwloc_get_api_version.3
 man/man3/hwloc_get_area_membind.3
 man/man3/hwloc_get_area_membind_nodeset.3
 man/man3/hwloc_get_cache_covering_cpuset.3
+man/man3/hwloc_get_cache_type_depth.3
 man/man3/hwloc_get_child_covering_cpuset.3
 man/man3/hwloc_get_closest_objs.3
 man/man3/hwloc_get_common_ancestor_obj.3
@@ -222,6 +231,7 @@ man/man3/hwloc_get_type_or_below_depth.3
 man/man3/hwloc_get_whole_distance_matrix_by_depth.3
 man/man3/hwloc_get_whole_distance_matrix_by_type.3
 man/man3/hwloc_ibv_get_device_cpuset.3
+man/man3/hwloc_ibv_get_device_osdev_by_name.3
 man/man3/hwloc_linux_get_tid_cpubind.3
 man/man3/hwloc_linux_parse_cpumap_file.3
 man/man3/hwloc_linux_set_tid_cpubind.3
@@ -230,11 +240,9 @@ man/man3/hwloc_membind_policy_t.3
 man/man3/hwloc_mx_board_get_device_cpuset.3
 man/man3/hwloc_mx_endpoint_get_device_cpuset.3
 man/man3/hwloc_nodeset_from_linux_libnuma_bitmask.3
-man/man3/hwloc_nodeset_from_linux_libnuma_nodemask.3
 man/man3/hwloc_nodeset_from_linux_libnuma_ulongs.3
 man/man3/hwloc_nodeset_t.3
 man/man3/hwloc_nodeset_to_linux_libnuma_bitmask.3
-man/man3/hwloc_nodeset_to_linux_libnuma_nodemask.3
 man/man3/hwloc_nodeset_to_linux_libnuma_ulongs.3
 man/man3/hwloc_obj.3
 man/man3/hwloc_obj_add_info.3
@@ -247,6 +255,8 @@ man/man3/hwloc_obj_attr_u_hwloc_osdev_attr_s.3
 man/man3/hwloc_obj_attr_u_hwloc_pcidev_attr_s.3
 man/man3/hwloc_obj_bridge_type_e.3
 man/man3/hwloc_obj_bridge_type_t.3
+man/man3/hwloc_obj_cache_type_e.3
+man/man3/hwloc_obj_cache_type_t.3
 man/man3/hwloc_obj_cpuset_snprintf.3
 man/man3/hwloc_obj_get_info_by_name.3
 man/man3/hwloc_obj_info_s.3
@@ -333,7 +343,6 @@ man/man3/hwlocality_helper_types.3
 man/man3/hwlocality_information.3
 man/man3/hwlocality_linux.3
 man/man3/hwlocality_linux_libnuma_bitmask.3
-man/man3/hwlocality_linux_libnuma_nodemask.3
 man/man3/hwlocality_linux_libnuma_ulongs.3
 man/man3/hwlocality_membinding.3
 man/man3/hwlocality_myriexpress.3
@@ -347,4 +356,5 @@ man/man3/hwlocality_types.3
 man/man7/hwloc.7
 share/doc/hwloc/hwloc-a4.pdf
 share/doc/hwloc/hwloc-letter.pdf
+share/hwloc/hwloc-valgrind.supp
 share/hwloc/hwloc.dtd
diff --git a/parallel/hwloc/distinfo b/parallel/hwloc/distinfo
index 6f65de80f75..8e49a0ae49d 100644
--- a/parallel/hwloc/distinfo
+++ b/parallel/hwloc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2012/05/10 10:55:38 wiz Exp $
+$NetBSD: distinfo,v 1.3 2012/10/17 03:11:44 asau Exp $
 
-SHA1 (hwloc-1.4.tar.gz) = 9d965cfba65756229de257d06d0929c6780bd9b0
-RMD160 (hwloc-1.4.tar.gz) = edf405a7e9c1d7fc776eacf51074f655e5cac377
-Size (hwloc-1.4.tar.gz) = 3014082 bytes
+SHA1 (hwloc-1.5.tar.gz) = 0ff8c81481987627dc21b3ed826caaefc94d4d0f
+RMD160 (hwloc-1.5.tar.gz) = eb9a055db25561a8d8aa35c6a54f9787ee3839ed
+Size (hwloc-1.5.tar.gz) = 3118586 bytes
 SHA1 (patch-config_hwloc.m4) = 9a76635c82021fe79d7ffab0642b7d667c43b0d5
 SHA1 (patch-configure.ac) = 5ee0bdd92edf7b33fc41ca37eac8a93ab2c28bbe
 SHA1 (patch-src_Makefile.am) = 8da2df8954347d6de72b18dee6f5141db549f9a5