linux: merge the linuxio component back into the main linux component

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

NEWS

@@ -74,6 +74,7 @@ Version 2.1.0
     kernel prior to 2.6.16.
   + Discovery components are now divided in phases that may be individually
     blacklisted.
+    - The linuxio component has been merged back into the linux component.
 * Tools
   + lstopo
     - lstopo factorizes objects by default in the graphical output when

config/hwloc.m4

@@ -1,6 +1,6 @@
 dnl -*- Autoconf -*-
 dnl
-dnl Copyright © 2009-2018 Inria.  All rights reserved.
+dnl Copyright © 2009-2019 Inria.  All rights reserved.
 dnl Copyright © 2009-2012, 2015-2017 Université Bordeaux
 dnl Copyright © 2004-2005 The Trustees of Indiana University and Indiana
 dnl                         University Research and Technology
@@ -217,8 +217,7 @@ EOF])
         AC_MSG_RESULT([Linux])
         hwloc_components="$hwloc_components linux"
         if test "x$enable_io" != xno; then
-	  hwloc_components="$hwloc_components linuxio"
-	  AC_DEFINE(HWLOC_HAVE_LINUXIO, 1, [Define to 1 if building the Linux I/O component])
+	  AC_DEFINE(HWLOC_HAVE_LINUXIO, 1, [Define to 1 for I/O discovery in the Linux component])
 	  hwloc_linuxio_happy=yes
 	  if test x$enable_pci != xno; then
 	    AC_DEFINE(HWLOC_HAVE_LINUXPCI, 1, [Define to 1 if enabling Linux-specific PCI discovery in the Linux I/O component])

doc/hwloc.doxy

@@ -1105,7 +1105,7 @@ following environment variables.
   This directory may have been saved previously from another machine
   with <tt>hwloc-gather-topology</tt>.
   <br/>
-  One should likely also set <tt>HWLOC_COMPONENTS=linux,linuxio,stop</tt>
+  One should likely also set <tt>HWLOC_COMPONENTS=linux,stop</tt>
   so that non-Linux backends are disabled
   (the <tt>-i</tt> option of command-line tools takes care of both).
   <br/>
@@ -2594,7 +2594,14 @@ environment variable (see \ref envvar).
 
 <dl>
 
-<dt>aix, darwin, freebsd, hpux, linux, netbsd, solaris, windows</dt>
+<dt>linux</dt>
+<dd>
+ The official component for discovering CPU, memory and I/O devices on Linux.
+ It discovers PCI devices without the help of external libraries such as libpciaccess,
+ but requires the pci component for adding vendor/device names to PCI objects.
+ It also discovers many kinds of Linux-specific OS devices.
+</dd>
+<dt>aix, darwin, freebsd, hpux, netbsd, solaris, windows</dt>
 <dd>
  Each officially supported operating system has its own native component,
  which is statically built when supported, and which is used by default.
@@ -2625,13 +2632,6 @@ environment variable (see \ref envvar).
  and device names.
  <b>It may be built as a plugin</b>.
 </dd>
-<dt>linuxio (former linuxpci)</dt>
-<dd>
- This component can probe I/O devices on Linux.
- It discovers PCI devices without the help of external libraries such as libpciaccess.
- Its priority is lower than the pci component because it misses device names.
- It also discovers many kinds of Linux-specific OS devices.
-</dd>
 <dt>opencl</dt>
 <dd>
  The OpenCL component creates co-processor OS device objects such as

hwloc/components.c

@@ -482,12 +482,13 @@ hwloc_disc_component_blacklist_one(struct hwloc_topology *topology,
   unsigned phases;
   unsigned i;
 
-  if (!strcmp(name, "linuxpci")) {
-    /* replace linuxpci with linuxio for backward compatibility with pre-v2.0 */
+  if (!strcmp(name, "linuxpci") || !strcmp(name, "linuxio")) {
+    /* replace linuxpci and linuxio with linux (with IO phases)
+     * for backward compatibility with pre-v2.0 and v2.0 respectively */
     if (hwloc_components_verbose)
-      fprintf(stderr, "Replacing deprecated component `%s' with `linuxio' in blacklisting\n", name);
-    comp = hwloc_disc_component_find("linuxio", NULL);
-    phases = ~0U;
+      fprintf(stderr, "Replacing deprecated component `%s' with `linux' IO phases in blacklisting\n", name);
+    comp = hwloc_disc_component_find("linux", NULL);
+    phases = HWLOC_DISC_PHASE_PCI | HWLOC_DISC_PHASE_IO | HWLOC_DISC_PHASE_MISC | HWLOC_DISC_PHASE_ANNOTATE;
 
   } else {
     /* normal lookup */
@@ -691,10 +692,10 @@ hwloc_disc_components_enable_others(struct hwloc_topology *topology)
 	curenv[s] = '\0';
 
 	name = curenv;
-	if (!strcmp(name, "linuxpci")) {
+	if (!strcmp(name, "linuxpci") || !strcmp(name, "linuxio")) {
 	  if (hwloc_components_verbose)
-	    fprintf(stderr, "Replacing deprecated component `%s' with `linuxio' in envvar forcing\n", name);
-	  name = "linuxio";
+	    fprintf(stderr, "Replacing deprecated component `%s' with `linux' in envvar forcing\n", name);
+	  name = "linux";
 	}
 
 	comp = hwloc_disc_component_find(name, NULL /* we enable the entire component, phases must be blacklisted separately */);