opal/mca/if: fix "struct sockaddr_in" and OS checks

jsquyres · jsquyres · commit f744b78b64ca · 2025-04-29T10:13:43.000-04:00
Found a few more places we needed to adjust for changing from
OPAL_CHECK_OS_FLAVORS to OAC_CHECK_OS_FLAVORS.

Also, in the opal/mca/if components, we have configure.m4 scripts that
explicitly check $opal_found_sockaddr.  This was a problem for a few
reasons:

1. We just deleted the setting of $opal_found_sockaddr from the
   previous OPAL_CHECK_OS_FLAVORS macro (*why* it was set in that
   macro isn't really clear -- "struct sockaddr" doesn't really have
   anything to do with checking OS flavors).
2. The old OPAL_CHECK_OS_FLAVORS macro actually checking for "struct
   sockaddr_in", not "struct sockaddr".  This led to a lot of
   confusion in this round of debugging.

Also, the additional network header checks and check for struct
sockaddr_in in OPAL_CHECK_OS_FLAVORS were redundant: they were already
being performed in OMPI's top-level configure.ac.  Deleting these
redundant tests -- and indeed, deleting all of OPAL_CHECK_OS_FLAVORS
-- is fine.  But we did need to set a global variable for the
opal/mca/if/*/configure.m4 scripts to check.

This commit therefore does the following:

* Adjusts the configure.m4 in the various opal/mca/if components that
  were previously looking at $opal_found_sockaddr.
* Each configure.m4 now looks for ac_cv_type_struct_sockaddr_in[6] as
  relevant.
* Also update them to use the OAC OS result variables.
* Update relevant comments to explain that we're using
  $ac_cv_type_... instead of calling AC_CHECK_TYPES again because that
  test is a bit cumbersome with all the required #includes.
* Slightly modify the test/results output emitted by these configure
  tests to make it clear that we're not calling AC_CHECK_TYPES.  Do
  this because the "(cached)" output that it previously emitted caused
  considerable confusion during this round of debugging (i.e., I
  assumed it was coming from regular Autoconf test caching, which is
  an entirely different mechanism).

Signed-off-by: Jeff Squyres &lt;jeff@squyres.com&gt;
diff --git a/opal/mca/if/bsdx_ipv4/configure.m4 b/opal/mca/if/bsdx_ipv4/configure.m4
@@ -4,6 +4,7 @@
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2025      Nanook Consulting  All rights reserved.
+# Copyright (c) 2025      Jeffrey M. Squyres.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -25,23 +26,24 @@ AC_DEFUN([MCA_opal_if_bsdx_ipv4_CONFIG], [
 
     AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
 
-    # If we found struct sockaddr and we're on any of the BSDs, we're
+    # If we previously found struct sockaddr_in (we don't repeat the
+    # AC CHECK_TYPES test here simply because it's cumbersome with all
+    # the required #includes) and we're on any of the BSDs, we're
     # happy.  I.e., this:
     #if defined(__NetBSD__) || defined(__FreeBSD__) || \
     #    defined(__OpenBSD__) || defined(__DragonFly__)
-    AC_MSG_CHECKING([struct sockaddr])
-    AS_IF([test "$opal_found_sockaddr" = "yes"],
-          [AC_MSG_RESULT([yes (cached)])
+    AC_MSG_CHECKING([struct sockaddr_in again])
+    AS_IF([test "$ac_cv_type_struct_sockaddr_in" = "yes"],
+          [AC_MSG_RESULT([yes (OPAL cached)])
            AC_MSG_CHECKING([NetBSD, FreeBSD, OpenBSD, or DragonFly])
-           AS_IF([test "$opal_found_netbsd" = "yes" || \
-                  test "$opal_found_freebsd" = "yes" || \
-                  test "$opal_found_openbsd" = "yes" || \
-                  test "$opal_found_dragonfly" = "yes"],
+           AS_IF([test "$oac_found_netbsd" = "yes" || \
+                  test "$oac_found_freebsd" = "yes" || \
+                  test "$oac_found_openbsd" = "yes" || \
+                  test "$oac_found_dragonfly" = "yes"],
                  [AC_MSG_RESULT([yes])
                   $1],
                  [AC_MSG_RESULT([no])
                   $2])],
-          [AC_MSG_RESULT([no (cached)])
+          [AC_MSG_RESULT([no (OPAL cached)])
            $2])
 ])
-
diff --git a/opal/mca/if/bsdx_ipv6/configure.m4 b/opal/mca/if/bsdx_ipv6/configure.m4
@@ -4,6 +4,7 @@
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2025      Nanook Consulting  All rights reserved.
+# Copyright (c) 2025      Jeffrey M. Squyres.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -25,24 +26,26 @@ AC_DEFUN([MCA_opal_if_bsdx_ipv6_CONFIG], [
 
     AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
 
-    # If we found struct sockaddr and we're on any of the BSDs, we're
+    # If we previously found struct sockaddr_in6 (we don't repeat the
+    # AC CHECK_TYPES test here simply because it's cumbersome with all
+    # the required #includes) and we're on any of the BSDs, we're
     # happy.  I.e., this:
     #if defined( __NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || \
     #             defined(__386BSD__) || defined(__bsdi__) || defined(__APPLE__)
-    AC_MSG_CHECKING([struct sockaddr])
-    AS_IF([test "$opal_found_sockaddr" = "yes"],
-          [AC_MSG_RESULT([yes (cached)])
+    AC_MSG_CHECKING([struct sockaddr_in6 again])
+    AS_IF([test "$ac_cv_type_struct_sockaddr_in6" = "yes"],
+          [AC_MSG_RESULT([yes (OPAL cached)])
            AC_MSG_CHECKING([some flavor of BSD])
-           AS_IF([test "$opal_found_netbsd" = "yes" || \
-                  test "$opal_found_freebsd" = "yes" || \
-                  test "$opal_found_openbsd" = "yes" || \
-                  test "$opal_found_386bsd" = "yes" || \
-                  test "$opal_found_bsdi" = "yes" ||
-                  test "$opal_found_apple" = "yes"],
+           AS_IF([test "$oac_found_netbsd" = "yes" || \
+                  test "$oac_found_freebsd" = "yes" || \
+                  test "$oac_found_openbsd" = "yes" || \
+                  test "$oac_found_386bsd" = "yes" || \
+                  test "$oac_found_bsdi" = "yes" ||
+                  test "$oac_found_apple" = "yes"],
                  [AC_MSG_RESULT([yes])
                   $1],
                  [AC_MSG_RESULT([no])
                   $2])],
-          [AC_MSG_RESULT([no (cached)])
+          [AC_MSG_RESULT([no (OPAL cached)])
            $2])
 ])dnl
diff --git a/opal/mca/if/linux_ipv6/configure.m4 b/opal/mca/if/linux_ipv6/configure.m4
@@ -4,6 +4,7 @@
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2025      Nanook Consulting  All rights reserved.
+# Copyright (c) 2025      Jeffrey M. Squyres.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -25,10 +26,11 @@ AC_DEFUN([MCA_opal_if_linux_ipv6_CONFIG], [
 
     AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
 
-    AC_MSG_CHECKING([if we are on Linux with TCP])
-    # If we have struct sockaddr and we're on Linux, then we're
-    # happy.
-    AS_IF([test "$opal_found_sockaddr" = "yes" && test "$opal_found_linux" = "yes"],
+    # If we previously found struct sockaddr_in6 (we don't repeat the
+    # AC CHECK_TYPES test here simply because it's cumbersome with all
+    # the required #includes) and we're on Linux, we're happy.
+    AC_MSG_CHECKING([for Linux with struct sockaddr_in6])
+    AS_IF([test "$ac_cv_type_struct_sockaddr_in6" = "yes" && test "$oac_found_linux" = "yes"],
           [AC_MSG_RESULT([yes])
            $1],
           [AC_MSG_RESULT([no])
diff --git a/opal/mca/if/posix_ipv4/configure.m4 b/opal/mca/if/posix_ipv4/configure.m4
@@ -4,6 +4,7 @@
 # Copyright (c) 2015      Research Organization for Information Science
 #                         and Technology (RIST). All rights reserved.
 # Copyright (c) 2025      Nanook Consulting  All rights reserved.
+# Copyright (c) 2025      Jeffrey M. Squyres.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -28,20 +29,22 @@ AC_DEFUN([MCA_opal_if_posix_ipv4_CONFIG], [
 
     AC_REQUIRE([OAC_CHECK_OS_FLAVORS])
 
-    # If we found struct sockaddr and we're NOT on most of the BSDs,
-    # we're happy.  I.e., if posix but not:
+    # If we previously found struct sockaddr_in (we don't repeat the
+    # AC CHECK_TYPES test here simply because it's cumbersome with all
+    # the required #includes) and we're NOT on most of the BSDs, we're
+    # happy.  I.e., this:
     #if defined(__NetBSD__) || defined(__FreeBSD__) || \
     #    defined(__OpenBSD__) || defined(__DragonFly__)
-    AC_MSG_CHECKING([struct sockaddr])
-    AS_IF([test "$opal_found_sockaddr" = "yes"],
-          [AC_MSG_RESULT([yes (cached)])
+    AC_MSG_CHECKING([struct sockaddr_in again])
+    AS_IF([test "$ac_cv_type_struct_sockaddr_in" = "yes"],
+          [AC_MSG_RESULT([yes (OPAL cached)])
            AC_MSG_CHECKING([not NetBSD, FreeBSD, OpenBSD, or DragonFly])
-           AS_IF([test "$opal_found_netbsd" = "no" && test "$opal_found_freebsd" = "no" && test "$opal_found_openbsd" = "no" && test "$opal_found_dragonfly" = "no"],
+           AS_IF([test "$oac_found_netbsd" = "no" && test "$oac_found_freebsd" = "no" && test "$oac_found_openbsd" = "no" && test "$oac_found_dragonfly" = "no"],
                  [AC_MSG_RESULT([yes])
                   opal_if_posix_ipv4_happy=yes],
                  [AC_MSG_RESULT([no])]
                 )],
-          [AC_MSG_RESULT([no (cached)])]
+          [AC_MSG_RESULT([no (OPAL cached)])]
          )
 
     AS_IF([test "$opal_if_posix_ipv4_happy" = "yes"],
