datatype/external32: fix test

(cherry picked from commit 63eec55)

Author: ggouaillardet

test/datatype/external32.c

@@ -18,10 +18,20 @@
 #include "opal/runtime/opal.h"
 #include "opal/datatype/opal_convertor.h"
 #include "opal/datatype/opal_datatype_internal.h"
-// #include <mpi.h>
+#include <arpa/inet.h>
+
+static int verbose = 0;
+ 
+typedef int (*checker_t)(void*, void*, ompi_datatype_t *, int, void*);
+
+int check_contiguous( void* send_buffer, void* packed,
+                      ompi_datatype_t * datatype, int count, void* arg );
+
+int check_vector( void* send_buffer, void* packed,
+                  ompi_datatype_t * datatype, int count, void* arg );
 
 static int pack_unpack_datatype( void* send_data, ompi_datatype_t *datatype, int count,
-                                 void* recv_data );
+                                 void* recv_data, checker_t validator, void *validator_arg );
 
 static void dump_hex(void* what, size_t length);
 
@@ -137,8 +147,74 @@ int MPI_Unpack_external (const char datarep[], const void *inbuf, MPI_Aint insiz
     return (rc == 1) ? OMPI_SUCCESS : OMPI_ERROR;
 }
 
+int check_contiguous( void* send_buffer, void* packed,
+                      ompi_datatype_t* datatype, int count, void* arg )
+{
+    int i;
+
+    if( (datatype == &ompi_mpi_int.dt) || (datatype == &ompi_mpi_int32_t.dt) ) {
+        uint32_t val;
+        for( i = 0 ; i < count; i++ ) {
+            val = htonl(((uint32_t*)send_buffer)[i]);
+            if( val != ((uint32_t*)packed)[i] ) {
+                printf("Error at position %d expected %x found %x (type %s)\n",
+                       i, ((uint32_t*)packed)[i], ((uint32_t*)send_buffer)[i], datatype->name);
+                return -1;
+            }
+        }
+    } else if( (datatype == &ompi_mpi_short.dt) || (datatype == &ompi_mpi_int16_t.dt) ) {
+        uint16_t val;
+        for( i = 0 ; i < count; i++ ) {
+            val = htons(((uint16_t*)send_buffer)[i]);
+            if( val != ((uint16_t*)packed)[i] ) {
+                printf("Error at position %d expected %x found %x (type %s)\n",
+                       i, ((uint16_t*)packed)[i], ((uint16_t*)send_buffer)[i], datatype->name);
+                return -1;
+            }
+        }
+    } else {
+        printf("Unknown type\n");
+        return -1;
+    }
+    return 0;
+}
+
+int check_vector( void* send_buffer, void* packed,
+                  ompi_datatype_t* datatype, int count, void* arg )
+{
+    int i;
+    ompi_datatype_t *origtype = (ompi_datatype_t *)arg;
+
+    if( (origtype == &ompi_mpi_int.dt) || (origtype == &ompi_mpi_int32_t.dt) ) {
+        uint32_t val;
+        for( i = 0 ; i < count; i++ ) {
+            val = htonl(((uint32_t*)send_buffer)[2*i]);
+            if( val != ((uint32_t*)packed)[i] ) {
+                printf("Error at position %d expected %x found %x (type %s)\n",
+                       i, ((uint32_t*)packed)[i], ((uint32_t*)send_buffer)[2*i], datatype->name);
+                return -1;
+            }
+        }
+    } else if( (origtype == &ompi_mpi_short.dt) || (origtype == &ompi_mpi_int16_t.dt) ) {
+        uint16_t val;
+        for( i = 0 ; i < count; i++ ) {
+            val = htons(((uint16_t*)send_buffer)[2*i]);
+            if( val != ((uint16_t*)packed)[i] ) {
+                printf("Error at position %d expected %x found %x (type %s)\n",
+                       i, ((uint16_t*)packed)[i], ((uint16_t*)send_buffer)[2*i], datatype->name);
+                return -1;
+            }
+        }
+    } else {
+        printf("Unknown %s type\n", datatype->name);
+        return -1;
+    }
+    return 0;
+}
+
 static int pack_unpack_datatype( void* send_data, ompi_datatype_t *datatype, int count,
-                                 void* recv_data )
+                                 void* recv_data,
+                                 checker_t validator, void* validator_arg)
 {
     MPI_Aint position = 0, buffer_size;
     void* buffer;
@@ -185,8 +261,8 @@ int main(int argc, char *argv[])
             printf("send data %08x %08x \n", send_data[0], send_data[1]);
             printf("data "); dump_hex(&send_data, sizeof(int32_t) * 2); printf("\n");
         }
-        (void)pack_unpack_datatype( send_data, MPI_INT32_T, 2,
-                                    recv_data, check_contiguous, (void*)(ptrdiff_t)MPI_INT32_T );
+        (void)pack_unpack_datatype( send_data, &ompi_mpi_int32_t.dt, 2,
+                                    recv_data, check_contiguous, (void*)&ompi_mpi_int32_t.dt );
         if( verbose ) {
             printf("recv "); dump_hex(&recv_data, sizeof(int32_t) * 2); printf("\n");
             printf("recv data %08x %08x \n", recv_data[0], recv_data[1]);
@@ -205,8 +281,8 @@ int main(int argc, char *argv[])
             printf("send data %08x %08x \n", send_data[0], send_data[1]);
             printf("data "); dump_hex(&send_data, sizeof(int16_t) * 2); printf("\n");
         }
-        (void)pack_unpack_datatype( send_data, MPI_INT16_T, 2,
-                                    recv_data, check_contiguous, (void*)(ptrdiff_t)MPI_INT16_T );
+        (void)pack_unpack_datatype( send_data, &ompi_mpi_int16_t.dt, 2,
+                                    recv_data, check_contiguous, (void*)&ompi_mpi_int16_t.dt );
         if( verbose ) {
             printf("recv "); dump_hex(&recv_data, sizeof(int16_t) * 2); printf("\n");
             printf("recv data %08x %08x \n", recv_data[0], recv_data[1]);
@@ -234,16 +310,18 @@ int main(int argc, char *argv[])
         }
         ompi_datatype_commit(&ddt);
 
-        printf("send data %08x %x08x %08x \n", send_data[0], send_data[1], send_data[2]);
-        printf("data "); dump_hex(&send_data, sizeof(int) * 3); printf("\n");
-
-        (void)pack_unpack_datatype( send_data, ddt, 1, recv_data );
-
-        printf("recv "); dump_hex(&recv_data, sizeof(int) * 3); printf("\n");
-        printf("recv data %08x %08x %08x \n", recv_data[0], recv_data[1], recv_data[2]);
+        if( verbose ) {
+            printf("send data %08x %x08x %08x \n", send_data[0], send_data[1], send_data[2]);
+            printf("data "); dump_hex(&send_data, sizeof(int32_t) * 3); printf("\n");
+        }
+        (void)pack_unpack_datatype( send_data, ddt, 1, recv_data, check_vector, (void*)&ompi_mpi_int32_t.dt );
+        if( verbose ) {
+            printf("recv "); dump_hex(&recv_data, sizeof(int32_t) * 3); printf("\n");
+            printf("recv data %08x %08x %08x \n", recv_data[0], recv_data[1], recv_data[2]);
+        }
         ompi_datatype_destroy(&ddt);
         if( (send_data[0] != recv_data[0]) || (send_data[2] != recv_data[2]) ) {
-            printf("Error during external32 pack/unack for vector types\n");
+            printf("Error during external32 pack/unack for vector types (MPI_INT32_T)\n");
             exit(-1);
         }
     }