Merge pull request #8492 from rhc54/topic/dss

Remove stale OPAL dss and opal_tree code

Author: rhc54

.gitignore

@@ -640,15 +640,6 @@ test/datatype/position_noncontig
 test/datatype/unpack_ooo
 test/datatype/unpack_hetero
 
-test/dss/dss_buffer
-test/dss/dss_copy
-test/dss/dss_size
-test/dss/dss_cmp
-test/dss/dss_release
-test/dss/dss_payload
-test/dss/dss_set_get
-test/dss/dss_print
-
 test/event/signal-test
 test/event/event-test
 test/event/time-test

3rd-party/prrte

@@ -1489,7 +1489,6 @@ AC_CONFIG_FILES([
     test/event/Makefile
     test/asm/Makefile
     test/datatype/Makefile
-    test/dss/Makefile
     test/class/Makefile
     test/mpool/Makefile
     test/support/Makefile

configure.ac

@@ -91,10 +91,10 @@ SEARCH_HEADER[6]="opal/class/opal_list.h opal_list_t opal_list_item_t opal_list_
 SEARCH_HEADER[7]="opal/class/opal_object.h opal_object_t opal_class_t opal_construct_t opal_destruct_t OPAL_OBJ_STATIC_INIT OBJ_CLASS OBJ_CLASS_INSTANCE OBJ_CLASS_DECLARATION OBJ_NEW OBJ_RETAIN OBJ_RELEASE OBJ_CONSTRUCT OBJ_DESTRUCT opal_class_initialize opal_class_finalize opal_obj_run_constructors opal_obj_run_destructors opal_obj_new opal_obj_update"
 SEARCH_HEADER[8]="opal/class/opal_pointer_array.h opal_pointer_array_t opal_pointer_array_init opal_pointer_array_add opal_pointer_array_set_item opal_pointer_array_get_item opal_pointer_array_get_size opal_pointer_array_set_size opal_pointer_array_test_and_set_item opal_pointer_array_remove_all"
 SEARCH_HEADER[9]="opal/class/opal_value_array.h opal_value_array_t opal_value_array_init opal_value_array_reserve opal_value_array_get_size opal_value_array_set_size OPAL_VALUE_ARRAY_GET_ITEM opal_value_array_get_item OPAL_VALUE_ARRAY_SET_ITEM opal_value_array_set_item opal_value_array_append_item opal_value_array_remove_item OPAL_VALUE_ARRAY_GET_BASE"
-SEARCH_HEADER[10]="opal/constants.h OPAL_SUCCESS OPAL_ERROR OPAL_ERR_ OPAL_EXISTS"
-SEARCH_HEADER[11]="opal/dss/dss.h opal_dss_open opal_dss_close opal_dss_t opal_dss"
-SEARCH_HEADER[12]="opal/dss/dss_internal.h OPAL_DSS_DEFAULT_INITIAL_SIZE OPAL_DSS_DEFAULT_THRESHOLD_SIZE DSS_TYPE_SIZE_T DSS_TYPE_BOOL DSS_TYPE_INT DSS_TYPE_UINT DSS_TYPE_PID_T UNPACK_SIZE_MISMATCH opal_dss_type_info_t opal_dss_initialized opal_dss_debug opal_dss_verbose opal_dss_initial_size opal_dss_threshold_size opal_dss_types opal_dss_num_reg_types opal_dss_set opal_dss_get opal_dss_pack opal_dss_unpack opal_dss_copy opal_dss_compare opal_dss_print opal_dss_dump opal_dss_size opal_dss_peek opal_dss_unload opal_dss_load opal_dss_copy_payload opal_dss_register opal_dss_release opal_dss_lookup_data_type opal_dss_dump_data_types opal_dss_pack_buffer opal_dss_unpack_buffer opal_dss_std_copy opal_dss_compare_ opal_dss_std_size opal_dss_size_ opal_dss_print_ opal_dss_std_release opal_dss_std_obj_release opal_dss_release_byte_object opal_dss_buffer_extend opal_dss_too_small opal_dss_find_type opal_dss_store_data_type opal_dss_get_data_type"
-SEARCH_HEADER[13]="opal/dss/dss_types.h OPAL_DATA_TYPE_T OPAL_DSS_ID_MAX OPAL_DSS_ID_INVALID OPAL_UNDEF OPAL_BYTE OPAL_BOOL OPAL_STRING OPAL_SIZE OPAL_PID OPAL_INT OPAL_UINT OPAL_BYTE_OBJECT OPAL_DATA_TYPE OPAL_NULL OPAL_DATA_VALUE OPAL_PSTAT OPAL_DSS_ID_DYNAMIC OPAL_VALUE1_GREATER OPAL_VALUE2_GREATER OPAL_EQUAL opal_dss_value_t OPAL_DATA_VALUE_EMPTY OPAL_PSTAT_MAX_STRING_LEN opal_pstats_t OPAL_DSS_STRUCTURED OPAL_DSS_UNSTRUCTURED OPAL_DSS_BUFFER_NON_DESC OPAL_DSS_BUFFER_FULLY_DESC OPAL_DSS_BUFFER_TYPE_HTON OPAL_DSS_BUFFER_TYPE_NTOH opal_buffer_t"
+SEARCH_HEADER[10]="opal/constants.h OPAL_EXISTS"
+SEARCH_HEADER[11]="OPAL_SUCCESS"
+SEARCH_HEADER[12]="OPAL_ERROR"
+SEARCH_HEADER[13]="OPAL_ERR_"
 SEARCH_HEADER[14]="opal/hash_string.h OPAL_HASH_STR"
 SEARCH_HEADER[15]="opal/mca/crs.h OPAL_CRS_ opal_crs"
 SEARCH_HEADER[16]="opal/opal_socket_errno.h opal_socket_errno"

contrib/check_unnecessary_headers.sh

@@ -23,6 +23,7 @@
  * Copyright (c) 2014-2020 Intel, Inc.  All rights reserved.
  * Copyright (c) 2015      Mellanox Technologies. All rights reserved.
  * Copyright (c) 2017      IBM Corporation. All rights reserved.
+ * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -36,7 +37,6 @@
 
 #include "ompi/constants.h"
 #include "opal/mca/hwloc/base/base.h"
-#include "opal/dss/dss.h"
 #include "opal/mca/pmix/pmix-internal.h"
 #include "opal/util/string_copy.h"
 
@@ -1549,7 +1549,7 @@ int ompi_comm_get_rprocs ( ompi_communicator_t *local_comm,
     ompi_proc_t **rprocs=NULL;
     int32_t size_len;
     int int_len=0, rlen;
-    opal_buffer_t *sbuf=NULL, *rbuf=NULL;
+    pmix_data_buffer_t *sbuf=NULL, *rbuf=NULL;
     void *sendbuf=NULL;
     char *recvbuf;
     ompi_proc_t **proc_list = NULL;
@@ -1559,7 +1559,7 @@ int ompi_comm_get_rprocs ( ompi_communicator_t *local_comm,
     local_size = ompi_comm_size (local_comm);
 
     if (local_rank == local_leader) {
-        sbuf = OBJ_NEW(opal_buffer_t);
+        PMIX_DATA_BUFFER_CREATE(sbuf);
         if (NULL == sbuf) {
             rc = OMPI_ERR_OUT_OF_RESOURCE;
             goto err_exit;
@@ -1579,7 +1579,9 @@ int ompi_comm_get_rprocs ( ompi_communicator_t *local_comm,
         if ( OMPI_SUCCESS != rc ) {
             goto err_exit;
         }
-        if (OPAL_SUCCESS != (rc = opal_dss.unload(sbuf, &sendbuf, &size_len))) {
+        PMIX_DATA_BUFFER_UNLOAD(sbuf, sendbuf, size_len);
+        if (NULL == sendbuf) {
+            rc = OMPI_ERR_UNPACK_FAILURE;
             goto err_exit;
         }
 
@@ -1662,21 +1664,19 @@ int ompi_comm_get_rprocs ( ompi_communicator_t *local_comm,
         goto err_exit;
     }
 
-    rbuf = OBJ_NEW(opal_buffer_t);
+    PMIX_DATA_BUFFER_CREATE(rbuf);
     if (NULL == rbuf) {
         rc = OMPI_ERR_OUT_OF_RESOURCE;
         goto err_exit;
     }
 
-    if (OMPI_SUCCESS != (rc = opal_dss.load(rbuf, recvbuf, rlen))) {
-        goto err_exit;
-    }
+    PMIX_DATA_BUFFER_LOAD(rbuf, recvbuf, rlen);
 
     /* decode the names into a proc-list -- will never add a new proc
        as the result of this operation, so no need to get the newprocs
        list or call PML add_procs(). */
     rc = ompi_proc_unpack(rbuf, rsize, &rprocs, NULL, NULL);
-    OBJ_RELEASE(rbuf);
+    PMIX_DATA_BUFFER_RELEASE(rbuf);
     if (OMPI_SUCCESS != rc) {
         goto err_exit;
     }
@@ -1713,10 +1713,10 @@ int ompi_comm_get_rprocs ( ompi_communicator_t *local_comm,
     }
     /* make sure the buffers have been released */
     if (NULL != sbuf) {
-        OBJ_RELEASE(sbuf);
+        PMIX_DATA_BUFFER_RELEASE(sbuf);
     }
     if (NULL != rbuf) {
-        OBJ_RELEASE(rbuf);
+        PMIX_DATA_BUFFER_RELEASE(rbuf);
     }
     if ( NULL != proc_list ) {
         free ( proc_list );

ompi/communicator/comm.c

@@ -23,6 +23,7 @@
  * Copyright (c) 2016      IBM Corporation.  All rights reserved.
  * Copyright (c) 2017      Mellanox Technologies. All rights reserved.
  * Copyright (c) 2018      Amazon.com, Inc. or its affiliates.  All Rights reserved.
+ * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -32,7 +33,6 @@
 
 #include "ompi_config.h"
 
-#include "opal/dss/dss.h"
 #include "opal/mca/pmix/base/base.h"
 #include "opal/util/printf.h"
 
@@ -953,28 +953,28 @@ static int ompi_comm_allreduce_pmix_reduce_complete (ompi_comm_request_t *reques
     int32_t size_count = context->count;
     pmix_info_t info;
     pmix_pdata_t pdat;
-    opal_buffer_t sbuf;
+    pmix_data_buffer_t sbuf;
     int rc;
     int bytes_written;
     char *key;
     const int output_id = 0;
     const int verbosity_level = 1;
 
-    OBJ_CONSTRUCT(&sbuf, opal_buffer_t);
+    PMIX_DATA_BUFFER_CONSTRUCT(&sbuf);
 
-    if (OPAL_SUCCESS != (rc = opal_dss.pack(&sbuf, context->tmpbuf, (int32_t)context->count, OPAL_INT))) {
-        OBJ_DESTRUCT(&sbuf);
-        opal_output_verbose (verbosity_level, output_id, "pack failed. rc  %d\n", rc);
-        return rc;
+    rc = PMIx_Data_pack(NULL, &sbuf, context->tmpbuf, (int32_t)context->count, PMIX_INT);
+    if (PMIX_SUCCESS != rc) {
+        PMIX_DATA_BUFFER_DESTRUCT(&sbuf);
+        opal_output_verbose (verbosity_level, output_id, "pack failed: %s\n", PMIx_Error_string(rc));
+        return opal_pmix_convert_status(rc);
     }
 
     PMIX_PDATA_CONSTRUCT(&pdat);
     PMIX_INFO_CONSTRUCT(&info);
     info.value.type = PMIX_BYTE_OBJECT;
 
-    opal_dss.unload(&sbuf, (void**)&info.value.data.bo.bytes, &rc);
-    info.value.data.bo.size = rc;
-    OBJ_DESTRUCT(&sbuf);
+    PMIX_DATA_BUFFER_UNLOAD(&sbuf, info.value.data.bo.bytes, info.value.data.bo.size);
+    PMIX_DATA_BUFFER_DESTRUCT(&sbuf);
 
     bytes_written = opal_asprintf(&key,
                              cid_context->send_first ? "%s:%s:send:%d"
@@ -1015,21 +1015,21 @@ static int ompi_comm_allreduce_pmix_reduce_complete (ompi_comm_request_t *reques
     rc = opal_pmix_base_exchange(&info, &pdat, 600);  // give them 10 minutes
     PMIX_INFO_DESTRUCT(&info);
     if (OPAL_SUCCESS != rc) {
-        OBJ_DESTRUCT(&pdat);
+        PMIX_PDATA_DESTRUCT(&pdat);
         return rc;
     }
     if (PMIX_BYTE_OBJECT != pdat.value.type) {
-        OBJ_DESTRUCT(&pdat);
+        PMIX_PDATA_DESTRUCT(&pdat);
         return OPAL_ERR_TYPE_MISMATCH;
     }
 
-    OBJ_CONSTRUCT(&sbuf, opal_buffer_t);
-    opal_dss.load(&sbuf, pdat.value.data.bo.bytes, pdat.value.data.bo.size);
+    PMIX_DATA_BUFFER_CONSTRUCT(&sbuf);
+    PMIX_DATA_BUFFER_LOAD(&sbuf, pdat.value.data.bo.bytes, pdat.value.data.bo.size);
 
-    rc = opal_dss.unpack (&sbuf, context->outbuf, &size_count, OPAL_INT);
-    OBJ_DESTRUCT(&sbuf);
-    if (OPAL_UNLIKELY(OPAL_SUCCESS != rc)) {
-        return rc;
+    rc = PMIx_Data_unpack(NULL, &sbuf, context->outbuf, &size_count, PMIX_INT);
+    PMIX_DATA_BUFFER_DESTRUCT(&sbuf);
+    if (OPAL_UNLIKELY(PMIX_SUCCESS != rc)) {
+        return opal_pmix_convert_status(rc);
     }
 
     ompi_op_reduce (context->op, context->tmpbuf, context->outbuf, size_count, MPI_INT);

ompi/communicator/comm_cid.c

@@ -5,15 +5,14 @@
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  *
+ * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
  *
  * $HEADER$
  */
 
-#include "opal/dss/dss.h"
-
 #include "ompi/runtime/params.h"
 #include "ompi/group/group.h"
 #include "ompi/communicator/communicator.h"

ompi/communicator/ft/comm_ft.c

@@ -3,6 +3,7 @@
  *                         of Tennessee Research Foundation.  All rights
  *                         reserved.
  *
+ * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -205,9 +206,9 @@ int ompi_comm_failure_detector_finalize(void) {
     /* wait until the observed process confirms he is not putting in our
      * memory (or everybody else is dead) */
     while( MPI_PROC_NULL != (observing = detector->hb_observing) ) {
+#if !FD_LOCAL_PROCS
         ompi_proc_t* proc = ompi_comm_peer_lookup(detector->comm, observing);
         assert( NULL != proc );
-#if !FD_LOCAL_PROCS
         if( OPAL_PROC_ON_LOCAL_NODE(proc->super.proc_flags) ) {
             break;
         }

ompi/communicator/ft/comm_ft_detector.c

@@ -20,6 +20,7 @@
  * Copyright (c) 2014-2020 Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2018      Amazon.com, Inc. or its affiliates.  All Rights reserved.
+ * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -44,7 +45,6 @@
 #include "opal/util/proc.h"
 #include "opal/util/show_help.h"
 #include "opal/util/printf.h"
-#include "opal/dss/dss.h"
 #include "opal/mca/hwloc/base/base.h"
 #include "opal/mca/pmix/base/base.h"
 
@@ -421,7 +421,7 @@ int ompi_dpm_connect_accept(ompi_communicator_t *comm, int root,
                         /* get their locality string */
                         val = NULL;
                         OPAL_MODEX_RECV_VALUE_IMMEDIATE(rc, PMIX_LOCALITY_STRING,
-                                                       &proc->super.proc_name, &val, OPAL_STRING);
+                                                       &proc->super.proc_name, &val, PMIX_STRING);
                         if (OPAL_SUCCESS == rc && NULL != ompi_process_info.locality) {
                             u16 = opal_hwloc_compute_relative_locality(ompi_process_info.locality, val);
                             free(val);

ompi/dpm/dpm.c

@@ -16,6 +16,7 @@
  * Copyright (c) 2015      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
  * Copyright (c) 2015-2019 Intel, Inc.  All rights reserved.
+ * Copyright (c) 2021      Nanook Consulting.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -423,20 +424,31 @@ typedef struct ompi_errhandler_event_s {
     int status;
     opal_process_name_t source;
     int nvalue;
-    opal_value_t value[];
+    pmix_info_t info[];
 } ompi_errhandler_event_t;
 
 static void *ompi_errhandler_event_cb(int fd, int flags, void *context) {
     ompi_errhandler_event_t *event = (ompi_errhandler_event_t*) context;
     int status = event->status;
     opal_process_name_t source = event->source;
+    opal_process_name_t prc;
+    int rc;
 #if OPAL_ENABLE_FT_MPI
     if( PMIX_ERR_PROC_ABORTED == status ) {
         int i;
         for(i = 0; i < event->nvalue; i++) {
-            if(OPAL_NAME != event->value[i].type) continue;
-            ompi_proc_t *proc = (ompi_proc_t*)ompi_proc_for_name(event->value[i].data.name);
-            if( NULL == proc ) continue; /* we are not 'MPI connected' with this proc. */
+            if (PMIX_PROC != event->info[i].value.type) {
+                continue;
+            }
+            OPAL_PMIX_CONVERT_PROCT(rc, &prc, event->info[i].value.data.proc);
+            if (OPAL_SUCCESS != rc) {
+                OPAL_ERROR_LOG(rc);
+                break;
+            }
+            ompi_proc_t *proc = (ompi_proc_t*)ompi_proc_for_name(prc);
+            if( NULL == proc ) {
+                continue; /* we are not 'MPI connected' with this proc. */
+            }
             assert( !ompi_proc_is_sentinel(proc) );
             ompi_errhandler_proc_failed_internal(proc, status, false);
         }
@@ -490,7 +502,7 @@ void ompi_errhandler_callback(size_t refid, pmix_status_t status,
     /* an error has been found, report to the MPI layer and let it take
      * further action. */
     /* transition this from the RTE thread to the MPI progress engine */
-    ompi_errhandler_event_t *event = malloc(sizeof(*event)+ninfo*sizeof(opal_value_t));
+    ompi_errhandler_event_t *event = malloc(sizeof(*event)+ninfo*sizeof(pmix_info_t));
     if(NULL == event) {
         OMPI_ERROR_LOG(OMPI_ERR_OUT_OF_RESOURCE);
         goto error;
@@ -503,8 +515,8 @@ void ompi_errhandler_callback(size_t refid, pmix_status_t status,
         goto error;
     }
     event->nvalue = ninfo;
-    for(i = 0; i < ninfo; i++) {
-        opal_pmix_value_unload(&event->value[i], &info[i].value);
+    for (i = 0; i < ninfo; i++) {
+        PMIX_INFO_XFER(&event->info[i], &info[i]);
     }
     opal_event_set(opal_sync_event_base, &event->super, -1, OPAL_EV_READ,
                    ompi_errhandler_event_cb, event);