Add function to lookup ompi datatype from opal datatype id.

Signed-off-by: Chris Chambreau <[email protected]>

Author: cchambreau

ompi/datatype/Makefile.am

@@ -41,6 +41,7 @@ libdatatype_la_SOURCES = \
         ompi_datatype_create_subarray.c \
         ompi_datatype_external.c \
         ompi_datatype_external32.c \
+        ompi_datatype_lookup_by_opal_id.c \
         ompi_datatype_match_size.c \
         ompi_datatype_module.c \
         ompi_datatype_sndrcv.c \

ompi/datatype/ompi_datatype.h

@@ -295,6 +295,8 @@ ompi_datatype_copy_content_same_ddt( const ompi_datatype_t* type, size_t count,
     return 0;
 }
 
+OMPI_DECLSPEC ompi_datatype_t* ompi_datatype_lookup_by_opal_id( uint16_t opal_id );
+
 OMPI_DECLSPEC const ompi_datatype_t* ompi_datatype_match_size( int size, uint16_t datakind, uint16_t datalang );
 
 /*

ompi/datatype/ompi_datatype_lookup_by_opal_id.c

@@ -0,0 +1,28 @@
+/* -*- Mode: C; c-basic-offset:4 ; -*- */
+/*
+ * $COPYRIGHT$
+ *
+ * Additional copyrights may follow
+ *
+ * $HEADER$
+ */
+
+#include "ompi_config.h"
+#include "ompi/datatype/ompi_datatype.h"
+#include "ompi/datatype/ompi_datatype_internal.h"
+
+
+ompi_datatype_t* ompi_datatype_lookup_by_opal_id( uint16_t opal_id )
+{
+    int32_t i;
+    const ompi_datatype_t* datatype = NULL;
+
+    for (int j = 0 ; j < OMPI_DATATYPE_MPI_MAX_PREDEFINED ; ++j) {
+        if (ompi_datatype_basicDatatypes[j]->super.id == opal_id) {
+            datatype = (ompi_datatype_t *) ompi_datatype_basicDatatypes[j];
+            break;
+        }
+    }
+
+    return datatype;
+}

ompi/mpi/tool/event_get_info.c

@@ -17,9 +17,6 @@
 
 #include "ompi/mpi/tool/mpit-internal.h"
 
-/* needed to convert between opal and ompi datatypes until a function is provided */
-#include "ompi/datatype/ompi_datatype_internal.h"
-
 #if OMPI_BUILD_MPI_PROFILING
 #if OPAL_HAVE_WEAK_SYMBOLS
 #pragma weak MPI_T_event_get_info = PMPI_T_event_get_info
@@ -89,16 +86,8 @@ int MPI_T_event_get_info (int event_index, char *name, int *name_len,
     if (max_datatypes) {
         if (array_of_datatypes) {
             for (int i = 0 ; i < max_datatypes ; i++) {
-                ompi_datatype_t *ompi_datatype = NULL;
-
-                for (int j = 0 ; j < OMPI_DATATYPE_MPI_MAX_PREDEFINED ; ++j) {
-                    if (ompi_datatype_basicDatatypes[j]->super.id == event->event_datatypes[i]->id) {
-                        ompi_datatype = (ompi_datatype_t *) ompi_datatype_basicDatatypes[j];
-                        break;
-                    }
-                }
 
-                array_of_datatypes[i] = ompi_datatype;
+                array_of_datatypes[i] = ompi_datatype_lookup_by_opal_id(event->event_datatypes[i]->id);
             }
         }