fix buffer management for nb-barrier.

This commit was SVN r18081.

ompi/mca/coll/sm2/Makefile.am

@@ -28,6 +28,7 @@ sources = \
         coll_sm2_barrier.c \
         coll_sm2_service.c
 
+
 # Make the output library in this directory, and name it either
 # mca_<type>_<name>.la (for DSO builds) or libmca_<type>_<name>.la
 # (for static builds).

ompi/mca/coll/sm2/coll_sm2_bcast.c

@@ -21,8 +21,6 @@
 extern uint64_t timers[7];
  end debug */
 
-
-
 /**
  * Shared memory blocking allreduce.
  */

ompi/mca/coll/sm2/coll_sm2_module.c

@@ -468,7 +468,6 @@ static int init_sm2_barrier(struct ompi_communicator_t *comm,
         module->sm2_size_management_region_per_proc*
         module->sm_buffer_mgmt_barrier_tree.tree_size;
 
-
     /* set the pointer to the request that needs to be completed first */
     module->current_request_index=0;
 
@@ -967,6 +966,7 @@ sm_work_buffer_t *alloc_sm2_shared_buffer(mca_coll_sm2_module_t *module)
             /* set request to inactive */
             module->barrier_request[module->current_request_index]. 
                 sm2_barrier_phase=NB_BARRIER_INACTIVE;
+            module->barrier_request[module->current_request_index].sm_index^=1;
             /* move pointer to next request that needs to be completed */
             module->current_request_index++;
             /* wrap around */
@@ -1018,6 +1018,9 @@ sm_work_buffer_t *alloc_sm2_shared_buffer(mca_coll_sm2_module_t *module)
             /* set request to inactive */
             request->sm2_barrier_phase=NB_BARRIER_INACTIVE;
 
+            /* set barrier struct to be used next time */
+            request->sm_index^=1;
+
             /* move pointer to next request that needs to be completed */
             module->current_request_index++;
 
@@ -1072,6 +1075,7 @@ int free_sm2_shared_buffer(mca_coll_sm2_module_t *module)
             /* set request to inactive */
             module->barrier_request[module->current_request_index]. 
                 sm2_barrier_phase=NB_BARRIER_INACTIVE;
+            module->barrier_request[module->current_request_index].sm_index^=1;
             /* move pointer to next request that needs to be completed */
             module->current_request_index++;
             /* wrap around */
@@ -1112,6 +1116,7 @@ int free_sm2_shared_buffer(mca_coll_sm2_module_t *module)
         if( NB_BARRIER_DONE == request->sm2_barrier_phase ) {
             /* set request to inactive */
             request->sm2_barrier_phase=NB_BARRIER_INACTIVE;
+            request->sm_index^=1;
             /* move pointer to next request that needs to be completed */
             module->current_request_index++;
             /* wrap around */