Merge pull request #6437 from bosilca/issues/6436/v3.1

Issues/6436/v3.1

Author: bwbarrett

opal/datatype/opal_convertor_raw.c

@@ -5,8 +5,8 @@
  *                         reserved.
  * Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
  * Copyright (c) 2013      Cisco Systems, Inc.  All rights reserved.
- * Copyright (c) 2017      Research Organization for Information Science
- *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2017-2019 Research Organization for Information Science
+ *                         and Technology (RIST).  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -102,7 +102,7 @@ opal_convertor_raw( opal_convertor_t* pConvertor,
                     /* now here we have a basic datatype */
                     OPAL_DATATYPE_SAFEGUARD_POINTER( source_base, blength, pConvertor->pBaseBuf,
                                                 pConvertor->pDesc, pConvertor->count );
-                    DO_DEBUG( opal_output( 0, "raw 1. iov[%d] = {base %p, length %lu}\n",
+                    DO_DEBUG( opal_output( 0, "raw 1. iov[%d] = {base %p, length %" PRIsize_t "}\n",
                                            index, (void*)source_base, (unsigned long)blength ); );
                     iov[index].iov_base = (IOVBASE_TYPE *) source_base;
                     iov[index].iov_len  = blength;
@@ -115,7 +115,7 @@ opal_convertor_raw( opal_convertor_t* pConvertor,
                 for( i = count_desc; (i > 0) && (index < *iov_count); i--, index++ ) {
                     OPAL_DATATYPE_SAFEGUARD_POINTER( source_base, blength, pConvertor->pBaseBuf,
                                                 pConvertor->pDesc, pConvertor->count );
-                    DO_DEBUG( opal_output( 0, "raw 2. iov[%d] = {base %p, length %lu}\n",
+                    DO_DEBUG( opal_output( 0, "raw 2. iov[%d] = {base %p, length %" PRIsize_t "}\n",
                                            index, (void*)source_base, (unsigned long)blength ); );
                     iov[index].iov_base = (IOVBASE_TYPE *) source_base;
                     iov[index].iov_len  = blength;
@@ -170,23 +170,30 @@ opal_convertor_raw( opal_convertor_t* pConvertor,
             ddt_endloop_desc_t* end_loop = (ddt_endloop_desc_t*)(pElem + pElem->loop.items);
 
             if( pElem->loop.common.flags & OPAL_DATATYPE_FLAG_CONTIGUOUS ) {
-                uint32_t i;
-                source_base += end_loop->first_elem_disp;
-                for( i = count_desc; (i > 0) && (index < *iov_count); i--, index++ ) {
+                ptrdiff_t offset = end_loop->first_elem_disp;
+                source_base += offset;
+                for(size_t i = MIN(count_desc, *iov_count - index); i > 0; i--, index++ ) {
                     OPAL_DATATYPE_SAFEGUARD_POINTER( source_base, end_loop->size, pConvertor->pBaseBuf,
                                                 pConvertor->pDesc, pConvertor->count );
                     iov[index].iov_base = (IOVBASE_TYPE *) source_base;
                     iov[index].iov_len  = end_loop->size;
                     source_base += pElem->loop.extent;
                     raw_data += end_loop->size;
                     count_desc--;
+                    DO_DEBUG( opal_output( 0, "raw contig loop generate iov[%d] = {base %p, length %" PRIsize_t "}"
+                                           "space %lu [pos_desc %d]\n",
+                                           index, iov[index].iov_base, iov[index].iov_len,
+                                           (unsigned long)raw_data, pos_desc ); );
                 }
-                source_base -= end_loop->first_elem_disp;
+                source_base -= offset;
                 if( 0 == count_desc ) {  /* completed */
                     pos_desc += pElem->loop.items + 1;
                     goto update_loop_description;
                 }
             }
+            if( index == *iov_count ) {  /* all iov have been filled, we need to bail out */
+                goto complete_loop;
+            }
             local_disp = (ptrdiff_t)source_base - local_disp;
             PUSH_STACK( pStack, pConvertor->stack_pos, pos_desc, OPAL_DATATYPE_LOOP, count_desc,
                         pStack->disp + local_disp);

test/datatype/Makefile.am

@@ -4,8 +4,8 @@
 #                         reserved.
 # Copyright (c) 2006-2015 Cisco Systems, Inc.  All rights reserved.
 # Copyright (c) 2009      Oak Ridge National Labs.  All rights reserved.
-# Copyright (c) 2014-2015 Research Organization for Information Science
-#                         and Technology (RIST). All rights reserved.
+# Copyright (c) 2014-2019 Research Organization for Information Science
+#                         and Technology (RIST).  All rights reserved.
 # Copyright (c) 2016      IBM Corporation.  All rights reserved.
 # $COPYRIGHT$
 #
@@ -15,7 +15,7 @@
 #
 
 if PROJECT_OMPI
-    MPI_TESTS = checksum position position_noncontig ddt_test ddt_raw unpack_ooo ddt_pack external32
+    MPI_TESTS = checksum position position_noncontig ddt_test ddt_raw ddt_raw2 unpack_ooo ddt_pack external32
     MPI_CHECKS = to_self
 endif
 TESTS = opal_datatype_test unpack_hetero $(MPI_TESTS)
@@ -40,6 +40,12 @@ ddt_raw_LDADD = \
         $(top_builddir)/ompi/lib@[email protected] \
         $(top_builddir)/opal/lib@[email protected]
 
+ddt_raw2_SOURCES = ddt_raw2.c ddt_lib.c ddt_lib.h
+ddt_raw2_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
+ddt_raw2_LDADD = \
+        $(top_builddir)/ompi/lib@[email protected] \
+        $(top_builddir)/opal/lib@[email protected]
+
 ddt_pack_SOURCES = ddt_pack.c
 ddt_pack_LDFLAGS = $(OMPI_PKG_CONFIG_LDFLAGS)
 ddt_pack_LDADD = \