fix threaded build issues with rcache.

This commit was SVN r7358.

ompi/mca/rcache/rb/rcache_rb.c

@@ -44,26 +44,26 @@ int mca_rcache_rb_find (
     
     int rc; 
     mca_rcache_rb_tree_item_t* tree_item; 
-    OPAL_THREAD_LOCK(&rb_module->rb_lock);
+    OPAL_THREAD_LOCK(&rcache->lock);
     *cnt = 0;
     tree_item = mca_rcache_rb_tree_find( (mca_rcache_rb_module_t*) rcache, addr ); 
     if(NULL == tree_item) { 
-        OPAL_THREAD_UNLOCK(&rb_module->rb_lock);
+        OPAL_THREAD_UNLOCK(&rcache->lock);
         return OMPI_ERROR; 
     }
     
    
     rc =  ompi_pointer_array_add(regs, (void*) tree_item->reg); 
     if(OMPI_SUCCESS != rc) { 
-        OPAL_THREAD_UNLOCK(&rb_module->rb_lock);
+        OPAL_THREAD_UNLOCK(&rcache->lock);
         return rc; 
     }
     
     if( !(tree_item->reg->flags & MCA_MPOOL_FLAGS_PERSIST) ) { 
         rc = mca_rcache_rb_mru_touch((mca_rcache_rb_module_t*)rcache, tree_item->reg); 
     }
-    OPAL_THREAD_ADD32(&tree_item->reg->ref_count, 1); 
-    OPAL_THREAD_UNLOCK(&rb_module->rb_lock);
+    OPAL_THREAD_ADD32((int32_t*) &tree_item->reg->ref_count, 1); 
+    OPAL_THREAD_UNLOCK(&rcache->lock);
     if(rc == OMPI_SUCCESS) { 
         *cnt = 1; 
     }
@@ -76,19 +76,19 @@ int mca_rcache_rb_insert (
                           uint32_t flags
                           ) { 
     int rc;
-    OPAL_THREAD_LOCK(&rb_module->rb_lock); 
+    OPAL_THREAD_LOCK(&rcache->lock); 
     if(!(flags & MCA_MPOOL_FLAGS_PERSIST)) { 
         rc = mca_rcache_rb_mru_insert( (mca_rcache_rb_module_t*) rcache, reg); 
         if(OMPI_SUCCESS != rc) { 
-            OPAL_THREAD_UNLOCK(&rb_module->rb_lock); 
+            OPAL_THREAD_UNLOCK(&rcache->lock); 
             return rc; 
         } else { 
-            OPAL_THREAD_ADD32(&reg->ref_count, 1); 
+            OPAL_THREAD_ADD32((int32_t*)&reg->ref_count, 1); 
         }
     }
     rc = mca_rcache_rb_tree_insert((mca_rcache_rb_module_t*)rcache, reg );
-    OPAL_THREAD_ADD32(&reg->ref_count, 1); 
-    OPAL_THREAD_UNLOCK(&rb_module->rb_lock); 
+    OPAL_THREAD_ADD32((int32_t*) &reg->ref_count, 1); 
+    OPAL_THREAD_UNLOCK(&rcache->lock); 
     return rc;
 }
 
@@ -98,17 +98,17 @@ int mca_rcache_rb_delete (
                           uint32_t flags
                           ) { 
     int rc; 
-    OPAL_THREAD_LOCK(&rb_module->rb_lock); 
+    OPAL_THREAD_LOCK(&rcache->lock); 
     if(!(flags & MCA_MPOOL_FLAGS_PERSIST)) { 
         rc = mca_rcache_rb_mru_delete( (mca_rcache_rb_module_t*) rcache, reg); 
     }
     if(OMPI_SUCCESS != rc) { 
-        OPAL_THREAD_UNLOCK(&rb_module->rb_lock);
+        OPAL_THREAD_UNLOCK(&rcache->lock);
         return rc; 
     }
     reg->flags = 0; 
     rc =  mca_rcache_rb_tree_delete((mca_rcache_rb_module_t*)rcache, reg );
-    OPAL_THREAD_UNLOCK(&rb_module->rb_lock);
+    OPAL_THREAD_UNLOCK(&rcache->lock);
     return rc; 
 }
 

ompi/mca/rcache/rb/rcache_rb.h

@@ -23,7 +23,6 @@
 #include "info/info.h"
 #include "opal/class/opal_list.h" 
 #include "class/ompi_rb_tree.h"
-#include "opal/threads/mutex.h"
 #include "mca/rcache/rcache.h"
 
 
@@ -31,7 +30,6 @@ struct mca_rcache_rb_module_t {
     mca_rcache_base_module_t base; 
     ompi_rb_tree_t rb_tree;
     ompi_free_list_t rb_tree_item_list; 
-    opal_mutex_t rb_lock;
     opal_list_t mru_list; 
     size_t reg_mru_len; 
     

ompi/mca/rcache/rb/rcache_rb_mru.c

@@ -40,14 +40,12 @@ int mca_rcache_rb_mru_insert(
         
                               ) {
     mca_mpool_base_registration_t* old_reg; 
-    OPAL_THREAD_LOCK(&rcache->rb_lock); 
     if(rcache->reg_mru_len <= rcache->mru_list.opal_list_length) { 
         old_reg = (mca_mpool_base_registration_t*) 
             opal_list_remove_last(&rcache->mru_list); 
         /* need to pull out of rb tree here */ 
     }
     opal_list_append(&rcache->mru_list,(opal_list_item_t*) reg); 
-    OPAL_THREAD_UNLOCK(&rcache->rb_lock); 
     return OMPI_SUCCESS; 
 }
 
@@ -60,7 +58,6 @@ int mca_rcache_rb_mru_delete(
                                mca_mpool_base_registration_t *reg
                                ){
     int rc; 
-    OPAL_THREAD_LOCK(&rcache->rb_lock); 
     if(NULL == opal_list_remove_item(
                                      &rcache->mru_list,
                                      (opal_list_item_t*) reg
@@ -69,7 +66,6 @@ int mca_rcache_rb_mru_delete(
     } else { 
         rc = OMPI_SUCCESS; 
     }
-    OPAL_THREAD_UNLOCK(&rcache->rb_lock); 
     return rc; 
 }
 
@@ -81,7 +77,6 @@ int mca_rcache_rb_mru_touch(
                               mca_mpool_base_registration_t* reg
                               ){
     int rc; 
-    OPAL_THREAD_LOCK(&rcache->rb_lock); 
     if(NULL == opal_list_remove_item(
                                      &rcache->mru_list,
                                      (opal_list_item_t*) reg
@@ -91,7 +86,6 @@ int mca_rcache_rb_mru_touch(
         opal_list_append(&rcache->mru_list, (opal_list_item_t*) reg); 
         rc = OMPI_SUCCESS; 
     }
-    OPAL_THREAD_UNLOCK(&rcache->rb_lock); 
     return rc; 
 }
 

ompi/mca/rcache/rcache.h

@@ -23,7 +23,7 @@
 #include "info/info.h"
 #include "opal/class/opal_list.h" 
 #include "mca/mpool/mpool.h"
-
+#include "opal/threads/mutex.h"
 
 
 /**
@@ -87,6 +87,7 @@ struct mca_rcache_base_module_t {
     mca_rcache_base_module_insert_fn_t rcache_insert; 
     mca_rcache_base_module_delete_fn_t rcache_delete; 
     mca_rcache_base_module_finalize_fn_t rcache_finalize; 
+    opal_mutex_t lock;
 }; 
 typedef struct mca_rcache_base_module_t mca_rcache_base_module_t;