Merge pull request #1258 from eisenhauer/SstNetworkTool

SST network tool

source/adios2/toolkit/sst/CMakeLists.txt

@@ -65,3 +65,5 @@ install(TARGETS sst EXPORT adios2Exports
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
+
+add_subdirectory(util)

source/adios2/toolkit/sst/cp/cp_common.c

@@ -1201,3 +1201,10 @@ static void CP_sendToPeer(SstStream s, CP_PeerCohort Cohort, int Rank,
                    Rank);
     }
 }
+
+CPNetworkInfoFunc globalNetinfoCallback = NULL;
+
+extern void SSTSetNetworkCallback(CPNetworkInfoFunc callback)
+{
+    globalNetinfoCallback = callback;
+}

source/adios2/toolkit/sst/cp/cp_internal.h

@@ -412,3 +412,8 @@ extern void CP_verbose(SstStream Stream, char *Format, ...);
 extern void CP_error(SstStream Stream, char *Format, ...);
 extern struct _CP_Services Svcs;
 extern void CP_dumpParams(SstStream Stream, struct _SstParams *Params);
+
+typedef void (*CPNetworkInfoFunc)(int dataID, const char *net_string,
+                                  const char *data_string);
+extern CPNetworkInfoFunc globalNetinfoCallback;
+extern void SSTSetNetworkCallback(CPNetworkInfoFunc callback);

source/adios2/toolkit/sst/cp/cp_reader.c

@@ -266,6 +266,11 @@ SstStream SstReaderOpen(const char *Name, SstParams Params, MPI_Comm comm)
         //               WriterFileID, CMContactString);
         free(Writer0Contact);
 
+        if (globalNetinfoCallback)
+        {
+            (globalNetinfoCallback)(1, CP_GetContactString(Stream), NULL);
+            (globalNetinfoCallback)(2, CMContactString, NULL);
+        }
         attr_list WriterRank0Contact = attr_list_from_string(CMContactString);
         CMConnection conn = CMget_conn(Stream->CPInfo->cm, WriterRank0Contact);
         free_attr_list(WriterRank0Contact);

source/adios2/toolkit/sst/cp/cp_writer.c

@@ -833,6 +833,10 @@ SstStream SstWriterOpen(const char *Name, SstParams Params, MPI_Comm comm)
         CP_dumpParams(Stream, Stream->ConfigParams);
     }
 
