More intrusive version of patch.

Rename components from mca_pml_base... to more correct mca_pml_uniq...

This commit was SVN r6749.

ompi/mca/pml/uniq/pml_uniq.c

@@ -294,7 +294,7 @@ int mca_pml_uniq_add_procs(ompi_proc_t** procs, size_t nprocs)
                     NULL != ptl->ptl_request_init &&
                     NULL != ptl->ptl_request_fini) {
                     
-                    mca_pml_base_ptl_uniq_t* ptl_base = OBJ_NEW(mca_pml_base_ptl_uniq_t);
+                    mca_pml_uniq_ptl_t* ptl_base = OBJ_NEW(mca_pml_uniq_ptl_t);
                     ptl_base->ptl = ptl;
                     ptl_base->ptl_cache_size = ptl->ptl_cache_size;
                     ptl->ptl_base = ptl_base;

ompi/mca/pml/uniq/pml_uniq_ptl.c

@@ -19,7 +19,7 @@
 #include "pml_uniq_ptl.h"
 
 
-static void mca_pml_base_ptl_construct(mca_pml_base_ptl_uniq_t* ptl)
+static void mca_pml_uniq_ptl_construct(mca_pml_uniq_ptl_t* ptl)
 {
     OBJ_CONSTRUCT(&ptl->ptl_cache, opal_list_t);
     OBJ_CONSTRUCT(&ptl->ptl_cache_lock, opal_mutex_t);
@@ -28,16 +28,16 @@ static void mca_pml_base_ptl_construct(mca_pml_base_ptl_uniq_t* ptl)
     ptl->ptl_cache_alloc = 0;
 }
 
-static void mca_pml_base_ptl_destruct(mca_pml_base_ptl_uniq_t* ptl)
+static void mca_pml_uniq_ptl_destruct(mca_pml_uniq_ptl_t* ptl)
 {
     OBJ_DESTRUCT(&ptl->ptl_cache);
     OBJ_DESTRUCT(&ptl->ptl_cache_lock);
 }
 
 OBJ_CLASS_INSTANCE(
-    mca_pml_base_ptl_uniq_t,
+    mca_pml_uniq_ptl_t,
     opal_list_t,
-    mca_pml_base_ptl_construct,
-    mca_pml_base_ptl_destruct
+    mca_pml_uniq_ptl_construct,
+    mca_pml_uniq_ptl_destruct
 );
 

ompi/mca/pml/uniq/pml_uniq_ptl.h

@@ -25,16 +25,16 @@ extern "C" {
 #endif
 
 
-struct mca_pml_base_ptl_t {
+struct mca_pml_uniq_ptl_t {
     opal_list_t       ptl_cache;       /**< cache of send requests */
     size_t            ptl_cache_size;  /**< maximum size of cache */
     size_t            ptl_cache_alloc; /**< current number of allocated items */
     opal_mutex_t      ptl_cache_lock;  /**< lock for queue access */
     struct mca_ptl_base_module_t* ptl; /**< back pointer to ptl */
 };
-typedef struct mca_pml_base_ptl_t mca_pml_base_ptl_uniq_t;
+typedef struct mca_pml_uniq_ptl_t mca_pml_uniq_ptl_t;
 
-OBJ_CLASS_DECLARATION(mca_pml_base_ptl_uniq_t);
+OBJ_CLASS_DECLARATION(mca_pml_uniq_ptl_t);
 
 #if defined(c_plusplus) || defined(__cplusplus)
 }

ompi/mca/pml/uniq/pml_uniq_sendreq.h

@@ -41,7 +41,7 @@ OBJ_CLASS_DECLARATION(mca_pml_uniq_send_request_t);
     rc)                                                                    \
 {                                                                          \
     mca_pml_proc_t *proc = mca_pml_uniq_proc_lookup_remote(comm,dst);      \
-    mca_pml_base_ptl_uniq_t* ptl_base;                                     \
+    mca_pml_uniq_ptl_t* ptl_base;                                     \
                                                                            \
     if(NULL == proc) {                                                     \
        return OMPI_ERR_OUT_OF_RESOURCE;                                    \
@@ -119,7 +119,7 @@ OBJ_CLASS_DECLARATION(mca_pml_uniq_send_request_t);
 #define MCA_PML_UNIQ_SEND_REQUEST_RETURN(sendreq)                          \
 {                                                                          \
     mca_ptl_base_module_t* ptl = (sendreq)->req_ptl;                       \
-    mca_pml_base_ptl_uniq_t* ptl_base = ptl->ptl_base;                     \
+    mca_pml_uniq_ptl_t* ptl_base = ptl->ptl_base;                     \
                                                                            \
     /*  Let the base handle the reference counts */                        \
     MCA_PML_BASE_SEND_REQUEST_FINI( &((sendreq)->req_send) );              \