Fix a goof that blocked cleanup of a specified process - it always cleanup up itself instead. Add a debug statement to proxy_cleanup.

Brian - you should be good to roll now. My apologies.

This commit was SVN r3788.

src/mca/gpr/proxy/gpr_proxy_cleanup.c

@@ -60,6 +60,10 @@ void mca_gpr_proxy_cleanup_proc(bool purge, ompi_process_name_t *proc)
 	return;
     }
 
+    if (mca_gpr_proxy_debug) {
+        ompi_output(0, "[%d,%d,%d] cleanup_process: function entered for proc [%d,%d,%d]",
+            OMPI_NAME_ARGS(*ompi_rte_get_self()), OMPI_NAME_ARGS(*proc));
+    }
 
     if (OMPI_SUCCESS != ompi_buffer_init(&cmd, 0)) { /* got a problem */
 	return;

src/mca/gpr/replica/gpr_replica_cleanup.c

@@ -70,7 +70,7 @@ void mca_gpr_replica_cleanup_job_nl(mca_ns_base_jobid_t jobid)
 void mca_gpr_replica_cleanup_proc(bool purge, ompi_process_name_t *proc)
 {
     OMPI_THREAD_LOCK(&mca_gpr_replica_mutex);
-    mca_gpr_replica_cleanup_proc_nl(purge, ompi_rte_get_self());
+    mca_gpr_replica_cleanup_proc_nl(purge, proc);
     OMPI_THREAD_UNLOCK(&mca_gpr_replica_mutex);
 }
 
@@ -83,8 +83,8 @@ void mca_gpr_replica_cleanup_proc_nl(bool purge, ompi_process_name_t *proc)
     mca_ns_base_jobid_t jobid;
 
 	if (mca_gpr_replica_debug) {
-		ompi_output(0, "[%d,%d,%d] gpr_replica_cleanup_proc: function entered",
-					OMPI_NAME_ARGS(*ompi_rte_get_self()));
+		ompi_output(0, "[%d,%d,%d] gpr_replica_cleanup_proc: function entered for process [%d,%d,%d]",
+					OMPI_NAME_ARGS(*ompi_rte_get_self()), OMPI_NAME_ARGS(*proc));
 	}
 	
     procname = ompi_name_server.get_proc_name_string(proc);
@@ -114,6 +114,9 @@ void mca_gpr_replica_cleanup_proc_nl(bool purge, ompi_process_name_t *proc)
         				}
         		    		trig->count--;
         			}
+                 if (mca_gpr_replica_debug) {
+                    ompi_output(0, "\ttrigger level %d current count %d", trig->trigger, trig->count);
+                 }
         	    }
         	    mca_gpr_replica_check_synchros(seg);
         	}