Modifications for changes to proposed MPI_T Events API as well as minor fixes.

Signed-off-by: Chris Chambreau <chambreau1@llnl.gov>

Author: cchambreau

ompi/include/mpi.h.in

@@ -934,12 +934,12 @@ typedef enum {
 /*
  * MPIT source ordering
  */
-enum ompi_mpi_t_order_t {
+enum ompi_mpi_t_source_order_t {
   MPI_T_ORDERED,
   MPI_T_UNORDERED,
 };
 
-typedef enum ompi_mpi_t_order_t MPI_T_order;
+typedef enum ompi_mpi_t_source_order_t MPI_T_source_order;
 
 /*
  * MPI Tool event functions
@@ -3019,7 +3019,7 @@ OMPI_DECLSPEC  int PMPI_T_event_get_timestamp (MPI_T_event_instance event, MPI_C
 OMPI_DECLSPEC  int PMPI_T_event_get_source (MPI_T_event_instance event, int *source_index);
 OMPI_DECLSPEC  int PMPI_T_source_get_num (int *num_source);
 OMPI_DECLSPEC  int PMPI_T_source_get_info (int source_id, char *name, int *name_len,
-                                           char *desc, int *desc_len, MPI_T_order *ordering,
+                                           char *desc, int *desc_len, MPI_T_source_order *ordering,
                                            MPI_Count *ticks_per_second, MPI_Count *max_timestamp,
                                            MPI_Info *info);
 OMPI_DECLSPEC  int PMPI_T_source_get_timestamp (int source_id, MPI_Count *timestamp);
@@ -3133,7 +3133,7 @@ OMPI_DECLSPEC  int MPI_T_event_get_source (MPI_T_event_instance event, int *sour
 
 OMPI_DECLSPEC  int MPI_T_source_get_num (int *num_source);
 OMPI_DECLSPEC  int MPI_T_source_get_info (int source_id, char *name, int *name_len,
-                                          char *desc, int *desc_len, MPI_T_order *ordering,
+                                          char *desc, int *desc_len, MPI_T_source_order *ordering,
                                           MPI_Count *ticks_per_second, MPI_Count *max_timestamp,
                                           MPI_Info *info);
 OMPI_DECLSPEC  int MPI_T_source_get_timestamp (int source_id, MPI_Count *timestamp);

ompi/mca/pml/ob1/pml_ob1_component.c

@@ -102,12 +102,12 @@ mca_base_event_list_item_t mca_pml_ob1_events[] = {
 
     [MCA_PML_OB1_EVENT_SEARCH_POSTED_BEGIN] = {.name = "search_posted_begin", .desc = "Begin searching posted message queue",
                                                .verbosity = OPAL_INFO_LVL_5, .datatypes = &mca_pml_ob1_match_hdr_types[1],
-                                               .offsets = &mca_pml_ob1_match_hdr_offsets[1], .num_datatypes = 2,
+                                               .offsets = &mca_pml_ob1_match_hdr_offsets[1], .num_datatypes = 3,
                                                .elements = &mca_pml_ob1_match_hdr_names[1], .extent = 8, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
 
     [MCA_PML_OB1_EVENT_SEARCH_POSTED_END] = {.name = "search_posted_end", .desc = "Finished searching posted message queue",
                                              .verbosity = OPAL_INFO_LVL_5, .datatypes = &mca_pml_ob1_match_hdr_types[1],
-                                             .offsets = &mca_pml_ob1_match_hdr_offsets[1], .num_datatypes = 2,
+                                             .offsets = &mca_pml_ob1_match_hdr_offsets[1], .num_datatypes = 3,
                                              .elements = &mca_pml_ob1_match_hdr_names[1], .extent = 8, .bind = MCA_BASE_VAR_BIND_MPI_COMM},
 
     [MCA_PML_OB1_EVENT_SEARCH_UNEX_BEGIN] = {.name = "search_unexpected_begin", .desc = "Begin searching unexpected message queue",

ompi/mpi/tool/event_get_info.c

@@ -61,7 +61,30 @@ int MPI_T_event_get_info (int event_index, char *name, int *name_len,
         mpit_copy_string (name, name_len, event->event_name);
         mpit_copy_string (desc, desc_len, event->event_description);
 
-        max_datatypes = num_elements ? (*num_elements < (int) (event->event_datatype_count + 1) ? *num_elements - 1 : event->event_datatype_count) : 0;
+        // num_elements is INOUT
+        //
+        // Can query number of datatypes, returned in num_elements
+        //   if array_of_datatypes or displacements are NULL, just return data_type_count.
+        // Otherwise, if array_of_datatypes or displacements are not NULL, use num_elements
+        //   as maximum datatypes or displacements returned.
+        //
+        // Unless the user passes the NULL pointer for num_elements, 
+        //   the function returns the number of elements required for this event type.
+        //
+        // If the number of elements used by the event type is larger than the value of num_elements 
+        //   provided by the user, the number of datatype handles and displacements returned in the 
+        //   corresponding arrays is truncated to the value of num_elements passed in by the user.
+
+        max_datatypes = 0;
+        if (num_elements) {
+            if (NULL != array_of_datatypes || NULL != array_of_displacements) {
+                if (*num_elements < (int) (event->event_datatype_count))
+                    max_datatypes = *num_elements;
+                else
+                    max_datatypes = event->event_datatype_count;
+            }
+            *num_elements = event->event_datatype_count;
+        }
 
         if (max_datatypes) {
             if (array_of_datatypes) {

ompi/mpi/tool/source_get_info.c

@@ -20,7 +20,7 @@
 #include "ompi/mpi/tool/profile/defines.h"
 #endif
 
-int MPI_T_source_get_info (int source_id, char *name, int *name_len, char *desc, int *desc_len, MPI_T_order *ordering,
+int MPI_T_source_get_info (int source_id, char *name, int *name_len, char *desc, int *desc_len, MPI_T_source_order *ordering,
                            MPI_Count *ticks_per_second, MPI_Count *max_timestamp, MPI_Info *info)
 {
     mca_base_source_t *source;
@@ -35,11 +35,17 @@ int MPI_T_source_get_info (int source_id, char *name, int *name_len, char *desc,
         return MPI_T_ERR_INVALID_INDEX;
     }
 
+    if (NULL == name && name_len)
+      *name_len = strlen(source->source_name);
+
     if (name && name_len) {
         strncpy (name, source->source_name, *name_len);
         *name_len = strlen (name);
     }
 
+    if (NULL == desc && desc_len)
+      *desc_len = strlen(source->source_description);
+
     if (desc && desc_len) {
         strncpy (desc, source->source_description, *desc_len);
         *desc_len = strlen (desc);
@@ -54,10 +60,10 @@ int MPI_T_source_get_info (int source_id, char *name, int *name_len, char *desc,
     }
 
     if (max_timestamp) {
-        *max_timestamp = SIZE_T_MAX;
+        *max_timestamp = SIZE_MAX;
     }
 
-    if (*info) {
+    if (NULL != info && *info) {
         *info = OBJ_NEW(ompi_info_t);
     }
 

opal/mca/base/mca_base_event.c

@@ -26,7 +26,7 @@
 
 #include "opal/class/opal_pointer_array.h"
 #include "opal/class/opal_hash_table.h"
-#include "opal/threads/thread_usage.h"
+#include "opal/mca/threads/thread_usage.h"
 
 static opal_hash_table_t mca_base_event_index_hash;
 static opal_pointer_array_t registered_events;

opal/mca/base/mca_base_var.c

@@ -277,6 +277,7 @@ int mca_base_var_init(void)
         if (NULL == (cwd = getcwd(NULL, 0))) {
             opal_output(0, "Error: Unable to get the current working directory\n");
             cwd = strdup(".");
+        }
 
         ret = mca_base_source_init ();
         if (OPAL_SUCCESS != ret) {