Checkpoint code - something wrong with debugging output.

This commit was SVN r1626.

src/mca/ns/base/ns_base_open.c

@@ -6,6 +6,7 @@
 
 #include "mca/mca.h"
 #include "mca/base/base.h"
+#include "util/output.h"
 #include "mca/ns/base/base.h"
 
 
@@ -66,6 +67,13 @@ int mca_ns_base_open(void)
     return OMPI_ERROR;
   }
 
+  /* setup output for debug messages */
+  if (!ompi_output_init) {  /* can't open output */
+      return OMPI_ERROR;
+  }
+
+  mca_ns_base_output = ompi_output_open(NULL);
+
   /* All done */
 
   return OMPI_SUCCESS;

src/mca/ns/base/ns_base_select.c

@@ -44,6 +44,7 @@ int mca_ns_base_select(bool *allow_multi_user_threads,
     /* Call the component's init function and see if it wants to be
        selected */
 
+    ompi_output(mca_ns_base_output, "calling component init\n");
     module = component->ns_init(&multi, &hidden, &priority);
 
     /* If we got a non-NULL module back, then the component wants to

src/mca/ns/proxy/src/ns_proxy_module.c

@@ -91,7 +91,7 @@ mca_ns_t* mca_ns_proxy_init(bool *allow_multi_user_threads, bool *have_hidden_th
 {
     /* If we're NOT the seed, then we want to be selected, so do all
        the setup and return the module */
-
+    fprintf(stderr, "ns_proxy: entered init\n");
     if (!ompi_process_info.seed) {
 
       /* Return a module (choose an arbitrary, positive priority --

src/mca/ns/replica/src/ns_replica.c

@@ -4,8 +4,10 @@
 /** @file:
  *
  */
+#include <stdio.h>
 
 #include "ompi_config.h"
+#include "util/output.h"
 #include "mca/mca.h"
 #include "mca/ns/base/base.h"
 #include "ns_replica.h"
@@ -20,7 +22,10 @@
 
 ompi_process_id_t ns_replica_create_cellid(void)
 {
-    if ((OMPI_NAME_SERVICE_MAX-1) < mca_ns_replica_last_used_cellid) {
+    ompi_output(mca_ns_base_output, "entered replica create cellid\n");
+    if ((OMPI_NAME_SERVICE_MAX-1) >= mca_ns_replica_last_used_cellid) {
+	ompi_output(mca_ns_base_output, "create cellid: last_used %d\n", mca_ns_replica_last_used_cellid);
+
 	mca_ns_replica_last_used_cellid = mca_ns_replica_last_used_cellid + 1;
 	return(mca_ns_replica_last_used_cellid);
     } else {
@@ -32,7 +37,7 @@ ompi_process_id_t ns_replica_create_jobid(void)
 {
     mca_ns_replica_name_tracker_t *new;
 
-    if ((OMPI_NAME_SERVICE_MAX-1) < mca_ns_replica_last_used_jobid) {
+    if ((OMPI_NAME_SERVICE_MAX-1) >= mca_ns_replica_last_used_jobid) {
 	mca_ns_replica_last_used_jobid = mca_ns_replica_last_used_jobid + 1;
 	new = OBJ_NEW(mca_ns_replica_name_tracker_t);
 	new->job = mca_ns_replica_last_used_jobid;
@@ -54,7 +59,7 @@ ompi_process_id_t ns_replica_reserve_range(ompi_process_id_t job, ompi_process_i
 	 ptr != (mca_ns_replica_name_tracker_t*)ompi_list_get_end(&mca_ns_replica_name_tracker);
 	 ptr = (mca_ns_replica_name_tracker_t*)ompi_list_get_next(ptr)) {
 	if (job == ptr->job) { /* found the specified job */
-	    if ((OMPI_NAME_SERVICE_MAX-range-1) > ptr->last_used_vpid) {  /* requested range available */
+	    if ((OMPI_NAME_SERVICE_MAX-range-1) >= ptr->last_used_vpid) {  /* requested range available */
 		start = ptr->last_used_vpid + 1;
 		ptr->last_used_vpid = ptr->last_used_vpid + range;
 		return(start);

src/mca/ns/replica/src/ns_replica_module.c

@@ -19,6 +19,7 @@
 
 #include "include/constants.h"
 #include "util/proc_info.h"
+#include "util/output.h"
 #include "mca/mca.h"
 #include "mca/ns/base/base.h"
 #include "ns_replica.h"
@@ -118,8 +119,12 @@ mca_ns_t* mca_ns_replica_init(bool *allow_multi_user_threads, bool *have_hidden_
     /* If we're the seed, then we want to be selected, so do all the
        setup and return the module */
 
+    ompi_output(mca_ns_base_output, "replica init called\n");
+
     if (ompi_process_info.seed) {
 
+	ompi_output(mca_ns_base_output, "replica: am seed\n");
+
       mca_ns_replica_last_used_cellid = 0;
       mca_ns_replica_last_used_jobid = 0;
 
@@ -132,11 +137,15 @@ mca_ns_t* mca_ns_replica_init(bool *allow_multi_user_threads, bool *have_hidden_
 
       /* We allow multi user threads but don't have any hidden threads */
 
+      ompi_output(mca_ns_base_output, "replica: assign thread values\n");
+
       *allow_multi_user_threads = true;
       *have_hidden_threads = false;
 
       /* initialize the name tracker */
 
+      ompi_output(mca_ns_base_output, "replica: construct name tracker");
+
       OBJ_CONSTRUCT(&mca_ns_replica_name_tracker, ompi_list_t);
 
       /* Return the module */