Hydra-specific patches for hwloc.

Picked up the relevant parts of [a460c1ee], [dab3166d], and [1eb07c6e

].
Signed-off-by: Antonio J. Pena <apenya@mcs.anl.gov>

src/pm/hydra/tools/topo/hwloc/hwloc/Makefile.am

@@ -9,10 +9,10 @@ ACLOCAL_AMFLAGS = -I ./config
 
 SUBDIRS = src include
 if HWLOC_BUILD_STANDALONE
-SUBDIRS += utils tests
+# SUBDIRS += utils tests
 # We need doc/ if HWLOC_BUILD_DOXYGEN, or during make install if HWLOC_INSTALL_DOXYGEN.
 # There's no INSTALL_SUBDIRS, so always enter doc/ and check HWLOC_BUILD/INSTALL_DOXYGEN there
-SUBDIRS += doc
+# SUBDIRS += doc
 endif
 
 # Do not let automake automatically add the non-standalone dirs to the

src/pm/hydra/tools/topo/hwloc/hwloc/autogen.sh

-:
-autoreconf ${autoreconf_args:-"-ivf"}
+#!/bin/sh
+
+if [ -n "$MPICH_AUTOTOOLS_DIR" ] ; then
+    autoreconf=${MPICH_AUTOTOOLS_DIR}/autoreconf
+else
+    autoreconf=${AUTORECONF:-autoreconf}
+fi
+
+$autoreconf ${autoreconf_args:-"-ivf"}

src/pm/hydra/tools/topo/hwloc/hwloc/src/diff.c

@@ -98,7 +98,7 @@ static int hwloc_append_diff_obj_attr_string(hwloc_obj_t obj,
 
 static int hwloc_append_diff_obj_attr_uint64(hwloc_obj_t obj,
 					     hwloc_topology_diff_obj_attr_type_t type,
-					     hwloc_uint64_t index,
+					     hwloc_uint64_t idx,
 					     hwloc_uint64_t oldvalue,
 					     hwloc_uint64_t newvalue,
 					     hwloc_topology_diff_t *firstdiffp,
@@ -118,7 +118,7 @@ static int hwloc_append_diff_obj_attr_uint64(hwloc_obj_t obj,
 	newdiff->obj_attr.obj_depth = obj->depth;
 	newdiff->obj_attr.obj_index = obj->logical_index;
 	newdiff->obj_attr.diff.uint64.type = type;
-	newdiff->obj_attr.diff.uint64.index = index;
+	newdiff->obj_attr.diff.uint64.index = idx;
 	newdiff->obj_attr.diff.uint64.oldvalue = oldvalue;
 	newdiff->obj_attr.diff.uint64.newvalue = newvalue;
 	hwloc_append_diff(newdiff, firstdiffp, lastdiffp);

src/pm/hydra/tools/topo/hwloc/hwloc/src/topology-linux.c

@@ -2727,7 +2727,7 @@ look_sysfsnode(struct hwloc_topology *topology,
       for (index_ = 0; index_ < nbnodes; index_++) {
           char nodepath[SYSFS_NUMA_NODE_PATH_LEN];
           hwloc_bitmap_t cpuset;
-          hwloc_obj_t node, res_obj;
+          hwloc_obj_t node, res_obj __hwloc_attribute_unused;
 
 	  osnode = indexes[index_];
 
@@ -4688,7 +4688,7 @@ hwloc_look_linuxfs_pci(struct hwloc_backend *backend)
     unsigned os_index;
     char path[64];
     char value[16];
-    size_t read;
+    size_t read __hwloc_attribute_unused;
     FILE *file;
 
     if (sscanf(dirent->d_name, "%04x:%02x:%02x.%01x", &domain, &bus, &dev, &func) != 4)

src/pm/hydra/tools/topo/hwloc/hwloc/src/topology-xml.c

@@ -1405,7 +1405,7 @@ hwloc_export_obj_userdata_base64(void *reserved,
   hwloc__xml_export_state_t state = reserved;
   size_t encoded_length;
   char *encoded_buffer;
-  int ret;
+  int ret __hwloc_attribute_unused;
 
   if (name && hwloc__xml_export_check_buffer(name, strlen(name)) < 0) {
     errno = EINVAL;

src/pm/hydra/tools/topo/hwloc/hwloc/src/topology.c

@@ -1055,17 +1055,19 @@ hwloc_insert_object_by_parent(struct hwloc_topology *topology, hwloc_obj_t paren
     if (obj->cpuset && (!curcpuset || hwloc__object_cpusets_compare_first(obj, *current) < 0)) {
       static int reported = 0;
       if (!reported && !hwloc_hide_errors()) {
-	char *a = "NULL", *b;
-	if (curcpuset)
-	  hwloc_bitmap_asprintf(&a, curcpuset);
+	char *a, *b;
 	hwloc_bitmap_asprintf(&b, obj->cpuset);
         fprintf(stderr, "****************************************************************************\n");
         fprintf(stderr, "* hwloc has encountered an out-of-order topology discovery.\n");
-        fprintf(stderr, "* An object with (complete) cpuset %s was inserted after object with %s\n", b, a);
+	if (curcpuset) {
+	  hwloc_bitmap_asprintf(&a, curcpuset);
+	  fprintf(stderr, "* An object with (complete) cpuset %s was inserted after object with %s\n", b, a);
+	  free(a);
+	} else {
+	  fprintf(stderr, "* An object with (complete) cpuset %s was inserted after object with NULL\n", b);
+	}
         fprintf(stderr, "* Please check that your input topology (XML file, etc.) is valid.\n");
         fprintf(stderr, "****************************************************************************\n");
-	if (curcpuset)
-	  free(a);
 	free(b);
 	reported = 1;
       }