From eb7e72258881b739dbe19dc1846a877fa1487b1d Mon Sep 17 00:00:00 2001
From: Brian Barrett <brbarret@open-mpi.org>
Date: Tue, 21 Feb 2006 18:43:28 +0000
Subject: [PATCH] * clean up some of the debugging in the onesided code so that
 I can understand   what is going on * Fix a dumb error where if a lock was
 released and another was pending, I   would send a lock *request* to the
 queued process, rather than giving   him the lock and sending him a lock
 *ack*.  Turns out requests and   acks are different things :)

This commit was SVN r9103.
---
 ompi/mca/osc/pt2pt/osc_pt2pt_component.c | 13 ++++++++-----
 ompi/mca/osc/pt2pt/osc_pt2pt_sync.c      | 21 ++++++++++++++-------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c
index 786883531c..dc58268b4c 100644
--- a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c
+++ b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c
@@ -288,19 +288,22 @@ ompi_osc_pt2pt_component_select(ompi_win_t *win,
                                      module->p2p_comm->c_contextid,
                                      module);
     OPAL_THREAD_UNLOCK(&mca_osc_pt2pt_component.p2p_c_lock);
-                                     
+
     /* fill in window information */
     win->w_osc_module = (ompi_osc_base_module_t*) module;
-    if (!want_locks(info)) win->w_flags |= OMPI_WIN_NO_LOCKS;
+    if (!want_locks(info)) {
+        opal_output(0, "disabling locks on new window");
+        win->w_flags |= OMPI_WIN_NO_LOCKS;
+    }
+
+    /* sync memory - make sure all initialization completed */
+    opal_atomic_mb();
 
     /* register to receive fragment callbacks */
     ret = mca_bml.bml_register(MCA_BTL_TAG_OSC_PT2PT,
                                ompi_osc_pt2pt_component_fragment_cb,
                                NULL);
 
-    /* sync memory - make sure all initialization completed */
-    opal_atomic_mb();
-
     return ret;
 }
 
diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_sync.c b/ompi/mca/osc/pt2pt/osc_pt2pt_sync.c
index 9af40ddd5f..abb4137c09 100644
--- a/ompi/mca/osc/pt2pt/osc_pt2pt_sync.c
+++ b/ompi/mca/osc/pt2pt/osc_pt2pt_sync.c
@@ -412,7 +412,8 @@ ompi_osc_pt2pt_module_lock(int lock_type,
     /* set our mode on the window */
     ompi_win_set_mode(win, OMPI_WIN_ACCESS_EPOCH | OMPI_WIN_LOCK_ACCESS);
 
-    opal_output(0, "sending lock request to %d", target);
+    opal_output(0, "%d sending lock request to %d", 
+                P2P_MODULE(win)->p2p_comm->c_my_rank, target);
     /* generate a lock request */
     ompi_osc_pt2pt_control_send(P2P_MODULE(win), 
                                 proc,
@@ -468,7 +469,8 @@ ompi_osc_pt2pt_module_unlock(int target,
     }
 
     /* send the unlock request */
-    opal_output(0, "sending unlock request to %d", target);
+    opal_output(0, "%d sending unlock request to %d", 
+                P2P_MODULE(win)->p2p_comm->c_my_rank, target);
     ompi_osc_pt2pt_control_send(P2P_MODULE(win), 
                                 proc,
                                 OMPI_OSC_PT2PT_HDR_UNLOCK_REQ,
@@ -498,7 +500,8 @@ ompi_osc_pt2pt_passive_lock(ompi_osc_pt2pt_module_t *module,
             module->p2p_lock_status = MPI_LOCK_EXCLUSIVE;
             send_ack = true;
         } else {
-            opal_output(0, "queuing lock request from %d (%d)", origin, lock_type);
+            opal_output(0, "%d queuing lock request from %d (%d)", 
+                        module->p2p_comm->c_my_rank, origin, lock_type);
             new_pending = OBJ_NEW(ompi_osc_pt2pt_pending_lock_t);
             new_pending->proc = proc;
             new_pending->lock_type = lock_type;
@@ -510,7 +513,8 @@ ompi_osc_pt2pt_passive_lock(ompi_osc_pt2pt_module_t *module,
             module->p2p_shared_count++;
             send_ack = true;
         } else {
-            opal_output(0, "queuing lock request from %d (%d)", origin, lock_type);
+            opal_output(0, "queuing lock request from %d (%d)", 
+                        module->p2p_comm->c_my_rank, origin, lock_type);
             new_pending = OBJ_NEW(ompi_osc_pt2pt_pending_lock_t);
             new_pending->proc = proc;
             new_pending->lock_type = lock_type;
@@ -522,7 +526,8 @@ ompi_osc_pt2pt_passive_lock(ompi_osc_pt2pt_module_t *module,
     OPAL_THREAD_UNLOCK(&(module->p2p_lock));
 
     if (send_ack) {
-        opal_output(0, "sending lock ack to %d", origin);
+        opal_output(0, "%d sending lock ack to %d", 
+                    module->p2p_comm->c_my_rank, origin);
         ompi_osc_pt2pt_control_send(module, proc,
                                     OMPI_OSC_PT2PT_HDR_LOCK_REQ,
                                     module->p2p_comm->c_my_rank,
@@ -565,12 +570,14 @@ ompi_osc_pt2pt_passive_unlock(ompi_osc_pt2pt_module_t *module,
 
     if (NULL != new_pending) {
         opal_output(0, "sending lock request to proc");
-        /* generate a lock request */
+        /* set lock state and generate a lock request */
+        module->p2p_lock_status = new_pending->lock_type;
         ompi_osc_pt2pt_control_send(module,
                                     new_pending->proc,
                                     OMPI_OSC_PT2PT_HDR_LOCK_REQ,
                                     module->p2p_comm->c_my_rank,
-                                    new_pending->lock_type);
+                                    OMPI_SUCCESS);
+        OBJ_DESTRUCT(new_pending);
     }
 
     return OMPI_SUCCESS;