Fix the definition checks for tool_connected2 and log2 integration

Need to do it based on PMIx capabilities

Signed-off-by: Ralph Castain <[email protected]>

Author: rhc54

config/prte_setup_pmix.m4

@@ -183,6 +183,16 @@ AC_DEFUN([PRTE_CHECK_PMIX],[
     PRTE_FLAGS_APPEND_UNIQ(LDFLAGS, $PRTE_FINAL_LDFLAGS)
     PRTE_FLAGS_APPEND_UNIQ(LIBS, $PRTE_FINAL_LIBS)
 
+    AC_MSG_CHECKING([for support of version 2 server upcalls])
+    PRTE_CHECK_PMIX_CAP([UPCALLS2],
+                        [AC_MSG_RESULT([yes])
+                         prte_server2_upcalls=1],
+                        [AC_MSG_RESULT([no])
+                         prte_server2_upcalls=0])
+    AC_DEFINE_UNQUOTED([PRTE_PMIX_SERVER2_UPCALLS],
+                       [$prte_server2_upcalls],
+                       [Whether or not PMIx supports server2 upcalls])
+
     AC_MSG_CHECKING([for in-memory show-help content compatibility])
     PRTE_CHECK_PMIX_CAP([INMEMHELP],
                         [AC_MSG_RESULT([yes])],

src/prted/pmix/pmix_server.c

@@ -114,11 +114,11 @@ static pmix_server_module_t pmix_server = {
     .notify_event = pmix_server_notify_event,
     .query = pmix_server_query_fn,
     .tool_connected = pmix_tool_connected_fn,
-#ifdef pmix_server_tool_connected2_fn
+#if PRTE_PMIX_SERVER2_UPCALLS
     .tool_connected2 = pmix_tool_connected2_fn,
 #endif
     .log = pmix_server_log_fn,
-#ifdef pmix_server_log2_fn
+#if PRTE_PMIX_SERVER2_UPCALLS
     .log2 = pmix_server_log2_fn,
 #endif
     .job_control = pmix_server_job_ctrl_fn,

src/prted/pmix/pmix_server_gen.c

@@ -928,7 +928,8 @@ void pmix_tool_connected_fn(pmix_info_t *info, size_t ninfo,
     prte_event_active(&(cd->ev), PRTE_EV_WRITE, 1);
 }
 
-#ifdef pmix_server_tool_connected2_fn
+#if PRTE_PMIX_SERVER2_UPCALLS
+
 pmix_status_t pmix_tool_connected2_fn(pmix_info_t *info, size_t ninfo,
                                       pmix_tool_connection_cbfunc_t cbfunc,
                                       void *cbdata)
@@ -1058,7 +1059,7 @@ void pmix_server_log_fn(const pmix_proc_t *client, const pmix_info_t data[], siz
     PRTE_SERVER_PMIX_THREADSHIFT(PRTE_NAME_WILDCARD, NULL, rc, NULL, NULL, 0, lgcbfn, cbfunc, cbdata);
 }
 
-#ifdef pmix_server_log2_fn
+#if PRTE_PMIX_SERVER2_UPCALLS
 pmix_status_t pmix_server_log2_fn(const pmix_proc_t *client, const pmix_info_t data[], size_t ndata,
                                   const pmix_info_t directives[], size_t ndirs, pmix_op_cbfunc_t cbfunc,
                                   void *cbdata)

src/prted/pmix/pmix_server_internal.h

@@ -266,7 +266,7 @@ PRTE_EXPORT extern pmix_status_t pmix_server_query_fn(pmix_proc_t *proct, pmix_q
 PRTE_EXPORT extern void pmix_tool_connected_fn(pmix_info_t *info, size_t ninfo,
                                                pmix_tool_connection_cbfunc_t cbfunc, void *cbdata);
 
-#ifdef pmix_server_tool_connected2_fn
+#if PRTE_PMIX_SERVER2_UPCALLS
 PRTE_EXPORT extern pmix_status_t pmix_tool_connected2_fn(pmix_info_t *info, size_t ninfo,
                                                          pmix_tool_connection_cbfunc_t cbfunc, void *cbdata);
 #endif
@@ -275,7 +275,7 @@ PRTE_EXPORT extern void pmix_server_log_fn(const pmix_proc_t *client, const pmix
                                            size_t ndata, const pmix_info_t directives[],
                                            size_t ndirs, pmix_op_cbfunc_t cbfunc, void *cbdata);
 
-#ifdef pmix_server_log2_fn
+#if PRTE_PMIX_SERVER2_UPCALLS
 PRTE_EXPORT extern pmix_status_t pmix_server_log2_fn(const pmix_proc_t *client, const pmix_info_t data[],
                                                      size_t ndata, const pmix_info_t directives[],
                                                      size_t ndirs, pmix_op_cbfunc_t cbfunc, void *cbdata);