add diagnostic interface

This commit was SVN r9328.

ompi/mca/btl/base/base.h

@@ -57,6 +57,8 @@ OBJ_CLASS_DECLARATION(mca_btl_base_selected_module_t);
 OMPI_DECLSPEC  int mca_btl_base_open(void);
 OMPI_DECLSPEC  int mca_btl_base_select(bool enable_progress_threads, bool enable_mpi_threads);
 OMPI_DECLSPEC  int mca_btl_base_close(void);
+OMPI_DECLSPEC  void mca_btl_base_dump(mca_btl_base_module_t*);
+
 
 
 /*

ompi/mca/btl/base/btl_base_error.c

@@ -21,6 +21,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
+#include "base.h"
 #include "btl_base_error.h"
 #include "opal/util/show_help.h"
 #include "orte/util/sys_info.h"
@@ -63,3 +64,8 @@ void mca_btl_base_error_no_nics(const char* transport,
                    nic_name);
     free(procid);
 }
+
+
+void mca_btl_base_dump(mca_btl_base_module_t* btl)
+{
+}

ompi/mca/btl/btl.h

@@ -482,6 +482,17 @@ typedef int (*mca_btl_base_module_get_fn_t)(
 );
 
 
+/**
+ * Diagnostic dump of btl state.
+ *
+ * @param btl (IN)         BTL module
+ */
+
+typedef void (*mca_btl_base_module_dump_fn_t)(
+    struct mca_btl_base_module_t* btl
+);
+
+
 /**
  * BTL module interface functions and attributes.
  */
@@ -512,10 +523,10 @@ struct mca_btl_base_module_t {
     mca_btl_base_module_send_fn_t        btl_send;
     mca_btl_base_module_put_fn_t         btl_put;
     mca_btl_base_module_get_fn_t         btl_get;
+    mca_btl_base_module_dump_fn_t        btl_dump; /* diagnostics */
 
     /* the mpool associated with this btl (optional) */ 
     mca_mpool_base_module_t*             btl_mpool; 
-
 };
 typedef struct mca_btl_base_module_t mca_btl_base_module_t;
 

ompi/mca/btl/gm/btl_gm.c

@@ -78,12 +78,13 @@ mca_btl_gm_module_t mca_btl_gm_module = {
 #if OMPI_ENABLE_MPI_THREADS || OMPI_ENABLE_PROGRESS_THREADS
         mca_btl_gm_send,
         mca_btl_gm_put,
-        mca_btl_gm_get
+        mca_btl_gm_get,
 #else
         mca_btl_gm_send_nl,
         mca_btl_gm_put_nl,
-        mca_btl_gm_get_nl
+        mca_btl_gm_get_nl,
 #endif
+        mca_btl_base_dump
     }
 };
 

ompi/mca/btl/mvapi/btl_mvapi.c

@@ -59,7 +59,8 @@ mca_btl_mvapi_module_t mca_btl_mvapi_module = {
         mca_btl_mvapi_prepare_dst,
         mca_btl_mvapi_send,
         mca_btl_mvapi_put,
-        mca_btl_mvapi_get
+        mca_btl_mvapi_get,
+        mca_btl_mvapi_dump
     }
 };
 
@@ -846,3 +847,15 @@ int mca_btl_mvapi_module_init(mca_btl_mvapi_module_t *mvapi_btl)
     
     return OMPI_SUCCESS;
 }
+
+
+/*
+ * Dump state of btl/queues
+ */
+
+void mca_btl_mvapi_dump(mca_btl_base_module_t* btl)
+{
+    mca_btl_mvapi_module_t* mvapi_btl = (mca_btl_mvapi_module_t*)btl;
+
+
+}

ompi/mca/btl/mx/btl_mx.c

@@ -54,7 +54,8 @@ mca_btl_mx_module_t mca_btl_mx_module = {
         mca_btl_mx_prepare_dst,
         mca_btl_mx_send,
         mca_btl_mx_put,
-        NULL /* get */ 
+        NULL, /* get */ 
+        mca_btl_base_dump 
     }
 };
 

ompi/mca/btl/openib/btl_openib.c

@@ -59,7 +59,8 @@ mca_btl_openib_module_t mca_btl_openib_module = {
         mca_btl_openib_prepare_dst,
         mca_btl_openib_send,
         mca_btl_openib_put,
-        mca_btl_openib_get /* get */ 
+        mca_btl_openib_get,
+        mca_btl_base_dump
     }
 };
 

ompi/mca/btl/portals/btl_portals.c

@@ -64,7 +64,8 @@ mca_btl_portals_module_t mca_btl_portals_module = {
         mca_btl_portals_prepare_dst,
         mca_btl_portals_send,
         mca_btl_portals_put,
-        mca_btl_portals_get
+        mca_btl_portals_get,
+        mca_btl_base_dump
     },
 };
 

ompi/mca/btl/self/btl_self.c

@@ -64,7 +64,8 @@ mca_btl_base_module_t mca_btl_self = {
     mca_btl_self_prepare_dst,
     mca_btl_self_send, 
     mca_btl_self_rdma,  /* put */
-    mca_btl_self_rdma   /* get */
+    mca_btl_self_rdma,
+    mca_btl_base_dump
 };
 
 

ompi/mca/btl/sm/btl_sm.c

@@ -105,7 +105,8 @@ mca_btl_sm_t mca_btl_sm[2] = {
         NULL,
         mca_btl_sm_send, 
         NULL,  /* put */
-        NULL   /* get */
+        NULL,  /* get */
+        mca_btl_base_dump
         }
     },
     {
@@ -129,8 +130,9 @@ mca_btl_sm_t mca_btl_sm[2] = {
         mca_btl_sm_prepare_src,
         NULL,
         mca_btl_sm_send,  
+        NULL, /* put function */
         NULL, /* get function */
-        NULL  /* put function */
+        mca_btl_base_dump
         }
     }
 };

ompi/mca/btl/tcp/btl_tcp.c

@@ -55,7 +55,8 @@ mca_btl_tcp_module_t mca_btl_tcp_module = {
         mca_btl_tcp_prepare_dst,
         mca_btl_tcp_send,
         mca_btl_tcp_put,
-        NULL /* get */ 
+        NULL, /* get */ 
+        mca_btl_base_dump
     }
 };
 

ompi/mca/btl/udapl/btl_udapl.c

@@ -56,7 +56,8 @@ mca_btl_udapl_module_t mca_btl_udapl_module = {
         NULL, /* prepare_dst */
         mca_btl_udapl_send,
         NULL, /* put */
-        NULL /* get */ 
+        NULL, /* get */ 
+        mca_btl_base_dump
     }
 };