From e7e18303f6ec98de40499275e1710d9c1053f41a Mon Sep 17 00:00:00 2001
From: Rich Graham <richardg@mellanox.com>
Date: Wed, 9 Apr 2008 15:10:58 +0000
Subject: [PATCH] more debug.

This commit was SVN r18108.
---
 ompi/mca/coll/sm2/coll_sm2_module.c | 10 ++++++++--
 ompi/mca/coll/sm2/coll_sm2_reduce.c |  5 +++++
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ompi/mca/coll/sm2/coll_sm2_module.c b/ompi/mca/coll/sm2/coll_sm2_module.c
index 51243e77a6..c1e93cdf11 100644
--- a/ompi/mca/coll/sm2/coll_sm2_module.c
+++ b/ompi/mca/coll/sm2/coll_sm2_module.c
@@ -50,6 +50,8 @@ extern int my_debug_rank;
 extern int my_debug_comm_size;
 extern void debug_module(void);
 extern int last_root;
+extern int node_type;
+int free_buff_free_index=-1;
 static mca_coll_sm2_module_t *module_dbg;
 static int blocking_cnt=0;
 void debug_module(void) {
@@ -73,11 +75,12 @@ void debug_module(void) {
        }
     }
     /* data regions */
-    fprintf(stderr," my_debug_rank %d current index %d freed index %d coll_tag %lld debug stat %d blocking_cnt %d last_root %d \n",
+    fprintf(stderr," my_debug_rank %d current index %d freed index %d coll_tag %lld debug stat %d blocking_cnt %d last_root %d free_buff_free_index %lld node_type %d \n",
          my_debug_rank,
          module_dbg->sm2_allocated_buffer_index,module_dbg->sm2_freed_buffer_index,
          module_dbg->collective_tag,
-         module_dbg->blocked_on_barrier,blocking_cnt,last_root);
+         module_dbg->blocked_on_barrier,blocking_cnt,last_root,
+         free_buff_free_index,node_type);
     fprintf(stderr," my_debug_rank %d barrier_bank_cntr %lld ",
             my_debug_rank,module_dbg->barrier_bank_cntr);
     for( i=0 ; i < BARRIER_BANK_LIST_SIZE ; i++ )
@@ -1342,6 +1345,9 @@ int free_sm2_shared_buffer(mca_coll_sm2_module_t *module)
 
     }
 
+    /* debug */
+    free_buff_free_index=module->sm2_freed_buffer_index;
+    /* end debug */
 
     /* return */
     return OMPI_SUCCESS;
diff --git a/ompi/mca/coll/sm2/coll_sm2_reduce.c b/ompi/mca/coll/sm2/coll_sm2_reduce.c
index fee809889a..47f4e1a92c 100644
--- a/ompi/mca/coll/sm2/coll_sm2_reduce.c
+++ b/ompi/mca/coll/sm2/coll_sm2_reduce.c
@@ -24,7 +24,9 @@ extern uint64_t timers[7];
 #include <assert.h>
 extern void debug_module(void);
 extern int last_root;
+extern int node_type;
 int last_root;
+int node_type;
 /* end debug */
 
 
@@ -96,6 +98,9 @@ int mca_coll_sm2_reduce_intra_fanin(void *sbuf, void *rbuf, int count,
     /* get my node for the reduction tree */
     my_reduction_node=&(sm_module->reduction_tree[my_node_index]);
     n_children=my_reduction_node->n_children;
+    /* debug */
+    node_type=my_reduction_node->my_node_type;
+    /* end debug */
 
     if( 1 == n_data_segments ) {
         /* single data segment */