sharing negative tag space between libNBC and HCOLL

fixed by devendar, reviewed by miked
cmr=v1.7.4:reviewer=ompi-rm1.7

This commit was SVN r30224.

ompi/mca/coll/base/coll_tags.h

@@ -41,4 +41,7 @@
 #define MCA_COLL_BASE_TAG_SCATTER -24
 #define MCA_COLL_BASE_TAG_SCATTERV -25
 #define MCA_COLL_BASE_TAG_NONBLOCKING_BASE -26
+#define MCA_COLL_BASE_TAG_NONBLOCKING_END ((-1 * INT_MAX/2) + 1)
+#define MCA_COLL_BASE_TAG_HCOLL_BASE (-1 * INT_MAX/2)
+#define MCA_COLL_BASE_TAG_HCOLL_END (-1 * INT_MAX)
 #endif /* MCA_COLL_BASE_TAGS_H */

ompi/mca/coll/hcoll/coll_hcoll_module.c

@@ -180,7 +180,7 @@ static int mca_coll_hcoll_module_enable(mca_coll_base_module_t *module,
         return OMPI_ERROR;
     }
 
-    hcoll_set_runtime_tag_offset(-100,mca_pml.pml_max_tag);
+    hcoll_set_runtime_tag_offset(MCA_COLL_BASE_TAG_HCOLL_BASE, mca_pml.pml_max_tag);
 
 
     hcoll_module->hcoll_context =

ompi/mca/coll/libnbc/nbc.c

@@ -544,7 +544,7 @@ int NBC_Init_handle(struct ompi_communicator_t *comm, ompi_coll_libnbc_request_t
 
   OPAL_THREAD_LOCK(&comminfo->mutex);
   tmp_tag = comminfo->tag--;
-  if (tmp_tag == (-1 * mca_pml.pml_max_tag)) {
+  if (tmp_tag == MCA_COLL_BASE_TAG_NONBLOCKING_END) {
       tmp_tag = comminfo->tag = MCA_COLL_BASE_TAG_NONBLOCKING_BASE;
       NBC_DEBUG(2,"resetting tags ...\n"); 
   }