Cleanup the pnet/sshot code for picky compilers

rhc54 · rhc54 · commit 1318c07fc22a · 2022-07-18T10:52:46.000-06:00
Signed-off-by: Ralph Castain &lt;rhc@pmix.org&gt;
diff --git a/src/mca/common/sse/Makefile.am b/src/mca/common/sse/Makefile.am
@@ -13,6 +13,8 @@
 AM_CPPFLAGS = $(LTDLINCL) -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/include -I$(top_builddir)/include/pmix $(common_sse_CPPFLAGS)
 AM_LFLAGS = -Ppmix_util_sse_yy
 LEX_OUTPUT_ROOT = lex.pmix_util_sse_yy
+# we do NOT want picky compilers down here due to use of flex
+CFLAGS = $(PMIX_CFLAGS_BEFORE_PICKY)
 
 headers = \
 	sse.h \
diff --git a/src/mca/common/sse/sse.c b/src/mca/common/sse/sse.c
@@ -111,6 +111,7 @@ static void curl_perform(int sd, short args, void *cbdata)
     long response_code;
     const char *effective_url = NULL;
     char *content_type;
+    PMIX_HIDE_UNUSED_PARAMS(sd, args);
 
     while (1) {
         CURLcode res = curl_easy_perform(pcl->curl);
@@ -175,6 +176,7 @@ static void ondataprocessing(char *ptr, size_t size, size_t nmemb, void *cbdata)
 /* provide a hook for the curl reply if it is just to be ignored */
 static size_t http_ignore_data(char *ptr, size_t size, size_t nmemb, void *userdata)
 {
+    PMIX_HIDE_UNUSED_PARAMS(ptr, userdata);
     return size * nmemb;
 }
 
@@ -185,6 +187,7 @@ void pmix_common_on_sse_event(char **inheaders, const char *data, const char *re
     pmix_sse_curl_handle_t *reply;
     char *result = NULL;
     int n;
+    PMIX_HIDE_UNUSED_PARAMS(inheaders);
 
     /* pass to the user for processing */
     if (NULL != pcl->ondata) {
diff --git a/src/mca/pnet/sshot/pnet_fabric.c b/src/mca/pnet/sshot/pnet_fabric.c
@@ -305,6 +305,7 @@ pmix_status_t pmix_pnet_sshot_register_fabric(pmix_fabric_t *fabric, const pmix_
 static void regcbfunc(long response_code, const char *effective_url, void *cbdata)
 {
     pmix_sse_request_t *req = (pmix_sse_request_t *) cbdata;
+    PMIX_HIDE_UNUSED_PARAMS(effective_url);
 
     PMIX_ACQUIRE_OBJECT(req); // ensure the object has been updated
 
@@ -320,6 +321,7 @@ static void regcbfunc(long response_code, const char *effective_url, void *cbdat
 static void ondata(const char *stream, char **result, void *userdata)
 {
     pmix_cb_t *cb = (pmix_cb_t *) userdata;
+    PMIX_HIDE_UNUSED_PARAMS(result);
 
     PMIX_ACQUIRE_OBJECT(cb);
 
@@ -350,6 +352,7 @@ static pmix_status_t ask_fabric_controller(pmix_fabric_t *fabric, const pmix_inf
     pmix_sse_request_t *req;
     pmix_cb_t *cb;
     pmix_status_t rc;
+    PMIX_HIDE_UNUSED_PARAMS(directives, ndirs);
 
     /* initialize the sse support - it is protected,
      * so it doesn't matter if it was already
diff --git a/src/mca/pnet/sshot/pnet_sshot.c b/src/mca/pnet/sshot/pnet_sshot.c
@@ -44,9 +44,11 @@
 
 static pmix_status_t sshot_init(void);
 static void sshot_finalize(void);
-static pmix_status_t allocate(pmix_namespace_t *nptr, pmix_info_t info[], size_t ninfo,
+static pmix_status_t allocate(pmix_namespace_t *nptr,
+                              pmix_info_t info[], size_t ninfo,
                               pmix_list_t *ilist);
-static pmix_status_t setup_local_network(pmix_namespace_t *nptr, pmix_info_t info[], size_t ninfo);
+static pmix_status_t setup_local_network(pmix_nspace_env_cache_t *nptr,
+                                         pmix_info_t info[], size_t ninfo);
 pmix_pnet_module_t pmix_sshot_module = {
     .name = "sshot",
     .init = sshot_init,
@@ -165,7 +167,8 @@ static void sshot_finalize(void)
  * (c) the final "blob" that is returned to the caller shall be compressed
  *     prior to adding it to the input "ilist"
  */
-static pmix_status_t allocate(pmix_namespace_t *nptr, pmix_info_t info[], size_t ninfo,
+static pmix_status_t allocate(pmix_namespace_t *nptr,
+                              pmix_info_t info[], size_t ninfo,
                               pmix_list_t *ilist)
 {
     int n, m;
@@ -408,7 +411,8 @@ static pmix_status_t allocate(pmix_namespace_t *nptr, pmix_info_t info[], size_t
  * from PMIx_server_setup_application. In this case, we search for a blob
  * that our "allocate" function may have included in that info.
  */
-static pmix_status_t setup_local_network(pmix_namespace_t *nptr, pmix_info_t info[], size_t ninfo)
+static pmix_status_t setup_local_network(pmix_nspace_env_cache_t *nptr,
+                                         pmix_info_t info[], size_t ninfo)
 {
     size_t n, ndevs, m, d, ndims = 3;
     pmix_buffer_t bkt;
@@ -442,7 +446,7 @@ static pmix_status_t setup_local_network(pmix_namespace_t *nptr, pmix_info_t inf
                         "pnet:sshot:setup_local_network with %lu info", (unsigned long) ninfo);
 
     /* setup the namespace for the job */
-    PMIX_LOAD_NSPACE(proc.nspace, nptr->nspace);
+    PMIX_LOAD_NSPACE(proc.nspace, nptr->ns->nspace);
     /* prep the unpack buffer */
     PMIX_CONSTRUCT(&bkt, pmix_buffer_t);
 
@@ -692,6 +696,8 @@ static pmix_status_t setup_local_network(pmix_namespace_t *nptr, pmix_info_t inf
 
 static void compute_coord(pmix_coord_t *coord, char *xname, pmix_coord_view_t view)
 {
+    PMIX_HIDE_UNUSED_PARAMS(xname);
+
     /* assume three dimensions */
     coord->view = view;
     coord->coord = (uint32_t *) malloc(3 * sizeof(uint32_t));
diff --git a/src/mca/pnet/sshot/pnet_sshot_component.c b/src/mca/pnet/sshot/pnet_sshot_component.c
@@ -30,6 +30,7 @@
 #include "src/include/pmix_config.h"
 #include "pmix_common.h"
 
+#include "src/hwloc/pmix_hwloc.h"
 #include "pnet_sshot.h"
 #include "src/mca/pnet/pnet.h"
 #include "src/util/pmix_argv.h"
@@ -73,7 +74,7 @@ static pmix_status_t component_register(void)
 
     (void) pmix_mca_base_component_var_register(
         component, "config_file", "Path of file containing Slingshot fabric configuration",
-        PMIX_MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
+        PMIX_MCA_BASE_VAR_TYPE_STRING,
         &pmix_mca_pnet_sshot_component.configfile);
 
     (void) pmix_mca_base_component_var_register(component, "num_nodes",
@@ -82,7 +83,7 @@ static pmix_status_t component_register(void)
                                                 &pmix_mca_pnet_sshot_component.numnodes);
     (void) pmix_mca_base_component_var_register(
         component, "devs_per_node", "Number of devices/node to simulate (0 = no simulation)",
-        PMIX_MCA_BASE_VAR_TYPE_INT, NULL, 0, 0, PMIX_INFO_LVL_2, PMIX_MCA_BASE_VAR_SCOPE_READONLY,
+        PMIX_MCA_BASE_VAR_TYPE_INT,
         &pmix_mca_pnet_sshot_component.numdevs);
 
     (void) pmix_mca_base_component_var_register(component, "ppn", "PPN to simulate",
@@ -97,12 +98,12 @@ static pmix_status_t component_open(void)
     pmix_status_t rc;
 
     // unsure what this will be registered under, so try multiple codes
-    rc = pmix_ploc.check_vendor(&pmix_globals.topology, 0x17db, 0x208);  // Cray
+    rc = pmix_hwloc_check_vendor(&pmix_globals.topology, 0x17db, 0x208);  // Cray
     if (PMIX_SUCCESS != rc) {
-        rc = pmix_ploc.check_vendor(&pmix_globals.topology, 0x18c8, 0x208);  // Cray
+        rc = pmix_hwloc_check_vendor(&pmix_globals.topology, 0x18c8, 0x208);  // Cray
     }
     if (PMIX_SUCCESS != rc) {
-        rc = pmix_ploc.check_vendor(&pmix_globals.topology, 0x1590, 0x208);  // HPE
+        rc = pmix_hwloc_check_vendor(&pmix_globals.topology, 0x1590, 0x208);  // HPE
     }
 
     return rc;
diff --git a/test/sshot/Makefile.am b/test/sshot/Makefile.am
@@ -1,6 +1,6 @@
 #
 # Copyright (c) 2020      Intel, Inc.  All rights reserved.
-# Copyright (c) 2021      Nanook Consulting.  All rights reserved.
+# Copyright (c) 2021-2022 Nanook Consulting.  All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
@@ -10,19 +10,20 @@
 
 AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_builddir)/src/include -I$(top_builddir)/include -I$(top_builddir)/include/pmix $(pmix_check_jansson_CPPFLAGS)
 # we do NOT want picky compilers down here
+CFLAGS = $(PMIX_CFLAGS_BEFORE_PICKY)
 
 if HAVE_JANSSON
 noinst_PROGRAMS = generate server daemon testcoord
 
 generate_SOURCES = \
         generate.c
 generate_LDFLAGS = $(pmix_check_jansson_LDFLAGS)
-generate_LDADD = $(pmix_check_jansson_LIBS)
+generate_LDADD = -ljansson
 
 server_SOURCES = \
         server.c
 server_LDFLAGS = $(pmix_check_jansson_LDFLAGS)
-server_LDADD = $(pmix_check_jansson_LIBS)
+server_LDADD = -ljansson
 
 daemon_SOURCES = \
         daemon.c