+    if (globalNetinfoCallback)
+    {
+        (globalNetinfoCallback)(0, CP_GetContactString(Stream), NULL);
+    }
     while (Stream->RendezvousReaderCount > 0)
     {
         WS_ReaderInfo reader;

source/adios2/toolkit/sst/sstmpidummy.h

@@ -73,6 +73,8 @@ typedef int MPI_Op;
 #define MPI_REPLACE 12
 #define MPI_NO_OP 13
 
+#define MPI_Init(argc, argv)
+
 static int MPI_Comm_rank(MPI_Comm comm, int *rank)
 {
     *rank = 0;

source/adios2/toolkit/sst/util/CMakeLists.txt

@@ -0,0 +1,23 @@
+#------------------------------------------------------------------------------#
+# Distributed under the OSI-approved Apache License, Version 2.0.  See
+# accompanying file Copyright.txt for details.
+#------------------------------------------------------------------------------#
+
+# stt_conn_tool
+add_executable(sst_conn_tool ./sst_conn_tool.c)
+target_link_libraries(sst_conn_tool adios2)
+if(ADIOS2_HAVE_MPI)
+  target_link_libraries(sst_conn_tool MPI::MPI_C)
+endif()
+
+if(WIN32)
+  target_link_libraries(sst_conn_tool getopt)
+endif()
+
+target_link_libraries(sst_conn_tool sst adios2::thirdparty::EVPath)
+
+target_include_directories(sst_conn_tool PRIVATE .. ../cp )
+
+install(TARGETS sst_conn_tool EXPORT adios2
+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+)

source/adios2/toolkit/sst/util/sst_conn_tool.c

@@ -0,0 +1,290 @@
+/*
+  SST connection tool.
+
+
+Run without parameters:  Listen mode
+
+Say what listen parameters are in use (get from SST, directly from listen
+output). Write connection file.  Wait for file open.
+
+
+Run with -c parameter
+Look for connection info. say what connection parameters are read and being
+tried.  Say if connection succeeds, fails or times out.
+
+
+SST info mode:
+What interfaces are available.   What IP addresses are associated with each.  if
+a hostname is identified using gethostname and getdomainname and it translates
+to any interfaces.
+*/
+
+#include <arpa/inet.h>
+#include <assert.h>
+#include <atl.h>
+#include <ctype.h>
+#include <float.h>
+#include <getopt.h>
+#include <limits.h>
+#include <math.h>
+#include <netinet/in.h>
+#include <stdio.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <unistd.h>
+#ifdef HAVE_SYS_SOCKIO_H
+#include <sys/sockio.h>
+#endif
+
+#include "adios2/ADIOSConfig.h"
+#include <atl.h>
+#include <evpath.h>
+#ifdef ADIOS2_HAVE_MPI
+#include <mpi.h>
+#else
+#include "sstmpidummy.h"
+#endif
+#include <pthread.h>
+
+#include "sst.h"
+
+#include "cp_internal.h"
+
+static atom_t TRANSPORT = -1;
+static atom_t IP_PORT = -1;
+static atom_t IP_HOSTNAME = -1;
+static atom_t IP_ADDR = -1;
+static atom_t ENET_PORT = -1;
+static atom_t ENET_HOSTNAME = -1;
+static atom_t ENET_ADDR = -1;
+
+struct option options[] = {
+    {"help", no_argument, NULL, 'h'},   {"verbose", no_argument, NULL, 'v'},
+    {"listen", no_argument, NULL, 'l'}, {"connect", no_argument, NULL, 'c'},
+    {"info", no_argument, NULL, 'i'},   {NULL, 0, NULL, 0}};
+
+static const char *optstring = "-hvci";
+
+void displayHelp()
+{
+    fprintf(stderr, "Usage:  sst_conn_tool { -l | -c | -i }\n");
+    fprintf(stderr, "  -l,-listen  Display connection parameters and wait for "
+                    "an SST connection\n");
+    fprintf(stderr, "  -c,-connect Attempt a connection to an already-running "
+                    "instance of sst_conn_tool\n");
+    fprintf(stderr,
+            "  -i,-info    Display networking information on this host\n");
+    fprintf(stderr, "  -h,-help    Display this message\n\n");
+}
+
+static void do_listen();
+static void do_connect();
+
+static void init_atoms()
+{
+    TRANSPORT = attr_atom_from_string("CM_TRANSPORT");
+    IP_HOSTNAME = attr_atom_from_string("IP_HOST");
+    IP_PORT = attr_atom_from_string("IP_PORT");
+    IP_ADDR = attr_atom_from_string("IP_ADDR");
+    ENET_HOSTNAME = attr_atom_from_string("CM_ENET_HOST");
+    ENET_PORT = attr_atom_from_string("CM_ENET_PORT");
+    ENET_ADDR = attr_atom_from_string("CM_ENET_ADDR");
+}
+
+int main(int argc, char **argv)
+{
+    int c;
+    int verbose = 0, connect = 0, info = 0, listen = 0;
+    while ((c = getopt_long(argc, argv, optstring, options, NULL)) != -1)
+    {
+        switch (c)
+        {
+        case 'h':
+            displayHelp();
+            return 1;
+        case 'v':
+            verbose = 1;
+            break;
+        case 'c':
+            connect = 1;
+            break;
+        case 'i':
+            info = 1;
+            break;
+        default:
+            displayHelp();
+            return 1;
+        }
+    }
+    if (verbose + connect + info > 1)
+    {
+        fprintf(stderr,
+                "Only one of -listen, -connect or -info can be specified\n\n");
+        displayHelp();
+        return 1;
+    }
+    MPI_Init(&argc, &argv);
+    init_atoms();
+    if (connect)
+    {
+        do_connect();
+    }
+    else if (info)
+    {
+    }
+    else
+    {
+        do_listen();
+    }
+}
+
+static void DecodeAttrList(const char *attrs, char **in_transport, char **in_ip,
+                           char **in_hostname, int *in_port)
+{
+    attr_list listen_info = attr_list_from_string(attrs);
+    char *transport = NULL;
+    get_string_attr(listen_info, TRANSPORT, &transport);
+    if (transport == NULL)
+    {
+        /* must be sockets */
+        struct in_addr addr;
+        int ip = -1, port = -1;
+        get_int_attr(listen_info, IP_PORT, &port);
+        get_int_attr(listen_info, IP_ADDR, &ip);
+        addr.s_addr = htonl(ip);
+
+        if (in_ip)
+            *in_ip = strdup(inet_ntoa(addr));
+        if (in_port)
+            *in_port = port;
+    }
+    else if (strcmp(transport, "enet") == 0)
+    {
+        /* reliable UDP transport "enet" */
+        struct in_addr addr;
+        int ip = -1, port = -1;
+        get_int_attr(listen_info, ENET_PORT, &port);
+        get_int_attr(listen_info, ENET_ADDR, &ip);
+        addr.s_addr = htonl(ip);
+        if (in_ip)
+            *in_ip = strdup(inet_ntoa(addr));
+        if (in_port)
+            *in_port = port;
+    }
+    else
+    {
+        dump_attr_list(listen_info);
+    }
+    if (in_transport && transport)
+        *in_transport = strdup(transport);
+}
+
+static void ConnToolCallback(int dataID, const char *attrs, const char *data)
+{
+    char *IP = NULL, *transport = NULL, *hostname = NULL;
+    int port = -1;
+    DecodeAttrList(attrs, &transport, &IP, &hostname, &port);
+    if (dataID == 0)
+    {
+        /* writer-side, prior to connection, giving info on listener network
+         * parameters */
+        if (!transport)
+        {
+            printf("\n\tSst writer is listening for TCP/IP connection at IP "
+                   "%s, port %d\n\n",
+                   IP, port);
+        }
+        else if (strcmp(transport, "enet") == 0)
+        {
+            printf("\n\tSst writer is listening for UDP connection at IP %s, "
+                   "port %d\n\n",
+                   IP, port);
+        }
+        else
+        {
+            printf(
+                "\n\tWarning, unknown control network transport operating\n");
+        }
+        printf("\tSst connection tool waiting for connection...\n\n");
+    }
+    else if (dataID == 1)
+    {
+        /* reader-side, prior to connection, giving info on listener network
+         * parameters */
+        if (!transport)
+        {
+            printf("\n\tSst reader at IP %s, listen TCP/IP port %d\n\n", IP,
+                   port);
+        }
+        else if (strcmp(transport, "enet") == 0)
+        {
+            printf("\n\tSst reader at IP %s, listening UDP port %d\n\n", IP,
+                   port);
+        }
+        else
+        {
+            printf(
+                "\n\tWarning, unknown control network transport operating\n");
+        }
+    }
+    else if (dataID == 2)
+    {
+        if (!transport)
+        {
+            printf("\n\tAttempting TCP/IP connection to writer at IP %s, port "
+                   "%d\n\n",
+                   IP, port);
+        }
+        else if (strcmp(transport, "enet") == 0)
+        {
+            printf("\n\tAttempting UDP connection to writer at IP %s,a port "
+                   "%d\n\n",
+                   IP, port);
+        }
+        else
+        {
+            printf(
+                "\n\tWarning, unknown control network transport operating\n");
+        }
+    }
+}
+
+static void do_connect()
+{
+    struct _SstParams Params;
+    SstStream reader;
+    memset(&Params, 0, sizeof(Params));
+    SSTSetNetworkCallback(ConnToolCallback);
+    Params.RendezvousReaderCount = 1;
+    Params.ControlTransport = "enet";
+    reader = SstReaderOpen("SstConnToolTemp", &Params, MPI_COMM_WORLD);
+    if (reader)
+    {
+        printf("Connection success, all is well!\n");
+        SstReaderClose(reader);
+    }
+    else
+    {
+        printf("This connection did not succeed.  Determine if IP addresses in "
+               "use are appropriate, or if firewalls or other network-level "
+               "artifacts might be causing a problem.\n\n");
+    }
+}
+
+static void do_listen()
+{
+    struct _SstParams Params;
+    SstStream writer;
+    memset(&Params, 0, sizeof(Params));
+    SSTSetNetworkCallback(ConnToolCallback);
+    Params.RendezvousReaderCount = 1;
+    //    Params.ControlTransport = "enet";
+    writer = SstWriterOpen("SstConnToolTemp", &Params, MPI_COMM_WORLD);
+    printf("Connection success!\n");
+    SstWriterClose(writer);
+}