Increment active_req_cnt when issuing the packet.

Increment active_req_cnt when actually issuing the packet
instead of issuing the operation, since we may cut one
operation into multiple packets.

Signed-off-by: Pavan Balaji <balaji@anl.gov>

src/mpid/ch3/include/mpid_rma_issue.h

@@ -375,6 +375,9 @@ static int issue_put_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr,
             MPIU_ERR_POP(mpi_errno);
     }
 
+    if (rma_op->request != NULL)
+        win_ptr->active_req_cnt++;
+
   fn_exit:
     MPIDI_RMA_FUNC_EXIT(MPID_STATE_ISSUE_PUT_OP);
     return mpi_errno;
@@ -420,6 +423,9 @@ static int issue_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr,
             MPIU_ERR_POP(mpi_errno);
     }
 
+    if (rma_op->request != NULL)
+        win_ptr->active_req_cnt++;
+
   fn_exit:
     MPIDI_RMA_FUNC_EXIT(MPID_STATE_ISSUE_ACC_OP);
     return mpi_errno;
@@ -519,6 +525,9 @@ static int issue_get_acc_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr,
     /* For error checking */
     resp_req = NULL;
 
+    if (rma_op->request != NULL)
+        win_ptr->active_req_cnt++;
+
   fn_exit:
     MPIDI_RMA_FUNC_EXIT(MPID_STATE_ISSUE_GET_ACC_OP);
     return mpi_errno;
@@ -624,6 +633,9 @@ static int issue_get_op(MPIDI_RMA_Op_t * rma_op, MPID_Win * win_ptr,
         MPID_Request_release(req);
     }
 
+    if (rma_op->request != NULL)
+        win_ptr->active_req_cnt++;
+
   fn_exit:
     MPIDI_RMA_FUNC_EXIT(MPID_STATE_ISSUE_GET_OP);
     return mpi_errno;
@@ -680,6 +692,9 @@ static int issue_cas_op(MPIDI_RMA_Op_t * rma_op,
         MPID_Request_release(rmw_req);
     }
 
+    if (rma_op->request != NULL)
+        win_ptr->active_req_cnt++;
+
   fn_exit:
     MPIDI_RMA_FUNC_EXIT(MPID_STATE_ISSUE_CAS_OP);
     return mpi_errno;
@@ -776,6 +791,9 @@ static int issue_fop_op(MPIDI_RMA_Op_t * rma_op,
     /* For error checking */
     resp_req = NULL;
 
+    if (rma_op->request != NULL)
+        win_ptr->active_req_cnt++;
+
   fn_exit:
     MPIDI_RMA_FUNC_EXIT(MPID_STATE_ISSUE_FOP_OP);
     return mpi_errno;

src/mpid/ch3/src/ch3u_rma_oplist.c

@@ -362,9 +362,6 @@ static inline int issue_ops_target(MPID_Win * win_ptr, MPIDI_RMA_Target_t * targ
 
         (*made_progress) = 1;
 
-        if (curr_op->request != NULL)
-            win_ptr->active_req_cnt++;
-
         if (curr_op->pkt.type == MPIDI_CH3_PKT_PUT ||
             curr_op->pkt.type == MPIDI_CH3_PKT_PUT_IMMED ||
             curr_op->pkt.type == MPIDI_CH3_PKT_ACCUMULATE ||