Add hwloc 1.3.1, but it is not yet the default -- it is currently

.ompi_ignored to allow other developers to test with it.  It is
expected that we'll remove the .ompi_ignore here soon, and
simultaneously remove the hwloc 1.2.2ompi component.

There was one very minor patch added to stock hwloc 1.3.1 in
hwloc/config/hwloc.m4:

{{{
--- hwloc-1.3.1/config/hwloc.m4	2011-12-14 
+++ ompi3/opal/mca/hwloc/hwloc131/hwloc/config/hwloc.m4
@@ -583,6 +583,7 @@
         ])
     fi
     AC_SUBST(HWLOC_PCI_LIBS)
+    HWLOC_LIBS="$HWLOC_LIBS $HWLOC_PCI_LIBS"
     # If we asked for pci support but couldn't deliver, fail
     AS_IF([test "$enable_pci" = "yes" -a "$hwloc_pci_happy" = "no"],
           [AC_MSG_WARN([Specified --enable-pci switch, but could
	   not])
}}}

This will be pushed upstream to hwloc.

This commit was SVN r25706.

opal/mca/hwloc/hwloc131/Makefile.am

@@ -0,0 +1,66 @@
+#
+# Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+# Need to include these files so that these directories are carried in
+# the tarball (in case someone invokes autogen.sh on a dist tarball).
+EXTRA_DIST = \
+        hwloc/doc/README.txt \
+        hwloc/tests/README.txt \
+        hwloc/utils/README.txt
+
+SUBDIRS = hwloc
+
+# Headers and sources
+headers = hwloc131.h
+sources = hwloc131_component.c hwloc131_module.c
+
+# We only ever build this component statically
+noinst_LTLIBRARIES = libmca_hwloc_hwloc131.la
+libmca_hwloc_hwloc131_la_SOURCES = $(headers) $(sources)
+libmca_hwloc_hwloc131_la_LDFLAGS = -module -avoid-version $(opal_hwloc_hwloc131_LDFLAGS)
+libmca_hwloc_hwloc131_la_LIBADD = $(opal_hwloc_hwloc131_LIBS)
+libmca_hwloc_hwloc131_la_DEPENDENCIES = \
+    $(HWLOC_top_builddir)/src/libhwloc_embedded.la
+
+# Since the rest of the code base includes the underlying hwloc.h, we
+# also have to install the underlying header files when
+# --with-devel-headers is specified.  hwloc doesn't support this; the
+# least gross way to make this happen is just to list all of hwloc's
+# header files here.  :-(
+headers += \
+        hwloc/include/hwloc.h \
+        hwloc/include/hwloc/bitmap.h \
+        hwloc/include/hwloc/cpuset.h \
+        hwloc/include/hwloc/helper.h \
+        hwloc/include/hwloc/myriexpress.h \
+        hwloc/include/hwloc/openfabrics-verbs.h \
+        hwloc/include/hwloc/cuda.h \
+        hwloc/include/hwloc/cudart.h \
+        hwloc/include/hwloc/rename.h \
+        hwloc/include/hwloc/autogen/config.h \
+        hwloc/include/private/private.h \
+        hwloc/include/private/debug.h \
+        hwloc/include/private/misc.h \
+        hwloc/include/private/cpuid.h
+
+if HWLOC_HAVE_LINUX
+headers += \
+        hwloc/include/hwloc/linux.h \
+        hwloc/include/hwloc/linux-libnuma.h
+endif HWLOC_HAVE_LINUX
+
+if HWLOC_HAVE_SCHED_SETAFFINITY
+headers += hwloc/include/hwloc/glibc-sched.h
+endif HWLOC_HAVE_SCHED_SETAFFINITY
+
+# Conditionally install the header files
+if WANT_INSTALL_HEADERS
+opaldir = $(includedir)/openmpi/$(subdir)
+nobase_opal_HEADERS = $(headers)
+endif

opal/mca/hwloc/hwloc131/configure.m4

@@ -0,0 +1,128 @@
+# -*- shell-script -*-
+#
+# Copyright (c) 2009-2011 Cisco Systems, Inc.  All rights reserved. 
+#
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+#
+# Priority
+#
+# JMS Temporarily make this higher than hwlo121
+AC_DEFUN([MCA_opal_hwloc_hwloc131_PRIORITY], [65])
+
+#
+# Force this component to compile in static-only mode
+#
+AC_DEFUN([MCA_opal_hwloc_hwloc131_COMPILE_MODE], [
+    AC_MSG_CHECKING([for MCA component $2:$3 compile mode])
+    $4="static"
+    AC_MSG_RESULT([$$4])
+])
+
+# Include hwloc m4 files
+m4_include(opal/mca/hwloc/hwloc131/hwloc/config/hwloc.m4)
+m4_include(opal/mca/hwloc/hwloc131/hwloc/config/hwloc_pkg.m4)
+m4_include(opal/mca/hwloc/hwloc131/hwloc/config/hwloc_check_attributes.m4)
+m4_include(opal/mca/hwloc/hwloc131/hwloc/config/hwloc_check_visibility.m4)
+
+# MCA_hwloc_hwloc131_POST_CONFIG()
+# ---------------------------------
+AC_DEFUN([MCA_opal_hwloc_hwloc131_POST_CONFIG],[
+    HWLOC_DO_AM_CONDITIONALS
+])dnl
+
+
+# MCA_hwloc_hwloc131_CONFIG([action-if-found], [action-if-not-found])
+# --------------------------------------------------------------------
+AC_DEFUN([MCA_opal_hwloc_hwloc131_CONFIG],[
+    AC_CONFIG_FILES([opal/mca/hwloc/hwloc131/Makefile])
+
+    OPAL_VAR_SCOPE_PUSH([HWLOC_VERSION opal_hwloc_hwloc131_save_CPPFLAGS opal_hwloc_hwloc131_save_LDFLAGS opal_hwloc_hwloc131_save_LIBS opal_hwloc_hwloc131_save_cairo opal_hwloc_hwloc131_save_xml opal_hwloc_hwloc131_basedir opal_hwloc_hwloc131_file])
+
+    # default to this component not providing support
+    opal_hwloc_hwloc131_basedir=opal/mca/hwloc/hwloc131
+    opal_hwloc_hwloc131_support=no
+
+    if test "$with_hwloc" = "internal" -o "$with_hwloc" = "" -o "$with_hwloc" = "yes"; then
+        opal_hwloc_hwloc131_save_CPPFLAGS=$CPPFLAGS
+        opal_hwloc_hwloc131_save_LDFLAGS=$LDFLAGS
+        opal_hwloc_hwloc131_save_LIBS=$LIBS
+
+        # Run the hwloc configuration - set the prefix to minimize
+        # the chance that someone will use the internal symbols
+        HWLOC_SET_SYMBOL_PREFIX([opal_hwloc131_])
+
+        # save XML or graphical options
+        opal_hwloc_hwloc131_save_cairo=$enable_cairo
+        opal_hwloc_hwloc131_save_xml=$enable_xml
+
+        # never enable hwloc's graphical option
+        enable_cairo=no
+
+        # Override -- disable hwloc's libxml2 support, but enable the
+        # native hwloc XML support
+        enable_libxml2=no
+        enable_xml=yes
+
+        HWLOC_SETUP_CORE([opal/mca/hwloc/hwloc131/hwloc], 
+                  [AC_MSG_CHECKING([whether hwloc configure succeeded])
+                   AC_MSG_RESULT([yes])
+                   HWLOC_VERSION="internal v`$srcdir/$opal_hwloc_hwloc131_basedir/hwloc/config/hwloc_get_version.sh $srcdir/$opal_hwloc_hwloc131_basedir/hwloc/VERSION`"
+
+                   # Build flags for our Makefile.am
+                   opal_hwloc_hwloc131_LDFLAGS='$(HWLOC_EMBEDDED_LDFLAGS)'
+                   opal_hwloc_hwloc131_LIBS='$(top_ompi_builddir)/'"$opal_hwloc_hwloc131_basedir"'/hwloc/src/libhwloc_embedded.la $(HWLOC_EMBEDDED_LIBS)'
+                   opal_hwloc_hwloc131_support=yes], 
+                  [AC_MSG_CHECKING([whether hwloc configure succeeded])
+                   AC_MSG_RESULT([no])
+                   opal_hwloc_hwloc131_support=no])
+
+        # Restore some env variables, if necessary
+        AS_IF([test -n "$opal_hwloc_hwloc131_save_cairo"],
+              [enable_cairo=$opal_hwloc_hwloc131_save_cairo])
+        AS_IF([test -n "$opal_hwloc_hwloc131_save_xml"],
+              [enable_xml=$opal_hwloc_hwloc131_save_xml])
+       
+        CPPFLAGS=$opal_hwloc_hwloc131_save_CPPFLAGS
+        LDFLAGS=$opal_hwloc_hwloc131_save_LDFLAGS
+        LIBS=$opal_hwloc_hwloc131_save_LIBS
+
+        AC_SUBST([opal_hwloc_hwloc131_CFLAGS])
+        AC_SUBST([opal_hwloc_hwloc131_CPPFLAGS])
+        AC_SUBST([opal_hwloc_hwloc131_LDFLAGS])
+        AC_SUBST([opal_hwloc_hwloc131_LIBS])
+    fi
+
+    # Done!
+    AS_IF([test "$opal_hwloc_hwloc131_support" = "yes"],
+          [AC_DEFINE_UNQUOTED([HWLOC_HWLOC131_HWLOC_VERSION], 
+                              ["$HWLOC_VERSION"], 
+                              [Version of hwloc])
+
+           # Set these variables so that the framework m4 knows
+           # what file to include in opal/mca/hwloc/hwloc.h
+           opal_hwloc_hwloc131_include="$opal_hwloc_hwloc131_basedir/hwloc131.h"
+
+           # Also pass some *_ADD_* flags upwards to the framework m4
+           # for various compile/link flags that are needed a) to
+           # build the rest of the source tree, and b) for the wrapper
+           # compilers (in the --with-devel-headers case).
+           opal_hwloc_hwloc131_file=$opal_hwloc_hwloc131_basedir/hwloc
+           opal_hwloc_hwloc131_ADD_CPPFLAGS="-I$OMPI_TOP_SRCDIR/$opal_hwloc_hwloc131_file/include"
+           AS_IF([test "$OMPI_TOP_BUILDDIR" != "$OMPI_TOP_SRCDIR"],
+                 [opal_hwloc_hwloc131_ADD_CPPFLAGS="$opal_hwloc_hwloc131_ADD_CPPFLAGS -I$OMPI_TOP_BUILDDIR/$opal_hwloc_hwloc131_file/include"])
+           if test "$with_devel_headers" = "yes" ; then
+               opal_hwloc_hwloc131_ADD_WRAPPER_EXTRA_CPPFLAGS='-I${includedir}/openmpi/'"$opal_hwloc_hwloc131_basedir/hwloc/include"
+               opal_hwloc_hwloc131_ADD_WRAPPER_EXTRA_LIBS=$HWLOC_EMBEDDED_LIBS
+           fi
+
+           $1],
+          [$2])
+
+    OPAL_VAR_SCOPE_POP
+])dnl

opal/mca/hwloc/hwloc131/hwloc/AUTHORS

@@ -0,0 +1,8 @@
+Cédric Augonnet <Cedric.Augonnet@labri.fr>
+Jérôme Clet-Ortega <Jerome.Clet-Ortega@labri.fr>
+Ludovic Courtès <Ludovic.Courtes@inria.fr>
+Brice Goglin <Brice.Goglin@inria.fr>
+Nathalie Furmento <Nathalie.Furmento@labri.fr>
+Samuel Thibault <Samuel.Thibault@labri.fr>
+Jeff Squyres <jsquyres@cisco.com>
+Alexey Kardashevskiy <aik@au1.ibm.com>

opal/mca/hwloc/hwloc131/hwloc/COPYING

@@ -0,0 +1,27 @@
+Copyright © 2009 CNRS
+Copyright © 2009 INRIA.  All rights reserved.
+Copyright © 2009 Université Bordeaux 1
+Copyright © 2009 Cisco Systems, Inc.  All rights reserved.
+See COPYING in top-level directory.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

opal/mca/hwloc/hwloc131/hwloc/Makefile.am

@@ -0,0 +1,68 @@
+# Copyright © 2009      INRIA.  All rights reserved.
+# Copyright © 2009      Université Bordeaux 1
+# Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
+# See COPYING in top-level directory.
+
+# Note that the -I directory must *exactly* match what was specified
+# via AC_CONFIG_MACRO_DIR in configure.ac.
+ACLOCAL_AMFLAGS = -I ./config
+
+SUBDIRS = src include
+if HWLOC_BUILD_STANDALONE
+SUBDIRS += utils tests doc
+endif
+
+# Do not let automake automatically add the non-standalone dirs to the
+# distribution tarball if we're building in embedded mode.
+DIST_SUBDIRS = $(SUBDIRS)
+
+# Only install the pkg file if we're building in standalone mode
+if HWLOC_BUILD_STANDALONE
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = hwloc.pc
+endif
+
+#
+# "make distcheck" requires that tarballs are able to be able to "make
+# dist", so we have to include config/distscript.csh.
+#
+EXTRA_DIST = \
+        README VERSION COPYING AUTHORS \
+        config/hwloc_get_version.sh \
+        config/distscript.csh
+
+if HWLOC_BUILD_STANDALONE
+#
+# Double check that we generated both the doxygen docs and a new copy
+# of the top-level README file.
+#
+cannot-dist:
+	@echo "ERROR: Did not build both of the doxygen docs and README."
+	@echo "ERROR: This tarball is not complete!"
+	@echo "ERROR: Cowardly refusing to complete successfully..."
+	@exit 1
+
+# Refuse to make dist if we can't make the doxygen stuff (note that
+# BUILD_DOXYGEN will automatically be false if we're not building
+# standalone).
+if !HWLOC_BUILD_DOXYGEN
+dist-hook: cannot-dist
+else
+if !HWLOC_BUILD_README
+dist-hook: cannot-dist
+else
+dist-hook:
+	csh "$(top_srcdir)/config/distscript.csh" "$(top_srcdir)" "$(distdir)" "$(HWLOC_VERSION)" "$(HWLOC_SVN_R)"
+endif HWLOC_BUILD_README
+endif HWLOC_BUILD_DOXYGEN
+endif HWLOC_BUILD_STANDALONE
+
+#
+# Build the top-level README file
+#
+
+if HWLOC_BUILD_STANDALONE
+.PHONY: doc readme
+doc readme:
+	$(MAKE) -C doc readme
+endif HWLOC_BUILD_STANDALONE

opal/mca/hwloc/hwloc131/hwloc/NEWS

@@ -0,0 +1,435 @@
+Copyright © 2009 CNRS
+Copyright © 2009-2011 INRIA.  All rights reserved.
+Copyright © 2009-2011 Université Bordeaux 1
+Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
+
+$COPYRIGHT$
+
+Additional copyrights may follow
+
+$HEADER$
+
+===========================================================================
+
+This file contains the main features as well as overviews of specific
+bug fixes (and other actions) for each version of hwloc since version
+0.9 (as initially released as "libtopology", then re-branded to "hwloc"
+in v0.9.1).
+
+
+Version 1.3.1
+-------------
+* Fix pciutils detection with pkg-config when not installed in standard
+  directories.
+* Fix visibility options detection with the Solaris Studio compiler.
+  Thanks to Igor Galić and Terry Dontje for reporting the problems.
+* Fix support for old Linux sched.h headers such as those found
+  on Red Hat 8. Thanks to Paul H. Hargrove for reporting the problems.
+* Fix inline and attribute support for Solaris compilers. Thanks to
+  Dave Love for reporting the problems.
+* Print a short summary at the end of the configure output. Thanks to
+  Stefan Eilemann for the suggestion.
+* Add --disable-libnuma configure option to disable libnuma-based
+  memory binding support on Linux.  Thanks to Rayson Ho for the
+  suggestion.
+* Make hwloc's configure script properly obey $PKG_CONFIG.  Thanks to
+  Nathan Phillip Brink for raising the issue.
+* Silence some harmless pciutils warnings, thanks to Paul H. Hargrove
+  for reporting the problem.
+* Fix the documentation with respect to hwloc_pid_t and hwloc_thread_t
+  being either pid_t and pthread_t on Unix, or HANDLE on Windows.
+
+
+Version 1.3.0
+-------------
+* Major features
+  + Add I/O devices and bridges to the topology using the pciutils
+    library. Only enabled after setting the relevant flag with
+    hwloc_topology_set_flags() before hwloc_topology_load(). See the
+    I/O Devices section in the documentation for details.
+* Discovery improvements
+  + Add associativity to the cache attributes.
+  + Add support for s390/z11 "books" on Linux.
+  + Add the HWLOC_GROUPING_ACCURACY environment variable to relax
+    distance-based grouping constraints. See the Environment Variables
+    section in the documentation for details about grouping behavior
+    and configuration.
+  + Allow user-given distance matrices to remove or replace those
+    discovered by the OS backend.
+* XML improvements
+  + XML is now always supported: a minimalistic custom import/export
+    code is used when libxml2 is not available. It is only guaranteed
+    to read XML files generated by hwloc.
+  + hwloc_topology_export_xml() and export_xmlbuffer() now return an
+    integer.
+  + Add hwloc_free_xmlbuffer() to free the buffer allocated by
+    hwloc_topology_export_xmlbuffer().
+  + Hide XML topology error messages unless HWLOC_XML_VERBOSE=1.
+* Minor API updates
+  + Add hwloc_obj_add_info to customize object info attributes.
+* Tools
+  + lstopo now displays I/O devices by default. Several options are
+    added to configure the I/O discovery.
+  + hwloc-calc and hwloc-bind now accept I/O devices as input.
+  + Add --restrict option to hwloc-calc and hwloc-distribute.
+  + Add --sep option to change the output field separator in hwloc-calc.
+  + Add --whole-system option to hwloc-ps.
+
+
+Version 1.2.2
+-------------
+* Fix build on AIX 5.2, thanks Utpal Kumar Ray for the report.
+* Fix XML import of very large page sizes or counts on 32bits platform,
+  thanks to Karsten Hopp for the RedHat ticket.
+* Fix crash when administrator limitations such as Linux cgroup require
+  to restrict distance matrices. Thanks to Ake Sandgren for reporting the
+  problem.
+* Fix the removal of objects such as AMD Magny-Cours dual-node sockets
+  in case of administrator restrictions.
+* Improve error reporting and messages in case of wrong synthetic topology
+  description.
+* Several other minor internal fixes and documentation improvements.
+
+
+Version 1.2.1
+-------------
+* Improve support of AMD Bulldozer "Compute-Unit" modules by detecting
+  logical processors with different core IDs on Linux.
+* Fix hwloc-ps crash when listing processes from another Linux cpuset.
+  Thanks to Carl Smith for reporting the problem.
+* Fix build on AIX and Solaris. Thanks to Carl Smith and Andreas Kupries
+  for reporting the problems.
+* Fix cache size detection on Darwin. Thanks to Erkcan Özcan for reporting
+  the problem.
+* Make configure fail if --enable-xml or --enable-cairo is given and
+  proper support cannot be found. Thanks to Andreas Kupries for reporting
+  the XML problem.
+* Fix spurious L1 cache detection on AIX. Thanks to Hendryk Bockelmann
+  for reporting the problem.
+* Fix hwloc_get_last_cpu_location(THREAD) on Linux. Thanks to Gabriele
+  Fatigati for reporting the problem.
+* Fix object distance detection on Solaris.
+* Add pthread_self weak symbol to ease static linking.
+* Minor documentation fixes.
+
+
+Version 1.2.0
+-------------
+* Major features
+  + Expose latency matrices in the API as an array of distance structures
+    within objects. Add several helpers to find distances.
+  + Add hwloc_topology_set_distance_matrix() and environment variables
+    to provide a matrix of distances between a given set of objects.
+  + Add hwloc_get_last_cpu_location() and hwloc_get_proc_last_cpu_location()
+    to retrieve the processors where a process or thread recently ran.
+    - Add the corresponding --get-last-cpu-location option to hwloc-bind.
+  + Add hwloc_topology_restrict() to restrict an existing topology to a
+    given cpuset.
+    - Add the corresponding --restrict option to lstopo.
+* Minor API updates
+  + Add hwloc_bitmap_list_sscanf/snprintf/asprintf to convert between bitmaps
+    and strings such as 4-5,7-9,12,15-
+  + hwloc_bitmap_set/clr_range() now support infinite ranges.
+  + Clarify the difference between inserting Misc objects by cpuset or by
+    parent.
+  + hwloc_insert_misc_object_by_cpuset() now returns NULL in case of error.
+* Discovery improvements
+  + x86 backend (for freebsd): add x2APIC support
+  + Support standard device-tree phandle, to get better support on e.g. ARM
+    systems providing it.
+  + Detect cache size on AIX. Thanks Christopher and IBM.
+  + Improve grouping to support asymmetric topologies.
+* Tools
+  + Command-line tools now support "all" and "root" special locations
+    consisting in the entire topology, as well as type names with depth
+    attributes such as L2 or Group4.
+  + hwloc-calc improvements:
+    - Add --number-of/-N option to report the number of objects of a given
+      type or depth.
+    - -I is now equivalent to --intersect for listing the indexes of
+      objects of a given type or depth that intersects the input.
+    - Add -H to report the output as a hierarchical combination of types
+      and depths.
+  + Add --thissystem to lstopo.
+  + Add lstopo-win, a console-less lstopo variant on Windows.
+* Miscellaneous
+  + Remove C99 usage from code base.
+  + Rename hwloc-gather-topology.sh into hwloc-gather-topology
+  + Fix AMD cache discovery on freebsd when there is no L3 cache, thanks
+    Andriy Gapon for the fix.
+
+
+Version 1.1.2
+-------------
+* Fix a segfault in the distance-based grouping code when some objects
+  are not placed in any group. Thanks to Bernd Kallies for reporting
+  the problem and providing a patch.
+* Fix the command-line parsing of hwloc-bind --mempolicy interleave.
+  Thanks to Guy Streeter for reporting the problem.
+* Stop truncating the output in hwloc_obj_attr_snprintf() and in the
+  corresponding lstopo output. Thanks to Guy Streeter for reporting the
+  problem.
+* Fix object levels ordering in synthetic topologies.
+* Fix potential incoherency between device tree and kernel information,
+  when SMT is disabled on Power machines.
+* Fix and document the behavior of hwloc_topology_set_synthetic() in case
+  of invalid argument. Thanks to Guy Streeter for reporting the problem.
+* Add some verbose error message reporting when it looks like the OS
+  gives erroneous information.
+* Do not include unistd.h and stdint.h in public headers on Windows.
+* Move config.h files into their own subdirectories to avoid name
+  conflicts when AC_CONFIG_HEADERS adds -I's for them.
+* Remove the use of declaring variables inside "for" loops.
+* Some other minor fixes.
+* Many minor documentation fixes.
+
+
+Version 1.1.1
+-------------
+* Add hwloc_get_api_version() which returns the version of hwloc used
+  at runtime. Thanks to Guy Streeter for the suggestion.
+* Fix the number of hugepages reported for NUMA nodes on Linux.
+* Fix hwloc_bitmap_to_ulong() right after allocating the bitmap.
+  Thanks to Bernd Kallies for reporting the problem.
+* Fix hwloc_bitmap_from_ith_ulong() to properly zero the first ulong.
+  Thanks to Guy Streeter for reporting the problem.
+* Fix hwloc_get_membind_nodeset() on Linux.
+  Thanks to Bernd Kallies for reporting the problem and providing a patch.
+* Fix some file descriptor leaks in the Linux discovery.
+* Fix the minimum width of NUMA nodes, caches and the legend in the graphical
+  lstopo output. Thanks to Jirka Hladky for reporting the problem.
+* Various fixes to bitmap conversion from/to taskset-strings.
+* Fix and document snprintf functions behavior when the buffer size is too
+  small or zero. Thanks to Guy Streeter for reporting the problem.
+* Fix configure to avoid spurious enabling of the cpuid backend.
+  Thanks to Tim Anderson for reporting the problem.
+* Cleanup error management in hwloc-gather-topology.sh.
+  Thanks to Jirka Hladky for reporting the problem and providing a patch.
+* Add a manpage and usage for hwloc-gather-topology.sh on Linux.
+  Thanks to Jirka Hladky for providing a patch.
+* Memory binding documentation enhancements.
+
+
+Version 1.1.0
+-------------
+
+* API
+  + Increase HWLOC_API_VERSION to 0x00010100 so that API changes may be
+    detected at build-time.
+  + Add a memory binding interface.
+  + The cpuset API (hwloc/cpuset.h) is now deprecated. It is replaced by
+    the bitmap API (hwloc/bitmap.h) which offers the same features with more
+    generic names since it applies to CPU sets, node sets and more.
+    Backward compatibility with the cpuset API and ABI is still provided but
+    it will be removed in a future release.
+    Old types (hwloc_cpuset_t, ...) are still available as a way to clarify
+    what kind of hwloc_bitmap_t each API function manipulates.
+    Upgrading to the new API only requires to replace hwloc_cpuset_ function
+    calls with the corresponding hwloc_bitmap_ calls, with the following
+    renaming exceptions:
+    - hwloc_cpuset_cpu -> hwloc_bitmap_only
+    - hwloc_cpuset_all_but_cpu -> hwloc_bitmap_allbut
+    - hwloc_cpuset_from_string -> hwloc_bitmap_sscanf
+  + Add an `infos' array in each object to store couples of info names and
+    values. It enables generic storage of things like the old dmi board infos
+    that were previously stored in machine specific attributes.
+  + Add linesize cache attribute.
+* Features
+  + Bitmaps (and thus CPU sets and node sets) are dynamically (re-)allocated,
+    the maximal number of CPUs (HWLOC_NBMAXCPUS) has been removed.
+  + Improve the distance-based grouping code to better support irregular
+    distance matrices.
+  + Add support for device-tree to get cache information (useful on Power
+    architectures).
+* Helpers
+  + Add NVIDIA CUDA helpers in cuda.h and cudart.h to ease interoperability
+    with CUDA Runtime and Driver APIs.
+  + Add Myrinet Express helper in myriexpress.h to ease interoperability.
+* Tools
+  + lstopo now displays physical/OS indexes by default in graphical mode
+    (use -l to switch back to logical indexes). The textual output still uses
+    logical by default (use -p to switch to physical indexes).
+  + lstopo prefixes logical indexes with `L#' and physical indexes with `P#'.
+    Physical indexes are also printed as `P#N' instead of `phys=N' within
+    object attributes (in parentheses).
+  + Add a legend at the bottom of the lstopo graphical output, use --no-legend
+    to remove it.
+  + Add hwloc-ps to list process' bindings.
+  + Add --membind and --mempolicy options to hwloc-bind.
+  + Improve tools command-line options by adding a generic --input option
+    (and more) which replaces the old --xml, --synthetic and --fsys-root.
+  + Cleanup lstopo output configuration by adding --output-format.
+  + Add --intersect in hwloc-calc, and replace --objects with --largest.
+  + Add the ability to work on standard input in hwloc-calc.
+  + Add --from, --to and --at in hwloc-distrib.
+  + Add taskset-specific functions and command-line tools options to
+    manipulate CPU set strings in the format of the taskset program.
+  + Install hwloc-gather-topology.sh on Linux.
+
+
+Version 1.0.3
+-------------
+
+* Fix support for Linux cpuset when emulated by a cgroup mount point.
+* Remove unneeded runtime dependency on libibverbs.so in the library and
+  all utils programs.
+* Fix hwloc_cpuset_to_linux_libnuma_ulongs in case of non-linear OS-indexes
+  for NUMA nodes.
+* lstopo now displays physical/OS indexes by default in graphical mode
+  (use -l to switch back to logical indexes). The textual output still uses
+  logical by default (use -p to switch to physical indexes).
+
+
+Version 1.0.2
+-------------
+
+* Public headers can now be included directly from C++ programs.
+* Solaris fix for non-contiguous cpu numbers.  Thanks to Rolf vandeVaart for
+  reporting the issue.
+* Darwin 10.4 fix.  Thanks to Olivier Cessenat for reporting the issue.
+* Revert 1.0.1 patch that ignored sockets with unknown ID values since it
+  only slightly helped POWER7 machines with old Linux kernels while it
+  prevents recent kernels from getting the complete POWER7 topology.
+* Fix hwloc_get_common_ancestor_obj().
+* Remove arch-specific bits in public headers.
+* Some fixes in the lstopo graphical output.
+* Various man page clarifications and minor updates.
+
+
+Version 1.0.1
+-------------
+
+* Various Solaris fixes.  Thanks to Yannick Martin for reporting the issue.
+* Fix "non-native" builds on x86 platforms (e.g., when building 32
+  bit executables with compilers that natively build 64 bit).
+* Ignore sockets with unknown ID values (which fixes issues on POWER7
+  machines).  Thanks to Greg Bauer for reporting the issue.
+* Various man page clarifications and minor updates.
+* Fixed memory leaks in hwloc_setup_group_from_min_distance_clique().
+* Fix cache type filtering on MS Windows 7.  Thanks to Αλέξανδρος
+  Παπαδογιαννάκ for reporting the issue.
+* Fixed warnings when compiling with -DNDEBUG.
+
+
+Version 1.0.0
+-------------
+
+* The ABI of the library has changed.
+* Backend updates
+  + Add FreeBSD support.
+  + Add x86 cpuid based backend.
+  + Add Linux cgroup support to the Linux cpuset code.
+  + Support binding of entire multithreaded process on Linux.
+  + Fix and enable Group support in Windows.
+  + Cleanup XML export/import.
+* Objects
+  + HWLOC_OBJ_PROC is renamed into HWLOC_OBJ_PU for "Processing Unit",
+    its stringified type name is now "PU".
+  + Use new HWLOC_OBJ_GROUP objects instead of MISC when grouping
+    objects according to NUMA distances or arbitrary OS aggregation.
+  + Rework memory attributes.
+  + Add different cpusets in each object to specify processors that
+    are offline, unavailable, ...
+  + Cleanup the storage of object names and DMI infos.
+* Features
+  + Add support for looking up specific PID topology information.
+  + Add hwloc_topology_export_xml() to export the topology in a XML file.
+  + Add hwloc_topology_get_support() to retrieve the supported features
+    for the current topology context.
+  + Support non-SYSTEM object as the root of the tree, use MACHINE in
+    most common cases.
+  + Add hwloc_get_*cpubind() routines to retrieve the current binding
+    of processes and threads.
+* API
+  + Add HWLOC_API_VERSION to help detect the currently used API version.
+  + Add missing ending "e" to *compare* functions.
+  + Add several routines to emulate PLPA functions.
+  + Rename and rework the cpuset and/or/xor/not/clear operators to output
+    their result in a dedicated argument instead of modifying one input.
+  + Deprecate hwloc_obj_snprintf() in favor of hwloc_obj_type/attr_snprintf().
+  + Clarify the use of parent and ancestor in the API, do not use father.
+  + Replace hwloc_get_system_obj() with hwloc_get_root_obj().
+  + Return -1 instead of HWLOC_OBJ_TYPE_MAX in the API since the latter
+    isn't public.
+  + Relax constraints in hwloc_obj_type_of_string().
+  + Improve displaying of memory sizes.
+  + Add 0x prefix to cpuset strings.
+* Tools
+  + lstopo now displays logical indexes by default, use --physical to
+    revert back to OS/physical indexes.
+  + Add colors in the lstopo graphical outputs to distinguish between online,
+    offline, reserved, ... objects.
+  + Extend lstopo to show cpusets, filter objects by type, ...
+  + Renamed hwloc-mask into hwloc-calc which supports many new options.
+* Documentation
+  + Add a hwloc(7) manpage containing general information.
+  + Add documentation about how to switch from PLPA to hwloc.
+  + Cleanup the distributed documentation files.
+* Miscellaneous
+  + Many compilers warning fixes.
+  + Cleanup the ABI by using the visibility attribute.
+  + Add project embedding support.
+
+
+Version 0.9.4 (unreleased)
+--------------------------
+
+* Fix reseting colors to normal in lstopo -.txt output.
+* Fix Linux pthread_t binding error report.
+
+
+Version 0.9.3
+-------------
+
+* Fix autogen.sh to work with Autoconf 2.63.
+* Fix various crashes in particular conditions:
+  - xml files with root attributes
+  - offline CPUs
+  - partial sysfs support
+  - unparseable /proc/cpuinfo
+  - ignoring NUMA level while Misc level have been generated
+* Tweak documentation a bit
+* Do not require the pthread library for binding the current thread on Linux
+* Do not erroneously consider the sched_setaffinity prototype is the old version
+  when there is actually none.
+* Fix _syscall3 compilation on archs for which we do not have the
+  sched_setaffinity system call number.
+* Fix AIX binding.
+* Fix libraries dependencies: now only lstopo depends on libtermcap, fix
+  binutils-gold link
+* Have make check always build and run hwloc-hello.c
+* Do not limit size of a cpuset.
+
+
+Version 0.9.2
+-------------
+
+* Trivial documentation changes.
+
+
+Version 0.9.1
+-------------
+
+* Re-branded to "hwloc" and moved to the Open MPI project, relicensed under the
+  BSD license.
+* The prefix of all functions and tools is now hwloc, and some public
+  functions were also renamed for real.
+* Group NUMA nodes into Misc objects according to their physical distance
+  that may be reported by the OS/BIOS.
+  May be ignored by setting HWLOC_IGNORE_DISTANCES=1 in the environment.
+* Ignore offline CPUs on Solaris.
+* Improved binding support on AIX.
+* Add HP-UX support.
+* CPU sets are now allocated/freed dynamically.
+* Add command line options to tune the lstopo graphical output, add
+  semi-graphical textual output
+* Extend topobind to support multiple cpusets or objects on the command
+  line as topomask does.
+* Add an Infiniband-specific helper hwloc/openfabrics-verbs.h to retrieve
+  the physical location of IB devices.
+
+
+Version 0.9 (libtopology)
+-------------------------
+
+* First release.

opal/mca/hwloc/hwloc131/hwloc/README

@@ -0,0 +1,719 @@
+Introduction
+
+hwloc provides command line tools and a C API to obtain the hierarchical map of
+key computing elements, such as: NUMA memory nodes, shared caches, processor
+sockets, processor cores, processing units (logical processors or "threads")
+and even I/O devices. hwloc also gathers various attributes such as cache and
+memory information, and is portable across a variety of different operating
+systems and platforms.
+
+hwloc primarily aims at helping high-performance computing (HPC) applications,
+but is also applicable to any project seeking to exploit code and/or data
+locality on modern computing platforms.
+
+Note that the hwloc project represents the merger of the libtopology project
+from INRIA and the Portable Linux Processor Affinity (PLPA) sub-project from
+Open MPI. Both of these prior projects are now deprecated. The first hwloc
+release was essentially a "re-branding" of the libtopology code base, but with
+both a few genuinely new features and a few PLPA-like features added in. Prior
+releases of hwloc included documentation about switching from PLPA to hwloc;
+this documentation has been dropped on the assumption that everyone who was
+using PLPA has already switched to hwloc.
+
+hwloc supports the following operating systems:
+
+  * Linux (including old kernels not having sysfs topology information, with
+ knowledge of cpusets, offline CPUs, ScaleMP vSMP, and Kerrighed support)
+  * Solaris
+  * AIX
+  * Darwin / OS X
+  * FreeBSD and its variants, such as kFreeBSD/GNU
+  * OSF/1 (a.k.a., Tru64)
+  * HP-UX
+  * Microsoft Windows
+
+Since it uses standard Operating System information, hwloc's support is mostly
+independant from the processor type (x86, powerpc, ...) and just relies on the
+Operating System support. The only exception to this is kFreeBSD, which does
+not support topology information, and hwloc thus uses an x86-only CPUID-based
+backend (which could be used for other OSes too).
+
+To check whether hwloc works on a particular machine, just try to build it and
+run lstopo. If some things do not look right (e.g. bogus or missing cache
+information), see Questions and Bugs below.
+
+hwloc only reports the number of processors on unsupported operating systems;
+no topology information is available.
+
+For development and debugging purposes, hwloc also offers the ability to work
+on "fake" topologies:
+
+  * Symmetrical tree of resources generated from a list of level arities
+  * Remote machine simulation through the gathering of Linux sysfs topology
+ files
+
+hwloc can display the topology in a human-readable format, either in graphical
+mode (X11), or by exporting in one of several different formats, including:
+plain text, PDF, PNG, and FIG (see CLI Examples below). Note that some of the
+export formats require additional support libraries.
+
+hwloc offers a programming interface for manipulating topologies and objects.
+It also brings a powerful CPU bitmap API that is used to describe topology
+objects location on physical/logical processors. See the Programming Interface
+below. It may also be used to binding applications onto certain cores or memory
+nodes. Several utility programs are also provided to ease command-line
+manipulation of topology objects, binding of processes, and so on.
+
+Perl bindings are available from Bernd Kallies on CPAN:
+
+Python bindings are available from Guy Streeter:
+
+  * Fedora RPM and tarball.
+  * git tree (html).
+
+Installation
+
+hwloc (http://www.open-mpi.org/projects/hwloc/) is available under the BSD
+license. It is hosted as a sub-project of the overall Open MPI project (http://
+www.open-mpi.org/). Note that hwloc does not require any functionality from
+Open MPI -- it is a wholly separate (and much smaller!) project and code base.
+It just happens to be hosted as part of the overall Open MPI project.
+
+Nightly development snapshots are available on the web site. Additionally, the
+code can be directly checked out of Subversion:
+
+shell$ svn checkout http://svn.open-mpi.org/svn/hwloc/trunk hwloc-trunk
+shell$ cd hwloc-trunk
+shell$ ./autogen.sh
+
+Note that GNU Autoconf >=2.63, Automake >=1.10 and Libtool >=2.2.6 are required
+when building from a Subversion checkout.
+
+Installation by itself is the fairly common GNU-based process:
+
+shell$ ./configure --prefix=...
+shell$ make
+shell$ make install
+
+The hwloc command-line tool "lstopo" produces human-readable topology maps, as
+mentioned above. It can also export maps to the "fig" file format. Support for
+PDF, Postscript, and PNG exporting is provided if the "Cairo" development
+package can be found when hwloc is configured and build.
+
+The hwloc core may also benefit from the following development packages:
+
+  * pciutils (libpci) for I/O discovery.
+  * libnuma for memory binding and migration support on Linux.
+  * libxml2 for full XML import/export support (otherwise, the internal
+ minimalistic parser will only be able to import XML files that were
+ exported by the same hwloc release). See Importing and exporting topologies
+ from/to XML files for details.
+
+CLI Examples
+
+On a 4-socket 2-core machine with hyperthreading, the lstopo tool may show the
+following graphical output:
+
+dudley.png
+
+Here's the equivalent output in textual form:
+
+Machine (16GB)
+  Socket L#0 + L3 L#0 (4096KB)
+ L2 L#0 (1024KB) + L1 L#0 (16KB) + Core L#0
+   PU L#0 (P#0)
+   PU L#1 (P#8)
+ L2 L#1 (1024KB) + L1 L#1 (16KB) + Core L#1
+   PU L#2 (P#4)
+   PU L#3 (P#12)
+  Socket L#1 + L3 L#1 (4096KB)
+ L2 L#2 (1024KB) + L1 L#2 (16KB) + Core L#2
+   PU L#4 (P#1)
+   PU L#5 (P#9)
+ L2 L#3 (1024KB) + L1 L#3 (16KB) + Core L#3
+   PU L#6 (P#5)
+   PU L#7 (P#13)
+  Socket L#2 + L3 L#2 (4096KB)
+ L2 L#4 (1024KB) + L1 L#4 (16KB) + Core L#4
+   PU L#8 (P#2)
+   PU L#9 (P#10)
+ L2 L#5 (1024KB) + L1 L#5 (16KB) + Core L#5
+   PU L#10 (P#6)
+   PU L#11 (P#14)
+  Socket L#3 + L3 L#3 (4096KB)
+ L2 L#6 (1024KB) + L1 L#6 (16KB) + Core L#6
+   PU L#12 (P#3)
+   PU L#13 (P#11)
+ L2 L#7 (1024KB) + L1 L#7 (16KB) + Core L#7
+   PU L#14 (P#7)
+   PU L#15 (P#15)
+
+Finally, here's the equivalent output in XML. Long lines were artificially
+broken for document clarity (in the real output, each XML tag is on a single
+line), and only socket #0 is shown for brevity:
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE topology SYSTEM "hwloc.dtd">
+<topology>
+  <object type="Machine" os_level="-1" os_index="0" cpuset="0x0000ffff"
+   complete_cpuset="0x0000ffff" online_cpuset="0x0000ffff"
+   allowed_cpuset="0x0000ffff"
+   dmi_board_vendor="Dell Computer Corporation" dmi_board_name="0RD318"
+   local_memory="16648183808">
+ <page_type size="4096" count="4064498"/>
+ <page_type size="2097152" count="0"/>
+ <object type="Socket" os_level="-1" os_index="0" cpuset="0x00001111"
+     complete_cpuset="0x00001111" online_cpuset="0x00001111"
+     allowed_cpuset="0x00001111">
+   <object type="Cache" os_level="-1" cpuset="0x00001111"
+       complete_cpuset="0x00001111" online_cpuset="0x00001111"
+       allowed_cpuset="0x00001111" cache_size="4194304" depth="3"
+       cache_linesize="64">
+     <object type="Cache" os_level="-1" cpuset="0x00000101"
+         complete_cpuset="0x00000101" online_cpuset="0x00000101"
+         allowed_cpuset="0x00000101" cache_size="1048576" depth="2"
+         cache_linesize="64">
+       <object type="Cache" os_level="-1" cpuset="0x00000101"
+           complete_cpuset="0x00000101" online_cpuset="0x00000101"
+           allowed_cpuset="0x00000101" cache_size="16384" depth="1"
+           cache_linesize="64">
+         <object type="Core" os_level="-1" os_index="0" cpuset="0x00000101"
+             complete_cpuset="0x00000101" online_cpuset="0x00000101"
+             allowed_cpuset="0x00000101">
+           <object type="PU" os_level="-1" os_index="0" cpuset="0x00000001"
+               complete_cpuset="0x00000001" online_cpuset="0x00000001"
+               allowed_cpuset="0x00000001"/>
+           <object type="PU" os_level="-1" os_index="8" cpuset="0x00000100"
+               complete_cpuset="0x00000100" online_cpuset="0x00000100"
+               allowed_cpuset="0x00000100"/>
+         </object>
+       </object>
+     </object>
+     <object type="Cache" os_level="-1" cpuset="0x00001010"
+         complete_cpuset="0x00001010" online_cpuset="0x00001010"
+         allowed_cpuset="0x00001010" cache_size="1048576" depth="2"
+         cache_linesize="64">
+       <object type="Cache" os_level="-1" cpuset="0x00001010"
+           complete_cpuset="0x00001010" online_cpuset="0x00001010"
+           allowed_cpuset="0x00001010" cache_size="16384" depth="1"
+           cache_linesize="64">
+         <object type="Core" os_level="-1" os_index="1" cpuset="0x00001010"
+             complete_cpuset="0x00001010" online_cpuset="0x00001010"
+             allowed_cpuset="0x00001010">
+           <object type="PU" os_level="-1" os_index="4" cpuset="0x00000010"
+               complete_cpuset="0x00000010" online_cpuset="0x00000010"
+               allowed_cpuset="0x00000010"/>
+           <object type="PU" os_level="-1" os_index="12" cpuset="0x00001000"
+               complete_cpuset="0x00001000" online_cpuset="0x00001000"
+               allowed_cpuset="0x00001000"/>
+         </object>
+       </object>
+     </object>
+   </object>
+ </object>
+ <!-- ...other sockets listed here ... -->
+  </object>
+</topology>
+
+On a 4-socket 2-core Opteron NUMA machine, the lstopo tool may show the
+following graphical output:
+
+hagrid.png
+
+Here's the equivalent output in textual form:
+
+Machine (32GB)
+  NUMANode L#0 (P#0 8190MB) + Socket L#0
+ L2 L#0 (1024KB) + L1 L#0 (64KB) + Core L#0 + PU L#0 (P#0)
+ L2 L#1 (1024KB) + L1 L#1 (64KB) + Core L#1 + PU L#1 (P#1)
+  NUMANode L#1 (P#1 8192MB) + Socket L#1
+ L2 L#2 (1024KB) + L1 L#2 (64KB) + Core L#2 + PU L#2 (P#2)
+ L2 L#3 (1024KB) + L1 L#3 (64KB) + Core L#3 + PU L#3 (P#3)
+  NUMANode L#2 (P#2 8192MB) + Socket L#2
+ L2 L#4 (1024KB) + L1 L#4 (64KB) + Core L#4 + PU L#4 (P#4)
+ L2 L#5 (1024KB) + L1 L#5 (64KB) + Core L#5 + PU L#5 (P#5)
+  NUMANode L#3 (P#3 8192MB) + Socket L#3
+ L2 L#6 (1024KB) + L1 L#6 (64KB) + Core L#6 + PU L#6 (P#6)
+ L2 L#7 (1024KB) + L1 L#7 (64KB) + Core L#7 + PU L#7 (P#7)
+
+And here's the equivalent output in XML. Similar to above, line breaks were
+added and only PU #0 is shown for brevity:
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE topology SYSTEM "hwloc.dtd">
+<topology>
+  <object type="Machine" os_level="-1" os_index="0" cpuset="0x000000ff"
+   complete_cpuset="0x000000ff" online_cpuset="0x000000ff"
+   allowed_cpuset="0x000000ff" nodeset="0x000000ff"
+   complete_nodeset="0x000000ff" allowed_nodeset="0x000000ff"
+   dmi_board_vendor="TYAN Computer Corp" dmi_board_name="S4881 ">
+ <page_type size="4096" count="0"/>
+ <page_type size="2097152" count="0"/>
+ <object type="NUMANode" os_level="-1" os_index="0" cpuset="0x00000003"
+     complete_cpuset="0x00000003" online_cpuset="0x00000003"
+     allowed_cpuset="0x00000003" nodeset="0x00000001"
+     complete_nodeset="0x00000001" allowed_nodeset="0x00000001"
+     local_memory="7514177536">
+   <page_type size="4096" count="1834516"/>
+   <page_type size="2097152" count="0"/>
+   <object type="Socket" os_level="-1" os_index="0" cpuset="0x00000003"
+       complete_cpuset="0x00000003" online_cpuset="0x00000003"
+       allowed_cpuset="0x00000003" nodeset="0x00000001"
+       complete_nodeset="0x00000001" allowed_nodeset="0x00000001">
+     <object type="Cache" os_level="-1" cpuset="0x00000001"
+         complete_cpuset="0x00000001" online_cpuset="0x00000001"
+         allowed_cpuset="0x00000001" nodeset="0x00000001"
+         complete_nodeset="0x00000001" allowed_nodeset="0x00000001"
+         cache_size="1048576" depth="2" cache_linesize="64">
+       <object type="Cache" os_level="-1" cpuset="0x00000001"
+           complete_cpuset="0x00000001" online_cpuset="0x00000001"
+           allowed_cpuset="0x00000001" nodeset="0x00000001"
+           complete_nodeset="0x00000001" allowed_nodeset="0x00000001"
+           cache_size="65536" depth="1" cache_linesize="64">
+         <object type="Core" os_level="-1" os_index="0"
+             cpuset="0x00000001" complete_cpuset="0x00000001"
+             online_cpuset="0x00000001" allowed_cpuset="0x00000001"
+             nodeset="0x00000001" complete_nodeset="0x00000001"
+             allowed_nodeset="0x00000001">
+           <object type="PU" os_level="-1" os_index="0" cpuset="0x00000001"
+               complete_cpuset="0x00000001" online_cpuset="0x00000001"
+               allowed_cpuset="0x00000001" nodeset="0x00000001"
+               complete_nodeset="0x00000001" allowed_nodeset="0x00000001"/>
+         </object>
+       </object>
+     </object>
+  <!-- ...more objects listed here ... -->
+</topology>
+
+On a 2-socket quad-core Xeon (pre-Nehalem, with 2 dual-core dies into each
+socket):
+
+emmett.png
+
+Here's the same output in textual form:
+
+Machine (16GB)
+  Socket L#0
+ L2 L#0 (4096KB)
+   L1 L#0 (32KB) + Core L#0 + PU L#0 (P#0)
+   L1 L#1 (32KB) + Core L#1 + PU L#1 (P#4)
+ L2 L#1 (4096KB)
+   L1 L#2 (32KB) + Core L#2 + PU L#2 (P#2)
+   L1 L#3 (32KB) + Core L#3 + PU L#3 (P#6)
+  Socket L#1
+ L2 L#2 (4096KB)
+   L1 L#4 (32KB) + Core L#4 + PU L#4 (P#1)
+   L1 L#5 (32KB) + Core L#5 + PU L#5 (P#5)
+ L2 L#3 (4096KB)
+   L1 L#6 (32KB) + Core L#6 + PU L#6 (P#3)
+   L1 L#7 (32KB) + Core L#7 + PU L#7 (P#7)
+
+And the same output in XML (line breaks added, only PU #0 shown):
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE topology SYSTEM "hwloc.dtd">
+<topology>
+  <object type="Machine" os_level="-1" os_index="0" cpuset="0x000000ff"
+   complete_cpuset="0x000000ff" online_cpuset="0x000000ff"
+   allowed_cpuset="0x000000ff" dmi_board_vendor="Dell Inc."
+   dmi_board_name="0NR282" local_memory="16865292288">
+ <page_type size="4096" count="4117503"/>
+ <page_type size="2097152" count="0"/>
+ <object type="Socket" os_level="-1" os_index="0" cpuset="0x00000055"
+     complete_cpuset="0x00000055" online_cpuset="0x00000055"
+     allowed_cpuset="0x00000055">
+   <object type="Cache" os_level="-1" cpuset="0x00000011"
+       complete_cpuset="0x00000011" online_cpuset="0x00000011"
+       allowed_cpuset="0x00000011" cache_size="4194304" depth="2"
+       cache_linesize="64">
+     <object type="Cache" os_level="-1" cpuset="0x00000001"
+         complete_cpuset="0x00000001" online_cpuset="0x00000001"
+         allowed_cpuset="0x00000001" cache_size="32768" depth="1"
+         cache_linesize="64">
+       <object type="Core" os_level="-1" os_index="0" cpuset="0x00000001"
+           complete_cpuset="0x00000001" online_cpuset="0x00000001"
+           allowed_cpuset="0x00000001">
+         <object type="PU" os_level="-1" os_index="0" cpuset="0x00000001"
+             complete_cpuset="0x00000001" online_cpuset="0x00000001"
+             allowed_cpuset="0x00000001"/>
+       </object>
+     </object>
+     <object type="Cache" os_level="-1" cpuset="0x00000010"
+         complete_cpuset="0x00000010" online_cpuset="0x00000010"
+         allowed_cpuset="0x00000010" cache_size="32768" depth="1"
+         cache_linesize="64">
+       <object type="Core" os_level="-1" os_index="1" cpuset="0x00000010"
+           complete_cpuset="0x00000010" online_cpuset="0x00000010"
+           allowed_cpuset="0x00000010">
+         <object type="PU" os_level="-1" os_index="4" cpuset="0x00000010"
+             complete_cpuset="0x00000010" online_cpuset="0x00000010"
+             allowed_cpuset="0x00000010"/>
+       </object>
+     </object>
+   </object>
+  <!-- ...more objects listed here ... -->
+</topology>
+
+Programming Interface
+
+The basic interface is available in hwloc.h. It essentially offers low-level
+routines for advanced programmers that want to manually manipulate objects and
+follow links between them. Documentation for everything in hwloc.h are provided
+later in this document. Developers should also look at hwloc/helper.h (and also
+in this document, which provides good higher-level topology traversal
+examples).
+
+To precisely define the vocabulary used by hwloc, a Terms and Definitions
+section is available and should probably be read first.
+
+Each hwloc object contains a cpuset describing the list of processing units
+that it contains. These bitmaps may be used for CPU binding and Memory binding.
+hwloc offers an extensive bitmap manipulation interface in hwloc/bitmap.h.
+
+Moreover, hwloc also comes with additional helpers for interoperability with
+several commonly used environments. See the Interoperability With Other
+Software section for details.
+
+The complete API documentation is available in a full set of HTML pages, man
+pages, and self-contained PDF files (formatted for both both US letter and A4
+formats) in the source tarball in doc/doxygen-doc/.
+
+NOTE: If you are building the documentation from a Subversion checkout, you
+will need to have Doxygen and pdflatex installed -- the documentation will be
+built during the normal "make" process. The documentation is installed during
+"make install" to $prefix/share/doc/hwloc/ and your systems default man page
+tree (under $prefix, of course).
+
+Portability
+
+As shown in CLI Examples, hwloc can obtain information on a wide variety of
+hardware topologies. However, some platforms and/or operating system versions
+will only report a subset of this information. For example, on an PPC64-based
+system with 32 cores (each with 2 hardware threads) running a default
+2.6.18-based kernel from RHEL 5.4, hwloc is only able to glean information
+about NUMA nodes and processor units (PUs). No information about caches,
+sockets, or cores is available.
+
+Similarly, Operating System have varying support for CPU and memory binding,
+e.g. while some Operating Systems provide interfaces for all kinds of CPU and
+memory bindings, some others provide only interfaces for a limited number of
+kinds of CPU and memory binding, and some do not provide any binding interface
+at all. Hwloc's binding functions would then simply return the ENOSYS error
+(Function not implemented), meaning that the underlying Operating System does
+not provide any interface for them. CPU binding and Memory binding provide more
+information on which hwloc binding functions should be preferred because
+interfaces for them are usually available on the supported Operating Systems.
+
+Here's the graphical output from lstopo on this platform when Simultaneous
+Multi-Threading (SMT) is enabled:
+
+ppc64-with-smt.png
+
+And here's the graphical output from lstopo on this platform when SMT is
+disabled:
+
+ppc64-without-smt.png
+
+Notice that hwloc only sees half the PUs when SMT is disabled. PU #15, for
+example, seems to change location from NUMA node #0 to #1. In reality, no PUs
+"moved" -- they were simply re-numbered when hwloc only saw half as many.
+Hence, PU #15 in the SMT-disabled picture probably corresponds to PU #30 in the
+SMT-enabled picture.
+
+This same "PUs have disappeared" effect can be seen on other platforms -- even
+platforms / OSs that provide much more information than the above PPC64 system.
+This is an unfortunate side-effect of how operating systems report information
+to hwloc.
+
+Note that upgrading the Linux kernel on the same PPC64 system mentioned above
+to 2.6.34, hwloc is able to discover all the topology information. The
+following picture shows the entire topology layout when SMT is enabled:
+
+ppc64-full-with-smt.png
+
+Developers using the hwloc API or XML output for portable applications should
+therefore be extremely careful to not make any assumptions about the structure
+of data that is returned. For example, per the above reported PPC topology, it
+is not safe to assume that PUs will always be descendants of cores.
+
+Additionally, future hardware may insert new topology elements that are not
+available in this version of hwloc. Long-lived applications that are meant to
+span multiple different hardware platforms should also be careful about making
+structure assumptions. For example, there may someday be an element "lower"
+than a PU, or perhaps a new element may exist between a core and a PU.
+
+API Example
+
+The following small C example (named ``hwloc-hello.c'') prints the topology of
+the machine and bring the process to the first logical processor of the second
+core of the machine.
+
+/* Example hwloc API program.
+ *
+ * Copyright ? 2009-2010 INRIA.  All rights reserved.
+ * Copyright ? 2009-2011 Universit? Bordeaux 1
+ * Copyright ? 2009-2010 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ *
+ * hwloc-hello.c
+ */
+
+#include <hwloc.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+static void print_children(hwloc_topology_t topology, hwloc_obj_t obj,
+                        int depth)
+{
+ char string[128];
+ unsigned i;
+
+ hwloc_obj_snprintf(string, sizeof(string), topology, obj, "#", 0);
+ printf("%*s%s\n", 2*depth, "", string);
+ for (i = 0; i < obj->arity; i++) {
+     print_children(topology, obj->children[i], depth + 1);
+ }
+}
+
+int main(void)
+{
+ int depth;
+ unsigned i, n;
+ unsigned long size;
+ int levels;
+ char string[128];
+ int topodepth;
+ hwloc_topology_t topology;
+ hwloc_cpuset_t cpuset;
+ hwloc_obj_t obj;
+
+ /* Allocate and initialize topology object. */
+ hwloc_topology_init(&topology);
+
+ /* ... Optionally, put detection configuration here to ignore
+    some objects types, define a synthetic topology, etc....  
+
+    The default is to detect all the objects of the machine that
+    the caller is allowed to access.  See Configure Topology
+    Detection. */
+
+ /* Perform the topology detection. */
+ hwloc_topology_load(topology);
+
+ /* Optionally, get some additional topology information
+    in case we need the topology depth later. */
+ topodepth = hwloc_topology_get_depth(topology);
+
+ /*****************************************************************
+  * First example:
+  * Walk the topology with an array style, from level 0 (always
+  * the system level) to the lowest level (always the proc level).
+  *****************************************************************/
+ for (depth = 0; depth < topodepth; depth++) {
+     printf("*** Objects at level %d\n", depth);
+     for (i = 0; i < hwloc_get_nbobjs_by_depth(topology, depth);
+          i++) {
+         hwloc_obj_snprintf(string, sizeof(string), topology,
+                    hwloc_get_obj_by_depth(topology, depth, i),
+                    "#", 0);
+         printf("Index %u: %s\n", i, string);
+     }
+ }
+
+ /*****************************************************************
+  * Second example:
+  * Walk the topology with a tree style.
+  *****************************************************************/
+ printf("*** Printing overall tree\n");
+ print_children(topology, hwloc_get_root_obj(topology), 0);
+
+ /*****************************************************************
+  * Third example:
+  * Print the number of sockets.
+  *****************************************************************/
+ depth = hwloc_get_type_depth(topology, HWLOC_OBJ_SOCKET);
+ if (depth == HWLOC_TYPE_DEPTH_UNKNOWN) {
+     printf("*** The number of sockets is unknown\n");
+ } else {
+     printf("*** %u socket(s)\n",
+            hwloc_get_nbobjs_by_depth(topology, depth));
+ }
+
+ /*****************************************************************
+  * Fourth example:
+  * Compute the amount of cache that the first logical processor
+  * has above it.
+  *****************************************************************/
+ levels = 0;
+ size = 0;
+ for (obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_PU, 0);
+      obj;
+      obj = obj->parent)
+   if (obj->type == HWLOC_OBJ_CACHE) {
+     levels++;
+     size += obj->attr->cache.size;
+   }
+ printf("*** Logical processor 0 has %d caches totaling %luKB\n",
+        levels, size / 1024);
+
+ /*****************************************************************
+  * Fifth example:
+  * Bind to only one thread of the last core of the machine.
+  *
+  * First find out where cores are, or else smaller sets of CPUs if
+  * the OS doesn't have the notion of a "core".
+  *****************************************************************/
+ depth = hwloc_get_type_or_below_depth(topology, HWLOC_OBJ_CORE);
+
+ /* Get last core. */
+ obj = hwloc_get_obj_by_depth(topology, depth,
+                hwloc_get_nbobjs_by_depth(topology, depth) - 1);
+ if (obj) {
+     /* Get a copy of its cpuset that we may modify. */
+     cpuset = hwloc_bitmap_dup(obj->cpuset);
+
+     /* Get only one logical processor (in case the core is
+        SMT/hyperthreaded). */
+     hwloc_bitmap_singlify(cpuset);
+
+     /* And try to bind ourself there. */
+     if (hwloc_set_cpubind(topology, cpuset, 0)) {
+         char *str;
+         int error = errno;
+         hwloc_bitmap_asprintf(&str, obj->cpuset);
+         printf("Couldn't bind to cpuset %s: %s\n", str, strerror(error));
+         free(str);
+     }
+
+     /* Free our cpuset copy */
+     hwloc_bitmap_free(cpuset);
+ }
+
+ /*****************************************************************
+  * Sixth example:
+  * Allocate some memory on the last NUMA node, bind some existing
+  * memory to the last NUMA node.
+  *****************************************************************/
+ /* Get last node. */
+ n = hwloc_get_nbobjs_by_type(topology, HWLOC_OBJ_NODE);
+ if (n) {
+     void *m;
+     size = 1024*1024;
+
+     obj = hwloc_get_obj_by_type(topology, HWLOC_OBJ_NODE, n - 1);
+     m = hwloc_alloc_membind_nodeset(topology, size, obj->nodeset,
+             HWLOC_MEMBIND_DEFAULT, 0);
+     hwloc_free(topology, m, size);
+
+     m = malloc(size);
+     hwloc_set_area_membind_nodeset(topology, m, size, obj->nodeset,
+             HWLOC_MEMBIND_DEFAULT, 0);
+     free(m);
+ }
+
+ /* Destroy topology object. */
+ hwloc_topology_destroy(topology);
+
+ return 0;
+}
+
+hwloc provides a pkg-config executable to obtain relevant compiler and linker
+flags. For example, it can be used thusly to compile applications that utilize
+the hwloc library (assuming GNU Make):
+
+CFLAGS += $(pkg-config --cflags hwloc)
+LDLIBS += $(pkg-config --libs hwloc)
+cc hwloc-hello.c $(CFLAGS) -o hwloc-hello $(LDLIBS)
+
+On a machine with 4GB of RAM and 2 processor sockets -- each socket of which
+has two processing cores -- the output from running hwloc-hello could be
+something like the following:
+
+shell$ ./hwloc-hello
+*** Objects at level 0
+Index 0: Machine(3938MB)
+*** Objects at level 1
+Index 0: Socket#0
+Index 1: Socket#1
+*** Objects at level 2
+Index 0: Core#0
+Index 1: Core#1
+Index 2: Core#3
+Index 3: Core#2
+*** Objects at level 3
+Index 0: PU#0
+Index 1: PU#1
+Index 2: PU#2
+Index 3: PU#3
+*** Printing overall tree
+Machine(3938MB)
+  Socket#0
+ Core#0
+   PU#0
+ Core#1
+   PU#1
+  Socket#1
+ Core#3
+   PU#2
+ Core#2
+   PU#3
+*** 2 socket(s)
+shell$
+
+Questions and Bugs
+
+Questions should be sent to the devel mailing list (http://www.open-mpi.org/
+community/lists/hwloc.php). Bug reports should be reported in the tracker (
+https://svn.open-mpi.org/trac/hwloc/).
+
+If hwloc discovers an incorrect topology for your machine, the very first thing
+you should check is to ensure that you have the most recent updates installed
+for your operating system. Indeed, most of hwloc topology discovery relies on
+hardware information retrieved through the operation system (e.g., via the /sys
+virtual filesystem of the Linux kernel). If upgrading your OS or Linux kernel
+does not solve your problem, you may also want to ensure that you are running
+the most recent version of the BIOS for your machine.
+
+If those things fail, contact us on the mailing list for additional help.
+Please attach the output of lstopo after having given the --enable-debug option
+to ./configure and rebuilt completely, to get debugging output. Also attach the
+/proc + /sys tarball generated by the installed script hwloc-gather-topology.sh
+when submitting problems about Linux, or send the output of kstat cpu_info in
+the Solaris case, or the output of sysctl hw in the Darwin or BSD cases.
+
+History / Credits
+
+hwloc is the evolution and merger of the libtopology (http://
+runtime.bordeaux.inria.fr/libtopology/) project and the Portable Linux
+Processor Affinity (PLPA) (http://www.open-mpi.org/projects/plpa/) project.
+Because of functional and ideological overlap, these two code bases and ideas
+were merged and released under the name "hwloc" as an Open MPI sub-project.
+
+libtopology was initially developed by the INRIA Runtime Team-Project (http://
+runtime.bordeaux.inria.fr/) (headed by Raymond Namyst (http://
+dept-info.labri.fr/~namyst/). PLPA was initially developed by the Open MPI
+development team as a sub-project. Both are now deprecated in favor of hwloc,
+which is distributed as an Open MPI sub-project.
+
+Further Reading
+
+The documentation chapters include
+
+  * Terms and Definitions
+  * Command-Line Tools
+  * Environment Variables
+  * CPU and Memory Binding Overview
+  * I/O Devices
+  * Importing and exporting topologies from/to XML files
+  * Interoperability With Other Software
+  * Thread Safety
+  * Embedding hwloc in Other Software
+  * Frequently Asked Questions
+
+Make sure to have had a look at those too!
+
+-------------------------------------------------------------------------------
+
+Generated on Tue Dec 20 2011 10:59:25 for Hardware Locality (hwloc) by  doxygen
+1.7.4

opal/mca/hwloc/hwloc131/hwloc/VERSION

@@ -0,0 +1,61 @@
+# This is the VERSION file for hwloc, describing the precise version
+# of hwloc in this distribution.  The various components of the version
+# number below are combined to form a single version number string.
+
+# major, minor, and release are generally combined in the form
+# <major>.<minor>.<release>.  If release is zero, then it is omitted.
+
+major=1
+minor=3
+release=1
+
+# greek is used for alpha or beta release tags.  If it is non-empty,
+# it will be appended to the version number.  It does not have to be
+# numeric.  Common examples include a1 (alpha release 1), b1 (beta
+# release 1), sc2005 (Super Computing 2005 release).  The only
+# requirement is that it must be entirely printable ASCII characters
+# and have no white space.
+
+greek=
+
+# If want_repo_rev=1, then the SVN r number will be included in the overall
+# hwloc version number in some form.
+
+want_repo_rev=0
+
+# If repo_rev=-1, then the repository version number will be obtained
+# dynamically at run time, either: 
+#
+# 1) via the "svnversion" command (if this is a Subversion checkout)
+#    in the form "r<svn_r>", or 
+# 2) via the "hg -v -R tip" command (if this is a Mercurial clone)
+#    in the form of "hg<hash>", using the hash tag at the tip
+# 3) via the "git log -1" command (if this is a Git clone) in the form
+#    of "git<hash>", using the hash tag at the HEAD
+# 4) with the date (if none of the above work) in the form of
+#    "date<date>".
+#
+# Alternatively, if repo_rev is not -1, the value of repo_rev_r will
+# be directly appended to the version string.  This happens during
+# "make dist", for example: if the distribution tarball is being made
+# from an SVN checkout, if repo_rev=-1, then its value is replaced
+# with the output of "svnversion".
+
+repo_rev=r4083
+
+# The date when this release was created
+
+date="Dec 20, 2011"
+
+# The shared library version of hwloc's public library.  This version
+# is maintained in accordance with the "Library Interface Versions"
+# chapter from the GNU Libtool documentation.  Notes:
+
+# 1. Since version numbers are associated with *releases*, the version
+# number maintained on the hwloc SVN trunk (and developer branches) is
+# always 0:0:0.
+
+# 2. Version numbers are described in the Libtool current:revision:age
+# format.
+
+libhwloc_so_version=4:1:4

opal/mca/hwloc/hwloc131/hwloc/config/distscript.csh

@@ -0,0 +1,240 @@
+#! /bin/csh -f
+#
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright © 2010 INRIA.  All rights reserved.
+# Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+set builddir="`pwd`"
+
+set srcdir="$1"
+cd "$srcdir"
+set srcdir=`pwd`
+cd "$builddir"
+
+set distdir="$builddir/$2"
+set HWLOC_VERSION="$3"
+set HWLOC_REPO_REV="$4"
+
+if ("$distdir" == "") then
+    echo "Must supply relative distdir as argv[2] -- aborting"
+    exit 1
+elif ("$HWLOC_VERSION" == "") then
+    echo "Must supply version as argv[1] -- aborting"
+    exit 1
+endif
+
+#========================================================================
+
+if ("$srcdir" != "$builddir") then
+    set vpath=1
+    set vpath_msg=yes
+else
+    set vpath=0
+    set vpath_msg=no
+endif
+
+# We can catch some hard (but possible) to do mistakes by looking at
+# our tree's revision number, but only if we are in the source tree.
+# Otherwise, use what configure told us, at the cost of allowing one
+# or two corner cases in (but otherwise VPATH builds won't work).
+set repo_rev=$HWLOC_REPO_REV
+if (-d .svn) then
+    set repo_rev="r`svnversion .`"
+endif
+
+set start=`date`
+cat <<EOF
+ 
+Creating hwloc distribution
+In directory: `pwd`
+Srcdir: $srcdir
+Builddir: $builddir
+VPATH: $vpath_msg
+Version: $HWLOC_VERSION
+Started: $start
+ 
+EOF
+
+umask 022
+
+if (! -d "$distdir") then
+    echo "*** ERROR: dist dir does not exist"
+    echo "*** ERROR:   $distdir"
+    exit 1
+endif
+
+#
+# See if we need to update the version file with the current repo
+# revision number.  Do this *before* entering the distribution tree to
+# solve a whole host of problems with VPATH (since srcdir may be
+# relative or absolute)
+#
+set cur_repo_rev="`grep '^repo_rev' ${distdir}/VERSION | cut -d= -f2`"
+if ("$cur_repo_rev" == "-1") then
+    sed -e 's/^repo_rev=.*/repo_rev='$repo_rev'/' "${distdir}/VERSION" > "${distdir}/version.new"
+    cp "${distdir}/version.new" "${distdir}/VERSION"
+    rm -f "${distdir}/version.new"
+    # need to reset the timestamp to not annoy AM dependencies
+    touch -r "${srcdir}/VERSION" "${distdir}/VERSION"
+    echo "*** Updated VERSION file with repo rev number: $repo_rev"
+else
+    echo "*** Did NOT update VERSION file with repo rev number"
+endif
+
+#
+# VPATH builds only work if the srcdir has valid docs already built.
+# If we're VPATH and the srcdir doesn't have valid docs, then fail.
+#
+
+if ($vpath == 1 && ! -d $srcdir/doc/doxygen-doc) then
+    echo "*** This is a VPATH 'make dist', but the srcdir does not already"
+    echo "*** have a doxygen-doc tree built.  hwloc's config/distscript.csh"
+    echo "*** requores the docs to be built in the srcdir before executing"
+    echo "*** 'make dist' in a VPATH build."
+    exit 1
+endif
+
+#
+# If we're not VPATH, force the generation of new doxygen documentation
+#
+
+if ($vpath == 0) then
+    # Not VPATH
+    echo "*** Making new doxygen documentation (doxygen-doc tree)"
+    echo "*** Directory: srcdir: $srcdir, distdir: $distdir, pwd: `pwd`"
+    cd doc
+    # We're still in the src tree, so kill any previous doxygen-docs
+    # tree and make a new one.
+    chmod -R a=rwx doxygen-doc
+    rm -rf doxygen-doc
+    make
+    if ($status != 0) then
+        echo ERROR: generating doxygen docs failed
+        echo ERROR: cannot continue
+        exit 1
+    endif
+
+    # Make new README file
+    echo "*** Making new README"
+    make readme
+    if ($status != 0) then
+        echo ERROR: generating new README failed
+        echo ERROR: cannot continue
+        exit 1
+    endif
+else
+    echo "*** This is a VPATH build; assuming that the doxygen docs and REAME"
+    echo "*** are current in the srcdir (i.e., we'll just copy those)"
+endif
+
+echo "*** Copying doxygen-doc tree to dist..."
+echo "*** Directory: srcdir: $srcdir, distdir: $distdir, pwd: `pwd`"
+chmod -R a=rwx $distdir/doc/doxygen-doc
+echo rm -rf $distdir/doc/doxygen-doc
+rm -rf $distdir/doc/doxygen-doc
+echo cp -rpf $srcdir/doc/doxygen-doc $distdir/doc
+cp -rpf $srcdir/doc/doxygen-doc $distdir/doc
+
+echo "*** Copying new README"
+ls -lf $distdir/README
+cp -pf $srcdir/README $distdir
+
+#########################################################
+# VERY IMPORTANT: Now go into the new distribution tree #
+#########################################################
+cd "$distdir"
+echo "*** Now in distdir: $distdir"
+
+#
+# Remove all the latex source files from the distribution tree (the
+# PDFs are still there; we're just removing the latex source because
+# some of the filenames get really, really long...).
+#
+
+echo "*** Removing latex source from dist tree"
+rm -rf doc/doxygen-doc/latex
+
+#
+# Get the latest config.guess and config.sub from ftp.gnu.org
+#
+
+echo "*** Downloading latest config.sub/config.guess from ftp.gnu.org..."
+cd config
+set configdir="`pwd`"
+mkdir tmp.$$
+cd tmp.$$
+# Official HTTP git mirrors for config.guess / config.sub
+wget -t 1 -T 10 -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=master'
+wget -t 1 -T 10 -O config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=master'
+chmod +x config.guess config.sub
+
+# Recently, ftp.gnu.org has had zero-legnth config.guess / config.sub
+# files, which causes the automated nightly SVN snapshot tarball to
+# fail to be made correctly.  This is a primitive attempt to fix that.
+# If we got zero-length files from wget, use a config.guess /
+# config.sub from a known location that is more recent than what ships
+# in the current generation of auto* tools.  Also check to ensure that
+# the resulting scripts are runnable (Jan 2009: there are un-runnable
+# scripts available right now because of some git vulnerability).
+
+# Before you complain about this too loudly, remember that we're using
+# unreleased software...
+
+set happy=0
+if (! -f config.guess || ! -s config.guess) then
+    echo " - WARNING: Got bad config.guess from ftp.gnu.org (non-existent or empty)"
+else
+    ./config.guess >& /dev/null
+    if ($status != 0) then
+        echo " - WARNING: Got bad config.guess from ftp.gnu.org (not executable)"
+    else
+        if (! -f config.sub || ! -s config.sub) then
+            echo " - WARNING: Got bad config.sub from ftp.gnu.org (non-existent or empty)"
+        else
+            ./config.sub `./config.guess` >& /dev/null
+            if ($status != 0) then
+                echo " - WARNING: Got bad config.sub from ftp.gnu.org (not executable)"
+            else
+                echo " - Got good config.guess and config.sub from ftp.gnu.org"
+                chmod +w ../config.sub ../config.guess
+                cp config.sub config.guess ..
+                set happy=1
+            endif
+        endif
+    endif
+endif
+
+if ("$happy" == "0") then
+    echo " - WARNING: using included versions for both config.sub and config.guess"
+endif
+cd ..
+rm -rf tmp.$$
+cd ..
+
+#
+# All done
+#
+
+cat <<EOF
+*** hwloc version $HWLOC_VERSION distribution created
+ 
+Started: $start
+Ended:   `date`
+ 
+EOF
+

opal/mca/hwloc/hwloc131/hwloc/config/hwloc.m4

@@ -0,0 +1,825 @@
+dnl -*- Autoconf -*-
+dnl
+dnl Copyright (c) 2009-2010 INRIA.  All rights reserved.
+dnl Copyright (c) 2009-2011 Université Bordeaux 1
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2004-2008 High Performance Computing Center Stuttgart, 
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright © 2006-2011  Cisco Systems, Inc.  All rights reserved.
+dnl See COPYING in top-level directory.
+
+# Main hwloc m4 macro, to be invoked by the user
+#
+# Expects two or three paramters:
+# 1. Configuration prefix
+# 2. What to do upon success
+# 3. What to do upon failure
+# 4. If non-empty, print the announcement banner
+#
+AC_DEFUN([HWLOC_SETUP_CORE],[
+    AC_REQUIRE([AC_CANONICAL_TARGET])
+    AC_REQUIRE([AC_PROG_CC])
+
+    AS_IF([test "x$4" != "x"],
+          [cat <<EOF
+
+###
+### Configuring hwloc core
+###
+EOF])
+
+    # If no prefix was defined, set a good value
+    m4_ifval([$1], 
+             [m4_define([hwloc_config_prefix],[$1/])],
+             [m4_define([hwloc_config_prefix], [])])
+
+    # Unless previously set to "standalone" mode, default to embedded
+    # mode
+    AS_IF([test "$hwloc_mode" = ""], [hwloc_mode=embedded])
+    AC_MSG_CHECKING([hwloc building mode])
+    AC_MSG_RESULT([$hwloc_mode])
+
+    # Get hwloc's absolute top builddir (which may not be the same as
+    # the real $top_builddir, because we may be building in embedded
+    # mode).
+    HWLOC_startdir=`pwd`
+    if test x"hwloc_config_prefix" != "x" -a ! -d "hwloc_config_prefix"; then
+        mkdir -p "hwloc_config_prefix"
+    fi
+    if test x"hwloc_config_prefix" != "x"; then
+        cd "hwloc_config_prefix"
+    fi
+    HWLOC_top_builddir=`pwd`
+    AC_SUBST(HWLOC_top_builddir)
+
+    # Get hwloc's absolute top srcdir (which may not be the same as
+    # the real $top_srcdir, because we may be building in embedded
+    # mode).  First, go back to the startdir incase the $srcdir is
+    # relative.
+
+    cd "$HWLOC_startdir"
+    cd "$srcdir"/hwloc_config_prefix
+    HWLOC_top_srcdir="`pwd`"
+    AC_SUBST(HWLOC_top_srcdir)
+
+    # Go back to where we started
+    cd "$HWLOC_startdir"
+
+    AC_MSG_NOTICE([hwloc builddir: $HWLOC_top_builddir])
+    AC_MSG_NOTICE([hwloc srcdir: $HWLOC_top_srcdir])
+    if test "$HWLOC_top_builddir" != "$HWLOC_top_srcdir"; then
+        AC_MSG_NOTICE([Detected VPATH build])
+    fi
+
+    # Debug mode?
+    AC_MSG_CHECKING([if want hwloc maintainer support])
+    hwloc_debug=
+
+    # Unconditionally disable debug mode in embedded mode; if someone
+    # asks, we can add a configure-time option for it.  Disable it
+    # now, however, because --enable-debug is not even added as an
+    # option when configuring in embedded mode, and we wouldn't want
+    # to hijack the enclosing application's --enable-debug configure
+    # switch.
+    AS_IF([test "$hwloc_mode" = "embedded"],
+          [hwloc_debug=0
+           hwloc_debug_msg="disabled (embedded mode)"])
+    AS_IF([test "$hwloc_debug" = "" -a "$enable_debug" = "yes"],
+          [hwloc_debug=1
+           hwloc_debug_msg="enabled"])
+    AS_IF([test "$hwloc_debug" = ""],
+          [hwloc_debug=0
+           hwloc_debug_msg="disabled"])
+    # Grr; we use #ifndef for HWLOC_DEBUG!  :-(
+    AH_TEMPLATE(HWLOC_DEBUG, [Whether we are in debugging mode or not])
+    AS_IF([test "$hwloc_debug" = "1"], [AC_DEFINE([HWLOC_DEBUG])])
+    AC_MSG_RESULT([$hwloc_debug_msg])
+
+    # We need to set a path for header, etc files depending on whether
+    # we're standalone or embedded. this is taken care of by HWLOC_EMBEDDED.
+
+    AC_MSG_CHECKING([for hwloc directory prefix])
+    AC_MSG_RESULT(m4_ifval([$1], hwloc_config_prefix, [(none)]))
+
+    # Note that private/config.h *MUST* be listed first so that it
+    # becomes the "main" config header file.  Any AC-CONFIG-HEADERS
+    # after that (hwloc/config.h) will only have selective #defines
+    # replaced, not the entire file.
+    AC_CONFIG_HEADERS(hwloc_config_prefix[include/private/autogen/config.h])
+    AC_CONFIG_HEADERS(hwloc_config_prefix[include/hwloc/autogen/config.h])
+
+    # What prefix are we using?
+    AC_MSG_CHECKING([for hwloc symbol prefix])
+    AS_IF([test "$hwloc_symbol_prefix_value" = ""],
+          [AS_IF([test "$with_hwloc_symbol_prefix" = ""],
+                 [hwloc_symbol_prefix_value=hwloc_],
+                 [hwloc_symbol_prefix_value=$with_hwloc_symbol_prefix])])
+    AC_DEFINE_UNQUOTED(HWLOC_SYM_PREFIX, [$hwloc_symbol_prefix_value],
+                       [The hwloc symbol prefix])
+    # Ensure to [] escape the whole next line so that we can get the
+    # proper tr tokens
+    [hwloc_symbol_prefix_value_caps="`echo $hwloc_symbol_prefix_value | tr '[:lower:]' '[:upper:]'`"]
+    AC_DEFINE_UNQUOTED(HWLOC_SYM_PREFIX_CAPS, [$hwloc_symbol_prefix_value_caps],
+                       [The hwloc symbol prefix in all caps])
+    AC_MSG_RESULT([$hwloc_symbol_prefix_value])
+
+    # Give an easy #define to know if we need to transform all the
+    # hwloc names
+    AH_TEMPLATE([HWLOC_SYM_TRANSFORM], [Whether we need to re-define all the hwloc public symbols or not])
+    AS_IF([test "$hwloc_symbol_prefix_value" = "hwloc_"],
+          [AC_DEFINE([HWLOC_SYM_TRANSFORM], [0])],
+          [AC_DEFINE([HWLOC_SYM_TRANSFORM], [1])])
+
+    # GCC specifics.
+    if test "x$GCC" = "xyes"; then
+        HWLOC_GCC_CFLAGS="-Wall -Wmissing-prototypes -Wundef"
+        HWLOC_GCC_CFLAGS="$HWLOC_GCC_CFLAGS -Wpointer-arith -Wcast-align"
+    fi
+
+    # Enample system extensions for O_DIRECTORY, fdopen, fssl, etc.
+    AC_USE_SYSTEM_EXTENSIONS
+    AH_VERBATIM([USE_HPUX_SYSTEM_EXTENSIONS],
+[/* Enable extensions on HP-UX. */
+#ifndef _HPUX_SOURCE
+# undef _HPUX_SOURCE
+#endif
+])
+    AC_DEFINE([_HPUX_SOURCE], [1], [Are we building for HP-UX?])
+    
+    AC_LANG_PUSH([C])
+    
+    # Check to see if we're producing a 32 or 64 bit executable by
+    # checking the sizeof void*.  Note that AC CHECK_SIZEOF even works
+    # when cross compiling (!), according to the AC 2.64 docs.  This
+    # check is needed because on some systems, you can instruct the
+    # compiler to specifically build 32 or 64 bit executables -- even
+    # though the $target may indicate something different.
+    AC_CHECK_SIZEOF([void *])
+
+    #
+    # Check OS support
+    #
+    AC_MSG_CHECKING([which OS support to include])
+    case ${target} in
+      *-*-linux*)
+        AC_DEFINE(HWLOC_LINUX_SYS, 1, [Define to 1 on Linux])
+        hwloc_linux=yes
+        AC_MSG_RESULT([Linux])
+        ;;
+      *-*-irix*)
+        AC_DEFINE(HWLOC_IRIX_SYS, 1, [Define to 1 on Irix])
+        hwloc_irix=yes
+        AC_MSG_RESULT([IRIX])
+        ;;
+      *-*-darwin*)
+        AC_DEFINE(HWLOC_DARWIN_SYS, 1, [Define to 1 on Darwin])
+        hwloc_darwin=yes
+        AC_MSG_RESULT([Darwin])
+        ;;
+      *-*-solaris*)
+        AC_DEFINE(HWLOC_SOLARIS_SYS, 1, [Define to 1 on Solaris])
+        hwloc_solaris=yes
+        AC_MSG_RESULT([Solaris])
+        ;;
+      *-*-aix*)
+        AC_DEFINE(HWLOC_AIX_SYS, 1, [Define to 1 on AIX])
+        hwloc_aix=yes
+        AC_MSG_RESULT([AIX])
+        ;;
+      *-*-osf*)
+        AC_DEFINE(HWLOC_OSF_SYS, 1, [Define to 1 on OSF])
+        hwloc_osf=yes
+        AC_MSG_RESULT([OSF])
+        ;;
+      *-*-hpux*)
+        AC_DEFINE(HWLOC_HPUX_SYS, 1, [Define to 1 on HP-UX])
+        hwloc_hpux=yes
+        AC_MSG_RESULT([HP-UX])
+        ;;
+      *-*-mingw*|*-*-cygwin*)
+        AC_DEFINE(HWLOC_WIN_SYS, 1, [Define to 1 on WINDOWS])
+        hwloc_windows=yes
+        AC_MSG_RESULT([Windows])
+        ;;
+      *-*-*freebsd*)
+        AC_DEFINE(HWLOC_FREEBSD_SYS, 1, [Define to 1 on *FREEBSD])
+        hwloc_freebsd=yes
+        AC_MSG_RESULT([FreeBSD])
+        ;;
+      *)
+        AC_MSG_RESULT([Unsupported! ($target)])
+        AC_DEFINE(HWLOC_UNSUPPORTED_SYS, 1, [Define to 1 on unsupported systems])
+        AC_MSG_WARN([***********************************************************])
+        AC_MSG_WARN([*** hwloc does not support this system.])
+        AC_MSG_WARN([*** hwloc will *attempt* to build (but it may not work).])
+        AC_MSG_WARN([*** hwloc run-time results may be reduced to showing just one processor.])
+        AC_MSG_WARN([*** You have been warned.])
+        AC_MSG_WARN([*** Pausing to give you time to read this message...])
+        AC_MSG_WARN([***********************************************************])
+        sleep 10
+        ;;
+    esac
+
+    #
+    # Check CPU support
+    #
+    AC_MSG_CHECKING([which CPU support to include])
+    case ${target} in
+      i*86-*-*|x86_64-*-*)
+        case ${ac_cv_sizeof_void_p} in
+          4)
+            AC_DEFINE(HWLOC_X86_32_ARCH, 1, [Define to 1 on x86_32])
+            hwloc_x86_32=yes
+            AC_MSG_RESULT([x86_32])
+            ;;
+          8)
+            AC_DEFINE(HWLOC_X86_64_ARCH, 1, [Define to 1 on x86_64])
+            hwloc_x86_64=yes
+            AC_MSG_RESULT([x86_64])
+            ;;
+          *)
+            AC_DEFINE(HWLOC_X86_64_ARCH, 1, [Define to 1 on x86_64])
+            hwloc_x86_64=yes
+            AC_MSG_RESULT([unknown -- assuming x86_64])
+            ;;
+        esac
+    esac
+    
+    AC_CHECK_SIZEOF([unsigned long])
+    AC_DEFINE_UNQUOTED([HWLOC_SIZEOF_UNSIGNED_LONG], $ac_cv_sizeof_unsigned_long, [The size of `unsigned long', as computed by sizeof])
+    AC_CHECK_SIZEOF([unsigned int])
+    AC_DEFINE_UNQUOTED([HWLOC_SIZEOF_UNSIGNED_INT], $ac_cv_sizeof_unsigned_int, [The size of `unsigned int', as computed by sizeof])
+
+    #
+    # Check for compiler attributes and visibility
+    #
+    _HWLOC_CHECK_ATTRIBUTES
+    _HWLOC_CHECK_VISIBILITY
+    HWLOC_CFLAGS="$HWLOC_FLAGS $HWLOC_VISIBILITY_CFLAGS"
+    AS_IF([test "$HWLOC_VISIBILITY_CFLAGS" != ""],
+          [AC_MSG_WARN(["$HWLOC_VISIBILITY_CFLAGS" has been added to the hwloc CFLAGS])])
+
+    #
+    # Check for inline compatibility support
+    #
+    AC_MSG_CHECKING([for inline compatibility keyword])
+    AC_TRY_COMPILE([static void __inline__ f(void) { }], [],
+      [__hwloc_inline=__inline__],
+      [AC_TRY_COMPILE([static void __inline f(void) {}], [],
+        [__hwloc_inline=__inline],
+        [__hwloc_inline=]
+      )]
+    )
+    AC_MSG_RESULT([$__hwloc_inline])
+    AC_DEFINE_UNQUOTED(__hwloc_inline, $__hwloc_inline, [Define this to a keyword that can safely replace inline in installed headers])
+    
+    #
+    # Now detect support
+    #
+    
+    hwloc_strncasecmp=strncmp
+    AC_CHECK_FUNCS([strncasecmp], [
+      _HWLOC_CHECK_DECL([strncasecmp], [
+        hwloc_strncasecmp=strncasecmp
+      ])
+    ])
+    AC_DEFINE_UNQUOTED(hwloc_strncasecmp, $hwloc_strncasecmp, [Define this to either strncasecmp or strncmp])
+
+    AC_CHECK_FUNCS([strftime])
+    AC_CHECK_FUNCS([setlocale])
+    
+    AC_CHECK_HEADER([stdint.h], [
+      AC_DEFINE([HWLOC_HAVE_STDINT_H], [1], [Define to 1 if you have the <stdint.h> header file.])
+    ])
+    AC_CHECK_HEADERS([sys/mman.h])
+    
+    AC_CHECK_TYPES([KAFFINITY,
+                    PROCESSOR_CACHE_TYPE,
+                    CACHE_DESCRIPTOR,
+                    LOGICAL_PROCESSOR_RELATIONSHIP,
+                    RelationProcessorPackage,
+                    SYSTEM_LOGICAL_PROCESSOR_INFORMATION,
+                    GROUP_AFFINITY,
+                    PROCESSOR_RELATIONSHIP,
+                    NUMA_NODE_RELATIONSHIP,
+                    CACHE_RELATIONSHIP,
+                    PROCESSOR_GROUP_INFO,
+                    GROUP_RELATIONSHIP,
+                    SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX,
+		    PSAPI_WORKING_SET_EX_BLOCK,
+		    PSAPI_WORKING_SET_EX_INFORMATION],
+                    [],[],[[#include <windows.h>]])
+    AC_CHECK_LIB([gdi32], [main],
+                 [HWLOC_LIBS="-lgdi32 $HWLOC_LIBS"
+                  AC_DEFINE([HAVE_LIBGDI32], 1, [Define to 1 if we have -lgdi32])])
+    
+    AC_CHECK_HEADER([windows.h], [
+      AC_DEFINE([HWLOC_HAVE_WINDOWS_H], [1], [Define to 1 if you have the `windows.h' header.])
+    ])
+    
+    AC_CHECK_HEADERS([sys/lgrp_user.h], [
+      AC_CHECK_LIB([lgrp], [lgrp_latency_cookie],
+                   [HWLOC_LIBS="-llgrp $HWLOC_LIBS"
+                    AC_DEFINE([HAVE_LIBLGRP], 1, [Define to 1 if we have -llgrp])])
+    ])
+    AC_CHECK_HEADERS([kstat.h], [
+      AC_CHECK_LIB([kstat], [main], 
+                   [HWLOC_LIBS="-lkstat $HWLOC_LIBS"
+                    AC_DEFINE([HAVE_LIBKSTAT], 1, [Define to 1 if we have -lkstat])])
+    ])
+    
+    AC_CHECK_DECLS([_SC_NPROCESSORS_ONLN,
+    		_SC_NPROCESSORS_CONF,
+    		_SC_NPROC_ONLN,
+    		_SC_NPROC_CONF,
+    		_SC_LARGE_PAGESIZE],,[:],[[#include <unistd.h>]])
+    
+    AC_HAVE_HEADERS([mach/mach_host.h])
+    AC_HAVE_HEADERS([mach/mach_init.h], [
+      AC_CHECK_FUNCS([host_info])
+    ])
+
+    AC_CHECK_HEADERS([sys/param.h])
+    AC_CHECK_HEADERS([sys/sysctl.h], [
+      AC_CHECK_DECLS([CTL_HW, HW_NCPU],,,[[
+      #if HAVE_SYS_PARAM_H
+      #include <sys/param.h>
+      #endif
+      #include <sys/sysctl.h>
+      ]])
+    ],,[
+      AC_INCLUDES_DEFAULT
+      #if HAVE_SYS_PARAM_H
+      #include <sys/param.h>
+      #endif
+    ])
+    AC_CHECK_FUNCS([sysctl sysctlbyname])
+
+    case ${target} in
+      *-*-mingw*|*-*-cygwin*)
+        hwloc_pid_t=HANDLE
+        hwloc_thread_t=HANDLE
+        ;;
+      *)
+        hwloc_pid_t=pid_t
+        AC_CHECK_TYPES([pthread_t], [hwloc_thread_t=pthread_t], [:], [[#include <pthread.h>]])
+        ;;
+    esac
+    AC_DEFINE_UNQUOTED(hwloc_pid_t, $hwloc_pid_t, [Define this to the process ID type])
+    if test "x$hwloc_thread_t" != "x" ; then
+      AC_DEFINE_UNQUOTED(hwloc_thread_t, $hwloc_thread_t, [Define this to the thread ID type])
+    fi
+    
+    _HWLOC_CHECK_DECL([sched_setaffinity], [
+      AC_DEFINE([HWLOC_HAVE_SCHED_SETAFFINITY], [1], [Define to 1 if glibc provides a prototype of sched_setaffinity()])
+      AC_MSG_CHECKING([for old prototype of sched_setaffinity])
+      AC_COMPILE_IFELSE([
+        AC_LANG_PROGRAM([[
+          #define _GNU_SOURCE
+          #include <sched.h>
+          static unsigned long mask;
+          ]], [[ sched_setaffinity(0, (void*) &mask); ]])],
+        [AC_DEFINE([HWLOC_HAVE_OLD_SCHED_SETAFFINITY], [1], [Define to 1 if glibc provides the old prototype (without length) of sched_setaffinity()])
+         AC_MSG_RESULT([yes])],
+        [AC_MSG_RESULT([no])])
+    ], , [[
+#define _GNU_SOURCE
+#include <sched.h>
+]])
+    
+    AC_MSG_CHECKING([for working CPU_SET])
+    AC_LINK_IFELSE([
+      AC_LANG_PROGRAM([[
+        #include <sched.h>
+        cpu_set_t set;
+        ]], [[ CPU_ZERO(&set); CPU_SET(0, &set);]])],
+	[AC_DEFINE([HWLOC_HAVE_CPU_SET], [1], [Define to 1 if the CPU_SET macro works])
+         AC_MSG_RESULT([yes])],
+        [AC_MSG_RESULT([no])])
+    
+    AC_MSG_CHECKING([for working CPU_SET_S])
+    AC_LINK_IFELSE([
+      AC_LANG_PROGRAM([[
+          #include <sched.h>
+          cpu_set_t *set;
+        ]], [[
+          set = CPU_ALLOC(1024);
+          CPU_ZERO_S(CPU_ALLOC_SIZE(1024), set);
+          CPU_SET_S(CPU_ALLOC_SIZE(1024), 0, set);
+          CPU_FREE(set);
+        ]])],
+        [AC_DEFINE([HWLOC_HAVE_CPU_SET_S], [1], [Define to 1 if the CPU_SET_S macro works])
+         AC_MSG_RESULT([yes])],
+        [AC_MSG_RESULT([no])])
+
+    AC_MSG_CHECKING([for working _syscall3])
+    AC_LINK_IFELSE([
+      AC_LANG_PROGRAM([[
+          #include <linux/unistd.h>
+          #include <errno.h>
+          #define __NR_hwloc_test 123
+          _syscall3(int, hwloc_test, int, param1, int, param2, int, param3);
+        ]], [[ hwloc_test(1, 2, 3); ]])],
+        [AC_DEFINE([HWLOC_HAVE__SYSCALL3], [1], [Define to 1 if the _syscall3 macro works])
+         AC_MSG_RESULT([yes])],
+        [AC_MSG_RESULT([no])])
+
+    # Check for kerrighed, but don't abort if not found.  It's illegal
+    # to pass in an empty 3rd argument, but we trust the output of
+    # pkg-config, so just give it a value that will always work:
+    # printf.
+    HWLOC_PKG_CHECK_MODULES([KERRIGHED], [kerrighed >= 2.0], [printf], [], [:])
+
+    AC_PATH_PROGS([HWLOC_MS_LIB], [lib])
+    AC_ARG_VAR([HWLOC_MS_LIB], [Path to Microsoft's Visual Studio `lib' tool])
+
+    AC_PATH_PROG([BASH], [bash])
+    
+    AC_CHECK_FUNCS([ffs], [
+      _HWLOC_CHECK_DECL([ffs],[
+        AC_DEFINE([HWLOC_HAVE_DECL_FFS], [1], [Define to 1 if function `ffs' is declared by system headers])
+      ])
+      AC_DEFINE([HWLOC_HAVE_FFS], [1], [Define to 1 if you have the `ffs' function.])
+    ])
+    AC_CHECK_FUNCS([ffsl], [
+      _HWLOC_CHECK_DECL([ffsl],[
+        AC_DEFINE([HWLOC_HAVE_DECL_FFSL], [1], [Define to 1 if function `ffsl' is declared by system headers])
+      ])
+      AC_DEFINE([HWLOC_HAVE_FFSL], [1], [Define to 1 if you have the `ffsl' function.])
+    ])
+    
+    AC_CHECK_FUNCS([fls], [
+      _HWLOC_CHECK_DECL([fls],[
+        AC_DEFINE([HWLOC_HAVE_DECL_FLS], [1], [Define to 1 if function `fls' is declared by system headers])
+      ])
+      AC_DEFINE([HWLOC_HAVE_FLS], [1], [Define to 1 if you have the `fls' function.])
+    ])
+    AC_CHECK_FUNCS([flsl], [
+      _HWLOC_CHECK_DECL([flsl],[
+        AC_DEFINE([HWLOC_HAVE_DECL_FLSL], [1], [Define to 1 if function `flsl' is declared by system headers])
+      ])
+      AC_DEFINE([HWLOC_HAVE_FLSL], [1], [Define to 1 if you have the `flsl' function.])
+    ])
+    
+    AC_CHECK_FUNCS([clz], [
+      _HWLOC_CHECK_DECL([clz],[
+        AC_DEFINE([HWLOC_HAVE_DECL_CLZ], [1], [Define to 1 if function `clz' is declared by system headers])
+      ])
+      AC_DEFINE([HWLOC_HAVE_CLZ], [1], [Define to 1 if you have the `clz' function.])
+    ])
+    AC_CHECK_FUNCS([clzl], [
+      _HWLOC_CHECK_DECL([clzl],[
+        AC_DEFINE([HWLOC_HAVE_DECL_CLZL], [1], [Define to 1 if function `clzl' is declared by system headers])
+      ])
+      AC_DEFINE([HWLOC_HAVE_CLZL], [1], [Define to 1 if you have the `clzl' function.])
+    ])
+    
+    AC_CHECK_FUNCS([openat], [hwloc_have_openat=yes])
+
+    AC_CHECK_HEADERS([malloc.h])
+    AC_CHECK_FUNCS([getpagesize memalign posix_memalign])
+
+    AC_CHECK_HEADERS([sys/utsname.h])
+    AC_CHECK_FUNCS([uname])
+
+    AC_CHECK_HEADERS([pthread_np.h])
+    AC_CHECK_DECLS([pthread_setaffinity_np],,[:],[[
+      #include <pthread.h>
+      #ifdef HAVE_PTHREAD_NP_H
+      #  include <pthread_np.h>
+      #endif
+    ]])
+    AC_CHECK_DECLS([pthread_getaffinity_np],,[:],[[
+      #include <pthread.h>
+      #ifdef HAVE_PTHREAD_NP_H
+      #  include <pthread_np.h>
+      #endif
+    ]])
+    AC_CHECK_FUNC([sched_setaffinity], [hwloc_have_sched_setaffinity=yes])
+    AC_CHECK_HEADERS([sys/cpuset.h],,,[[#include <sys/param.h>]])
+    AC_SEARCH_LIBS([pthread_getthrds_np], [pthread],
+      AC_DEFINE([HWLOC_HAVE_PTHREAD_GETTHRDS_NP], 1, `Define to 1 if you have pthread_getthrds_np')
+    )
+
+    # Linux libnuma support
+    hwloc_linux_libnuma_happy=no
+    if test "x$enable_libnuma" != "xno"; then
+        hwloc_linux_libnuma_happy=yes
+        AC_CHECK_HEADERS([numaif.h], [
+            AC_CHECK_LIB([numa], [numa_available], [HWLOC_LINUX_LIBNUMA_LIBS="-lnuma"], [hwloc_linux_libnuma_happy=no])
+        ], [hwloc_linux_libnuma_happy=no])
+    fi
+    AC_SUBST(HWLOC_LINUX_LIBNUMA_LIBS)
+    # If we asked for Linux libnuma support but couldn't deliver, fail
+    AS_IF([test "$enable_libnuma" = "yes" -a "$hwloc_linux_libnuma_happy" = "no"],
+          [AC_MSG_WARN([Specified --enable-libnuma switch, but could not])
+           AC_MSG_WARN([find appropriate support])
+           AC_MSG_ERROR([Cannot continue])])
+    if test "x$hwloc_linux_libnuma_happy" = "xyes"; then
+      tmp_save_LIBS="$LIBS"
+      LIBS="$LIBS $HWLOC_LINUX_LIBNUMA_LIBS"
+
+      AC_CHECK_LIB([numa], [set_mempolicy], [
+	enable_set_mempolicy=yes
+	AC_DEFINE([HWLOC_HAVE_SET_MEMPOLICY], [1], [Define to 1 if set_mempolicy is available.])
+      ])
+      AC_CHECK_LIB([numa], [mbind], [
+	enable_mbind=yes
+	AC_DEFINE([HWLOC_HAVE_MBIND], [1], [Define to 1 if mbind is available.])
+      ])
+      AC_CHECK_LIB([numa], [migrate_pages], [
+	enable_migrate_pages=yes
+	AC_DEFINE([HWLOC_HAVE_MIGRATE_PAGES], [1], [Define to 1 if migrate_pages is available.])
+      ])
+
+      LIBS="$tmp_save_LIBS"
+    fi
+
+    # PCI support
+    hwloc_pci_happy=no
+    if test "x$enable_pci" != "xno"; then
+        hwloc_pci_happy=yes
+        HWLOC_PKG_CHECK_MODULES([PCI], [libpci], [pci_cleanup], [:], [
+          # manually check pciutils in case a old one without .pc is installed
+          AC_CHECK_HEADERS([pci/pci.h], [
+	    # try first without -lz, it's not always needed (RHEL5, Debian Etch)
+	    AC_CHECK_LIB([pci], [pci_init], [
+	      HWLOC_PCI_LIBS="-lpci"
+	      ], [
+              # try again with -lz because it's needed sometimes (FC7).
+              # don't use AC_CHECK_LIB again because the cache would
+              # return "no" without actually rechecking
+              AC_MSG_CHECKING([for pci_init in -lpci with -lz])
+              tmp_save_LIBS=$LIBS
+              LIBS="-lpci -lz $LIBS"
+              AC_LINK_IFELSE([AC_LANG_CALL([], [pci_init])],
+                             [HWLOC_PCI_LIBS="-lpci -lz"
+                              HWLOC_PCI_ADDITIONAL_LIBS="-lz"
+                              AC_MSG_RESULT(yes)],
+                             [hwloc_pci_happy=no
+                              AC_MSG_RESULT(no)])
+              LIBS=$tmp_save_LIBS])
+            # Also check with pci_lookup_name, because that sometimes
+            # requires -lresolv (RHEL5.6). don't use AC_CHECK_LIB twice
+            # because the cache would return "no" without actually rechecking
+	    AC_CHECK_LIB([pci], [pci_lookup_name], [],
+                [AC_CHECK_LIB([resolv], [inet_ntoa], 
+                    [AC_MSG_CHECKING([for pci_lookup_name in -lpci with -lresolv])
+                     tmp_save_LIBS=$LIBS
+                     LIBS="-lpci -lresolv $LIBS $HWLOC_PCI_ADDITIONAL_LIBS"
+                     AC_LINK_IFELSE([AC_LANG_CALL([], [pci_lookup_name])],
+                                    [HWLOC_PCI_LIBS="$HWLOC_PCI_LIBS -lresolv"
+                                     HWLOC_PCI_ADDITIONAL_LIBS="$HWLOC_PCI_ADDITIONAL_LIBS -lresolv"
+                                     AC_MSG_RESULT(yes)],
+                                    [hwloc_pci_happy=no
+                                     AC_MSG_RESULT(no)])
+                     LIBS=$tmp_save_LIBS],
+                    [hwloc_pci_happy=no])])
+            ], [hwloc_pci_happy=no])
+        ])
+    fi
+    AC_SUBST(HWLOC_PCI_LIBS)
+    HWLOC_LIBS="$HWLOC_LIBS $HWLOC_PCI_LIBS"
+    # If we asked for pci support but couldn't deliver, fail
+    AS_IF([test "$enable_pci" = "yes" -a "$hwloc_pci_happy" = "no"],
+          [AC_MSG_WARN([Specified --enable-pci switch, but could not])
+           AC_MSG_WARN([find appropriate support])
+           AC_MSG_ERROR([Cannot continue])])
+    if test "x$hwloc_pci_happy" = "xyes"; then
+      tmp_save_CFLAGS="$CFLAGS"
+      CFLAGS="$CFLAGS $HWLOC_PCI_CFLAGS"
+      tmp_save_LIBS="$LIBS"
+      LIBS="$LIBS $HWLOC_PCI_LIBS"
+      AC_CHECK_DECLS([PCI_LOOKUP_NO_NUMBERS],,[:],[[#include <pci/pci.h>]])
+      AC_CHECK_DECLS([PCI_LOOKUP_NO_NUMBERS],,[:],[[#include <pci/pci.h>]])
+      AC_CHECK_LIB([pci], [pci_find_cap], [enable_pci_caps=yes], [enable_pci_caps=no], [$HWLOC_PCI_ADDITIONAL_LIBS])
+      if test "x$enable_pci_caps" = "xyes"; then
+        AC_DEFINE([HWLOC_HAVE_PCI_FIND_CAP], [1], [Define to 1 if `libpci' has the `pci_find_cap' function.])
+      fi
+
+      AC_MSG_CHECKING(whether struct pci_dev has a device_class field)
+      AC_TRY_COMPILE([#include <pci/pci.h>],
+	[int f(struct pci_dev *dev) { return dev->device_class; }],
+        [pcidev_device_class=yes], [pcidev_device_class=no])
+      AC_MSG_RESULT([$pcidev_device_class])
+      if test x$pcidev_device_class = xyes; then
+        AC_DEFINE([HWLOC_HAVE_PCIDEV_DEVICE_CLASS], [1], [Define to 1 if struct pci_dev has a `device_class' field.])
+      fi
+
+      AC_MSG_CHECKING(whether struct pci_dev has a domain field)
+      AC_TRY_COMPILE([#include <pci/pci.h>],
+	[int f(struct pci_dev *dev) { return dev->domain; }],
+        [pcidev_domain=yes], [pcidev_domain=no])
+      AC_MSG_RESULT([$pcidev_domain])
+      if test x$pcidev_domain = xyes; then
+        AC_DEFINE([HWLOC_HAVE_PCIDEV_DOMAIN], [1], [Define to 1 if struct pci_dev has a `domain' field.])
+      fi
+
+      HWLOC_REQUIRES="libpci $HWLOC_REQUIRES"
+      AC_DEFINE([HWLOC_HAVE_LIBPCI], [1], [Define to 1 if you have the `libpci' library.])
+      AC_SUBST([HWLOC_HAVE_LIBPCI], [1])
+      CFLAGS="$tmp_save_CFLAGS"
+      LIBS="$tmp_save_LIBS"
+    else
+      AC_SUBST([HWLOC_HAVE_LIBPCI], [0])
+    fi
+    HWLOC_CFLAGS="$HWLOC_CFLAGS $HWLOC_PCI_CFLAGS"
+
+    # libxml2 support
+    hwloc_libxml2_happy=
+    if test "x$enable_libxml2" != "xno"; then
+        HWLOC_PKG_CHECK_MODULES([LIBXML2], [libxml-2.0], [xmlNewDoc], 
+                                [hwloc_libxml2_happy=yes], 
+                                [hwloc_libxml2_happy=no])
+    fi
+    if test "x$hwloc_libxml2_happy" = "xyes"; then
+        HWLOC_REQUIRES="libxml-2.0 $HWLOC_REQUIRES"
+        AC_DEFINE([HWLOC_HAVE_LIBXML2], [1], [Define to 1 if you have the `libxml2' library.])
+        AC_SUBST([HWLOC_HAVE_LIBXML2], [1])
+    else
+        AC_SUBST([HWLOC_HAVE_LIBXML2], [0])
+	AS_IF([test "$enable_libxml2" = "yes"],
+              [AC_MSG_WARN([--enable-libxml2 requested, but libxml2 was not found])
+               AC_MSG_ERROR([Cannot continue])])
+    fi
+    HWLOC_CFLAGS="$HWLOC_CFLAGS $HWLOC_LIBXML2_CFLAGS"    
+
+    # Setup HWLOC's C, CPP, and LD flags, and LIBS
+    AC_SUBST(HWLOC_REQUIRES)
+    AC_SUBST(HWLOC_CFLAGS)
+    HWLOC_CPPFLAGS='-I$(HWLOC_top_srcdir)/include -I$(HWLOC_top_builddir)/include'
+    AC_SUBST(HWLOC_CPPFLAGS)
+    HWLOC_LDFLAGS='-L$(HWLOC_top_builddir)/src'
+    AC_SUBST(HWLOC_LDFLAGS)
+    AC_SUBST(HWLOC_LIBS)
+
+    # Set these values explicitly for embedded builds.  Exporting
+    # these values through *_EMBEDDED_* values gives us the freedom to
+    # do something different someday if we ever need to.
+    HWLOC_EMBEDDED_CFLAGS=$HWLOC_CFLAGS
+    AC_SUBST(HWLOC_EMBEDDED_CFLAGS)
+    HWLOC_EMBEDDED_CPPFLAGS=$HWLOC_CPPFLAGS
+    AC_SUBST(HWLOC_EMBEDDED_CPPFLAGS)
+    HWLOC_EMBEDDED_LDADD='$(HWLOC_top_builddir)/src/libhwloc_embedded.la'
+    AC_SUBST(HWLOC_EMBEDDED_LDADD)
+    HWLOC_EMBEDDED_LIBS=$HWLOC_LIBS
+    AC_SUBST(HWLOC_EMBEDDED_LIBS)
+
+    # Try to compile the cpuid inlines
+    AC_MSG_CHECKING([for cpuid])
+    old_CPPFLAGS="$CPPFLAGS"
+    CFLAGS="$CFLAGS -I$HWLOC_top_srcdir/include"
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+        #include <stdio.h>
+        #include <private/cpuid.h>
+      ]], [[
+        if (hwloc_have_cpuid()) {
+          unsigned eax = 0, ebx, ecx = 0, edx;
+          hwloc_cpuid(&eax, &ebx, &ecx, &edx);
+          printf("highest cpuid %x\n", eax);
+          return 0;
+        }
+      ]])],
+      [AC_MSG_RESULT([yes])
+       AC_DEFINE(HWLOC_HAVE_CPUID, 1, [Define to 1 if you have cpuid])
+       hwloc_have_cpuid=yes],
+      [AC_MSG_RESULT([no])])
+    CPPFLAGS="$old_CPPFLAGS"
+
+    # Always generate these files
+    AC_CONFIG_FILES(
+        hwloc_config_prefix[Makefile]
+        hwloc_config_prefix[include/Makefile]
+        hwloc_config_prefix[src/Makefile ]
+    )
+
+    # Cleanup
+    AC_LANG_POP
+
+    # Success
+    $2
+])dnl
+
+#-----------------------------------------------------------------------
+
+# Specify the symbol prefix
+AC_DEFUN([HWLOC_SET_SYMBOL_PREFIX],[
+    hwloc_symbol_prefix_value=$1
+])dnl
+
+#-----------------------------------------------------------------------
+
+# This must be a standalone routine so that it can be called both by
+# HWLOC_INIT and an external caller (if HWLOC_INIT is not invoked).
+AC_DEFUN([HWLOC_DO_AM_CONDITIONALS],[
+    AS_IF([test "$hwloc_did_am_conditionals" != "yes"],[
+        AM_CONDITIONAL([HWLOC_BUILD_STANDALONE], [test "$hwloc_mode" = "standalone"])
+
+        AM_CONDITIONAL([HWLOC_HAVE_GCC], [test "x$GCC" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_MS_LIB], [test "x$HWLOC_MS_LIB" != "x"])
+        AM_CONDITIONAL([HWLOC_HAVE_OPENAT], [test "x$hwloc_have_openat" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_LINUX_LIBNUMA],
+                       [test "x$hwloc_have_linux_libnuma" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_SCHED_SETAFFINITY],
+                       [test "x$hwloc_have_sched_setaffinity" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_LIBIBVERBS], 
+                       [test "x$hwloc_have_libibverbs" = "xyes"])
+	AM_CONDITIONAL([HWLOC_HAVE_CUDA],
+		       [test "x$hwloc_have_cuda" = "xyes"])
+	AM_CONDITIONAL([HWLOC_HAVE_MYRIEXPRESS],
+		       [test "x$hwloc_have_myriexpress" = "xyes"])
+	AM_CONDITIONAL([HWLOC_HAVE_CUDART],
+		       [test "x$hwloc_have_cudart" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_CAIRO], [test "x$enable_cairo" != "xno"])
+        AM_CONDITIONAL([HWLOC_HAVE_LIBPCI], [test "$hwloc_pci_happy" = "yes"])
+        AM_CONDITIONAL([HWLOC_HAVE_SET_MEMPOLICY], [test "x$enable_set_mempolicy" != "xno"])
+        AM_CONDITIONAL([HWLOC_HAVE_MBIND], [test "x$enable_mbind" != "xno"])
+        AM_CONDITIONAL([HWLOC_HAVE_BUNZIPP], [test "x$BUNZIPP" != "xfalse"])
+
+        AM_CONDITIONAL([HWLOC_BUILD_DOXYGEN],
+                       [test "x$hwloc_generate_doxs" = "xyes"])
+        AM_CONDITIONAL([HWLOC_BUILD_README], 
+                       [test "x$hwloc_generate_readme" = "xyes" -a \( "x$hwloc_install_doxs" = "xyes" -o "x$hwloc_generate_doxs" = "xyes" \) ])
+        AM_CONDITIONAL([HWLOC_INSTALL_DOXYGEN], 
+                       [test "x$hwloc_install_doxs" = "xyes"])
+
+        AM_CONDITIONAL([HWLOC_HAVE_LINUX], [test "x$hwloc_linux" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_IRIX], [test "x$hwloc_irix" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_DARWIN], [test "x$hwloc_darwin" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_FREEBSD], [test "x$hwloc_freebsd" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_SOLARIS], [test "x$hwloc_solaris" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_AIX], [test "x$hwloc_aix" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_OSF], [test "x$hwloc_osf" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_HPUX], [test "x$hwloc_hpux" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_WINDOWS], [test "x$hwloc_windows" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_MINGW32], [test "x$target_os" = "xmingw32"])
+
+        AM_CONDITIONAL([HWLOC_HAVE_X86_32], [test "x$hwloc_x86_32" = "xyes"])
+        AM_CONDITIONAL([HWLOC_HAVE_X86_64], [test "x$hwloc_x86_64" = "xyes"])
+        AM_CONDITIONAL([HWLOC_DOXYGEN_BROKEN_SHORT_NAMES], [test "$HWLOC_DOXYGEN_VERSION" = "1.6.2"])
+        AM_CONDITIONAL([HWLOC_HAVE_CPUID], [test "x$hwloc_have_cpuid" = "xyes"])
+        AM_CONDITIONAL([HWLOC_BUILD_UTILS], [test "$hwloc_build_utils" = "yes"])
+        AM_CONDITIONAL([HWLOC_BUILD_TESTS], [test "$hwloc_build_tests" = "yes"])
+    ])
+    hwloc_did_am_conditionals=yes
+])dnl
+
+#-----------------------------------------------------------------------
+
+AC_DEFUN([_HWLOC_CHECK_DIFF_U], [
+  AC_MSG_CHECKING([whether diff accepts -u])
+  if diff -u /dev/null /dev/null 2> /dev/null
+  then
+    HWLOC_DIFF_U="-u"
+  else
+    HWLOC_DIFF_U=""
+  fi
+  AC_SUBST([HWLOC_DIFF_U])
+  AC_MSG_RESULT([$HWLOC_DIFF_U])
+])
+
+AC_DEFUN([_HWLOC_CHECK_DIFF_W], [
+  AC_MSG_CHECKING([whether diff accepts -w])
+  if diff -w /dev/null /dev/null 2> /dev/null
+  then
+    HWLOC_DIFF_W="-w"
+  else
+    HWLOC_DIFF_W=""
+  fi
+  AC_SUBST([HWLOC_DIFF_W])
+  AC_MSG_RESULT([$HWLOC_DIFF_W])
+])
+
+#-----------------------------------------------------------------------
+
+dnl HWLOC_CHECK_DECL
+dnl
+dnl Check declaration of given function by trying to call it with an insane
+dnl number of arguments (10). Success means the compiler couldn't really check.
+AC_DEFUN([_HWLOC_CHECK_DECL], [
+  AC_MSG_CHECKING([whether function $1 is declared])
+  AC_REQUIRE([AC_PROG_CC])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT([$4])],[$1(1,2,3,4,5,6,7,8,9,10);])],
+    [AC_MSG_RESULT([no])
+     $3],
+    [AC_MSG_RESULT([yes])
+     $2]
+  )
+])
+
+#-----------------------------------------------------------------------
+
+dnl HWLOC_CHECK_DECLS
+dnl
+dnl Same as HWLOCK_CHECK_DECL, but defines HAVE_DECL_foo to 1 or 0 depending on
+dnl the result.
+AC_DEFUN([_HWLOC_CHECK_DECLS], [
+  HWLOC_CHECK_DECL([$1], [ac_have_decl=1], [ac_have_decl=0], [$4])
+  AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_DECL_$1]), [$ac_have_decl],
+    [Define to 1 if you have the declaration of `$1', and to 0 if you don't])
+])
+

opal/mca/hwloc/hwloc131/hwloc/config/hwloc_check_attributes.m4

@@ -0,0 +1,533 @@
+# This macro set originally copied from Open MPI:
+# Copyright (c) 2004-2007 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2007 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# and renamed for hwloc:
+# Copyright (c) 2009 INRIA.  All rights reserved.
+# Copyright (c) 2009 Université Bordeaux 1
+# Copyright (c) 2010 Cisco Systems, Inc.  All rights reserved.
+# See COPYING in top-level directory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# 
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer listed
+#   in this license in the documentation and/or other materials
+#   provided with the distribution.
+# 
+# - Neither the name of the copyright holders nor the names of its
+#   contributors may be used to endorse or promote products derived from
+#   this software without specific prior written permission.
+# 
+# The copyright holders provide no reassurances that the source code
+# provided does not infringe any patent, copyright, or any other
+# intellectual property rights of third parties.  The copyright holders
+# disclaim any liability to any recipient for claims brought against
+# recipient by any third party for infringement of that parties
+# intellectual property rights.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+#
+# Search the generated warnings for 
+# keywords regarding skipping or ignoring certain attributes
+#   Intel: ignore
+#   Sun C++: skip
+#
+AC_DEFUN([_HWLOC_ATTRIBUTE_FAIL_SEARCH],[
+    # Be safe for systems that have ancient Autoconf's (e.g., RHEL5)
+    m4_ifdef([AC_PROG_GREP], 
+             [AC_REQUIRE([AC_PROG_GREP])],
+             [GREP=grep])
+
+    if test -s conftest.err ; then
+        for i in ignore skip ; do
+            $GREP -iq $i conftest.err
+            if test "$?" = "0" ; then
+                hwloc_cv___attribute__[$1]=0
+                break;
+            fi
+        done
+    fi
+])
+
+#
+# HWLOC: Remove C++ compiler check.  It can result in a circular
+# dependency in embedded situations.
+#
+# Check for one specific attribute by compiling with C
+# and possibly using a cross-check.
+#
+# If the cross-check is defined, a static function "usage" should be
+# defined, which is to be called from main (to circumvent warnings
+# regarding unused function in main file)
+#       static int usage (int * argument);
+#
+# The last argument is for specific CFLAGS, that need to be set 
+# for the compiler to generate a warning on the cross-check.
+# This may need adaption for future compilers / CFLAG-settings.
+#
+AC_DEFUN([_HWLOC_CHECK_SPECIFIC_ATTRIBUTE], [
+    AC_MSG_CHECKING([for __attribute__([$1])])
+    AC_CACHE_VAL(hwloc_cv___attribute__[$1], [
+        #
+        # Try to compile using the C compiler
+        #
+        AC_TRY_COMPILE([$2],[],
+                       [
+                        #
+                        # In case we did succeed: Fine, but was this due to the
+                        # attribute being ignored/skipped? Grep for IgNoRe/skip in conftest.err
+                        # and if found, reset the hwloc_cv__attribute__var=0
+                        #
+                        hwloc_cv___attribute__[$1]=1
+                        _HWLOC_ATTRIBUTE_FAIL_SEARCH([$1])
+                       ],
+                       [hwloc_cv___attribute__[$1]=0])
+        
+        #
+        # If the attribute is supported by both compilers,
+        # try to recompile a *cross-check*, IFF defined.
+        #
+        if test '(' "$hwloc_cv___attribute__[$1]" = "1" -a "[$3]" != "" ')' ; then
+            ac_c_werror_flag_safe=$ac_c_werror_flag
+            ac_c_werror_flag="yes"
+            CFLAGS_safe=$CFLAGS
+            CFLAGS="$CFLAGS [$4]"
+
+            AC_TRY_COMPILE([$3],
+                [
+                 int i=4711;
+                 i=usage(&i);
+                ],
+                [hwloc_cv___attribute__[$1]=0],
+                [
+                 #
+                 # In case we did NOT succeed: Fine, but was this due to the
+                 # attribute being ignored? Grep for IgNoRe in conftest.err
+                 # and if found, reset the hwloc_cv__attribute__var=0
+                 #
+                 hwloc_cv___attribute__[$1]=1
+                 _HWLOC_ATTRIBUTE_FAIL_SEARCH([$1])
+                ])
+
+            ac_c_werror_flag=$ac_c_werror_flag_safe
+            CFLAGS=$CFLAGS_safe
+        fi
+    ])
+
+    if test "$hwloc_cv___attribute__[$1]" = "1" ; then
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+    fi
+])
+
+
+#
+# Test the availability of __attribute__ and with the help
+# of _HWLOC_CHECK_SPECIFIC_ATTRIBUTE for the support of
+# particular attributes. Compilers, that do not support an
+# attribute most often fail with a warning (when the warning
+# level is set).
+# The compilers output is parsed in _HWLOC_ATTRIBUTE_FAIL_SEARCH
+# 
+# To add a new attributes __NAME__ add the
+#   hwloc_cv___attribute__NAME
+# add a new check with _HWLOC_CHECK_SPECIFIC_ATTRIBUTE (possibly with a cross-check)
+#   _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([name], [int foo (int arg) __attribute__ ((__name__));], [], [])
+# and define the corresponding
+#   AC_DEFINE_UNQUOTED(_HWLOC_HAVE_ATTRIBUTE_NAME, [$hwloc_cv___attribute__NAME],
+#                      [Whether your compiler has __attribute__ NAME or not])
+# and decide on a correct macro (in opal/include/opal_config_bottom.h):
+#  #  define __opal_attribute_NAME(x)  __attribute__(__NAME__)
+#
+# Please use the "__"-notation of the attribute in order not to
+# clash with predefined names or macros (e.g. const, which some compilers
+# do not like..)
+#
+
+
+AC_DEFUN([_HWLOC_CHECK_ATTRIBUTES], [
+  AC_MSG_CHECKING(for __attribute__)
+
+  AC_CACHE_VAL(hwloc_cv___attribute__, [
+    AC_TRY_COMPILE(
+      [#include <stdlib.h>
+       /* Check for the longest available __attribute__ (since gcc-2.3) */
+       struct foo {
+           char a;
+           int x[2] __attribute__ ((__packed__));
+        };
+      ],
+      [],
+      [hwloc_cv___attribute__=1],
+      [hwloc_cv___attribute__=0],
+    )
+
+    if test "$hwloc_cv___attribute__" = "1" ; then
+        AC_TRY_COMPILE(
+          [#include <stdlib.h>
+           /* Check for the longest available __attribute__ (since gcc-2.3) */
+           struct foo {
+               char a;
+               int x[2] __attribute__ ((__packed__));
+            };
+          ],
+          [],
+          [hwloc_cv___attribute__=1],
+          [hwloc_cv___attribute__=0],
+        )
+    fi
+    ])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE, [$hwloc_cv___attribute__],
+                     [Whether your compiler has __attribute__ or not])
+
+#
+# Now that we know the compiler support __attribute__ let's check which kind of
+# attributed are supported.
+#
+  if test "$hwloc_cv___attribute__" = "0" ; then
+    AC_MSG_RESULT([no])
+    hwloc_cv___attribute__aligned=0
+    hwloc_cv___attribute__always_inline=0
+    hwloc_cv___attribute__cold=0
+    hwloc_cv___attribute__const=0
+    hwloc_cv___attribute__deprecated=0
+    hwloc_cv___attribute__format=0
+    hwloc_cv___attribute__hot=0
+    hwloc_cv___attribute__malloc=0
+    hwloc_cv___attribute__may_alias=0
+    hwloc_cv___attribute__no_instrument_function=0
+    hwloc_cv___attribute__nonnull=0
+    hwloc_cv___attribute__noreturn=0
+    hwloc_cv___attribute__packed=0
+    hwloc_cv___attribute__pure=0
+    hwloc_cv___attribute__sentinel=0
+    hwloc_cv___attribute__unused=0
+    hwloc_cv___attribute__warn_unused_result=0
+    hwloc_cv___attribute__weak_alias=0
+  else
+    AC_MSG_RESULT([yes])
+
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([aligned],
+        [struct foo { char text[4]; }  __attribute__ ((__aligned__(8)));],
+        [],
+        [])
+
+    #
+    # Ignored by PGI-6.2.5; -- recognized by output-parser
+    #
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([always_inline],
+        [int foo (int arg) __attribute__ ((__always_inline__));],
+        [],
+        [])
+
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([cold],
+        [
+         int foo(int arg1, int arg2) __attribute__ ((__cold__));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+        ],
+        [],
+        [])
+
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([const],
+        [
+         int foo(int arg1, int arg2) __attribute__ ((__const__));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+        ],
+        [],
+        [])
+
+
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([deprecated],
+        [
+         int foo(int arg1, int arg2) __attribute__ ((__deprecated__));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+        ],
+        [],
+        [])
+
+
+    HWLOC_ATTRIBUTE_CFLAGS=
+    case "$hwloc_c_vendor" in
+        gnu)
+            HWLOC_ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we want specifically the warning on format string conversion
+            HWLOC_ATTRIBUTE_CFLAGS="-we181"
+            ;;
+    esac
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([format],
+        [
+         int this_printf (void *my_object, const char *my_format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
+        ],
+        [
+         static int usage (int * argument);
+         extern int this_printf (int arg1, const char *my_format, ...) __attribute__ ((__format__ (__printf__, 2, 3)));
+
+         static int usage (int * argument) {
+             return this_printf (*argument, "%d", argument); /* This should produce a format warning */
+         }
+         /* The autoconf-generated main-function is int main(), which produces a warning by itself */
+         int main(void);
+        ],
+        [$HWLOC_ATTRIBUTE_CFLAGS])
+
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([hot],
+        [
+         int foo(int arg1, int arg2) __attribute__ ((__hot__));
+         int foo(int arg1, int arg2) { return arg1 * arg2 + arg1; }
+        ],
+        [],
+        [])
+
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([malloc],
+        [
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
+         int * foo(int arg1) __attribute__ ((__malloc__));
+         int * foo(int arg1) { return (int*) malloc(arg1); }
+        ],
+        [],
+        [])
+
+
+    #
+    # Attribute may_alias: No suitable cross-check available, that works for non-supporting compilers
+    # Ignored by intel-9.1.045 -- turn off with -wd1292
+    # Ignored by PGI-6.2.5; ignore not detected due to missing cross-check
+    #
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([may_alias],
+        [int * p_value __attribute__ ((__may_alias__));],
+        [],
+        [])
+
+
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([no_instrument_function],
+        [int * foo(int arg1) __attribute__ ((__no_instrument_function__));],
+        [],
+        [])
+
+
+    #
+    # Attribute nonnull:
+    # Ignored by intel-compiler 9.1.045 -- recognized by cross-check
+    # Ignored by PGI-6.2.5 (pgCC) -- recognized by cross-check
+    #
+    HWLOC_ATTRIBUTE_CFLAGS=
+    case "$hwloc_c_vendor" in
+        gnu)
+            HWLOC_ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we do not want to get ignored attributes warnings, but rather real warnings
+            HWLOC_ATTRIBUTE_CFLAGS="-wd1292"
+            ;;
+    esac
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([nonnull],
+        [
+         int square(int *arg) __attribute__ ((__nonnull__));
+         int square(int *arg) { return *arg; }
+        ],
+        [
+         static int usage(int * argument);
+         int square(int * argument) __attribute__ ((__nonnull__));
+         int square(int * argument) { return (*argument) * (*argument); }
+
+         static int usage(int * argument) {
+             return square( ((void*)0) );    /* This should produce an argument must be nonnull warning */
+         }
+         /* The autoconf-generated main-function is int main(), which produces a warning by itself */
+         int main(void);
+        ],
+        [$HWLOC_ATTRIBUTE_CFLAGS])
+
+
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([noreturn],
+        [
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif
+         void fatal(int arg1) __attribute__ ((__noreturn__));
+         void fatal(int arg1) { exit(arg1); }
+        ],
+        [],
+        [])
+
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([packed],
+        [
+         struct foo {
+             char a;
+             int x[2] __attribute__ ((__packed__));
+         };
+        ],
+        [],
+        [])
+
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([pure],
+        [
+         int square(int arg) __attribute__ ((__pure__));
+         int square(int arg) { return arg * arg; }
+        ],
+        [],
+        [])
+
+    #
+    # Attribute sentinel:
+    # Ignored by the intel-9.1.045 -- recognized by cross-check
+    #                intel-10.0beta works fine
+    # Ignored by PGI-6.2.5 (pgCC) -- recognized by output-parser and cross-check
+    # Ignored by pathcc-2.2.1 -- recognized by cross-check (through grep ignore)
+    #
+    HWLOC_ATTRIBUTE_CFLAGS=
+    case "$hwloc_c_vendor" in
+        gnu)
+            HWLOC_ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we do not want to get ignored attributes warnings
+            HWLOC_ATTRIBUTE_CFLAGS="-wd1292"
+            ;;
+    esac
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([sentinel],
+        [
+         int my_execlp(const char * file, const char *arg, ...) __attribute__ ((__sentinel__));
+        ],
+        [
+         static int usage(int * argument);
+         int my_execlp(const char * file, const char *arg, ...) __attribute__ ((__sentinel__));
+
+         static int usage(int * argument) {
+             void * last_arg_should_be_null = argument;
+             return my_execlp ("lala", "/home/there", last_arg_should_be_null);   /* This should produce a warning */
+         }
+         /* The autoconf-generated main-function is int main(), which produces a warning by itself */
+         int main(void);
+        ],
+        [$HWLOC_ATTRIBUTE_CFLAGS])
+
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([unused],
+        [
+         int square(int arg1 __attribute__ ((__unused__)), int arg2);
+         int square(int arg1, int arg2) { return arg2; }
+        ],
+        [],
+        [])
+
+
+    #
+    # Attribute warn_unused_result:
+    # Ignored by the intel-compiler 9.1.045 -- recognized by cross-check
+    # Ignored by pathcc-2.2.1 -- recognized by cross-check (through grep ignore)
+    #
+    HWLOC_ATTRIBUTE_CFLAGS=
+    case "$hwloc_c_vendor" in
+        gnu)
+            HWLOC_ATTRIBUTE_CFLAGS="-Wall"
+            ;;
+        intel)
+            # we do not want to get ignored attributes warnings
+            HWLOC_ATTRIBUTE_CFLAGS="-wd1292"
+            ;;
+    esac
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([warn_unused_result],
+        [
+         int foo(int arg) __attribute__ ((__warn_unused_result__));
+         int foo(int arg) { return arg + 3; }
+        ],
+        [
+         static int usage(int * argument);
+         int foo(int arg) __attribute__ ((__warn_unused_result__));
+
+         int foo(int arg) { return arg + 3; }
+         static int usage(int * argument) {
+           foo (*argument);        /* Should produce an unused result warning */
+           return 0;
+         }
+
+         /* The autoconf-generated main-function is int main(), which produces a warning by itself */
+         int main(void);
+        ],
+        [$HWLOC_ATTRIBUTE_CFLAGS])
+
+
+    _HWLOC_CHECK_SPECIFIC_ATTRIBUTE([weak_alias],
+        [
+         int foo(int arg);
+         int foo(int arg) { return arg + 3; }
+         int foo2(int arg) __attribute__ ((__weak__, __alias__("foo")));
+        ],
+        [],
+        [])
+
+  fi
+
+  # Now that all the values are set, define them
+
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_ALIGNED, [$hwloc_cv___attribute__aligned],
+                     [Whether your compiler has __attribute__ aligned or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_ALWAYS_INLINE, [$hwloc_cv___attribute__always_inline],
+                     [Whether your compiler has __attribute__ always_inline or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_COLD, [$hwloc_cv___attribute__cold],
+                     [Whether your compiler has __attribute__ cold or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_CONST, [$hwloc_cv___attribute__const],
+                     [Whether your compiler has __attribute__ const or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_DEPRECATED, [$hwloc_cv___attribute__deprecated],
+                     [Whether your compiler has __attribute__ deprecated or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_FORMAT, [$hwloc_cv___attribute__format],
+                     [Whether your compiler has __attribute__ format or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_HOT, [$hwloc_cv___attribute__hot],
+                     [Whether your compiler has __attribute__ hot or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_MALLOC, [$hwloc_cv___attribute__malloc],
+                     [Whether your compiler has __attribute__ malloc or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_MAY_ALIAS, [$hwloc_cv___attribute__may_alias],
+                     [Whether your compiler has __attribute__ may_alias or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION, [$hwloc_cv___attribute__no_instrument_function],
+                     [Whether your compiler has __attribute__ no_instrument_function or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_NONNULL, [$hwloc_cv___attribute__nonnull],
+                     [Whether your compiler has __attribute__ nonnull or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_NORETURN, [$hwloc_cv___attribute__noreturn],
+                     [Whether your compiler has __attribute__ noreturn or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_PACKED, [$hwloc_cv___attribute__packed],
+                     [Whether your compiler has __attribute__ packed or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_PURE, [$hwloc_cv___attribute__pure],
+                     [Whether your compiler has __attribute__ pure or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_SENTINEL, [$hwloc_cv___attribute__sentinel],
+                     [Whether your compiler has __attribute__ sentinel or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_UNUSED, [$hwloc_cv___attribute__unused],
+                     [Whether your compiler has __attribute__ unused or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT, [$hwloc_cv___attribute__warn_unused_result],
+                     [Whether your compiler has __attribute__ warn unused result or not])
+  AC_DEFINE_UNQUOTED(HWLOC_HAVE_ATTRIBUTE_WEAK_ALIAS, [$hwloc_cv___attribute__weak_alias],
+                     [Whether your compiler has __attribute__ weak alias or not])
+])
+

opal/mca/hwloc/hwloc131/hwloc/config/hwloc_check_visibility.m4

@@ -0,0 +1,147 @@
+# This macro set originally copied from Open MPI:
+# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2007 High Performance Computing Center Stuttgart, 
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright (c) 2006-2007 Cisco Systems, Inc.  All rights reserved.
+# and renamed/modified for hwloc:
+# Copyright (c) 2009 INRIA.  All rights reserved.
+# Copyright (c) 2009-2010 Université Bordeaux 1
+# Copyright (c) 2010-2011 Cisco Systems, Inc.  All rights reserved.
+# See COPYING in top-level directory.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+# 
+# - Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+# 
+# - Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer listed
+#   in this license in the documentation and/or other materials
+#   provided with the distribution.
+# 
+# - Neither the name of the copyright holders nor the names of its
+#   contributors may be used to endorse or promote products derived from
+#   this software without specific prior written permission.
+# 
+# The copyright holders provide no reassurances that the source code
+# provided does not infringe any patent, copyright, or any other
+# intellectual property rights of third parties.  The copyright holders
+# disclaim any liability to any recipient for claims brought against
+# recipient by any third party for infringement of that parties
+# intellectual property rights.
+# 
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+# _HWLOC_CHECK_VISIBILITY
+# --------------------------------------------------------
+AC_DEFUN([_HWLOC_CHECK_VISIBILITY],[
+    # Be safe for systems that have ancient Autoconf's (e.g., RHEL5)
+    m4_ifdef([AC_PROG_GREP], 
+             [AC_REQUIRE([AC_PROG_GREP])],
+             [GREP=grep])
+
+    # Check if the compiler has support for visibility, like some
+    # versions of gcc, icc, Sun Studio cc.
+    AC_ARG_ENABLE(visibility, 
+        AC_HELP_STRING([--enable-visibility],
+            [enable visibility feature of certain compilers/linkers (default: enabled on platforms that support it)]))
+
+    case ${target} in
+        *-*-aix*|*-*-mingw*|*-*-cygwin*|*-*-hpux*)
+            enable_visibility=no
+            ;;
+    esac
+
+    hwloc_visibility_define=0
+    hwloc_msg="whether to enable symbol visibility"
+    if test "$enable_visibility" = "no"; then
+        AC_MSG_CHECKING([$hwloc_msg])
+        AC_MSG_RESULT([no (disabled)]) 
+    else
+        CFLAGS_orig=$CFLAGS
+
+        hwloc_add=
+        case "$hwloc_c_vendor" in
+        sun)
+            # Check using Sun Studio -xldscope=hidden flag
+            hwloc_add=-xldscope=hidden
+            CFLAGS="$CFLAGS_orig $hwloc_add"
+
+            AC_MSG_CHECKING([if $CC supports -xldscope])
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+                __attribute__((visibility("default"))) int foo;
+                ]],[[int i;]])],
+                [],
+                [AS_IF([test -s conftest.err],
+                       [$GREP -iq visibility conftest.err
+                        # If we find "visibility" in the stderr, then
+                        # assume it doesn't work
+                        AS_IF([test "$?" = "0"], [hwloc_add=])])
+                ])
+            AS_IF([test "$hwloc_add" = ""],
+                  [AC_MSG_RESULT([no])],
+                  [AC_MSG_RESULT([yes])])
+            ;;
+
+        *)
+            # Check using -fvisibility=hidden
+            hwloc_add=-fvisibility=hidden
+	    CFLAGS="$CFLAGS_orig $hwloc_add"
+
+            AC_MSG_CHECKING([if $CC supports -fvisibility])
+            AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+                __attribute__((visibility("default"))) int foo;
+                ]],[[int i;]])],
+                [],
+                [AS_IF([test -s conftest.err],
+                       [$GREP -iq visibility conftest.err
+                        # If we find "visibility" in the stderr, then
+                        # assume it doesn't work
+                        AS_IF([test "$?" = "0"], [hwloc_add=])])
+                ])
+            AS_IF([test "$hwloc_add" = ""],
+                  [AC_MSG_RESULT([no])],
+                  [AC_MSG_RESULT([yes])])
+            ;;
+
+        esac
+
+        CFLAGS=$CFLAGS_orig
+        HWLOC_VISIBILITY_CFLAGS=$hwloc_add
+
+        if test "$hwloc_add" != "" ; then
+            hwloc_visibility_define=1
+            AC_MSG_CHECKING([$hwloc_msg])
+            AC_MSG_RESULT([yes (via $hwloc_add)]) 
+        elif test "$enable_visibility" = "yes"; then
+            AC_MSG_ERROR([Symbol visibility support requested but compiler does not seem to support it.  Aborting])
+        else 
+            AC_MSG_CHECKING([$hwloc_msg])
+            AC_MSG_RESULT([no (unsupported)]) 
+        fi
+        unset hwloc_add 
+    fi
+
+    AC_DEFINE_UNQUOTED([HWLOC_C_HAVE_VISIBILITY], [$hwloc_visibility_define],
+            [Whether C compiler supports symbol visibility or not])
+])

opal/mca/hwloc/hwloc131/hwloc/config/hwloc_get_version.sh

@@ -0,0 +1,173 @@
+#!/bin/sh
+#
+# hwloc_get_version is created from hwloc_get_version.m4 and hwloc_get_version.m4sh.
+#
+# Copyright (c) 2004-2006 The Trustees of Indiana University and Indiana
+#                         University Research and Technology
+#                         Corporation.  All rights reserved.
+# Copyright (c) 2004-2005 The University of Tennessee and The University
+#                         of Tennessee Research Foundation.  All rights
+#                         reserved.
+# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
+#                         University of Stuttgart.  All rights reserved.
+# Copyright (c) 2004-2005 The Regents of the University of California.
+#                         All rights reserved.
+# Copyright © 2008-2010 Cisco Systems, Inc.  All rights reserved.
+# $COPYRIGHT$
+#
+# Additional copyrights may follow
+#
+# $HEADER$
+#
+
+# 11 September 2009: this file was copied from PLPA's SVN trunk as of
+# r251 on 11 September 2009.  The only change made to it was
+# s/PLPA/hwloc/ig.
+
+
+# HWLOC_GET_VERSION(version_file, variable_prefix)
+# -----------------------------------------------
+# parse version_file for version information, setting
+# the following shell variables:
+#
+#  prefix_VERSION
+#  prefix_BASE_VERSION
+#  prefix_MAJOR_VERSION
+#  prefix_MINOR_VERSION
+#  prefix_RELEASE_VERSION
+#  prefix_GREEK_VERSION
+#  prefix_WANT_REPO_REV
+#  prefix_REPO_REV
+#  prefix_RELEASE_DATE
+
+
+
+srcfile="$1"
+option="$2"
+
+case "$option" in
+    # svnversion can take a while to run.  If we don't need it, don't run it.
+    --major|--minor|--release|--greek|--base|--help)
+        ompi_ver_need_repo_rev=0
+        ;;
+    *)
+        ompi_ver_need_repo_rev=1
+esac
+
+
+if test -z "$srcfile"; then
+    option="--help"
+else
+
+    : ${ompi_ver_need_repo_rev=1}
+    : ${srcdir=.}
+    : ${svnversion_result=-1}
+
+        if test -f "$srcfile"; then
+        ompi_vers=`sed -n "
+	t clear
+	: clear
+	s/^major/HWLOC_MAJOR_VERSION/
+	s/^minor/HWLOC_MINOR_VERSION/
+	s/^release/HWLOC_RELEASE_VERSION/
+	s/^greek/HWLOC_GREEK_VERSION/
+	s/^want_repo_rev/HWLOC_WANT_REPO_REV/
+	s/^repo_rev/HWLOC_REPO_REV/
+	s/^date/HWLOC_RELEASE_DATE/
+	t print
+	b
+	: print
+	p" < "$srcfile"`
+	eval "$ompi_vers"
+
+        # Only print release version if it isn't 0
+        if test $HWLOC_RELEASE_VERSION -ne 0 ; then
+            HWLOC_VERSION="$HWLOC_MAJOR_VERSION.$HWLOC_MINOR_VERSION.$HWLOC_RELEASE_VERSION"
+        else
+            HWLOC_VERSION="$HWLOC_MAJOR_VERSION.$HWLOC_MINOR_VERSION"
+        fi
+        HWLOC_VERSION="${HWLOC_VERSION}${HWLOC_GREEK_VERSION}"
+        HWLOC_BASE_VERSION=$HWLOC_VERSION
+
+        if test $HWLOC_WANT_REPO_REV -eq 1 && test $ompi_ver_need_repo_rev -eq 1 ; then
+            if test "$svnversion_result" != "-1" ; then
+                HWLOC_REPO_REV=$svnversion_result
+            fi
+            if test "$HWLOC_REPO_REV" = "-1" ; then
+
+                if test -d "$srcdir/.svn" ; then
+                    HWLOC_REPO_REV=r`svnversion "$srcdir"`
+                elif test -d "$srcdir/.hg" ; then
+                    HWLOC_REPO_REV=hg`hg -v -R "$srcdir" tip | grep changeset | cut -d: -f3`
+                elif test -d "$srcdir/.git" ; then
+                    HWLOC_REPO_REV=git`git log -1 "$srcdir" | grep commit | awk '{ print $2 }'`
+                fi
+                if test "HWLOC_REPO_REV" = ""; then
+                    HWLOC_REPO_REV=date`date '+%m%d%Y'`
+                fi
+
+            fi
+            HWLOC_VERSION="${HWLOC_VERSION}${HWLOC_REPO_REV}"
+        fi
+    fi
+
+
+    if test "$option" = ""; then
+	option="--full"
+    fi
+fi
+
+case "$option" in
+    --full|-v|--version)
+	echo $HWLOC_VERSION
+	;;
+    --major)
+	echo $HWLOC_MAJOR_VERSION
+	;;
+    --minor)
+	echo $HWLOC_MINOR_VERSION
+	;;
+    --release)
+	echo $HWLOC_RELEASE_VERSION
+	;;
+    --greek)
+	echo $HWLOC_GREEK_VERSION
+	;;
+    --repo-rev)
+	echo $HWLOC_REPO_REV
+	;;
+    --base)
+        echo $HWLOC_BASE_VERSION
+        ;;
+    --release-date)
+        echo $HWLOC_RELEASE_DATE
+        ;;
+    --all)
+        echo ${HWLOC_VERSION} ${HWLOC_MAJOR_VERSION} ${HWLOC_MINOR_VERSION} ${HWLOC_RELEASE_VERSION} ${HWLOC_GREEK_VERSION} ${HWLOC_REPO_REV}
+        ;;
+    -h|--help)
+	cat <<EOF
+$0 <srcfile> <option>
+
+<srcfile> - Text version file
+<option>  - One of:
+    --full         - Full version number
+    --major        - Major version number
+    --minor        - Minor version number
+    --release      - Release version number
+    --greek        - Greek (alpha, beta, etc) version number
+    --repo-rev     - Repository version number
+    --all          - Show all version numbers, separated by :
+    --base         - Show base version number (no repo version number)
+    --release-date - Show the release date
+    --help         - This message
+EOF
+        ;;
+    *)
+        echo "Unrecognized option $option.  Run $0 --help for options"
+        ;;
+esac
+
+# All done
+
+exit 0

opal/mca/hwloc/hwloc131/hwloc/config/hwloc_internal.m4

@@ -0,0 +1,418 @@
+dnl -*- Autoconf -*-
+dnl
+dnl Copyright (c) 2009 INRIA.  All rights reserved.
+dnl Copyright (c) 2009, 2011 Université Bordeaux 1
+dnl Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
+dnl                         University Research and Technology
+dnl                         Corporation.  All rights reserved.
+dnl Copyright (c) 2004-2005 The Regents of the University of California.
+dnl                         All rights reserved.
+dnl Copyright (c) 2004-2008 High Performance Computing Center Stuttgart, 
+dnl                         University of Stuttgart.  All rights reserved.
+dnl Copyright ©  2010 INRIA.  All rights reserved.
+dnl Copyright © 2006-2011 Cisco Systems, Inc.  All rights reserved.
+dnl
+dnl See COPYING in top-level directory.
+
+#-----------------------------------------------------------------------
+
+# Probably only ever invoked by hwloc's configure.ac
+AC_DEFUN([HWLOC_BUILD_STANDALONE],[
+    hwloc_mode=standalone
+])dnl
+
+#-----------------------------------------------------------------------
+
+# Probably only ever invoked by hwloc's configure.ac
+AC_DEFUN([HWLOC_DEFINE_ARGS],[
+    # Embedded mode, or standalone?
+    AC_ARG_ENABLE([embedded-mode],
+                    AC_HELP_STRING([--enable-embedded-mode],
+                                   [Using --enable-embedded-mode puts the HWLOC into "embedded" mode.  The default is --disable-embedded-mode, meaning that the HWLOC is in "standalone" mode.]))
+
+    # Change the symbol prefix?
+    AC_ARG_WITH([hwloc-symbol-prefix],
+                AC_HELP_STRING([--with-hwloc-symbol-prefix=STRING],
+                               [STRING can be any valid C symbol name.  It will be prefixed to all public HWLOC symbols.  Default: "hwloc_"]))
+
+    # Debug mode?
+    AC_ARG_ENABLE([debug],
+                  AC_HELP_STRING([--enable-debug],
+                                 [Using --enable-debug enables various hwloc maintainer-level debugging controls.  This option is not recomended for end users.]))
+
+    # Doxygen?
+    AC_ARG_ENABLE([doxygen],
+        [AC_HELP_STRING([--enable-doxygen],
+                        [enable support for building Doxygen documentation (note that this option is ONLY relevant in developer builds; Doxygen documentation is pre-built for tarball builds and this option is therefore ignored)])])
+
+    # Picky?
+    AC_ARG_ENABLE(picky,
+                  AC_HELP_STRING([--disable-picky],
+                                 [When in developer checkouts of hwloc and compiling with gcc, the default is to enable maximum compiler pickyness.  Using --disable-picky or --enable-picky overrides any default setting]))
+
+    # Cairo?
+    AC_ARG_ENABLE([cairo],
+                  AS_HELP_STRING([--disable-cairo], 
+                                 [Disable the Cairo back-end of hwloc's lstopo command]))
+
+    # XML using libxml2?
+    AC_ARG_ENABLE([libxml2],
+                  AS_HELP_STRING([--disable-libxml2], 
+		                 [Do not use libxml2 for XML support, use a custom minimalistic support]))
+
+    # PCI?
+    AC_ARG_ENABLE([pci],
+                  AS_HELP_STRING([--disable-pci],
+                                 [Disable the PCI device discovery using libpci]))
+
+    # Linux libnuma
+    AC_ARG_ENABLE([libnuma],
+                  AS_HELP_STRING([--disable-libnuma],
+                                 [Disable the Linux libnuma]))
+
+])dnl
+
+#-----------------------------------------------------------------------
+
+dnl We only build documentation if this is a developer checkout.
+dnl Distribution tarballs just install pre-built docuemntation that was
+dnl included in the tarball.
+
+# Probably only ever invoked by hwloc's configure.ac
+AC_DEFUN([HWLOC_SETUP_DOCS],[
+    cat <<EOF
+
+###
+### Configuring hwloc documentation
+###
+EOF
+
+    AC_MSG_CHECKING([if this is a developer build])
+    AS_IF([test ! -d "$srcdir/.svn" -a ! -d "$srcdir/.hg" -a ! -d "$srcdir/.git"],
+          [AC_MSG_RESULT([no (doxygen generation is optional)])],
+          [AC_MSG_RESULT([yes])])
+    
+    # Generating the doxygen output requires a few tools.  If we
+    # don't have all of them, refuse the build the docs.
+    AC_ARG_VAR([DOXYGEN], [Location of the doxygen program (required for building the hwloc doxygen documentation)])
+    AC_PATH_TOOL([DOXYGEN], [doxygen])
+    HWLOC_DOXYGEN_VERSION=`doxygen --version 2> /dev/null`
+    
+    AC_ARG_VAR([PDFLATEX], [Location of the pdflatex program (required for building the hwloc doxygen documentation)])
+    AC_PATH_TOOL([PDFLATEX], [pdflatex])
+    
+    AC_ARG_VAR([MAKEINDEX], [Location of the makeindex program (required for building the hwloc doxygen documentation)])
+    AC_PATH_TOOL([MAKEINDEX], [makeindex])
+    
+    AC_ARG_VAR([FIG2DEV], [Location of the fig2dev program (required for building the hwloc doxygen documentation)])
+    AC_PATH_TOOL([FIG2DEV], [fig2dev])
+    
+    AC_ARG_VAR([GS], [Location of the gs program (required for building the hwloc doxygen documentation)])
+    AC_PATH_TOOL([GS], [gs])
+
+    AC_ARG_VAR([EPSTOPDF], [Location of the epstopdf program (required for building the hwloc doxygen documentation)])
+    AC_PATH_TOOL([EPSTOPDF], [epstopdf])
+
+    AC_MSG_CHECKING([if can build doxygen docs])
+    AS_IF([test "x$DOXYGEN" != "x" -a "x$PDFLATEX" != "x" -a "x$MAKEINDEX" != "x" -a "x$FIG2DEV" != "x" -a "x$GS" != "x" -a "x$EPSTOPDF" != "x"],
+                 [hwloc_generate_doxs=yes], [hwloc_generate_doxs=no])
+    AC_MSG_RESULT([$hwloc_generate_doxs])
+    
+    # Linux and OS X take different sed arguments.
+    AC_PROG_SED
+    AC_MSG_CHECKING([if the sed -i option requires an argument])
+    rm -f conftest
+    cat > conftest <<EOF
+hello
+EOF
+    $SED -i -e s/hello/goodbye/ conftest 2> /dev/null
+    AS_IF([test -f conftest-e],
+          [SED_I="$SED -i ''"
+           AC_MSG_RESULT([yes])],
+          [SED_I="$SED -i"
+           AC_MSG_RESULT([no])])
+    rm -f conftest conftest-e
+    AC_SUBST([SED_I])
+
+    # Making the top-level README requires w3m or lynx.
+    AC_ARG_VAR([W3M], [Location of the w3m program (required to building the top-level hwloc README file)])
+    AC_PATH_TOOL([W3M], [w3m])
+    AC_ARG_VAR([LYNX], [Location of the lynx program (required to building the top-level hwloc README file)])
+    AC_PATH_TOOL([LYNX], [lynx])
+    
+    AC_MSG_CHECKING([if can build top-level README])
+    AS_IF([test "x$W3M" != "x"],
+          [hwloc_generate_readme=yes
+           HWLOC_W3_GENERATOR=$W3M],
+          [AS_IF([test "x$LYNX" != "x"],
+                 [hwloc_generate_readme=yes
+                  HWLOC_W3_GENERATOR="$LYNX -dump -nolist"],
+                 [hwloc_generate_readme=no])])
+    AC_SUBST(HWLOC_W3_GENERATOR)
+    AC_MSG_RESULT([$hwloc_generate_readme])
+    
+    # If any one of the above tools is missing, we will refuse to make dist.
+    AC_MSG_CHECKING([if will build doxygen docs])
+    AS_IF([test "x$hwloc_generate_doxs" = "xyes" -a "x$enable_doxygen" != "xno"],
+          [], [hwloc_generate_doxs=no])
+    AC_MSG_RESULT([$hwloc_generate_doxs])
+    
+    # See if we want to install the doxygen docs
+    AC_MSG_CHECKING([if will install doxygen docs])
+    AS_IF([test "x$hwloc_generate_doxs" = "xyes" -o \
+    	    -f "$srcdir/doc/doxygen-doc/man/man3/hwloc_distribute.3" -a \
+    	    -f "$srcdir/doc/doxygen-doc/hwloc-a4.pdf" -a \
+    	    -f "$srcdir/doc/doxygen-doc/hwloc-letter.pdf"],
+          [hwloc_install_doxs=yes],
+          [hwloc_install_doxs=no])
+    AC_MSG_RESULT([$hwloc_install_doxs])
+    
+    # For the common developer case, if we're in a developer checkout and
+    # using the GNU compilers, turn on maximum warnings unless
+    # specifically disabled by the user.
+    AC_MSG_CHECKING([whether to enable "picky" compiler mode])
+    hwloc_want_picky=0
+    AS_IF([test "$GCC" = "yes"],
+          [AS_IF([test -d "$srcdir/.svn" -o -d "$srcdir/.hg" -o -d "$srcdir/.git"],
+                 [hwloc_want_picky=1])])
+    if test "$enable_picky" = "yes"; then
+        if test "$GCC" = "yes"; then
+            AC_MSG_RESULT([yes])
+            hwloc_want_picky=1
+        else
+            AC_MSG_RESULT([no])
+            AC_MSG_WARN([Warning: --enable-picky used, but is currently only defined for the GCC compiler set -- automatically disabled])
+            hwloc_want_picky=0
+        fi
+    elif test "$enable_picky" = "no"; then
+        AC_MSG_RESULT([no])
+        hwloc_want_picky=0
+    else
+        if test "$hwloc_want_picky" = 1; then
+            AC_MSG_RESULT([yes (default)])
+        else
+            AC_MSG_RESULT([no (default)])
+        fi
+    fi
+    if test "$hwloc_want_picky" = 1; then
+        add="-Wall -Wunused-parameter -Wundef -Wno-long-long -Wsign-compare"
+        add="$add -Wmissing-prototypes -Wstrict-prototypes"
+        add="$add -Wcomment -pedantic"
+
+        CFLAGS="$CFLAGS $add"
+    fi
+
+    # Generate some files for the docs
+    AC_CONFIG_FILES(
+        hwloc_config_prefix[doc/Makefile]
+        hwloc_config_prefix[doc/doxygen-config.cfg])
+])
+
+#-----------------------------------------------------------------------
+
+# Probably only ever invoked by hwloc's configure.ac
+AC_DEFUN([HWLOC_SETUP_UTILS],[
+    cat <<EOF
+
+###
+### Configuring hwloc command line utilities
+###
+EOF
+
+    hwloc_build_utils=yes
+
+    # Cairo support
+    hwloc_cairo_happy=
+    if test "x$enable_cairo" != "xno"; then
+      HWLOC_PKG_CHECK_MODULES([CAIRO], [cairo], [cairo_fill],
+                              [hwloc_cairo_happy=yes],
+                              [hwloc_cairo_happy=no])
+      if test "x$hwloc_cairo_happy" = "xyes"; then
+        AC_PATH_XTRA
+	CFLAGS_save=$CFLAGS
+	LIBS_save=$LIBS
+
+	CFLAGS="$CFLAGS $X_CFLAGS"
+	LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
+        AC_CHECK_HEADERS([X11/Xlib.h], [
+          AC_CHECK_HEADERS([X11/Xutil.h X11/keysym.h], [
+            AC_CHECK_LIB([X11], [XOpenDisplay], [
+              enable_X11=yes
+              AC_SUBST([HWLOC_X11_LIBS], ["-lX11"])
+              AC_DEFINE([HWLOC_HAVE_X11], [1], [Define to 1 if X11 libraries are available.])
+            ])]
+          )],,
+          [[#include <X11/Xlib.h>]]
+        )
+        if test "x$enable_X11" != "xyes"; then
+          AC_MSG_WARN([X11 headers not found, Cairo/X11 back-end disabled])
+          hwloc_cairo_happy=no
+        fi
+
+	CFLAGS=$CFLAGS_save
+	LIBS=$LIBS_save
+      fi
+    fi
+    
+    if test "x$hwloc_cairo_happy" = "xyes"; then
+        AC_DEFINE([HWLOC_HAVE_CAIRO], [1], [Define to 1 if you have the `cairo' library.])
+    else
+        AS_IF([test "$enable_cairo" = "yes"],
+              [AC_MSG_WARN([--enable-cairo requested, but Cairo/X11 support was not found])
+               AC_MSG_ERROR([Cannot continue])])
+    fi
+
+    AC_CHECK_TYPES([wchar_t], [
+      AC_CHECK_FUNCS([putwc])
+    ], [], [[#include <wchar.h>]])
+
+    AC_CHECK_HEADERS([locale.h], [
+      AC_CHECK_FUNCS([setlocale])
+    ])
+    AC_CHECK_HEADERS([langinfo.h], [
+      AC_CHECK_FUNCS([nl_langinfo])
+    ])
+    hwloc_old_LIBS="$LIBS"
+    chosen_curses=""
+    for curses in ncurses curses
+    do
+      for lib in "" -ltermcap -l${curses}w -l$curses
+      do
+        AC_MSG_CHECKING(termcap support using $curses and $lib)
+        LIBS="$hwloc_old_LIBS $lib"
+        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+#include <$curses.h>
+#include <term.h>
+]], [[tparm(NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0)]])], [
+          AC_MSG_RESULT(yes)
+          AC_SUBST([HWLOC_TERMCAP_LIBS], ["$LIBS"])
+          AC_DEFINE([HWLOC_HAVE_LIBTERMCAP], [1],
+                    [Define to 1 if you have a library providing the termcap interface])
+          chosen_curses=$curses
+        ], [
+          AC_MSG_RESULT(no)
+        ])
+        test "x$chosen_curses" != "x" && break
+      done
+      test "x$chosen_curses" != "x" && break
+    done
+    if test "$chosen_curses" = ncurses
+    then
+      AC_DEFINE([HWLOC_USE_NCURSES], [1], [Define to 1 if ncurses works, preferred over curses])
+    fi
+    LIBS="$hwloc_old_LIBS"
+    unset hwloc_old_LIBS
+
+    _HWLOC_CHECK_DIFF_U
+    _HWLOC_CHECK_DIFF_W
+
+    # Only generate this if we're building the utilities
+    AC_CONFIG_FILES(
+        hwloc_config_prefix[utils/Makefile]
+        hwloc_config_prefix[hwloc.pc])
+])dnl
+
+#-----------------------------------------------------------------------
+
+# Probably only ever invoked by hwloc's configure.ac
+AC_DEFUN([HWLOC_SETUP_TESTS],[
+    cat <<EOF
+
+###
+### Configuring hwloc tests
+###
+EOF
+
+    hwloc_build_tests=yes
+
+    # linux-libnuma.h testing requires libnuma with numa_bitmask_alloc()
+    AC_CHECK_DECL([numa_bitmask_alloc], [hwloc_have_linux_libnuma=yes], [],
+    	      [#include <numa.h>])
+
+    AC_CHECK_HEADERS([infiniband/verbs.h], [
+      AC_CHECK_LIB([ibverbs], [ibv_open_device],
+                   [AC_DEFINE([HAVE_LIBIBVERBS], 1, [Define to 1 if we have -libverbs])
+                    hwloc_have_libibverbs=yes])
+    ])
+
+    AC_CHECK_HEADERS([myriexpress.h], [
+      AC_MSG_CHECKING(if MX_NUMA_NODE exists)
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <myriexpress.h>]],
+                                         [[int a = MX_NUMA_NODE;]],
+                        [AC_MSG_RESULT(yes)
+                         AC_CHECK_LIB([myriexpress], [mx_get_info],
+                                      [AC_DEFINE([HAVE_MYRIEXPRESS], 1, [Define to 1 if we have -lmyriexpress])
+                                       hwloc_have_myriexpress=yes])],
+                        [AC_MSG_RESULT(no)])])])
+
+    AC_CHECK_HEADERS([cuda.h], [
+      AC_MSG_CHECKING(if CUDA_VERSION >= 3020)
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <cuda.h>
+#ifndef CUDA_VERSION
+#error CUDA_VERSION undefined
+#elif CUDA_VERSION < 3020
+#error CUDA_VERSION too old
+#endif]], [[int i = 3;]])],
+       [AC_MSG_RESULT(yes)
+        AC_CHECK_LIB([cuda], [cuInit],
+		     [AC_DEFINE([HAVE_CUDA], 1, [Define to 1 if we have -lcuda])
+		      hwloc_have_cuda=yes])],
+       [AC_MSG_RESULT(no)])])
+
+    AC_CHECK_HEADERS([cuda_runtime_api.h], [
+      AC_MSG_CHECKING(if CUDART_VERSION >= 3020)
+      AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <cuda_runtime_api.h>
+#ifndef CUDART_VERSION
+#error CUDART_VERSION undefined
+#elif CUDART_VERSION < 3020
+#error CUDART_VERSION too old
+#endif]], [[int i = 3;]])],
+       [AC_MSG_RESULT(yes)
+        AC_CHECK_LIB([cudart], [cudaGetDeviceCount],
+		     [AC_DEFINE([HAVE_CUDART], 1, [Define to 1 if we have -lcudart])
+		      hwloc_have_cudart=yes])],
+       [AC_MSG_RESULT(no)])])
+
+    AC_CHECK_PROGS(XMLLINT, [xmllint])
+
+    AC_CHECK_PROGS(BUNZIPP, bunzip2, false)
+
+    _HWLOC_CHECK_DIFF_U
+
+    # Only generate these files if we're making the tests
+    AC_CONFIG_FILES(
+        hwloc_config_prefix[tests/Makefile]
+        hwloc_config_prefix[tests/linux/Makefile]
+        hwloc_config_prefix[tests/linux/gather/Makefile]
+        hwloc_config_prefix[tests/xml/Makefile]
+        hwloc_config_prefix[tests/ports/Makefile]
+        hwloc_config_prefix[tests/linux/hwloc-gather-topology]
+        hwloc_config_prefix[tests/linux/gather/test-gather-topology.sh]
+        hwloc_config_prefix[tests/linux/test-topology.sh]
+        hwloc_config_prefix[tests/xml/test-topology.sh]
+        hwloc_config_prefix[utils/test-hwloc-calc.sh]
+        hwloc_config_prefix[utils/test-hwloc-distrib.sh])
+
+    AC_CONFIG_COMMANDS([chmoding-scripts], [chmod +x ]hwloc_config_prefix[tests/linux/test-topology.sh ]hwloc_config_prefix[tests/xml/test-topology.sh ]hwloc_config_prefix[tests/linux/hwloc-gather-topology ]hwloc_config_prefix[tests/linux/gather/test-gather-topology.sh ]hwloc_config_prefix[utils/test-hwloc-calc.sh ]hwloc_config_prefix[utils/test-hwloc-distrib.sh])
+
+    # These links are only needed in standalone mode.  It would
+    # be nice to m4 foreach this somehow, but whenever I tried
+    # it, I got obscure "invalid tag" errors from
+    # AC_CONFIG_LINKS.  :-\ Since these tests are only run when
+    # built in standalone mode, only generate them in
+    # standalone mode.
+    AC_CONFIG_LINKS(
+        hwloc_config_prefix[tests/ports/topology.c]:hwloc_config_prefix[src/topology.c]
+	hwloc_config_prefix[tests/ports/traversal.c]:hwloc_config_prefix[src/traversal.c]
+	hwloc_config_prefix[tests/ports/topology-synthetic.c]:hwloc_config_prefix[src/topology-synthetic.c]
+	hwloc_config_prefix[tests/ports/topology-solaris.c]:hwloc_config_prefix[src/topology-solaris.c]
+	hwloc_config_prefix[tests/ports/topology-aix.c]:hwloc_config_prefix[src/topology-aix.c]
+	hwloc_config_prefix[tests/ports/topology-osf.c]:hwloc_config_prefix[src/topology-osf.c]
+	hwloc_config_prefix[tests/ports/topology-windows.c]:hwloc_config_prefix[src/topology-windows.c]
+	hwloc_config_prefix[tests/ports/topology-darwin.c]:hwloc_config_prefix[src/topology-darwin.c]
+	hwloc_config_prefix[tests/ports/topology-freebsd.c]:hwloc_config_prefix[src/topology-freebsd.c]
+	hwloc_config_prefix[tests/ports/topology-hpux.c]:hwloc_config_prefix[src/topology-hpux.c])
+    ])
+])dnl

opal/mca/hwloc/hwloc131/hwloc/config/hwloc_pkg.m4

@@ -0,0 +1,197 @@
+# Copyright (c) 2010 Cisco Systems, Inc.  All rights reserved.
+# See COPYING in top-level directory.
+#
+# hwloc modification to the following PKG_* macros -- add HWLOC_
+# prefix to make it "safe" to embed these macros in other packages.
+# Originally copied from the pkg-config package; see copyright and
+# license below.
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# 
+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# HWLOC_PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+# hwloc note: Per https://svn.open-mpi.org/trac/hwloc/ticket/55, keep
+# the environment variable $PKG_CONFIG (vs. renaming it
+# $HWLOC_PKG_CONFIG).  Short explanation: $PKG_CONFIG is a well-known
+# environment variable that can be set by users to override what these
+# .m4 macros do.  There's no reason we should have a different env
+# variable name (e.g., $HWLOC_PKG_CONFIG).  So leave it named
+# $PKG_CONFIG both here in this specific macro, and all the other
+# macros that use it.
+AC_DEFUN([HWLOC_PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	HWLOC_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $HWLOC_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $HWLOC_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# HWLOC_PKG_PROG_PKG_CONFIG
+
+# HWLOC_PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to HWLOC_PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to HWLOC_PKG_CHECK_MODULES, make sure that the first instance of
+# this or HWLOC_PKG_CHECK_MODULES is called, or make sure to call
+# HWLOC_PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([HWLOC_PKG_CHECK_EXISTS],
+[AC_REQUIRE([HWLOC_PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --silence-errors "$1"]); then
+    m4_ifval([$2], [$2], [:])
+    m4_ifvaln([$3], [else
+                     $3])dnl
+fi])
+
+
+# _HWLOC_PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_HWLOC_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        HWLOC_pkg_cv_[]$1="$$1"
+    else
+        HWLOC_PKG_CHECK_EXISTS([$3],
+                         [HWLOC_pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [HWLOC_pkg_failed=yes])
+    fi
+else
+	HWLOC_pkg_failed=untried
+fi[]
+])# _HWLOC_PKG_CONFIG
+
+# _HWLOC_PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_HWLOC_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([HWLOC_PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        HWLOC_pkg_short_errors_supported=yes
+else
+        HWLOC_pkg_short_errors_supported=no
+fi[]dnl
+])# _HWLOC_PKG_SHORT_ERRORS_SUPPORTED
+
+
+# HWLOC_PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# HWLOC_PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to HWLOC_PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([HWLOC_PKG_CHECK_MODULES],[
+    AC_REQUIRE([HWLOC_PKG_PROG_PKG_CONFIG])dnl
+    AC_ARG_VAR([HWLOC_]$1[_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+    AC_ARG_VAR([HWLOC_]$1[_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+    HWLOC_pkg_failed=no
+    AC_MSG_CHECKING([for $1])
+
+    _HWLOC_PKG_CONFIG([HWLOC_][$1][_CFLAGS], [cflags], [$2])
+    _HWLOC_PKG_CONFIG([HWLOC_][$1][_LIBS], [libs], [$2])
+
+    m4_define([_HWLOC_PKG_TEXT], [Alternatively, you may set the environment variables HWLOC_[]$1[]_CFLAGS
+and HWLOC_[]$1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+    # Check for failure of pkg-config
+    if test $HWLOC_pkg_failed = yes; then
+        _HWLOC_PKG_SHORT_ERRORS_SUPPORTED
+        if test $HWLOC_pkg_short_errors_supported = yes; then
+            HWLOC_[]$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2" 2>&1`
+        else 
+            HWLOC_[]$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2" 2>&1`
+        fi
+        # Put the nasty error message in config.log where it belongs
+	echo "$HWLOC_[]$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	ifelse([$5], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$HWLOC_$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_HWLOC_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $5])
+    elif test $HWLOC_pkg_failed = untried; then
+        ifelse([$5], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_HWLOC_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+		[AC_MSG_RESULT([cannot check without pkg-config])
+		$5])
+    else
+        AC_MSG_RESULT([yes])
+
+        # If we got good results from pkg-config, check that they
+        # actually work (i.e., that we can link against the resulting
+        # $LIBS).  The canonical example why we do this is if
+        # pkg-config returns 64 bit libraries but ./configure was run
+        # with CFLAGS=-m32 LDFLAGS=-m32.  pkg-config gave us valid
+        # results, but we'll fail if we try to link.  So detect that
+        # failure now.
+        hwloc_cflags_save=$CFLAGS
+        hwloc_libs_save=$LIBS
+        CFLAGS="$CFLAGS $HWLOC_pkg_cv_HWLOC_[]$1[]_CFLAGS"
+        LIBS="$LIBS $HWLOC_pkg_cv_HWLOC_[]$1[]_LIBS"
+        AC_CHECK_FUNC([$3], [hwloc_result=yes], [hwloc_result=no])
+        CFLAGS=$hwloc_cflags_save
+        LIBS=$hwloc_libs_save
+
+        AC_MSG_CHECKING([for final $1 support])
+        AS_IF([test "$hwloc_result" = "yes"],
+              [HWLOC_[]$1[]_CFLAGS=$HWLOC_pkg_cv_HWLOC_[]$1[]_CFLAGS
+               HWLOC_[]$1[]_LIBS=$HWLOC_pkg_cv_HWLOC_[]$1[]_LIBS
+               AC_MSG_RESULT([yes])            
+               ifelse([$4], , :, [$4])],
+              [AC_MSG_RESULT([no])
+               ifelse([$5], , :, [$5])])
+    fi[]dnl
+])# HWLOC_PKG_CHECK_MODULES

opal/mca/hwloc/hwloc131/hwloc/configure.ac

@@ -0,0 +1,197 @@
+# -*- shell-script -*-
+#
+# Copyright © 2009      CNRS
+# Copyright © 2009-2010 INRIA.  All rights reserved.
+# Copyright © 2009, 2011      Université Bordeaux 1
+# Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
+#
+# See COPYING in top-level directory.
+# 
+# Additional copyrights may follow
+# 
+# $HEADER$
+#
+
+AC_INIT([hwloc], 
+        [m4_normalize(esyscmd([config/hwloc_get_version.sh VERSION --base]))],
+        [http://www.open-mpi.org/community/help/], [hwloc])
+AC_PREREQ(2.63)
+AC_CONFIG_AUX_DIR(./config)
+# Note that this directory must *exactly* match what was specified via
+# -I in ACLOCAL_AMFLAGS in the top-level Makefile.am.
+AC_CONFIG_MACRO_DIR(./config)
+
+cat <<EOF
+
+###
+### Configuring hwloc distribution tarball
+### Startup tests
+###
+EOF
+
+# This must be before AM_INIT_AUTOMAKE
+AC_CANONICAL_TARGET
+
+# Init automake
+AM_INIT_AUTOMAKE([1.10 dist-bzip2 subdir-objects foreign tar-ustar -Wall -Werror])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+# We want new Libtool.  None of that old stuff.  Pfft.    
+m4_ifdef([LT_PREREQ], [],
+	 [m4_fatal([libtool version 2.2.6 or higher is required], [63])])
+LT_PREREQ([2.2.6])
+
+AC_LANG([C])
+
+# Make configure depend on the VERSION file, since it's used in AC_INIT
+AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION'])
+
+# Get the version of hwloc that we are installing
+AC_MSG_CHECKING([for hwloc version])
+HWLOC_VERSION="`$srcdir/config/hwloc_get_version.sh $srcdir/VERSION`"
+HWLOC_MAJOR_VERSION="`$srcdir/config/hwloc_get_version.sh $srcdir/VERSION --major`"
+HWLOC_MINOR_VERSION="`$srcdir/config/hwloc_get_version.sh $srcdir/VERSION --minor`"
+HWLOC_RELEASE_VERSION="`$srcdir/config/hwloc_get_version.sh $srcdir/VERSION --release`"
+HWLOC_REPO_REV="`$srcdir/config/hwloc_get_version.sh $srcdir/VERSION --repo-rev`"
+HWLOC_RELEASE_DATE="`$srcdir/config/hwloc_get_version.sh $srcdir/VERSION --release-date`"
+AC_SUBST(HWLOC_VERSION)
+AC_SUBST(HWLOC_SVN_R)
+AC_SUBST(HWLOC_RELEASE_DATE)
+AC_DEFINE_UNQUOTED([HWLOC_MAJOR_VERSION], [$HWLOC_MAJOR_VERSION],
+    [Major version of hwloc])
+AC_DEFINE_UNQUOTED([HWLOC_MINOR_VERSION], [$HWLOC_MINOR_VERSION],
+    [Minor version of hwloc])
+AC_DEFINE_UNQUOTED([HWLOC_RELEASE_VERSION], [$HWLOC_RELEASE_VERSION],
+    [Release version of hwloc])
+AC_MSG_RESULT([$HWLOC_VERSION])
+
+# Override/fixup the version numbers set by AC_INIT, since on
+# developer builds, there's no good way to know what the version is
+# before running configure :(.  We only use the base version number
+# (ie, no svn r numbers) for the version set in AC_INIT.  This will
+# always match reality because we add the VERSION file (the only way
+# to change the major.minor.release{greek}) into the configure
+# dependencies.
+
+PACKAGE_VERSION="$HWLOC_VERSION"
+PACKAGE_STRING="${PACKAGE_NAME} ${PACKAGE_VERSION}"
+VERSION="${PACKAGE_VERSION}"
+
+# For standalone configurations, we also include a .so version number.
+
+. $srcdir/VERSION
+AC_SUBST([libhwloc_so_version])
+
+# Setup the header file
+AH_TOP([/* -*- c -*-
+ *
+ * Copyright © 2009 CNRS, INRIA., Université Bordeaux 1  All rights reserved.
+ * Copyright © 2009 Cisco Systems, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ *
+ * This file is automatically generated by configure.  Edits will be lost
+ * the next time you run configure!
+ */
+
+#ifndef HWLOC_CONFIGURE_H
+#define HWLOC_CONFIGURE_H
+])
+AH_BOTTOM([
+#endif /* HWLOC_CONFIGURE_H */
+])
+
+# Setup C compiler
+
+CFLAGS_save="$CFLAGS"
+AC_PROG_CC
+AM_PROG_CC_C_O
+CFLAGS="$CFLAGS_save"
+
+# Define hwloc's configure arguments
+HWLOC_DEFINE_ARGS
+
+# If debug mode, add -g
+AS_IF([test "$hwloc_debug" = "1"],
+      [CFLAGS="$CFLAGS -g"])
+
+# If the user didn't specifically ask for embedding mode, default to
+# standalone mode
+AS_IF([test "$enable_embedded_mode" != "yes"],
+      [AS_IF([test ! -d "$srcdir/doc"],
+             [AC_MSG_WARN([The hwloc source tree looks incomplete for a standalone])
+              AC_MSG_WARN([build.  Perhaps this hwloc tree is intended for an embedded])
+              AC_MSG_WARN([build?  Try using the --enable-embedded-mode switch.])
+              AC_MSG_ERROR([Cannot build standalone hwloc])],
+             [HWLOC_BUILD_STANDALONE])])
+
+# Setup the hwloc core
+HWLOC_SETUP_CORE([], [], [AC_MSG_ERROR([Cannot build hwloc core])], [1])
+
+# Setup hwloc's docs, utils, and tests
+AS_IF([test "$hwloc_mode" = "standalone"],
+      [HWLOC_SETUP_DOCS
+       HWLOC_SETUP_UTILS
+       HWLOC_SETUP_TESTS])
+
+# Run the AM_CONDITIONALs
+HWLOC_DO_AM_CONDITIONALS
+
+# Set the final flags
+CFLAGS="$HWLOC_EMBEDDED_CFLAGS $CFLAGS"
+CPPFLAGS="$HWLOC_EMBEDDED_CPPFLAGS $CPPFLAGS"
+LIBS="$HWLOC_EMBEDDED_LIBS $LIBS"
+
+# Setup libtool, but disable C++, F77, Java and Windows Resource
+# Compiler support -- we don't need that stuff.
+AM_ENABLE_SHARED
+AM_DISABLE_STATIC
+AM_PROG_LIBTOOL([win32-dll])
+LT_LANG([C])
+
+# Party on
+AC_OUTPUT
+
+# Create a comma-delimited list in an environment variable.
+# $1 = variable name
+# $2 = value to append
+append_env() {
+    # Tricky shell/m4 quoting here -- not for the meek.
+    var=[$]1
+    # Note: quotes *NOT* needed in this assignment
+    eval initial_value=\$$var
+
+    AS_IF([test "$initial_value" != ""], 
+          [new_value="$initial_value, [$]2"],
+          [new_value="[$]2]")
+    eval "[$]1=\"$new_value\""
+}
+
+# Show which optional support we'll be building
+hwloc_xml_status=basic
+AS_IF([test "$hwloc_libxml2_happy" = "yes"], [hwloc_xml_status=full])
+
+# Beginning of generic support
+cat <<EOF
+
+-----------------------------------------------------------------------------
+Hwloc optional build support status (more details can be found above):
+
+Probe / display PCI devices: $hwloc_pci_happy
+Graphical output (Cairo):    $hwloc_cairo_happy
+XML input / output:          $hwloc_xml_status
+EOF
+
+# Linux specific support
+AS_IF([test "$hwloc_linux" = "yes"], [cat <<EOF
+libnuma memory support:      $hwloc_linux_libnuma_happy
+EOF])
+
+# End of generic support
+cat <<EOF
+-----------------------------------------------------------------------------
+
+EOF

opal/mca/hwloc/hwloc131/hwloc/doc/README.txt

@@ -0,0 +1,4 @@
+Open MPI doesn't need this tree from hwloc.  But automake *requires*
+that this directory has to be here.  So we have an empty directory
+with a README in it, a) just to explain why it's here, and b) so that
+hg clones won't delete the directory (because it's empty).

opal/mca/hwloc/hwloc131/hwloc/hwloc.pc.in

@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: hwloc
+Description: Hardware locality detection and management library
+Version: @VERSION@
+Requires.private: @HWLOC_REQUIRES@
+Cflags: -I${includedir}
+Libs: -L${libdir} -lhwloc
+Libs.private: @LIBS@

opal/mca/hwloc/hwloc131/hwloc/include/Makefile.am

@@ -0,0 +1,40 @@
+# Copyright © 2009-2010 INRIA.  All rights reserved.
+# Copyright © 2009-2010 Université Bordeaux 1
+# Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
+# See COPYING in top-level directory.
+
+# Only install the headers if we're in standalone mode (meaning:
+# *don't* install the headers if we're in embedded mode).
+
+if HWLOC_BUILD_STANDALONE
+include_HEADERS = hwloc.h
+include_hwlocdir = $(includedir)/hwloc
+include_hwloc_HEADERS = \
+        hwloc/bitmap.h \
+        hwloc/cpuset.h \
+        hwloc/helper.h \
+        hwloc/myriexpress.h \
+        hwloc/openfabrics-verbs.h \
+        hwloc/cuda.h \
+        hwloc/cudart.h \
+        hwloc/rename.h
+include_hwloc_autogendir = $(includedir)/hwloc/autogen
+nodist_include_hwloc_autogen_HEADERS = hwloc/autogen/config.h 
+
+noinst_HEADERS = \
+        private/private.h \
+        private/debug.h \
+        private/misc.h \
+        private/cpuid.h
+
+if HWLOC_HAVE_LINUX
+include_hwloc_HEADERS += \
+        hwloc/linux.h \
+        hwloc/linux-libnuma.h
+endif HWLOC_HAVE_LINUX
+
+if HWLOC_HAVE_SCHED_SETAFFINITY
+include_hwloc_HEADERS += hwloc/glibc-sched.h
+endif HWLOC_HAVE_SCHED_SETAFFINITY
+
+endif HWLOC_BUILD_STANDALONE

opal/mca/hwloc/hwloc131/hwloc/include/hwloc/autogen/config.h.in

@@ -0,0 +1,141 @@
+/* -*- c -*-
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2010 INRIA.  All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/* The configuration file */
+
+#ifndef HWLOC_CONFIG_H
+#define HWLOC_CONFIG_H
+
+#if (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
+# define __hwloc_restrict __restrict
+#else
+# if __STDC_VERSION__ >= 199901L
+#  define __hwloc_restrict restrict
+# else
+#  define __hwloc_restrict
+# endif
+#endif
+
+#undef __hwloc_inline
+
+/*
+ * Note: this is public.  We can not assume anything from the compiler used
+ * by the application and thus the HWLOC_HAVE_* macros below are not
+ * fetched from the autoconf result here. We only automatically use a few
+ * well-known easy cases.
+ */
+
+/* Maybe before gcc 2.95 too */
+#if !defined(HWLOC_HAVE_ATTRIBUTE_UNUSED) && defined(__GNUC__)
+# define HWLOC_HAVE_ATTRIBUTE_UNUSED (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
+#else
+# define HWLOC_HAVE_ATTRIBUTE_UNUSED 0
+#endif
+#if HWLOC_HAVE_ATTRIBUTE_UNUSED
+# define __hwloc_attribute_unused __attribute__((__unused__))
+#else
+# define __hwloc_attribute_unused
+#endif
+
+#if !defined(HWLOC_HAVE_ATTRIBUTE_MALLOC) && defined(__GNUC__)
+# define HWLOC_HAVE_ATTRIBUTE_MALLOC (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
+#else
+# define HWLOC_HAVE_ATTRIBUTE_MALLOC 0
+#endif
+#if HWLOC_HAVE_ATTRIBUTE_MALLOC
+# define __hwloc_attribute_malloc __attribute__((__malloc__))
+#else
+# define __hwloc_attribute_malloc
+#endif
+
+#if !defined(HWLOC_HAVE_ATTRIBUTE_CONST) && defined(__GNUC__)
+# define HWLOC_HAVE_ATTRIBUTE_CONST (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95))
+#else
+# define HWLOC_HAVE_ATTRIBUTE_CONST 0
+#endif
+#if HWLOC_HAVE_ATTRIBUTE_CONST
+# define __hwloc_attribute_const __attribute__((__const__))
+#else
+# define __hwloc_attribute_const
+#endif
+
+#if !defined(HWLOC_HAVE_ATTRIBUTE_PURE) && defined(__GNUC__)
+# define HWLOC_HAVE_ATTRIBUTE_PURE (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
+#else
+# define HWLOC_HAVE_ATTRIBUTE_PURE 0
+#endif
+#if HWLOC_HAVE_ATTRIBUTE_PURE
+# define __hwloc_attribute_pure __attribute__((__pure__))
+#else
+# define __hwloc_attribute_pure
+#endif
+
+#if !defined(HWLOC_HAVE_ATTRIBUTE_DEPRECATED) && defined(__GNUC__)
+# define HWLOC_HAVE_ATTRIBUTE_DEPRECATED (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3))
+#else
+# define HWLOC_HAVE_ATTRIBUTE_DEPRECATED 0
+#endif
+#if HWLOC_HAVE_ATTRIBUTE_DEPRECATED
+# define __hwloc_attribute_deprecated __attribute__((__deprecated__))
+#else
+# define __hwloc_attribute_deprecated
+#endif
+
+#ifdef HWLOC_C_HAVE_VISIBILITY
+# if HWLOC_C_HAVE_VISIBILITY
+#  define HWLOC_DECLSPEC __attribute__((__visibility__("default")))
+# else
+#  define HWLOC_DECLSPEC
+# endif
+#else
+# define HWLOC_DECLSPEC
+#endif
+
+/* Defined to 1 on Linux */
+#undef HWLOC_LINUX_SYS
+
+/* Defined to 1 if the CPU_SET macro works */
+#undef HWLOC_HAVE_CPU_SET
+
+/* Defined to 1 if you have the `windows.h' header. */
+#undef HWLOC_HAVE_WINDOWS_H
+#undef hwloc_pid_t
+#undef hwloc_thread_t
+
+#ifdef HWLOC_HAVE_WINDOWS_H
+
+#  include <windows.h>
+typedef DWORDLONG hwloc_uint64_t;
+
+#else /* HWLOC_HAVE_WINDOWS_H */
+
+#  ifdef hwloc_thread_t
+#    include <pthread.h>
+#  endif /* hwloc_thread_t */
+
+/* Defined to 1 if you have the <stdint.h> header file. */
+#  undef HWLOC_HAVE_STDINT_H
+
+#  include <unistd.h>
+#  ifdef HWLOC_HAVE_STDINT_H
+#    include <stdint.h>
+#  endif
+typedef uint64_t hwloc_uint64_t;
+
+#endif /* HWLOC_HAVE_WINDOWS_H */
+
+/* Whether we need to re-define all the hwloc public symbols or not */
+#undef HWLOC_SYM_TRANSFORM
+
+/* The hwloc symbol prefix */
+#undef HWLOC_SYM_PREFIX
+
+/* The hwloc symbol prefix in all caps */
+#undef HWLOC_SYM_PREFIX_CAPS
+
+#endif /* HWLOC_CONFIG_H */

opal/mca/hwloc/hwloc131/hwloc/include/hwloc/bitmap.h

@@ -0,0 +1,335 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/** \file
+ * \brief The bitmap API, for use in hwloc itself.
+ */
+
+#ifndef HWLOC_BITMAP_H
+#define HWLOC_BITMAP_H
+
+#include <hwloc/autogen/config.h>
+#include <assert.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/** \defgroup hwlocality_bitmap The bitmap API
+ *
+ * The ::hwloc_bitmap_t type represents a set of objects, typically OS
+ * processors -- which may actually be hardware threads (represented
+ * by ::hwloc_cpuset_t, which is a typedef for ::hwloc_bitmap_t) -- or
+ * memory nodes (represented by ::hwloc_nodeset_t, which is also a
+ * typedef for ::hwloc_bitmap_t).  
+ *
+ * <em>Both CPU and node sets are always indexed by OS physical number.</em>
+ *
+ * \note CPU sets and nodesets are described in \ref hwlocality_sets.
+ *
+ * A bitmap may be of infinite size.
+ * @{
+ */
+
+
+/** \brief
+ * Set of bits represented as an opaque pointer to an internal bitmap.
+ */
+typedef struct hwloc_bitmap_s * hwloc_bitmap_t;
+/** \brief a non-modifiable ::hwloc_bitmap_t */
+typedef const struct hwloc_bitmap_s * hwloc_const_bitmap_t;
+
+
+/*
+ * Bitmap allocation, freeing and copying.
+ */
+
+/** \brief Allocate a new empty bitmap.
+ *
+ * \returns A valid bitmap or \c NULL.
+ *
+ * The bitmap should be freed by a corresponding call to
+ * hwloc_bitmap_free().
+ */
+HWLOC_DECLSPEC hwloc_bitmap_t hwloc_bitmap_alloc(void) __hwloc_attribute_malloc;
+
+/** \brief Allocate a new full bitmap. */
+HWLOC_DECLSPEC hwloc_bitmap_t hwloc_bitmap_alloc_full(void) __hwloc_attribute_malloc;
+
+/** \brief Free bitmap \p bitmap.
+ *
+ * If \p bitmap is \c NULL, no operation is performed.
+ */
+HWLOC_DECLSPEC void hwloc_bitmap_free(hwloc_bitmap_t bitmap);
+
+/** \brief Duplicate bitmap \p bitmap by allocating a new bitmap and copying \p bitmap contents.
+ *
+ * If \p bitmap is \c NULL, \c NULL is returned.
+ */
+HWLOC_DECLSPEC hwloc_bitmap_t hwloc_bitmap_dup(hwloc_const_bitmap_t bitmap) __hwloc_attribute_malloc;
+
+/** \brief Copy the contents of bitmap \p src into the already allocated bitmap \p dst */
+HWLOC_DECLSPEC void hwloc_bitmap_copy(hwloc_bitmap_t dst, hwloc_const_bitmap_t src);
+
+
+/*
+ * Bitmap/String Conversion
+ */
+
+/** \brief Stringify a bitmap.
+ *
+ * Up to \p buflen characters may be written in buffer \p buf.
+ *
+ * If \p buflen is 0, \p buf may safely be \c NULL.
+ *
+ * \return the number of character that were actually written if not truncating,
+ * or that would have been written (not including the ending \\0).
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap);
+
+/** \brief Stringify a bitmap into a newly allocated string.
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_asprintf(char ** strp, hwloc_const_bitmap_t bitmap);
+
+/** \brief Parse a bitmap string and stores it in bitmap \p bitmap.
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_sscanf(hwloc_bitmap_t bitmap, const char * __hwloc_restrict string);
+
+/** \brief Stringify a bitmap in the list format.
+ *
+ * Lists are comma-separated indexes or ranges.
+ * Ranges are dash separated indexes.
+ * The last range may not have a ending indexes if the bitmap is infinite.
+ *
+ * Up to \p buflen characters may be written in buffer \p buf.
+ *
+ * If \p buflen is 0, \p buf may safely be \c NULL.
+ *
+ * \return the number of character that were actually written if not truncating,
+ * or that would have been written (not including the ending \\0).
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_list_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap);
+
+/** \brief Stringify a bitmap into a newly allocated list string.
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_list_asprintf(char ** strp, hwloc_const_bitmap_t bitmap);
+
+/** \brief Parse a list string and stores it in bitmap \p bitmap.
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_list_sscanf(hwloc_bitmap_t bitmap, const char * __hwloc_restrict string);
+
+/** \brief Stringify a bitmap in the taskset-specific format.
+ *
+ * The taskset command manipulates bitmap strings that contain a single
+ * (possible very long) hexadecimal number starting with 0x.
+ *
+ * Up to \p buflen characters may be written in buffer \p buf.
+ *
+ * If \p buflen is 0, \p buf may safely be \c NULL.
+ *
+ * \return the number of character that were actually written if not truncating,
+ * or that would have been written (not including the ending \\0).
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_taskset_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap);
+
+/** \brief Stringify a bitmap into a newly allocated taskset-specific string.
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_taskset_asprintf(char ** strp, hwloc_const_bitmap_t bitmap);
+
+/** \brief Parse a taskset-specific bitmap string and stores it in bitmap \p bitmap.
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_taskset_sscanf(hwloc_bitmap_t bitmap, const char * __hwloc_restrict string);
+
+
+/*
+ * Building bitmaps.
+ */
+
+/** \brief Empty the bitmap \p bitmap */
+HWLOC_DECLSPEC void hwloc_bitmap_zero(hwloc_bitmap_t bitmap);
+
+/** \brief Fill bitmap \p bitmap with all possible indexes (even if those objects don't exist or are otherwise unavailable) */
+HWLOC_DECLSPEC void hwloc_bitmap_fill(hwloc_bitmap_t bitmap);
+
+/** \brief Empty the bitmap \p bitmap and add bit \p id */
+HWLOC_DECLSPEC void hwloc_bitmap_only(hwloc_bitmap_t bitmap, unsigned id);
+
+/** \brief Fill the bitmap \p and clear the index \p id */
+HWLOC_DECLSPEC void hwloc_bitmap_allbut(hwloc_bitmap_t bitmap, unsigned id);
+
+/** \brief Setup bitmap \p bitmap from unsigned long \p mask */
+HWLOC_DECLSPEC void hwloc_bitmap_from_ulong(hwloc_bitmap_t bitmap, unsigned long mask);
+
+/** \brief Setup bitmap \p bitmap from unsigned long \p mask used as \p i -th subset */
+HWLOC_DECLSPEC void hwloc_bitmap_from_ith_ulong(hwloc_bitmap_t bitmap, unsigned i, unsigned long mask);
+
+
+/*
+ * Modifying bitmaps.
+ */
+
+/** \brief Add index \p id in bitmap \p bitmap */
+HWLOC_DECLSPEC void hwloc_bitmap_set(hwloc_bitmap_t bitmap, unsigned id);
+
+/** \brief Add indexes from \p begin to \p end in bitmap \p bitmap.
+ *
+ * If \p end is \c -1, the range is infinite.
+ */
+HWLOC_DECLSPEC void hwloc_bitmap_set_range(hwloc_bitmap_t bitmap, unsigned begin, int end);
+
+/** \brief Replace \p i -th subset of bitmap \p bitmap with unsigned long \p mask */
+HWLOC_DECLSPEC void hwloc_bitmap_set_ith_ulong(hwloc_bitmap_t bitmap, unsigned i, unsigned long mask);
+
+/** \brief Remove index \p id from bitmap \p bitmap */
+HWLOC_DECLSPEC void hwloc_bitmap_clr(hwloc_bitmap_t bitmap, unsigned id);
+
+/** \brief Remove indexes from \p begin to \p end in bitmap \p bitmap.
+ *
+ * If \p end is \c -1, the range is infinite.
+ */
+HWLOC_DECLSPEC void hwloc_bitmap_clr_range(hwloc_bitmap_t bitmap, unsigned begin, int end);
+
+/** \brief Keep a single index among those set in bitmap \p bitmap
+ *
+ * May be useful before binding so that the process does not
+ * have a chance of migrating between multiple logical CPUs
+ * in the original mask.
+ */
+HWLOC_DECLSPEC void hwloc_bitmap_singlify(hwloc_bitmap_t bitmap);
+
+
+/*
+ * Consulting bitmaps.
+ */
+
+/** \brief Convert the beginning part of bitmap \p bitmap into unsigned long \p mask */
+HWLOC_DECLSPEC unsigned long hwloc_bitmap_to_ulong(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
+
+/** \brief Convert the \p i -th subset of bitmap \p bitmap into unsigned long mask */
+HWLOC_DECLSPEC unsigned long hwloc_bitmap_to_ith_ulong(hwloc_const_bitmap_t bitmap, unsigned i) __hwloc_attribute_pure;
+
+/** \brief Test whether index \p id is part of bitmap \p bitmap */
+HWLOC_DECLSPEC int hwloc_bitmap_isset(hwloc_const_bitmap_t bitmap, unsigned id) __hwloc_attribute_pure;
+
+/** \brief Test whether bitmap \p bitmap is empty */
+HWLOC_DECLSPEC int hwloc_bitmap_iszero(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
+
+/** \brief Test whether bitmap \p bitmap is completely full */
+HWLOC_DECLSPEC int hwloc_bitmap_isfull(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
+
+/** \brief Compute the first index (least significant bit) in bitmap \p bitmap
+ *
+ * \return -1 if no index is set.
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_first(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
+
+/** \brief Compute the next index in bitmap \p bitmap which is after index \p prev
+ *
+ * If \p prev is -1, the first index is returned.
+ *
+ * \return -1 if no index with higher index is bitmap.
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_next(hwloc_const_bitmap_t bitmap, int prev) __hwloc_attribute_pure;
+
+/** \brief Compute the last index (most significant bit) in bitmap \p bitmap
+ *
+ * \return -1 if no index is bitmap, or if the index bitmap is infinite.
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_last(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
+
+/** \brief Compute the "weight" of bitmap \p bitmap (i.e., number of
+ * indexes that are in the bitmap).
+ *
+ * \return the number of indexes that are in the bitmap.
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_weight(hwloc_const_bitmap_t bitmap) __hwloc_attribute_pure;
+
+/** \brief Loop macro iterating on bitmap \p bitmap
+ * \hideinitializer
+ *
+ * \p index is the loop variable; it should be an unsigned int.  The
+ * first iteration will set \p index to the lowest index in the bitmap.
+ * Successive iterations will iterate through, in order, all remaining
+ * indexes that in the bitmap.  To be specific: each iteration will return a
+ * value for \p index such that hwloc_bitmap_isset(bitmap, index) is true.
+ *
+ * The assert prevents the loop from being infinite if the bitmap is infinite.
+ */
+#define hwloc_bitmap_foreach_begin(id, bitmap) \
+do { \
+        assert(hwloc_bitmap_weight(bitmap) != -1); \
+        for (id = hwloc_bitmap_first(bitmap); \
+             (unsigned) id != (unsigned) -1; \
+             id = hwloc_bitmap_next(bitmap, id)) { \
+/** \brief End of loop. Needs a terminating ';'.
+ * \hideinitializer
+ *
+ * \sa hwloc_bitmap_foreach_begin */
+#define hwloc_bitmap_foreach_end() \
+        } \
+} while (0)
+
+
+/*
+ * Combining bitmaps.
+ */
+
+/** \brief Or bitmaps \p bitmap1 and \p bitmap2 and store the result in bitmap \p res */
+HWLOC_DECLSPEC void hwloc_bitmap_or (hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2);
+
+/** \brief And bitmaps \p bitmap1 and \p bitmap2 and store the result in bitmap \p res */
+HWLOC_DECLSPEC void hwloc_bitmap_and (hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2);
+
+/** \brief And bitmap \p bitmap1 and the negation of \p bitmap2 and store the result in bitmap \p res */
+HWLOC_DECLSPEC void hwloc_bitmap_andnot (hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2);
+
+/** \brief Xor bitmaps \p bitmap1 and \p bitmap2 and store the result in bitmap \p res */
+HWLOC_DECLSPEC void hwloc_bitmap_xor (hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2);
+
+/** \brief Negate bitmap \p bitmap and store the result in bitmap \p res */
+HWLOC_DECLSPEC void hwloc_bitmap_not (hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap);
+
+
+/*
+ * Comparing bitmaps.
+ */
+
+/** \brief Test whether bitmaps \p bitmap1 and \p bitmap2 intersects */
+HWLOC_DECLSPEC int hwloc_bitmap_intersects (hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) __hwloc_attribute_pure;
+
+/** \brief Test whether bitmap \p sub_bitmap is part of bitmap \p super_bitmap */
+HWLOC_DECLSPEC int hwloc_bitmap_isincluded (hwloc_const_bitmap_t sub_bitmap, hwloc_const_bitmap_t super_bitmap) __hwloc_attribute_pure;
+
+/** \brief Test whether bitmap \p bitmap1 is equal to bitmap \p bitmap2 */
+HWLOC_DECLSPEC int hwloc_bitmap_isequal (hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) __hwloc_attribute_pure;
+
+/** \brief Compare bitmaps \p bitmap1 and \p bitmap2 using their lowest index.
+ *
+ * Smaller least significant bit is smaller.
+ * The empty bitmap is considered higher than anything.
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_compare_first(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) __hwloc_attribute_pure;
+
+/** \brief Compare bitmaps \p bitmap1 and \p bitmap2 using their highest index.
+ *
+ * Higher most significant bit is higher.
+ * The empty bitmap is considered lower than anything.
+ */
+HWLOC_DECLSPEC int hwloc_bitmap_compare(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) __hwloc_attribute_pure;
+
+/** @} */
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+
+#endif /* HWLOC_BITMAP_H */

opal/mca/hwloc/hwloc131/hwloc/include/hwloc/cpuset.h

@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2010 INRIA.  All rights reserved.
+ * Copyright © 2009-2010 Université Bordeaux 1
+ * Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/** \file
+ * \brief The old deprecated Cpuset API.
+ * This interface should not be used anymore, it will be dropped in a later release.
+ *
+ * hwloc/bitmap.h should be used instead. Most hwloc_cpuset_foo functions are
+ * replaced with hwloc_bitmap_foo. The only exceptions are:
+ * - hwloc_cpuset_from_string -> hwloc_bitmap_sscanf
+ * - hwloc_cpuset_cpu -> hwloc_bitmap_only
+ * - hwloc_cpuset_all_but_cpu -> hwloc_bitmap_allbut
+ */
+
+#ifndef HWLOC_CPUSET_H
+#define HWLOC_CPUSET_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "hwloc/bitmap.h"
+
+static __hwloc_inline hwloc_bitmap_t __hwloc_attribute_deprecated hwloc_cpuset_alloc(void) { return hwloc_bitmap_alloc(); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_free(hwloc_bitmap_t bitmap) { hwloc_bitmap_free(bitmap); }
+static __hwloc_inline hwloc_bitmap_t __hwloc_attribute_deprecated hwloc_cpuset_dup(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_dup(bitmap); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_copy(hwloc_bitmap_t dst, hwloc_const_bitmap_t src) { hwloc_bitmap_copy(dst, src); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_snprintf(char * __hwloc_restrict buf, size_t buflen, hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_snprintf(buf, buflen, bitmap); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_asprintf(char ** strp, hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_asprintf(strp, bitmap); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_from_string(hwloc_bitmap_t bitmap, const char * __hwloc_restrict string) { return hwloc_bitmap_sscanf(bitmap, string); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_zero(hwloc_bitmap_t bitmap) { hwloc_bitmap_zero(bitmap); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_fill(hwloc_bitmap_t bitmap) { hwloc_bitmap_fill(bitmap); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_from_ulong(hwloc_bitmap_t bitmap, unsigned long mask) { hwloc_bitmap_from_ulong(bitmap, mask); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_from_ith_ulong(hwloc_bitmap_t bitmap, unsigned i, unsigned long mask) { hwloc_bitmap_from_ith_ulong(bitmap, i, mask); }
+static __hwloc_inline unsigned __hwloc_attribute_deprecated long hwloc_cpuset_to_ulong(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_to_ulong(bitmap); }
+static __hwloc_inline unsigned __hwloc_attribute_deprecated long hwloc_cpuset_to_ith_ulong(hwloc_const_bitmap_t bitmap, unsigned i) { return hwloc_bitmap_to_ith_ulong(bitmap, i); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_cpu(hwloc_bitmap_t bitmap, unsigned index_) { hwloc_bitmap_only(bitmap, index_); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_all_but_cpu(hwloc_bitmap_t bitmap, unsigned index_) { hwloc_bitmap_allbut(bitmap, index_); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_set(hwloc_bitmap_t bitmap, unsigned index_) { hwloc_bitmap_set(bitmap, index_); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_set_range(hwloc_bitmap_t bitmap, unsigned begin, unsigned end) { hwloc_bitmap_set_range(bitmap, begin, end); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_set_ith_ulong(hwloc_bitmap_t bitmap, unsigned i, unsigned long mask) { hwloc_bitmap_set_ith_ulong(bitmap, i, mask); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_clr(hwloc_bitmap_t bitmap, unsigned index_) { hwloc_bitmap_clr(bitmap, index_); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_clr_range(hwloc_bitmap_t bitmap, unsigned begin, unsigned end) { hwloc_bitmap_clr_range(bitmap, begin, end); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_isset(hwloc_const_bitmap_t bitmap, unsigned index_) { return hwloc_bitmap_isset(bitmap, index_); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_iszero(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_iszero(bitmap); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_isfull(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_isfull(bitmap); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_isequal(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { return hwloc_bitmap_isequal(bitmap1, bitmap2); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_intersects(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { return hwloc_bitmap_intersects(bitmap1, bitmap2); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_isincluded(hwloc_const_bitmap_t sub_bitmap, hwloc_const_bitmap_t super_bitmap) { return hwloc_bitmap_isincluded(sub_bitmap, super_bitmap); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_or(hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { hwloc_bitmap_or(res, bitmap1, bitmap2); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_and(hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { hwloc_bitmap_and(res, bitmap1, bitmap2); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_andnot(hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { hwloc_bitmap_andnot(res, bitmap1, bitmap2); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_xor(hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { hwloc_bitmap_xor(res, bitmap1, bitmap2); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_not(hwloc_bitmap_t res, hwloc_const_bitmap_t bitmap) { hwloc_bitmap_not(res, bitmap); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_first(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_first(bitmap); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_last(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_last(bitmap); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_next(hwloc_const_bitmap_t bitmap, unsigned prev) { return hwloc_bitmap_next(bitmap, prev); }
+static __hwloc_inline void __hwloc_attribute_deprecated hwloc_cpuset_singlify(hwloc_bitmap_t bitmap) { hwloc_bitmap_singlify(bitmap); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_compare_first(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { return hwloc_bitmap_compare_first(bitmap1, bitmap2); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_compare(hwloc_const_bitmap_t bitmap1, hwloc_const_bitmap_t bitmap2) { return hwloc_bitmap_compare(bitmap1, bitmap2); }
+static __hwloc_inline int __hwloc_attribute_deprecated hwloc_cpuset_weight(hwloc_const_bitmap_t bitmap) { return hwloc_bitmap_weight(bitmap); }
+
+#define hwloc_cpuset_foreach_begin hwloc_bitmap_foreach_begin
+#define hwloc_cpuset_foreach_end hwloc_bitmap_foreach_end
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#endif /* HWLOC_CPUSET_H */

opal/mca/hwloc/hwloc131/hwloc/include/hwloc/cuda.h

@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2010 INRIA.  All rights reserved.
+ * Copyright © 2010 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/** \file
+ * \brief Macros to help interaction between hwloc and the CUDA Driver API.
+ *
+ * Applications that use both hwloc and the CUDA Driver API may want to
+ * include this file so as to get topology information for CUDA devices.
+ *
+ */
+
+#ifndef HWLOC_CUDA_H
+#define HWLOC_CUDA_H
+
+#include <hwloc.h>
+#include <hwloc/autogen/config.h>
+#include <hwloc/linux.h>
+
+#include <cuda.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/** \defgroup hwlocality_cuda CUDA Driver API Specific Functions
+ * @{
+ */
+
+/** \brief Get the CPU set of logical processors that are physically
+ * close to device \p cudevice.
+ *
+ * For the given CUDA Driver API device \p cudevice, read the corresponding
+ * kernel-provided cpumap file and return the corresponding CPU set.
+ * This function is currently only implemented in a meaningful way for
+ * Linux; other systems will simply get a full cpuset.
+ */
+static __hwloc_inline int
+hwloc_cuda_get_device_cpuset(hwloc_topology_t topology __hwloc_attribute_unused,
+			     CUdevice cudevice, hwloc_cpuset_t set)
+{
+#ifdef HWLOC_LINUX_SYS
+  /* If we're on Linux, use the sysfs mechanism to get the local cpus */
+#define HWLOC_CUDA_DEVICE_SYSFS_PATH_MAX 128
+  CUresult cres;
+  int domainid = 0;
+  int deviceid;
+  int busid;
+  char path[HWLOC_CUDA_DEVICE_SYSFS_PATH_MAX];
+  FILE *sysfile = NULL;
+
+#if CUDA_VERSION >= 4000
+  cres = cuDeviceGetAttribute(&domainid, CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID, cudevice);
+  if (cres != CUDA_SUCCESS) {
+    errno = ENOSYS;
+    return -1;
+  } 
+#endif
+  cres = cuDeviceGetAttribute(&busid, CU_DEVICE_ATTRIBUTE_PCI_BUS_ID, cudevice);
+  if (cres != CUDA_SUCCESS) {
+    errno = ENOSYS;
+    return -1;
+  }
+  cres = cuDeviceGetAttribute(&deviceid, CU_DEVICE_ATTRIBUTE_PCI_DEVICE_ID, cudevice);
+  if (cres != CUDA_SUCCESS) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  sprintf(path, "/sys/bus/pci/devices/%04x:%02x:%02x.0/local_cpus", domainid, busid, deviceid);
+  sysfile = fopen(path, "r");
+  if (!sysfile)
+    return -1;
+
+  hwloc_linux_parse_cpumap_file(sysfile, set);
+
+  fclose(sysfile);
+#else
+  /* Non-Linux systems simply get a full cpuset */
+  hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
+#endif
+  return 0;
+}
+
+/** @} */
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+
+#endif /* HWLOC_CUDA_H */

opal/mca/hwloc/hwloc131/hwloc/include/hwloc/cudart.h

@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2010 INRIA.  All rights reserved.
+ * Copyright © 2010 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/** \file
+ * \brief Macros to help interaction between hwloc and the CUDA Runtime API.
+ *
+ * Applications that use both hwloc and the CUDA Runtime API may want to
+ * include this file so as to get topology information for CUDA devices.
+ *
+ */
+
+#ifndef HWLOC_CUDART_H
+#define HWLOC_CUDART_H
+
+#include <hwloc.h>
+#include <hwloc/autogen/config.h>
+#include <hwloc/linux.h>
+
+#include <cuda_runtime_api.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/** \defgroup hwlocality_cudart CUDA Runtime API Specific Functions
+ * @{
+ */
+
+/** \brief Get the CPU set of logical processors that are physically
+ * close to device \p cudevice.
+ *
+ * For the given CUDA Runtime API device \p cudevice, read the corresponding
+ * kernel-provided cpumap file and return the corresponding CPU set.
+ * This function is currently only implemented in a meaningful way for
+ * Linux; other systems will simply get a full cpuset.
+ */
+static __hwloc_inline int
+hwloc_cudart_get_device_cpuset(hwloc_topology_t topology __hwloc_attribute_unused,
+			       int device, hwloc_cpuset_t set)
+{
+#ifdef HWLOC_LINUX_SYS
+  /* If we're on Linux, use the sysfs mechanism to get the local cpus */
+#define HWLOC_CUDART_DEVICE_SYSFS_PATH_MAX 128
+  cudaError_t cerr;
+  struct cudaDeviceProp prop;
+  char path[HWLOC_CUDART_DEVICE_SYSFS_PATH_MAX];
+  FILE *sysfile = NULL;
+  int pciDomainID = 0;
+
+  cerr = cudaGetDeviceProperties(&prop, device);
+  if (cerr) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+#if CUDART_VERSION >= 4000
+  pciDomainID = prop.pciDomainID;
+#endif
+
+  sprintf(path, "/sys/bus/pci/devices/%04x:%02x:%02x.0/local_cpus", pciDomainID, prop.pciBusID, prop.pciDeviceID);
+  sysfile = fopen(path, "r");
+  if (!sysfile)
+    return -1;
+
+  hwloc_linux_parse_cpumap_file(sysfile, set);
+
+  fclose(sysfile);
+#else
+  /* Non-Linux systems simply get a full cpuset */
+  hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
+#endif
+  return 0;
+}
+
+/** @} */
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+
+#endif /* HWLOC_CUDART_H */

opal/mca/hwloc/hwloc131/hwloc/include/hwloc/glibc-sched.h

@@ -0,0 +1,119 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2010 INRIA.  All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/** \file
+ * \brief Macros to help interaction between hwloc and glibc scheduling routines.
+ *
+ * Applications that use both hwloc and glibc scheduling routines such as
+ * sched_getaffinity may want to include this file so as to ease conversion
+ * between their respective types.
+ */
+
+#ifndef HWLOC_GLIBC_SCHED_H
+#define HWLOC_GLIBC_SCHED_H
+
+#include <hwloc.h>
+#include <hwloc/helper.h>
+#include <assert.h>
+
+#if !defined _GNU_SOURCE || !defined _SCHED_H || (!defined CPU_SETSIZE && !defined sched_priority)
+#error Please make sure to include sched.h before including glibc-sched.h, and define _GNU_SOURCE before any inclusion of sched.h
+#endif
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#ifdef HWLOC_HAVE_CPU_SET
+
+
+/** \defgroup hwlocality_glibc_sched Helpers for manipulating glibc sched affinity
+ * @{
+ */
+
+
+/** \brief Convert hwloc CPU set \p toposet into glibc sched affinity CPU set \p schedset
+ *
+ * This function may be used before calling sched_setaffinity or any other function
+ * that takes a cpu_set_t as input parameter.
+ *
+ * \p schedsetsize should be sizeof(cpu_set_t) unless \p schedset was dynamically allocated with CPU_ALLOC
+ */
+static __hwloc_inline int
+hwloc_cpuset_to_glibc_sched_affinity(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_const_cpuset_t hwlocset,
+				    cpu_set_t *schedset, size_t schedsetsize)
+{
+#ifdef CPU_ZERO_S
+  unsigned cpu;
+  CPU_ZERO_S(schedsetsize, schedset);
+  hwloc_bitmap_foreach_begin(cpu, hwlocset)
+    CPU_SET_S(cpu, schedsetsize, schedset);
+  hwloc_bitmap_foreach_end();
+#else /* !CPU_ZERO_S */
+  unsigned cpu;
+  CPU_ZERO(schedset);
+  assert(schedsetsize == sizeof(cpu_set_t));
+  hwloc_bitmap_foreach_begin(cpu, hwlocset)
+    CPU_SET(cpu, schedset);
+  hwloc_bitmap_foreach_end();
+#endif /* !CPU_ZERO_S */
+  return 0;
+}
+
+/** \brief Convert glibc sched affinity CPU set \p schedset into hwloc CPU set
+ *
+ * This function may be used before calling sched_setaffinity  or any other function
+ * that takes a cpu_set_t  as input parameter.
+ *
+ * \p schedsetsize should be sizeof(cpu_set_t) unless \p schedset was dynamically allocated with CPU_ALLOC
+ */
+static __hwloc_inline int
+hwloc_cpuset_from_glibc_sched_affinity(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_cpuset_t hwlocset,
+                                       const cpu_set_t *schedset, size_t schedsetsize)
+{
+#ifdef CPU_ZERO_S
+  int cpu, count;
+#endif
+  hwloc_bitmap_zero(hwlocset);
+#ifdef CPU_ZERO_S
+  count = CPU_COUNT_S(schedsetsize, schedset);
+  cpu = 0;
+  while (count) {
+    if (CPU_ISSET_S(cpu, schedsetsize, schedset)) {
+      hwloc_bitmap_set(hwlocset, cpu);
+      count--;
+    }
+    cpu++;
+  }
+#else /* !CPU_ZERO_S */
+  /* sched.h does not support dynamic cpu_set_t (introduced in glibc 2.7),
+   * assume we have a very old interface without CPU_COUNT (added in 2.6)
+   */
+  int cpu;
+  assert(schedsetsize == sizeof(cpu_set_t));
+  for(cpu=0; cpu<CPU_SETSIZE; cpu++)
+    if (CPU_ISSET(cpu, schedset))
+      hwloc_bitmap_set(hwlocset, cpu);
+#endif /* !CPU_ZERO_S */
+  return 0;
+}
+
+/** @} */
+
+
+#endif /* CPU_SET */
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+
+#endif /* HWLOC_GLIBC_SCHED_H */

opal/mca/hwloc/hwloc131/hwloc/include/hwloc/linux-libnuma.h

@@ -0,0 +1,471 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2010 INRIA.  All rights reserved.
+ * Copyright © 2009-2010 Université Bordeaux 1
+ * See COPYING in top-level directory.
+ */
+
+/** \file
+ * \brief Macros to help interaction between hwloc and Linux libnuma.
+ *
+ * Applications that use both Linux libnuma and hwloc may want to
+ * include this file so as to ease conversion between their respective types.
+ *
+ * This helper also offers a consistent behavior on non-NUMA machines
+ * or non-NUMA-aware kernels by assuming that the machines have a single
+ * NUMA node.
+ *
+ * \note The behavior of libnuma is undefined if the kernel is not NUMA-aware.
+ * (when CONFIG_NUMA is not set in the kernel configuration).
+ * This helper and libnuma may thus not be strictly compatible in this case,
+ * which may be detected by checking whether numa_available() returns -1.
+ */
+
+#ifndef HWLOC_LINUX_LIBNUMA_H
+#define HWLOC_LINUX_LIBNUMA_H
+
+#include <hwloc.h>
+#include <numa.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/** \defgroup hwlocality_linux_libnuma_ulongs Helpers for manipulating Linux libnuma unsigned long masks
+ * @{
+ */
+
+
+/** \brief Convert hwloc CPU set \p cpuset into the array of unsigned long \p mask
+ *
+ * \p mask is the array of unsigned long that will be filled.
+ * \p maxnode contains the maximal node number that may be stored in \p mask.
+ * \p maxnode will be set to the maximal node number that was found, plus one.
+ *
+ * This function may be used before calling set_mempolicy, mbind, migrate_pages
+ * or any other function that takes an array of unsigned long and a maximal
+ * node number as input parameter.
+ */
+static __hwloc_inline int
+hwloc_cpuset_to_linux_libnuma_ulongs(hwloc_topology_t topology, hwloc_const_cpuset_t cpuset,
+				    unsigned long *mask, unsigned long *maxnode)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+  unsigned long outmaxnode = -1;
+
+  /* round-up to the next ulong and clear all bytes */
+  *maxnode = (*maxnode + 8*sizeof(*mask) - 1) & ~(8*sizeof(*mask) - 1);
+  memset(mask, 0, *maxnode/8);
+
+  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    hwloc_obj_t node = NULL;
+    while ((node = hwloc_get_next_obj_covering_cpuset_by_type(topology, cpuset, HWLOC_OBJ_NODE, node)) != NULL) {
+      if (node->os_index >= *maxnode)
+	continue;
+      mask[node->os_index/sizeof(*mask)/8] |= 1UL << (node->os_index % (sizeof(*mask)*8));
+      if (outmaxnode == (unsigned long) -1 || outmaxnode < node->os_index)
+	outmaxnode = node->os_index;
+    }
+
+  } else {
+    /* if no numa, libnuma assumes we have a single node */
+    if (!hwloc_bitmap_iszero(cpuset)) {
+      mask[0] = 1;
+      outmaxnode = 0;
+    }
+  }
+
+  *maxnode = outmaxnode+1;
+  return 0;
+}
+
+/** \brief Convert hwloc NUMA node set \p nodeset into the array of unsigned long \p mask
+ *
+ * \p mask is the array of unsigned long that will be filled.
+ * \p maxnode contains the maximal node number that may be stored in \p mask.
+ * \p maxnode will be set to the maximal node number that was found, plus one.
+ *
+ * This function may be used before calling set_mempolicy, mbind, migrate_pages
+ * or any other function that takes an array of unsigned long and a maximal
+ * node number as input parameter.
+ */
+static __hwloc_inline int
+hwloc_nodeset_to_linux_libnuma_ulongs(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset,
+				      unsigned long *mask, unsigned long *maxnode)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+  unsigned long outmaxnode = -1;
+
+  /* round-up to the next ulong and clear all bytes */
+  *maxnode = (*maxnode + 8*sizeof(*mask) - 1) & ~(8*sizeof(*mask) - 1);
+  memset(mask, 0, *maxnode/8);
+
+  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    hwloc_obj_t node = NULL;
+    while ((node = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_NODE, node)) != NULL) {
+      if (node->os_index >= *maxnode)
+	continue;
+      if (!hwloc_bitmap_isset(nodeset, node->os_index))
+	continue;
+      mask[node->os_index/sizeof(*mask)/8] |= 1UL << (node->os_index % (sizeof(*mask)*8));
+      if (outmaxnode == (unsigned long) -1 || outmaxnode < node->os_index)
+	outmaxnode = node->os_index;
+    }
+
+  } else {
+    /* if no numa, libnuma assumes we have a single node */
+    if (!hwloc_bitmap_iszero(nodeset)) {
+      mask[0] = 1;
+      outmaxnode = 0;
+    }
+  }
+
+  *maxnode = outmaxnode+1;
+  return 0;
+}
+
+/** \brief Convert the array of unsigned long \p mask into hwloc CPU set
+ *
+ * \p mask is a array of unsigned long that will be read.
+ * \p maxnode contains the maximal node number that may be read in \p mask.
+ *
+ * This function may be used after calling get_mempolicy or any other function
+ * that takes an array of unsigned long as output parameter (and possibly
+ * a maximal node number as input parameter).
+ */
+static __hwloc_inline int
+hwloc_cpuset_from_linux_libnuma_ulongs(hwloc_topology_t topology, hwloc_cpuset_t cpuset,
+				      const unsigned long *mask, unsigned long maxnode)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+
+  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    hwloc_obj_t node;
+    unsigned i;
+    hwloc_bitmap_zero(cpuset);
+    for(i=0; i<maxnode; i++)
+      if (mask[i/sizeof(*mask)/8] & (1UL << (i% (sizeof(*mask)*8)))) {
+	node = hwloc_get_obj_by_depth(topology, depth, i);
+	if (node)
+	  hwloc_bitmap_or(cpuset, cpuset, node->cpuset);
+      }
+  } else {
+    /* if no numa, libnuma assumes we have a single node */
+    if (mask[0] & 1)
+      hwloc_bitmap_copy(cpuset, hwloc_topology_get_complete_cpuset(topology));
+    else
+      hwloc_bitmap_zero(cpuset);
+  }
+
+  return 0;
+}
+
+/** \brief Convert the array of unsigned long \p mask into hwloc NUMA node set
+ *
+ * \p mask is a array of unsigned long that will be read.
+ * \p maxnode contains the maximal node number that may be read in \p mask.
+ *
+ * This function may be used after calling get_mempolicy or any other function
+ * that takes an array of unsigned long as output parameter (and possibly
+ * a maximal node number as input parameter).
+ */
+static __hwloc_inline int
+hwloc_nodeset_from_linux_libnuma_ulongs(hwloc_topology_t topology, hwloc_nodeset_t nodeset,
+					const unsigned long *mask, unsigned long maxnode)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+
+  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    hwloc_obj_t node;
+    unsigned i;
+    hwloc_bitmap_zero(nodeset);
+    for(i=0; i<maxnode; i++)
+      if (mask[i/sizeof(*mask)/8] & (1UL << (i% (sizeof(*mask)*8)))) {
+	node = hwloc_get_obj_by_depth(topology, depth, i);
+	if (node)
+	  hwloc_bitmap_set(nodeset, node->os_index);
+      }
+  } else {
+    /* if no numa, libnuma assumes we have a single node */
+    if (mask[0] & 1)
+      hwloc_bitmap_fill(nodeset);
+    else
+      hwloc_bitmap_zero(nodeset);
+  }
+
+  return 0;
+}
+
+/** @} */
+
+
+
+/** \defgroup hwlocality_linux_libnuma_bitmask Helpers for manipulating Linux libnuma bitmask
+ * @{
+ */
+
+
+/** \brief Convert hwloc CPU set \p cpuset into the returned libnuma bitmask
+ *
+ * The returned bitmask should later be freed with numa_bitmask_free.
+ *
+ * This function may be used before calling many numa_ functions
+ * that use a struct bitmask as an input parameter.
+ *
+ * \return newly allocated struct bitmask.
+ */
+static __hwloc_inline struct bitmask * __hwloc_attribute_malloc
+hwloc_cpuset_to_linux_libnuma_bitmask(hwloc_topology_t topology, hwloc_const_cpuset_t cpuset)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+  struct bitmask *bitmask = numa_allocate_cpumask();
+  if (!bitmask)
+    return NULL;
+
+  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    hwloc_obj_t node = NULL;
+    while ((node = hwloc_get_next_obj_covering_cpuset_by_type(topology, cpuset, HWLOC_OBJ_NODE, node)) != NULL)
+      numa_bitmask_setbit(bitmask, node->os_index);
+  } else {
+    /* if no numa, libnuma assumes we have a single node */
+    if (!hwloc_bitmap_iszero(cpuset))
+      numa_bitmask_setbit(bitmask, 0);
+  }
+
+  return bitmask;
+}
+
+/** \brief Convert hwloc NUMA node set \p nodeset into the returned libnuma bitmask
+ *
+ * The returned bitmask should later be freed with numa_bitmask_free.
+ *
+ * This function may be used before calling many numa_ functions
+ * that use a struct bitmask as an input parameter.
+ *
+ * \return newly allocated struct bitmask.
+ */
+static __hwloc_inline struct bitmask * __hwloc_attribute_malloc
+hwloc_nodeset_to_linux_libnuma_bitmask(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+  struct bitmask *bitmask = numa_allocate_cpumask();
+  if (!bitmask)
+    return NULL;
+
+  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    hwloc_obj_t node = NULL;
+    while ((node = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_NODE, node)) != NULL)
+      if (hwloc_bitmap_isset(nodeset, node->os_index))
+	numa_bitmask_setbit(bitmask, node->os_index);
+  } else {
+    /* if no numa, libnuma assumes we have a single node */
+    if (!hwloc_bitmap_iszero(nodeset))
+      numa_bitmask_setbit(bitmask, 0);
+  }
+
+  return bitmask;
+}
+
+/** \brief Convert libnuma bitmask \p bitmask into hwloc CPU set \p cpuset
+ *
+ * This function may be used after calling many numa_ functions
+ * that use a struct bitmask as an output parameter.
+ */
+static __hwloc_inline int
+hwloc_cpuset_from_linux_libnuma_bitmask(hwloc_topology_t topology, hwloc_cpuset_t cpuset,
+					const struct bitmask *bitmask)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+
+  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    hwloc_obj_t node;
+    int i;
+    hwloc_bitmap_zero(cpuset);
+    for(i=0; i<NUMA_NUM_NODES; i++)
+      if (numa_bitmask_isbitset(bitmask, i)) {
+	node = hwloc_get_obj_by_depth(topology, depth, i);
+	if (node)
+	  hwloc_bitmap_or(cpuset, cpuset, node->cpuset);
+      }
+  } else {
+    /* if no numa, libnuma assumes we have a single node */
+    if (numa_bitmask_isbitset(bitmask, 0))
+      hwloc_bitmap_copy(cpuset, hwloc_topology_get_complete_cpuset(topology));
+    else
+      hwloc_bitmap_zero(cpuset);
+  }
+
+  return 0;
+}
+
+/** \brief Convert libnuma bitmask \p bitmask into hwloc NUMA node set \p nodeset
+ *
+ * This function may be used after calling many numa_ functions
+ * that use a struct bitmask as an output parameter.
+ */
+static __hwloc_inline int
+hwloc_nodeset_from_linux_libnuma_bitmask(hwloc_topology_t topology, hwloc_nodeset_t nodeset,
+					 const struct bitmask *bitmask)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+
+  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    hwloc_obj_t node;
+    int i;
+    hwloc_bitmap_zero(nodeset);
+    for(i=0; i<NUMA_NUM_NODES; i++)
+      if (numa_bitmask_isbitset(bitmask, i)) {
+	node = hwloc_get_obj_by_depth(topology, depth, i);
+	if (node)
+	  hwloc_bitmap_set(nodeset, node->os_index);
+      }
+  } else {
+    /* if no numa, libnuma assumes we have a single node */
+    if (numa_bitmask_isbitset(bitmask, 0))
+      hwloc_bitmap_fill(nodeset);
+    else
+      hwloc_bitmap_zero(nodeset);
+  }
+
+  return 0;
+}
+
+/** @} */
+
+
+
+#ifdef NUMA_VERSION1_COMPATIBILITY
+/** \defgroup hwlocality_linux_libnuma_nodemask Helpers for manipulating Linux libnuma nodemask_t
+ * @{
+ */
+
+
+/** \brief Convert hwloc CPU set \p cpuset into libnuma nodemask \p nodemask
+ *
+ * This function may be used before calling some old libnuma functions
+ * that use a nodemask_t as an input parameter.
+ */
+static __hwloc_inline int
+hwloc_cpuset_to_linux_libnuma_nodemask(hwloc_topology_t topology, hwloc_const_cpuset_t cpuset,
+				      nodemask_t *nodemask)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+
+  nodemask_zero(nodemask);
+
+  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    hwloc_obj_t node = NULL;
+    while ((node = hwloc_get_next_obj_covering_cpuset_by_type(topology, cpuset, HWLOC_OBJ_NODE, node)) != NULL)
+      nodemask_set(nodemask, node->os_index);
+  } else {
+    /* if no numa, libnuma assumes we have a single node */
+    if (!hwloc_bitmap_iszero(cpuset))
+      nodemask_set(nodemask, 0);
+  }
+
+  return 0;
+}
+
+/** \brief Convert hwloc NUMA node set \p nodeset into libnuma nodemask \p nodemask
+ *
+ * This function may be used before calling some old libnuma functions
+ * that use a nodemask_t as an input parameter.
+ */
+static __hwloc_inline int
+hwloc_nodeset_to_linux_libnuma_nodemask(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset,
+					nodemask_t *nodemask)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+
+  nodemask_zero(nodemask);
+
+  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    hwloc_obj_t node = NULL;
+    while ((node = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_NODE, node)) != NULL)
+      if (hwloc_bitmap_isset(nodeset, node->os_index))
+	nodemask_set(nodemask, node->os_index);
+  } else {
+    /* if no numa, libnuma assumes we have a single node */
+    if (!hwloc_bitmap_iszero(nodeset))
+      nodemask_set(nodemask, 0);
+  }
+
+  return 0;
+}
+
+/** \brief Convert libnuma nodemask \p nodemask into hwloc CPU set \p cpuset
+ *
+ * This function may be used before calling some old libnuma functions
+ * that use a nodemask_t as an output parameter.
+ */
+static __hwloc_inline int
+hwloc_cpuset_from_linux_libnuma_nodemask(hwloc_topology_t topology, hwloc_cpuset_t cpuset,
+					const nodemask_t *nodemask)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+
+  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    hwloc_obj_t node;
+    int i;
+    hwloc_bitmap_zero(cpuset);
+    for(i=0; i<NUMA_NUM_NODES; i++)
+      if (nodemask_isset(nodemask, i)) {
+	node = hwloc_get_obj_by_depth(topology, depth, i);
+	if (node)
+	  hwloc_bitmap_or(cpuset, cpuset, node->cpuset);
+      }
+  } else {
+    /* if no numa, libnuma assumes we have a single node */
+    if (nodemask_isset(nodemask, 0))
+      hwloc_bitmap_copy(cpuset, hwloc_topology_get_complete_cpuset(topology));
+    else
+      hwloc_bitmap_zero(cpuset);
+  }
+
+  return 0;
+}
+
+/** \brief Convert libnuma nodemask \p nodemask into hwloc NUMA node set \p nodeset
+ *
+ * This function may be used before calling some old libnuma functions
+ * that use a nodemask_t as an output parameter.
+ */
+static __hwloc_inline int
+hwloc_nodeset_from_linux_libnuma_nodemask(hwloc_topology_t topology, hwloc_nodeset_t nodeset,
+					  const nodemask_t *nodemask)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+
+  if (depth != HWLOC_TYPE_DEPTH_UNKNOWN) {
+    hwloc_obj_t node;
+    int i;
+    hwloc_bitmap_zero(nodeset);
+    for(i=0; i<NUMA_NUM_NODES; i++)
+      if (nodemask_isset(nodemask, i)) {
+	node = hwloc_get_obj_by_depth(topology, depth, i);
+	if (node)
+	  hwloc_bitmap_set(nodeset, node->os_index);
+      }
+  } else {
+    /* if no numa, libnuma assumes we have a single node */
+    if (nodemask_isset(nodemask, 0))
+      hwloc_bitmap_fill(nodeset);
+    else
+      hwloc_bitmap_zero(nodeset);
+  }
+
+  return 0;
+}
+
+/** @} */
+#endif /* NUMA_VERSION1_COMPATIBILITY */
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+
+#endif /* HWLOC_LINUX_NUMA_H */

opal/mca/hwloc/hwloc131/hwloc/include/hwloc/linux.h

@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2010 INRIA.  All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * See COPYING in top-level directory.
+ */
+
+/** \file
+ * \brief Macros to help interaction between hwloc and Linux.
+ *
+ * Applications that use hwloc on Linux may want to include this file
+ * if using some low-level Linux features.
+ */
+
+#ifndef HWLOC_LINUX_H
+#define HWLOC_LINUX_H
+
+#include <hwloc.h>
+#include <stdio.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/** \defgroup hwlocality_linux Linux-only helpers
+ *
+ * This includes helpers for manipulating linux kernel cpumap files, and hwloc
+ * equivalents of the Linux sched_setaffinity and sched_getaffinity system calls.
+ *
+ * @{
+ */
+
+/** \brief Convert a linux kernel cpumap file \p file into hwloc CPU set.
+ *
+ * Might be used when reading CPU set from sysfs attributes such as topology
+ * and caches for processors, or local_cpus for devices.
+ */
+HWLOC_DECLSPEC int hwloc_linux_parse_cpumap_file(FILE *file, hwloc_cpuset_t set);
+
+/** \brief Bind a thread \p tid on cpus given in cpuset \p set
+ *
+ * The behavior is exactly the same as the Linux sched_setaffinity system call,
+ * but uses a hwloc cpuset.
+ */
+HWLOC_DECLSPEC int hwloc_linux_set_tid_cpubind(hwloc_topology_t topology, pid_t tid, hwloc_const_cpuset_t set);
+
+/** \brief Get the current binding of thread \p tid
+ *
+ * The behavior is exactly the same as the Linux sched_getaffinity system call,
+ * but uses a hwloc cpuset.
+ */
+HWLOC_DECLSPEC int hwloc_linux_get_tid_cpubind(hwloc_topology_t topology, pid_t tid, hwloc_cpuset_t set);
+
+/** @} */
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+
+#endif /* HWLOC_GLIBC_SCHED_H */

opal/mca/hwloc/hwloc131/hwloc/include/hwloc/myriexpress.h

@@ -0,0 +1,107 @@
+/*
+ * Copyright © 2010 INRIA.  All rights reserved.
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/** \file
+ * \brief Macros to help interaction between hwloc and Myrinet Express.
+ *
+ * Applications that use both hwloc and Myrinet Express verbs may want to
+ * include this file so as to get topology information for Myrinet hardware.
+ *
+ */
+
+#ifndef HWLOC_MYRIEXPRESS_H
+#define HWLOC_MYRIEXPRESS_H
+
+#include <hwloc.h>
+#include <hwloc/autogen/config.h>
+#include <hwloc/linux.h>
+
+#include <myriexpress.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/** \defgroup hwlocality_myriexpress Myrinet Express-Specific Functions
+ * @{
+ */
+
+/** \brief Get the CPU set of logical processors that are physically
+ * close the MX board \p id.
+ *
+ * For the given Myrinet Express board index \p id, read the
+ * OS-provided NUMA node and return the corresponding CPU set.
+ */
+static __hwloc_inline int
+hwloc_mx_board_get_device_cpuset(hwloc_topology_t topology,
+				 unsigned id, hwloc_cpuset_t set)
+{
+  uint32_t in, out;
+
+  in = id;
+  if (mx_get_info(NULL, MX_NUMA_NODE, &in, sizeof(in), &out, sizeof(out)) != MX_SUCCESS) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  if (out != (uint32_t) -1) {
+    hwloc_obj_t obj = NULL;
+    while ((obj = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_NODE, obj)) != NULL)
+      if (obj->os_index == out) {
+	hwloc_bitmap_copy(set, obj->cpuset);
+	goto out;
+      }
+  }
+  /* fallback to the full topology cpuset */
+  hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
+
+ out:
+  return 0;
+}
+
+/** \brief Get the CPU set of logical processors that are physically
+ * close to endpoint \p endpoint.
+ *
+ * For the given Myrinet Express endpoint \p endpoint, read the
+ * OS-provided NUMA node and return the corresponding CPU set.
+ */
+static __hwloc_inline int
+hwloc_mx_endpoint_get_device_cpuset(hwloc_topology_t topology,
+				    mx_endpoint_t endpoint, hwloc_cpuset_t set)
+{
+  uint64_t nid;
+  uint32_t nindex, eid;
+  mx_endpoint_addr_t eaddr;
+
+  if (mx_get_endpoint_addr(endpoint, &eaddr) != MX_SUCCESS) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  if (mx_decompose_endpoint_addr(eaddr, &nid, &eid) != MX_SUCCESS) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  if (mx_nic_id_to_board_number(nid, &nindex) != MX_SUCCESS) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  return hwloc_mx_board_get_device_cpuset(topology, nindex, set);
+}
+
+/** @} */
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+
+#endif /* HWLOC_MYRIEXPRESS_H */

opal/mca/hwloc/hwloc131/hwloc/include/hwloc/openfabrics-verbs.h

@@ -0,0 +1,81 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2010 INRIA.  All rights reserved.
+ * Copyright © 2009-2010 Université Bordeaux 1
+ * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/** \file
+ * \brief Macros to help interaction between hwloc and OpenFabrics
+ * verbs.
+ *
+ * Applications that use both hwloc and OpenFabrics verbs may want to
+ * include this file so as to get topology information for OpenFabrics
+ * hardware.
+ *
+ */
+
+#ifndef HWLOC_OPENFABRICS_VERBS_H
+#define HWLOC_OPENFABRICS_VERBS_H
+
+#include <hwloc.h>
+#include <hwloc/autogen/config.h>
+#include <hwloc/linux.h>
+
+#include <infiniband/verbs.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/** \defgroup hwlocality_openfabrics OpenFabrics-Specific Functions
+ * @{
+ */
+
+/** \brief Get the CPU set of logical processors that are physically
+ * close to device \p ibdev.
+ *
+ * For the given OpenFabrics device \p ibdev, read the corresponding
+ * kernel-provided cpumap file and return the corresponding CPU set.
+ * This function is currently only implemented in a meaningful way for
+ * Linux; other systems will simply get a full cpuset.
+ */
+static __hwloc_inline int
+hwloc_ibv_get_device_cpuset(hwloc_topology_t topology __hwloc_attribute_unused,
+			    struct ibv_device *ibdev, hwloc_cpuset_t set)
+{
+#ifdef HWLOC_LINUX_SYS
+  /* If we're on Linux, use the verbs-provided sysfs mechanism to
+     get the local cpus */
+#define HWLOC_OPENFABRICS_VERBS_SYSFS_PATH_MAX 128
+  char path[HWLOC_OPENFABRICS_VERBS_SYSFS_PATH_MAX];
+  FILE *sysfile = NULL;
+
+  sprintf(path, "/sys/class/infiniband/%s/device/local_cpus",
+	  ibv_get_device_name(ibdev));
+  sysfile = fopen(path, "r");
+  if (!sysfile)
+    return -1;
+
+  hwloc_linux_parse_cpumap_file(sysfile, set);
+
+  fclose(sysfile);
+#else
+  /* Non-Linux systems simply get a full cpuset */
+  hwloc_bitmap_copy(set, hwloc_topology_get_complete_cpuset(topology));
+#endif
+  return 0;
+}
+
+/** @} */
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+
+#endif /* HWLOC_OPENFABRICS_VERBS_H */

opal/mca/hwloc/hwloc131/hwloc/include/hwloc/rename.h

@@ -0,0 +1,554 @@
+/*
+ * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
+ * Copyright © 2010-2011 INRIA.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+#ifndef HWLOC_RENAME_H
+#define HWLOC_RENAME_H
+
+#include <hwloc/autogen/config.h>
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+/* Only enact these defines if we're actually renaming the symbols
+   (i.e., avoid trying to have no-op defines if we're *not*
+   renaming). */
+
+#if HWLOC_SYM_TRANSFORM
+
+/* Use a preprocessor two-step in order to get the prefixing right.
+   Make 2 macros: HWLOC_NAME and HWLOC_NAME_CAPS for renaming
+   things. */
+
+#define HWLOC_MUNGE_NAME(a, b) HWLOC_MUNGE_NAME2(a, b)
+#define HWLOC_MUNGE_NAME2(a, b) a ## b
+#define HWLOC_NAME(name) HWLOC_MUNGE_NAME(HWLOC_SYM_PREFIX, hwloc_ ## name)
+#define HWLOC_NAME_CAPS(name) HWLOC_MUNGE_NAME(HWLOC_SYM_PREFIX_CAPS, hwloc_ ## name)
+
+/* Now define all the "real" names to be the prefixed names.  This
+   allows us to use the real names throughout the code base (i.e.,
+   "hwloc_<foo>"); the preprocessor will adjust to have the prefixed
+   name under the covers. */
+
+/* Names from hwloc.h */
+
+#define hwloc_get_api_version HWLOC_NAME(get_api_version)
+
+#define hwloc_topology HWLOC_NAME(topology)
+#define hwloc_topology_t HWLOC_NAME(topology_t)
+
+#define hwloc_cpuset_t HWLOC_NAME(cpuset_t)
+#define hwloc_const_cpuset_t HWLOC_NAME(const_cpuset_t)
+#define hwloc_nodeset_t HWLOC_NAME(nodeset_t)
+#define hwloc_const_nodeset_t HWLOC_NAME(const_nodeset_t)
+
+#define HWLOC_OBJ_SYSTEM HWLOC_NAME_CAPS(OBJ_SYSTEM)
+#define HWLOC_OBJ_MACHINE HWLOC_NAME_CAPS(OBJ_MACHINE)
+#define HWLOC_OBJ_NODE HWLOC_NAME_CAPS(OBJ_NODE)
+#define HWLOC_OBJ_SOCKET HWLOC_NAME_CAPS(OBJ_SOCKET)
+#define HWLOC_OBJ_CACHE HWLOC_NAME_CAPS(OBJ_CACHE)
+#define HWLOC_OBJ_CORE HWLOC_NAME_CAPS(OBJ_CORE)
+#define HWLOC_OBJ_PU HWLOC_NAME_CAPS(OBJ_PU)
+#define HWLOC_OBJ_MISC HWLOC_NAME_CAPS(OBJ_MISC)
+#define HWLOC_OBJ_GROUP HWLOC_NAME_CAPS(OBJ_GROUP)
+#define HWLOC_OBJ_BRIDGE HWLOC_NAME_CAPS(OBJ_BRIDGE)
+#define HWLOC_OBJ_PCI_DEVICE HWLOC_NAME_CAPS(OBJ_PCI_DEVICE)
+#define HWLOC_OBJ_OS_DEVICE HWLOC_NAME_CAPS(OBJ_OS_DEVICE)
+#define HWLOC_OBJ_TYPE_MAX HWLOC_NAME_CAPS(OBJ_TYPE_MAX)
+#define hwloc_obj_type_t HWLOC_NAME(obj_type_t)
+
+#define hwloc_obj_bridge_type_e HWLOC_NAME(obj_bridge_type_e)
+#define hwloc_obj_bridge_type_t HWLOC_NAME(obj_bridge_type_t)
+#define HWLOC_OBJ_BRIDGE_HOST HWLOC_NAME_CAPS(OBJ_BRIDGE_HOST)
+#define HWLOC_OBJ_BRIDGE_PCI HWLOC_NAME_CAPS(OBJ_BRIDGE_PCI)
+
+#define hwloc_obj_osdev_type_e HWLOC_NAME(obj_osdev_type_e)
+#define hwloc_obj_osdev_type_t HWLOC_NAME(obj_osdev_type_t)
+#define HWLOC_OBJ_OSDEV_BLOCK HWLOC_NAME_CAPS(OBJ_OSDEV_BLOCK)
+#define HWLOC_OBJ_OSDEV_GPU HWLOC_NAME_CAPS(OBJ_OSDEV_GPU)
+#define HWLOC_OBJ_OSDEV_NETWORK HWLOC_NAME_CAPS(OBJ_OSDEV_NETWORK)
+#define HWLOC_OBJ_OSDEV_OPENFABRICS HWLOC_NAME_CAPS(OBJ_OSDEV_OPENFABRICS)
+#define HWLOC_OBJ_OSDEV_DMA HWLOC_NAME_CAPS(OBJ_OSDEV_DMA)
+
+#define hwloc_compare_types HWLOC_NAME(compare_types)
+
+#define hwloc_compare_types_e HWLOC_NAME(compare_types_e)
+#define HWLOC_TYPE_UNORDERED HWLOC_NAME_CAPS(TYPE_UNORDERED)
+
+#define hwloc_obj_memory_s HWLOC_NAME(obj_memory_s)
+#define hwloc_obj_memory_page_type_s HWLOC_NAME(obj_memory_page_type_s)
+
+#define hwloc_obj HWLOC_NAME(obj)
+#define hwloc_obj_t HWLOC_NAME(obj_t)
+
+#define hwloc_distances_s HWLOC_NAME(distances_s)
+#define hwloc_obj_info_s HWLOC_NAME(obj_info_s)
+
+#define hwloc_obj_attr_u HWLOC_NAME(obj_attr_u)
+#define hwloc_cache_attr_s HWLOC_NAME(cache_attr_s)
+#define hwloc_group_attr_s HWLOC_NAME(group_attr_s)
+#define hwloc_pcidev_attr_s HWLOC_NAME(pcidev_attr_s)
+#define hwloc_bridge_attr_s HWLOC_NAME(bridge_attr_s)
+#define hwloc_osdev_attr_s HWLOC_NAME(osdev_attr_s)
+
+#define hwloc_topology_init HWLOC_NAME(topology_init)
+#define hwloc_topology_load HWLOC_NAME(topology_load)
+#define hwloc_topology_destroy HWLOC_NAME(topology_destroy)
+#define hwloc_topology_check HWLOC_NAME(topology_check)
+#define hwloc_topology_ignore_type HWLOC_NAME(topology_ignore_type)
+#define hwloc_topology_ignore_type_keep_structure HWLOC_NAME(topology_ignore_type_keep_structure)
+#define hwloc_topology_ignore_all_keep_structure HWLOC_NAME(topology_ignore_all_keep_structure)
+
+#define hwloc_topology_flags_e HWLOC_NAME(topology_flags_e)
+
+#define HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM HWLOC_NAME_CAPS(TOPOLOGY_FLAG_WHOLE_SYSTEM)
+#define HWLOC_TOPOLOGY_FLAG_IS_THISSYSTEM HWLOC_NAME_CAPS(TOPOLOGY_FLAG_IS_THISSYSTEM)
+#define HWLOC_TOPOLOGY_FLAG_IO_DEVICES HWLOC_NAME_CAPS(TOPOLOGY_FLAG_IO_DEVICES)
+#define HWLOC_TOPOLOGY_FLAG_IO_BRIDGES HWLOC_NAME_CAPS(TOPOLOGY_FLAG_IO_BRIDGES)
+#define HWLOC_TOPOLOGY_FLAG_WHOLE_IO HWLOC_NAME_CAPS(TOPOLOGY_FLAG_WHOLE_IO)
+
+#define hwloc_topology_set_flags HWLOC_NAME(topology_set_flags)
+#define hwloc_topology_set_fsroot HWLOC_NAME(topology_set_fsroot)
+#define hwloc_topology_set_pid HWLOC_NAME(topology_set_pid)
+#define hwloc_topology_set_synthetic HWLOC_NAME(topology_set_synthetic)
+#define hwloc_topology_set_xml HWLOC_NAME(topology_set_xml)
+#define hwloc_topology_set_xmlbuffer HWLOC_NAME(topology_set_xmlbuffer)
+#define hwloc_topology_set_distance_matrix HWLOC_NAME(topology_set_distance_matrix)
+
+#define hwloc_topology_discovery_support HWLOC_NAME(topology_discovery_support)
+#define hwloc_topology_cpubind_support HWLOC_NAME(topology_cpubind_support)
+#define hwloc_topology_membind_support HWLOC_NAME(topology_membind_support)
+#define hwloc_topology_support HWLOC_NAME(topology_support)
+#define hwloc_topology_get_support HWLOC_NAME(topology_get_support)
+#define hwloc_topology_export_xml HWLOC_NAME(topology_export_xml)
+#define hwloc_topology_export_xmlbuffer HWLOC_NAME(topology_export_xmlbuffer)
+#define hwloc_free_xmlbuffer HWLOC_NAME(free_xmlbuffer)
+
+#define hwloc_topology_insert_misc_object_by_cpuset HWLOC_NAME(topology_insert_misc_object_by_cpuset)
+#define hwloc_topology_insert_misc_object_by_parent HWLOC_NAME(topology_insert_misc_object_by_parent)
+
+#define hwloc_restrict_flags_e HWLOC_NAME(restrict_flags_e)
+#define HWLOC_RESTRICT_FLAG_ADAPT_DISTANCES HWLOC_NAME_CAPS(RESTRICT_FLAG_ADAPT_DISTANCES)
+#define HWLOC_RESTRICT_FLAG_ADAPT_MISC HWLOC_NAME_CAPS(RESTRICT_FLAG_ADAPT_MISC)
+#define HWLOC_RESTRICT_FLAG_ADAPT_IO HWLOC_NAME_CAPS(RESTRICT_FLAG_ADAPT_IO)
+#define hwloc_topology_restrict HWLOC_NAME(topology_restrict)
+
+#define hwloc_topology_get_depth HWLOC_NAME(topology_get_depth)
+#define hwloc_get_type_depth HWLOC_NAME(get_type_depth)
+
+#define hwloc_get_type_depth_e HWLOC_NAME(get_type_depth_e)
+#define HWLOC_TYPE_DEPTH_UNKNOWN HWLOC_NAME_CAPS(TYPE_DEPTH_UNKNOWN)
+#define HWLOC_TYPE_DEPTH_MULTIPLE HWLOC_NAME_CAPS(TYPE_DEPTH_MULTIPLE)
+#define HWLOC_TYPE_DEPTH_BRIDGE HWLOC_NAME_CAPS(TYPE_DEPTH_BRIDGE)
+#define HWLOC_TYPE_DEPTH_PCI_DEVICE HWLOC_NAME_CAPS(TYPE_DEPTH_PCI_DEVICE)
+#define HWLOC_TYPE_DEPTH_OS_DEVICE HWLOC_NAME_CAPS(TYPE_DEPTH_OS_DEVICE)
+
+#define hwloc_get_depth_type HWLOC_NAME(get_depth_type)
+#define hwloc_get_nbobjs_by_depth HWLOC_NAME(get_nbobjs_by_depth)
+#define hwloc_get_nbobjs_by_type HWLOC_NAME(get_nbobjs_by_type)
+
+#define hwloc_topology_is_thissystem HWLOC_NAME(topology_is_thissystem)
+
+#define hwloc_get_obj_by_depth HWLOC_NAME(get_obj_by_depth )
+#define hwloc_get_obj_by_type HWLOC_NAME(get_obj_by_type )
+
+#define hwloc_obj_type_string HWLOC_NAME(obj_type_string )
+#define hwloc_obj_type_of_string HWLOC_NAME(obj_type_of_string )
+#define hwloc_obj_type_snprintf HWLOC_NAME(obj_type_snprintf )
+#define hwloc_obj_attr_snprintf HWLOC_NAME(obj_attr_snprintf )
+#define hwloc_obj_snprintf HWLOC_NAME(obj_snprintf)
+#define hwloc_obj_cpuset_snprintf HWLOC_NAME(obj_cpuset_snprintf)
+#define hwloc_obj_get_info_by_name HWLOC_NAME(obj_get_info_by_name)
+#define hwloc_obj_add_info HWLOC_NAME(obj_add_info)
+
+#define HWLOC_CPUBIND_PROCESS HWLOC_NAME_CAPS(CPUBIND_PROCESS)
+#define HWLOC_CPUBIND_THREAD HWLOC_NAME_CAPS(CPUBIND_THREAD)
+#define HWLOC_CPUBIND_STRICT HWLOC_NAME_CAPS(CPUBIND_STRICT)
+#define HWLOC_CPUBIND_NOMEMBIND HWLOC_NAME_CAPS(CPUBIND_NOMEMBIND)
+
+#define hwloc_cpubind_flags_t HWLOC_NAME(cpubind_flags_t)
+
+#define hwloc_set_cpubind HWLOC_NAME(set_cpubind)
+#define hwloc_get_cpubind HWLOC_NAME(get_cpubind)
+#define hwloc_set_proc_cpubind HWLOC_NAME(set_proc_cpubind)
+#define hwloc_get_proc_cpubind HWLOC_NAME(get_proc_cpubind)
+#define hwloc_set_thread_cpubind HWLOC_NAME(set_thread_cpubind)
+#define hwloc_get_thread_cpubind HWLOC_NAME(get_thread_cpubind)
+
+#define hwloc_get_last_cpu_location HWLOC_NAME(get_last_cpu_location)
+#define hwloc_get_proc_last_cpu_location HWLOC_NAME(get_proc_last_cpu_location)
+
+#define HWLOC_MEMBIND_DEFAULT HWLOC_NAME_CAPS(MEMBIND_DEFAULT)
+#define HWLOC_MEMBIND_FIRSTTOUCH HWLOC_NAME_CAPS(MEMBIND_FIRSTTOUCH)
+#define HWLOC_MEMBIND_BIND HWLOC_NAME_CAPS(MEMBIND_BIND)
+#define HWLOC_MEMBIND_INTERLEAVE HWLOC_NAME_CAPS(MEMBIND_INTERLEAVE)
+#define HWLOC_MEMBIND_REPLICATE HWLOC_NAME_CAPS(MEMBIND_REPLICATE)
+#define HWLOC_MEMBIND_NEXTTOUCH HWLOC_NAME_CAPS(MEMBIND_NEXTTOUCH)
+#define HWLOC_MEMBIND_MIXED HWLOC_NAME_CAPS(MEMBIND_MIXED)
+
+#define hwloc_membind_policy_t HWLOC_NAME(membind_policy_t)
+
+#define HWLOC_MEMBIND_PROCESS HWLOC_NAME_CAPS(MEMBIND_PROCESS)
+#define HWLOC_MEMBIND_THREAD HWLOC_NAME_CAPS(MEMBIND_THREAD)
+#define HWLOC_MEMBIND_STRICT HWLOC_NAME_CAPS(MEMBIND_STRICT)
+#define HWLOC_MEMBIND_MIGRATE HWLOC_NAME_CAPS(MEMBIND_MIGRATE)
+#define HWLOC_MEMBIND_NOCPUBIND HWLOC_NAME_CAPS(MEMBIND_NOCPUBIND)
+
+#define hwloc_membind_flags_t HWLOC_NAME(membind_flags_t)
+
+#define hwloc_set_membind_nodeset HWLOC_NAME(set_membind_nodeset)
+#define hwloc_set_membind HWLOC_NAME(set_membind)
+#define hwloc_get_membind_nodeset HWLOC_NAME(get_membind_nodeset)
+#define hwloc_get_membind HWLOC_NAME(get_membind)
+#define hwloc_set_proc_membind_nodeset HWLOC_NAME(set_proc_membind_nodeset)
+#define hwloc_set_proc_membind HWLOC_NAME(set_proc_membind)
+#define hwloc_get_proc_membind_nodeset HWLOC_NAME(get_proc_membind_nodeset)
+#define hwloc_get_proc_membind HWLOC_NAME(get_proc_membind)
+#define hwloc_set_area_membind_nodeset HWLOC_NAME(set_area_membind_nodeset)
+#define hwloc_set_area_membind HWLOC_NAME(set_area_membind)
+#define hwloc_get_area_membind_nodeset HWLOC_NAME(get_area_membind_nodeset)
+#define hwloc_get_area_membind HWLOC_NAME(get_area_membind)
+#define hwloc_alloc_membind_nodeset HWLOC_NAME(alloc_membind_nodeset)
+#define hwloc_alloc_membind HWLOC_NAME(alloc_membind)
+#define hwloc_alloc HWLOC_NAME(alloc)
+#define hwloc_free HWLOC_NAME(free)
+
+#define hwloc_get_non_io_ancestor_obj HWLOC_NAME(get_non_io_ancestor_obj)
+#define hwloc_get_next_pcidev HWLOC_NAME(get_next_pcidev)
+#define hwloc_get_pcidev_by_busid HWLOC_NAME(get_pcidev_by_busid)
+#define hwloc_get_pcidev_by_busidstring HWLOC_NAME(get_pcidev_by_busidstring)
+#define hwloc_get_next_osdev HWLOC_NAME(get_next_osdev)
+#define hwloc_get_next_bridge HWLOC_NAME(get_next_bridge)
+#define hwloc_bridge_covers_pcibus HWLOC_NAME(bridge_covers_pcibus)
+#define hwloc_get_hostbridge_by_pcibus HWLOC_NAME(get_hostbridge_by_pcibus)
+
+/* hwloc/bitmap.h */
+
+#define hwloc_bitmap HWLOC_NAME(bitmap)
+#define hwloc_bitmap_s HWLOC_NAME(bitmap_s)
+#define hwloc_bitmap_t HWLOC_NAME(bitmap_t)
+#define hwloc_const_bitmap_t HWLOC_NAME(const_bitmap_t)
+
+#define hwloc_bitmap_alloc HWLOC_NAME(bitmap_alloc)
+#define hwloc_bitmap_alloc_full HWLOC_NAME(bitmap_alloc_full)
+#define hwloc_bitmap_free HWLOC_NAME(bitmap_free)
+#define hwloc_bitmap_dup HWLOC_NAME(bitmap_dup)
+#define hwloc_bitmap_copy HWLOC_NAME(bitmap_copy)
+#define hwloc_bitmap_snprintf HWLOC_NAME(bitmap_snprintf)
+#define hwloc_bitmap_asprintf HWLOC_NAME(bitmap_asprintf)
+#define hwloc_bitmap_sscanf HWLOC_NAME(bitmap_sscanf)
+#define hwloc_bitmap_list_snprintf HWLOC_NAME(bitmap_list_snprintf)
+#define hwloc_bitmap_list_asprintf HWLOC_NAME(bitmap_list_asprintf)
+#define hwloc_bitmap_list_sscanf HWLOC_NAME(bitmap_list_sscanf)
+#define hwloc_bitmap_taskset_snprintf HWLOC_NAME(bitmap_taskset_snprintf)
+#define hwloc_bitmap_taskset_asprintf HWLOC_NAME(bitmap_taskset_asprintf)
+#define hwloc_bitmap_taskset_sscanf HWLOC_NAME(bitmap_taskset_sscanf)
+#define hwloc_bitmap_zero HWLOC_NAME(bitmap_zero)
+#define hwloc_bitmap_fill HWLOC_NAME(bitmap_fill)
+#define hwloc_bitmap_from_ulong HWLOC_NAME(bitmap_from_ulong)
+
+#define hwloc_bitmap_from_ith_ulong HWLOC_NAME(bitmap_from_ith_ulong)
+#define hwloc_bitmap_to_ulong HWLOC_NAME(bitmap_to_ulong)
+#define hwloc_bitmap_to_ith_ulong HWLOC_NAME(bitmap_to_ith_ulong)
+#define hwloc_bitmap_only HWLOC_NAME(bitmap_only)
+#define hwloc_bitmap_allbut HWLOC_NAME(bitmap_allbut)
+#define hwloc_bitmap_set HWLOC_NAME(bitmap_set)
+#define hwloc_bitmap_set_range HWLOC_NAME(bitmap_set_range)
+#define hwloc_bitmap_set_ith_ulong HWLOC_NAME(bitmap_set_ith_ulong)
+#define hwloc_bitmap_clr HWLOC_NAME(bitmap_clr)
+#define hwloc_bitmap_clr_range HWLOC_NAME(bitmap_clr_range)
+#define hwloc_bitmap_isset HWLOC_NAME(bitmap_isset)
+#define hwloc_bitmap_iszero HWLOC_NAME(bitmap_iszero)
+#define hwloc_bitmap_isfull HWLOC_NAME(bitmap_isfull)
+#define hwloc_bitmap_isequal HWLOC_NAME(bitmap_isequal)
+#define hwloc_bitmap_intersects HWLOC_NAME(bitmap_intersects)
+#define hwloc_bitmap_isincluded HWLOC_NAME(bitmap_isincluded)
+#define hwloc_bitmap_or HWLOC_NAME(bitmap_or)
+#define hwloc_bitmap_and HWLOC_NAME(bitmap_and)
+#define hwloc_bitmap_andnot HWLOC_NAME(bitmap_andnot)
+#define hwloc_bitmap_xor HWLOC_NAME(bitmap_xor)
+#define hwloc_bitmap_not HWLOC_NAME(bitmap_not)
+#define hwloc_bitmap_first HWLOC_NAME(bitmap_first)
+#define hwloc_bitmap_last HWLOC_NAME(bitmap_last)
+#define hwloc_bitmap_next HWLOC_NAME(bitmap_next)
+#define hwloc_bitmap_singlify HWLOC_NAME(bitmap_singlify)
+#define hwloc_bitmap_compare_first HWLOC_NAME(bitmap_compare_first)
+#define hwloc_bitmap_compare HWLOC_NAME(bitmap_compare)
+#define hwloc_bitmap_weight HWLOC_NAME(bitmap_weight)
+
+/* hwloc/cpuset.h -- deprecated but still available */
+
+#define hwloc_cpuset HWLOC_NAME(cpuset)
+#define hwloc_cpuset_s HWLOC_NAME(cpuset_s)
+#define hwloc_cpuset_t HWLOC_NAME(cpuset_t)
+#define hwloc_const_cpuset_t HWLOC_NAME(const_cpuset_t)
+
+#define hwloc_cpuset_alloc HWLOC_NAME(cpuset_alloc)
+#define hwloc_cpuset_free HWLOC_NAME(cpuset_free)
+#define hwloc_cpuset_dup HWLOC_NAME(cpuset_dup)
+#define hwloc_cpuset_copy HWLOC_NAME(cpuset_copy)
+#define hwloc_cpuset_snprintf HWLOC_NAME(cpuset_snprintf)
+#define hwloc_cpuset_asprintf HWLOC_NAME(cpuset_asprintf)
+#define hwloc_cpuset_from_string HWLOC_NAME(cpuset_from_string)
+#define hwloc_cpuset_zero HWLOC_NAME(cpuset_zero)
+#define hwloc_cpuset_fill HWLOC_NAME(cpuset_fill)
+#define hwloc_cpuset_from_ulong HWLOC_NAME(cpuset_from_ulong)
+#define hwloc_cpuset_taskset_snprintf HWLOC_NAME(cpuset_taskset_snprintf)
+#define hwloc_cpuset_taskset_asprintf HWLOC_NAME(cpuset_taskset_asprintf)
+#define hwloc_cpuset_taskset_sscanf HWLOC_NAME(cpuset_taskset_sscanf)
+
+#define hwloc_cpuset_from_ith_ulong HWLOC_NAME(cpuset_from_ith_ulong)
+#define hwloc_cpuset_to_ulong HWLOC_NAME(cpuset_to_ulong)
+#define hwloc_cpuset_to_ith_ulong HWLOC_NAME(cpuset_to_ith_ulong)
+#define hwloc_cpuset_cpu HWLOC_NAME(cpuset_cpu)
+#define hwloc_cpuset_all_but_cpu HWLOC_NAME(cpuset_all_but_cpu)
+#define hwloc_cpuset_set HWLOC_NAME(cpuset_set)
+#define hwloc_cpuset_set_range HWLOC_NAME(cpuset_set_range)
+#define hwloc_cpuset_set_ith_ulong HWLOC_NAME(cpuset_set_ith_ulong)
+#define hwloc_cpuset_clr HWLOC_NAME(cpuset_clr)
+#define hwloc_cpuset_clr_range HWLOC_NAME(cpuset_clr_range)
+#define hwloc_cpuset_isset HWLOC_NAME(cpuset_isset)
+#define hwloc_cpuset_iszero HWLOC_NAME(cpuset_iszero)
+#define hwloc_cpuset_isfull HWLOC_NAME(cpuset_isfull)
+#define hwloc_cpuset_isequal HWLOC_NAME(cpuset_isequal)
+#define hwloc_cpuset_intersects HWLOC_NAME(cpuset_intersects)
+#define hwloc_cpuset_isincluded HWLOC_NAME(cpuset_isincluded)
+#define hwloc_cpuset_or HWLOC_NAME(cpuset_or)
+#define hwloc_cpuset_and HWLOC_NAME(cpuset_and)
+#define hwloc_cpuset_andnot HWLOC_NAME(cpuset_andnot)
+#define hwloc_cpuset_xor HWLOC_NAME(cpuset_xor)
+#define hwloc_cpuset_not HWLOC_NAME(cpuset_not)
+#define hwloc_cpuset_first HWLOC_NAME(cpuset_first)
+#define hwloc_cpuset_last HWLOC_NAME(cpuset_last)
+#define hwloc_cpuset_next HWLOC_NAME(cpuset_next)
+#define hwloc_cpuset_singlify HWLOC_NAME(cpuset_singlify)
+#define hwloc_cpuset_compare_first HWLOC_NAME(cpuset_compare_first)
+#define hwloc_cpuset_compare HWLOC_NAME(cpuset_compare)
+#define hwloc_cpuset_weight HWLOC_NAME(cpuset_weight)
+
+/* hwloc/helper.h */
+
+#define hwloc_get_type_or_below_depth HWLOC_NAME(get_type_or_below_depth)
+#define hwloc_get_type_or_above_depth HWLOC_NAME(get_type_or_above_depth)
+#define hwloc_get_root_obj HWLOC_NAME(get_root_obj)
+#define hwloc_get_system_obj HWLOC_NAME(get_system_obj)
+#define hwloc_get_ancestor_obj_by_depth HWLOC_NAME(get_ancestor_obj_by_depth)
+#define hwloc_get_ancestor_obj_by_type HWLOC_NAME(get_ancestor_obj_by_type)
+#define hwloc_get_next_obj_by_depth HWLOC_NAME(get_next_obj_by_depth)
+#define hwloc_get_next_obj_by_type HWLOC_NAME(get_next_obj_by_type)
+#define hwloc_get_pu_obj_by_os_index HWLOC_NAME(get_pu_obj_by_os_index)
+#define hwloc_get_next_child HWLOC_NAME(get_next_child)
+#define hwloc_get_common_ancestor_obj HWLOC_NAME(get_common_ancestor_obj)
+#define hwloc_obj_is_in_subtree HWLOC_NAME(obj_is_in_subtree)
+#define hwloc_get_first_largest_obj_inside_cpuset HWLOC_NAME(get_first_largest_obj_inside_cpuset)
+#define hwloc_get_largest_objs_inside_cpuset HWLOC_NAME(get_largest_objs_inside_cpuset)
+#define hwloc_get_next_obj_inside_cpuset_by_depth HWLOC_NAME(get_next_obj_inside_cpuset_by_depth)
+#define hwloc_get_next_obj_inside_cpuset_by_type HWLOC_NAME(get_next_obj_inside_cpuset_by_type)
+#define hwloc_get_obj_inside_cpuset_by_depth HWLOC_NAME(get_obj_inside_cpuset_by_depth)
+#define hwloc_get_obj_inside_cpuset_by_type HWLOC_NAME(get_obj_inside_cpuset_by_type)
+#define hwloc_get_nbobjs_inside_cpuset_by_depth HWLOC_NAME(get_nbobjs_inside_cpuset_by_depth)
+#define hwloc_get_nbobjs_inside_cpuset_by_type HWLOC_NAME(get_nbobjs_inside_cpuset_by_type)
+#define hwloc_get_child_covering_cpuset HWLOC_NAME(get_child_covering_cpuset)
+#define hwloc_get_obj_covering_cpuset HWLOC_NAME(get_obj_covering_cpuset)
+#define hwloc_get_next_obj_covering_cpuset_by_depth HWLOC_NAME(get_next_obj_covering_cpuset_by_depth)
+#define hwloc_get_next_obj_covering_cpuset_by_type HWLOC_NAME(get_next_obj_covering_cpuset_by_type)
+#define hwloc_get_cache_covering_cpuset HWLOC_NAME(get_cache_covering_cpuset)
+#define hwloc_get_shared_cache_covering_obj HWLOC_NAME(get_shared_cache_covering_obj)
+#define hwloc_get_closest_objs HWLOC_NAME(get_closest_objs)
+#define hwloc_get_obj_below_by_type HWLOC_NAME(get_obj_below_by_type)
+#define hwloc_get_obj_below_array_by_type HWLOC_NAME(get_obj_below_array_by_type)
+#define hwloc_distributev HWLOC_NAME(distributev)
+#define hwloc_distribute HWLOC_NAME(distribute)
+#define hwloc_alloc_membind_policy HWLOC_NAME(alloc_membind_policy)
+#define hwloc_alloc_membind_policy_nodeset HWLOC_NAME(alloc_membind_policy_nodeset)
+#define hwloc_topology_get_complete_cpuset HWLOC_NAME(topology_get_complete_cpuset)
+#define hwloc_topology_get_topology_cpuset HWLOC_NAME(topology_get_topology_cpuset)
+#define hwloc_topology_get_online_cpuset HWLOC_NAME(topology_get_online_cpuset)
+#define hwloc_topology_get_allowed_cpuset HWLOC_NAME(topology_get_allowed_cpuset)
+#define hwloc_topology_get_complete_nodeset HWLOC_NAME(topology_get_complete_nodeset)
+#define hwloc_topology_get_topology_nodeset HWLOC_NAME(topology_get_topology_nodeset)
+#define hwloc_topology_get_allowed_nodeset HWLOC_NAME(topology_get_allowed_nodeset)
+#define hwloc_cpuset_to_nodeset HWLOC_NAME(cpuset_to_nodeset)
+#define hwloc_cpuset_to_nodeset_strict HWLOC_NAME(cpuset_to_nodeset_strict)
+#define hwloc_cpuset_from_nodeset HWLOC_NAME(cpuset_from_nodeset)
+#define hwloc_cpuset_from_nodeset_strict HWLOC_NAME(cpuset_from_nodeset_strict)
+#define hwloc_get_whole_distance_matrix_by_depth HWLOC_NAME(get_whole_distance_matrix_by_depth)
+#define hwloc_get_whole_distance_matrix_by_type HWLOC_NAME(get_whole_distance_matrix_by_type)
+#define hwloc_get_distance_matrix_covering_obj_by_depth HWLOC_NAME(get_distance_matrix_covering_obj_by_depth)
+#define hwloc_get_latency HWLOC_NAME(get_latency)
+
+/* glibc-sched.h */
+
+#define hwloc_cpuset_to_glibc_sched_affinity HWLOC_NAME(cpuset_to_glibc_sched_affinity)
+#define hwloc_cpuset_from_glibc_sched_affinity HWLOC_NAME(cpuset_from_glibc_sched_affinity)
+
+/* linux-libnuma.h */
+
+#define hwloc_cpuset_to_linux_libnuma_ulongs HWLOC_NAME(cpuset_to_linux_libnuma_ulongs)
+#define hwloc_nodeset_to_linux_libnuma_ulongs HWLOC_NAME(nodeset_to_linux_libnuma_ulongs)
+#define hwloc_cpuset_from_linux_libnuma_ulongs HWLOC_NAME(cpuset_from_linux_libnuma_ulongs)
+#define hwloc_nodeset_from_linux_libnuma_ulongs HWLOC_NAME(nodeset_from_linux_libnuma_ulongs)
+#define hwloc_cpuset_to_linux_libnuma_bitmask HWLOC_NAME(cpuset_to_linux_libnuma_bitmask)
+#define hwloc_nodeset_to_linux_libnuma_bitmask HWLOC_NAME(nodeset_to_linux_libnuma_bitmask)
+#define hwloc_cpuset_from_linux_libnuma_bitmask HWLOC_NAME(cpuset_from_linux_libnuma_bitmask)
+#define hwloc_nodeset_from_linux_libnuma_bitmask HWLOC_NAME(nodeset_from_linux_libnuma_bitmask)
+#define hwloc_cpuset_to_linux_libnuma_nodemask HWLOC_NAME(cpuset_to_linux_libnuma_nodemask)
+#define hwloc_nodeset_to_linux_libnuma_nodemask HWLOC_NAME(nodeset_to_linux_libnuma_nodemask)
+#define hwloc_cpuset_from_linux_libnuma_nodemask HWLOC_NAME(cpuset_from_linux_libnuma_nodemask)
+#define hwloc_nodeset_from_linux_libnuma_nodemask HWLOC_NAME(nodeset_from_linux_libnuma_nodemask)
+
+/* linux.h */
+
+#define hwloc_linux_parse_cpumap_file HWLOC_NAME(linux_parse_cpumap_file)
+#define hwloc_linux_set_tid_cpubind HWLOC_NAME(linux_set_tid_cpubind)
+#define hwloc_linux_get_tid_cpubind HWLOC_NAME(linux_get_tid_cpubind)
+
+/* openfabrics-verbs.h */
+
+#define hwloc_ibv_get_device_cpuset HWLOC_NAME(ibv_get_device_cpuset)
+
+/* myriexpress.h */
+
+#define hwloc_mx_board_get_device_cpuset HWLOC_NAME(mx_board_get_device_cpuset)
+#define hwloc_mx_endpoint_get_device_cpuset HWLOC_NAME(mx_endpoint_get_device_cpuset)
+
+/* cuda.h */
+
+#define hwloc_cuda_get_device_cpuset HWLOC_NAME(cuda_get_device_cpuset)
+
+/* cudart.h */
+
+#define hwloc_cudart_get_device_cpuset HWLOC_NAME(cudart_get_device_cpuset)
+
+/* private/debug.h */
+
+#define hwloc_debug HWLOC_NAME(debug)
+
+/* private/misc.h */
+
+#define hwloc_snprintf HWLOC_NAME(snprintf)
+#define hwloc_namecoloncmp HWLOC_NAME(namecoloncmp)
+/* FIXME: hwloc_ffsl may be a macro, but it may not be defined yet */
+#define hwloc_ffs32 HWLOC_NAME(ffs32)
+/* FIXME: hwloc_flsl may be a macro, but it may not be defined yet */
+#define hwloc_fls32 HWLOC_NAME(fls32)
+#define hwloc_weight_long HWLOC_NAME(weight_long)
+
+/* private/cpuid.h */
+
+#define hwloc_have_cpuid HWLOC_NAME(have_cpuid)
+#define hwloc_cpuid HWLOC_NAME(cpuid)
+
+/* private/private.h */
+
+#define hwloc_ignore_type_e HWLOC_NAME(ignore_type_e)
+
+#define HWLOC_IGNORE_TYPE_NEVER HWLOC_NAME_CAPS(IGNORE_TYPE_NEVER)
+#define HWLOC_IGNORE_TYPE_KEEP_STRUCTURE HWLOC_NAME_CAPS(IGNORE_TYPE_KEEP_STRUCTURE)
+#define HWLOC_IGNORE_TYPE_ALWAYS HWLOC_NAME_CAPS(IGNORE_TYPE_ALWAYS)
+
+#define hwloc_os_distances_s HWLOC_NAME(os_distances_s)
+#define hwloc_backend_e HWLOC_NAME(backend_e)
+#define hwloc_backend_t HWLOC_NAME(backend_t)
+
+#define HWLOC_BACKEND_NONE HWLOC_NAME_CAPS(BACKEND_NONE)
+#define HWLOC_BACKEND_SYNTHETIC HWLOC_NAME_CAPS(BACKEND_SYNTHETIC)
+#define HWLOC_BACKEND_SYSFS HWLOC_NAME_CAPS(BACKEND_SYSFS)
+#define HWLOC_BACKEND_XML HWLOC_NAME_CAPS(BACKEND_XML)
+#define HWLOC_BACKEND_MAX HWLOC_NAME_CAPS(BACKEND_MAX)
+
+#define hwloc_backend_params_u HWLOC_NAME(backend_params_u)
+#define hwloc_backend_params_sysfs_s HWLOC_NAME(backend_params_sysfs_s)
+#define hwloc_backend_params_osf HWLOC_NAME(backend_params_osf)
+#define hwloc_backend_params_xml_s HWLOC_NAME(backend_params_xml_s)
+#define hwloc_backend_params_synthetic_s HWLOC_NAME(backend_params_synthetic_s)
+
+#define hwloc_setup_pu_level HWLOC_NAME(setup_pu_level)
+#define hwloc_setup_misc_level_from_distances HWLOC_NAME(setup_misc_level_from_distances)
+#define hwloc_get_sysctlbyname HWLOC_NAME(get_sysctlbyname)
+#define hwloc_get_sysctl HWLOC_NAME(get_sysctl)
+#define hwloc_fallback_nbprocessors HWLOC_NAME(fallback_nbprocessors)
+
+#define hwloc_look_linux HWLOC_NAME(look_linux)
+#define hwloc_set_linux_hooks HWLOC_NAME(set_linux_hooks)
+#define hwloc_backend_sysfs_init HWLOC_NAME(backend_sysfs_init)
+#define hwloc_backend_sysfs_exit HWLOC_NAME(backend_sysfs_exit)
+
+#define hwloc_backend_xml_init HWLOC_NAME(backend_xml_init)
+#define hwloc_xml_check_distances HWLOC_NAME(xml_check_distances)
+#define hwloc_look_xml HWLOC_NAME(look_xml)
+#define hwloc_backend_xml_exit HWLOC_NAME(backend_xml_exit)
+
+#define hwloc_look_solaris HWLOC_NAME(look_solaris)
+#define hwloc_set_solaris_hooks HWLOC_NAME(set_solaris_hooks)
+
+#define hwloc_look_aix HWLOC_NAME(look_aix)
+#define hwloc_set_aix_hooks HWLOC_NAME(set_aix_hooks)
+
+#define hwloc_look_osf HWLOC_NAME(look_osf)
+#define hwloc_set_osf_hooks HWLOC_NAME(set_osf_hooks)
+
+#define hwloc_look_windows HWLOC_NAME(look_windows)
+#define hwloc_set_windows_hooks HWLOC_NAME(set_windows_hooks)
+
+#define hwloc_look_darwin HWLOC_NAME(look_darwin)
+#define hwloc_set_darwin_hooks HWLOC_NAME(set_darwin_hooks)
+
+#define hwloc_look_freebsd HWLOC_NAME(look_freebsd)
+#define hwloc_set_freebsd_hooks HWLOC_NAME(set_freebsd_hooks)
+
+#define hwloc_look_hpux HWLOC_NAME(look_hpux)
+#define hwloc_set_hpux_hooks HWLOC_NAME(set_hpux_hooks)
+
+#define hwloc_look_libpci HWLOC_NAME(look_libpci)
+
+#define hwloc_look_x86 HWLOC_NAME(look_x86)
+
+#define hwloc_backend_synthetic_init HWLOC_NAME(backend_synthetic_init)
+#define hwloc_backend_synthetic_exit HWLOC_NAME(backend_synthetic_exit)
+#define hwloc_look_synthetic  HWLOC_NAME(look_synthetic )
+
+#define hwloc_insert_object_by_cpuset HWLOC_NAME(insert_object_by_cpuset)
+#define hwloc_report_error_t HWLOC_NAME(report_error_t)
+#define hwloc_report_os_error HWLOC_NAME(report_os_error)
+#define hwloc_hide_errors HWLOC_NAME(hide_errors)
+#define hwloc__insert_object_by_cpuset HWLOC_NAME(_insert_object_by_cpuset)
+#define hwloc_insert_object_by_parent HWLOC_NAME(insert_object_by_parent)
+#define hwloc_add_uname_info HWLOC_NAME(add_uname_info)
+#define hwloc_free_object HWLOC_NAME(free_object)
+#define hwloc_bitmap_printf_value HWLOC_NAME(bitmap_printf_value)
+#define hwloc_alloc_setup_object HWLOC_NAME(alloc_setup_object)
+#define hwloc_free_unlinked_object HWLOC_NAME(free_unlinked_object)
+#define hwloc_setup_level HWLOC_NAME(setup_level)
+
+#define hwloc_alloc_heap HWLOC_NAME(alloc_heap)
+#define hwloc_alloc_mmap HWLOC_NAME(alloc_mmap)
+#define hwloc_free_heap HWLOC_NAME(free_heap)
+#define hwloc_free_mmap HWLOC_NAME(free_mmap)
+#define hwloc_alloc_or_fail HWLOC_NAME(alloc_or_fail)
+
+#define hwloc_topology_distances_init HWLOC_NAME(topology_distances_init)
+#define hwloc_topology_distances_clear HWLOC_NAME(topology_distances_clear)
+#define hwloc_topology_distances_destroy HWLOC_NAME(topology_distances_destroy)
+#define hwloc_topology__set_distance_matrix HWLOC_NAME(topology__set_distance_matrix)
+#define hwloc_store_distances_from_env HWLOC_NAME(store_distances_from_env)
+#define hwloc_convert_distances_indexes_into_objects HWLOC_NAME(convert_distances_indexes_into_objects)
+#define hwloc_finalize_logical_distances HWLOC_NAME(finalize_logical_distances)
+#define hwloc_restrict_distances HWLOC_NAME(restrict_distances)
+#define hwloc_free_logical_distances HWLOC_NAME(free_logical_distances)
+#define hwloc_group_by_distances HWLOC_NAME(group_by_distances)
+
+#endif /* HWLOC_SYM_TRANSFORM */
+
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+
+#endif /* HWLOC_RENAME_H */

opal/mca/hwloc/hwloc131/hwloc/include/private/autogen/config.h.in

@@ -0,0 +1,614 @@
+/* include/private/autogen/config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* -*- c -*-
+ *
+ * Copyright © 2009 CNRS, INRIA., Université Bordeaux 1  All rights reserved.
+ * Copyright © 2009 Cisco Systems, Inc.  All rights reserved.
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ *
+ * This file is automatically generated by configure.  Edits will be lost
+ * the next time you run configure!
+ */
+
+#ifndef HWLOC_CONFIGURE_H
+#define HWLOC_CONFIGURE_H
+
+
+/* Define to 1 if the system has the type `CACHE_DESCRIPTOR'. */
+#undef HAVE_CACHE_DESCRIPTOR
+
+/* Define to 1 if the system has the type `CACHE_RELATIONSHIP'. */
+#undef HAVE_CACHE_RELATIONSHIP
+
+/* Define to 1 if you have the `clz' function. */
+#undef HAVE_CLZ
+
+/* Define to 1 if you have the `clzl' function. */
+#undef HAVE_CLZL
+
+/* Define to 1 if we have -lcuda */
+#undef HAVE_CUDA
+
+/* Define to 1 if we have -lcudart */
+#undef HAVE_CUDART
+
+/* Define to 1 if you have the <cuda.h> header file. */
+#undef HAVE_CUDA_H
+
+/* Define to 1 if you have the <cuda_runtime_api.h> header file. */
+#undef HAVE_CUDA_RUNTIME_API_H
+
+/* Define to 1 if you have the declaration of `CTL_HW', and to 0 if you don't.
+   */
+#undef HAVE_DECL_CTL_HW
+
+/* Define to 1 if you have the declaration of `HW_NCPU', and to 0 if you
+   don't. */
+#undef HAVE_DECL_HW_NCPU
+
+/* Define to 1 if you have the declaration of `PCI_LOOKUP_NO_NUMBERS', and to
+   0 if you don't. */
+#undef HAVE_DECL_PCI_LOOKUP_NO_NUMBERS
+
+/* Define to 1 if you have the declaration of `pthread_getaffinity_np', and to
+   0 if you don't. */
+#undef HAVE_DECL_PTHREAD_GETAFFINITY_NP
+
+/* Define to 1 if you have the declaration of `pthread_setaffinity_np', and to
+   0 if you don't. */
+#undef HAVE_DECL_PTHREAD_SETAFFINITY_NP
+
+/* Define to 1 if you have the declaration of `_SC_LARGE_PAGESIZE', and to 0
+   if you don't. */
+#undef HAVE_DECL__SC_LARGE_PAGESIZE
+
+/* Define to 1 if you have the declaration of `_SC_NPROCESSORS_CONF', and to 0
+   if you don't. */
+#undef HAVE_DECL__SC_NPROCESSORS_CONF
+
+/* Define to 1 if you have the declaration of `_SC_NPROCESSORS_ONLN', and to 0
+   if you don't. */
+#undef HAVE_DECL__SC_NPROCESSORS_ONLN
+
+/* Define to 1 if you have the declaration of `_SC_NPROC_CONF', and to 0 if
+   you don't. */
+#undef HAVE_DECL__SC_NPROC_CONF
+
+/* Define to 1 if you have the declaration of `_SC_NPROC_ONLN', and to 0 if
+   you don't. */
+#undef HAVE_DECL__SC_NPROC_ONLN
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the `ffs' function. */
+#undef HAVE_FFS
+
+/* Define to 1 if you have the `ffsl' function. */
+#undef HAVE_FFSL
+
+/* Define to 1 if you have the `fls' function. */
+#undef HAVE_FLS
+
+/* Define to 1 if you have the `flsl' function. */
+#undef HAVE_FLSL
+
+/* Define to 1 if you have the `getpagesize' function. */
+#undef HAVE_GETPAGESIZE
+
+/* Define to 1 if the system has the type `GROUP_AFFINITY'. */
+#undef HAVE_GROUP_AFFINITY
+
+/* Define to 1 if the system has the type `GROUP_RELATIONSHIP'. */
+#undef HAVE_GROUP_RELATIONSHIP
+
+/* Define to 1 if you have the `host_info' function. */
+#undef HAVE_HOST_INFO
+
+/* Define to 1 if you have the <infiniband/verbs.h> header file. */
+#undef HAVE_INFINIBAND_VERBS_H
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if the system has the type `KAFFINITY'. */
+#undef HAVE_KAFFINITY
+
+/* Define to 1 if you have the <kstat.h> header file. */
+#undef HAVE_KSTAT_H
+
+/* Define to 1 if you have the <langinfo.h> header file. */
+#undef HAVE_LANGINFO_H
+
+/* Define to 1 if we have -lgdi32 */
+#undef HAVE_LIBGDI32
+
+/* Define to 1 if we have -libverbs */
+#undef HAVE_LIBIBVERBS
+
+/* Define to 1 if we have -lkstat */
+#undef HAVE_LIBKSTAT
+
+/* Define to 1 if we have -llgrp */
+#undef HAVE_LIBLGRP
+
+/* Define to 1 if you have the `pci' library (-lpci). */
+#undef HAVE_LIBPCI
+
+/* Define to 1 if you have the <locale.h> header file. */
+#undef HAVE_LOCALE_H
+
+/* Define to 1 if the system has the type `LOGICAL_PROCESSOR_RELATIONSHIP'. */
+#undef HAVE_LOGICAL_PROCESSOR_RELATIONSHIP
+
+/* Define to 1 if you have the <mach/mach_host.h> header file. */
+#undef HAVE_MACH_MACH_HOST_H
+
+/* Define to 1 if you have the <mach/mach_init.h> header file. */
+#undef HAVE_MACH_MACH_INIT_H
+
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the `memalign' function. */
+#undef HAVE_MEMALIGN
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <myriexpress.h> header file. */
+#undef HAVE_MYRIEXPRESS_H
+
+/* Define to 1 if you have the `nl_langinfo' function. */
+#undef HAVE_NL_LANGINFO
+
+/* Define to 1 if you have the <numaif.h> header file. */
+#undef HAVE_NUMAIF_H
+
+/* Define to 1 if the system has the type `NUMA_NODE_RELATIONSHIP'. */
+#undef HAVE_NUMA_NODE_RELATIONSHIP
+
+/* Define to 1 if you have the `openat' function. */
+#undef HAVE_OPENAT
+
+/* Define to 1 if you have the <pci/pci.h> header file. */
+#undef HAVE_PCI_PCI_H
+
+/* Define to 1 if you have the `posix_memalign' function. */
+#undef HAVE_POSIX_MEMALIGN
+
+/* Define to 1 if the system has the type `PROCESSOR_CACHE_TYPE'. */
+#undef HAVE_PROCESSOR_CACHE_TYPE
+
+/* Define to 1 if the system has the type `PROCESSOR_GROUP_INFO'. */
+#undef HAVE_PROCESSOR_GROUP_INFO
+
+/* Define to 1 if the system has the type `PROCESSOR_RELATIONSHIP'. */
+#undef HAVE_PROCESSOR_RELATIONSHIP
+
+/* Define to 1 if the system has the type `PSAPI_WORKING_SET_EX_BLOCK'. */
+#undef HAVE_PSAPI_WORKING_SET_EX_BLOCK
+
+/* Define to 1 if the system has the type `PSAPI_WORKING_SET_EX_INFORMATION'.
+   */
+#undef HAVE_PSAPI_WORKING_SET_EX_INFORMATION
+
+/* Define to 1 if you have the <pthread_np.h> header file. */
+#undef HAVE_PTHREAD_NP_H
+
+/* Define to 1 if the system has the type `pthread_t'. */
+#undef HAVE_PTHREAD_T
+
+/* Define to 1 if you have the `putwc' function. */
+#undef HAVE_PUTWC
+
+/* Define to 1 if the system has the type `RelationProcessorPackage'. */
+#undef HAVE_RELATIONPROCESSORPACKAGE
+
+/* Define to 1 if you have the `setlocale' function. */
+#undef HAVE_SETLOCALE
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the `strftime' function. */
+#undef HAVE_STRFTIME
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the `strncasecmp' function. */
+#undef HAVE_STRNCASECMP
+
+/* Define to 1 if you have the `sysctl' function. */
+#undef HAVE_SYSCTL
+
+/* Define to 1 if you have the `sysctlbyname' function. */
+#undef HAVE_SYSCTLBYNAME
+
+/* Define to 1 if the system has the type
+   `SYSTEM_LOGICAL_PROCESSOR_INFORMATION'. */
+#undef HAVE_SYSTEM_LOGICAL_PROCESSOR_INFORMATION
+
+/* Define to 1 if the system has the type
+   `SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX'. */
+#undef HAVE_SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX
+
+/* Define to 1 if you have the <sys/cpuset.h> header file. */
+#undef HAVE_SYS_CPUSET_H
+
+/* Define to 1 if you have the <sys/lgrp_user.h> header file. */
+#undef HAVE_SYS_LGRP_USER_H
+
+/* Define to 1 if you have the <sys/mman.h> header file. */
+#undef HAVE_SYS_MMAN_H
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#undef HAVE_SYS_PARAM_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/sysctl.h> header file. */
+#undef HAVE_SYS_SYSCTL_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <sys/utsname.h> header file. */
+#undef HAVE_SYS_UTSNAME_H
+
+/* Define to 1 if you have the `uname' function. */
+#undef HAVE_UNAME
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to 1 if the system has the type `wchar_t'. */
+#undef HAVE_WCHAR_T
+
+/* Define to 1 if you have the <X11/keysym.h> header file. */
+#undef HAVE_X11_KEYSYM_H
+
+/* Define to 1 if you have the <X11/Xlib.h> header file. */
+#undef HAVE_X11_XLIB_H
+
+/* Define to 1 if you have the <X11/Xutil.h> header file. */
+#undef HAVE_X11_XUTIL_H
+
+/* Define to 1 on AIX */
+#undef HWLOC_AIX_SYS
+
+/* Whether C compiler supports symbol visibility or not */
+#undef HWLOC_C_HAVE_VISIBILITY
+
+/* Define to 1 on Darwin */
+#undef HWLOC_DARWIN_SYS
+
+/* Whether we are in debugging mode or not */
+#undef HWLOC_DEBUG
+
+/* Define to 1 on *FREEBSD */
+#undef HWLOC_FREEBSD_SYS
+
+/* Whether your compiler has __attribute__ or not */
+#undef HWLOC_HAVE_ATTRIBUTE
+
+/* Whether your compiler has __attribute__ aligned or not */
+#undef HWLOC_HAVE_ATTRIBUTE_ALIGNED
+
+/* Whether your compiler has __attribute__ always_inline or not */
+#undef HWLOC_HAVE_ATTRIBUTE_ALWAYS_INLINE
+
+/* Whether your compiler has __attribute__ cold or not */
+#undef HWLOC_HAVE_ATTRIBUTE_COLD
+
+/* Whether your compiler has __attribute__ const or not */
+#undef HWLOC_HAVE_ATTRIBUTE_CONST
+
+/* Whether your compiler has __attribute__ deprecated or not */
+#undef HWLOC_HAVE_ATTRIBUTE_DEPRECATED
+
+/* Whether your compiler has __attribute__ format or not */
+#undef HWLOC_HAVE_ATTRIBUTE_FORMAT
+
+/* Whether your compiler has __attribute__ hot or not */
+#undef HWLOC_HAVE_ATTRIBUTE_HOT
+
+/* Whether your compiler has __attribute__ malloc or not */
+#undef HWLOC_HAVE_ATTRIBUTE_MALLOC
+
+/* Whether your compiler has __attribute__ may_alias or not */
+#undef HWLOC_HAVE_ATTRIBUTE_MAY_ALIAS
+
+/* Whether your compiler has __attribute__ nonnull or not */
+#undef HWLOC_HAVE_ATTRIBUTE_NONNULL
+
+/* Whether your compiler has __attribute__ noreturn or not */
+#undef HWLOC_HAVE_ATTRIBUTE_NORETURN
+
+/* Whether your compiler has __attribute__ no_instrument_function or not */
+#undef HWLOC_HAVE_ATTRIBUTE_NO_INSTRUMENT_FUNCTION
+
+/* Whether your compiler has __attribute__ packed or not */
+#undef HWLOC_HAVE_ATTRIBUTE_PACKED
+
+/* Whether your compiler has __attribute__ pure or not */
+#undef HWLOC_HAVE_ATTRIBUTE_PURE
+
+/* Whether your compiler has __attribute__ sentinel or not */
+#undef HWLOC_HAVE_ATTRIBUTE_SENTINEL
+
+/* Whether your compiler has __attribute__ unused or not */
+#undef HWLOC_HAVE_ATTRIBUTE_UNUSED
+
+/* Whether your compiler has __attribute__ warn unused result or not */
+#undef HWLOC_HAVE_ATTRIBUTE_WARN_UNUSED_RESULT
+
+/* Whether your compiler has __attribute__ weak alias or not */
+#undef HWLOC_HAVE_ATTRIBUTE_WEAK_ALIAS
+
+/* Define to 1 if you have the `cairo' library. */
+#undef HWLOC_HAVE_CAIRO
+
+/* Define to 1 if you have the `clz' function. */
+#undef HWLOC_HAVE_CLZ
+
+/* Define to 1 if you have the `clzl' function. */
+#undef HWLOC_HAVE_CLZL
+
+/* Define to 1 if you have cpuid */
+#undef HWLOC_HAVE_CPUID
+
+/* Define to 1 if the CPU_SET macro works */
+#undef HWLOC_HAVE_CPU_SET
+
+/* Define to 1 if the CPU_SET_S macro works */
+#undef HWLOC_HAVE_CPU_SET_S
+
+/* Define to 1 if function `clz' is declared by system headers */
+#undef HWLOC_HAVE_DECL_CLZ
+
+/* Define to 1 if function `clzl' is declared by system headers */
+#undef HWLOC_HAVE_DECL_CLZL
+
+/* Define to 1 if function `ffs' is declared by system headers */
+#undef HWLOC_HAVE_DECL_FFS
+
+/* Define to 1 if function `ffsl' is declared by system headers */
+#undef HWLOC_HAVE_DECL_FFSL
+
+/* Define to 1 if function `fls' is declared by system headers */
+#undef HWLOC_HAVE_DECL_FLS
+
+/* Define to 1 if function `flsl' is declared by system headers */
+#undef HWLOC_HAVE_DECL_FLSL
+
+/* Define to 1 if you have the `ffs' function. */
+#undef HWLOC_HAVE_FFS
+
+/* Define to 1 if you have the `ffsl' function. */
+#undef HWLOC_HAVE_FFSL
+
+/* Define to 1 if you have the `fls' function. */
+#undef HWLOC_HAVE_FLS
+
+/* Define to 1 if you have the `flsl' function. */
+#undef HWLOC_HAVE_FLSL
+
+/* Define to 1 if you have the `libpci' library. */
+#undef HWLOC_HAVE_LIBPCI
+
+/* Define to 1 if you have a library providing the termcap interface */
+#undef HWLOC_HAVE_LIBTERMCAP
+
+/* Define to 1 if you have the `libxml2' library. */
+#undef HWLOC_HAVE_LIBXML2
+
+/* Define to 1 if mbind is available. */
+#undef HWLOC_HAVE_MBIND
+
+/* Define to 1 if migrate_pages is available. */
+#undef HWLOC_HAVE_MIGRATE_PAGES
+
+/* Define to 1 if glibc provides the old prototype (without length) of
+   sched_setaffinity() */
+#undef HWLOC_HAVE_OLD_SCHED_SETAFFINITY
+
+/* Define to 1 if struct pci_dev has a `device_class' field. */
+#undef HWLOC_HAVE_PCIDEV_DEVICE_CLASS
+
+/* Define to 1 if struct pci_dev has a `domain' field. */
+#undef HWLOC_HAVE_PCIDEV_DOMAIN
+
+/* Define to 1 if `libpci' has the `pci_find_cap' function. */
+#undef HWLOC_HAVE_PCI_FIND_CAP
+
+/* `Define to 1 if you have pthread_getthrds_np' */
+#undef HWLOC_HAVE_PTHREAD_GETTHRDS_NP
+
+/* Define to 1 if glibc provides a prototype of sched_setaffinity() */
+#undef HWLOC_HAVE_SCHED_SETAFFINITY
+
+/* Define to 1 if set_mempolicy is available. */
+#undef HWLOC_HAVE_SET_MEMPOLICY
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HWLOC_HAVE_STDINT_H
+
+/* Define to 1 if you have the `windows.h' header. */
+#undef HWLOC_HAVE_WINDOWS_H
+
+/* Define to 1 if X11 libraries are available. */
+#undef HWLOC_HAVE_X11
+
+/* Define to 1 if the _syscall3 macro works */
+#undef HWLOC_HAVE__SYSCALL3
+
+/* Define to 1 on HP-UX */
+#undef HWLOC_HPUX_SYS
+
+/* Define to 1 on Irix */
+#undef HWLOC_IRIX_SYS
+
+/* Define to 1 on Linux */
+#undef HWLOC_LINUX_SYS
+
+/* Major version of hwloc */
+#undef HWLOC_MAJOR_VERSION
+
+/* Minor version of hwloc */
+#undef HWLOC_MINOR_VERSION
+
+/* Define to 1 on OSF */
+#undef HWLOC_OSF_SYS
+
+/* Release version of hwloc */
+#undef HWLOC_RELEASE_VERSION
+
+/* The size of `unsigned int', as computed by sizeof */
+#undef HWLOC_SIZEOF_UNSIGNED_INT
+
+/* The size of `unsigned long', as computed by sizeof */
+#undef HWLOC_SIZEOF_UNSIGNED_LONG
+
+/* Define to 1 on Solaris */
+#undef HWLOC_SOLARIS_SYS
+
+/* The hwloc symbol prefix */
+#undef HWLOC_SYM_PREFIX
+
+/* The hwloc symbol prefix in all caps */
+#undef HWLOC_SYM_PREFIX_CAPS
+
+/* Whether we need to re-define all the hwloc public symbols or not */
+#undef HWLOC_SYM_TRANSFORM
+
+/* Define to 1 on unsupported systems */
+#undef HWLOC_UNSUPPORTED_SYS
+
+/* Define to 1 if ncurses works, preferred over curses */
+#undef HWLOC_USE_NCURSES
+
+/* Define to 1 on WINDOWS */
+#undef HWLOC_WIN_SYS
+
+/* Define to 1 on x86_32 */
+#undef HWLOC_X86_32_ARCH
+
+/* Define to 1 on x86_64 */
+#undef HWLOC_X86_64_ARCH
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#undef LT_OBJDIR
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* The size of `unsigned int', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_INT
+
+/* The size of `unsigned long', as computed by sizeof. */
+#undef SIZEOF_UNSIGNED_LONG
+
+/* The size of `void *', as computed by sizeof. */
+#undef SIZEOF_VOID_P
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Enable extensions on HP-UX. */
+#ifndef _HPUX_SOURCE
+# undef _HPUX_SOURCE
+#endif
+
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 if the X Window System is missing or not being used. */
+#undef X_DISPLAY_MISSING
+
+/* Are we building for HP-UX? */
+#undef _HPUX_SOURCE
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Define this to a keyword that can safely replace inline in installed
+   headers */
+#undef __hwloc_inline
+
+/* Define this to the process ID type */
+#undef hwloc_pid_t
+
+/* Define this to either strncasecmp or strncmp */
+#undef hwloc_strncasecmp
+
+/* Define this to the thread ID type */
+#undef hwloc_thread_t
+
+
+#endif /* HWLOC_CONFIGURE_H */
+

opal/mca/hwloc/hwloc131/hwloc/include/private/cpuid.h

@@ -0,0 +1,72 @@
+/*
+ * Copyright © 2010-2011 Université Bordeaux 1
+ * Copyright © 2010 Cisco Systems, Inc.  All rights reserved.
+ *
+ * See COPYING in top-level directory.
+ */
+
+/* Internals for x86's cpuid.  */
+
+#ifndef HWLOC_PRIVATE_CPUID_H
+#define HWLOC_PRIVATE_CPUID_H
+
+#ifdef HWLOC_X86_32_ARCH
+static __hwloc_inline int hwloc_have_cpuid(void)
+{
+  int ret;
+  unsigned tmp, tmp2;
+  asm(
+      "mov $0,%0\n\t"   /* Not supported a priori */
+
+      "pushfl   \n\t"   /* Save flags */
+
+      "pushfl   \n\t"                                           \
+      "pop %1   \n\t"   /* Get flags */                         \
+
+#define TRY_TOGGLE                                              \
+      "xor $0x00200000,%1\n\t"        /* Try to toggle ID */    \
+      "mov %1,%2\n\t"   /* Save expected value */               \
+      "push %1  \n\t"                                           \
+      "popfl    \n\t"   /* Try to toggle */                     \
+      "pushfl   \n\t"                                           \
+      "pop %1   \n\t"                                           \
+      "cmp %1,%2\n\t"   /* Compare with expected value */       \
+      "jnz Lhwloc1\n\t"   /* Unexpected, failure */               \
+
+      TRY_TOGGLE        /* Try to set/clear */
+      TRY_TOGGLE        /* Try to clear/set */
+
+      "mov $1,%0\n\t"   /* Passed the test! */
+
+      "Lhwloc1: \n\t"
+      "popfl    \n\t"   /* Restore flags */
+
+      : "=r" (ret), "=&r" (tmp), "=&r" (tmp2));
+  return ret;
+}
+#endif /* HWLOC_X86_32_ARCH */
+#ifdef HWLOC_X86_64_ARCH
+static __hwloc_inline int hwloc_have_cpuid(void) { return 1; }
+#endif /* HWLOC_X86_64_ARCH */
+
+static __hwloc_inline void hwloc_cpuid(unsigned *eax, unsigned *ebx, unsigned *ecx, unsigned *edx)
+{
+  asm(
+#ifdef HWLOC_X86_32_ARCH 
+  "push %%ebx\n\t"
+#endif
+  "cpuid\n\t"
+#ifdef HWLOC_X86_32_ARCH 
+  "mov %%ebx,%1\n\t"
+  "pop %%ebx\n\t"
+#endif
+  : "+a" (*eax),
+#ifdef HWLOC_X86_32_ARCH 
+    "=r" (*ebx),
+#else
+    "=b" (*ebx),
+#endif
+    "+c" (*ecx), "=d" (*edx));
+}
+
+#endif /* HWLOC_PRIVATE_CPUID_H */

opal/mca/hwloc/hwloc131/hwloc/include/private/debug.h

@@ -0,0 +1,54 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2010 INRIA.  All rights reserved.
+ * Copyright © 2009, 2011 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/* The configuration file */
+
+#ifndef HWLOC_DEBUG_H
+#define HWLOC_DEBUG_H
+
+#include <private/autogen/config.h>
+
+#ifdef HWLOC_DEBUG
+#include <stdarg.h>
+#include <stdio.h>
+#endif
+
+static __hwloc_inline void hwloc_debug(const char *s __hwloc_attribute_unused, ...)
+{
+#ifdef HWLOC_DEBUG
+    va_list ap;
+
+    va_start(ap, s);
+    vfprintf(stderr, s, ap);
+    va_end(ap);
+#endif
+}
+
+#ifdef HWLOC_DEBUG
+#define hwloc_debug_bitmap(fmt, bitmap) do { \
+  char *s= hwloc_bitmap_printf_value(bitmap); \
+  fprintf(stderr, fmt, s); \
+  free(s); \
+} while (0)
+#define hwloc_debug_1arg_bitmap(fmt, arg1, bitmap) do { \
+  char *s= hwloc_bitmap_printf_value(bitmap); \
+  fprintf(stderr, fmt, arg1, s); \
+  free(s); \
+} while (0)
+#define hwloc_debug_2args_bitmap(fmt, arg1, arg2, bitmap) do { \
+  char *s= hwloc_bitmap_printf_value(bitmap); \
+  fprintf(stderr, fmt, arg1, arg2, s); \
+  free(s); \
+} while (0)
+#else
+#define hwloc_debug_bitmap(s, bitmap) do { } while(0)
+#define hwloc_debug_1arg_bitmap(s, arg1, bitmap) do { } while(0)
+#define hwloc_debug_2args_bitmap(s, arg1, arg2, bitmap) do { } while(0)
+#endif
+
+#endif /* HWLOC_DEBUG_H */

opal/mca/hwloc/hwloc131/hwloc/include/private/misc.h

@@ -0,0 +1,331 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2010 INRIA.  All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/* Misc internals routines.  */
+
+#ifndef HWLOC_PRIVATE_MISC_H
+#define HWLOC_PRIVATE_MISC_H
+
+#include <hwloc/autogen/config.h>
+#include <private/autogen/config.h>
+#include <private/private.h>
+
+
+/* On some systems, snprintf returns the size of written data, not the actually
+ * required size.  hwloc_snprintf always report the actually required size. */
+int hwloc_snprintf(char *str, size_t size, const char *format, ...) __hwloc_attribute_format(printf, 3, 4);
+
+/* Check whether needle matches the beginning of haystack, at least n, and up
+ * to a colon or \0 */
+HWLOC_DECLSPEC
+int hwloc_namecoloncmp(const char *haystack, const char *needle, size_t n);
+
+/* Compile-time assertion */
+#define HWLOC_BUILD_ASSERT(condition) ((void)sizeof(char[1 - 2*!(condition)]))
+
+
+
+#define HWLOC_BITS_PER_LONG (HWLOC_SIZEOF_UNSIGNED_LONG * 8)
+#define HWLOC_BITS_PER_INT (HWLOC_SIZEOF_UNSIGNED_INT * 8)
+
+#if (HWLOC_BITS_PER_LONG != 32) && (HWLOC_BITS_PER_LONG != 64)
+#error "unknown size for unsigned long."
+#endif
+
+#if (HWLOC_BITS_PER_INT != 16) && (HWLOC_BITS_PER_INT != 32) && (HWLOC_BITS_PER_INT != 64)
+#error "unknown size for unsigned int."
+#endif
+
+
+/**
+ * ffsl helpers.
+ */
+
+#ifdef __GNUC__
+
+#  if (__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
+     /* Starting from 3.4, gcc has a long variant.  */
+#    define hwloc_ffsl(x) __builtin_ffsl(x)
+#  else
+#    define hwloc_ffs(x) __builtin_ffs(x)
+#    define HWLOC_NEED_FFSL
+#  endif
+
+#elif defined(HWLOC_HAVE_FFSL)
+
+#  ifndef HWLOC_HAVE_DECL_FFSL
+extern int ffsl(long) __hwloc_attribute_const;
+#  endif
+
+#  define hwloc_ffsl(x) ffsl(x)
+
+#elif defined(HWLOC_HAVE_FFS)
+
+#  ifndef HWLOC_HAVE_DECL_FFS
+extern int ffs(int) __hwloc_attribute_const;
+#  endif
+
+#  define hwloc_ffs(x) ffs(x)
+#  define HWLOC_NEED_FFSL
+
+#else /* no ffs implementation */
+
+static __hwloc_inline int __hwloc_attribute_const
+hwloc_ffsl(unsigned long x)
+{
+	int i;
+
+	if (!x)
+		return 0;
+
+	i = 1;
+#if HWLOC_BITS_PER_LONG >= 64
+	if (!(x & 0xfffffffful)) {
+		x >>= 32;
+		i += 32;
+	}
+#endif
+	if (!(x & 0xffffu)) {
+		x >>= 16;
+		i += 16;
+	}
+	if (!(x & 0xff)) {
+		x >>= 8;
+		i += 8;
+	}
+	if (!(x & 0xf)) {
+		x >>= 4;
+		i += 4;
+	}
+	if (!(x & 0x3)) {
+		x >>= 2;
+		i += 2;
+	}
+	if (!(x & 0x1)) {
+		x >>= 1;
+		i += 1;
+	}
+
+	return i;
+}
+
+#endif
+
+#ifdef HWLOC_NEED_FFSL
+
+/* We only have an int ffs(int) implementation, build a long one.  */
+
+/* First make it 32 bits if it was only 16.  */
+static __hwloc_inline int __hwloc_attribute_const
+hwloc_ffs32(unsigned long x)
+{
+#if HWLOC_BITS_PER_INT == 16
+	int low_ffs, hi_ffs;
+
+	low_ffs = hwloc_ffs(x & 0xfffful);
+	if (low_ffs)
+		return low_ffs;
+
+	hi_ffs = hwloc_ffs(x >> 16);
+	if (hi_ffs)
+		return hi_ffs + 16;
+
+	return 0;
+#else
+	return hwloc_ffs(x);
+#endif
+}
+
+/* Then make it 64 bit if longs are.  */
+static __hwloc_inline int __hwloc_attribute_const
+hwloc_ffsl(unsigned long x)
+{
+#if HWLOC_BITS_PER_LONG == 64
+	int low_ffs, hi_ffs;
+
+	low_ffs = hwloc_ffs32(x & 0xfffffffful);
+	if (low_ffs)
+		return low_ffs;
+
+	hi_ffs = hwloc_ffs32(x >> 32);
+	if (hi_ffs)
+		return hi_ffs + 32;
+
+	return 0;
+#else
+	return hwloc_ffs32(x);
+#endif
+}
+#endif
+
+/**
+ * flsl helpers.
+ */
+#ifdef __GNUC_____
+
+#  if (__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 4))
+#    define hwloc_flsl(x) (x ? 8*sizeof(long) - __builtin_clzl(x) : 0)
+#  else
+#    define hwloc_fls(x) (x ? 8*sizeof(int) - __builtin_clz(x) : 0)
+#    define HWLOC_NEED_FLSL
+#  endif
+
+#elif defined(HWLOC_HAVE_FLSL)
+
+#  ifndef HWLOC_HAVE_DECL_FLSL
+extern int flsl(long) __hwloc_attribute_const;
+#  endif
+
+#  define hwloc_flsl(x) flsl(x)
+
+#elif defined(HWLOC_HAVE_CLZL)
+
+#  ifndef HWLOC_HAVE_DECL_CLZL
+extern int clzl(long) __hwloc_attribute_const;
+#  endif
+
+#  define hwloc_flsl(x) (x ? 8*sizeof(long) - clzl(x) : 0)
+
+#elif defined(HWLOC_HAVE_FLS)
+
+#  ifndef HWLOC_HAVE_DECL_FLS
+extern int fls(int) __hwloc_attribute_const;
+#  endif
+
+#  define hwloc_fls(x) fls(x)
+#  define HWLOC_NEED_FLSL
+
+#elif defined(HWLOC_HAVE_CLZ)
+
+#  ifndef HWLOC_HAVE_DECL_CLZ
+extern int clz(int) __hwloc_attribute_const;
+#  endif
+
+#  define hwloc_fls(x) (x ? 8*sizeof(int) - clz(x) : 0)
+#  define HWLOC_NEED_FLSL
+
+#else /* no fls implementation */
+
+static __hwloc_inline int __hwloc_attribute_const
+hwloc_flsl(unsigned long x)
+{
+	int i = 0;
+
+	if (!x)
+		return 0;
+
+	i = 1;
+#if HWLOC_BITS_PER_LONG >= 64
+	if ((x & 0xffffffff00000000ul)) {
+		x >>= 32;
+		i += 32;
+	}
+#endif
+	if ((x & 0xffff0000u)) {
+		x >>= 16;
+		i += 16;
+	}
+	if ((x & 0xff00)) {
+		x >>= 8;
+		i += 8;
+	}
+	if ((x & 0xf0)) {
+		x >>= 4;
+		i += 4;
+	}
+	if ((x & 0xc)) {
+		x >>= 2;
+		i += 2;
+	}
+	if ((x & 0x2)) {
+		x >>= 1;
+		i += 1;
+	}
+
+	return i;
+}
+
+#endif
+
+#ifdef HWLOC_NEED_FLSL
+
+/* We only have an int fls(int) implementation, build a long one.  */
+
+/* First make it 32 bits if it was only 16.  */
+static __hwloc_inline int __hwloc_attribute_const
+hwloc_fls32(unsigned long x)
+{
+#if HWLOC_BITS_PER_INT == 16
+	int low_fls, hi_fls;
+
+	hi_fls = hwloc_fls(x >> 16);
+	if (hi_fls)
+		return hi_fls + 16;
+
+	low_fls = hwloc_fls(x & 0xfffful);
+	if (low_fls)
+		return low_fls;
+
+	return 0;
+#else
+	return hwloc_fls(x);
+#endif
+}
+
+/* Then make it 64 bit if longs are.  */
+static __hwloc_inline int __hwloc_attribute_const
+hwloc_flsl(unsigned long x)
+{
+#if HWLOC_BITS_PER_LONG == 64
+	int low_fls, hi_fls;
+
+	hi_fls = hwloc_fls32(x >> 32);
+	if (hi_fls)
+		return hi_fls + 32;
+
+	low_fls = hwloc_fls32(x & 0xfffffffful);
+	if (low_fls)
+		return low_fls;
+
+	return 0;
+#else
+	return hwloc_fls32(x);
+#endif
+}
+#endif
+
+static __hwloc_inline int __hwloc_attribute_const
+hwloc_weight_long(unsigned long w)
+{
+#if HWLOC_BITS_PER_LONG == 32
+#if (__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__) >= 4)
+	return __builtin_popcount(w);
+#else
+	unsigned int res = (w & 0x55555555) + ((w >> 1) & 0x55555555);
+	res = (res & 0x33333333) + ((res >> 2) & 0x33333333);
+	res = (res & 0x0F0F0F0F) + ((res >> 4) & 0x0F0F0F0F);
+	res = (res & 0x00FF00FF) + ((res >> 8) & 0x00FF00FF);
+	return (res & 0x0000FFFF) + ((res >> 16) & 0x0000FFFF);
+#endif
+#else /* HWLOC_BITS_PER_LONG == 32 */
+#if (__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__) >= 4)
+	return __builtin_popcountll(w);
+#else
+	unsigned long res;
+	res = (w & 0x5555555555555555ul) + ((w >> 1) & 0x5555555555555555ul);
+	res = (res & 0x3333333333333333ul) + ((res >> 2) & 0x3333333333333333ul);
+	res = (res & 0x0F0F0F0F0F0F0F0Ful) + ((res >> 4) & 0x0F0F0F0F0F0F0F0Ful);
+	res = (res & 0x00FF00FF00FF00FFul) + ((res >> 8) & 0x00FF00FF00FF00FFul);
+	res = (res & 0x0000FFFF0000FFFFul) + ((res >> 16) & 0x0000FFFF0000FFFFul);
+	return (res & 0x00000000FFFFFFFFul) + ((res >> 32) & 0x00000000FFFFFFFFul);
+#endif
+#endif /* HWLOC_BITS_PER_LONG == 64 */
+}
+
+
+#endif /* HWLOC_PRIVATE_MISC_H */

opal/mca/hwloc/hwloc131/hwloc/include/private/private.h

@@ -0,0 +1,354 @@
+/*
+ * Copyright © 2009      CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
+ *
+ * See COPYING in top-level directory.
+ */
+
+/* Internal types and helpers. */
+
+#ifndef HWLOC_PRIVATE_H
+#define HWLOC_PRIVATE_H
+
+#include <private/autogen/config.h>
+#include <hwloc.h>
+#include <hwloc/bitmap.h>
+#include <private/debug.h>
+#include <sys/types.h>
+#ifdef HAVE_STDINT_H
+#include <stdint.h>
+#endif
+
+#include <string.h>
+
+#ifdef HWLOC_HAVE_ATTRIBUTE_FORMAT
+# if HWLOC_HAVE_ATTRIBUTE_FORMAT
+#  define __hwloc_attribute_format(type, str, arg)  __attribute__((__format__(type, str, arg)))
+# else
+#  define __hwloc_attribute_format(type, str, arg)
+# endif
+#else
+# define __hwloc_attribute_format(type, str, arg)
+#endif
+
+enum hwloc_ignore_type_e {
+  HWLOC_IGNORE_TYPE_NEVER = 0,
+  HWLOC_IGNORE_TYPE_KEEP_STRUCTURE,
+  HWLOC_IGNORE_TYPE_ALWAYS
+};
+
+#define HWLOC_DEPTH_MAX 128
+
+typedef enum hwloc_backend_e {
+  HWLOC_BACKEND_NONE,
+  HWLOC_BACKEND_SYNTHETIC,
+#ifdef HWLOC_LINUX_SYS
+  HWLOC_BACKEND_SYSFS,
+#endif
+  HWLOC_BACKEND_XML,
+  /* This value is only here so that we can end the enum list without
+     a comma (thereby preventing compiler warnings) */
+  HWLOC_BACKEND_MAX
+} hwloc_backend_t;
+
+struct hwloc_topology {
+  unsigned nb_levels;					/* Number of horizontal levels */
+  unsigned next_group_depth;				/* Depth of the next Group object that we may create */
+  unsigned level_nbobjects[HWLOC_DEPTH_MAX]; 		/* Number of objects on each horizontal level */
+  struct hwloc_obj **levels[HWLOC_DEPTH_MAX];		/* Direct access to levels, levels[l = 0 .. nblevels-1][0..level_nbobjects[l]] */
+  unsigned long flags;
+  int type_depth[HWLOC_OBJ_TYPE_MAX];
+  enum hwloc_ignore_type_e ignored_types[HWLOC_OBJ_TYPE_MAX];
+  int is_thissystem;
+  int is_loaded;
+  hwloc_pid_t pid;                                      /* Process ID the topology is view from, 0 for self */
+
+  unsigned bridge_nbobjects;
+  struct hwloc_obj **bridge_level;
+  struct hwloc_obj *first_bridge, *last_bridge;
+  unsigned pcidev_nbobjects;
+  struct hwloc_obj **pcidev_level;
+  struct hwloc_obj *first_pcidev, *last_pcidev;
+  unsigned osdev_nbobjects;
+  struct hwloc_obj **osdev_level;
+  struct hwloc_obj *first_osdev, *last_osdev;
+
+  int (*set_thisproc_cpubind)(hwloc_topology_t topology, hwloc_const_cpuset_t set, int flags);
+  int (*get_thisproc_cpubind)(hwloc_topology_t topology, hwloc_cpuset_t set, int flags);
+  int (*set_thisthread_cpubind)(hwloc_topology_t topology, hwloc_const_cpuset_t set, int flags);
+  int (*get_thisthread_cpubind)(hwloc_topology_t topology, hwloc_cpuset_t set, int flags);
+  int (*set_proc_cpubind)(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_cpuset_t set, int flags);
+  int (*get_proc_cpubind)(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_cpuset_t set, int flags);
+#ifdef hwloc_thread_t
+  int (*set_thread_cpubind)(hwloc_topology_t topology, hwloc_thread_t tid, hwloc_const_cpuset_t set, int flags);
+  int (*get_thread_cpubind)(hwloc_topology_t topology, hwloc_thread_t tid, hwloc_cpuset_t set, int flags);
+#endif
+
+  int (*get_thisproc_last_cpu_location)(hwloc_topology_t topology, hwloc_cpuset_t set, int flags);
+  int (*get_thisthread_last_cpu_location)(hwloc_topology_t topology, hwloc_cpuset_t set, int flags);
+  int (*get_proc_last_cpu_location)(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_cpuset_t set, int flags);
+
+  int (*set_thisproc_membind)(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags);
+  int (*get_thisproc_membind)(hwloc_topology_t topology, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags);
+  int (*set_thisthread_membind)(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags);
+  int (*get_thisthread_membind)(hwloc_topology_t topology, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags);
+  int (*set_proc_membind)(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags);
+  int (*get_proc_membind)(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags);
+  int (*set_area_membind)(hwloc_topology_t topology, const void *addr, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags);
+  int (*get_area_membind)(hwloc_topology_t topology, const void *addr, size_t len, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags);
+  /* This has to return the same kind of pointer as alloc_membind, so that free_membind can be used on it */
+  void *(*alloc)(hwloc_topology_t topology, size_t len);
+  /* alloc_membind has to always succeed if !(flags & HWLOC_MEMBIND_STRICT).
+   * see hwloc_alloc_or_fail which is convenient for that.  */
+  void *(*alloc_membind)(hwloc_topology_t topology, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags);
+  int (*free_membind)(hwloc_topology_t topology, void *addr, size_t len);
+
+  struct hwloc_topology_support support;
+
+  struct hwloc_os_distances_s {
+    int nbobjs;
+    unsigned *indexes; /* array of OS indexes before we can convert them into objs. always available.
+			*/
+    struct hwloc_obj **objs; /* array of objects, in the same order as above.
+			      * either given (by a backend) together with the indexes array above.
+			      * or build from the above indexes array when not given (by the user).
+			      */
+    float *distances; /* distance matrices, ordered according to the above indexes/objs array.
+		       * distance from i to j is stored in slot i*nbnodes+j.
+		       * will be copied into the main logical-index-ordered distance at the end of the discovery.
+		       */
+    int forced; /* set if the user forced a matrix to ignore the OS one */
+  } os_distances[HWLOC_OBJ_TYPE_MAX];
+
+  hwloc_backend_t backend_type;
+  union hwloc_backend_params_u {
+#ifdef HWLOC_LINUX_SYS
+    struct hwloc_backend_params_sysfs_s {
+      /* sysfs backend parameters */
+      char *root_path; /* The path of the file system root, used when browsing, e.g., Linux' sysfs and procfs. */
+      int root_fd; /* The file descriptor for the file system root, used when browsing, e.g., Linux' sysfs and procfs. */
+    } sysfs;
+#endif /* HWLOC_LINUX_SYS */
+#if defined(HWLOC_OSF_SYS) || defined(HWLOC_COMPILE_PORTS)
+    struct hwloc_backend_params_osf {
+      int nbnodes;
+    } osf;
+#endif /* HWLOC_OSF_SYS */
+    struct hwloc_backend_params_xml_s {
+      /* xml backend parameters */
+#ifdef HWLOC_HAVE_LIBXML2
+      void *doc;
+#endif /* HWLOC_HAVE_LIBXML2 */
+      char *buffer; /* only used when not using libxml2 */
+    } xml;
+    struct hwloc_backend_params_synthetic_s {
+      /* synthetic backend parameters */
+#define HWLOC_SYNTHETIC_MAX_DEPTH 128
+      unsigned arity[HWLOC_SYNTHETIC_MAX_DEPTH];
+      hwloc_obj_type_t type[HWLOC_SYNTHETIC_MAX_DEPTH];
+      unsigned id[HWLOC_SYNTHETIC_MAX_DEPTH];
+      unsigned depth[HWLOC_SYNTHETIC_MAX_DEPTH]; /* For cache/misc */
+    } synthetic;
+  } backend_params;
+};
+
+
+extern void hwloc_setup_pu_level(struct hwloc_topology *topology, unsigned nb_pus);
+extern int hwloc_get_sysctlbyname(const char *name, int64_t *n);
+extern int hwloc_get_sysctl(int name[], unsigned namelen, int *n);
+extern unsigned hwloc_fallback_nbprocessors(struct hwloc_topology *topology);
+
+#if defined(HWLOC_LINUX_SYS)
+extern void hwloc_look_linux(struct hwloc_topology *topology);
+extern void hwloc_set_linux_hooks(struct hwloc_topology *topology);
+extern int hwloc_backend_sysfs_init(struct hwloc_topology *topology, const char *fsroot_path);
+extern void hwloc_backend_sysfs_exit(struct hwloc_topology *topology);
+#endif /* HWLOC_LINUX_SYS */
+
+extern int hwloc_backend_xml_init(struct hwloc_topology *topology, const char *xmlpath, const char *xmlbuffer, int buflen);
+extern void hwloc_xml_check_distances(struct hwloc_topology *topology);
+extern int hwloc_look_xml(struct hwloc_topology *topology);
+extern void hwloc_backend_xml_exit(struct hwloc_topology *topology);
+
+#ifdef HWLOC_SOLARIS_SYS
+extern void hwloc_look_solaris(struct hwloc_topology *topology);
+extern void hwloc_set_solaris_hooks(struct hwloc_topology *topology);
+#endif /* HWLOC_SOLARIS_SYS */
+
+#ifdef HWLOC_AIX_SYS
+extern void hwloc_look_aix(struct hwloc_topology *topology);
+extern void hwloc_set_aix_hooks(struct hwloc_topology *topology);
+#endif /* HWLOC_AIX_SYS */
+
+#ifdef HWLOC_OSF_SYS
+extern void hwloc_look_osf(struct hwloc_topology *topology);
+extern void hwloc_set_osf_hooks(struct hwloc_topology *topology);
+#endif /* HWLOC_OSF_SYS */
+
+#ifdef HWLOC_WIN_SYS
+extern void hwloc_look_windows(struct hwloc_topology *topology);
+extern void hwloc_set_windows_hooks(struct hwloc_topology *topology);
+#endif /* HWLOC_WIN_SYS */
+
+#ifdef HWLOC_DARWIN_SYS
+extern void hwloc_look_darwin(struct hwloc_topology *topology);
+extern void hwloc_set_darwin_hooks(struct hwloc_topology *topology);
+#endif /* HWLOC_DARWIN_SYS */
+
+#ifdef HWLOC_FREEBSD_SYS
+extern void hwloc_look_freebsd(struct hwloc_topology *topology);
+extern void hwloc_set_freebsd_hooks(struct hwloc_topology *topology);
+#endif /* HWLOC_FREEBSD_SYS */
+
+#ifdef HWLOC_HPUX_SYS
+extern void hwloc_look_hpux(struct hwloc_topology *topology);
+extern void hwloc_set_hpux_hooks(struct hwloc_topology *topology);
+#endif /* HWLOC_HPUX_SYS */
+
+extern void hwloc_look_x86(struct hwloc_topology *topology, unsigned nbprocs);
+
+#ifdef HWLOC_HAVE_LIBPCI
+extern void hwloc_look_libpci(struct hwloc_topology *topology);
+#endif /* HWLOC_HAVE_LIBPCI */
+
+extern int hwloc_backend_synthetic_init(struct hwloc_topology *topology, const char *description);
+extern void hwloc_backend_synthetic_exit(struct hwloc_topology *topology);
+extern void hwloc_look_synthetic (struct hwloc_topology *topology);
+
+/*
+ * Add an object to the topology.
+ * It is sorted along the tree of other objects according to the inclusion of
+ * cpusets, to eventually be added as a child of the smallest object including
+ * this object.
+ *
+ * If the cpuset is empty, the type of the object (and maybe some attributes)
+ * must be enough to find where to insert the object. This is especially true
+ * for NUMA nodes with memory and no CPUs.
+ *
+ * The given object should not have children.
+ *
+ * This shall only be called before levels are built.
+ *
+ * In case of error, hwloc_report_os_error() is called.
+ */
+extern void hwloc_insert_object_by_cpuset(struct hwloc_topology *topology, hwloc_obj_t obj);
+
+/* Error reporting */
+typedef void (*hwloc_report_error_t)(const char * msg, int line);
+extern void hwloc_report_os_error(const char * msg, int line);
+extern int hwloc_hide_errors(void);
+/*
+ * Add an object to the topology and specify which error callback to use
+ */
+extern int hwloc__insert_object_by_cpuset(struct hwloc_topology *topology, hwloc_obj_t obj, hwloc_report_error_t report_error);
+
+/*
+ * Insert an object somewhere in the topology.
+ *
+ * It is added as the last child of the given parent.
+ * The cpuset is completely ignored, so strange objects such as I/O devices should
+ * preferably be inserted with this.
+ *
+ * The given object may have children.
+ *
+ * Remember to call topology_connect() afterwards to fix handy pointers.
+ */
+extern void hwloc_insert_object_by_parent(struct hwloc_topology *topology, hwloc_obj_t parent, hwloc_obj_t obj);
+
+/* Insert uname-specific names/values in the object infos array */
+extern void hwloc_add_uname_info(struct hwloc_topology *topology);
+
+/** \brief Return a locally-allocated stringified bitmap for printf-like calls. */
+static __hwloc_inline char *
+hwloc_bitmap_printf_value(hwloc_const_bitmap_t bitmap)
+{
+  char *buf;
+  hwloc_bitmap_asprintf(&buf, bitmap);
+  return buf;
+}
+
+static __hwloc_inline struct hwloc_obj *
+hwloc_alloc_setup_object(hwloc_obj_type_t type, signed idx)
+{
+  struct hwloc_obj *obj = malloc(sizeof(*obj));
+  memset(obj, 0, sizeof(*obj));
+  obj->type = type;
+  obj->os_index = idx;
+  obj->os_level = -1;
+  obj->attr = malloc(sizeof(*obj->attr));
+  memset(obj->attr, 0, sizeof(*obj->attr));
+  /* do not allocate the cpuset here, let the caller do it */
+  return obj;
+}
+
+extern void hwloc_free_unlinked_object(hwloc_obj_t obj);
+
+#define hwloc_object_cpuset_from_array(l, _value, _array, _max) do {	\
+		struct hwloc_obj *__l = (l);				\
+		unsigned int *__a = (_array);				\
+		int k;							\
+		__l->cpuset = hwloc_bitmap_alloc();			\
+		for(k=0; k<_max; k++)					\
+			if (__a[k] == _value)				\
+				hwloc_bitmap_set(__l->cpuset, k);	\
+	} while (0)
+
+/* Configures an array of NUM objects of type TYPE with physical IDs OSPHYSIDS
+ * and for which processors have ID PROC_PHYSIDS, and add them to the topology.
+ * */
+static __hwloc_inline void
+hwloc_setup_level(int procid_max, unsigned num, unsigned *osphysids, unsigned *proc_physids, struct hwloc_topology *topology, hwloc_obj_type_t type)
+{
+  struct hwloc_obj *obj;
+  unsigned j;
+
+  hwloc_debug("%d %s\n", num, hwloc_obj_type_string(type));
+
+  for (j = 0; j < num; j++)
+    {
+      obj = hwloc_alloc_setup_object(type, osphysids[j]);
+      hwloc_object_cpuset_from_array(obj, j, proc_physids, procid_max);
+      hwloc_debug_2args_bitmap("%s %d has cpuset %s\n",
+		 hwloc_obj_type_string(type),
+		 j, obj->cpuset);
+      hwloc_insert_object_by_cpuset(topology, obj);
+    }
+  hwloc_debug("%s", "\n");
+}
+
+/* This can be used for the alloc field to get allocated data that can be freed by free() */
+void *hwloc_alloc_heap(hwloc_topology_t topology, size_t len);
+
+/* This can be used for the alloc field to get allocated data that can be freed by munmap() */
+void *hwloc_alloc_mmap(hwloc_topology_t topology, size_t len);
+
+/* This can be used for the free_membind field to free data using free() */
+int hwloc_free_heap(hwloc_topology_t topology, void *addr, size_t len);
+
+/* This can be used for the free_membind field to free data using munmap() */
+int hwloc_free_mmap(hwloc_topology_t topology, void *addr, size_t len);
+
+/* Allocates unbound memory or fail, depending on whether STRICT is requested
+ * or not */
+static __hwloc_inline void *
+hwloc_alloc_or_fail(hwloc_topology_t topology, size_t len, int flags)
+{
+  if (flags & HWLOC_MEMBIND_STRICT)
+    return NULL;
+  return hwloc_alloc(topology, len);
+}
+
+extern void hwloc_topology_distances_init(struct hwloc_topology *topology);
+extern void hwloc_topology_distances_clear(struct hwloc_topology *topology);
+extern void hwloc_topology_distances_destroy(struct hwloc_topology *topology);
+extern void hwloc_topology__set_distance_matrix(struct hwloc_topology *topology, hwloc_obj_type_t type, unsigned nbobjs, unsigned *indexes, hwloc_obj_t *objs, float *distances, int force);
+extern void hwloc_store_distances_from_env(struct hwloc_topology *topology);
+extern void hwloc_convert_distances_indexes_into_objects(struct hwloc_topology *topology);
+extern void hwloc_finalize_logical_distances(struct hwloc_topology *topology);
+extern void hwloc_restrict_distances(struct hwloc_topology *topology, unsigned long flags);
+extern void hwloc_free_logical_distances(struct hwloc_distances_s *dist);
+extern void hwloc_group_by_distances(struct hwloc_topology *topology);
+
+#endif /* HWLOC_PRIVATE_H */

opal/mca/hwloc/hwloc131/hwloc/src/Makefile.am

@@ -0,0 +1,119 @@
+# Copyright © 2009-2010 INRIA.  All rights reserved.
+# Copyright © 2009-2010 Université Bordeaux 1
+# Copyright © 2009-2010 Cisco Systems, Inc.  All rights reserved.
+# See COPYING in top-level directory.
+
+AM_CFLAGS = $(HWLOC_CFLAGS)
+AM_CPPFLAGS = $(HWLOC_CPPFLAGS)
+AM_LDFLAGS = $(HWLOC_LDFLAGS)
+
+EXTRA_DIST = dolib.c
+
+# If we're in standalone mode, build the installable library.
+# Otherwise, build the embedded library.
+
+if HWLOC_BUILD_STANDALONE
+lib_LTLIBRARIES = libhwloc.la
+else
+noinst_LTLIBRARIES = libhwloc_embedded.la
+endif
+
+# Sources and ldflags
+
+sources = \
+        topology.c \
+        traversal.c \
+        distances.c \
+        topology-synthetic.c \
+        topology-xml.c \
+        bind.c \
+        cpuset.c \
+        misc.c
+ldflags =
+
+# Conditionally add to the sources and ldflags
+
+if HWLOC_HAVE_LIBPCI
+sources += topology-libpci.c
+endif HWLOC_HAVE_LIBPCI
+
+if HWLOC_HAVE_SOLARIS
+sources += topology-solaris.c
+endif HWLOC_HAVE_SOLARIS
+
+if HWLOC_HAVE_LINUX
+sources += topology-linux.c
+endif HWLOC_HAVE_LINUX
+
+if HWLOC_HAVE_AIX
+sources += topology-aix.c
+ldflags += -lpthread
+endif HWLOC_HAVE_AIX
+
+if HWLOC_HAVE_OSF
+sources += topology-osf.c
+ldflags += -lnuma -lpthread
+endif HWLOC_HAVE_OSF
+
+if HWLOC_HAVE_HPUX
+sources += topology-hpux.c
+ldflags += -lpthread
+endif HWLOC_HAVE_HPUX
+
+if HWLOC_HAVE_WINDOWS
+sources += topology-windows.c
+endif HWLOC_HAVE_WINDOWS
+
+if HWLOC_HAVE_DARWIN
+sources += topology-darwin.c
+endif HWLOC_HAVE_DARWIN
+
+if HWLOC_HAVE_FREEBSD
+sources += topology-freebsd.c
+endif HWLOC_HAVE_FREEBSD
+
+if HWLOC_HAVE_GCC
+ldflags += -no-undefined
+endif HWLOC_HAVE_GCC
+
+if HWLOC_HAVE_WINDOWS
+LC_MESSAGES=C
+export LC_MESSAGES
+ldflags += -Xlinker --output-def -Xlinker .libs/libhwloc.def
+
+if HWLOC_HAVE_MS_LIB
+.libs/libhwloc.lib: libhwloc.la dolib
+	./dolib "$(HWLOC_MS_LIB)" X86 .libs/libhwloc.def libhwloc-$(HWLOC_SOVERSION) .libs/libhwloc.lib
+all-local: .libs/libhwloc.lib
+endif HWLOC_HAVE_MS_LIB
+
+install-exec-hook:
+	$(INSTALL) .libs/libhwloc.def $(DESTDIR)$(libdir)
+if HWLOC_HAVE_MS_LIB
+	$(INSTALL) .libs/libhwloc.lib $(DESTDIR)$(libdir)
+	$(INSTALL) .libs/libhwloc.exp $(DESTDIR)$(libdir)
+endif HWLOC_HAVE_MS_LIB
+endif HWLOC_HAVE_WINDOWS
+
+if HWLOC_HAVE_CPUID
+sources += topology-x86.c
+endif HWLOC_HAVE_CPUID
+
+# Installable library
+
+libhwloc_la_SOURCES = $(sources)
+libhwloc_la_LDFLAGS = $(ldflags) -version-number $(libhwloc_so_version) $(HWLOC_LIBXML2_LIBS) $(HWLOC_LINUX_LIBNUMA_LIBS) $(HWLOC_PCI_LIBS)
+
+# Embedded library (note the lack of a .so version number -- that
+# intentionally only appears in the installable library)
+
+libhwloc_embedded_la_SOURCES = $(sources)
+libhwloc_embedded_la_LDFLAGS = $(ldflags) $(HWLOC_LIBXML2_LIBS) $(HWLOC_LINUX_LIBNUMA_LIBS)
+
+# XML data (only install if we're building in standalone mode)
+
+if HWLOC_BUILD_STANDALONE
+xml_DATA = $(srcdir)/hwloc.dtd
+xmldir = $(pkgdatadir)
+EXTRA_DIST += hwloc.dtd
+endif

opal/mca/hwloc/hwloc131/hwloc/src/bind.c

@@ -0,0 +1,552 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2010 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+#include <private/autogen/config.h>
+#include <hwloc.h>
+#include <private/private.h>
+#include <hwloc/helper.h>
+#ifdef HAVE_SYS_MMAN_H
+#  include <sys/mman.h>
+#endif
+#ifdef HAVE_MALLOC_H
+#  include <malloc.h>
+#endif
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <errno.h>
+
+/* TODO: HWLOC_GNU_SYS, HWLOC_IRIX_SYS,
+ *
+ * IRIX: see MP_MUSTRUN / _DSM_MUSTRUN, pthread_setrunon_np, /hw, procss_cpulink, numa_create
+ *
+ * We could use glibc's sched_setaffinity generically when it is available
+ *
+ * Darwin and OpenBSD don't seem to have binding facilities.
+ */
+
+static hwloc_const_bitmap_t
+hwloc_fix_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t set)
+{
+  hwloc_const_bitmap_t topology_set = hwloc_topology_get_topology_cpuset(topology);
+  hwloc_const_bitmap_t complete_set = hwloc_topology_get_complete_cpuset(topology);
+
+  if (!topology_set) {
+    /* The topology is composed of several systems, the cpuset is ambiguous. */
+    errno = EXDEV;
+    return NULL;
+  }
+
+  if (hwloc_bitmap_iszero(set)) {
+    errno = EINVAL;
+    return NULL;
+  }
+
+  if (!hwloc_bitmap_isincluded(set, complete_set)) {
+    errno = EINVAL;
+    return NULL;
+  }
+
+  if (hwloc_bitmap_isincluded(topology_set, set))
+    set = complete_set;
+
+  return set;
+}
+
+int
+hwloc_set_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t set, int flags)
+{
+  set = hwloc_fix_cpubind(topology, set);
+  if (!set)
+    return -1;
+
+  if (flags & HWLOC_CPUBIND_PROCESS) {
+    if (topology->set_thisproc_cpubind)
+      return topology->set_thisproc_cpubind(topology, set, flags);
+  } else if (flags & HWLOC_CPUBIND_THREAD) {
+    if (topology->set_thisthread_cpubind)
+      return topology->set_thisthread_cpubind(topology, set, flags);
+  } else {
+    if (topology->set_thisproc_cpubind)
+      return topology->set_thisproc_cpubind(topology, set, flags);
+    else if (topology->set_thisthread_cpubind)
+      return topology->set_thisthread_cpubind(topology, set, flags);
+  }
+
+  errno = ENOSYS;
+  return -1;
+}
+
+int
+hwloc_get_cpubind(hwloc_topology_t topology, hwloc_bitmap_t set, int flags)
+{
+  if (flags & HWLOC_CPUBIND_PROCESS) {
+    if (topology->get_thisproc_cpubind)
+      return topology->get_thisproc_cpubind(topology, set, flags);
+  } else if (flags & HWLOC_CPUBIND_THREAD) {
+    if (topology->get_thisthread_cpubind)
+      return topology->get_thisthread_cpubind(topology, set, flags);
+  } else {
+    if (topology->get_thisproc_cpubind)
+      return topology->get_thisproc_cpubind(topology, set, flags);
+    else if (topology->get_thisthread_cpubind)
+      return topology->get_thisthread_cpubind(topology, set, flags);
+  }
+
+  errno = ENOSYS;
+  return -1;
+}
+
+int
+hwloc_set_proc_cpubind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_bitmap_t set, int flags)
+{
+  set = hwloc_fix_cpubind(topology, set);
+  if (!set)
+    return -1;
+
+  if (topology->set_proc_cpubind)
+    return topology->set_proc_cpubind(topology, pid, set, flags);
+
+  errno = ENOSYS;
+  return -1;
+}
+
+int
+hwloc_get_proc_cpubind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_bitmap_t set, int flags)
+{
+  if (topology->get_proc_cpubind)
+    return topology->get_proc_cpubind(topology, pid, set, flags);
+
+  errno = ENOSYS;
+  return -1;
+}
+
+#ifdef hwloc_thread_t
+int
+hwloc_set_thread_cpubind(hwloc_topology_t topology, hwloc_thread_t tid, hwloc_const_bitmap_t set, int flags)
+{
+  set = hwloc_fix_cpubind(topology, set);
+  if (!set)
+    return -1;
+
+  if (topology->set_thread_cpubind)
+    return topology->set_thread_cpubind(topology, tid, set, flags);
+
+  errno = ENOSYS;
+  return -1;
+}
+
+int
+hwloc_get_thread_cpubind(hwloc_topology_t topology, hwloc_thread_t tid, hwloc_bitmap_t set, int flags)
+{
+  if (topology->get_thread_cpubind)
+    return topology->get_thread_cpubind(topology, tid, set, flags);
+
+  errno = ENOSYS;
+  return -1;
+}
+#endif
+
+int
+hwloc_get_last_cpu_location(hwloc_topology_t topology, hwloc_bitmap_t set, int flags)
+{
+  if (flags & HWLOC_CPUBIND_PROCESS) {
+    if (topology->get_thisproc_last_cpu_location)
+      return topology->get_thisproc_last_cpu_location(topology, set, flags);
+  } else if (flags & HWLOC_CPUBIND_THREAD) {
+    if (topology->get_thisthread_last_cpu_location)
+      return topology->get_thisthread_last_cpu_location(topology, set, flags);
+  } else {
+    if (topology->get_thisproc_last_cpu_location)
+      return topology->get_thisproc_last_cpu_location(topology, set, flags);
+    else if (topology->get_thisthread_last_cpu_location)
+      return topology->get_thisthread_last_cpu_location(topology, set, flags);
+  }
+
+  errno = ENOSYS;
+  return -1;
+}
+
+int
+hwloc_get_proc_last_cpu_location(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_bitmap_t set, int flags)
+{
+  if (topology->get_proc_last_cpu_location)
+    return topology->get_proc_last_cpu_location(topology, pid, set, flags);
+
+  errno = ENOSYS;
+  return -1;
+}
+
+static hwloc_const_nodeset_t
+hwloc_fix_membind(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset)
+{
+  hwloc_const_bitmap_t topology_nodeset = hwloc_topology_get_topology_nodeset(topology);
+  hwloc_const_bitmap_t complete_nodeset = hwloc_topology_get_complete_nodeset(topology);
+
+  if (!hwloc_topology_get_topology_cpuset(topology)) {
+    /* The topology is composed of several systems, the nodeset is thus
+     * ambiguous. */
+    errno = EXDEV;
+    return NULL;
+  }
+
+  if (!complete_nodeset) {
+    /* There is no NUMA node */
+    errno = ENODEV;
+    return NULL;
+  }
+
+  if (hwloc_bitmap_iszero(nodeset)) {
+    errno = EINVAL;
+    return NULL;
+  }
+
+  if (!hwloc_bitmap_isincluded(nodeset, complete_nodeset)) {
+    errno = EINVAL;
+    return NULL;
+  }
+
+  if (hwloc_bitmap_isincluded(topology_nodeset, nodeset))
+    return complete_nodeset;
+
+  return nodeset;
+}
+
+static int
+hwloc_fix_membind_cpuset(hwloc_topology_t topology, hwloc_nodeset_t nodeset, hwloc_const_cpuset_t cpuset)
+{
+  hwloc_const_bitmap_t topology_set = hwloc_topology_get_topology_cpuset(topology);
+  hwloc_const_bitmap_t complete_set = hwloc_topology_get_complete_cpuset(topology);
+  hwloc_const_bitmap_t complete_nodeset = hwloc_topology_get_complete_nodeset(topology);
+
+  if (!topology_set) {
+    /* The topology is composed of several systems, the cpuset is thus
+     * ambiguous. */
+    errno = EXDEV;
+    return -1;
+  }
+
+  if (!complete_nodeset) {
+    /* There is no NUMA node */
+    errno = ENODEV;
+    return -1;
+  }
+
+  if (hwloc_bitmap_iszero(cpuset)) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  if (!hwloc_bitmap_isincluded(cpuset, complete_set)) {
+    errno = EINVAL;
+    return -1;
+  }
+
+  if (hwloc_bitmap_isincluded(topology_set, cpuset)) {
+    hwloc_bitmap_copy(nodeset, complete_nodeset);
+    return 0;
+  }
+
+  hwloc_cpuset_to_nodeset(topology, cpuset, nodeset);
+  return 0;
+}
+
+int
+hwloc_set_membind_nodeset(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  nodeset = hwloc_fix_membind(topology, nodeset);
+  if (!nodeset)
+    return -1;
+
+  if (flags & HWLOC_MEMBIND_PROCESS) {
+    if (topology->set_thisproc_membind)
+      return topology->set_thisproc_membind(topology, nodeset, policy, flags);
+  } else if (flags & HWLOC_MEMBIND_THREAD) {
+    if (topology->set_thisthread_membind)
+      return topology->set_thisthread_membind(topology, nodeset, policy, flags);
+  } else {
+    if (topology->set_thisproc_membind)
+      return topology->set_thisproc_membind(topology, nodeset, policy, flags);
+    else if (topology->set_thisthread_membind)
+      return topology->set_thisthread_membind(topology, nodeset, policy, flags);
+  }
+
+  errno = ENOSYS;
+  return -1;
+}
+
+int
+hwloc_set_membind(hwloc_topology_t topology, hwloc_const_cpuset_t set, hwloc_membind_policy_t policy, int flags)
+{
+  hwloc_nodeset_t nodeset = hwloc_bitmap_alloc();
+  int ret;
+
+  if (hwloc_fix_membind_cpuset(topology, nodeset, set))
+    ret = -1;
+  else
+    ret = hwloc_set_membind_nodeset(topology, nodeset, policy, flags);
+
+  hwloc_bitmap_free(nodeset);
+  return ret;
+}
+
+int
+hwloc_get_membind_nodeset(hwloc_topology_t topology, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags)
+{
+  if (flags & HWLOC_MEMBIND_PROCESS) {
+    if (topology->get_thisproc_membind)
+      return topology->get_thisproc_membind(topology, nodeset, policy, flags);
+  } else if (flags & HWLOC_MEMBIND_THREAD) {
+    if (topology->get_thisthread_membind)
+      return topology->get_thisthread_membind(topology, nodeset, policy, flags);
+  } else {
+    if (topology->get_thisproc_membind)
+      return topology->get_thisproc_membind(topology, nodeset, policy, flags);
+    else if (topology->get_thisthread_membind)
+      return topology->get_thisthread_membind(topology, nodeset, policy, flags);
+  }
+
+  errno = ENOSYS;
+  return -1;
+}
+
+int
+hwloc_get_membind(hwloc_topology_t topology, hwloc_cpuset_t set, hwloc_membind_policy_t * policy, int flags)
+{
+  hwloc_nodeset_t nodeset;
+  int ret;
+
+  nodeset = hwloc_bitmap_alloc();
+  ret = hwloc_get_membind_nodeset(topology, nodeset, policy, flags);
+
+  if (!ret)
+    hwloc_cpuset_from_nodeset(topology, set, nodeset);
+
+  return ret;
+}
+
+int
+hwloc_set_proc_membind_nodeset(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  nodeset = hwloc_fix_membind(topology, nodeset);
+  if (!nodeset)
+    return -1;
+
+  if (topology->set_proc_membind)
+    return topology->set_proc_membind(topology, pid, nodeset, policy, flags);
+
+  errno = ENOSYS;
+  return -1;
+}
+
+
+int
+hwloc_set_proc_membind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_cpuset_t set, hwloc_membind_policy_t policy, int flags)
+{
+  hwloc_nodeset_t nodeset = hwloc_bitmap_alloc();
+  int ret;
+
+  if (hwloc_fix_membind_cpuset(topology, nodeset, set))
+    ret = -1;
+  else
+    ret = hwloc_set_proc_membind_nodeset(topology, pid, nodeset, policy, flags);
+
+  hwloc_bitmap_free(nodeset);
+  return ret;
+}
+
+int
+hwloc_get_proc_membind_nodeset(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags)
+{
+  if (topology->get_proc_membind)
+    return topology->get_proc_membind(topology, pid, nodeset, policy, flags);
+
+  errno = ENOSYS;
+  return -1;
+}
+
+int
+hwloc_get_proc_membind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_cpuset_t set, hwloc_membind_policy_t * policy, int flags)
+{
+  hwloc_nodeset_t nodeset;
+  int ret;
+
+  nodeset = hwloc_bitmap_alloc();
+  ret = hwloc_get_proc_membind_nodeset(topology, pid, nodeset, policy, flags);
+
+  if (!ret)
+    hwloc_cpuset_from_nodeset(topology, set, nodeset);
+
+  return ret;
+}
+
+int
+hwloc_set_area_membind_nodeset(hwloc_topology_t topology, const void *addr, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  nodeset = hwloc_fix_membind(topology, nodeset);
+  if (!nodeset)
+    return -1;
+
+  if (topology->set_area_membind)
+    return topology->set_area_membind(topology, addr, len, nodeset, policy, flags);
+
+  errno = ENOSYS;
+  return -1;
+}
+
+int
+hwloc_set_area_membind(hwloc_topology_t topology, const void *addr, size_t len, hwloc_const_cpuset_t set, hwloc_membind_policy_t policy, int flags)
+{
+  hwloc_nodeset_t nodeset = hwloc_bitmap_alloc();
+  int ret;
+
+  if (hwloc_fix_membind_cpuset(topology, nodeset, set))
+    ret = -1;
+  else
+    ret = hwloc_set_area_membind_nodeset(topology, addr, len, nodeset, policy, flags);
+
+  hwloc_bitmap_free(nodeset);
+  return ret;
+}
+
+int
+hwloc_get_area_membind_nodeset(hwloc_topology_t topology, const void *addr, size_t len, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags)
+{
+  if (topology->get_area_membind)
+    return topology->get_area_membind(topology, addr, len, nodeset, policy, flags);
+
+  errno = ENOSYS;
+  return -1;
+}
+
+int
+hwloc_get_area_membind(hwloc_topology_t topology, const void *addr, size_t len, hwloc_cpuset_t set, hwloc_membind_policy_t * policy, int flags)
+{
+  hwloc_nodeset_t nodeset;
+  int ret;
+
+  nodeset = hwloc_bitmap_alloc();
+  ret = hwloc_get_area_membind_nodeset(topology, addr, len, nodeset, policy, flags);
+
+  if (!ret)
+    hwloc_cpuset_from_nodeset(topology, set, nodeset);
+
+  return ret;
+}
+
+void *
+hwloc_alloc_heap(hwloc_topology_t topology __hwloc_attribute_unused, size_t len)
+{
+  void *p;
+#if defined(HAVE_GETPAGESIZE) && defined(HAVE_POSIX_MEMALIGN)
+  errno = posix_memalign(&p, getpagesize(), len);
+  if (errno)
+    p = NULL;
+#elif defined(HAVE_GETPAGESIZE) && defined(HAVE_MEMALIGN)
+  p = memalign(getpagesize(), len);
+#else
+  p = malloc(len);
+#endif
+  return p;
+}
+
+#ifdef MAP_ANONYMOUS
+void *
+hwloc_alloc_mmap(hwloc_topology_t topology __hwloc_attribute_unused, size_t len)
+{
+  return mmap(NULL, len, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+}
+#endif
+
+int
+hwloc_free_heap(hwloc_topology_t topology __hwloc_attribute_unused, void *addr, size_t len __hwloc_attribute_unused)
+{
+  free(addr);
+  return 0;
+}
+
+#ifdef MAP_ANONYMOUS
+int
+hwloc_free_mmap(hwloc_topology_t topology __hwloc_attribute_unused, void *addr, size_t len)
+{
+  if (!addr)
+    return 0;
+  return munmap(addr, len);
+}
+#endif
+
+void *
+hwloc_alloc(hwloc_topology_t topology, size_t len)
+{
+  if (topology->alloc)
+    return topology->alloc(topology, len);
+  return hwloc_alloc_heap(topology, len);
+}
+
+void *
+hwloc_alloc_membind_nodeset(hwloc_topology_t topology, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  void *p;
+  nodeset = hwloc_fix_membind(topology, nodeset);
+  if (!nodeset)
+    goto fallback;
+  if (flags & HWLOC_MEMBIND_MIGRATE) {
+    errno = EINVAL;
+    goto fallback;
+  }
+
+  if (topology->alloc_membind)
+    return topology->alloc_membind(topology, len, nodeset, policy, flags);
+  else if (topology->set_area_membind) {
+    p = hwloc_alloc(topology, len);
+    if (!p)
+      return NULL;
+    if (topology->set_area_membind(topology, p, len, nodeset, policy, flags) && flags & HWLOC_MEMBIND_STRICT) {
+      int error = errno;
+      free(p);
+      errno = error;
+      return NULL;
+    }
+    return p;
+  } else {
+    errno = ENOSYS;
+  }
+
+fallback:
+  if (flags & HWLOC_MEMBIND_STRICT)
+    /* Report error */
+    return NULL;
+  /* Never mind, allocate anyway */
+  return hwloc_alloc(topology, len);
+}
+
+void *
+hwloc_alloc_membind(hwloc_topology_t topology, size_t len, hwloc_const_cpuset_t set, hwloc_membind_policy_t policy, int flags)
+{
+  hwloc_nodeset_t nodeset = hwloc_bitmap_alloc();
+  void *ret;
+
+  if (!hwloc_fix_membind_cpuset(topology, nodeset, set)) {
+    if (flags & HWLOC_MEMBIND_STRICT)
+      ret = NULL;
+    else
+      ret = hwloc_alloc(topology, len);
+  } else
+    ret = hwloc_alloc_membind_nodeset(topology, len, nodeset, policy, flags);
+
+  hwloc_bitmap_free(nodeset);
+  return ret;
+}
+
+int
+hwloc_free(hwloc_topology_t topology, void *addr, size_t len)
+{
+  if (topology->free_membind)
+    return topology->free_membind(topology, addr, len);
+  return hwloc_free_heap(topology, addr, len);
+}

opal/mca/hwloc/hwloc131/hwloc/src/distances.c

@@ -0,0 +1,790 @@
+/*
+ * Copyright © 2010-2011 INRIA.  All rights reserved.
+ * Copyright © 2011 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+#include <private/autogen/config.h>
+#include <hwloc.h>
+#include <private/private.h>
+#include <private/debug.h>
+
+#include <float.h>
+#include <math.h>
+
+/* called during topology init */
+void hwloc_topology_distances_init(struct hwloc_topology *topology)
+{
+  unsigned i;
+  for (i = HWLOC_OBJ_SYSTEM; i < HWLOC_OBJ_TYPE_MAX; i++) {
+    /* no distances yet */
+    topology->os_distances[i].nbobjs = 0;
+    topology->os_distances[i].objs = NULL;
+    topology->os_distances[i].indexes = NULL;
+    topology->os_distances[i].distances = NULL;
+    topology->os_distances[i].forced = 0;
+  }
+}
+
+/* called when reloading a topology.
+ * keep initial parameters (from set_distances and environment),
+ * but drop what was generated during previous load().
+ */
+void hwloc_topology_distances_clear(struct hwloc_topology *topology)
+{
+  unsigned i;
+  for (i = HWLOC_OBJ_SYSTEM; i < HWLOC_OBJ_TYPE_MAX; i++) {
+    /* remove final distance matrices, but keep physically-ordered ones */
+    free(topology->os_distances[i].objs);
+    topology->os_distances[i].objs = NULL;
+  }
+}
+
+/* called during topology destroy */
+void hwloc_topology_distances_destroy(struct hwloc_topology *topology)
+{
+  unsigned i;
+  for (i = HWLOC_OBJ_SYSTEM; i < HWLOC_OBJ_TYPE_MAX; i++) {
+    /* remove final distance matrics AND physically-ordered ones */
+    free(topology->os_distances[i].indexes);
+    topology->os_distances[i].indexes = NULL;
+    free(topology->os_distances[i].objs);
+    topology->os_distances[i].objs = NULL;
+    free(topology->os_distances[i].distances);
+    topology->os_distances[i].distances = NULL;
+  }
+}
+
+/* insert a distance matrix in the topology.
+ * the caller gives us those pointers, we take care of freeing them later and so on.
+ */
+void hwloc_topology__set_distance_matrix(hwloc_topology_t __hwloc_restrict topology, hwloc_obj_type_t type,
+					 unsigned nbobjs, unsigned *indexes, hwloc_obj_t *objs, float *distances,
+					 int force)
+{
+  if (topology->os_distances[type].forced && !force) {
+    free(indexes);
+    free(objs);
+    free(distances);
+    return;
+  }
+
+  free(topology->os_distances[type].indexes);
+  free(topology->os_distances[type].objs);
+  free(topology->os_distances[type].distances);
+  topology->os_distances[type].nbobjs = nbobjs;
+  topology->os_distances[type].indexes = indexes;
+  topology->os_distances[type].objs = objs;
+  topology->os_distances[type].distances = distances;
+  topology->os_distances[type].forced = force;
+}
+
+/* make sure a user-given distance matrix is sane */
+static int hwloc_topology__check_distance_matrix(hwloc_topology_t __hwloc_restrict topology __hwloc_attribute_unused, hwloc_obj_type_t type __hwloc_attribute_unused,
+						 unsigned nbobjs, unsigned *indexes, hwloc_obj_t *objs __hwloc_attribute_unused, float *distances __hwloc_attribute_unused)
+{
+  unsigned i,j;
+  /* make sure we don't have the same index twice */
+  for(i=0; i<nbobjs; i++)
+    for(j=i+1; j<nbobjs; j++)
+      if (indexes[i] == indexes[j]) {
+	errno = EINVAL;
+	return -1;
+      }
+  return 0;
+}
+
+static hwloc_obj_t hwloc_find_obj_by_type_and_os_index(hwloc_obj_t root, hwloc_obj_type_t type, unsigned os_index)
+{
+  hwloc_obj_t child;
+  if (root->type == type && root->os_index == os_index)
+    return root;
+  child = root->first_child;
+  while (child) {
+    hwloc_obj_t found = hwloc_find_obj_by_type_and_os_index(child, type, os_index);
+    if (found)
+      return found;
+    child = child->next_sibling;
+  }
+  return NULL;
+}
+
+static void hwloc_get_type_distances_from_string(struct hwloc_topology *topology,
+						 hwloc_obj_type_t type, char *string)
+{
+  /* the string format is: "index[0],...,index[N-1]:distance[0],...,distance[N*N-1]"
+   * or "index[0],...,index[N-1]:X*Y" or "index[0],...,index[N-1]:X*Y*Z"
+   */
+  char *tmp = string, *next;
+  unsigned *indexes;
+  float *distances;
+  unsigned nbobjs = 0, i, j, x, y, z;
+
+  if (!strcmp(string, "none")) {
+    hwloc_topology__set_distance_matrix(topology, type, 0, NULL, NULL, NULL, 1 /* force */);
+    return;
+  }
+
+  /* count indexes */
+  while (1) {
+    size_t size = strspn(tmp, "0123456789");
+    if (tmp[size] != ',') {
+      /* last element */
+      tmp += size;
+      nbobjs++;
+      break;
+    }
+    /* another index */
+    tmp += size+1;
+    nbobjs++;
+  }
+
+  if (*tmp != ':') {
+    fprintf(stderr, "Ignoring %s distances from environment variable, missing colon\n",
+	    hwloc_obj_type_string(type));
+    return;
+  }
+
+  indexes = calloc(nbobjs, sizeof(unsigned));
+  distances = calloc(nbobjs*nbobjs, sizeof(float));
+  tmp = string;
+
+  /* parse indexes */
+  for(i=0; i<nbobjs; i++) {
+    indexes[i] = strtoul(tmp, &next, 0);
+    tmp = next+1;
+  }
+
+  /* parse distances */
+  z=1; /* default if sscanf finds only 2 values below */
+  if (sscanf(tmp, "%u*%u*%u", &x, &y, &z) >= 2) {
+    /* generate the matrix to create x groups of y elements */
+    if (x*y*z != nbobjs) {
+      fprintf(stderr, "Ignoring %s distances from environment variable, invalid grouping (%u*%u*%u=%u instead of %u)\n",
+	      hwloc_obj_type_string(type), x, y, z, x*y*z, nbobjs);
+      free(indexes);
+      free(distances);
+      return;
+    }
+    for(i=0; i<nbobjs; i++)
+      for(j=0; j<nbobjs; j++)
+	if (i==j)
+	  distances[i*nbobjs+j] = 1;
+	else if (i/z == j/z)
+	  distances[i*nbobjs+j] = 2;
+	else if (i/z/y == j/z/y)
+	  distances[i*nbobjs+j] = 4;
+	else
+	  distances[i*nbobjs+j] = 8;
+
+  } else {
+    /* parse a comma separated list of distances */
+    for(i=0; i<nbobjs*nbobjs; i++) {
+      distances[i] = atof(tmp);
+      next = strchr(tmp, ',');
+      if (next) {
+        tmp = next+1;
+      } else if (i!=nbobjs*nbobjs-1) {
+	fprintf(stderr, "Ignoring %s distances from environment variable, not enough values (%u out of %u)\n",
+		hwloc_obj_type_string(type), i+1, nbobjs*nbobjs);
+	free(indexes);
+	free(distances);
+	return;
+      }
+    }
+  }
+
+  if (hwloc_topology__check_distance_matrix(topology, type, nbobjs, indexes, NULL, distances) < 0) {
+    fprintf(stderr, "Ignoring invalid %s distances from environment variable\n", hwloc_obj_type_string(type));
+    free(indexes);
+    free(distances);
+    return;
+  }
+
+  hwloc_topology__set_distance_matrix(topology, type, nbobjs, indexes, NULL, distances, 1 /* force */);
+}
+
+/* take distances in the environment, store them as is in the topology.
+ * we'll convert them into object later once the tree is filled
+ */
+void hwloc_store_distances_from_env(struct hwloc_topology *topology)
+{
+  hwloc_obj_type_t type;
+  for(type = HWLOC_OBJ_SYSTEM; type < HWLOC_OBJ_TYPE_MAX; type++) {
+    char *env, envname[64];
+    snprintf(envname, sizeof(envname), "HWLOC_%s_DISTANCES", hwloc_obj_type_string(type));
+    env = getenv(envname);
+    if (env)
+      hwloc_get_type_distances_from_string(topology, type, env);
+  }
+}
+
+/* take the given distance, store them as is in the topology.
+ * we'll convert them into object later once the tree is filled.
+ */
+int hwloc_topology_set_distance_matrix(hwloc_topology_t __hwloc_restrict topology, hwloc_obj_type_t type,
+				       unsigned nbobjs, unsigned *indexes, float *distances)
+{
+  unsigned *_indexes;
+  float *_distances;
+
+  if (!nbobjs && !indexes && !distances) {
+    hwloc_topology__set_distance_matrix(topology, type, 0, NULL, NULL, NULL, 1 /* force */);
+    return 0;
+  }
+
+  if (!nbobjs || !indexes || !distances)
+    return -1;
+
+  if (hwloc_topology__check_distance_matrix(topology, type, nbobjs, indexes, NULL, distances) < 0)
+    return -1;
+
+  /* copy the input arrays and give them to the topology */
+  _indexes = malloc(nbobjs*sizeof(unsigned));
+  memcpy(_indexes, indexes, nbobjs*sizeof(unsigned));
+  _distances = malloc(nbobjs*nbobjs*sizeof(float));
+  memcpy(_distances, distances, nbobjs*nbobjs*sizeof(float));
+  hwloc_topology__set_distance_matrix(topology, type, nbobjs, _indexes, NULL, _distances, 1 /* force */);
+
+  return 0;
+}
+
+/* cleanup everything we created from distances so that we may rebuild them
+ * at the end of restrict()
+ */
+void hwloc_restrict_distances(struct hwloc_topology *topology, unsigned long flags)
+{
+  hwloc_obj_type_t type;
+  for(type = HWLOC_OBJ_SYSTEM; type < HWLOC_OBJ_TYPE_MAX; type++) {
+    /* remove the objs array, we'll rebuild it from the indexes
+     * depending on remaining objects */
+    free(topology->os_distances[type].objs);
+    topology->os_distances[type].objs = NULL;
+    /* if not adapting distances, drop everything */
+    if (!(flags & HWLOC_RESTRICT_FLAG_ADAPT_DISTANCES)) {
+      free(topology->os_distances[type].indexes);
+      topology->os_distances[type].indexes = NULL;
+      free(topology->os_distances[type].distances);
+      topology->os_distances[type].distances = NULL;
+      topology->os_distances[type].nbobjs = 0;
+    }
+  }
+}
+
+/* convert distance indexes that were previously stored in the topology
+ * into actual objects if not done already.
+ * it's already done when distances come from backends.
+ * it's not done when distances come from the user.
+ */
+void hwloc_convert_distances_indexes_into_objects(struct hwloc_topology *topology)
+{
+  hwloc_obj_type_t type;
+  for(type = HWLOC_OBJ_SYSTEM; type < HWLOC_OBJ_TYPE_MAX; type++) {
+    unsigned nbobjs = topology->os_distances[type].nbobjs;
+    unsigned *indexes = topology->os_distances[type].indexes;
+    float *distances = topology->os_distances[type].distances;
+    unsigned i, j;
+    if (!topology->os_distances[type].objs) {
+      hwloc_obj_t *objs = calloc(nbobjs, sizeof(hwloc_obj_t));
+      /* traverse the topology and look for the relevant objects */
+      for(i=0; i<nbobjs; i++) {
+	hwloc_obj_t obj = hwloc_find_obj_by_type_and_os_index(topology->levels[0][0], type, indexes[i]);
+	if (!obj) {
+
+	  /* shift the matrix */
+#define OLDPOS(i,j) (distances+(i)*nbobjs+(j))
+#define NEWPOS(i,j) (distances+(i)*(nbobjs-1)+(j))
+	  if (i>0) {
+	    /** no need to move beginning of 0th line */
+	    for(j=0; j<i-1; j++)
+	      /** move end of jth line + beginning of (j+1)th line */
+	      memmove(NEWPOS(j,i), OLDPOS(j,i+1), (nbobjs-1)*sizeof(*distances));
+	    /** move end of (i-1)th line */
+	    memmove(NEWPOS(i-1,i), OLDPOS(i-1,i+1), (nbobjs-i-1)*sizeof(*distances));
+	  }
+	  if (i<nbobjs-1) {
+	    /** move beginning of (i+1)th line */
+	    memmove(NEWPOS(i,0), OLDPOS(i+1,0), i*sizeof(*distances));
+	    /** move end of jth line + beginning of (j+1)th line */
+	    for(j=i; j<nbobjs-2; j++)
+	      memmove(NEWPOS(j,i), OLDPOS(j+1,i+1), (nbobjs-1)*sizeof(*distances));
+	    /** move end of (nbobjs-2)th line */
+	    memmove(NEWPOS(nbobjs-2,i), OLDPOS(nbobjs-1,i+1), (nbobjs-i-1)*sizeof(*distances));
+	  }
+
+	  /* shift the indexes array */
+	  memmove(indexes+i, indexes+i+1, (nbobjs-i-1)*sizeof(*indexes));
+
+	  /* update counters */
+	  nbobjs--;
+	  i--;
+	  continue;
+	}
+	objs[i] = obj;
+      }
+
+      topology->os_distances[type].nbobjs = nbobjs;
+      if (!nbobjs) {
+	/* the whole matrix was invalid */
+	free(objs);
+	free(topology->os_distances[type].indexes);
+	topology->os_distances[type].indexes = NULL;
+	free(topology->os_distances[type].distances);
+	topology->os_distances[type].distances = NULL;
+      } else {
+	/* setup the objs array */
+	topology->os_distances[type].objs = objs;
+      }
+    }
+  }
+}
+
+static void
+hwloc_setup_distances_from_os_matrix(struct hwloc_topology *topology,
+				     unsigned nbobjs,
+				     hwloc_obj_t *objs, float *osmatrix)
+{
+  unsigned i, j, li, lj, minl;
+  float min = FLT_MAX, max = FLT_MIN;
+  hwloc_obj_t root;
+  float *matrix;
+  hwloc_cpuset_t set;
+  unsigned relative_depth;
+  int idx;
+
+  /* find the root */
+  set = hwloc_bitmap_alloc();
+  for(i=0; i<nbobjs; i++)
+    hwloc_bitmap_or(set, set, objs[i]->cpuset);
+  root = hwloc_get_obj_covering_cpuset(topology, set);
+  assert(root);
+  if (!hwloc_bitmap_isequal(set, root->cpuset)) {
+    /* partial distance matrix not including all the children of a single object */
+    /* TODO insert an intermediate object (group?) covering only these children ? */
+    hwloc_bitmap_free(set);
+    return;
+  }
+  hwloc_bitmap_free(set);
+  if (root->depth >= objs[0]->depth) {
+    /* strange topology led us to find invalid relative depth, ignore */
+    return;
+  }
+  relative_depth = objs[0]->depth - root->depth; /* this assume that we have distances between objects of the same level */
+
+  /* get the logical index offset, it's the min of all logical indexes */
+  minl = UINT_MAX;
+  for(i=0; i<nbobjs; i++)
+    if (minl > objs[i]->logical_index)
+      minl = objs[i]->logical_index;
+
+  /* compute/check min/max values */
+  for(i=0; i<nbobjs; i++)
+    for(j=0; j<nbobjs; j++) {
+      float val = osmatrix[i*nbobjs+j];
+      if (val < min)
+	min = val;
+      if (val > max)
+	max = val;
+    }
+  if (!min) {
+    /* Linux up to 2.6.36 reports ACPI SLIT distances, which should be memory latencies.
+     * Except of SGI IP27 (SGI Origin 200/2000 with MIPS processors) where the distances
+     * are the number of hops between routers.
+     */
+    hwloc_debug("%s", "minimal distance is 0, matrix does not seem to contain latencies, ignoring\n");
+    return;
+  }
+
+  /* store the normalized latency matrix in the root object */
+  idx = root->distances_count++;
+  root->distances = realloc(root->distances, root->distances_count * sizeof(struct hwloc_distances_s *));
+  root->distances[idx] = malloc(sizeof(struct hwloc_distances_s));
+  root->distances[idx]->relative_depth = relative_depth;
+  root->distances[idx]->nbobjs = nbobjs;
+  root->distances[idx]->latency = matrix = malloc(nbobjs*nbobjs*sizeof(float));
+  root->distances[idx]->latency_base = (float) min;
+#define NORMALIZE_LATENCY(d) ((d)/(min))
+  root->distances[idx]->latency_max = NORMALIZE_LATENCY(max);
+  for(i=0; i<nbobjs; i++) {
+    li = objs[i]->logical_index - minl;
+    matrix[li*nbobjs+li] = NORMALIZE_LATENCY(osmatrix[i*nbobjs+i]);
+    for(j=i+1; j<nbobjs; j++) {
+      lj = objs[j]->logical_index - minl;
+      matrix[li*nbobjs+lj] = NORMALIZE_LATENCY(osmatrix[i*nbobjs+j]);
+      matrix[lj*nbobjs+li] = NORMALIZE_LATENCY(osmatrix[j*nbobjs+i]);
+    }
+  }
+}
+
+/* convert internal distances into logically-ordered distances
+ * that can be exposed in the API
+ */
+void
+hwloc_finalize_logical_distances(struct hwloc_topology *topology)
+{
+  unsigned nbobjs;
+  hwloc_obj_type_t type;
+  int depth;
+
+  for (type = HWLOC_OBJ_SYSTEM; type < HWLOC_OBJ_TYPE_MAX; type++) {
+    nbobjs = topology->os_distances[type].nbobjs;
+    if (!nbobjs)
+      continue;
+
+    depth = hwloc_get_type_depth(topology, type);
+    if (depth == HWLOC_TYPE_DEPTH_UNKNOWN || depth == HWLOC_TYPE_DEPTH_MULTIPLE)
+      continue;
+
+    if (topology->os_distances[type].objs) {
+      assert(topology->os_distances[type].distances);
+
+      hwloc_setup_distances_from_os_matrix(topology, nbobjs,
+					   topology->os_distances[type].objs,
+					   topology->os_distances[type].distances);
+    }
+  }
+}
+
+/* destroy a object distances structure */
+void
+hwloc_free_logical_distances(struct hwloc_distances_s * dist)
+{
+  free(dist->latency);
+  free(dist);
+}
+
+static void hwloc_report_user_distance_error(const char *msg, int line)
+{
+    static int reported = 0;
+
+    if (!reported && !hwloc_hide_errors()) {
+        fprintf(stderr, "****************************************************************************\n");
+        fprintf(stderr, "* Hwloc has encountered what looks like an error from user-given distances.\n");
+        fprintf(stderr, "*\n");
+        fprintf(stderr, "* %s\n", msg);
+        fprintf(stderr, "* Error occurred in topology.c line %d\n", line);
+        fprintf(stderr, "*\n");
+        fprintf(stderr, "* Please make sure that distances given through the interface or environment\n");
+        fprintf(stderr, "* variables do not contradict any other topology information.\n");
+        fprintf(stderr, "****************************************************************************\n");
+        reported = 1;
+    }
+}
+
+static int hwloc_compare_distances(float a, float b, float accuracy)
+{
+  if (accuracy != 0.0 && fabsf(a-b) < a * accuracy)
+    return 0;
+  return a < b ? -1 : a == b ? 0 : 1;
+}
+
+/*
+ * Place objects in groups if they are in a transitive graph of minimal distances.
+ * Return how many groups were created, or 0 if some incomplete distance graphs were found.
+ */
+static unsigned
+hwloc_setup_group_from_min_distance(unsigned nbobjs,
+				    float *_distances,
+				    float accuracy,
+				    unsigned *groupids,
+				    int verbose)
+{
+  float min_distance = FLT_MAX;
+  unsigned groupid = 1;
+  unsigned i,j,k;
+  unsigned skipped = 0;
+
+#define DISTANCE(i, j) _distances[(i) * nbobjs + (j)]
+
+  memset(groupids, 0, nbobjs*sizeof(*groupids));
+
+  /* find the minimal distance */
+  for(i=0; i<nbobjs; i++)
+    for(j=0; j<nbobjs; j++) /* check the entire matrix, it may not be perfectly symmetric depending on the accuracy */
+      if (i != j && DISTANCE(i, j) < min_distance) /* no accuracy here, we want the real minimal */
+        min_distance = DISTANCE(i, j);
+  hwloc_debug("found minimal distance %f between objects\n", min_distance);
+
+  if (min_distance == FLT_MAX)
+    return 0;
+
+  /* build groups of objects connected with this distance */
+  for(i=0; i<nbobjs; i++) {
+    unsigned size;
+    int firstfound;
+
+    /* if already grouped, skip */
+    if (groupids[i])
+      continue;
+
+    /* start a new group */
+    groupids[i] = groupid;
+    size = 1;
+    firstfound = i;
+
+    while (firstfound != -1) {
+      /* we added new objects to the group, the first one was firstfound.
+       * rescan all connections from these new objects (starting at first found) to any other objects,
+       * so as to find new objects minimally-connected by transivity.
+       */
+      int newfirstfound = -1;
+      for(j=firstfound; j<nbobjs; j++)
+	if (groupids[j] == groupid)
+	  for(k=0; k<nbobjs; k++)
+              if (!groupids[k] && !hwloc_compare_distances(DISTANCE(j, k), min_distance, accuracy)) {
+	      groupids[k] = groupid;
+	      size++;
+	      if (newfirstfound == -1)
+		newfirstfound = k;
+	      if (i == j)
+		hwloc_debug("object %u is minimally connected to %u\n", k, i);
+	      else
+	        hwloc_debug("object %u is minimally connected to %u through %u\n", k, i, j);
+	    }
+      firstfound = newfirstfound;
+    }
+
+    if (size == 1) {
+      /* cancel this useless group, ignore this object and try from the next one */
+      groupids[i] = 0;
+      skipped++;
+      continue;
+    }
+
+    /* valid this group */
+    groupid++;
+    if (verbose)
+      fprintf(stderr, "Found transitive graph with %u objects with minimal distance %f accuracy %f\n",
+	      size, min_distance, accuracy);
+  }
+
+  if (groupid == 2 && !skipped)
+    /* we created a single group containing all objects, ignore it */
+    return 0;
+
+  /* return the last id, since it's also the number of used group ids */
+  return groupid-1;
+}
+
+/* check that the matrix is ok */
+static int
+hwloc__check_grouping_matrix(unsigned nbobjs, float *_distances, float accuracy, int verbose)
+{
+  unsigned i,j;
+  for(i=0; i<nbobjs; i++) {
+    for(j=i+1; j<nbobjs; j++) {
+      /* should be symmetric */
+      if (hwloc_compare_distances(DISTANCE(i, j), DISTANCE(j, i), accuracy)) {
+	if (verbose)
+	  fprintf(stderr, "Distance matrix asymmetric ([%u,%u]=%f != [%u,%u]=%f), aborting\n",
+		  i, j, DISTANCE(i, j), j, i, DISTANCE(j, i));
+	return -1;
+      }
+      /* diagonal is smaller than everything else */
+      if (hwloc_compare_distances(DISTANCE(i, j), DISTANCE(i, i), accuracy) <= 0) {
+	if (verbose)
+	  fprintf(stderr, "Distance to self not strictly minimal ([%u,%u]=%f <= [%u,%u]=%f), aborting\n",
+		  i, j, DISTANCE(i, j), i, i, DISTANCE(i, i));
+	return -1;
+      }
+    }
+  }
+  return 0;
+}
+
+/*
+ * Look at object physical distances to group them.
+ */
+static void
+hwloc_setup_groups_from_distances(struct hwloc_topology *topology,
+				  unsigned nbobjs,
+				  struct hwloc_obj **objs,
+				  float *_distances,
+				  unsigned nbaccuracies, float *accuracies,
+				  int fromuser,
+				  int needcheck,
+				  int verbose)
+{
+  unsigned *groupids = NULL;
+  unsigned nbgroups = 0;
+  unsigned i,j;
+
+  if (nbobjs <= 2) {
+      return;
+  }
+
+  groupids = malloc(sizeof(unsigned) * nbobjs);
+  if (NULL == groupids) {
+      return;
+  }
+
+  for(i=0; i<nbaccuracies; i++) {
+    if (verbose)
+      fprintf(stderr, "Trying to group %u %s objects according to physical distances with accuracy %f\n",
+	      nbobjs, hwloc_obj_type_string(objs[0]->type), accuracies[i]);
+    if (needcheck && hwloc__check_grouping_matrix(nbobjs, _distances, accuracies[i], verbose) < 0)
+      continue;
+    nbgroups = hwloc_setup_group_from_min_distance(nbobjs, _distances, accuracies[i], groupids, verbose);
+    if (nbgroups)
+      break;
+  }
+  if (!nbgroups)
+    goto outter_free;
+
+  /* For convenience, put these declarations inside a block.  It's a
+     crying shame we can't use C99 syntax here, and have to do a bunch
+     of mallocs. :-( */
+  {
+      hwloc_obj_t *groupobjs = NULL;
+      unsigned *groupsizes = NULL;
+      float *groupdistances = NULL;
+
+      groupobjs = malloc(sizeof(hwloc_obj_t) * nbgroups);
+      groupsizes = malloc(sizeof(unsigned) * nbgroups);
+      groupdistances = malloc(sizeof(float) * nbgroups * nbgroups);
+      if (NULL == groupobjs || NULL == groupsizes || NULL == groupdistances) {
+          goto inner_free;
+      }
+      /* create new Group objects and record their size */
+      memset(&(groupsizes[0]), 0, sizeof(groupsizes[0]) * nbgroups);
+      for(i=0; i<nbgroups; i++) {
+          /* create the Group object */
+          hwloc_obj_t group_obj;
+          group_obj = hwloc_alloc_setup_object(HWLOC_OBJ_GROUP, -1);
+          group_obj->cpuset = hwloc_bitmap_alloc();
+          group_obj->attr->group.depth = topology->next_group_depth;
+          for (j=0; j<nbobjs; j++)
+              if (groupids[j] == i+1) {
+                  hwloc_bitmap_or(group_obj->cpuset, group_obj->cpuset, objs[j]->cpuset);
+                  groupsizes[i]++;
+              }
+          hwloc_debug_1arg_bitmap("adding Group object with %u objects and cpuset %s\n",
+                                  groupsizes[i], group_obj->cpuset);
+          hwloc__insert_object_by_cpuset(topology, group_obj,
+					 fromuser ? hwloc_report_user_distance_error : hwloc_report_os_error);
+          groupobjs[i] = group_obj;
+      }
+
+      /* factorize distances */
+      memset(&(groupdistances[0]), 0, sizeof(groupdistances[0]) * nbgroups * nbgroups);
+#undef DISTANCE
+#define DISTANCE(i, j) _distances[(i) * nbobjs + (j)]
+#define GROUP_DISTANCE(i, j) groupdistances[(i) * nbgroups + (j)]
+      for(i=0; i<nbobjs; i++)
+	if (groupids[i])
+	  for(j=0; j<nbobjs; j++)
+	    if (groupids[j])
+                GROUP_DISTANCE(groupids[i]-1, groupids[j]-1) += DISTANCE(i, j);
+      for(i=0; i<nbgroups; i++)
+          for(j=0; j<nbgroups; j++)
+              GROUP_DISTANCE(i, j) /= groupsizes[i]*groupsizes[j];
+#ifdef HWLOC_DEBUG
+      hwloc_debug("%s", "generated new distance matrix between groups:\n");
+      hwloc_debug("%s", "  index");
+      for(j=0; j<nbgroups; j++)
+	hwloc_debug(" % 5d", (int) j); /* print index because os_index is -1 for Groups */
+      hwloc_debug("%s", "\n");
+      for(i=0; i<nbgroups; i++) {
+	hwloc_debug("  % 5d", (int) i);
+	for(j=0; j<nbgroups; j++)
+	  hwloc_debug(" %2.3f", GROUP_DISTANCE(i, j));
+	hwloc_debug("%s", "\n");
+      }
+#endif
+
+      topology->next_group_depth++;
+      hwloc_setup_groups_from_distances(topology, nbgroups, groupobjs, (float*) groupdistances, nbaccuracies, accuracies, fromuser, 0 /* no need to check generated matrix */, verbose);
+
+  inner_free:
+      /* Safely free everything */
+      if (NULL != groupobjs) {
+          free(groupobjs);
+      }
+      if (NULL != groupsizes) {
+          free(groupsizes);
+      }
+      if (NULL != groupdistances) {
+          free(groupdistances);
+      }
+  }
+
+ outter_free:
+  if (NULL != groupids) {
+      free(groupids);
+  }
+}
+
+void
+hwloc_group_by_distances(struct hwloc_topology *topology)
+{
+  unsigned nbobjs;
+  hwloc_obj_type_t type;
+  char *env;
+  float accuracies[5] = { 0.0, 0.01, 0.02, 0.05, 0.1 };
+  unsigned nbaccuracies = 5;
+  int verbose = 0;
+#ifdef HWLOC_DEBUG
+  unsigned i,j;
+#endif
+
+  env = getenv("HWLOC_GROUPING");
+  if (env && !atoi(env))
+    return;
+  /* backward compat with v1.2 */
+  if (getenv("HWLOC_IGNORE_DISTANCES"))
+    return;
+
+  env = getenv("HWLOC_GROUPING_ACCURACY");
+  if (!env) {
+    /* only use 0.0 */
+    nbaccuracies = 1;
+  } else if (strcmp(env, "try")) {
+    /* use the given value */
+    nbaccuracies = 1;
+    accuracies[0] = atof(env);
+  } /* otherwise try all values */
+
+#ifdef HWLOC_DEBUG
+  verbose = 1;
+#else
+  env = getenv("HWLOC_GROUPING_VERBOSE");
+  if (env)
+    verbose = atoi(env);
+#endif
+
+  for (type = HWLOC_OBJ_SYSTEM; type < HWLOC_OBJ_TYPE_MAX; type++) {
+    nbobjs = topology->os_distances[type].nbobjs;
+    if (!nbobjs)
+      continue;
+
+    if (topology->os_distances[type].objs) {
+      /* if we have objs, we must have distances as well,
+       * thanks to hwloc_convert_distances_indexes_into_objects()
+       */
+      assert(topology->os_distances[type].distances);
+
+#ifdef HWLOC_DEBUG
+      hwloc_debug("%s", "trying to group objects using distance matrix:\n");
+      hwloc_debug("%s", "  index");
+      for(j=0; j<nbobjs; j++)
+	hwloc_debug(" % 5d", (int) topology->os_distances[type].objs[j]->os_index);
+      hwloc_debug("%s", "\n");
+      for(i=0; i<nbobjs; i++) {
+	hwloc_debug("  % 5d", (int) topology->os_distances[type].objs[i]->os_index);
+	for(j=0; j<nbobjs; j++)
+	  hwloc_debug(" %2.3f", topology->os_distances[type].distances[i*nbobjs + j]);
+	hwloc_debug("%s", "\n");
+      }
+#endif
+
+      hwloc_setup_groups_from_distances(topology, nbobjs,
+					topology->os_distances[type].objs,
+					topology->os_distances[type].distances,
+					nbaccuracies, accuracies,
+					topology->os_distances[type].indexes != NULL,
+					1 /* check the first matrice */,
+					verbose);
+    }
+  }
+}

opal/mca/hwloc/hwloc131/hwloc/src/dolib.c

@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009 INRIA.  All rights reserved.
+ * Copyright © 2009 Université Bordeaux 1
+ * See COPYING in top-level directory.
+ */
+
+/* Wrapper to avoid msys' tendency to turn / into \ and : into ;  */
+
+#include <unistd.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(int argc, char *argv[]) {
+  char *prog, *arch, *def, *name, *lib;
+  char s[1024];
+
+  if (argc != 6) {
+    fprintf(stderr,"bad number of arguments");
+    exit(EXIT_FAILURE);
+  }
+
+  prog = argv[1];
+  arch = argv[2];
+  def = argv[3];
+  name = argv[4];
+  lib = argv[5];
+
+  snprintf(s, sizeof(s), "\"%s\" /machine:%s /def:%s /name:%s /out:%s",
+      prog, arch, def, name, lib);
+  if (system(s)) {
+    fprintf(stderr, "%s failed\n", s);
+    exit(EXIT_FAILURE);
+  }
+
+  exit(EXIT_SUCCESS);
+}

opal/mca/hwloc/hwloc131/hwloc/src/hwloc.dtd

@@ -0,0 +1,44 @@
+<!ELEMENT topology (object)+>
+<!ELEMENT root (object)+>
+
+<!ELEMENT object (page_type*,info*,distances*,object*)>
+<!ATTLIST object type (System | Machine | Misc | Group | NUMANode | Socket| Cache | Core | PU | Bridge | PCIDev | OSDev) #REQUIRED>
+<!ATTLIST object os_level CDATA "-1" >
+<!ATTLIST object os_index CDATA "-1" >
+<!ATTLIST object name CDATA "" >
+<!ATTLIST object local_memory CDATA "0" >
+<!ATTLIST object cache_size CDATA "0" >
+<!ATTLIST object cache_linesize CDATA "0" >
+<!ATTLIST object cache_associativity CDATA "0" >
+<!ATTLIST object huge_page_size_kB CDATA "0" >
+<!ATTLIST object huge_page_free CDATA "0" >
+<!ATTLIST object depth CDATA "-1" >
+<!ATTLIST object cpuset CDATA "0" >
+<!ATTLIST object complete_cpuset CDATA "" >
+<!ATTLIST object online_cpuset CDATA "" >
+<!ATTLIST object allowed_cpuset CDATA "" >
+<!ATTLIST object nodeset CDATA "" >
+<!ATTLIST object complete_nodeset CDATA "" >
+<!ATTLIST object allowed_nodeset CDATA "" >
+<!ATTLIST object bridge_type CDATA "" >
+<!ATTLIST object bridge_pci CDATA "" >
+<!ATTLIST object pci_busid CDATA "" >
+<!ATTLIST object pci_type CDATA "" >
+<!ATTLIST object pci_link_speed CDATA "0." >
+<!ATTLIST object osdev_type CDATA "" >
+
+<!ELEMENT page_type EMPTY>
+<!ATTLIST page_type size CDATA #REQUIRED>
+<!ATTLIST page_type count CDATA #REQUIRED>
+
+<!ELEMENT info EMPTY>
+<!ATTLIST info name CDATA #REQUIRED>
+<!ATTLIST info value CDATA #REQUIRED>
+
+<!ELEMENT distances (latency*)>
+<!ATTLIST distances nbobjs CDATA #REQUIRED>
+<!ATTLIST distances relative_depth CDATA #REQUIRED>
+<!ATTLIST distances latency_base CDATA #REQUIRED>
+
+<!ELEMENT latency EMPTY>
+<!ATTLIST latency value CDATA #REQUIRED>

opal/mca/hwloc/hwloc131/hwloc/src/misc.c

@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2010 Université Bordeaux 1
+ * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+#include <private/autogen/config.h>
+#include <private/misc.h>
+
+#include <stdarg.h>
+#ifdef HAVE_SYS_UTSNAME_H
+#include <sys/utsname.h>
+#endif
+#include <stdlib.h>
+#include <stdio.h>
+#include <errno.h>
+#include <ctype.h>
+
+int hwloc_snprintf(char *str, size_t size, const char *format, ...)
+{
+  int ret;
+  va_list ap;
+  static char bin;
+  size_t fakesize;
+  char *fakestr;
+
+  /* Some systems crash on str == NULL */
+  if (!size) {
+    str = &bin;
+    size = 1;
+  }
+
+  va_start(ap, format);
+  ret = vsnprintf(str, size, format, ap);
+  va_end(ap);
+
+  if (ret >= 0 && (size_t) ret != size-1)
+    return ret;
+
+  /* vsnprintf returned size-1 or -1. That could be a system which reports the
+   * written data and not the actually required room. Try increasing buffer
+   * size to get the latter. */
+
+  fakesize = size;
+  fakestr = NULL;
+  do {
+    fakesize *= 2;
+    free(fakestr);
+    fakestr = malloc(fakesize);
+    if (NULL == fakestr)
+      return -1;
+    va_start(ap, format);
+    errno = 0;
+    ret = vsnprintf(fakestr, fakesize, format, ap);
+    va_end(ap);
+  } while ((size_t) ret == fakesize-1 || (ret < 0 && (!errno || errno == ERANGE)));
+
+  if (ret >= 0 && size) {
+    if (size > (size_t) ret+1)
+      size = ret+1;
+    memcpy(str, fakestr, size-1);
+    str[size-1] = 0;
+  }
+  free(fakestr);
+
+  return ret;
+}
+
+int hwloc_namecoloncmp(const char *haystack, const char *needle, size_t n)
+{
+  size_t i = 0;
+  while (*haystack && *haystack != ':') {
+    int ha = *haystack++;
+    int low_h = tolower(ha);
+    int ne = *needle++;
+    int low_n = tolower(ne);
+    if (low_h != low_n)
+      return 1;
+    i++;
+  }
+  return i < n;
+}
+
+void hwloc_add_uname_info(struct hwloc_topology *topology __hwloc_attribute_unused)
+{
+#ifdef HAVE_UNAME
+  struct utsname utsname;
+
+  if (uname(&utsname) < 0)
+    return;
+
+  hwloc_obj_add_info(topology->levels[0][0], "OSName", utsname.sysname);
+  hwloc_obj_add_info(topology->levels[0][0], "OSRelease", utsname.release);
+  hwloc_obj_add_info(topology->levels[0][0], "OSVersion", utsname.version);
+  hwloc_obj_add_info(topology->levels[0][0], "HostName", utsname.nodename);
+  hwloc_obj_add_info(topology->levels[0][0], "Architecture", utsname.machine);
+#endif /* HAVE_UNAME */
+}

opal/mca/hwloc/hwloc131/hwloc/src/topology-aix.c

@@ -0,0 +1,623 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/* TODO: use SIGRECONFIG & dr_reconfig for state change */
+
+#include <private/autogen/config.h>
+
+#include <sys/types.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+#include <hwloc.h>
+#include <private/private.h>
+#include <private/debug.h>
+
+#include <sys/rset.h>
+#include <sys/processor.h>
+#include <sys/thread.h>
+#include <sys/mman.h>
+#include <sys/systemcfg.h>
+
+static int
+hwloc_aix_set_sth_cpubind(hwloc_topology_t topology, rstype_t what, rsid_t who, hwloc_const_bitmap_t hwloc_set, int flags __hwloc_attribute_unused)
+{
+  rsethandle_t rad;
+  int res;
+  unsigned cpu;
+
+  if (flags & HWLOC_CPUBIND_NOMEMBIND) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  /* The resulting binding is always strict */
+
+  if (hwloc_bitmap_isequal(hwloc_set, hwloc_topology_get_complete_cpuset(topology))) {
+    if (ra_detachrset(what, who, 0))
+      return -1;
+    return 0;
+  }
+
+  rad = rs_alloc(RS_EMPTY);
+  hwloc_bitmap_foreach_begin(cpu, hwloc_set)
+    rs_op(RS_ADDRESOURCE, rad, NULL, R_PROCS, cpu);
+  hwloc_bitmap_foreach_end();
+
+  res = ra_attachrset(what, who, rad, 0);
+
+  rs_free(rad);
+  return res;
+}
+
+static int
+hwloc_aix_get_sth_cpubind(hwloc_topology_t topology, rstype_t what, rsid_t who, hwloc_bitmap_t hwloc_set, int flags __hwloc_attribute_unused)
+{
+  rsethandle_t rset;
+  unsigned cpu, maxcpus;
+  int res = -1;
+
+  rset = rs_alloc(RS_EMPTY);
+
+  if (ra_getrset(what, who, 0, rset) == -1)
+    goto out;
+
+  hwloc_bitmap_zero(hwloc_set);
+  maxcpus = rs_getinfo(rset, R_MAXPROCS, 0);
+  for (cpu = 0; cpu < maxcpus; cpu++)
+    if (rs_op(RS_TESTRESOURCE, rset, NULL, R_PROCS, cpu) == 1)
+      hwloc_bitmap_set(hwloc_set, cpu);
+  hwloc_bitmap_and(hwloc_set, hwloc_set, hwloc_topology_get_complete_cpuset(topology));
+  res = 0;
+
+out:
+  rs_free(rset);
+  return res;
+}
+
+static int
+hwloc_aix_set_thisproc_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  rsid_t who;
+  who.at_pid = getpid();
+  return hwloc_aix_set_sth_cpubind(topology, R_PROCESS, who, hwloc_set, flags);
+}
+
+static int
+hwloc_aix_get_thisproc_cpubind(hwloc_topology_t topology, hwloc_bitmap_t hwloc_set, int flags)
+{
+  rsid_t who;
+  who.at_pid = getpid();
+  return hwloc_aix_get_sth_cpubind(topology, R_PROCESS, who, hwloc_set, flags);
+}
+
+#ifdef R_THREAD
+static int
+hwloc_aix_set_thisthread_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  rsid_t who;
+  who.at_tid = thread_self();
+  return hwloc_aix_set_sth_cpubind(topology, R_THREAD, who, hwloc_set, flags);
+}
+
+static int
+hwloc_aix_get_thisthread_cpubind(hwloc_topology_t topology, hwloc_bitmap_t hwloc_set, int flags)
+{
+  rsid_t who;
+  who.at_tid = thread_self();
+  return hwloc_aix_get_sth_cpubind(topology, R_THREAD, who, hwloc_set, flags);
+}
+#endif /* R_THREAD */
+
+static int
+hwloc_aix_set_proc_cpubind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  rsid_t who;
+  who.at_pid = pid;
+  return hwloc_aix_set_sth_cpubind(topology, R_PROCESS, who, hwloc_set, flags);
+}
+
+static int
+hwloc_aix_get_proc_cpubind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_bitmap_t hwloc_set, int flags)
+{
+  rsid_t who;
+  who.at_pid = pid;
+  return hwloc_aix_get_sth_cpubind(topology, R_PROCESS, who, hwloc_set, flags);
+}
+
+#ifdef R_THREAD
+#ifdef HWLOC_HAVE_PTHREAD_GETTHRDS_NP
+static int
+hwloc_aix_set_thread_cpubind(hwloc_topology_t topology, hwloc_thread_t pthread, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  struct __pthrdsinfo info;
+  int size;
+  if ((errno = pthread_getthrds_np(&pthread, PTHRDSINFO_QUERY_TID, &info, sizeof(info), NULL, &size)))
+    return -1;
+  {
+    rsid_t who = { .at_tid = info.__pi_tid };
+    return hwloc_aix_set_sth_cpubind(topology, R_THREAD, who, hwloc_set, flags);
+  }
+}
+
+static int
+hwloc_aix_get_thread_cpubind(hwloc_topology_t topology, hwloc_thread_t pthread, hwloc_bitmap_t hwloc_set, int flags)
+{
+  struct __pthrdsinfo info;
+  int size;
+  if (pthread_getthrds_np(&pthread, PTHRDSINFO_QUERY_TID, &info, sizeof(info), NULL, &size))
+    return -1;
+  {
+    rsid_t who;
+    who.at_tid = info.__pi_tid;
+    return hwloc_aix_get_sth_cpubind(topology, R_THREAD, who, hwloc_set, flags);
+  }
+}
+#endif /* HWLOC_HAVE_PTHREAD_GETTHRDS_NP */
+#endif /* R_THREAD */
+
+#ifdef P_DEFAULT
+
+static int
+hwloc_aix_membind_policy_from_hwloc(uint_t *aix_policy, int policy)
+{
+  switch (policy) {
+    case HWLOC_MEMBIND_DEFAULT:
+    case HWLOC_MEMBIND_BIND:
+      *aix_policy = P_DEFAULT;
+      break;
+    case HWLOC_MEMBIND_FIRSTTOUCH:
+      *aix_policy = P_FIRST_TOUCH;
+      break;
+    case HWLOC_MEMBIND_INTERLEAVE:
+      *aix_policy = P_BALANCED;
+      break;
+    default:
+      errno = ENOSYS;
+      return -1;
+  }
+  return 0;
+}
+
+static int
+hwloc_aix_prepare_membind(hwloc_topology_t topology, rsethandle_t *rad, hwloc_const_nodeset_t nodeset, int flags __hwloc_attribute_unused)
+{
+  rsethandle_t rset, noderad;
+  int MCMlevel;
+  int node;
+
+  MCMlevel = rs_getinfo(NULL, R_MCMSDL, 0);
+  if ((topology->flags & HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM))
+    rset = rs_alloc(RS_ALL);
+  else
+    rset = rs_alloc(RS_PARTITION);
+  *rad = rs_alloc(RS_EMPTY);
+  noderad = rs_alloc(RS_EMPTY);
+
+  hwloc_bitmap_foreach_begin(node, nodeset)
+    rs_getrad(rset, noderad, MCMlevel, node, 0);
+    rs_op(RS_UNION, noderad, *rad, 0, 0);
+  hwloc_bitmap_foreach_end();
+
+  rs_free(rset);
+  rs_free(noderad);
+
+  return 0;
+}
+
+static int
+hwloc_aix_set_sth_membind(hwloc_topology_t topology, rstype_t what, rsid_t who, hwloc_const_bitmap_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  rsethandle_t rad;
+  int res;
+
+  if (flags & HWLOC_MEMBIND_NOCPUBIND) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  switch (policy) {
+    case HWLOC_MEMBIND_DEFAULT:
+    case HWLOC_MEMBIND_BIND:
+      break;
+    default:
+      errno = ENOSYS;
+      return -1;
+  }
+
+  if (hwloc_aix_prepare_membind(topology, &rad, nodeset, flags))
+    return -1;
+
+  res = ra_attachrset(what, who, rad, 0);
+
+  rs_free(rad);
+  return res;
+}
+
+static int
+hwloc_aix_get_sth_membind(hwloc_topology_t topology, rstype_t what, rsid_t who, hwloc_bitmap_t nodeset, hwloc_membind_policy_t *policy, int flags __hwloc_attribute_unused)
+{
+  hwloc_bitmap_t hwloc_set;
+  rsethandle_t rset;
+  unsigned cpu, maxcpus;
+  int res = -1;
+  int depth, n, i;
+
+  depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+  if (depth < 0) {
+    errno = EXDEV;
+    return -1;
+  }
+  n = hwloc_get_nbobjs_by_depth(topology, depth);
+
+  rset = rs_alloc(RS_EMPTY);
+
+  if (ra_getrset(what, who, 0, rset) == -1)
+    goto out;
+
+  hwloc_set = hwloc_bitmap_alloc();
+  maxcpus = rs_getinfo(rset, R_MAXPROCS, 0);
+  for (cpu = 0; cpu < maxcpus; cpu++)
+    if (rs_op(RS_TESTRESOURCE, rset, NULL, R_PROCS, cpu) == 1)
+      hwloc_bitmap_set(hwloc_set, cpu);
+  hwloc_bitmap_and(hwloc_set, hwloc_set, hwloc_topology_get_complete_cpuset(topology));
+
+  hwloc_bitmap_zero(nodeset);
+  for (i = 0; i < n; i++) {
+    hwloc_obj_t obj = hwloc_get_obj_by_depth(topology, depth, i);
+    if (hwloc_bitmap_isincluded(obj->cpuset, hwloc_set))
+      hwloc_bitmap_set(nodeset, obj->os_index);
+  }
+
+  *policy = HWLOC_MEMBIND_DEFAULT;
+  res = 0;
+
+out:
+  rs_free(rset);
+  return res;
+}
+
+static int
+hwloc_aix_set_thisproc_membind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set, hwloc_membind_policy_t policy, int flags)
+{
+  rsid_t who;
+  who.at_pid = getpid();
+  return hwloc_aix_set_sth_membind(topology, R_PROCESS, who, hwloc_set, policy, flags);
+}
+
+static int
+hwloc_aix_get_thisproc_membind(hwloc_topology_t topology, hwloc_bitmap_t hwloc_set, hwloc_membind_policy_t *policy, int flags)
+{
+  rsid_t who;
+  who.at_pid = getpid();
+  return hwloc_aix_get_sth_membind(topology, R_PROCESS, who, hwloc_set, policy, flags);
+}
+
+#ifdef R_THREAD
+static int
+hwloc_aix_set_thisthread_membind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set, hwloc_membind_policy_t policy, int flags)
+{
+  rsid_t who;
+  who.at_tid = thread_self();
+  return hwloc_aix_set_sth_membind(topology, R_THREAD, who, hwloc_set, policy, flags);
+}
+
+static int
+hwloc_aix_get_thisthread_membind(hwloc_topology_t topology, hwloc_bitmap_t hwloc_set, hwloc_membind_policy_t *policy, int flags)
+{
+  rsid_t who;
+  who.at_tid = thread_self();
+  return hwloc_aix_get_sth_membind(topology, R_THREAD, who, hwloc_set, policy, flags);
+}
+#endif /* R_THREAD */
+
+static int
+hwloc_aix_set_proc_membind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_bitmap_t hwloc_set, hwloc_membind_policy_t policy, int flags)
+{
+  rsid_t who;
+  who.at_pid = pid;
+  return hwloc_aix_set_sth_membind(topology, R_PROCESS, who, hwloc_set, policy, flags);
+}
+
+static int
+hwloc_aix_get_proc_membind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_bitmap_t hwloc_set, hwloc_membind_policy_t *policy, int flags)
+{
+  rsid_t who;
+  who.at_pid = pid;
+  return hwloc_aix_get_sth_membind(topology, R_PROCESS, who, hwloc_set, policy, flags);
+}
+
+#ifdef R_THREAD
+#if 0 /* def HWLOC_HAVE_PTHREAD_GETTHRDS_NP */
+static int
+hwloc_aix_set_thread_membind(hwloc_topology_t topology, hwloc_thread_t pthread, hwloc_const_bitmap_t hwloc_set, hwloc_membind_policy_t policy, int flags)
+{
+  struct __pthrdsinfo info;
+  int size;
+  if ((errno = pthread_getthrds_np(&pthread, PTHRDSINFO_QUERY_TID, &info, sizeof(info), NULL, &size)))
+    return -1;
+  {
+    rsid_t who;
+    who.at_tid = info.__pi_tid;
+    return hwloc_aix_set_sth_membind(topology, R_THREAD, who, hwloc_set, policy, flags);
+  }
+}
+
+static int
+hwloc_aix_get_thread_membind(hwloc_topology_t topology, hwloc_thread_t pthread, hwloc_bitmap_t hwloc_set, hwloc_membind_policy_t *policy, int flags)
+{
+  struct __pthrdsinfo info;
+  int size;
+  if (pthread_getthrds_np(&pthread, PTHRDSINFO_QUERY_TID, &info, sizeof(info), NULL, &size))
+    return -1;
+  {
+    rsid_t who;
+    who.at_tid = info.__pi_tid;
+    return hwloc_aix_get_sth_membind(topology, R_THREAD, who, hwloc_set, policy, flags);
+  }
+}
+#endif /* HWLOC_HAVE_PTHREAD_GETTHRDS_NP */
+#endif /* R_THREAD */
+
+#if 0
+/* TODO: seems to be right, but doesn't seem to be working (EINVAL), even after
+ * aligning the range on 64K... */
+static int
+hwloc_aix_set_area_membind(hwloc_topology_t topology, const void *addr, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  subrange_t subrange;
+  rsid_t rsid = { .at_subrange = &subrange };
+  uint_t aix_policy;
+  int ret;
+  fprintf(stderr,"yop\n");
+
+  if ((flags & (HWLOC_MEMBIND_MIGRATE|HWLOC_MEMBIND_STRICT))
+            == (HWLOC_MEMBIND_MIGRATE|HWLOC_MEMBIND_STRICT)) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  subrange.su_offset = (uintptr_t) addr;
+  subrange.su_length = len;
+  subrange.su_rstype = R_RSET;
+
+  if (hwloc_aix_membind_policy_from_hwloc(&aix_policy, policy))
+    return -1;
+
+  if (hwloc_aix_prepare_membind(topology, &subrange.su_rsid.at_rset, nodeset, flags))
+    return -1;
+
+  subrange.su_policy = aix_policy;
+
+  ret = ra_attachrset(R_SUBRANGE, rsid, subrange.su_rsid.at_rset, 0);
+  rs_free(subrange.su_rsid.at_rset);
+  return ret;
+}
+#endif
+
+static void *
+hwloc_aix_alloc_membind(hwloc_topology_t topology, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  void *ret;
+  rsid_t rsid;
+  uint_t aix_policy;
+
+  if (hwloc_aix_membind_policy_from_hwloc(&aix_policy, policy))
+    return hwloc_alloc_or_fail(topology, len, flags);
+
+  if (hwloc_aix_prepare_membind(topology, &rsid.at_rset, nodeset, flags))
+    return hwloc_alloc_or_fail(topology, len, flags);
+
+  ret = ra_mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0, R_RSET, rsid, aix_policy);
+
+  rs_free(rsid.at_rset);
+  return ret;
+}
+#endif /* P_DEFAULT */
+
+static void
+look_rset(int sdl, hwloc_obj_type_t type, struct hwloc_topology *topology, int level)
+{
+  rsethandle_t rset, rad;
+  int i,maxcpus,j;
+  int nbnodes;
+  struct hwloc_obj *obj;
+
+  if ((topology->flags & HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM))
+    rset = rs_alloc(RS_ALL);
+  else
+    rset = rs_alloc(RS_PARTITION);
+  rad = rs_alloc(RS_EMPTY);
+  nbnodes = rs_numrads(rset, sdl, 0);
+  if (nbnodes == -1) {
+    perror("rs_numrads");
+    return;
+  }
+
+  for (i = 0; i < nbnodes; i++) {
+    if (rs_getrad(rset, rad, sdl, i, 0)) {
+      fprintf(stderr,"rs_getrad(%d) failed: %s\n", i, strerror(errno));
+      continue;
+    }
+    if (!rs_getinfo(rad, R_NUMPROCS, 0))
+      continue;
+
+    /* It seems logical processors are numbered from 1 here, while the
+     * bindprocessor functions numbers them from 0... */
+    obj = hwloc_alloc_setup_object(type, i - (type == HWLOC_OBJ_PU));
+    obj->cpuset = hwloc_bitmap_alloc();
+    obj->os_level = sdl;
+    maxcpus = rs_getinfo(rad, R_MAXPROCS, 0);
+    for (j = 0; j < maxcpus; j++) {
+      if (rs_op(RS_TESTRESOURCE, rad, NULL, R_PROCS, j))
+	hwloc_bitmap_set(obj->cpuset, j);
+    }
+    switch(type) {
+      case HWLOC_OBJ_NODE:
+	obj->nodeset = hwloc_bitmap_alloc();
+	hwloc_bitmap_set(obj->nodeset, i);
+	obj->memory.local_memory = 0; /* TODO: odd, rs_getinfo(rad, R_MEMSIZE, 0) << 10 returns the total memory ... */
+	obj->memory.page_types_len = 2;
+	obj->memory.page_types = malloc(2*sizeof(*obj->memory.page_types));
+	memset(obj->memory.page_types, 0, 2*sizeof(*obj->memory.page_types));
+	obj->memory.page_types[0].size = getpagesize();
+#ifdef HAVE__SC_LARGE_PAGESIZE
+	obj->memory.page_types[1].size = sysconf(_SC_LARGE_PAGESIZE);
+#endif
+	/* TODO: obj->memory.page_types[1].count = rs_getinfo(rset, R_LGPGFREE, 0) / hugepagesize */
+	break;
+      case HWLOC_OBJ_CACHE:
+	obj->attr->cache.size = _system_configuration.L2_cache_size;
+	obj->attr->cache.associativity = _system_configuration.L2_cache_asc;
+	obj->attr->cache.linesize = 0; /* TODO: ? */
+	obj->attr->cache.depth = 2;
+	break;
+      case HWLOC_OBJ_GROUP:
+	obj->attr->group.depth = level;
+	break;
+      case HWLOC_OBJ_CORE:
+      {
+	hwloc_obj_t obj2 = hwloc_alloc_setup_object(HWLOC_OBJ_CACHE, i);
+	obj2->cpuset = hwloc_bitmap_dup(obj->cpuset);
+	obj2->attr->cache.size = _system_configuration.dcache_size;
+	obj2->attr->cache.associativity = _system_configuration.dcache_asc;
+	obj2->attr->cache.linesize = _system_configuration.dcache_line;
+	obj2->attr->cache.depth = 1;
+	hwloc_debug("Adding an L1 cache for core %d\n", i);
+	hwloc_insert_object_by_cpuset(topology, obj2);
+	break;
+      }
+      default:
+	break;
+    }
+    hwloc_debug_2args_bitmap("%s %d has cpuset %s\n",
+	       hwloc_obj_type_string(type),
+	       i, obj->cpuset);
+    hwloc_insert_object_by_cpuset(topology, obj);
+  }
+
+  rs_free(rset);
+  rs_free(rad);
+}
+
+void
+hwloc_look_aix(struct hwloc_topology *topology)
+{
+  int i;
+  /* TODO: R_LGPGDEF/R_LGPGFREE for large pages */
+
+  hwloc_debug("Note: SMPSDL is at %d\n", rs_getinfo(NULL, R_SMPSDL, 0));
+#ifdef R_REF1SDL
+  hwloc_debug("Note: REF1SDL is at %d\n", rs_getinfo(NULL, R_REF1SDL, 0));
+#endif
+
+  for (i=0; i<=rs_getinfo(NULL, R_MAXSDL, 0); i++)
+    {
+      int known = 0;
+#if 0
+      if (i == rs_getinfo(NULL, R_SMPSDL, 0))
+	/* Not enabled for now because I'm not sure what it corresponds to. On
+	 * decrypthon it contains all the cpus. Is it a "machine" or a "system"
+	 * level ?
+	 */
+	{
+	  hwloc_debug("looking AIX \"SMP\" sdl %d\n", i);
+	  look_rset(i, HWLOC_OBJ_MACHINE, topology, i);
+	  known = 1;
+	}
+#endif
+      if (i == rs_getinfo(NULL, R_MCMSDL, 0))
+	{
+	  hwloc_debug("looking AIX node sdl %d\n", i);
+	  look_rset(i, HWLOC_OBJ_NODE, topology, i);
+	  known = 1;
+	}
+#      ifdef R_L2CSDL
+      if (i == rs_getinfo(NULL, R_L2CSDL, 0))
+	{
+	  hwloc_debug("looking AIX L2 sdl %d\n", i);
+	  look_rset(i, HWLOC_OBJ_CACHE, topology, i);
+	  known = 1;
+	}
+#      endif
+#      ifdef R_PCORESDL
+      if (i == rs_getinfo(NULL, R_PCORESDL, 0))
+	{
+	  hwloc_debug("looking AIX core sdl %d\n", i);
+	  look_rset(i, HWLOC_OBJ_CORE, topology, i);
+	  known = 1;
+	}
+#      endif
+      if (i == rs_getinfo(NULL, R_MAXSDL, 0))
+	{
+	  hwloc_debug("looking AIX max sdl %d\n", i);
+	  look_rset(i, HWLOC_OBJ_PU, topology, i);
+	  known = 1;
+          topology->support.discovery->pu = 1;
+	}
+
+      /* Don't know how it should be rendered, make a misc object for it.  */
+      if (!known)
+	{
+	  hwloc_debug("looking AIX unknown sdl %d\n", i);
+	  look_rset(i, HWLOC_OBJ_GROUP, topology, i);
+	}
+    }
+
+  hwloc_obj_add_info(topology->levels[0][0], "Backend", "AIX");
+}
+
+void
+hwloc_set_aix_hooks(struct hwloc_topology *topology)
+{
+  topology->set_proc_cpubind = hwloc_aix_set_proc_cpubind;
+  topology->get_proc_cpubind = hwloc_aix_get_proc_cpubind;
+#ifdef R_THREAD
+#ifdef HWLOC_HAVE_PTHREAD_GETTHRDS_NP
+  topology->set_thread_cpubind = hwloc_aix_set_thread_cpubind;
+  topology->get_thread_cpubind = hwloc_aix_get_thread_cpubind;
+#endif /* HWLOC_HAVE_PTHREAD_GETTHRDS_NP */
+#endif /* R_THREAD */
+  topology->set_thisproc_cpubind = hwloc_aix_set_thisproc_cpubind;
+  topology->get_thisproc_cpubind = hwloc_aix_get_thisproc_cpubind;
+#ifdef R_THREAD
+  topology->set_thisthread_cpubind = hwloc_aix_set_thisthread_cpubind;
+  topology->get_thisthread_cpubind = hwloc_aix_get_thisthread_cpubind;
+#endif /* R_THREAD */
+  /* TODO: get_last_cpu_location: use mycpu() */
+#ifdef P_DEFAULT
+  topology->set_proc_membind = hwloc_aix_set_proc_membind;
+  topology->get_proc_membind = hwloc_aix_get_proc_membind;
+#ifdef R_THREAD
+#if 0 /* def HWLOC_HAVE_PTHREAD_GETTHRDS_NP */
+  /* Does it really make sense to set the memory binding of another thread? */
+  topology->set_thread_membind = hwloc_aix_set_thread_membind;
+  topology->get_thread_membind = hwloc_aix_get_thread_membind;
+#endif /* HWLOC_HAVE_PTHREAD_GETTHRDS_NP */
+#endif /* R_THREAD */
+  topology->set_thisproc_membind = hwloc_aix_set_thisproc_membind;
+  topology->get_thisproc_membind = hwloc_aix_get_thisproc_membind;
+#ifdef R_THREAD
+  topology->set_thisthread_membind = hwloc_aix_set_thisthread_membind;
+  topology->get_thisthread_membind = hwloc_aix_get_thisthread_membind;
+#endif /* R_THREAD */
+  /* topology->set_area_membind = hwloc_aix_set_area_membind; */
+  /* get_area_membind is not available */
+  topology->alloc_membind = hwloc_aix_alloc_membind;
+  topology->alloc = hwloc_alloc_mmap;
+  topology->free_membind = hwloc_free_mmap;
+  topology->support.membind->firsttouch_membind = 1;
+  topology->support.membind->bind_membind = 1;
+  topology->support.membind->interleave_membind = 1;
+#endif /* P_DEFAULT */
+}

opal/mca/hwloc/hwloc131/hwloc/src/topology-darwin.c

@@ -0,0 +1,231 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/* Detect topology change: registering for power management changes and check
+ * if for example hw.activecpu changed */
+
+/* Apparently, Darwin people do not _want_ to provide binding functions.  */
+
+#include <private/autogen/config.h>
+
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <stdlib.h>
+#include <inttypes.h>
+
+#include <hwloc.h>
+#include <private/private.h>
+#include <private/debug.h>
+
+void
+hwloc_look_darwin(struct hwloc_topology *topology)
+{
+  int64_t _nprocs;
+  unsigned nprocs;
+  int64_t _npackages;
+  unsigned i, j, cpu;
+  struct hwloc_obj *obj;
+  size_t size;
+  int64_t l1cachesize;
+  int64_t cacheways[2];
+  int64_t l2cachesize;
+  int64_t cachelinesize;
+  int64_t memsize;
+
+  if (hwloc_get_sysctlbyname("hw.ncpu", &_nprocs) || _nprocs <= 0)
+    return;
+  nprocs = _nprocs;
+  topology->support.discovery->pu = 1;
+
+  hwloc_debug("%u procs\n", nprocs);
+
+  if (!hwloc_get_sysctlbyname("hw.packages", &_npackages) && _npackages > 0) {
+    unsigned npackages = _npackages;
+    int64_t _cores_per_package;
+    int64_t _logical_per_package;
+    unsigned logical_per_package;
+
+    hwloc_debug("%u packages\n", npackages);
+
+    if (!hwloc_get_sysctlbyname("machdep.cpu.logical_per_package", &_logical_per_package) && _logical_per_package > 0)
+      logical_per_package = _logical_per_package;
+    else
+      /* Assume the trivia.  */
+      logical_per_package = nprocs / npackages;
+
+    hwloc_debug("%u threads per package\n", logical_per_package);
+
+
+    if (nprocs == npackages * logical_per_package)
+      for (i = 0; i < npackages; i++) {
+        obj = hwloc_alloc_setup_object(HWLOC_OBJ_SOCKET, i);
+        obj->cpuset = hwloc_bitmap_alloc();
+        for (cpu = i*logical_per_package; cpu < (i+1)*logical_per_package; cpu++)
+          hwloc_bitmap_set(obj->cpuset, cpu);
+
+        hwloc_debug_1arg_bitmap("package %u has cpuset %s\n",
+                   i, obj->cpuset);
+        hwloc_insert_object_by_cpuset(topology, obj);
+      }
+
+    if (!hwloc_get_sysctlbyname("machdep.cpu.cores_per_package", &_cores_per_package) && _cores_per_package > 0) {
+      unsigned cores_per_package = _cores_per_package;
+      hwloc_debug("%u cores per package\n", cores_per_package);
+
+      if (!(logical_per_package % cores_per_package))
+        for (i = 0; i < npackages * cores_per_package; i++) {
+          obj = hwloc_alloc_setup_object(HWLOC_OBJ_CORE, i);
+          obj->cpuset = hwloc_bitmap_alloc();
+          for (cpu = i*(logical_per_package/cores_per_package);
+               cpu < (i+1)*(logical_per_package/cores_per_package);
+               cpu++)
+            hwloc_bitmap_set(obj->cpuset, cpu);
+
+          hwloc_debug_1arg_bitmap("core %u has cpuset %s\n",
+                     i, obj->cpuset);
+          hwloc_insert_object_by_cpuset(topology, obj);
+        }
+    }
+  }
+
+  if (hwloc_get_sysctlbyname("hw.l1dcachesize", &l1cachesize))
+    l1cachesize = 0;
+
+  if (hwloc_get_sysctlbyname("hw.l2cachesize", &l2cachesize))
+    l2cachesize = 0;
+
+  if (hwloc_get_sysctlbyname("machdep.cpu.cache.L1_associativity", &cacheways[0]))
+    cacheways[0] = 0;
+  else if (cacheways[0] == 0xff)
+    cacheways[0] = -1;
+
+  if (hwloc_get_sysctlbyname("machdep.cpu.cache.L2_associativity", &cacheways[1]))
+    cacheways[1] = 0;
+  else if (cacheways[1] == 0xff)
+    cacheways[1] = -1;
+
+  if (hwloc_get_sysctlbyname("hw.cachelinesize", &cachelinesize))
+    cachelinesize = 0;
+
+  if (hwloc_get_sysctlbyname("hw.memsize", &memsize))
+    memsize = 0;
+
+  if (!sysctlbyname("hw.cacheconfig", NULL, &size, NULL, 0)) {
+    unsigned n = size / sizeof(uint32_t);
+    uint64_t *cacheconfig = NULL;
+    uint64_t *cachesize = NULL;
+    uint32_t *cacheconfig32 = NULL;
+
+    cacheconfig = malloc(sizeof(uint64_t) * n);
+    if (NULL == cacheconfig) {
+        goto out;
+    }
+    cachesize = malloc(sizeof(uint64_t) * n);
+    if (NULL == cachesize) {
+        goto out;
+    }
+    cacheconfig32 = malloc(sizeof(uint32_t) * n);
+    if (NULL == cacheconfig32) {
+        goto out;
+    }
+
+    if ((!sysctlbyname("hw.cacheconfig", cacheconfig, &size, NULL, 0))) {
+      /* Yeech. Darwin seemingly has changed from 32bit to 64bit integers for
+       * cacheconfig, with apparently no way for detection. Assume the machine
+       * won't have more than 4 billion cpus */
+      if (cacheconfig[0] > 0xFFFFFFFFUL) {
+        memcpy(cacheconfig32, cacheconfig, size);
+        for (i = 0 ; i < size / sizeof(uint32_t); i++)
+          cacheconfig[i] = cacheconfig32[i];
+      }
+
+      memset(cachesize, 0, sizeof(uint64_t) * n);
+      size = sizeof(uint64_t) * n;
+      if (sysctlbyname("hw.cachesize", cachesize, &size, NULL, 0)) {
+        if (n > 0)
+          cachesize[0] = memsize;
+        if (n > 1)
+          cachesize[1] = l1cachesize;
+        if (n > 2)
+          cachesize[2] = l2cachesize;
+      }
+
+      hwloc_debug("%s", "caches");
+      for (i = 0; i < n && cacheconfig[i]; i++)
+        hwloc_debug(" %"PRIu64"(%"PRIu64"kB)", cacheconfig[i], cachesize[i] / 1024);
+
+      cacheconfig[i] = cacheconfig32[i];
+      /* Now we know how many caches there are */
+      n = i;
+      hwloc_debug("\n%u cache levels\n", n - 1);
+
+      /* For each cache level (0 is memory) */
+      for (i = 0; i < n; i++) {
+        /* cacheconfig tells us how many cpus share it, let's iterate on each cache */
+        for (j = 0; j < (nprocs / cacheconfig[i]); j++) {
+          obj = hwloc_alloc_setup_object(i?HWLOC_OBJ_CACHE:HWLOC_OBJ_NODE, j);
+          if (!i) {
+            obj->nodeset = hwloc_bitmap_alloc();
+            hwloc_bitmap_set(obj->nodeset, j);
+          }
+          obj->cpuset = hwloc_bitmap_alloc();
+          for (cpu = j*cacheconfig[i];
+               cpu < ((j+1)*cacheconfig[i]);
+               cpu++)
+            hwloc_bitmap_set(obj->cpuset, cpu);
+
+          if (i) {
+            hwloc_debug_2args_bitmap("L%ucache %u has cpuset %s\n",
+                i, j, obj->cpuset);
+            obj->attr->cache.depth = i;
+            obj->attr->cache.size = cachesize[i];
+            obj->attr->cache.linesize = cachelinesize;
+            if (i <= sizeof(cacheways) / sizeof(cacheways[0]))
+              obj->attr->cache.associativity = cacheways[i-1];
+            else
+              obj->attr->cache.associativity = 0;
+          } else {
+            hwloc_debug_1arg_bitmap("node %u has cpuset %s\n",
+                j, obj->cpuset);
+	    obj->memory.local_memory = cachesize[i];
+	    obj->memory.page_types_len = 2;
+	    obj->memory.page_types = malloc(2*sizeof(*obj->memory.page_types));
+	    memset(obj->memory.page_types, 0, 2*sizeof(*obj->memory.page_types));
+	    obj->memory.page_types[0].size = getpagesize();
+#ifdef HAVE__SC_LARGE_PAGESIZE
+	    obj->memory.page_types[1].size = sysconf(_SC_LARGE_PAGESIZE);
+#endif
+          }
+
+          hwloc_insert_object_by_cpuset(topology, obj);
+        }
+      }
+    }
+  out:
+    if (NULL != cacheconfig) {
+        free(cacheconfig);
+    }
+    if (NULL != cachesize) {
+        free(cachesize);
+    }
+    if (NULL != cacheconfig32) {
+        free(cacheconfig32);
+    }
+  }
+
+
+  /* add PU objects */
+  hwloc_setup_pu_level(topology, nprocs);
+
+  hwloc_obj_add_info(topology->levels[0][0], "Backend", "Darwin");
+}
+
+void
+hwloc_set_darwin_hooks(struct hwloc_topology *topology __hwloc_attribute_unused)
+{
+}

opal/mca/hwloc/hwloc131/hwloc/src/topology-freebsd.c

@@ -0,0 +1,201 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2010 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+#include <private/autogen/config.h>
+
+#include <sys/types.h>
+#include <stdlib.h>
+#include <inttypes.h>
+#include <sys/param.h>
+#include <pthread.h>
+#ifdef HAVE_PTHREAD_NP_H
+#include <pthread_np.h>
+#endif
+#ifdef HAVE_SYS_CPUSET_H
+#include <sys/cpuset.h>
+#endif
+
+#include <hwloc.h>
+#include <private/private.h>
+#include <private/debug.h>
+
+#ifdef HAVE_SYS_CPUSET_H
+static void
+hwloc_freebsd_bsd2hwloc(hwloc_bitmap_t hwloc_cpuset, const cpuset_t *cpuset)
+{
+  unsigned cpu;
+  hwloc_bitmap_zero(hwloc_cpuset);
+  for (cpu = 0; cpu < CPU_SETSIZE; cpu++)
+    if (CPU_ISSET(cpu, cpuset))
+      hwloc_bitmap_set(hwloc_cpuset, cpu);
+}
+
+static void
+hwloc_freebsd_hwloc2bsd(hwloc_const_bitmap_t hwloc_cpuset, cpuset_t *cpuset)
+{
+  unsigned cpu;
+  CPU_ZERO(cpuset);
+  for (cpu = 0; cpu < CPU_SETSIZE; cpu++)
+    if (hwloc_bitmap_isset(hwloc_cpuset, cpu))
+      CPU_SET(cpu, cpuset);
+}
+
+static int
+hwloc_freebsd_set_sth_affinity(hwloc_topology_t topology __hwloc_attribute_unused, cpulevel_t level, cpuwhich_t which, id_t id, hwloc_const_bitmap_t hwloc_cpuset, int flags __hwloc_attribute_unused)
+{
+  cpuset_t cpuset;
+
+  hwloc_freebsd_hwloc2bsd(hwloc_cpuset, &cpuset);
+
+  if (cpuset_setaffinity(level, which, id, sizeof(cpuset), &cpuset))
+    return -1;
+
+  return 0;
+}
+
+static int
+hwloc_freebsd_get_sth_affinity(hwloc_topology_t topology __hwloc_attribute_unused, cpulevel_t level, cpuwhich_t which, id_t id, hwloc_bitmap_t hwloc_cpuset, int flags __hwloc_attribute_unused)
+{
+  cpuset_t cpuset;
+
+  if (cpuset_getaffinity(level, which, id, sizeof(cpuset), &cpuset))
+    return -1;
+
+  hwloc_freebsd_bsd2hwloc(hwloc_cpuset, &cpuset);
+  return 0;
+}
+
+static int
+hwloc_freebsd_set_thisproc_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_cpuset, int flags)
+{
+  return hwloc_freebsd_set_sth_affinity(topology, CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, hwloc_cpuset, flags);
+}
+
+static int
+hwloc_freebsd_get_thisproc_cpubind(hwloc_topology_t topology, hwloc_bitmap_t hwloc_cpuset, int flags)
+{
+  return hwloc_freebsd_get_sth_affinity(topology, CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, hwloc_cpuset, flags);
+}
+
+static int
+hwloc_freebsd_set_thisthread_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_cpuset, int flags)
+{
+  return hwloc_freebsd_set_sth_affinity(topology, CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, hwloc_cpuset, flags);
+}
+
+static int
+hwloc_freebsd_get_thisthread_cpubind(hwloc_topology_t topology, hwloc_bitmap_t hwloc_cpuset, int flags)
+{
+  return hwloc_freebsd_get_sth_affinity(topology, CPU_LEVEL_WHICH, CPU_WHICH_TID, -1, hwloc_cpuset, flags);
+}
+
+static int
+hwloc_freebsd_set_proc_cpubind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_bitmap_t hwloc_cpuset, int flags)
+{
+  return hwloc_freebsd_set_sth_affinity(topology, CPU_LEVEL_WHICH, CPU_WHICH_PID, pid, hwloc_cpuset, flags);
+}
+
+static int
+hwloc_freebsd_get_proc_cpubind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_bitmap_t hwloc_cpuset, int flags)
+{
+  return hwloc_freebsd_get_sth_affinity(topology, CPU_LEVEL_WHICH, CPU_WHICH_PID, pid, hwloc_cpuset, flags);
+}
+
+#ifdef hwloc_thread_t
+
+#if HAVE_DECL_PTHREAD_SETAFFINITY_NP
+#pragma weak pthread_setaffinity_np
+static int
+hwloc_freebsd_set_thread_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_thread_t tid, hwloc_const_bitmap_t hwloc_cpuset, int flags __hwloc_attribute_unused)
+{
+  int err;
+  cpuset_t cpuset;
+
+  if (!pthread_setaffinity_np) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  hwloc_freebsd_hwloc2bsd(hwloc_cpuset, &cpuset);
+
+  err = pthread_setaffinity_np(tid, sizeof(cpuset), &cpuset);
+
+  if (err) {
+    errno = err;
+    return -1;
+  }
+
+  return 0;
+}
+#endif
+
+#if HAVE_DECL_PTHREAD_GETAFFINITY_NP
+#pragma weak pthread_getaffinity_np
+static int
+hwloc_freebsd_get_thread_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_thread_t tid, hwloc_bitmap_t hwloc_cpuset, int flags __hwloc_attribute_unused)
+{
+  int err;
+  cpuset_t cpuset;
+
+  if (!pthread_getaffinity_np) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  err = pthread_getaffinity_np(tid, sizeof(cpuset), &cpuset);
+
+  if (err) {
+    errno = err;
+    return -1;
+  }
+
+  hwloc_freebsd_bsd2hwloc(hwloc_cpuset, &cpuset);
+  return 0;
+}
+#endif
+#endif
+#endif
+
+void
+hwloc_look_freebsd(struct hwloc_topology *topology)
+{
+  unsigned nbprocs = hwloc_fallback_nbprocessors(topology);
+
+#ifdef HAVE__SC_LARGE_PAGESIZE
+  topology->levels[0][0]->attr->machine.huge_page_size_kB = sysconf(_SC_LARGE_PAGESIZE);
+#endif
+
+  hwloc_set_freebsd_hooks(topology);
+  hwloc_look_x86(topology, nbprocs);
+
+  hwloc_setup_pu_level(topology, nbprocs);
+
+  hwloc_obj_add_info(topology->levels[0][0], "Backend", "FreeBSD");
+}
+
+void
+hwloc_set_freebsd_hooks(struct hwloc_topology *topology)
+{
+#ifdef HAVE_SYS_CPUSET_H
+  topology->set_thisproc_cpubind = hwloc_freebsd_set_thisproc_cpubind;
+  topology->get_thisproc_cpubind = hwloc_freebsd_get_thisproc_cpubind;
+  topology->set_thisthread_cpubind = hwloc_freebsd_set_thisthread_cpubind;
+  topology->get_thisthread_cpubind = hwloc_freebsd_get_thisthread_cpubind;
+  topology->set_proc_cpubind = hwloc_freebsd_set_proc_cpubind;
+  topology->get_proc_cpubind = hwloc_freebsd_get_proc_cpubind;
+#ifdef hwloc_thread_t
+#if HAVE_DECL_PTHREAD_SETAFFINITY_NP
+  topology->set_thread_cpubind = hwloc_freebsd_set_thread_cpubind;
+#endif
+#if HAVE_DECL_PTHREAD_GETAFFINITY_NP
+  topology->get_thread_cpubind = hwloc_freebsd_get_thread_cpubind;
+#endif
+#endif
+#endif
+  /* TODO: get_last_cpu_location: find out ki_lastcpu */
+}

opal/mca/hwloc/hwloc131/hwloc/src/topology-hpux.c

@@ -0,0 +1,262 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2010 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/* TODO: psets? (Only for root)
+ * since 11i 1.6:
+   _SC_PSET_SUPPORT
+   pset_create/destroy/assign/setattr
+   pset_ctl/getattr
+   pset_bind()
+   pthread_pset_bind_np()
+ */
+
+#include <private/autogen/config.h>
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+
+#include <hwloc.h>
+#include <private/private.h>
+#include <private/debug.h>
+
+#include <sys/mpctl.h>
+#include <sys/mman.h>
+#include <pthread.h>
+
+static ldom_t
+hwloc_hpux_find_ldom(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set)
+{
+  int has_numa = sysconf(_SC_CCNUMA_SUPPORT) == 1;
+  hwloc_obj_t obj;
+
+  if (!has_numa)
+    return -1;
+
+  obj = hwloc_get_first_largest_obj_inside_cpuset(topology, hwloc_set);
+  if (!hwloc_bitmap_isequal(obj->cpuset, hwloc_set) || obj->type != HWLOC_OBJ_NODE) {
+    /* Does not correspond to exactly one node */
+    return -1;
+  }
+
+  return obj->os_index;
+}
+
+static spu_t
+hwloc_hpux_find_spu(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_const_bitmap_t hwloc_set)
+{
+  spu_t cpu;
+
+  cpu = hwloc_bitmap_first(hwloc_set);
+  if (cpu != -1 && hwloc_bitmap_weight(hwloc_set) == 1)
+    return cpu;
+  return -1;
+}
+
+/* Note: get_cpubind not available on HP-UX */
+static int
+hwloc_hpux_set_proc_cpubind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  ldom_t ldom;
+  spu_t cpu;
+
+  /* Drop previous binding */
+  mpctl(MPC_SETLDOM, MPC_LDOMFLOAT, pid);
+  mpctl(MPC_SETPROCESS, MPC_SPUFLOAT, pid);
+
+  if (hwloc_bitmap_isequal(hwloc_set, hwloc_topology_get_complete_cpuset(topology)))
+    return 0;
+
+  ldom = hwloc_hpux_find_ldom(topology, hwloc_set);
+  if (ldom != -1)
+    return mpctl(MPC_SETLDOM, ldom, pid);
+
+  cpu = hwloc_hpux_find_spu(topology, hwloc_set);
+  if (cpu != -1)
+    return mpctl(flags & HWLOC_CPUBIND_STRICT ? MPC_SETPROCESS_FORCE : MPC_SETPROCESS, cpu, pid);
+
+  errno = EXDEV;
+  return -1;
+}
+
+static int
+hwloc_hpux_set_thisproc_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  return hwloc_hpux_set_proc_cpubind(topology, MPC_SELFPID, hwloc_set, flags);
+}
+
+#ifdef hwloc_thread_t
+static int
+hwloc_hpux_set_thread_cpubind(hwloc_topology_t topology, hwloc_thread_t pthread, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  ldom_t ldom, ldom2;
+  spu_t cpu, cpu2;
+
+  /* Drop previous binding */
+  pthread_ldom_bind_np(&ldom2, PTHREAD_LDOMFLOAT_NP, pthread);
+  pthread_processor_bind_np(PTHREAD_BIND_ADVISORY_NP, &cpu2, PTHREAD_SPUFLOAT_NP, pthread);
+
+  if (hwloc_bitmap_isequal(hwloc_set, hwloc_topology_get_complete_cpuset(topology)))
+    return 0;
+
+  ldom = hwloc_hpux_find_ldom(topology, hwloc_set);
+  if (ldom != -1)
+    return pthread_ldom_bind_np(&ldom2, ldom, pthread);
+
+  cpu = hwloc_hpux_find_spu(topology, hwloc_set);
+  if (cpu != -1)
+    return pthread_processor_bind_np(flags & HWLOC_CPUBIND_STRICT ? PTHREAD_BIND_FORCED_NP : PTHREAD_BIND_ADVISORY_NP, &cpu2, cpu, pthread);
+
+  errno = EXDEV;
+  return -1;
+}
+
+static int
+hwloc_hpux_set_thisthread_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  return hwloc_hpux_set_thread_cpubind(topology, PTHREAD_SELFTID_NP, hwloc_set, flags);
+}
+#endif
+
+/* According to HP docs, HP-UX up to 11iv2 don't support migration */
+
+#ifdef MAP_MEM_FIRST_TOUCH
+static void*
+hwloc_hpux_alloc_membind(hwloc_topology_t topology, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  int mmap_flags;
+
+  /* Can not give a set of nodes.  */
+  if (!hwloc_bitmap_isequal(nodeset, hwloc_topology_get_complete_nodeset(topology))) {
+    errno = EXDEV;
+    return hwloc_alloc_or_fail(topology, len, flags);
+  }
+
+  switch (policy) {
+    case HWLOC_MEMBIND_DEFAULT:
+    case HWLOC_MEMBIND_BIND:
+      mmap_flags = 0;
+      break;
+    case HWLOC_MEMBIND_FIRSTTOUCH:
+      mmap_flags = MAP_MEM_FIRST_TOUCH;
+      break;
+    case HWLOC_MEMBIND_INTERLEAVE:
+      mmap_flags = MAP_MEM_INTERLEAVED;
+      break;
+    default:
+      errno = ENOSYS;
+      return NULL;
+  }
+
+  return mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | mmap_flags, -1, 0);
+}
+#endif /* MAP_MEM_FIRST_TOUCH */
+
+void
+hwloc_look_hpux(struct hwloc_topology *topology)
+{
+  int has_numa = sysconf(_SC_CCNUMA_SUPPORT) == 1;
+  hwloc_obj_t *nodes = NULL, obj;
+  spu_t currentcpu;
+  ldom_t currentnode;
+  int i, nbnodes = 0;
+
+#ifdef HAVE__SC_LARGE_PAGESIZE
+  topology->levels[0][0]->attr->machine.huge_page_size_kB = sysconf(_SC_LARGE_PAGESIZE);
+#endif
+
+  if (has_numa) {
+    nbnodes = mpctl(topology->flags & HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM ?
+      MPC_GETNUMLDOMS_SYS : MPC_GETNUMLDOMS, 0, 0);
+
+    hwloc_debug("%d nodes\n", nbnodes);
+
+    nodes = malloc(nbnodes * sizeof(*nodes));
+
+    i = 0;
+    currentnode = mpctl(topology->flags & HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM ?
+      MPC_GETFIRSTLDOM_SYS : MPC_GETFIRSTLDOM, 0, 0);
+    while (currentnode != -1 && i < nbnodes) {
+      hwloc_debug("node %d is %d\n", i, currentnode);
+      nodes[i] = obj = hwloc_alloc_setup_object(HWLOC_OBJ_NODE, currentnode);
+      obj->cpuset = hwloc_bitmap_alloc();
+      obj->nodeset = hwloc_bitmap_alloc();
+      hwloc_bitmap_set(obj->nodeset, currentnode);
+      /* TODO: obj->attr->node.memory_kB */
+      /* TODO: obj->attr->node.huge_page_free */
+
+      currentnode = mpctl(topology->flags & HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM ?
+        MPC_GETNEXTLDOM_SYS : MPC_GETNEXTLDOM, currentnode, 0);
+      i++;
+    }
+  }
+
+  i = 0;
+  currentcpu = mpctl(topology->flags & HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM ?
+      MPC_GETFIRSTSPU_SYS : MPC_GETFIRSTSPU, 0,0);
+  while (currentcpu != -1) {
+    obj = hwloc_alloc_setup_object(HWLOC_OBJ_PU, currentcpu);
+    obj->cpuset = hwloc_bitmap_alloc();
+    hwloc_bitmap_set(obj->cpuset, currentcpu);
+
+    hwloc_debug("cpu %d\n", currentcpu);
+
+    if (nodes) {
+      /* Add this cpu to its node */
+      currentnode = mpctl(MPC_SPUTOLDOM, currentcpu, 0);
+      if ((ldom_t) nodes[i]->os_index != currentnode)
+        for (i = 0; i < nbnodes; i++)
+          if ((ldom_t) nodes[i]->os_index == currentnode)
+            break;
+      if (i < nbnodes) {
+        hwloc_bitmap_set(nodes[i]->cpuset, currentcpu);
+        hwloc_debug("is in node %d\n", i);
+      } else {
+        hwloc_debug("%s", "is in no node?!\n");
+      }
+    }
+
+    /* Add cpu */
+    hwloc_insert_object_by_cpuset(topology, obj);
+
+    currentcpu = mpctl(topology->flags & HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM ?
+      MPC_GETNEXTSPU_SYS : MPC_GETNEXTSPU, currentcpu, 0);
+  }
+
+  if (nodes) {
+    /* Add nodes */
+    for (i = 0 ; i < nbnodes ; i++)
+      hwloc_insert_object_by_cpuset(topology, nodes[i]);
+    free(nodes);
+  }
+
+  topology->support.discovery->pu = 1;
+
+  hwloc_obj_add_info(topology->levels[0][0], "Backend", "HP-UX");
+}
+
+void
+hwloc_set_hpux_hooks(struct hwloc_topology *topology)
+{
+  topology->set_proc_cpubind = hwloc_hpux_set_proc_cpubind;
+  topology->set_thisproc_cpubind = hwloc_hpux_set_thisproc_cpubind;
+#ifdef hwloc_thread_t
+  topology->set_thread_cpubind = hwloc_hpux_set_thread_cpubind;
+  topology->set_thisthread_cpubind = hwloc_hpux_set_thisthread_cpubind;
+#endif
+#ifdef MAP_MEM_FIRST_TOUCH
+  topology->alloc_membind = hwloc_hpux_alloc_membind;
+  topology->alloc = hwloc_alloc_mmap;
+  topology->free_membind = hwloc_free_mmap;
+  topology->support.membind->firsttouch_membind = 1;
+  topology->support.membind->bind_membind = 1;
+  topology->support.membind->interleave_membind = 1;
+#endif /* MAP_MEM_FIRST_TOUCH */
+}

opal/mca/hwloc/hwloc131/hwloc/src/topology-libpci.c

@@ -0,0 +1,801 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * See COPYING in top-level directory.
+ */
+
+#include <private/autogen/config.h>
+#include <hwloc.h>
+#include <hwloc/helper.h>
+#include <private/private.h>
+#include <private/debug.h>
+#include <private/misc.h>
+
+#ifdef HWLOC_HAVE_LIBPCI
+
+#include <pci/pci.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <string.h>
+#include <assert.h>
+#include <stdarg.h>
+#include <setjmp.h>
+#ifdef HWLOC_LINUX_SYS
+#include <hwloc/linux.h>
+#include <dirent.h>
+#include <sys/types.h>
+#endif
+
+#define CONFIG_SPACE_CACHESIZE 256
+
+static void
+hwloc_pci_traverse_print_cb(struct hwloc_topology *topology __hwloc_attribute_unused, struct hwloc_obj *pcidev, int depth __hwloc_attribute_unused)
+{
+  char busid[14];
+  snprintf(busid, sizeof(busid), "%04x:%02x:%02x.%01x",
+           pcidev->attr->pcidev.domain, pcidev->attr->pcidev.bus, pcidev->attr->pcidev.dev, pcidev->attr->pcidev.func);
+
+  if (pcidev->type == HWLOC_OBJ_BRIDGE) {
+    if (pcidev->attr->bridge.upstream_type == HWLOC_OBJ_BRIDGE_HOST)
+      hwloc_debug("%*s HostBridge", depth, "");
+    else
+      hwloc_debug("%*s %s Bridge [%04x:%04x]", depth, "", busid,
+		  pcidev->attr->pcidev.vendor_id, pcidev->attr->pcidev.device_id);
+    hwloc_debug(" to %04x:[%02x:%02x]\n",
+		pcidev->attr->bridge.downstream.pci.domain, pcidev->attr->bridge.downstream.pci.secondary_bus, pcidev->attr->bridge.downstream.pci.subordinate_bus);
+  } else
+    hwloc_debug("%*s %s Device [%04x:%04x (%04x:%04x) rev=%02x class=%04x]\n", depth, "", busid,
+		pcidev->attr->pcidev.vendor_id, pcidev->attr->pcidev.device_id,
+		pcidev->attr->pcidev.subvendor_id, pcidev->attr->pcidev.subdevice_id,
+		pcidev->attr->pcidev.revision, pcidev->attr->pcidev.class_id);
+}
+
+static void
+hwloc_pci_traverse_setbridgedepth_cb(struct hwloc_topology *topology __hwloc_attribute_unused, struct hwloc_obj *pcidev, int depth)
+{
+  if (pcidev->type == HWLOC_OBJ_BRIDGE)
+    pcidev->attr->bridge.depth = depth;
+}
+
+#ifdef HWLOC_LINUX_SYS
+static hwloc_obj_t
+hwloc_linux_add_os_device(struct hwloc_topology *topology, struct hwloc_obj *pcidev, hwloc_obj_osdev_type_t type, const char *name)
+{
+  struct hwloc_obj *obj = hwloc_alloc_setup_object(HWLOC_OBJ_OS_DEVICE, -1);
+  obj->name = strdup(name);
+  obj->logical_index = -1;
+  obj->attr->osdev.type = type;
+
+  hwloc_insert_object_by_parent(topology, pcidev, obj);
+
+  return obj;
+}
+
+typedef void (*hwloc_linux_class_fillinfos_t)(struct hwloc_topology *topology, struct hwloc_obj *osdev, const char *osdevpath);
+
+/* look for objects of the given class below a sysfs directory */
+static void
+hwloc_linux_class_readdir(struct hwloc_topology *topology, struct hwloc_obj *pcidev, const char *devicepath,
+			  hwloc_obj_osdev_type_t type, const char *classname,
+			  hwloc_linux_class_fillinfos_t fillinfo)
+{
+  size_t classnamelen = strlen(classname);
+  char path[256];
+  DIR *dir;
+  struct dirent *dirent;
+  hwloc_obj_t obj;
+
+  snprintf(path, sizeof(path), "%s/%s", devicepath, classname);
+  dir = opendir(path);
+  if (dir) {
+    /* modern sysfs: <device>/<class>/<name> */
+    while ((dirent = readdir(dir)) != NULL) {
+      if (!strcmp(dirent->d_name, ".") || !strcmp(dirent->d_name, ".."))
+	continue;
+      obj = hwloc_linux_add_os_device(topology, pcidev, type, dirent->d_name);
+      if (fillinfo) {
+	snprintf(path, sizeof(path), "%s/%s/%s", devicepath, classname, dirent->d_name);
+	fillinfo(topology, obj, path);
+      }
+    }
+    closedir(dir);
+  } else {
+    /* deprecated sysfs: <device>/<class>:<name> */
+    dir = opendir(devicepath);
+    if (dir) {
+      while ((dirent = readdir(dir)) != NULL) {
+	if (strncmp(dirent->d_name, classname, classnamelen) || dirent->d_name[classnamelen] != ':')
+	  continue;
+	obj = hwloc_linux_add_os_device(topology, pcidev, type, dirent->d_name + classnamelen+1);
+	if (fillinfo) {
+	  snprintf(path, sizeof(path), "%s/%s", devicepath, dirent->d_name);
+	  fillinfo(topology, obj, path);
+	}
+      }
+      closedir(dir);
+    }
+  }
+}
+
+/* class objects that are immediately below pci devices */
+static void
+hwloc_linux_net_class_fillinfos(struct hwloc_topology *topology __hwloc_attribute_unused, struct hwloc_obj *obj, const char *osdevpath)
+{
+  FILE *fd;
+  char path[256];
+  snprintf(path, sizeof(path), "%s/address", osdevpath);
+  fd = fopen(path, "r");
+  if (fd) {
+    char address[128];
+    if (fgets(address, sizeof(address), fd)) {
+      char *eol = strchr(address, '\n');
+      if (eol)
+        *eol = 0;
+      hwloc_obj_add_info(obj, "Address", address);
+    }
+    fclose(fd);
+  }
+}
+static void
+hwloc_linux_lookup_net_class(struct hwloc_topology *topology, struct hwloc_obj *pcidev, const char *pcidevpath)
+{
+  hwloc_linux_class_readdir(topology, pcidev, pcidevpath, HWLOC_OBJ_OSDEV_NETWORK, "net", hwloc_linux_net_class_fillinfos);
+}
+static void
+hwloc_linux_lookup_openfabrics_class(struct hwloc_topology *topology, struct hwloc_obj *pcidev, const char *pcidevpath)
+{
+  hwloc_linux_class_readdir(topology, pcidev, pcidevpath, HWLOC_OBJ_OSDEV_OPENFABRICS, "infiniband", NULL);
+}
+static void
+hwloc_linux_lookup_dma_class(struct hwloc_topology *topology, struct hwloc_obj *pcidev, const char *pcidevpath)
+{
+  hwloc_linux_class_readdir(topology, pcidev, pcidevpath, HWLOC_OBJ_OSDEV_DMA, "dma", NULL);
+}
+static void
+hwloc_linux_lookup_drm_class(struct hwloc_topology *topology, struct hwloc_obj *pcidev, const char *pcidevpath)
+{
+  hwloc_linux_class_readdir(topology, pcidev, pcidevpath, HWLOC_OBJ_OSDEV_GPU, "drm", NULL);
+
+  /* we could look at the "graphics" class too, but it doesn't help for proprietary drivers either */
+
+  /* GPU devices (even with a proprietary driver) seem to have a boot_vga field in their PCI device directory (since 2.6.30),
+   * so we could create a OS device for each PCI devices with such a field.
+   * boot_vga is actually created when class >> 8 == VGA (it contains 1 for boot vga device), so it's trivial anyway.
+   */
+}
+
+/* block class objects are in
+ * host%d/target%d:%d:%d/%d:%d:%d:%d/
+ * or
+ * host%d/port-%d:%d/end_device-%d:%d/target%d:%d:%d/%d:%d:%d:%d/
+ * or
+ * ide%d/%d.%d/
+ * below pci devices */
+static void
+hwloc_linux_lookup_host_block_class(struct hwloc_topology *topology, struct hwloc_obj *pcidev, char *path, size_t pathlen)
+{
+  DIR *hostdir, *portdir, *targetdir;
+  struct dirent *hostdirent, *portdirent, *targetdirent;
+  int dummy;
+  hostdir = opendir(path);
+  if (!hostdir)
+    return;
+  while ((hostdirent = readdir(hostdir)) != NULL) {
+    if (sscanf(hostdirent->d_name, "port-%d:%d", &dummy, &dummy) == 2)
+    {
+      /* found host%d/port-%d:%d */
+      path[pathlen] = '/';
+      strcpy(&path[pathlen+1], hostdirent->d_name);
+      pathlen += 1+strlen(hostdirent->d_name);
+      portdir = opendir(path);
+      if (!portdir)
+	continue;
+      while ((portdirent = readdir(portdir)) != NULL) {
+	if (sscanf(portdirent->d_name, "end_device-%d:%d", &dummy, &dummy) == 2) {
+	  /* found host%d/port-%d:%d/end_device-%d:%d */
+	  path[pathlen] = '/';
+	  strcpy(&path[pathlen+1], portdirent->d_name);
+	  pathlen += 1+strlen(portdirent->d_name);
+	  hwloc_linux_lookup_host_block_class(topology, pcidev, path, pathlen);
+	  pathlen -= 1+strlen(portdirent->d_name);
+	  path[pathlen] = '\0';
+	}
+      }
+      closedir(portdir);
+      /* restore parent path */
+      pathlen -= 1+strlen(hostdirent->d_name);
+      path[pathlen] = '\0';
+      continue;
+    } else if (sscanf(hostdirent->d_name, "target%d:%d:%d", &dummy, &dummy, &dummy) == 3) {
+      /* found host%d/target%d:%d:%d */
+      path[pathlen] = '/';
+      strcpy(&path[pathlen+1], hostdirent->d_name);
+      pathlen += 1+strlen(hostdirent->d_name);
+      targetdir = opendir(path);
+      if (!targetdir)
+	continue;
+      while ((targetdirent = readdir(targetdir)) != NULL) {
+	if (sscanf(targetdirent->d_name, "%d:%d:%d:%d", &dummy, &dummy, &dummy, &dummy) != 4)
+	  continue;
+	/* found host%d/target%d:%d:%d/%d:%d:%d:%d */
+	path[pathlen] = '/';
+	strcpy(&path[pathlen+1], targetdirent->d_name);
+	pathlen += 1+strlen(targetdirent->d_name);
+	/* lookup block class for real */
+	hwloc_linux_class_readdir(topology, pcidev, path, HWLOC_OBJ_OSDEV_BLOCK, "block", NULL);
+	/* restore parent path */
+	pathlen -= 1+strlen(targetdirent->d_name);
+	path[pathlen] = '\0';
+      }
+      closedir(targetdir);
+      /* restore parent path */
+      pathlen -= 1+strlen(hostdirent->d_name);
+      path[pathlen] = '\0';
+    }
+  }
+  closedir(hostdir);
+}
+
+static void
+hwloc_linux_lookup_block_class(struct hwloc_topology *topology, struct hwloc_obj *pcidev, const char *pcidevpath)
+{
+  size_t pathlen;
+  DIR *devicedir, *hostdir;
+  struct dirent *devicedirent, *hostdirent;
+  char path[256];
+  int dummy;
+
+  strcpy(path, pcidevpath);
+  pathlen = strlen(path);
+
+  devicedir = opendir(pcidevpath);
+  if (!devicedir)
+    return;
+  while ((devicedirent = readdir(devicedir)) != NULL) {
+    if (sscanf(devicedirent->d_name, "ide%d", &dummy) == 1) {
+      /* found ide%d */
+      path[pathlen] = '/';
+      strcpy(&path[pathlen+1], devicedirent->d_name);
+      pathlen += 1+strlen(devicedirent->d_name);
+      hostdir = opendir(path);
+      if (!hostdir)
+	continue;
+      while ((hostdirent = readdir(hostdir)) != NULL) {
+	if (sscanf(hostdirent->d_name, "%d.%d", &dummy, &dummy) == 2) {
+	  /* found ide%d/%d.%d */
+	  path[pathlen] = '/';
+	  strcpy(&path[pathlen+1], hostdirent->d_name);
+	  pathlen += 1+strlen(hostdirent->d_name);
+	  /* lookup block class for real */
+	  hwloc_linux_class_readdir(topology, pcidev, path, HWLOC_OBJ_OSDEV_BLOCK, "block", NULL);
+	  /* restore parent path */
+	  pathlen -= 1+strlen(hostdirent->d_name);
+	  path[pathlen] = '\0';
+	}
+      }
+    } else if (sscanf(devicedirent->d_name, "host%d", &dummy) == 1) {
+      /* found host%d */
+      path[pathlen] = '/';
+      strcpy(&path[pathlen+1], devicedirent->d_name);
+      pathlen += 1+strlen(devicedirent->d_name);
+      hwloc_linux_lookup_host_block_class(topology, pcidev, path, pathlen);
+      /* restore parent path */
+      pathlen -= 1+strlen(devicedirent->d_name);
+      path[pathlen] = '\0';
+    }
+  }
+  closedir(devicedir);
+}
+#endif /* HWLOC_LINUX_SYS */
+
+static void
+hwloc_pci_traverse_lookuposdevices_cb(struct hwloc_topology *topology, struct hwloc_obj *pcidev, int depth __hwloc_attribute_unused)
+{
+  if (pcidev->type == HWLOC_OBJ_BRIDGE)
+    return;
+
+#ifdef HWLOC_LINUX_SYS
+  {
+  char pcidevpath[256];
+  snprintf(pcidevpath, sizeof(pcidevpath), "/sys/bus/pci/devices/%04x:%02x:%02x.%01x/",
+	   pcidev->attr->pcidev.domain, pcidev->attr->pcidev.bus,
+	   pcidev->attr->pcidev.dev, pcidev->attr->pcidev.func);
+
+  hwloc_linux_lookup_net_class(topology, pcidev, pcidevpath);
+  hwloc_linux_lookup_openfabrics_class(topology, pcidev, pcidevpath);
+  hwloc_linux_lookup_dma_class(topology, pcidev, pcidevpath);
+  hwloc_linux_lookup_drm_class(topology, pcidev, pcidevpath);
+  hwloc_linux_lookup_block_class(topology, pcidev, pcidevpath);
+  }
+#endif /* HWLOC_LINUX_SYS */
+}
+
+static void
+hwloc_pci__traverse(struct hwloc_topology *topology, struct hwloc_obj *root,
+		    void (*cb)(struct hwloc_topology *, struct hwloc_obj *, int depth),
+		    int depth)
+{
+  struct hwloc_obj *child = root->first_child;
+  while (child) {
+    cb(topology, child, depth);
+    if (child->type == HWLOC_OBJ_BRIDGE)
+      hwloc_pci__traverse(topology, child, cb, depth+1);
+    child = child->next_sibling;
+  }
+}
+
+static void
+hwloc_pci_traverse(struct hwloc_topology *topology, struct hwloc_obj *root,
+		   void (*cb)(struct hwloc_topology *, struct hwloc_obj *, int depth))
+{
+  hwloc_pci__traverse(topology, root, cb, 0);
+}
+
+enum hwloc_pci_busid_comparison_e {
+  HWLOC_PCI_BUSID_LOWER,
+  HWLOC_PCI_BUSID_HIGHER,
+  HWLOC_PCI_BUSID_INCLUDED,
+  HWLOC_PCI_BUSID_SUPERSET
+};
+
+static int
+hwloc_pci_compare_busids(struct hwloc_obj *a, struct hwloc_obj *b)
+{
+  if (a->type == HWLOC_OBJ_BRIDGE)
+    assert(a->attr->bridge.upstream_type == HWLOC_OBJ_BRIDGE_PCI);
+  if (b->type == HWLOC_OBJ_BRIDGE)
+    assert(b->attr->bridge.upstream_type == HWLOC_OBJ_BRIDGE_PCI);
+
+  if (a->attr->pcidev.domain < b->attr->pcidev.domain)
+    return HWLOC_PCI_BUSID_LOWER;
+  if (a->attr->pcidev.domain > b->attr->pcidev.domain)
+    return HWLOC_PCI_BUSID_HIGHER;
+
+  if (a->type == HWLOC_OBJ_BRIDGE
+      && b->attr->pcidev.bus >= a->attr->bridge.downstream.pci.secondary_bus
+      && b->attr->pcidev.bus <= a->attr->bridge.downstream.pci.subordinate_bus)
+    return HWLOC_PCI_BUSID_SUPERSET;
+  if (b->type == HWLOC_OBJ_BRIDGE
+      && a->attr->pcidev.bus >= b->attr->bridge.downstream.pci.secondary_bus
+      && a->attr->pcidev.bus <= b->attr->bridge.downstream.pci.subordinate_bus)
+    return HWLOC_PCI_BUSID_INCLUDED;
+
+  if (a->attr->pcidev.bus < b->attr->pcidev.bus)
+    return HWLOC_PCI_BUSID_LOWER;
+  if (a->attr->pcidev.bus > b->attr->pcidev.bus)
+    return HWLOC_PCI_BUSID_HIGHER;
+
+  if (a->attr->pcidev.dev < b->attr->pcidev.dev)
+    return HWLOC_PCI_BUSID_LOWER;
+  if (a->attr->pcidev.dev > b->attr->pcidev.dev)
+    return HWLOC_PCI_BUSID_HIGHER;
+
+  if (a->attr->pcidev.func < b->attr->pcidev.func)
+    return HWLOC_PCI_BUSID_LOWER;
+  if (a->attr->pcidev.func > b->attr->pcidev.func)
+    return HWLOC_PCI_BUSID_HIGHER;
+
+  assert(0);
+}
+
+static void
+hwloc_pci_add_child_before(struct hwloc_obj *root, struct hwloc_obj *child, struct hwloc_obj *new)
+{
+  if (child) {
+    new->prev_sibling = child->prev_sibling;
+    child->prev_sibling = new;
+  } else {
+    new->prev_sibling = root->last_child;
+    root->last_child = new;
+  }
+
+  if (new->prev_sibling)
+    new->prev_sibling->next_sibling = new;
+  else
+    root->first_child = new;
+  new->next_sibling = child;
+}
+
+static void
+hwloc_pci_remove_child(struct hwloc_obj *root, struct hwloc_obj *child)
+{
+  if (child->next_sibling)
+    child->next_sibling->prev_sibling = child->prev_sibling;
+  else
+    root->last_child = child->prev_sibling;
+  if (child->prev_sibling)
+    child->prev_sibling->next_sibling = child->next_sibling;
+  else
+    root->first_child = child->next_sibling;
+  child->prev_sibling = NULL;
+  child->next_sibling = NULL;
+}
+
+static void hwloc_pci_add_object(struct hwloc_obj *root, struct hwloc_obj *new);
+
+static void
+hwloc_pci_try_insert_siblings_below_new_bridge(struct hwloc_obj *root, struct hwloc_obj *new)
+{
+  enum hwloc_pci_busid_comparison_e comp;
+  struct hwloc_obj *current, *next;
+
+  next = new->next_sibling;
+  while (next) {
+    current = next;
+    next = current->next_sibling;
+
+    comp = hwloc_pci_compare_busids(current, new);
+    assert(comp != HWLOC_PCI_BUSID_SUPERSET);
+    if (comp == HWLOC_PCI_BUSID_HIGHER)
+      continue;
+    assert(comp == HWLOC_PCI_BUSID_INCLUDED);
+
+    /* move this object below the new bridge */
+    hwloc_pci_remove_child(root, current);
+    hwloc_pci_add_object(new, current);
+  }
+}
+
+static void
+hwloc_pci_add_object(struct hwloc_obj *root, struct hwloc_obj *new)
+{
+  struct hwloc_obj *current;
+
+  current = root->first_child;
+  while (current) {
+    enum hwloc_pci_busid_comparison_e comp = hwloc_pci_compare_busids(new, current);
+    switch (comp) {
+    case HWLOC_PCI_BUSID_HIGHER:
+      /* go further */
+      current = current->next_sibling;
+      continue;
+    case HWLOC_PCI_BUSID_INCLUDED:
+      /* insert below current bridge */
+      hwloc_pci_add_object(current, new);
+      return;
+    case HWLOC_PCI_BUSID_LOWER:
+    case HWLOC_PCI_BUSID_SUPERSET:
+      /* insert before current object */
+      hwloc_pci_add_child_before(root, current, new);
+      /* walk next siblings and move them below new bridge if needed */
+      hwloc_pci_try_insert_siblings_below_new_bridge(root, new);
+      return;
+    }
+  }
+  /* add to the end of the list if higher than everybody */
+  hwloc_pci_add_child_before(root, NULL, new);
+}
+
+static struct hwloc_obj *
+hwloc_pci_find_hostbridge_parent(struct hwloc_topology *topology, struct hwloc_obj *hostbridge, int *created)
+{
+  hwloc_bitmap_t cpuset = hwloc_bitmap_alloc();
+  struct hwloc_obj *parent;
+  char *env;
+  int err;
+
+  /* override the cpuset with the environment if given */
+  char envname[256];
+  snprintf(envname, sizeof(envname), "HWLOC_PCI_%04x_%02x_LOCALCPUS",
+	   hostbridge->first_child->attr->pcidev.domain, hostbridge->first_child->attr->pcidev.bus);
+  env = getenv(envname);
+  if (env) {
+    hwloc_debug("Overriding localcpus using %s in the environment\n", envname);
+    hwloc_bitmap_sscanf(cpuset, env);
+    goto found;
+  }
+
+  /* get the hostbridge cpuset. it's not a PCI device, so we use its first child locality info */
+#ifdef HWLOC_LINUX_SYS
+  {
+  char path[256];
+  FILE *file;
+  snprintf(path, sizeof(path), "/sys/bus/pci/devices/%04x:%02x:%02x.%01x/local_cpus",
+	   hostbridge->first_child->attr->pcidev.domain, hostbridge->first_child->attr->pcidev.bus,
+	   hostbridge->first_child->attr->pcidev.dev, hostbridge->first_child->attr->pcidev.func);
+  file = fopen(path, "r"); /* the libpci backend doesn't use sysfs.fsroot */
+  if (file) {
+    err = hwloc_linux_parse_cpumap_file(file, cpuset);
+    fclose(file);
+    if (!err && !hwloc_bitmap_iszero(cpuset))
+      goto found;
+  }
+  }
+#endif
+
+  /* if we got nothing, assume the hostbridge is attached to the top of hierarchy */
+  hwloc_bitmap_copy(cpuset, hwloc_topology_get_topology_cpuset(topology));
+
+ found:
+  hwloc_debug_bitmap("Attaching hostbridge to cpuset %s\n", cpuset);
+
+  /* restrict to the existing topology cpuset to avoid errors later */
+  hwloc_bitmap_and(cpuset, cpuset, topology->levels[0][0]->cpuset);
+
+  /* why not inserting a group and let the core remove it if useless?
+   * 1) we need to make sure that the group is above all objects
+   * with same cpuset (to avoid attaching to caches or so)
+   * 2) the merge-keep-structure code is already done when coming here
+   */
+
+  /* attach the hostbridge now that it contains the right objects */
+  parent = hwloc_get_obj_covering_cpuset(topology, cpuset);
+  /* in the worst case, we got the root object */
+
+  if (hwloc_bitmap_isequal(cpuset, parent->cpuset)) {
+    /* this object has the right cpuset, but it could be a cache or so,
+     * go up as long as the cpuset is the same
+     */
+    while (parent->parent && hwloc_bitmap_isequal(parent->cpuset, parent->parent->cpuset))
+      parent = parent->parent;
+  } else {
+    /* the object we found is too large, insert an intermediate group */
+    hwloc_obj_t group_obj = group_obj = hwloc_alloc_setup_object(HWLOC_OBJ_GROUP, -1);
+    if (group_obj) {
+      group_obj->cpuset = hwloc_bitmap_dup(cpuset);
+      group_obj->attr->group.depth = topology->next_group_depth;
+      hwloc__insert_object_by_cpuset(topology, group_obj, hwloc_report_os_error);
+      parent = group_obj;
+      *created = 1;
+    }
+  }
+
+  hwloc_bitmap_free(cpuset);
+
+  return parent;
+}
+
+/* Avoid letting libpci call exit(1) when no PCI bus is available. */
+static jmp_buf err_buf;
+static void
+hwloc_pci_error(char *msg, ...)
+{
+  va_list args;
+
+  va_start(args, msg);
+  fprintf(stderr, "pcilib: ");
+  vfprintf(stderr, msg, args);
+  fprintf(stderr, "\n");
+  longjmp(err_buf, 1);
+}
+
+static void
+hwloc_pci_warning(char *msg __hwloc_attribute_unused, ...)
+{
+}
+
+void
+hwloc_look_libpci(struct hwloc_topology *topology)
+{
+  struct pci_access *pciaccess;
+  struct pci_dev *pcidev;
+  struct hwloc_obj fakehostbridge; /* temporary object covering the whole PCI hierarchy until its complete */
+  unsigned current_hostbridge;
+  int createdgroups = 0;
+
+  fakehostbridge.first_child = NULL;
+  fakehostbridge.last_child = NULL;
+
+  hwloc_debug("%s", "\nScanning PCI buses...\n");
+
+  pciaccess = pci_alloc();
+  pciaccess->error = hwloc_pci_error;
+  pciaccess->warning = hwloc_pci_warning;
+
+  if (setjmp(err_buf)) {
+    pci_cleanup(pciaccess);
+    return;
+  }
+
+  pci_init(pciaccess);
+  pci_scan_bus(pciaccess);
+
+  pcidev = pciaccess->devices;
+  while (pcidev) {
+    char name[128], *resname;
+    u8 config_space_cache[CONFIG_SPACE_CACHESIZE];
+    struct hwloc_obj *obj;
+    unsigned char headertype;
+    unsigned os_index;
+    unsigned isbridge;
+    unsigned domain;
+    unsigned device_class;
+
+    /* cache what we need of the config space */
+    pci_read_block(pcidev, 0, config_space_cache, CONFIG_SPACE_CACHESIZE);
+
+    /* read some fields that may not always be available */
+#ifdef HWLOC_HAVE_PCIDEV_DOMAIN
+    domain = pcidev->domain;
+#else
+    domain = 0; /* default domain number */
+#endif
+#ifdef HWLOC_HAVE_PCIDEV_DEVICE_CLASS
+    device_class = pcidev->device_class;
+#else
+    HWLOC_BUILD_ASSERT(PCI_CLASS_DEVICE < CONFIG_SPACE_CACHESIZE);
+    device_class = config_space_cache[PCI_CLASS_DEVICE] | (config_space_cache[PCI_CLASS_DEVICE+1] << 8);
+#endif
+
+    /* is this a bridge? */
+    HWLOC_BUILD_ASSERT(PCI_HEADER_TYPE < CONFIG_SPACE_CACHESIZE);
+    headertype = config_space_cache[PCI_HEADER_TYPE] & 0x7f;
+    isbridge = (device_class == PCI_CLASS_BRIDGE_PCI
+		&& headertype == PCI_HEADER_TYPE_BRIDGE);
+
+    /* might be useful for debugging (note that domain might be truncated) */
+    os_index = (domain << 20) + (pcidev->bus << 12) + (pcidev->dev << 4) + pcidev->func;
+
+    obj = hwloc_alloc_setup_object(isbridge ? HWLOC_OBJ_BRIDGE : HWLOC_OBJ_PCI_DEVICE, os_index);
+    obj->attr->pcidev.domain = domain;
+    obj->attr->pcidev.bus = pcidev->bus;
+    obj->attr->pcidev.dev = pcidev->dev;
+    obj->attr->pcidev.func = pcidev->func;
+    obj->attr->pcidev.vendor_id = pcidev->vendor_id;
+    obj->attr->pcidev.device_id = pcidev->device_id;
+    obj->attr->pcidev.class_id = device_class;
+    HWLOC_BUILD_ASSERT(PCI_REVISION_ID < CONFIG_SPACE_CACHESIZE);
+    obj->attr->pcidev.revision = config_space_cache[PCI_REVISION_ID];
+    HWLOC_BUILD_ASSERT(PCI_SUBSYSTEM_VENDOR_ID < CONFIG_SPACE_CACHESIZE);
+    obj->attr->pcidev.subvendor_id = config_space_cache[PCI_SUBSYSTEM_VENDOR_ID];
+    HWLOC_BUILD_ASSERT(PCI_SUBSYSTEM_ID < CONFIG_SPACE_CACHESIZE);
+    obj->attr->pcidev.subdevice_id = config_space_cache[PCI_SUBSYSTEM_ID];
+
+    obj->attr->pcidev.linkspeed = 0; /* unknown */
+#ifdef HWLOC_HAVE_PCI_FIND_CAP
+    {
+    struct pci_cap *cap = pci_find_cap(pcidev, PCI_CAP_ID_EXP, PCI_CAP_NORMAL);
+    if (cap) {
+      if (cap->addr + PCI_EXP_LNKSTA >= CONFIG_SPACE_CACHESIZE) {
+        fprintf(stderr, "cannot read PCI_EXP_LNKSTA cap at %d (only %d cached)\n", cap->addr + PCI_EXP_LNKSTA, CONFIG_SPACE_CACHESIZE);
+      } else {
+        unsigned linksta = * (unsigned*) &config_space_cache[cap->addr + PCI_EXP_LNKSTA];
+        unsigned speed = linksta & PCI_EXP_LNKSTA_SPEED; /* PCIe generation */
+        unsigned width = (linksta & PCI_EXP_LNKSTA_WIDTH) >> 4; /* how many lanes */
+	/* PCIe Gen1 = 2.5GT/s signal-rate per lane with 8/10 encoding    = 0.25GB/s data-rate per lane
+	 * PCIe Gen2 = 5  GT/s signal-rate per lane with 8/10 encoding    = 0.5 GB/s data-rate per lane
+	 * PCIe Gen3 = 8  GT/s signal-rate per lane with 128/130 encoding = 1   GB/s data-rate per lane
+	 */
+        float lanespeed = speed <= 2 ? 2.5 * speed * 0.8 : 8 * 128/130; /* Gbit/s per lane */
+        obj->attr->pcidev.linkspeed = lanespeed * width / 8; /* GB/s */
+      }
+    }
+    }
+#endif /* HWLOC_HAVE_PCI_FIND_CAP */
+
+    if (isbridge) {
+      HWLOC_BUILD_ASSERT(PCI_PRIMARY_BUS < CONFIG_SPACE_CACHESIZE);
+      HWLOC_BUILD_ASSERT(PCI_SECONDARY_BUS < CONFIG_SPACE_CACHESIZE);
+      HWLOC_BUILD_ASSERT(PCI_SUBORDINATE_BUS < CONFIG_SPACE_CACHESIZE);
+      if (config_space_cache[PCI_PRIMARY_BUS] != pcidev->bus)
+	hwloc_debug("  %04x:%02x:%02x.%01x bridge with (ignored) invalid PCI_PRIMARY_BUS %02x\n",
+		    domain, pcidev->bus, pcidev->dev, pcidev->func, config_space_cache[PCI_PRIMARY_BUS]);
+      obj->attr->bridge.upstream_type = HWLOC_OBJ_BRIDGE_PCI;
+      obj->attr->bridge.downstream_type = HWLOC_OBJ_BRIDGE_PCI;
+      obj->attr->bridge.downstream.pci.domain = domain;
+      obj->attr->bridge.downstream.pci.secondary_bus = config_space_cache[PCI_SECONDARY_BUS];
+      obj->attr->bridge.downstream.pci.subordinate_bus = config_space_cache[PCI_SUBORDINATE_BUS];
+    }
+
+/* starting from pciutils 2.2, pci_lookup_name() takes a variable number
+ * of arguments, and supports the PCI_LOOKUP_NO_NUMBERS flag.
+ */
+
+    resname = pci_lookup_name(pciaccess, name, sizeof(name),
+#if HAVE_DECL_PCI_LOOKUP_NO_NUMBERS
+			      PCI_LOOKUP_VENDOR|PCI_LOOKUP_NO_NUMBERS,
+			      pcidev->vendor_id
+#else
+			      PCI_LOOKUP_VENDOR,
+			      pcidev->vendor_id, 0, 0, 0
+#endif
+			      );
+    if (resname)
+      hwloc_obj_add_info(obj, "PCIVendor", resname);
+
+    resname = pci_lookup_name(pciaccess, name, sizeof(name),
+#if HAVE_DECL_PCI_LOOKUP_NO_NUMBERS
+			      PCI_LOOKUP_DEVICE|PCI_LOOKUP_NO_NUMBERS,
+			      pcidev->vendor_id, pcidev->device_id
+#else
+			      PCI_LOOKUP_DEVICE,
+			      pcidev->vendor_id, pcidev->device_id, 0, 0
+#endif
+			      );
+    if (resname)
+      hwloc_obj_add_info(obj, "PCIDevice", resname);
+
+    resname = pci_lookup_name(pciaccess, name, sizeof(name),
+#if HAVE_DECL_PCI_LOOKUP_NO_NUMBERS
+			      PCI_LOOKUP_VENDOR|PCI_LOOKUP_DEVICE|PCI_LOOKUP_NO_NUMBERS,
+			      pcidev->vendor_id, pcidev->device_id
+#else
+			      PCI_LOOKUP_VENDOR|PCI_LOOKUP_DEVICE,
+			      pcidev->vendor_id, pcidev->device_id, 0, 0
+#endif
+			      );
+    if (resname)
+      obj->name = strdup(resname);
+    else
+      resname = "??";
+
+    hwloc_debug("  %04x:%02x:%02x.%01x %04x %04x:%04x %s\n",
+		domain, pcidev->bus, pcidev->dev, pcidev->func,
+		device_class, pcidev->vendor_id, pcidev->device_id,
+		resname);
+
+    hwloc_pci_add_object(&fakehostbridge, obj);
+    pcidev = pcidev->next;
+  }
+
+  pci_cleanup(pciaccess);
+
+  hwloc_debug("%s", "\nPCI hierarchy after basic scan:\n");
+  hwloc_pci_traverse(topology, &fakehostbridge, hwloc_pci_traverse_print_cb);
+
+  if (!fakehostbridge.first_child)
+    /* found nothing, exit */
+    return;
+
+  /* walk the hierarchy, set bridge depth and lookup OS devices */
+  hwloc_pci_traverse(topology, &fakehostbridge, hwloc_pci_traverse_setbridgedepth_cb);
+  hwloc_pci_traverse(topology, &fakehostbridge, hwloc_pci_traverse_lookuposdevices_cb);
+
+  /*
+   * fakehostbridge lists all objects connected to any upstream bus in the machine.
+   * We now create one real hostbridge object per upstream bus.
+   * It's not actually a PCI device so we have to create it.
+   */
+  current_hostbridge = 0;
+  while (fakehostbridge.first_child) {
+    /* start a new host bridge */
+    struct hwloc_obj *hostbridge = hwloc_alloc_setup_object(HWLOC_OBJ_BRIDGE, current_hostbridge++);
+    struct hwloc_obj *child = fakehostbridge.first_child;
+    struct hwloc_obj *next_child;
+    struct hwloc_obj *parent;
+    unsigned short current_domain = child->attr->pcidev.domain;
+    unsigned char current_bus = child->attr->pcidev.bus;
+    unsigned char current_subordinate = current_bus;
+
+    hwloc_debug("Starting new PCI hostbridge %04x:%02x\n", current_domain, current_bus);
+
+    /*
+     * attach all objects from the same upstream domain/bus
+     */
+  next_child:
+    next_child = child->next_sibling;
+    hwloc_pci_remove_child(&fakehostbridge, child);
+    hwloc_pci_add_child_before(hostbridge, NULL, child);
+
+    /* compute hostbridge secondary/subordinate buses */
+    if (child->type == HWLOC_OBJ_BRIDGE
+	&& child->attr->bridge.downstream.pci.subordinate_bus > current_subordinate)
+      current_subordinate = child->attr->bridge.downstream.pci.subordinate_bus;
+
+    /* use next child if it has the same domains/bus */
+    child = next_child;
+    if (child
+	&& child->attr->pcidev.domain == current_domain
+	&& child->attr->pcidev.bus == current_bus)
+      goto next_child;
+
+    /* finish setting up this hostbridge */
+    hostbridge->attr->bridge.upstream_type = HWLOC_OBJ_BRIDGE_HOST;
+    hostbridge->attr->bridge.downstream_type = HWLOC_OBJ_BRIDGE_PCI;
+    hostbridge->attr->bridge.downstream.pci.domain = current_domain;
+    hostbridge->attr->bridge.downstream.pci.secondary_bus = current_bus;
+    hostbridge->attr->bridge.downstream.pci.subordinate_bus = current_subordinate;
+    hwloc_debug("New PCI hostbridge %04x:[%02x-%02x]\n",
+		current_domain, current_bus, current_subordinate);
+
+    /* attach the hostbridge where it belongs */
+    parent = hwloc_pci_find_hostbridge_parent(topology, hostbridge, &createdgroups);
+    hwloc_insert_object_by_parent(topology, parent, hostbridge);
+  }
+
+  if (createdgroups)
+    topology->next_group_depth++;
+}
+
+#endif /* HWLOC_HAVE_LIBPCI */

opal/mca/hwloc/hwloc131/hwloc/src/topology-osf.c

@@ -0,0 +1,343 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+#include <private/autogen/config.h>
+
+#include <sys/types.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <pthread.h>
+
+#include <hwloc.h>
+#include <private/private.h>
+#include <private/debug.h>
+
+#include <numa.h>
+#include <radset.h>
+#include <cpuset.h>
+#include <sys/mman.h>
+
+/*
+ * TODO
+ *
+ * nsg_init(), nsg_attach_pid(), RAD_MIGRATE/RAD_WAIT
+ * assign_pid_to_pset()
+ *
+ * pthread_use_only_cpu too?
+ */
+
+static int
+prepare_radset(hwloc_topology_t topology, radset_t *radset, hwloc_const_bitmap_t hwloc_set)
+{
+  unsigned cpu;
+  cpuset_t target_cpuset;
+  cpuset_t cpuset, xor_cpuset;
+  radid_t radid;
+  int ret = 0;
+  int ret_errno = 0;
+
+  cpusetcreate(&target_cpuset);
+  cpuemptyset(target_cpuset);
+  hwloc_bitmap_foreach_begin(cpu, hwloc_set)
+    cpuaddset(target_cpuset, cpu);
+  hwloc_bitmap_foreach_end();
+
+  cpusetcreate(&cpuset);
+  cpusetcreate(&xor_cpuset);
+  for (radid = 0; radid < topology->backend_params.osf.nbnodes; radid++) {
+    cpuemptyset(cpuset);
+    if (rad_get_cpus(radid, cpuset)==-1) {
+      fprintf(stderr,"rad_get_cpus(%d) failed: %s\n",radid,strerror(errno));
+      continue;
+    }
+    cpuxorset(target_cpuset, cpuset, xor_cpuset);
+    if (cpucountset(xor_cpuset) == 0) {
+      /* Found it */
+      radsetcreate(radset);
+      rademptyset(*radset);
+      radaddset(*radset, radid);
+      ret = 1;
+      goto out;
+    }
+  }
+  /* radset containing exactly this set of CPUs not found */
+  ret_errno = EXDEV;
+
+out:
+  cpusetdestroy(&target_cpuset);
+  cpusetdestroy(&cpuset);
+  cpusetdestroy(&xor_cpuset);
+  errno = ret_errno;
+  return ret;
+}
+
+/* Note: get_cpubind not available on OSF */
+
+static int
+hwloc_osf_set_thread_cpubind(hwloc_topology_t topology, hwloc_thread_t thread, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  radset_t radset;
+
+  if (hwloc_bitmap_isequal(hwloc_set, hwloc_topology_get_complete_cpuset(topology))) {
+    if ((errno = pthread_rad_detach(thread)))
+      return -1;
+    return 0;
+  }
+
+  /* Apparently OSF migrates pages */
+  if (flags & HWLOC_CPUBIND_NOMEMBIND) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  if (!prepare_radset(topology, &radset, hwloc_set))
+    return -1;
+
+  if (flags & HWLOC_CPUBIND_STRICT) {
+    if ((errno = pthread_rad_bind(thread, radset, RAD_INSIST | RAD_WAIT)))
+      return -1;
+  } else {
+    if ((errno = pthread_rad_attach(thread, radset, RAD_WAIT)))
+      return -1;
+  }
+  radsetdestroy(&radset);
+
+  return 0;
+}
+
+static int
+hwloc_osf_set_proc_cpubind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  radset_t radset;
+
+  if (hwloc_bitmap_isequal(hwloc_set, hwloc_topology_get_complete_cpuset(topology))) {
+    if (rad_detach_pid(pid))
+      return -1;
+    return 0;
+  }
+
+  /* Apparently OSF migrates pages */
+  if (flags & HWLOC_CPUBIND_NOMEMBIND) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  if (!prepare_radset(topology, &radset, hwloc_set))
+    return -1;
+
+  if (flags & HWLOC_CPUBIND_STRICT) {
+    if (rad_bind_pid(pid, radset, RAD_INSIST | RAD_WAIT))
+      return -1;
+  } else {
+    if (rad_attach_pid(pid, radset, RAD_WAIT))
+      return -1;
+  }
+  radsetdestroy(&radset);
+
+  return 0;
+}
+
+static int
+hwloc_osf_set_thisthread_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  return hwloc_osf_set_thread_cpubind(topology, pthread_self(), hwloc_set, flags);
+}
+
+static int
+hwloc_osf_set_thisproc_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  return hwloc_osf_set_proc_cpubind(topology, getpid(), hwloc_set, flags);
+}
+
+static int
+hwloc_osf_prepare_mattr(hwloc_topology_t topology __hwloc_attribute_unused, memalloc_attr_t *mattr, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags __hwloc_attribute_unused)
+{
+  unsigned long osf_policy;
+  int node;
+
+  switch (policy) {
+    case HWLOC_MEMBIND_FIRSTTOUCH:
+      osf_policy = MPOL_THREAD;
+      break;
+    case HWLOC_MEMBIND_DEFAULT:
+    case HWLOC_MEMBIND_BIND:
+      osf_policy = MPOL_DIRECTED;
+      break;
+    case HWLOC_MEMBIND_INTERLEAVE:
+      osf_policy = MPOL_STRIPPED;
+      break;
+    case HWLOC_MEMBIND_REPLICATE:
+      osf_policy = MPOL_REPLICATED;
+      break;
+    default:
+      errno = ENOSYS;
+      return -1;
+  }
+
+  memset(mattr, 0, sizeof(*mattr));
+  mattr->mattr_policy = osf_policy;
+  mattr->mattr_rad = RAD_NONE;
+  radsetcreate(&mattr->mattr_radset);
+  rademptyset(mattr->mattr_radset);
+
+  hwloc_bitmap_foreach_begin(node, nodeset)
+    radaddset(mattr->mattr_radset, node);
+  hwloc_bitmap_foreach_end();
+  return 0;
+}
+
+static int
+hwloc_osf_set_area_membind(hwloc_topology_t topology, const void *addr, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  memalloc_attr_t mattr;
+  int behavior = 0;
+  int ret;
+
+  if (flags & HWLOC_MEMBIND_MIGRATE)
+    behavior |= MADV_CURRENT;
+  if (flags & HWLOC_MEMBIND_STRICT)
+    behavior |= MADV_INSIST;
+
+  if (hwloc_osf_prepare_mattr(topology, &mattr, nodeset, policy, flags))
+    return -1;
+
+  ret = nmadvise(addr, len, MADV_CURRENT, &mattr);
+  radsetdestroy(&mattr.mattr_radset);
+  return ret;
+}
+
+static void *
+hwloc_osf_alloc_membind(hwloc_topology_t topology, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  memalloc_attr_t mattr;
+  void *ptr;
+
+  if (hwloc_osf_prepare_mattr(topology, &mattr, nodeset, policy, flags))
+    return hwloc_alloc_or_fail(topology, len, flags);
+
+  /* TODO: rather use acreate/amalloc ? */
+  ptr = nmmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1,
+               0, &mattr);
+  radsetdestroy(&mattr.mattr_radset);
+  return ptr;
+}
+
+void
+hwloc_look_osf(struct hwloc_topology *topology)
+{
+  cpu_cursor_t cursor;
+  unsigned nbnodes;
+  radid_t radid, radid2;
+  radset_t radset, radset2;
+  cpuid_t cpuid;
+  cpuset_t cpuset;
+  struct hwloc_obj *obj;
+  unsigned distance;
+
+  topology->backend_params.osf.nbnodes = nbnodes = rad_get_num();
+
+  cpusetcreate(&cpuset);
+  radsetcreate(&radset);
+  radsetcreate(&radset2);
+  {
+    hwloc_obj_t *nodes = calloc(nbnodes, sizeof(hwloc_obj_t));
+    unsigned *indexes = calloc(nbnodes, sizeof(unsigned));
+    float *distances = calloc(nbnodes*nbnodes, sizeof(float));
+    unsigned nfound;
+    numa_attr_t attr;
+
+    attr.nattr_type = R_RAD;
+    attr.nattr_descr.rd_radset = radset;
+    attr.nattr_flags = 0;
+
+    for (radid = 0; radid < (radid_t) nbnodes; radid++) {
+      rademptyset(radset);
+      radaddset(radset, radid);
+      cpuemptyset(cpuset);
+      if (rad_get_cpus(radid, cpuset)==-1) {
+	fprintf(stderr,"rad_get_cpus(%d) failed: %s\n",radid,strerror(errno));
+	continue;
+      }
+
+      indexes[radid] = radid;
+      nodes[radid] = obj = hwloc_alloc_setup_object(HWLOC_OBJ_NODE, radid);
+      obj->cpuset = hwloc_bitmap_alloc();
+      obj->memory.local_memory = rad_get_physmem(radid) * getpagesize();
+      obj->memory.page_types_len = 2;
+      obj->memory.page_types = malloc(2*sizeof(*obj->memory.page_types));
+      memset(obj->memory.page_types, 0, 2*sizeof(*obj->memory.page_types));
+      obj->memory.page_types[0].size = getpagesize();
+#ifdef HAVE__SC_LARGE_PAGESIZE
+      obj->memory.page_types[1].size = sysconf(_SC_LARGE_PAGESIZE);
+#endif
+
+      cursor = SET_CURSOR_INIT;
+      while((cpuid = cpu_foreach(cpuset, 0, &cursor)) != CPU_NONE)
+	hwloc_bitmap_set(obj->cpuset, cpuid);
+
+      hwloc_debug_1arg_bitmap("node %d has cpuset %s\n",
+		 radid, obj->cpuset);
+
+      hwloc_insert_object_by_cpuset(topology, obj);
+
+      nfound = 0;
+      for (radid2 = 0; radid2 < (radid_t) nbnodes; radid2++)
+	distances[radid*nbnodes+radid2] = RAD_DIST_REMOTE;
+      for (distance = RAD_DIST_LOCAL; distance < RAD_DIST_REMOTE; distance++) {
+	attr.nattr_distance = distance;
+	/* get set of NUMA nodes at distance <= DISTANCE */
+	if (nloc(&attr, radset2)) {
+	  fprintf(stderr,"nloc failed: %s\n", strerror(errno));
+	  continue;
+	}
+	cursor = SET_CURSOR_INIT;
+	while ((radid2 = rad_foreach(radset2, 0, &cursor)) != RAD_NONE) {
+	  if (distances[radid*nbnodes+radid2] == RAD_DIST_REMOTE) {
+            distances[radid*nbnodes+radid2] = (float) distance;
+	    nfound++;
+	  }
+	}
+	if (nfound == nbnodes)
+	  /* Finished finding distances, no need to go up to RAD_DIST_REMOTE */
+	  break;
+      }
+    }
+
+    hwloc_topology__set_distance_matrix(topology, HWLOC_OBJ_NODE, nbnodes, indexes, nodes, distances, 0 /* OS cannot force */);
+  }
+  radsetdestroy(&radset2);
+  radsetdestroy(&radset);
+  cpusetdestroy(&cpuset);
+
+  /* add PU objects */
+  hwloc_setup_pu_level(topology, hwloc_fallback_nbprocessors(topology));
+
+  hwloc_obj_add_info(topology->levels[0][0], "Backend", "OSF");
+}
+
+void
+hwloc_set_osf_hooks(struct hwloc_topology *topology)
+{
+  topology->set_thread_cpubind = hwloc_osf_set_thread_cpubind;
+  topology->set_thisthread_cpubind = hwloc_osf_set_thisthread_cpubind;
+  topology->set_proc_cpubind = hwloc_osf_set_proc_cpubind;
+  topology->set_thisproc_cpubind = hwloc_osf_set_thisproc_cpubind;
+  topology->set_area_membind = hwloc_osf_set_area_membind;
+  topology->alloc_membind = hwloc_osf_alloc_membind;
+  topology->alloc = hwloc_alloc_mmap;
+  topology->free_membind = hwloc_free_mmap;
+  topology->support.membind->firsttouch_membind = 1;
+  topology->support.membind->bind_membind = 1;
+  topology->support.membind->interleave_membind = 1;
+  topology->support.membind->replicate_membind = 1;
+}

opal/mca/hwloc/hwloc131/hwloc/src/topology-solaris.c

@@ -0,0 +1,667 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+#include <private/autogen/config.h>
+#include <hwloc.h>
+#include <private/private.h>
+#include <private/debug.h>
+
+#include <stdio.h>
+#include <errno.h>
+#include <dirent.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/processor.h>
+#include <sys/procset.h>
+#include <sys/types.h>
+#include <sys/mman.h>
+
+#ifdef HAVE_LIBLGRP
+#  include <sys/lgrp_user.h>
+#endif
+
+/* TODO: use psets? (only for root)
+ * TODO: get cache info from prtdiag? (it is setgid sys to be able to read from
+ * crw-r-----   1 root     sys       88,  0 nov   3 14:35 /devices/pseudo/devinfo@0:devinfo
+ * and run (apparently undocumented) ioctls on it.
+ */
+
+static int
+hwloc_solaris_set_sth_cpubind(hwloc_topology_t topology, idtype_t idtype, id_t id, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  unsigned target_cpu;
+
+  /* The resulting binding is always strict */
+
+  if (hwloc_bitmap_isequal(hwloc_set, hwloc_topology_get_complete_cpuset(topology))) {
+    if (processor_bind(idtype, id, PBIND_NONE, NULL) != 0)
+      return -1;
+#ifdef HAVE_LIBLGRP
+    if (!(flags & HWLOC_CPUBIND_NOMEMBIND)) {
+      int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+      if (depth >= 0) {
+	int n = hwloc_get_nbobjs_by_depth(topology, depth);
+	int i;
+
+	for (i = 0; i < n; i++) {
+	  hwloc_obj_t obj = hwloc_get_obj_by_depth(topology, depth, i);
+	  lgrp_affinity_set(idtype, id, obj->os_index, LGRP_AFF_NONE);
+	}
+      }
+    }
+#endif /* HAVE_LIBLGRP */
+    return 0;
+  }
+
+#ifdef HAVE_LIBLGRP
+  if (!(flags & HWLOC_CPUBIND_NOMEMBIND)) {
+    int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+    if (depth >= 0) {
+      int n = hwloc_get_nbobjs_by_depth(topology, depth);
+      int i;
+      int ok;
+      hwloc_bitmap_t target = hwloc_bitmap_alloc();
+
+      for (i = 0; i < n; i++) {
+	hwloc_obj_t obj = hwloc_get_obj_by_depth(topology, depth, i);
+        if (hwloc_bitmap_isincluded(obj->cpuset, hwloc_set))
+          hwloc_bitmap_or(target, target, obj->cpuset);
+      }
+
+      ok = hwloc_bitmap_isequal(target, hwloc_set);
+      hwloc_bitmap_free(target);
+
+      if (ok) {
+        /* Ok, managed to achieve hwloc_set by just combining NUMA nodes */
+
+        for (i = 0; i < n; i++) {
+          hwloc_obj_t obj = hwloc_get_obj_by_depth(topology, depth, i);
+
+          if (hwloc_bitmap_isincluded(obj->cpuset, hwloc_set)) {
+            lgrp_affinity_set(idtype, id, obj->os_index, LGRP_AFF_STRONG);
+          } else {
+            if (flags & HWLOC_CPUBIND_STRICT)
+              lgrp_affinity_set(idtype, id, obj->os_index, LGRP_AFF_NONE);
+            else
+              lgrp_affinity_set(idtype, id, obj->os_index, LGRP_AFF_WEAK);
+          }
+        }
+
+        return 0;
+      }
+    }
+  }
+#endif /* HAVE_LIBLGRP */
+
+  if (hwloc_bitmap_weight(hwloc_set) != 1) {
+    errno = EXDEV;
+    return -1;
+  }
+
+  target_cpu = hwloc_bitmap_first(hwloc_set);
+
+  if (processor_bind(idtype, id,
+		     (processorid_t) (target_cpu), NULL) != 0)
+    return -1;
+
+  return 0;
+}
+
+static int
+hwloc_solaris_set_proc_cpubind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  return hwloc_solaris_set_sth_cpubind(topology, P_PID, pid, hwloc_set, flags);
+}
+
+static int
+hwloc_solaris_set_thisproc_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  return hwloc_solaris_set_sth_cpubind(topology, P_PID, P_MYID, hwloc_set, flags);
+}
+
+static int
+hwloc_solaris_set_thisthread_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  return hwloc_solaris_set_sth_cpubind(topology, P_LWPID, P_MYID, hwloc_set, flags);
+}
+
+#ifdef HAVE_LIBLGRP
+static int
+hwloc_solaris_get_sth_cpubind(hwloc_topology_t topology, idtype_t idtype, id_t id, hwloc_bitmap_t hwloc_set, int flags __hwloc_attribute_unused)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+  int n;
+  int i;
+
+  if (depth < 0) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  hwloc_bitmap_zero(hwloc_set);
+  n = hwloc_get_nbobjs_by_depth(topology, depth);
+
+  for (i = 0; i < n; i++) {
+    hwloc_obj_t obj = hwloc_get_obj_by_depth(topology, depth, i);
+    lgrp_affinity_t aff = lgrp_affinity_get(idtype, id, obj->os_index);
+
+    if (aff == LGRP_AFF_STRONG)
+      hwloc_bitmap_or(hwloc_set, hwloc_set, obj->cpuset);      
+  }
+
+  if (hwloc_bitmap_iszero(hwloc_set))
+    hwloc_bitmap_copy(hwloc_set, hwloc_topology_get_complete_cpuset(topology));
+
+  return 0;
+}
+
+static int
+hwloc_solaris_get_proc_cpubind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_bitmap_t hwloc_set, int flags)
+{
+  return hwloc_solaris_get_sth_cpubind(topology, P_PID, pid, hwloc_set, flags);
+}
+
+static int
+hwloc_solaris_get_thisproc_cpubind(hwloc_topology_t topology, hwloc_bitmap_t hwloc_set, int flags)
+{
+  return hwloc_solaris_get_sth_cpubind(topology, P_PID, P_MYID, hwloc_set, flags);
+}
+
+static int
+hwloc_solaris_get_thisthread_cpubind(hwloc_topology_t topology, hwloc_bitmap_t hwloc_set, int flags)
+{
+  return hwloc_solaris_get_sth_cpubind(topology, P_LWPID, P_MYID, hwloc_set, flags);
+}
+#endif /* HAVE_LIBLGRP */
+
+/* TODO: given thread, probably not easy because of the historical n:m implementation */
+#ifdef HAVE_LIBLGRP
+static int
+hwloc_solaris_set_sth_membind(hwloc_topology_t topology, idtype_t idtype, id_t id, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  int depth;
+  int n, i;
+
+  switch (policy) {
+    case HWLOC_MEMBIND_DEFAULT:
+    case HWLOC_MEMBIND_BIND:
+      break;
+    default:
+      errno = ENOSYS;
+      return -1;
+  }
+
+  if (flags & HWLOC_MEMBIND_NOCPUBIND) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+  if (depth < 0) {
+    errno = EXDEV;
+    return -1;
+  }
+  n = hwloc_get_nbobjs_by_depth(topology, depth);
+
+  for (i = 0; i < n; i++) {
+    hwloc_obj_t obj = hwloc_get_obj_by_depth(topology, depth, i);
+    if (hwloc_bitmap_isset(nodeset, obj->os_index)) {
+      lgrp_affinity_set(idtype, id, obj->os_index, LGRP_AFF_STRONG);
+    } else {
+      if (flags & HWLOC_CPUBIND_STRICT)
+	lgrp_affinity_set(idtype, id, obj->os_index, LGRP_AFF_NONE);
+      else
+	lgrp_affinity_set(idtype, id, obj->os_index, LGRP_AFF_WEAK);
+    }
+  }
+
+  return 0;
+}
+
+static int
+hwloc_solaris_set_proc_membind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  return hwloc_solaris_set_sth_membind(topology, P_PID, pid, nodeset, policy, flags);
+}
+
+static int
+hwloc_solaris_set_thisproc_membind(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  return hwloc_solaris_set_sth_membind(topology, P_PID, P_MYID, nodeset, policy, flags);
+}
+
+static int
+hwloc_solaris_set_thisthread_membind(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  return hwloc_solaris_set_sth_membind(topology, P_LWPID, P_MYID, nodeset, policy, flags);
+}
+
+static int
+hwloc_solaris_get_sth_membind(hwloc_topology_t topology, idtype_t idtype, id_t id, hwloc_nodeset_t nodeset, hwloc_membind_policy_t *policy, int flags __hwloc_attribute_unused)
+{
+  int depth = hwloc_get_type_depth(topology, HWLOC_OBJ_NODE);
+  int n;
+  int i;
+
+  if (depth < 0) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  hwloc_bitmap_zero(nodeset);
+  n = hwloc_get_nbobjs_by_depth(topology, depth);
+
+  for (i = 0; i < n; i++) {
+    hwloc_obj_t obj = hwloc_get_obj_by_depth(topology, depth, i);
+    lgrp_affinity_t aff = lgrp_affinity_get(idtype, id, obj->os_index);
+
+    if (aff == LGRP_AFF_STRONG)
+      hwloc_bitmap_set(nodeset, obj->os_index);
+  }
+
+  if (hwloc_bitmap_iszero(nodeset))
+    hwloc_bitmap_copy(nodeset, hwloc_topology_get_complete_nodeset(topology));
+
+  *policy = HWLOC_MEMBIND_DEFAULT;
+  return 0;
+}
+
+static int
+hwloc_solaris_get_proc_membind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_nodeset_t nodeset, hwloc_membind_policy_t *policy, int flags)
+{
+  return hwloc_solaris_get_sth_membind(topology, P_PID, pid, nodeset, policy, flags);
+}
+
+static int
+hwloc_solaris_get_thisproc_membind(hwloc_topology_t topology, hwloc_nodeset_t nodeset, hwloc_membind_policy_t *policy, int flags)
+{
+  return hwloc_solaris_get_sth_membind(topology, P_PID, P_MYID, nodeset, policy, flags);
+}
+
+static int
+hwloc_solaris_get_thisthread_membind(hwloc_topology_t topology, hwloc_nodeset_t nodeset, hwloc_membind_policy_t *policy, int flags)
+{
+  return hwloc_solaris_get_sth_membind(topology, P_LWPID, P_MYID, nodeset, policy, flags);
+}
+#endif /* HAVE_LIBLGRP */
+
+
+#ifdef MADV_ACCESS_LWP 
+static int
+hwloc_solaris_set_area_membind(hwloc_topology_t topology, const void *addr, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags __hwloc_attribute_unused)
+{
+  int advice;
+  size_t remainder;
+
+  /* Can not give a set of nodes just for an area.  */
+  if (!hwloc_bitmap_isequal(nodeset, hwloc_topology_get_complete_nodeset(topology))) {
+    errno = EXDEV;
+    return -1;
+  }
+
+  switch (policy) {
+    case HWLOC_MEMBIND_DEFAULT:
+    case HWLOC_MEMBIND_BIND:
+      advice = MADV_ACCESS_DEFAULT;
+      break;
+    case HWLOC_MEMBIND_FIRSTTOUCH:
+    case HWLOC_MEMBIND_NEXTTOUCH:
+      advice = MADV_ACCESS_LWP;
+      break;
+    case HWLOC_MEMBIND_INTERLEAVE:
+      advice = MADV_ACCESS_MANY;
+      break;
+    default:
+      errno = ENOSYS;
+      return -1;
+  }
+
+  remainder = (uintptr_t) addr & (sysconf(_SC_PAGESIZE)-1);
+  addr = (char*) addr - remainder;
+  len += remainder;
+  return madvise((void*) addr, len, advice);
+}
+#endif
+
+#ifdef HAVE_LIBLGRP
+static void
+browse(struct hwloc_topology *topology, lgrp_cookie_t cookie, lgrp_id_t lgrp, hwloc_obj_t *glob_lgrps, unsigned *curlgrp)
+{
+  int n;
+  hwloc_obj_t obj;
+  lgrp_mem_size_t mem_size;
+
+  n = lgrp_cpus(cookie, lgrp, NULL, 0, LGRP_CONTENT_HIERARCHY);
+  if (n == -1)
+    return;
+
+  /* Is this lgrp a NUMA node? */
+  if ((mem_size = lgrp_mem_size(cookie, lgrp, LGRP_MEM_SZ_INSTALLED, LGRP_CONTENT_DIRECT)) > 0)
+  {
+    int i;
+    processorid_t *cpuids;
+    cpuids = malloc(sizeof(processorid_t) * n);
+    assert(cpuids != NULL);
+
+    obj = hwloc_alloc_setup_object(HWLOC_OBJ_NODE, lgrp);
+    obj->nodeset = hwloc_bitmap_alloc();
+    hwloc_bitmap_set(obj->nodeset, lgrp);
+    obj->cpuset = hwloc_bitmap_alloc();
+    glob_lgrps[(*curlgrp)++] = obj;
+
+    lgrp_cpus(cookie, lgrp, cpuids, n, LGRP_CONTENT_HIERARCHY);
+    for (i = 0; i < n ; i++) {
+      hwloc_debug("node %ld's cpu %d is %d\n", lgrp, i, cpuids[i]);
+      hwloc_bitmap_set(obj->cpuset, cpuids[i]);
+    }
+    hwloc_debug_1arg_bitmap("node %ld has cpuset %s\n",
+	lgrp, obj->cpuset);
+
+    /* or LGRP_MEM_SZ_FREE */
+    hwloc_debug("node %ld has %lldkB\n", lgrp, mem_size/1024);
+    obj->memory.local_memory = mem_size;
+    obj->memory.page_types_len = 2;
+    obj->memory.page_types = malloc(2*sizeof(*obj->memory.page_types));
+    memset(obj->memory.page_types, 0, 2*sizeof(*obj->memory.page_types));
+    obj->memory.page_types[0].size = getpagesize();
+#ifdef HAVE__SC_LARGE_PAGESIZE
+    obj->memory.page_types[1].size = sysconf(_SC_LARGE_PAGESIZE);
+#endif
+    hwloc_insert_object_by_cpuset(topology, obj);
+    free(cpuids);
+  }
+
+  n = lgrp_children(cookie, lgrp, NULL, 0);
+  {
+    lgrp_id_t *lgrps;
+    int i;
+
+    lgrps = malloc(sizeof(lgrp_id_t) * n);
+    assert(lgrps != NULL);
+    lgrp_children(cookie, lgrp, lgrps, n);
+    hwloc_debug("lgrp %ld has %d children\n", lgrp, n);
+    for (i = 0; i < n ; i++)
+      {
+	browse(topology, cookie, lgrps[i], glob_lgrps, curlgrp);
+      }
+    hwloc_debug("lgrp %ld's children done\n", lgrp);
+    free(lgrps);
+  }
+}
+
+static void
+hwloc_look_lgrp(struct hwloc_topology *topology)
+{
+  lgrp_cookie_t cookie;
+  unsigned curlgrp = 0;
+  int nlgrps;
+  lgrp_id_t root;
+
+  if ((topology->flags & HWLOC_TOPOLOGY_FLAG_WHOLE_SYSTEM))
+    cookie = lgrp_init(LGRP_VIEW_OS);
+  else
+    cookie = lgrp_init(LGRP_VIEW_CALLER);
+  if (cookie == LGRP_COOKIE_NONE)
+    {
+      hwloc_debug("lgrp_init failed: %s\n", strerror(errno));
+      return;
+    }
+  nlgrps = lgrp_nlgrps(cookie);
+  root = lgrp_root(cookie);
+  {
+    hwloc_obj_t *glob_lgrps = calloc(nlgrps, sizeof(hwloc_obj_t));
+    browse(topology, cookie, root, glob_lgrps, &curlgrp);
+#ifdef HAVE_LGRP_LATENCY_COOKIE
+    {
+      float *distances = calloc(curlgrp*curlgrp, sizeof(float));
+      unsigned *indexes = calloc(curlgrp,sizeof(unsigned));
+      unsigned i, j;
+      for (i = 0; i < curlgrp; i++) {
+	indexes[i] = glob_lgrps[i]->os_index;
+	for (j = 0; j < curlgrp; j++)
+          distances[i*curlgrp+j] = (float) lgrp_latency_cookie(cookie, glob_lgrps[i]->os_index, glob_lgrps[j]->os_index, LGRP_LAT_CPU_TO_MEM);
+      }
+      hwloc_topology__set_distance_matrix(topology, HWLOC_OBJ_NODE, curlgrp, indexes, glob_lgrps, distances, 0 /* OS cannot force */);
+    }
+#endif /* HAVE_LGRP_LATENCY_COOKIE */
+  }
+  lgrp_fini(cookie);
+}
+#endif /* LIBLGRP */
+
+#ifdef HAVE_LIBKSTAT
+#include <kstat.h>
+#define HWLOC_NBMAXCPUS 1024 /* FIXME: drop */
+static int
+hwloc_look_kstat(struct hwloc_topology *topology)
+{
+  kstat_ctl_t *kc = kstat_open();
+  kstat_t *ksp;
+  kstat_named_t *stat;
+  unsigned look_cores = 1, look_chips = 1;
+
+  unsigned numsockets = 0;
+  unsigned proc_physids[HWLOC_NBMAXCPUS];
+  unsigned proc_osphysids[HWLOC_NBMAXCPUS];
+  unsigned osphysids[HWLOC_NBMAXCPUS];
+
+  unsigned numcores = 0;
+  unsigned proc_coreids[HWLOC_NBMAXCPUS];
+  unsigned oscoreids[HWLOC_NBMAXCPUS];
+
+  unsigned core_osphysids[HWLOC_NBMAXCPUS];
+
+  unsigned numprocs = 0;
+  unsigned proc_procids[HWLOC_NBMAXCPUS];
+  unsigned osprocids[HWLOC_NBMAXCPUS];
+
+  unsigned physid, coreid, cpuid;
+  unsigned procid_max = 0;
+  unsigned i;
+
+  for (cpuid = 0; cpuid < HWLOC_NBMAXCPUS; cpuid++)
+    {
+      proc_procids[cpuid] = -1;
+      proc_physids[cpuid] = -1;
+      proc_osphysids[cpuid] = -1;
+      proc_coreids[cpuid] = -1;
+    }
+
+  if (!kc)
+    {
+      hwloc_debug("kstat_open failed: %s\n", strerror(errno));
+      return 0;
+    }
+
+  for (ksp = kc->kc_chain; ksp; ksp = ksp->ks_next)
+    {
+      if (strncmp("cpu_info", ksp->ks_module, 8))
+	continue;
+
+      cpuid = ksp->ks_instance;
+      if (cpuid > HWLOC_NBMAXCPUS)
+	{
+	  fprintf(stderr,"CPU id too big: %u\n", cpuid);
+	  continue;
+	}
+
+      if (kstat_read(kc, ksp, NULL) == -1)
+	{
+	  fprintf(stderr, "kstat_read failed for CPU%u: %s\n", cpuid, strerror(errno));
+	  continue;
+	}
+
+      hwloc_debug("cpu%u\n", cpuid);
+      proc_procids[cpuid] = numprocs;
+      osprocids[numprocs] = cpuid;
+      numprocs++;
+
+      if (cpuid >= procid_max)
+        procid_max = cpuid + 1;
+
+      stat = (kstat_named_t *) kstat_data_lookup(ksp, "state");
+      if (!stat)
+          hwloc_debug("could not read state for CPU%u: %s\n", cpuid, strerror(errno));
+      else if (stat->data_type != KSTAT_DATA_CHAR)
+          hwloc_debug("unknown kstat type %d for cpu state\n", stat->data_type);
+      else
+        {
+          hwloc_debug("cpu%u's state is %s\n", cpuid, stat->value.c);
+          if (strcmp(stat->value.c, "on-line"))
+            /* not online */
+            hwloc_bitmap_clr(topology->levels[0][0]->online_cpuset, cpuid);
+        }
+
+      if (look_chips) do {
+	/* Get Chip ID */
+	stat = (kstat_named_t *) kstat_data_lookup(ksp, "chip_id");
+	if (!stat)
+	  {
+	    if (numsockets)
+	      fprintf(stderr, "could not read socket id for CPU%u: %s\n", cpuid, strerror(errno));
+	    else
+	      hwloc_debug("could not read socket id for CPU%u: %s\n", cpuid, strerror(errno));
+	    look_chips = 0;
+	    continue;
+	  }
+	switch (stat->data_type) {
+	  case KSTAT_DATA_INT32:
+	    physid = stat->value.i32;
+	    break;
+	  case KSTAT_DATA_UINT32:
+	    physid = stat->value.ui32;
+	    break;
+#ifdef _INT64_TYPE
+	  case KSTAT_DATA_UINT64:
+	    physid = stat->value.ui64;
+	    break;
+	  case KSTAT_DATA_INT64:
+	    physid = stat->value.i64;
+	    break;
+#endif
+	  default:
+	    fprintf(stderr, "chip_id type %d unknown\n", stat->data_type);
+	    look_chips = 0;
+	    continue;
+	}
+	proc_osphysids[cpuid] = physid;
+	for (i = 0; i < numsockets; i++)
+	  if (physid == osphysids[i])
+	    break;
+	proc_physids[cpuid] = i;
+	hwloc_debug("%u on socket %u (%u)\n", cpuid, i, physid);
+	if (i == numsockets)
+	  osphysids[numsockets++] = physid;
+      } while(0);
+
+      if (look_cores) do {
+	/* Get Core ID */
+	stat = (kstat_named_t *) kstat_data_lookup(ksp, "core_id");
+	if (!stat)
+	  {
+	    if (numcores)
+	      fprintf(stderr, "could not read core id for CPU%u: %s\n", cpuid, strerror(errno));
+	    else
+	      hwloc_debug("could not read core id for CPU%u: %s\n", cpuid, strerror(errno));
+	    look_cores = 0;
+	    continue;
+	  }
+	switch (stat->data_type) {
+	  case KSTAT_DATA_INT32:
+	    coreid = stat->value.i32;
+	    break;
+	  case KSTAT_DATA_UINT32:
+	    coreid = stat->value.ui32;
+	    break;
+#ifdef _INT64_TYPE
+	  case KSTAT_DATA_UINT64:
+	    coreid = stat->value.ui64;
+	    break;
+	  case KSTAT_DATA_INT64:
+	    coreid = stat->value.i64;
+	    break;
+#endif
+	  default:
+	    fprintf(stderr, "core_id type %d unknown\n", stat->data_type);
+	    look_cores = 0;
+	    continue;
+	}
+	for (i = 0; i < numcores; i++)
+	  if (coreid == oscoreids[i] && proc_osphysids[cpuid] == core_osphysids[i])
+	    break;
+	proc_coreids[cpuid] = i;
+	hwloc_debug("%u on core %u (%u)\n", cpuid, i, coreid);
+	if (i == numcores)
+	  {
+	    core_osphysids[numcores] = proc_osphysids[cpuid];
+	    oscoreids[numcores++] = coreid;
+	  }
+      } while(0);
+
+      /* Note: there is also clog_id for the Thread ID (not unique) and
+       * pkg_core_id for the core ID (not unique).  They are not useful to us
+       * however. */
+    }
+
+  if (look_chips)
+    hwloc_setup_level(procid_max, numsockets, osphysids, proc_physids, topology, HWLOC_OBJ_SOCKET);
+
+  if (look_cores)
+    hwloc_setup_level(procid_max, numcores, oscoreids, proc_coreids, topology, HWLOC_OBJ_CORE);
+
+  if (numprocs)
+    hwloc_setup_level(procid_max, numprocs, osprocids, proc_procids, topology, HWLOC_OBJ_PU);
+
+  kstat_close(kc);
+
+  return numprocs > 0;
+}
+#endif /* LIBKSTAT */
+
+void
+hwloc_look_solaris(struct hwloc_topology *topology)
+{
+  unsigned nbprocs = hwloc_fallback_nbprocessors (topology);
+#ifdef HAVE_LIBLGRP
+  hwloc_look_lgrp(topology);
+#endif /* HAVE_LIBLGRP */
+#ifdef HAVE_LIBKSTAT
+  nbprocs = 0;
+  if (hwloc_look_kstat(topology))
+    return;
+#endif /* HAVE_LIBKSTAT */
+  hwloc_setup_pu_level(topology, nbprocs);
+
+  hwloc_obj_add_info(topology->levels[0][0], "Backend", "Solaris");
+}
+
+void
+hwloc_set_solaris_hooks(struct hwloc_topology *topology)
+{
+  topology->set_proc_cpubind = hwloc_solaris_set_proc_cpubind;
+  topology->set_thisproc_cpubind = hwloc_solaris_set_thisproc_cpubind;
+  topology->set_thisthread_cpubind = hwloc_solaris_set_thisthread_cpubind;
+#ifdef HAVE_LIBLGRP
+  topology->get_proc_cpubind = hwloc_solaris_get_proc_cpubind;
+  topology->get_thisproc_cpubind = hwloc_solaris_get_thisproc_cpubind;
+  topology->get_thisthread_cpubind = hwloc_solaris_get_thisthread_cpubind;
+  topology->set_proc_membind = hwloc_solaris_set_proc_membind;
+  topology->set_thisproc_membind = hwloc_solaris_set_thisproc_membind;
+  topology->set_thisthread_membind = hwloc_solaris_set_thisthread_membind;
+  topology->get_proc_membind = hwloc_solaris_get_proc_membind;
+  topology->get_thisproc_membind = hwloc_solaris_get_thisproc_membind;
+  topology->get_thisthread_membind = hwloc_solaris_get_thisthread_membind;
+#endif /* HAVE_LIBLGRP */
+#ifdef MADV_ACCESS_LWP 
+  topology->set_area_membind = hwloc_solaris_set_area_membind;
+  topology->support.membind->firsttouch_membind = 1;
+  topology->support.membind->bind_membind = 1;
+  topology->support.membind->interleave_membind = 1;
+  topology->support.membind->nexttouch_membind = 1;
+#endif
+}

opal/mca/hwloc/hwloc131/hwloc/src/topology-synthetic.c

@@ -0,0 +1,347 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2010 Université Bordeaux 1
+ * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+#include <private/autogen/config.h>
+#include <hwloc.h>
+#include <private/private.h>
+#include <private/misc.h>
+#include <private/debug.h>
+
+#include <limits.h>
+#include <assert.h>
+#include <strings.h>
+
+/* Read from DESCRIPTION a series of integers describing a symmetrical
+   topology and update `topology->synthetic_description' accordingly.  On
+   success, return zero.  */
+int
+hwloc_backend_synthetic_init(struct hwloc_topology *topology, const char *description)
+{
+  const char *pos, *next_pos;
+  unsigned long item, count;
+  unsigned i;
+  int cache_depth = 0, group_depth = 0;
+  int nb_machine_levels = 0, nb_node_levels = 0;
+  int nb_pu_levels = 0;
+
+  assert(topology->backend_type == HWLOC_BACKEND_NONE);
+
+  for (pos = description, count = 1; *pos; pos = next_pos) {
+#define HWLOC_OBJ_TYPE_UNKNOWN ((hwloc_obj_type_t) -1)
+    hwloc_obj_type_t type = HWLOC_OBJ_TYPE_UNKNOWN;
+
+    while (*pos == ' ')
+      pos++;
+
+    if (!*pos)
+      break;
+
+    if (*pos < '0' || *pos > '9') {
+      if (!hwloc_namecoloncmp(pos, "machines", 2)) {
+	type = HWLOC_OBJ_MACHINE;
+      } else if (!hwloc_namecoloncmp(pos, "nodes", 1))
+	type = HWLOC_OBJ_NODE;
+      else if (!hwloc_namecoloncmp(pos, "sockets", 1))
+	type = HWLOC_OBJ_SOCKET;
+      else if (!hwloc_namecoloncmp(pos, "cores", 2))
+	type = HWLOC_OBJ_CORE;
+      else if (!hwloc_namecoloncmp(pos, "caches", 2))
+	type = HWLOC_OBJ_CACHE;
+      else if (!hwloc_namecoloncmp(pos, "pus", 1) || !hwloc_namecoloncmp(pos, "procs", 1) /* backward compatiblity with 0.9 */)
+	type = HWLOC_OBJ_PU;
+      else if (!hwloc_namecoloncmp(pos, "misc", 2))
+	type = HWLOC_OBJ_MISC;
+      else if (!hwloc_namecoloncmp(pos, "group", 2))
+	type = HWLOC_OBJ_GROUP;
+      else
+        fprintf(stderr, "Unknown object type `%s'\n", pos);
+
+      next_pos = strchr(pos, ':');
+      if (!next_pos) {
+	fprintf(stderr,"synthetic string doesn't have a `:' after object type at '%s'\n", pos);
+	errno = EINVAL;
+	return -1;
+      }
+      pos = next_pos + 1;
+    }
+    item = strtoul(pos, (char **)&next_pos, 0);
+    if (next_pos == pos) {
+      fprintf(stderr,"synthetic string doesn't have a number of objects at '%s'\n", pos);
+      errno = EINVAL;
+      return -1;
+    }
+
+    if (count + 1 >= HWLOC_SYNTHETIC_MAX_DEPTH) {
+      fprintf(stderr,"Too many synthetic levels, max %d\n", HWLOC_SYNTHETIC_MAX_DEPTH);
+      errno = EINVAL;
+      return -1;
+    }
+    if (item > UINT_MAX) {
+      fprintf(stderr,"Too big arity, max %u\n", UINT_MAX);
+      errno = EINVAL;
+      return -1;
+    }
+
+    topology->backend_params.synthetic.arity[count-1] = (unsigned)item;
+    topology->backend_params.synthetic.type[count] = type;
+    count++;
+  }
+
+  if (count <= 0) {
+    fprintf(stderr,"synthetic string doesn't contain any object\n");
+    errno = EINVAL;
+    return -1;
+  }
+
+  for(i=count-1; i>0; i--) {
+    hwloc_obj_type_t type;
+
+    type = topology->backend_params.synthetic.type[i];
+
+    if (type == HWLOC_OBJ_TYPE_UNKNOWN) {
+      if (i == count-1)
+	type = HWLOC_OBJ_PU;
+      else {
+	switch (topology->backend_params.synthetic.type[i+1]) {
+	case HWLOC_OBJ_PU: type = HWLOC_OBJ_CORE; break;
+	case HWLOC_OBJ_CORE: type = HWLOC_OBJ_CACHE; break;
+	case HWLOC_OBJ_CACHE: type = HWLOC_OBJ_SOCKET; break;
+	case HWLOC_OBJ_SOCKET: type = HWLOC_OBJ_NODE; break;
+	case HWLOC_OBJ_NODE:
+	case HWLOC_OBJ_GROUP: type = HWLOC_OBJ_GROUP; break;
+	case HWLOC_OBJ_MACHINE:
+	case HWLOC_OBJ_MISC: type = HWLOC_OBJ_MISC; break;
+	default:
+	  assert(0);
+	}
+      }
+      topology->backend_params.synthetic.type[i] = type;
+    }
+    switch (type) {
+      case HWLOC_OBJ_PU:
+	if (nb_pu_levels) {
+	    fprintf(stderr,"synthetic string can not have several PU levels\n");
+	    errno = EINVAL;
+	    return -1;
+	}
+	nb_pu_levels++;
+	break;
+      case HWLOC_OBJ_CACHE:
+	cache_depth++;
+	break;
+      case HWLOC_OBJ_GROUP:
+	group_depth++;
+	break;
+      case HWLOC_OBJ_NODE:
+	nb_node_levels++;
+	break;
+      case HWLOC_OBJ_MACHINE:
+	nb_machine_levels++;
+	break;
+      default:
+	break;
+    }
+  }
+
+  if (!nb_pu_levels) {
+    fprintf(stderr,"synthetic string missing ending number of PUs\n");
+    errno = EINVAL;
+    return -1;
+  }
+
+  if (nb_pu_levels > 1) {
+    fprintf(stderr,"synthetic string can not have several PU levels\n");
+    errno = EINVAL;
+    return -1;
+  }
+  if (nb_node_levels > 1) {
+    fprintf(stderr,"synthetic string can not have several NUMA node levels\n");
+    errno = EINVAL;
+    return -1;
+  }
+  if (nb_machine_levels > 1) {
+    fprintf(stderr,"synthetic string can not have several machine levels\n");
+    errno = EINVAL;
+    return -1;
+  }
+
+  if (nb_machine_levels)
+    topology->backend_params.synthetic.type[0] = HWLOC_OBJ_SYSTEM;
+  else {
+    topology->backend_params.synthetic.type[0] = HWLOC_OBJ_MACHINE;
+    nb_machine_levels++;
+  }
+
+  if (cache_depth == 1)
+    /* if there is a single cache level, make it L2 */
+    cache_depth = 2;
+
+  for (i=0; i<count; i++) {
+    hwloc_obj_type_t type = topology->backend_params.synthetic.type[i];
+
+    if (type == HWLOC_OBJ_GROUP)
+      topology->backend_params.synthetic.depth[i] = group_depth--;
+    else if (type == HWLOC_OBJ_CACHE)
+      topology->backend_params.synthetic.depth[i] = cache_depth--;
+  }
+
+  topology->backend_type = HWLOC_BACKEND_SYNTHETIC;
+  topology->backend_params.synthetic.arity[count-1] = 0;
+  topology->is_thissystem = 0;
+
+  return 0;
+}
+
+void
+hwloc_backend_synthetic_exit(struct hwloc_topology *topology)
+{
+  assert(topology->backend_type == HWLOC_BACKEND_SYNTHETIC);
+  topology->backend_type = HWLOC_BACKEND_NONE;
+}
+
+/*
+ * Recursively build objects whose cpu start at first_cpu
+ * - level gives where to look in the type, arity and id arrays
+ * - the id array is used as a variable to get unique IDs for a given level.
+ * - generated memory should be added to *memory_kB.
+ * - generated cpus should be added to parent_cpuset.
+ * - next cpu number to be used should be returned.
+ */
+static unsigned
+hwloc__look_synthetic(struct hwloc_topology *topology,
+    int level, unsigned first_cpu,
+    hwloc_bitmap_t parent_cpuset)
+{
+  hwloc_obj_t obj;
+  unsigned i;
+  hwloc_obj_type_t type = topology->backend_params.synthetic.type[level];
+
+  /* pre-hooks */
+  switch (type) {
+    case HWLOC_OBJ_MISC:
+      break;
+    case HWLOC_OBJ_GROUP:
+      break;
+    case HWLOC_OBJ_SYSTEM:
+    case HWLOC_OBJ_BRIDGE:
+    case HWLOC_OBJ_PCI_DEVICE:
+    case HWLOC_OBJ_OS_DEVICE:
+      /* Shouldn't happen.  */
+      abort();
+      break;
+    case HWLOC_OBJ_MACHINE:
+      break;
+    case HWLOC_OBJ_NODE:
+      break;
+    case HWLOC_OBJ_SOCKET:
+      break;
+    case HWLOC_OBJ_CACHE:
+      break;
+    case HWLOC_OBJ_CORE:
+      break;
+    case HWLOC_OBJ_PU:
+      break;
+    case HWLOC_OBJ_TYPE_MAX:
+      /* Should never happen */
+      assert(0);
+      break;
+  }
+
+  obj = hwloc_alloc_setup_object(type, topology->backend_params.synthetic.id[level]++);
+  obj->cpuset = hwloc_bitmap_alloc();
+
+  if (!topology->backend_params.synthetic.arity[level]) {
+    hwloc_bitmap_set(obj->cpuset, first_cpu++);
+  } else {
+    for (i = 0; i < topology->backend_params.synthetic.arity[level]; i++)
+      first_cpu = hwloc__look_synthetic(topology, level + 1, first_cpu, obj->cpuset);
+  }
+
+  if (type == HWLOC_OBJ_NODE) {
+    obj->nodeset = hwloc_bitmap_alloc();
+    hwloc_bitmap_set(obj->nodeset, obj->os_index);
+  }
+
+  hwloc_bitmap_or(parent_cpuset, parent_cpuset, obj->cpuset);
+
+  /* post-hooks */
+  switch (type) {
+    case HWLOC_OBJ_MISC:
+      break;
+    case HWLOC_OBJ_GROUP:
+      obj->attr->group.depth = topology->backend_params.synthetic.depth[level];
+      break;
+    case HWLOC_OBJ_SYSTEM:
+    case HWLOC_OBJ_BRIDGE:
+    case HWLOC_OBJ_PCI_DEVICE:
+    case HWLOC_OBJ_OS_DEVICE:
+      abort();
+      break;
+    case HWLOC_OBJ_MACHINE:
+      break;
+    case HWLOC_OBJ_NODE:
+      /* 1GB in memory nodes, 256k 4k-pages.  */
+      obj->memory.local_memory = 1024*1024*1024;
+      obj->memory.page_types_len = 1;
+      obj->memory.page_types = malloc(sizeof(*obj->memory.page_types));
+      memset(obj->memory.page_types, 0, sizeof(*obj->memory.page_types));
+      obj->memory.page_types[0].size = 4096;
+      obj->memory.page_types[0].count = 256*1024;
+      break;
+    case HWLOC_OBJ_SOCKET:
+      break;
+    case HWLOC_OBJ_CACHE:
+      obj->attr->cache.depth = topology->backend_params.synthetic.depth[level];
+      obj->attr->cache.linesize = 64;
+      if (obj->attr->cache.depth == 1)
+	/* 32Kb in L1 */
+	obj->attr->cache.size = 32*1024;
+      else
+	/* *4 at each level, starting from 1MB for L2 */
+	obj->attr->cache.size = 256*1024 << (2*obj->attr->cache.depth);
+      break;
+    case HWLOC_OBJ_CORE:
+      break;
+    case HWLOC_OBJ_PU:
+      break;
+    case HWLOC_OBJ_TYPE_MAX:
+      /* Should never happen */
+      assert(0);
+      break;
+  }
+
+  hwloc_insert_object_by_cpuset(topology, obj);
+
+  return first_cpu;
+}
+
+void
+hwloc_look_synthetic(struct hwloc_topology *topology)
+{
+  hwloc_bitmap_t cpuset = hwloc_bitmap_alloc();
+  unsigned first_cpu = 0, i;
+
+  topology->support.discovery->pu = 1;
+
+  /* start with id=0 for each level */
+  for (i = 0; topology->backend_params.synthetic.arity[i] > 0; i++)
+    topology->backend_params.synthetic.id[i] = 0;
+  /* ... including the last one */
+  topology->backend_params.synthetic.id[i] = 0;
+
+  /* update first level type according to the synthetic type array */
+  topology->levels[0][0]->type = topology->backend_params.synthetic.type[0];
+
+  for (i = 0; i < topology->backend_params.synthetic.arity[0]; i++)
+    first_cpu = hwloc__look_synthetic(topology, 1, first_cpu, cpuset);
+
+  hwloc_bitmap_free(cpuset);
+
+  hwloc_obj_add_info(topology->levels[0][0], "Backend", "Synthetic");
+}
+

opal/mca/hwloc/hwloc131/hwloc/src/topology-windows.c

@@ -0,0 +1,709 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2011 Université Bordeaux 1
+ * Copyright © 2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+/* To try to get all declarations duplicated below.  */
+#define _WIN32_WINNT 0x0601
+
+#include <private/autogen/config.h>
+#include <hwloc.h>
+#include <private/private.h>
+#include <private/debug.h>
+
+#include <windows.h>
+
+#ifndef HAVE_KAFFINITY
+typedef ULONG_PTR KAFFINITY, *PKAFFINITY;
+#endif
+
+#ifndef HAVE_PROCESSOR_CACHE_TYPE
+typedef enum _PROCESSOR_CACHE_TYPE {
+  CacheUnified,
+  CacheInstruction,
+  CacheData,
+  CacheTrace
+} PROCESSOR_CACHE_TYPE;
+#endif
+
+#ifndef CACHE_FULLY_ASSOCIATIVE
+#define CACHE_FULLY_ASSOCIATIVE 0xFF
+#endif
+
+#ifndef HAVE_CACHE_DESCRIPTOR
+typedef struct _CACHE_DESCRIPTOR {
+  BYTE Level;
+  BYTE Associativity;
+  WORD LineSize;
+  DWORD Size; /* in bytes */
+  PROCESSOR_CACHE_TYPE Type;
+} CACHE_DESCRIPTOR, *PCACHE_DESCRIPTOR;
+#endif
+
+#ifndef HAVE_LOGICAL_PROCESSOR_RELATIONSHIP
+typedef enum _LOGICAL_PROCESSOR_RELATIONSHIP {
+  RelationProcessorCore,
+  RelationNumaNode,
+  RelationCache,
+  RelationProcessorPackage,
+  RelationGroup,
+  RelationAll = 0xffff
+} LOGICAL_PROCESSOR_RELATIONSHIP;
+#else /* HAVE_LOGICAL_PROCESSOR_RELATIONSHIP */
+#  ifndef HAVE_RELATIONPROCESSORPACKAGE
+#    define RelationProcessorPackage 3
+#    define RelationGroup 4
+#    define RelationAll 0xffff
+#  endif /* HAVE_RELATIONPROCESSORPACKAGE */
+#endif /* HAVE_LOGICAL_PROCESSOR_RELATIONSHIP */
+
+#ifndef HAVE_SYSTEM_LOGICAL_PROCESSOR_INFORMATION
+typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION {
+  ULONG_PTR ProcessorMask;
+  LOGICAL_PROCESSOR_RELATIONSHIP Relationship;
+  _ANONYMOUS_UNION
+  union {
+    struct {
+      BYTE flags;
+    } ProcessorCore;
+    struct {
+      DWORD NodeNumber;
+    } NumaNode;
+    CACHE_DESCRIPTOR Cache;
+    ULONGLONG Reserved[2];
+  } DUMMYUNIONNAME;
+} SYSTEM_LOGICAL_PROCESSOR_INFORMATION, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION;
+#endif
+
+/* Extended interface, for group support */
+
+#ifndef HAVE_GROUP_AFFINITY
+typedef struct _GROUP_AFFINITY {
+  KAFFINITY Mask;
+  WORD Group;
+  WORD Reserved[3];
+} GROUP_AFFINITY, *PGROUP_AFFINITY;
+#endif
+
+#ifndef HAVE_PROCESSOR_RELATIONSHIP
+typedef struct _PROCESSOR_RELATIONSHIP {
+  BYTE Flags;
+  BYTE Reserved[21];
+  WORD GroupCount;
+  GROUP_AFFINITY GroupMask[ANYSIZE_ARRAY];
+} PROCESSOR_RELATIONSHIP, *PPROCESSOR_RELATIONSHIP;
+#endif
+
+#ifndef HAVE_NUMA_NODE_RELATIONSHIP
+typedef struct _NUMA_NODE_RELATIONSHIP {
+  DWORD NodeNumber;
+  BYTE Reserved[20];
+  GROUP_AFFINITY GroupMask;
+} NUMA_NODE_RELATIONSHIP, *PNUMA_NODE_RELATIONSHIP;
+#endif
+
+#ifndef HAVE_CACHE_RELATIONSHIP
+typedef struct _CACHE_RELATIONSHIP {
+  BYTE Level;
+  BYTE Associativity;
+  WORD LineSize;
+  DWORD CacheSize;
+  PROCESSOR_CACHE_TYPE Type;
+  BYTE Reserved[20];
+  GROUP_AFFINITY GroupMask;
+} CACHE_RELATIONSHIP, *PCACHE_RELATIONSHIP;
+#endif
+
+#ifndef HAVE_PROCESSOR_GROUP_INFO
+typedef struct _PROCESSOR_GROUP_INFO {
+  BYTE MaximumProcessorCount;
+  BYTE ActiveProcessorCount;
+  BYTE Reserved[38];
+  KAFFINITY ActiveProcessorMask;
+} PROCESSOR_GROUP_INFO, *PPROCESSOR_GROUP_INFO;
+#endif
+
+#ifndef HAVE_GROUP_RELATIONSHIP
+typedef struct _GROUP_RELATIONSHIP {
+  WORD MaximumGroupCount;
+  WORD ActiveGroupCount;
+  ULONGLONG Reserved[2];
+  PROCESSOR_GROUP_INFO GroupInfo[ANYSIZE_ARRAY];
+} GROUP_RELATIONSHIP, *PGROUP_RELATIONSHIP;
+#endif
+
+#ifndef HAVE_SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX
+typedef struct _SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX {
+  LOGICAL_PROCESSOR_RELATIONSHIP Relationship;
+  DWORD Size;
+  _ANONYMOUS_UNION
+  union {
+    PROCESSOR_RELATIONSHIP Processor;
+    NUMA_NODE_RELATIONSHIP NumaNode;
+    CACHE_RELATIONSHIP Cache;
+    GROUP_RELATIONSHIP Group;
+    /* Odd: no member to tell the cpu mask of the package... */
+  } DUMMYUNIONNAME;
+} SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX, *PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX;
+#endif
+
+#ifndef HAVE_PSAPI_WORKING_SET_EX_BLOCK
+typedef union _PSAPI_WORKING_SET_EX_BLOCK {
+  ULONG_PTR Flags;
+  struct {
+    unsigned Valid  :1;
+    unsigned ShareCount  :3;
+    unsigned Win32Protection  :11;
+    unsigned Shared  :1;
+    unsigned Node  :6;
+    unsigned Locked  :1;
+    unsigned LargePage  :1;
+  };
+} PSAPI_WORKING_SET_EX_BLOCK;
+#endif
+
+#ifndef HAVE_PSAPI_WORKING_SET_EX_INFORMATION
+typedef struct _PSAPI_WORKING_SET_EX_INFORMATION {
+  PVOID VirtualAddress;
+  PSAPI_WORKING_SET_EX_BLOCK VirtualAttributes;
+} PSAPI_WORKING_SET_EX_INFORMATION;
+#endif
+
+/* TODO: SetThreadIdealProcessor */
+
+static int
+hwloc_win_set_thread_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_thread_t thread, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  if (flags & HWLOC_CPUBIND_NOMEMBIND) {
+    errno = ENOSYS;
+    return -1;
+  }
+  /* TODO: groups SetThreadGroupAffinity */
+  /* The resulting binding is always strict */
+  DWORD mask = hwloc_bitmap_to_ulong(hwloc_set);
+  if (!SetThreadAffinityMask(thread, mask))
+    return -1;
+  return 0;
+}
+
+/* TODO: SetThreadGroupAffinity to get affinity */
+
+static int
+hwloc_win_set_thisthread_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  return hwloc_win_set_thread_cpubind(topology, GetCurrentThread(), hwloc_set, flags);
+}
+
+static int
+hwloc_win_set_thisthread_membind(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  int ret;
+  hwloc_cpuset_t cpuset;
+
+  if ((policy != HWLOC_MEMBIND_DEFAULT && policy != HWLOC_MEMBIND_BIND)
+      || flags & HWLOC_MEMBIND_NOCPUBIND) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  cpuset = hwloc_bitmap_alloc();
+  hwloc_cpuset_from_nodeset(topology, cpuset, nodeset);
+  ret = hwloc_win_set_thisthread_cpubind(topology, cpuset, flags & HWLOC_MEMBIND_STRICT?HWLOC_CPUBIND_STRICT:0);
+  hwloc_bitmap_free(cpuset);
+  return ret;
+}
+
+static int
+hwloc_win_set_proc_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_pid_t proc, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  if (flags & HWLOC_CPUBIND_NOMEMBIND) {
+    errno = ENOSYS;
+    return -1;
+  }
+  /* TODO: groups, hard: has to manually bind all threads into the other group,
+   * and the bind the process inside the group */
+  /* The resulting binding is always strict */
+  DWORD mask = hwloc_bitmap_to_ulong(hwloc_set);
+  if (!SetProcessAffinityMask(proc, mask))
+    return -1;
+  return 0;
+}
+
+static int
+hwloc_win_set_proc_membind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  int ret;
+  hwloc_cpuset_t cpuset;
+
+  if ((policy != HWLOC_MEMBIND_DEFAULT && policy != HWLOC_MEMBIND_BIND)
+      || flags & HWLOC_MEMBIND_NOCPUBIND) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  cpuset = hwloc_bitmap_alloc();
+  hwloc_cpuset_from_nodeset(topology, cpuset, nodeset);
+  ret = hwloc_win_set_proc_cpubind(topology, pid, cpuset, flags & HWLOC_MEMBIND_STRICT?HWLOC_CPUBIND_STRICT:0);
+  hwloc_bitmap_free(cpuset);
+  return ret;
+}
+
+static int
+hwloc_win_get_proc_cpubind(hwloc_topology_t topology __hwloc_attribute_unused, hwloc_pid_t proc, hwloc_bitmap_t hwloc_set, int flags)
+{
+  DWORD_PTR proc_mask, sys_mask;
+  if (flags & HWLOC_CPUBIND_NOMEMBIND) {
+    errno = ENOSYS;
+    return -1;
+  }
+  /* TODO: groups, GetProcessGroupAffinity, or merge SetThreadGroupAffinity for all threads */
+  if (!GetProcessAffinityMask(proc, &proc_mask, &sys_mask))
+    return -1;
+  hwloc_bitmap_from_ulong(hwloc_set, proc_mask);
+  return 0;
+}
+
+static int
+hwloc_win_get_proc_membind(hwloc_topology_t topology, hwloc_pid_t pid, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags)
+{
+  int ret;
+  hwloc_cpuset_t cpuset = hwloc_bitmap_alloc();
+  ret = hwloc_win_get_proc_cpubind(topology, pid, cpuset, flags & HWLOC_MEMBIND_STRICT?HWLOC_CPUBIND_STRICT:0);
+  if (!ret) {
+    *policy = HWLOC_MEMBIND_BIND;
+    hwloc_cpuset_to_nodeset(topology, cpuset, nodeset);
+  }
+  hwloc_bitmap_free(cpuset);
+  return ret;
+}
+
+static int
+hwloc_win_set_thisproc_cpubind(hwloc_topology_t topology, hwloc_const_bitmap_t hwloc_set, int flags)
+{
+  return hwloc_win_set_proc_cpubind(topology, GetCurrentProcess(), hwloc_set, flags);
+}
+
+static int
+hwloc_win_set_thisproc_membind(hwloc_topology_t topology, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags)
+{
+  return hwloc_win_set_proc_membind(topology, GetCurrentProcess(), nodeset, policy, flags);
+}
+
+static int
+hwloc_win_get_thisproc_cpubind(hwloc_topology_t topology, hwloc_bitmap_t hwloc_cpuset, int flags)
+{
+  return hwloc_win_get_proc_cpubind(topology, GetCurrentProcess(), hwloc_cpuset, flags);
+}
+
+static int
+hwloc_win_get_thisproc_membind(hwloc_topology_t topology, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags)
+{
+  return hwloc_win_get_proc_membind(topology, GetCurrentProcess(), nodeset, policy, flags);
+}
+
+static LPVOID WINAPI (*VirtualAllocExNumaProc)(HANDLE hProcess, LPVOID lpAddress, SIZE_T dwSize, DWORD flAllocationType, DWORD flProtect, DWORD nndPreferred);
+static BOOL WINAPI (*VirtualFreeExProc)(HANDLE hProcess, LPVOID lpAddress, SIZE_T dwSize, DWORD dwFreeType);
+static BOOL WINAPI (*QueryWorkingSetExProc)(HANDLE hProcess, PVOID pv, DWORD cb);
+
+static int hwloc_win_get_VirtualAllocExNumaProc(void) {
+  if (VirtualAllocExNumaProc == NULL) {
+    FARPROC alloc_fun = NULL, free_fun = NULL;
+    HMODULE kernel32;
+
+    kernel32 = LoadLibrary("kernel32.dll");
+    if (kernel32) {
+      alloc_fun = GetProcAddress(kernel32, "VirtualAllocExNuma");
+      free_fun = GetProcAddress(kernel32, "VirtualFreeEx");
+    }
+
+    if (!alloc_fun || !free_fun) {
+      VirtualAllocExNumaProc = (FARPROC) -1;
+      errno = ENOSYS;
+      return -1;
+    }
+
+    VirtualAllocExNumaProc = alloc_fun;
+    VirtualFreeExProc = free_fun;
+  } else if ((FARPROC) VirtualAllocExNumaProc == (FARPROC)-1) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  return 0;
+}
+
+static void *
+hwloc_win_alloc(hwloc_topology_t topology __hwloc_attribute_unused, size_t len) {
+  return VirtualAlloc(NULL, len, MEM_COMMIT|MEM_RESERVE, PAGE_EXECUTE_READWRITE);
+}
+
+static void *
+hwloc_win_alloc_membind(hwloc_topology_t topology __hwloc_attribute_unused, size_t len, hwloc_const_nodeset_t nodeset, hwloc_membind_policy_t policy, int flags) {
+  int node;
+
+  switch (policy) {
+    case HWLOC_MEMBIND_DEFAULT:
+    case HWLOC_MEMBIND_BIND:
+      break;
+    default:
+      errno = ENOSYS;
+      return hwloc_alloc_or_fail(topology, len, flags);
+  }
+
+  if (flags & HWLOC_MEMBIND_STRICT) {
+    errno = ENOSYS;
+    return NULL;
+  }
+
+  if (hwloc_bitmap_weight(nodeset) != 1) {
+    /* Not a single node, can't do this */
+    errno = EXDEV;
+    return hwloc_alloc_or_fail(topology, len, flags);
+  }
+
+  node = hwloc_bitmap_first(nodeset);
+  return VirtualAllocExNumaProc(GetCurrentProcess(), NULL, len, MEM_COMMIT|MEM_RESERVE, PAGE_EXECUTE_READWRITE, node);
+}
+
+static int
+hwloc_win_free_membind(hwloc_topology_t topology __hwloc_attribute_unused, void *addr, size_t len __hwloc_attribute_unused) {
+  if (!addr)
+    return 0;
+  if (!VirtualFreeExProc(GetCurrentProcess(), addr, 0, MEM_RELEASE))
+    return -1;
+  return 0;
+}
+
+static int hwloc_win_get_QueryWorkingSetExProc(void) {
+  if (QueryWorkingSetExProc == NULL) {
+    FARPROC fun = NULL;
+    HMODULE kernel32, psapi;
+
+    kernel32 = LoadLibrary("kernel32.dll");
+    if (kernel32)
+      fun = GetProcAddress(kernel32, "K32QueryWorkingSetEx");
+    if (!fun) {
+      psapi = LoadLibrary("psapi.dll");
+      if (psapi)
+        fun = GetProcAddress(psapi, "QueryWorkingSetEx");
+    }
+
+    if (!fun) {
+      QueryWorkingSetExProc = (FARPROC) -1;
+      errno = ENOSYS;
+      return -1;
+    }
+
+    QueryWorkingSetExProc = fun;
+  } else if ((FARPROC) QueryWorkingSetExProc == (FARPROC)-1) {
+    errno = ENOSYS;
+    return -1;
+  }
+
+  return 0;
+}
+
+static int
+hwloc_win_get_area_membind(hwloc_topology_t topology __hwloc_attribute_unused, const void *addr, size_t len, hwloc_nodeset_t nodeset, hwloc_membind_policy_t * policy, int flags)
+{
+  SYSTEM_INFO SystemInfo;
+  DWORD page_size;
+
+  GetSystemInfo(&SystemInfo);
+  page_size = SystemInfo.dwPageSize;
+
+  uintptr_t start = (((uintptr_t) addr) / page_size) * page_size;
+  unsigned nb = (((uintptr_t) addr + len - start) + page_size - 1) / page_size;
+
+  if (!nb)
+    nb = 1;
+
+  {
+    PSAPI_WORKING_SET_EX_INFORMATION pv[nb];
+    unsigned i;
+
+    for (i = 0; i < nb; i++)
+      pv[i].VirtualAddress = (void*) (start + i * page_size);
+    if (!QueryWorkingSetExProc(GetCurrentProcess(), &pv, sizeof(pv)))
+      return -1;
+    *policy = HWLOC_MEMBIND_BIND;
+    if (flags & HWLOC_MEMBIND_STRICT) {
+      unsigned node = pv[0].VirtualAttributes.Node;
+      for (i = 1; i < nb; i++) {
+	if (pv[i].VirtualAttributes.Node != node) {
+	  errno = EXDEV;
+	  return -1;
+	}
+      }
+      hwloc_bitmap_only(nodeset, node);
+      return 0;
+    }
+    hwloc_bitmap_zero(nodeset);
+    for (i = 0; i < nb; i++)
+      hwloc_bitmap_set(nodeset, pv[i].VirtualAttributes.Node);
+    return 0;
+  }
+}
+
+void
+hwloc_look_windows(struct hwloc_topology *topology)
+{
+  BOOL WINAPI (*GetLogicalProcessorInformationProc)(PSYSTEM_LOGICAL_PROCESSOR_INFORMATION Buffer, PDWORD ReturnLength);
+  BOOL WINAPI (*GetLogicalProcessorInformationExProc)(LOGICAL_PROCESSOR_RELATIONSHIP relationship, PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX Buffer, PDWORD ReturnLength);
+  BOOL WINAPI (*GetNumaAvailableMemoryNodeProc)(UCHAR Node, PULONGLONG AvailableBytes);
+  BOOL WINAPI (*GetNumaAvailableMemoryNodeExProc)(USHORT Node, PULONGLONG AvailableBytes);
+  SYSTEM_INFO SystemInfo;
+
+  DWORD length;
+
+  HMODULE kernel32;
+
+  GetSystemInfo(&SystemInfo);
+
+  kernel32 = LoadLibrary("kernel32.dll");
+  if (kernel32) {
+    GetLogicalProcessorInformationProc = GetProcAddress(kernel32, "GetLogicalProcessorInformation");
+    GetNumaAvailableMemoryNodeProc = GetProcAddress(kernel32, "GetNumaAvailableMemoryNode");
+    GetNumaAvailableMemoryNodeExProc = GetProcAddress(kernel32, "GetNumaAvailableMemoryNodeEx");
+    GetLogicalProcessorInformationExProc = GetProcAddress(kernel32, "GetLogicalProcessorInformationEx");
+
+    if (!GetLogicalProcessorInformationExProc && GetLogicalProcessorInformationProc) {
+      PSYSTEM_LOGICAL_PROCESSOR_INFORMATION procInfo;
+      unsigned id;
+      unsigned i;
+      struct hwloc_obj *obj;
+      hwloc_obj_type_t type;
+
+      length = 0;
+      procInfo = NULL;
+
+      while (1) {
+	if (GetLogicalProcessorInformationProc(procInfo, &length))
+	  break;
+	if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+	  return;
+	procInfo = realloc(procInfo, length);
+      }
+
+      for (i = 0; i < length / sizeof(*procInfo); i++) {
+
+        /* Ignore non-data caches */
+	if (procInfo[i].Relationship == RelationCache
+		&& procInfo[i].Cache.Type != CacheUnified
+		&& procInfo[i].Cache.Type != CacheData)
+	  continue;
+
+	id = -1;
+	switch (procInfo[i].Relationship) {
+	  case RelationNumaNode:
+	    type = HWLOC_OBJ_NODE;
+	    id = procInfo[i].NumaNode.NodeNumber;
+	    break;
+	  case RelationProcessorPackage:
+	    type = HWLOC_OBJ_SOCKET;
+	    break;
+	  case RelationCache:
+	    type = HWLOC_OBJ_CACHE;
+	    break;
+	  case RelationProcessorCore:
+	    type = HWLOC_OBJ_CORE;
+	    break;
+	  case RelationGroup:
+	  default:
+	    type = HWLOC_OBJ_GROUP;
+	    break;
+	}
+
+	obj = hwloc_alloc_setup_object(type, id);
+        obj->cpuset = hwloc_bitmap_alloc();
+	hwloc_debug("%s#%u mask %lx\n", hwloc_obj_type_string(type), id, procInfo[i].ProcessorMask);
+	hwloc_bitmap_from_ulong(obj->cpuset, procInfo[i].ProcessorMask);
+
+	switch (type) {
+	  case HWLOC_OBJ_NODE:
+	    {
+	      ULONGLONG avail;
+	      obj->nodeset = hwloc_bitmap_alloc();
+	      hwloc_bitmap_set(obj->nodeset, id);
+	      if ((GetNumaAvailableMemoryNodeExProc && GetNumaAvailableMemoryNodeExProc(id, &avail))
+	       || (GetNumaAvailableMemoryNodeProc && GetNumaAvailableMemoryNodeProc(id, &avail)))
+		obj->memory.local_memory = avail;
+	      obj->memory.page_types_len = 2;
+	      obj->memory.page_types = malloc(2 * sizeof(*obj->memory.page_types));
+	      memset(obj->memory.page_types, 0, 2 * sizeof(*obj->memory.page_types));
+	      obj->memory.page_types_len = 1;
+	      obj->memory.page_types[0].size = SystemInfo.dwPageSize;
+#ifdef HAVE__SC_LARGE_PAGESIZE
+	      obj->memory.page_types_len++;
+	      obj->memory.page_types[1].size = sysconf(_SC_LARGE_PAGESIZE);
+#endif
+	      break;
+	    }
+	  case HWLOC_OBJ_CACHE:
+	    obj->attr->cache.size = procInfo[i].Cache.Size;
+	    obj->attr->cache.associativity = procInfo[i].Cache.Associativity == CACHE_FULLY_ASSOCIATIVE ? -1 : procInfo[i].Cache.Associativity ;
+	    obj->attr->cache.linesize = procInfo[i].Cache.LineSize;
+	    obj->attr->cache.depth = procInfo[i].Cache.Level;
+	    break;
+	  case HWLOC_OBJ_GROUP:
+	    obj->attr->group.depth = procInfo[i].Relationship == RelationGroup;
+	    break;
+	  default:
+	    break;
+	}
+	hwloc_insert_object_by_cpuset(topology, obj);
+      }
+
+      free(procInfo);
+    }
+
+    if (GetLogicalProcessorInformationExProc) {
+      PSYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX procInfoTotal, procInfo;
+
+      unsigned id;
+      struct hwloc_obj *obj;
+      hwloc_obj_type_t type;
+
+      length = 0;
+      procInfoTotal = NULL;
+
+      while (1) {
+	if (GetLogicalProcessorInformationExProc(RelationAll, procInfoTotal, &length))
+	  break;
+	if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+	  return;
+        procInfoTotal = realloc(procInfoTotal, length);
+      }
+
+      for (procInfo = procInfoTotal;
+	   (void*) procInfo < (void*) ((unsigned long) procInfoTotal + length);
+	   procInfo = (void*) ((unsigned long) procInfo + procInfo->Size)) {
+        unsigned num, i;
+        GROUP_AFFINITY *GroupMask;
+
+        /* Ignore non-data caches */
+	if (procInfo->Relationship == RelationCache
+		&& procInfo->Cache.Type != CacheUnified
+		&& procInfo->Cache.Type != CacheData)
+	  continue;
+
+	id = -1;
+	switch (procInfo->Relationship) {
+	  case RelationNumaNode:
+	    type = HWLOC_OBJ_NODE;
+            num = 1;
+            GroupMask = &procInfo->NumaNode.GroupMask;
+	    id = procInfo->NumaNode.NodeNumber;
+	    break;
+	  case RelationProcessorPackage:
+	    type = HWLOC_OBJ_SOCKET;
+            num = procInfo->Processor.GroupCount;
+            GroupMask = procInfo->Processor.GroupMask;
+	    break;
+	  case RelationCache:
+	    type = HWLOC_OBJ_CACHE;
+            num = 1;
+            GroupMask = &procInfo->Cache.GroupMask;
+	    break;
+	  case RelationProcessorCore:
+	    type = HWLOC_OBJ_CORE;
+            num = procInfo->Processor.GroupCount;
+            GroupMask = procInfo->Processor.GroupMask;
+	    break;
+	  case RelationGroup:
+	    /* So strange an interface... */
+	    for (id = 0; id < procInfo->Group.ActiveGroupCount; id++) {
+              KAFFINITY mask;
+	      obj = hwloc_alloc_setup_object(HWLOC_OBJ_GROUP, id);
+	      obj->cpuset = hwloc_bitmap_alloc();
+	      mask = procInfo->Group.GroupInfo[id].ActiveProcessorMask;
+	      hwloc_debug("group %u %d cpus mask %lx\n", id,
+                  procInfo->Group.GroupInfo[id].ActiveProcessorCount, mask);
+	      hwloc_bitmap_from_ith_ulong(obj->cpuset, id, mask);
+	      hwloc_insert_object_by_cpuset(topology, obj);
+	    }
+	    continue;
+	  default:
+	    /* Don't know how to get the mask.  */
+            hwloc_debug("unknown relation %d\n", procInfo->Relationship);
+	    continue;
+	}
+
+	obj = hwloc_alloc_setup_object(type, id);
+        obj->cpuset = hwloc_bitmap_alloc();
+        for (i = 0; i < num; i++) {
+          hwloc_debug("%s#%u %d: mask %d:%lx\n", hwloc_obj_type_string(type), id, i, GroupMask[i].Group, GroupMask[i].Mask);
+          hwloc_bitmap_from_ith_ulong(obj->cpuset, GroupMask[i].Group, GroupMask[i].Mask);
+        }
+
+	switch (type) {
+	  case HWLOC_OBJ_NODE:
+	    {
+	      ULONGLONG avail;
+	      obj->nodeset = hwloc_bitmap_alloc();
+	      hwloc_bitmap_set(obj->nodeset, id);
+	      if ((GetNumaAvailableMemoryNodeExProc && GetNumaAvailableMemoryNodeExProc(id, &avail))
+	       || (GetNumaAvailableMemoryNodeProc && GetNumaAvailableMemoryNodeProc(id, &avail)))
+	        obj->memory.local_memory = avail;
+	      obj->memory.page_types = malloc(2 * sizeof(*obj->memory.page_types));
+	      memset(obj->memory.page_types, 0, 2 * sizeof(*obj->memory.page_types));
+	      obj->memory.page_types_len = 1;
+	      obj->memory.page_types[0].size = SystemInfo.dwPageSize;
+#ifdef HAVE__SC_LARGE_PAGESIZE
+	      obj->memory.page_types_len++;
+	      obj->memory.page_types[1].size = sysconf(_SC_LARGE_PAGESIZE);
+#endif
+	      break;
+	    }
+	  case HWLOC_OBJ_CACHE:
+	    obj->attr->cache.size = procInfo->Cache.CacheSize;
+	    obj->attr->cache.associativity = procInfo->Cache.Associativity;
+	    obj->attr->cache.associativity = procInfo->Cache.Associativity == CACHE_FULLY_ASSOCIATIVE ? -1 : procInfo->Cache.Associativity ;
+	    obj->attr->cache.linesize = procInfo->Cache.LineSize;
+	    obj->attr->cache.depth = procInfo->Cache.Level;
+	    break;
+	  default:
+	    break;
+	}
+	hwloc_insert_object_by_cpuset(topology, obj);
+      }
+      free(procInfoTotal);
+    }
+  }
+
+  /* add PU objects */
+  hwloc_setup_pu_level(topology, hwloc_fallback_nbprocessors(topology));
+
+  hwloc_obj_add_info(topology->levels[0][0], "Backend", "Windows");
+}
+
+void
+hwloc_set_windows_hooks(struct hwloc_topology *topology)
+{
+  topology->set_proc_cpubind = hwloc_win_set_proc_cpubind;
+  topology->get_proc_cpubind = hwloc_win_get_proc_cpubind;
+  topology->set_thread_cpubind = hwloc_win_set_thread_cpubind;
+  topology->set_thisproc_cpubind = hwloc_win_set_thisproc_cpubind;
+  topology->get_thisproc_cpubind = hwloc_win_get_thisproc_cpubind;
+  topology->set_thisthread_cpubind = hwloc_win_set_thisthread_cpubind;
+  /* TODO: get_last_cpu_location: use GetCurrentProcessorNumber */
+
+  topology->set_proc_membind = hwloc_win_set_proc_membind;
+  topology->get_proc_membind = hwloc_win_get_proc_membind;
+  topology->set_thisproc_membind = hwloc_win_set_thisproc_membind;
+  topology->get_thisproc_membind = hwloc_win_get_thisproc_membind;
+  topology->set_thisthread_membind = hwloc_win_set_thisthread_membind;
+
+  if (!hwloc_win_get_VirtualAllocExNumaProc()) {
+    topology->alloc_membind = hwloc_win_alloc_membind;
+    topology->alloc = hwloc_win_alloc;
+    topology->free_membind = hwloc_win_free_membind;
+    topology->support.membind->bind_membind = 1;
+  }
+
+  if (!hwloc_win_get_QueryWorkingSetExProc())
+    topology->get_area_membind = hwloc_win_get_area_membind;
+}

opal/mca/hwloc/hwloc131/hwloc/src/topology-x86.c

@@ -0,0 +1,543 @@
+/*
+ * Copyright © 2010-2011 INRIA.  All rights reserved.
+ * Copyright © 2010-2011 Université Bordeaux 1
+ * Copyright © 2010-2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ *
+ *
+ * This backend is only used when the operating system does not export
+ * the necessary hardware topology information to user-space applications.
+ * Currently, only the FreeBSD backend relies on this x86 backend.
+ *
+ * Other backends such as Linux have their own way to retrieve various
+ * pieces of hardware topology information from the operating system
+ * on various architectures, without having to use this x86-specific code.
+ */
+
+#include <private/autogen/config.h>
+#include <hwloc.h>
+#include <private/private.h>
+#include <private/debug.h>
+#include <private/cpuid.h>
+#include <private/misc.h>
+
+struct cacheinfo {
+  unsigned type;
+  unsigned level;
+  unsigned nbthreads_sharing;
+
+  unsigned linesize;
+  unsigned linepart;
+  int ways;
+  unsigned sets;
+  unsigned size;
+};
+
+struct procinfo {
+  unsigned present;
+  unsigned apicid;
+  unsigned max_log_proc;
+  unsigned max_nbcores;
+  unsigned max_nbthreads;
+  unsigned socketid;
+  unsigned logprocid;
+  unsigned threadid;
+  unsigned coreid;
+  unsigned *otherids;
+  unsigned levels;
+  unsigned numcaches;
+  struct cacheinfo *cache;
+};
+
+enum cpuid_type {
+  intel,
+  amd,
+  unknown
+};
+
+static void fill_amd_cache(struct procinfo *infos, unsigned level, unsigned cpuid)
+{
+  struct cacheinfo *cache;
+  unsigned cachenum;
+  unsigned size = 0;
+
+  if (level == 1)
+    size = ((cpuid >> 24)) << 10;
+  else if (level == 2)
+    size = ((cpuid >> 16)) << 10;
+  else if (level == 3)
+    size = ((cpuid >> 18)) << 19;
+  if (!size)
+    return;
+
+  cachenum = infos->numcaches++;
+  infos->cache = realloc(infos->cache, infos->numcaches*sizeof(*infos->cache));
+  cache = &infos->cache[cachenum];
+
+  cache->type = 1;
+  cache->level = level;
+  if (level <= 2)
+    cache->nbthreads_sharing = 1;
+  else
+    cache->nbthreads_sharing = infos->max_log_proc;
+  cache->linesize = cpuid & 0xff;
+  cache->linepart = 0;
+  if (level == 1) {
+    cache->ways = (cpuid >> 16) & 0xff;
+    if (cache->ways == 0xff)
+      /* Fully associative */
+      cache->ways = -1;
+  } else {
+    static const unsigned ways_tab[] = { 0, 1, 2, 0, 4, 0, 8, 0, 16, 0, 32, 48, 64, 96, 128, -1 };
+    unsigned ways = (cpuid >> 12) & 0xf;
+    cache->ways = ways_tab[ways];
+  }
+  cache->size = size;
+  cache->sets = 0;
+
+  hwloc_debug("cache L%u t%u linesize %u ways %u size %uKB\n", cache->level, cache->nbthreads_sharing, cache->linesize, cache->ways, cache->size >> 10);
+}
+
+/* Fetch information from the processor itself thanks to cpuid and store it in
+ * infos for summarize to analyze them globally */
+static void look_proc(struct procinfo *infos, unsigned highest_cpuid, unsigned highest_ext_cpuid, enum cpuid_type cpuid_type)
+{
+  unsigned eax, ebx, ecx = 0, edx;
+  unsigned cachenum;
+  struct cacheinfo *cache;
+
+  infos->present = 1;
+
+  eax = 0x01;
+  hwloc_cpuid(&eax, &ebx, &ecx, &edx);
+  infos->apicid = ebx >> 24;
+  if (edx & (1 << 28))
+    infos->max_log_proc = 1 << hwloc_flsl(((ebx >> 16) & 0xff) - 1);
+  else
+    infos->max_log_proc = 1;
+  hwloc_debug("APIC ID 0x%02x max_log_proc %u\n", infos->apicid, infos->max_log_proc);
+  infos->socketid = infos->apicid / infos->max_log_proc;
+  infos->logprocid = infos->apicid % infos->max_log_proc;
+  infos->coreid = (unsigned) -1;
+  infos->threadid = (unsigned) -1;
+  hwloc_debug("phys %u thread %u\n", infos->socketid, infos->logprocid);
+
+  /* Intel doesn't actually provide 0x80000008 information */
+  if (cpuid_type != intel && highest_ext_cpuid >= 0x80000008) {
+    unsigned coreidsize;
+    eax = 0x80000008;
+    hwloc_cpuid(&eax, &ebx, &ecx, &edx);
+    coreidsize = (ecx >> 12) & 0xf;
+    hwloc_debug("core ID size: %u\n", coreidsize);
+    if (!coreidsize) {
+      infos->max_nbcores = (ecx & 0xff) + 1;
+    } else 
+      infos->max_nbcores = 1 << coreidsize;
+    hwloc_debug("Thus max # of cores: %u\n", infos->max_nbcores);
+    /* Still no multithreaded AMD */
+    infos->max_nbthreads = 1 ;
+    hwloc_debug("and max # of threads: %u\n", infos->max_nbthreads);
+    infos->threadid = infos->logprocid % infos->max_nbthreads;
+    infos->coreid = infos->logprocid / infos->max_nbthreads;
+    hwloc_debug("this is thread %u of core %u\n", infos->threadid, infos->coreid);
+  }
+
+  infos->numcaches = 0;
+  infos->cache = NULL;
+
+  /* Intel doesn't actually provide 0x80000005 information */
+  if (cpuid_type != intel && highest_ext_cpuid >= 0x80000005) {
+    eax = 0x80000005;
+    hwloc_cpuid(&eax, &ebx, &ecx, &edx);
+    fill_amd_cache(infos, 1, ecx);
+  }
+
+  /* Intel doesn't actually provide 0x80000006 information */
+  if (cpuid_type != intel && highest_ext_cpuid >= 0x80000006) {
+    eax = 0x80000006;
+    hwloc_cpuid(&eax, &ebx, &ecx, &edx);
+    fill_amd_cache(infos, 2, ecx);
+    fill_amd_cache(infos, 3, edx);
+  }
+
+  /* AMD doesn't actually provide 0x04 information */
+  if (cpuid_type != amd && highest_cpuid >= 0x04) {
+    cachenum = 0;
+    for (cachenum = 0; ; cachenum++) {
+      unsigned type;
+      eax = 0x04;
+      ecx = cachenum;
+      hwloc_cpuid(&eax, &ebx, &ecx, &edx);
+
+      type = eax & 0x1f;
+
+      hwloc_debug("cache %u type %u\n", cachenum, type);
+
+      if (type == 0)
+	break;
+      if (type == 2)
+	/* Instruction cache */
+	continue;
+      infos->numcaches++;
+    }
+
+    cache = infos->cache = malloc(infos->numcaches * sizeof(*infos->cache));
+
+    for (cachenum = 0; ; cachenum++) {
+      unsigned linesize, linepart, ways, sets;
+      unsigned type;
+      eax = 0x04;
+      ecx = cachenum;
+      hwloc_cpuid(&eax, &ebx, &ecx, &edx);
+
+      type = eax & 0x1f;
+
+      if (type == 0)
+	break;
+      if (type == 2)
+	/* Instruction cache */
+	continue;
+
+      cache->type = type;
+
+      cache->level = (eax >> 5) & 0x7;
+      cache->nbthreads_sharing = ((eax >> 14) & 0xfff) + 1;
+      infos->max_nbcores = ((eax >> 26) & 0x3f) + 1;
+
+      cache->linesize = linesize = (ebx & 0xfff) + 1;
+      cache->linepart = linepart = ((ebx >> 12) & 0x3ff) + 1;
+      if (eax & (1 << 9))
+        /* Fully associative */
+        cache->ways = -1;
+      else
+        cache->ways = ways = ((ebx >> 22) & 0x3ff) + 1;
+      cache->sets = sets = ecx + 1;
+      cache->size = linesize * linepart * ways * sets;
+
+      hwloc_debug("cache %u type %u L%u t%u c%u linesize %u linepart %u ways %u sets %u, size %uKB\n", cachenum, cache->type, cache->level, cache->nbthreads_sharing, infos->max_nbcores, linesize, linepart, ways, sets, cache->size >> 10);
+      infos->max_nbthreads = infos->max_log_proc / infos->max_nbcores;
+      hwloc_debug("thus %u threads\n", infos->max_nbthreads);
+      infos->threadid = infos->logprocid % infos->max_nbthreads;
+      infos->coreid = infos->logprocid / infos->max_nbthreads;
+      hwloc_debug("this is thread %u of core %u\n", infos->threadid, infos->coreid);
+
+      cache++;
+    }
+  }
+
+  if (cpuid_type == intel && highest_cpuid >= 0x0b) {
+    unsigned level, apic_nextshift, apic_number, apic_type, apic_id = 0, apic_shift = 0, id;
+    for (level = 0; ; level++) {
+      ecx = level;
+      eax = 0x0b;
+      hwloc_cpuid(&eax, &ebx, &ecx, &edx);
+      if (!eax && !ebx)
+        break;
+    }
+    if (level) {
+      infos->levels = level;
+      infos->otherids = malloc(level * sizeof(*infos->otherids));
+      for (level = 0; ; level++) {
+	ecx = level;
+	eax = 0x0b;
+	hwloc_cpuid(&eax, &ebx, &ecx, &edx);
+	if (!eax && !ebx)
+	  break;
+	apic_nextshift = eax & 0x1f;
+	apic_number = ebx & 0xffff;
+	apic_type = (ecx & 0xff00) >> 8;
+	apic_id = edx;
+	id = (apic_id >> apic_shift) & ((1 << (apic_nextshift - apic_shift)) - 1);
+	hwloc_debug("x2APIC %08x %d: nextshift %d num %2d type %d id %2d\n", apic_id, level, apic_nextshift, apic_number, apic_type, id);
+	infos->apicid = apic_id;
+	infos->otherids[level] = UINT_MAX;
+	switch (apic_type) {
+	case 1:
+	  infos->threadid = id;
+	  break;
+	case 2:
+	  infos->coreid = id;
+	  break;
+	default:
+	  hwloc_debug("x2APIC %d: unknown type %d\n", level, apic_type);
+	  infos->otherids[level] = apic_id >> apic_shift;
+	  break;
+	}
+	apic_shift = apic_nextshift;
+      }
+      infos->socketid = apic_id >> apic_shift;
+      hwloc_debug("x2APIC remainder: %d\n", infos->socketid);
+    } else
+      infos->otherids = NULL;
+  } else
+    infos->otherids = NULL;
+}
+
+/* Analyse information stored in infos, and build topology levels accordingly */
+static void summarize(hwloc_topology_t topology, struct procinfo *infos, unsigned nbprocs)
+{
+  hwloc_bitmap_t complete_cpuset = hwloc_bitmap_alloc();
+  unsigned i, j, l, level;
+  int one = -1;
+
+  for (i = 0; i < nbprocs; i++)
+    if (infos[i].present) {
+      hwloc_bitmap_set(complete_cpuset, i);
+      one = i;
+    }
+
+  if (one == -1)
+    return;
+
+  /* Look for sockets */
+  {
+    hwloc_bitmap_t sockets_cpuset = hwloc_bitmap_dup(complete_cpuset);
+    hwloc_bitmap_t socket_cpuset;
+    hwloc_obj_t sock;
+
+    while ((i = hwloc_bitmap_first(sockets_cpuset)) != (unsigned) -1) {
+      unsigned socketid = infos[i].socketid;
+
+      socket_cpuset = hwloc_bitmap_alloc();
+      for (j = i; j < nbprocs; j++) {
+        if (infos[j].socketid == socketid) {
+          hwloc_bitmap_set(socket_cpuset, j);
+          hwloc_bitmap_clr(sockets_cpuset, j);
+        }
+      }
+      sock = hwloc_alloc_setup_object(HWLOC_OBJ_SOCKET, socketid);
+      sock->cpuset = socket_cpuset;
+      hwloc_debug_1arg_bitmap("os socket %u has cpuset %s\n",
+          socketid, socket_cpuset);
+      hwloc_insert_object_by_cpuset(topology, sock);
+    }
+    hwloc_bitmap_free(sockets_cpuset);
+  }
+
+  /* Look for unknown objects */
+  if (infos[one].otherids) {
+    for (level = infos[one].levels-1; level <= infos[one].levels-1; level--) {
+      if (infos[one].otherids[level] != UINT_MAX) {
+	hwloc_bitmap_t unknowns_cpuset = hwloc_bitmap_dup(complete_cpuset);
+	hwloc_bitmap_t unknown_cpuset;
+	hwloc_obj_t unknown;
+
+	while ((i = hwloc_bitmap_first(unknowns_cpuset)) != (unsigned) -1) {
+	  unsigned unknownid = infos[i].otherids[level];
+
+	  unknown_cpuset = hwloc_bitmap_alloc();
+	  for (j = i; j < nbprocs; j++) {
+	    if (infos[j].otherids[level] == unknownid) {
+	      hwloc_bitmap_set(unknown_cpuset, j);
+	      hwloc_bitmap_clr(unknowns_cpuset, j);
+	    }
+	  }
+	  unknown = hwloc_alloc_setup_object(HWLOC_OBJ_MISC, unknownid);
+	  unknown->cpuset = unknown_cpuset;
+	  unknown->os_level = level;
+	  hwloc_debug_2args_bitmap("os unknown%d %u has cpuset %s\n",
+	      level, unknownid, unknown_cpuset);
+	  hwloc_insert_object_by_cpuset(topology, unknown);
+	}
+	hwloc_bitmap_free(unknowns_cpuset);
+      }
+    }
+  }
+
+  /* Look for cores */
+  {
+    hwloc_bitmap_t cores_cpuset = hwloc_bitmap_dup(complete_cpuset);
+    hwloc_bitmap_t core_cpuset;
+    hwloc_obj_t core;
+
+    while ((i = hwloc_bitmap_first(cores_cpuset)) != (unsigned) -1) {
+      unsigned socketid = infos[i].socketid;
+      unsigned coreid = infos[i].coreid;
+
+      if (coreid == (unsigned) -1) {
+        hwloc_bitmap_clr(cores_cpuset, i);
+	continue;
+      }
+
+      core_cpuset = hwloc_bitmap_alloc();
+      for (j = i; j < nbprocs; j++) {
+	if (infos[j].coreid == (unsigned) -1) {
+	  hwloc_bitmap_clr(cores_cpuset, j);
+	  continue;
+	}
+
+        if (infos[j].socketid == socketid && infos[j].coreid == coreid) {
+          hwloc_bitmap_set(core_cpuset, j);
+          hwloc_bitmap_clr(cores_cpuset, j);
+        }
+      }
+      core = hwloc_alloc_setup_object(HWLOC_OBJ_CORE, coreid);
+      core->cpuset = core_cpuset;
+      hwloc_debug_1arg_bitmap("os core %u has cpuset %s\n",
+          coreid, core_cpuset);
+      hwloc_insert_object_by_cpuset(topology, core);
+    }
+    hwloc_bitmap_free(cores_cpuset);
+  }
+
+  /* Look for caches */
+  /* First find max level */
+  level = 0;
+  for (i = 0; i < nbprocs; i++)
+    for (j = 0; j < infos[i].numcaches; j++)
+      if (infos[i].cache[j].level > level)
+        level = infos[i].cache[j].level;
+
+  while (level > 0) {
+    /* Look for caches at level level */
+    {
+      hwloc_bitmap_t caches_cpuset = hwloc_bitmap_dup(complete_cpuset);
+      hwloc_bitmap_t cache_cpuset;
+      hwloc_obj_t cache;
+
+      while ((i = hwloc_bitmap_first(caches_cpuset)) != (unsigned) -1) {
+        unsigned socketid = infos[i].socketid;
+
+        for (l = 0; l < infos[i].numcaches; l++) {
+          if (infos[i].cache[l].level == level)
+            break;
+        }
+        if (l == infos[i].numcaches) {
+          /* no cache Llevel in i, odd */
+          hwloc_bitmap_clr(caches_cpuset, i);
+          continue;
+        }
+
+        {
+          unsigned cacheid = infos[i].apicid / infos[i].cache[l].nbthreads_sharing;
+
+          cache_cpuset = hwloc_bitmap_alloc();
+          for (j = i; j < nbprocs; j++) {
+            unsigned l2;
+            for (l2 = 0; l2 < infos[j].numcaches; l2++) {
+              if (infos[j].cache[l2].level == level)
+                break;
+            }
+            if (l2 == infos[j].numcaches) {
+              /* no cache Llevel in j, odd */
+              hwloc_bitmap_clr(caches_cpuset, j);
+              continue;
+            }
+            if (infos[j].socketid == socketid && infos[j].apicid / infos[j].cache[l2].nbthreads_sharing == cacheid) {
+              hwloc_bitmap_set(cache_cpuset, j);
+              hwloc_bitmap_clr(caches_cpuset, j);
+            }
+          }
+          cache = hwloc_alloc_setup_object(HWLOC_OBJ_CACHE, cacheid);
+          cache->attr->cache.depth = level;
+          cache->attr->cache.size = infos[i].cache[l].size;
+          cache->attr->cache.linesize = infos[i].cache[l].linesize;
+          cache->attr->cache.associativity = infos[i].cache[l].ways;
+          cache->cpuset = cache_cpuset;
+          hwloc_debug_2args_bitmap("os L%u cache %u has cpuset %s\n",
+              level, cacheid, cache_cpuset);
+          hwloc_insert_object_by_cpuset(topology, cache);
+        }
+      }
+      hwloc_bitmap_free(caches_cpuset);
+    }
+    level--;
+  }
+
+  for (i = 0; i < nbprocs; i++) {
+    free(infos[i].cache);
+    if (infos[i].otherids)
+      free(infos[i].otherids);
+  }
+}
+
+#define INTEL_EBX ('G' | ('e'<<8) | ('n'<<16) | ('u'<<24))
+#define INTEL_EDX ('i' | ('n'<<8) | ('e'<<16) | ('I'<<24))
+#define INTEL_ECX ('n' | ('t'<<8) | ('e'<<16) | ('l'<<24))
+
+#define AMD_EBX ('A' | ('u'<<8) | ('t'<<16) | ('h'<<24))
+#define AMD_EDX ('e' | ('n'<<8) | ('t'<<16) | ('i'<<24))
+#define AMD_ECX ('c' | ('A'<<8) | ('M'<<16) | ('D'<<24))
+
+void hwloc_look_x86(struct hwloc_topology *topology, unsigned nbprocs)
+{
+    /* This function must always be here, but it's ok if it's empty. */
+#if defined(HWLOC_HAVE_CPUID)
+  unsigned eax, ebx, ecx = 0, edx;
+  hwloc_bitmap_t orig_cpuset;
+  unsigned i;
+  unsigned highest_cpuid;
+  unsigned highest_ext_cpuid;
+  struct procinfo *infos = NULL;
+  enum cpuid_type cpuid_type = unknown;
+
+  if (!hwloc_have_cpuid())
+    return;
+
+  infos = malloc(sizeof(struct procinfo) * nbprocs);
+  if (NULL == infos) {
+      return;
+  }
+
+  eax = 0x00;
+  hwloc_cpuid(&eax, &ebx, &ecx, &edx);
+  highest_cpuid = eax;
+  if (ebx == INTEL_EBX && ecx == INTEL_ECX && edx == INTEL_EDX)
+    cpuid_type = intel;
+  if (ebx == AMD_EBX && ecx == AMD_ECX && edx == AMD_EDX)
+    cpuid_type = amd;
+
+  hwloc_debug("highest cpuid %x, cpuid type %u\n", highest_cpuid, cpuid_type);
+  if (highest_cpuid < 0x01) {
+      goto free;
+  }
+
+  eax = 0x80000000;
+  hwloc_cpuid(&eax, &ebx, &ecx, &edx);
+  highest_ext_cpuid = eax;
+
+  hwloc_debug("highest extended cpuid %x\n", highest_ext_cpuid);
+
+  orig_cpuset = hwloc_bitmap_alloc();
+
+  if (topology->get_thisthread_cpubind && topology->set_thisthread_cpubind) {
+    if (!topology->get_thisthread_cpubind(topology, orig_cpuset, HWLOC_CPUBIND_STRICT)) {
+      hwloc_bitmap_t cpuset = hwloc_bitmap_alloc();
+      for (i = 0; i < nbprocs; i++) {
+        hwloc_bitmap_only(cpuset, i);
+        if (topology->set_thisthread_cpubind(topology, cpuset, HWLOC_CPUBIND_STRICT))
+          continue;
+        look_proc(&infos[i], highest_cpuid, highest_ext_cpuid, cpuid_type);
+      }
+      hwloc_bitmap_free(cpuset);
+      topology->set_thisthread_cpubind(topology, orig_cpuset, 0);
+      hwloc_bitmap_free(orig_cpuset);
+      summarize(topology, infos, nbprocs);
+      goto free;
+    }
+  }
+  if (topology->get_thisproc_cpubind && topology->set_thisproc_cpubind) {
+    if (!topology->get_thisproc_cpubind(topology, orig_cpuset, HWLOC_CPUBIND_STRICT)) {
+      hwloc_bitmap_t cpuset = hwloc_bitmap_alloc();
+      for (i = 0; i < nbprocs; i++) {
+        hwloc_bitmap_only(cpuset, i);
+        if (topology->set_thisproc_cpubind(topology, cpuset, HWLOC_CPUBIND_STRICT))
+          continue;
+        look_proc(&infos[i], highest_cpuid, highest_ext_cpuid, cpuid_type);
+      }
+      hwloc_bitmap_free(cpuset);
+      topology->set_thisproc_cpubind(topology, orig_cpuset, 0);
+      hwloc_bitmap_free(orig_cpuset);
+      summarize(topology, infos, nbprocs);
+      goto free;
+    }
+  }
+#endif
+
+  hwloc_obj_add_info(topology->levels[0][0], "Backend", "x86");
+
+ free:
+  if (NULL != infos) {
+      free(infos);
+  }
+}

opal/mca/hwloc/hwloc131/hwloc/src/traversal.c

@@ -0,0 +1,604 @@
+/*
+ * Copyright © 2009 CNRS
+ * Copyright © 2009-2011 INRIA.  All rights reserved.
+ * Copyright © 2009-2010 Université Bordeaux 1
+ * Copyright © 2009-2011 Cisco Systems, Inc.  All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+#include <private/autogen/config.h>
+#include <hwloc.h>
+#include <private/private.h>
+#include <private/misc.h>
+#include <private/debug.h>
+
+int
+hwloc_get_type_depth (struct hwloc_topology *topology, hwloc_obj_type_t type)
+{
+  return topology->type_depth[type];
+}
+
+hwloc_obj_type_t
+hwloc_get_depth_type (hwloc_topology_t topology, unsigned depth)
+{
+  if (depth >= topology->nb_levels)
+    switch (depth) {
+    case HWLOC_TYPE_DEPTH_BRIDGE:
+      return HWLOC_OBJ_BRIDGE;
+    case HWLOC_TYPE_DEPTH_PCI_DEVICE:
+      return HWLOC_OBJ_PCI_DEVICE;
+    case HWLOC_TYPE_DEPTH_OS_DEVICE:
+      return HWLOC_OBJ_OS_DEVICE;
+    default:
+      return (hwloc_obj_type_t) -1;
+    }
+  return topology->levels[depth][0]->type;
+}
+
+unsigned
+hwloc_get_nbobjs_by_depth (struct hwloc_topology *topology, unsigned depth)
+{
+  if (depth >= topology->nb_levels)
+    switch (depth) {
+    case HWLOC_TYPE_DEPTH_BRIDGE:
+      return topology->bridge_nbobjects;
+    case HWLOC_TYPE_DEPTH_PCI_DEVICE:
+      return topology->pcidev_nbobjects;
+    case HWLOC_TYPE_DEPTH_OS_DEVICE:
+      return topology->osdev_nbobjects;
+    default:
+      return 0;
+    }
+  return topology->level_nbobjects[depth];
+}
+
+struct hwloc_obj *
+hwloc_get_obj_by_depth (struct hwloc_topology *topology, unsigned depth, unsigned idx)
+{
+  if (depth >= topology->nb_levels)
+    switch (depth) {
+    case HWLOC_TYPE_DEPTH_BRIDGE:
+      return idx < topology->bridge_nbobjects ? topology->bridge_level[idx] : NULL;
+    case HWLOC_TYPE_DEPTH_PCI_DEVICE:
+      return idx < topology->pcidev_nbobjects ? topology->pcidev_level[idx] : NULL;
+    case HWLOC_TYPE_DEPTH_OS_DEVICE:
+      return idx < topology->osdev_nbobjects ? topology->osdev_level[idx] : NULL;
+    default:
+      return NULL;
+    }
+  if (idx >= topology->level_nbobjects[depth])
+    return NULL;
+  return topology->levels[depth][idx];
+}
+
+unsigned hwloc_get_closest_objs (struct hwloc_topology *topology, struct hwloc_obj *src, struct hwloc_obj **objs, unsigned max)
+{
+  struct hwloc_obj *parent, *nextparent, **src_objs;
+  int i,src_nbobjects;
+  unsigned stored = 0;
+
+  if (!src->cpuset)
+    return 0;
+
+  src_nbobjects = topology->level_nbobjects[src->depth];
+  src_objs = topology->levels[src->depth];
+
+  parent = src;
+  while (stored < max) {
+    while (1) {
+      nextparent = parent->parent;
+      if (!nextparent)
+	goto out;
+      if (!nextparent->cpuset || !hwloc_bitmap_isequal(parent->cpuset, nextparent->cpuset))
+	break;
+      parent = nextparent;
+    }
+
+    if (!nextparent->cpuset)
+      break;
+
+    /* traverse src's objects and find those that are in nextparent and were not in parent */
+    for(i=0; i<src_nbobjects; i++) {
+      if (hwloc_bitmap_isincluded(src_objs[i]->cpuset, nextparent->cpuset)
+	  && !hwloc_bitmap_isincluded(src_objs[i]->cpuset, parent->cpuset)) {
+	objs[stored++] = src_objs[i];
+	if (stored == max)
+	  goto out;
+      }
+    }
+    parent = nextparent;
+  }
+
+ out:
+  return stored;
+}
+
+static int
+hwloc__get_largest_objs_inside_cpuset (struct hwloc_obj *current, hwloc_const_bitmap_t set,
+				       struct hwloc_obj ***res, int *max)
+{
+  int gotten = 0;
+  unsigned i;
+
+  /* the caller must ensure this */
+  if (*max <= 0)
+    return 0;
+
+  if (hwloc_bitmap_isequal(current->cpuset, set)) {
+    **res = current;
+    (*res)++;
+    (*max)--;
+    return 1;
+  }
+
+  for (i=0; i<current->arity; i++) {
+    hwloc_bitmap_t subset = hwloc_bitmap_dup(set);
+    int ret;
+
+    /* split out the cpuset part corresponding to this child and see if there's anything to do */
+    if (current->children[i]->cpuset) {
+      hwloc_bitmap_and(subset, subset, current->children[i]->cpuset);
+      if (hwloc_bitmap_iszero(subset)) {
+        hwloc_bitmap_free(subset);
+        continue;
+      }
+    }
+
+    ret = hwloc__get_largest_objs_inside_cpuset (current->children[i], subset, res, max);
+    gotten += ret;
+    hwloc_bitmap_free(subset);
+
+    /* if no more room to store remaining objects, return what we got so far */
+    if (!*max)
+      break;
+  }
+
+  return gotten;
+}
+
+int
+hwloc_get_largest_objs_inside_cpuset (struct hwloc_topology *topology, hwloc_const_bitmap_t set,
+				      struct hwloc_obj **objs, int max)
+{
+  struct hwloc_obj *current = topology->levels[0][0];
+
+  if (!current->cpuset || !hwloc_bitmap_isincluded(set, current->cpuset))
+    return -1;
+
+  if (max <= 0)
+    return 0;
+
+  return hwloc__get_largest_objs_inside_cpuset (current, set, &objs, &max);
+}
+
+const char *
+hwloc_obj_type_string (hwloc_obj_type_t obj)
+{
+  switch (obj)
+    {
+    case HWLOC_OBJ_SYSTEM: return "System";
+    case HWLOC_OBJ_MACHINE: return "Machine";
+    case HWLOC_OBJ_MISC: return "Misc";
+    case HWLOC_OBJ_GROUP: return "Group";
+    case HWLOC_OBJ_NODE: return "NUMANode";
+    case HWLOC_OBJ_SOCKET: return "Socket";
+    case HWLOC_OBJ_CACHE: return "Cache";
+    case HWLOC_OBJ_CORE: return "Core";
+    case HWLOC_OBJ_BRIDGE: return "Bridge";
+    case HWLOC_OBJ_PCI_DEVICE: return "PCIDev";
+    case HWLOC_OBJ_OS_DEVICE: return "OSDev";
+    case HWLOC_OBJ_PU: return "PU";
+    default: return "Unknown";
+    }
+}
+
+hwloc_obj_type_t
+hwloc_obj_type_of_string (const char * string)
+{
+  if (!strcasecmp(string, "System")) return HWLOC_OBJ_SYSTEM;
+  if (!strcasecmp(string, "Machine")) return HWLOC_OBJ_MACHINE;
+  if (!strcasecmp(string, "Misc")) return HWLOC_OBJ_MISC;
+  if (!strcasecmp(string, "Group")) return HWLOC_OBJ_GROUP;
+  if (!strcasecmp(string, "NUMANode") || !strcasecmp(string, "Node")) return HWLOC_OBJ_NODE;
+  if (!strcasecmp(string, "Socket")) return HWLOC_OBJ_SOCKET;
+  if (!strcasecmp(string, "Cache")) return HWLOC_OBJ_CACHE;
+  if (!strcasecmp(string, "Core")) return HWLOC_OBJ_CORE;
+  if (!strcasecmp(string, "PU") || !strcasecmp(string, "proc") /* backward compatiliby with 0.9 */) return HWLOC_OBJ_PU;
+  if (!strcasecmp(string, "Bridge")) return HWLOC_OBJ_BRIDGE;
+  if (!strcasecmp(string, "PCIDev")) return HWLOC_OBJ_PCI_DEVICE;
+  if (!strcasecmp(string, "OSDev")) return HWLOC_OBJ_OS_DEVICE;
+  return (hwloc_obj_type_t) -1;
+}
+
+static const char *
+hwloc_pci_class_string(unsigned short class_id)
+{
+  switch ((class_id & 0xff00) >> 8) {
+    case 0x00:
+      switch (class_id) {
+	case 0x0001: return "VGA";
+      }
+      return "PCI";
+    case 0x01:
+      switch (class_id) {
+	case 0x0100: return "SCSI";
+	case 0x0101: return "IDE";
+	case 0x0102: return "Flop";
+	case 0x0103: return "IPI";
+	case 0x0104: return "RAID";
+	case 0x0105: return "ATA";
+	case 0x0106: return "SATA";
+	case 0x0107: return "SAS";
+      }
+      return "Stor";
+    case 0x02:
+      switch (class_id) {
+	case 0x0200: return "Ether";
+	case 0x0201: return "TokRn";
+	case 0x0202: return "FDDI";
+	case 0x0203: return "ATM";
+	case 0x0204: return "ISDN";
+	case 0x0205: return "WrdFip";
+	case 0x0206: return "PICMG";
+      }
+      return "Net";
+    case 0x03:
+      switch (class_id) {
+	case 0x0300: return "VGA";
+	case 0x0301: return "XGA";
+	case 0x0302: return "3D";
+      }
+      return "Disp";
+    case 0x04:
+      switch (class_id) {
+	case 0x0400: return "Video";
+	case 0x0401: return "Audio";
+	case 0x0402: return "Phone";
+	case 0x0403: return "Auddv";
+      }
+      return "MM";
+    case 0x05:
+      switch (class_id) {
+	case 0x0500: return "RAM";
+	case 0x0501: return "Flash";
+      }
+      return "Mem";
+    case 0x06:
+      switch (class_id) {
+	case 0x0600: return "Host";
+	case 0x0601: return "ISA";
+	case 0x0602: return "EISA";
+	case 0x0603: return "MC";
+	case 0x0604: return "PCI_B";
+	case 0x0605: return "PCMCIA";
+	case 0x0606: return "Nubus";
+	case 0x0607: return "CardBus";
+	case 0x0608: return "RACEway";
+	case 0x0609: return "PCI_SB";
+	case 0x060a: return "IB_B";
+      }
+      return "Bridg";
+    case 0x07:
+      switch (class_id) {
+	case 0x0700: return "Ser";
+	case 0x0701: return "Para";
+	case 0x0702: return "MSer";
+	case 0x0703: return "Modm";
+	case 0x0704: return "GPIB";
+	case 0x0705: return "SmrtCrd";
+      }
+      return "Comm";
+    case 0x08:
+      switch (class_id) {
+	case 0x0800: return "PIC";
+	case 0x0801: return "DMA";
+	case 0x0802: return "Time";
+	case 0x0803: return "RTC";
+	case 0x0804: return "HtPl";
+	case 0x0805: return "SD-HtPl";
+      }
+      return "Syst";
+    case 0x09:
+      switch (class_id) {
+	case 0x0900: return "Kbd";
+	case 0x0901: return "Pen";
+	case 0x0902: return "Mouse";
+	case 0x0903: return "Scan";
+	case 0x0904: return "Game";
+      }
+      return "In";
+    case 0x0a:
+      return "Dock";
+    case 0x0b:
+      switch (class_id) {
+	case 0x0b00: return "386";
+	case 0x0b01: return "486";
+	case 0x0b02: return "Pent";
+	case 0x0b10: return "Alpha";
+	case 0x0b20: return "PPC";
+	case 0x0b30: return "MIPS";
+	case 0x0b40: return "CoProc";
+      }
+      return "Proc";
+    case 0x0c:
+      switch (class_id) {
+	case 0x0c00: return "Firw";
+	case 0x0c01: return "ACCES";
+	case 0x0c02: return "SSA";
+	case 0x0c03: return "USB";
+	case 0x0c04: return "Fiber";
+	case 0x0c05: return "SMBus";
+	case 0x0c06: return "IB";
+	case 0x0c07: return "IPMI";
+	case 0x0c08: return "SERCOS";
+	case 0x0c09: return "CANBUS";
+      }
+      return "Ser";
+    case 0x0d:
+      switch (class_id) {
+	case 0x0d00: return "IRDA";
+	case 0x0d01: return "IR";
+	case 0x0d10: return "RF";
+	case 0x0d11: return "Blueth";
+	case 0x0d12: return "BroadB";
+	case 0x0d20: return "802.1a";
+	case 0x0d21: return "802.1b";
+      }
+      return "Wifi";
+    case 0x0e:
+      switch (class_id) {
+	case 0x0e00: return "I2O";
+      }
+      return "Intll";
+    case 0x0f:
+      switch (class_id) {
+	case 0x0f00: return "S-TV";
+	case 0x0f01: return "S-Aud";
+	case 0x0f02: return "S-Voice";
+	case 0x0f03: return "S-Data";
+      }
+      return "Satel";
+    case 0x10:
+      return "Crypt";
+    case 0x11:
+      return "Signl";
+    case 0xff:
+      return "Oth";
+  }
+  return "PCI";
+}
+
+#define hwloc_memory_size_printf_value(_size, _verbose) \
+  ((_size) < (10ULL<<20) || _verbose ? (((_size)>>9)+1)>>1 : (_size) < (10ULL<<30) ? (((_size)>>19)+1)>>1 : (((_size)>>29)+1)>>1)
+#define hwloc_memory_size_printf_unit(_size, _verbose) \
+  ((_size) < (10ULL<<20) || _verbose ? "KB" : (_size) < (10ULL<<30) ? "MB" : "GB")
+
+int
+hwloc_obj_type_snprintf(char * __hwloc_restrict string, size_t size, hwloc_obj_t obj, int verbose)
+{
+  hwloc_obj_type_t type = obj->type;
+  switch (type) {
+  case HWLOC_OBJ_MISC:
+  case HWLOC_OBJ_SYSTEM:
+  case HWLOC_OBJ_MACHINE:
+  case HWLOC_OBJ_NODE:
+  case HWLOC_OBJ_SOCKET:
+  case HWLOC_OBJ_CORE:
+  case HWLOC_OBJ_PU:
+    return hwloc_snprintf(string, size, "%s", hwloc_obj_type_string(type));
+  case HWLOC_OBJ_CACHE:
+    return hwloc_snprintf(string, size, "L%u%s", obj->attr->cache.depth, verbose ? hwloc_obj_type_string(type): "");
+  case HWLOC_OBJ_GROUP:
+	  /* TODO: more pretty presentation? */
+    return hwloc_snprintf(string, size, "%s%u", hwloc_obj_type_string(type), obj->attr->group.depth);
+  case HWLOC_OBJ_BRIDGE:
+    if (verbose)
+      return snprintf(string, size, "Bridge %s->%s",
+		      obj->attr->bridge.upstream_type == HWLOC_OBJ_BRIDGE_PCI ? "PCI" : "Host",
+		      "PCI");
+    else
+      return snprintf(string, size, obj->attr->bridge.upstream_type == HWLOC_OBJ_BRIDGE_PCI ? "PCIBridge" : "HostBridge");
+  case HWLOC_OBJ_PCI_DEVICE:
+    return snprintf(string, size, "PCI %04x:%04x",
+		    obj->attr->pcidev.vendor_id, obj->attr->pcidev.device_id);
+  case HWLOC_OBJ_OS_DEVICE:
+    switch (obj->attr->osdev.type) {
+    case HWLOC_OBJ_OSDEV_BLOCK: return hwloc_snprintf(string, size, "Block");
+    case HWLOC_OBJ_OSDEV_NETWORK: return hwloc_snprintf(string, size, "Net");
+    case HWLOC_OBJ_OSDEV_OPENFABRICS: return hwloc_snprintf(string, size, "OpenFabrics");
+    case HWLOC_OBJ_OSDEV_DMA: return hwloc_snprintf(string, size, "DMA");
+    case HWLOC_OBJ_OSDEV_GPU: return hwloc_snprintf(string, size, "GPU");
+    default:
+      *string = '\0';
+      return 0;
+    }
+    break;
+  default:
+    if (size > 0)
+      *string = '\0';
+    return 0;
+  }
+}
+
+int
+hwloc_obj_attr_snprintf(char * __hwloc_restrict string, size_t size, hwloc_obj_t obj, const char * separator, int verbose)
+{
+  const char *prefix = "";
+  char *tmp = string;
+  ssize_t tmplen = size;
+  int ret = 0;
+  int res;
+
+  /* make sure we output at least an empty string */
+  if (size)
+    *string = '\0';
+
+  /* print memory attributes */
+  res = 0;
+  if (verbose) {
+    if (obj->memory.local_memory)
+      res = hwloc_snprintf(tmp, tmplen, "%slocal=%lu%s%stotal=%lu%s",
+			   prefix,
+			   (unsigned long) hwloc_memory_size_printf_value(obj->memory.total_memory, verbose),
+			   hwloc_memory_size_printf_unit(obj->memory.total_memory, verbose),
+			   separator,
+			   (unsigned long) hwloc_memory_size_printf_value(obj->memory.local_memory, verbose),
+			   hwloc_memory_size_printf_unit(obj->memory.local_memory, verbose));
+    else if (obj->memory.total_memory)
+      res = hwloc_snprintf(tmp, tmplen, "%stotal=%lu%s",
+			   prefix,
+			   (unsigned long) hwloc_memory_size_printf_value(obj->memory.total_memory, verbose),
+			   hwloc_memory_size_printf_unit(obj->memory.total_memory, verbose));
+  } else {
+    if (obj->memory.total_memory)
+      res = hwloc_snprintf(tmp, tmplen, "%s%lu%s",
+			   prefix,
+			   (unsigned long) hwloc_memory_size_printf_value(obj->memory.total_memory, verbose),
+			   hwloc_memory_size_printf_unit(obj->memory.total_memory, verbose));
+  }
+  if (res < 0)
+    return -1;
+  ret += res;
+  if (ret > 0)
+    prefix = separator;
+  if (res >= tmplen)
+    res = tmplen>0 ? tmplen - 1 : 0;
+  tmp += res;
+  tmplen -= res;
+
+  /* printf type-specific attributes */
+  res = 0;
+  switch (obj->type) {
+  case HWLOC_OBJ_CACHE:
+    if (verbose) {
+      char assoc[32];
+      if (obj->attr->cache.associativity == -1)
+	snprintf(assoc, sizeof(assoc), "%sfully-associative", separator);
+      else if (obj->attr->cache.associativity == 0)
+	*assoc = '\0';
+      else
+	snprintf(assoc, sizeof(assoc), "%sways=%d", separator, obj->attr->cache.associativity);
+      res = hwloc_snprintf(tmp, tmplen, "%ssize=%lu%s%slinesize=%u%s",
+			   prefix,
+			   (unsigned long) hwloc_memory_size_printf_value(obj->attr->cache.size, verbose),
+			   hwloc_memory_size_printf_unit(obj->attr->cache.size, verbose),
+			   separator, obj->attr->cache.linesize,
+			   assoc);
+    } else
+      res = hwloc_snprintf(tmp, tmplen, "%s%lu%s",
+			   prefix,
+			   (unsigned long) hwloc_memory_size_printf_value(obj->attr->cache.size, verbose),
+			   hwloc_memory_size_printf_unit(obj->attr->cache.size, verbose));
+    break;
+  case HWLOC_OBJ_BRIDGE:
+    if (verbose) {
+      char up[128], down[64];
+      /* upstream is PCI or HOST */
+      if (obj->attr->bridge.upstream_type == HWLOC_OBJ_BRIDGE_PCI) {
+        char linkspeed[64]= "";
+        if (obj->attr->pcidev.linkspeed)
+          snprintf(linkspeed, sizeof(linkspeed), "%slink=%.2fGB/s", separator, obj->attr->pcidev.linkspeed);
+	snprintf(up, sizeof(up), "busid=%04x:%02x:%02x.%01x%sid=%04x:%04x%sclass=%04x(%s)%s",
+		 obj->attr->pcidev.domain, obj->attr->pcidev.bus, obj->attr->pcidev.dev, obj->attr->pcidev.func, separator,
+		 obj->attr->pcidev.vendor_id, obj->attr->pcidev.device_id, separator,
+		 obj->attr->pcidev.class_id, hwloc_pci_class_string(obj->attr->pcidev.class_id), linkspeed);
+      } else
+        *up = '\0';
+      /* downstream is_PCI */
+      snprintf(down, sizeof(down), "buses=%04x:[%02x-%02x]",
+	       obj->attr->bridge.downstream.pci.domain, obj->attr->bridge.downstream.pci.secondary_bus, obj->attr->bridge.downstream.pci.subordinate_bus);
+      if (*up)
+	res = snprintf(string, size, "%s%s%s", up, separator, down);
+      else
+	res = snprintf(string, size, "%s", down);
+    }
+    break;
+  case HWLOC_OBJ_PCI_DEVICE:
+    if (verbose) {
+      char linkspeed[64]= "";
+      if (obj->attr->pcidev.linkspeed)
+        snprintf(linkspeed, sizeof(linkspeed), "%slink=%.2fGB/s", separator, obj->attr->pcidev.linkspeed);
+      res = snprintf(string, size, "busid=%04x:%02x:%02x.%01x%sclass=%04x(%s)%s",
+		     obj->attr->pcidev.domain, obj->attr->pcidev.bus, obj->attr->pcidev.dev, obj->attr->pcidev.func, separator,
+		     obj->attr->pcidev.class_id, hwloc_pci_class_string(obj->attr->pcidev.class_id), linkspeed);
+    }
+    break;
+  default:
+    break;
+  }
+  if (res < 0)
+    return -1;
+  ret += res;
+  if (ret > 0)
+    prefix = separator;
+  if (res >= tmplen)
+    res = tmplen>0 ? tmplen - 1 : 0;
+  tmp += res;
+  tmplen -= res;
+
+  /* printf infos */
+  if (verbose) {
+    unsigned i;
+    for(i=0; i<obj->infos_count; i++) {
+      if (strchr(obj->infos[i].value, ' '))
+	res = hwloc_snprintf(tmp, tmplen, "%s%s=\"%s\"",
+			     prefix,
+			     obj->infos[i].name, obj->infos[i].value);
+      else
+	res = hwloc_snprintf(tmp, tmplen, "%s%s=%s",
+			     prefix,
+			     obj->infos[i].name, obj->infos[i].value);
+      if (res < 0)
+        return -1;
+      ret += res;
+      if (res >= tmplen)
+        res = tmplen>0 ? tmplen - 1 : 0;
+      tmp += res;
+      tmplen -= res;
+      if (ret > 0)
+        prefix = separator;
+    }
+  }
+
+  return ret;
+}
+
+
+int
+hwloc_obj_snprintf(char *string, size_t size,
+    struct hwloc_topology *topology __hwloc_attribute_unused, struct hwloc_obj *l, const char *_indexprefix, int verbose)
+{
+  const char *indexprefix = _indexprefix ? _indexprefix : "#";
+  char os_index[12] = "";
+  char type[64];
+  char attr[128];
+  int attrlen;
+
+  if (l->os_index != (unsigned) -1) {
+    hwloc_snprintf(os_index, 12, "%s%u", indexprefix, l->os_index);
+  }
+
+  hwloc_obj_type_snprintf(type, sizeof(type), l, verbose);
+  attrlen = hwloc_obj_attr_snprintf(attr, sizeof(attr), l, " ", verbose);
+
+  if (attrlen > 0)
+    return hwloc_snprintf(string, size, "%s%s(%s)", type, os_index, attr);
+  else
+    return hwloc_snprintf(string, size, "%s%s", type, os_index);
+}
+
+int hwloc_obj_cpuset_snprintf(char *str, size_t size, size_t nobj, struct hwloc_obj * const *objs)
+{
+  hwloc_bitmap_t set = hwloc_bitmap_alloc();
+  int res;
+  unsigned i;
+
+  hwloc_bitmap_zero(set);
+  for(i=0; i<nobj; i++)
+    if (objs[i]->cpuset)
+      hwloc_bitmap_or(set, set, objs[i]->cpuset);
+
+  res = hwloc_bitmap_snprintf(str, size, set);
+  hwloc_bitmap_free(set);
+  return res;
+}

opal/mca/hwloc/hwloc131/hwloc/tests/README.txt

@@ -0,0 +1,4 @@
+Open MPI doesn't need this tree from hwloc.  But automake *requires*
+that this directory has to be here.  So we have an empty directory
+with a README in it, a) just to explain why it's here, and b) so that
+hg clones won't delete the directory (because it's empty).

opal/mca/hwloc/hwloc131/hwloc/utils/README.txt

@@ -0,0 +1,4 @@
+Open MPI doesn't need this tree from hwloc.  But automake *requires*
+that this directory has to be here.  So we have an empty directory
+with a README in it, a) just to explain why it's here, and b) so that
+hg clones won't delete the directory (because it's empty).

opal/mca/hwloc/hwloc131/hwloc131.h

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+ *
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ *
+ * When this component is used, this file is included in the rest of
+ * the OPAL/ORTE/OMPI code base via opal/mca/event/event.h.  As such,
+ * this header represents the public interface to this static component.
+ */
+
+#ifndef MCA_OPAL_HWLOC_HWLOC131_H
+#define MCA_OPAL_HWLOC_HWLOC131_H
+
+#include "hwloc/include/hwloc.h"
+
+END_C_DECLS
+
+#endif /* MCA_OPAL_HWLOC_HWLOC131_H */

opal/mca/hwloc/hwloc131/hwloc131_component.c

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved. 
+ *
+ * $COPYRIGHT$
+ * 
+ * Additional copyrights may follow
+ * 
+ * $HEADER$
+ *
+ * These symbols are in a file by themselves to provide nice linker
+ * semantics.  Since linkers generally pull in symbols by object
+ * files, keeping these symbols as the only symbols in this file
+ * prevents utility programs such as "ompi_info" from having to import
+ * entire components just to query their version and parameters.
+ */
+
+#include "opal_config.h"
+#include "opal/constants.h"
+
+#include "opal/mca/hwloc/hwloc.h"
+#include "hwloc131.h"
+
+/*
+ * Public string showing the sysinfo ompi_linux component version number
+ */
+const char *opal_hwloc_hwloc131_component_version_string =
+    "OPAL hwloc131 hwloc MCA component version " OPAL_VERSION;
+
+/*
+ * Local function
+ */
+static int hwloc131_open(void);
+
+/*
+ * Instantiate the public struct with all of our public information
+ * and pointers to our public functions in it
+ */
+
+const opal_hwloc_component_t mca_hwloc_hwloc131_component = {
+
+    /* First, the mca_component_t struct containing meta information
+       about the component itself */
+
+    {
+        OPAL_HWLOC_BASE_VERSION_2_0_0,
+
+        /* Component name and version */
+        "hwloc131",
+        OPAL_MAJOR_VERSION,
+        OPAL_MINOR_VERSION,
+        OPAL_RELEASE_VERSION,
+
+        /* Component open and close functions */
+        hwloc131_open,
+        NULL
+    },
+    {
+        /* The component is checkpoint ready */
+        MCA_BASE_METADATA_PARAM_CHECKPOINT
+    }
+};
+
+
+static int hwloc131_open(void)
+{    
+    return OPAL_SUCCESS;
+}
+

opal/mca/hwloc/hwloc131/hwloc131_module.c

@@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2011      Cisco Systems, Inc.  All rights reserved.
+ */
+#include "opal_config.h"
+#include "opal/constants.h"
+
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#undef WIN32_LEAN_AND_MEAN
+#endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <sys/queue.h>
+#include <stdio.h>
+#include <stdlib.h>
+#ifndef WIN32
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#endif
+#include <errno.h>
+#include <signal.h>
+#include <string.h>
+#include <assert.h>
+#include <time.h>
+
+#include "opal/class/opal_object.h"
+#include "opal/threads/mutex.h"
+#include "opal/threads/threads.h"
+#include "opal/util/output.h"
+#include "opal/util/argv.h"
+#include "opal/util/fd.h"
+#include "opal/mca/base/mca_base_param.h"
+
+#include "hwloc131.h"
+#include "opal/mca/hwloc/base/base.h"
+