Commit b2c8d888 authored by Kenneth Raffenetti's avatar Kenneth Raffenetti Committed by Antonio Pena Monferrer
Browse files

portals4: change variable name put_acked -> put_done



Helps clarity since we no longer use ACKs in the netmod code.
Signed-off-by: default avatarAntonio Pena Monferrer <apenya@mcs.anl.gov>
parent f3fb46ae
...@@ -49,7 +49,7 @@ typedef struct { ...@@ -49,7 +49,7 @@ typedef struct {
ptl_handle_me_t put_me; ptl_handle_me_t put_me;
ptl_handle_me_t *get_me_p; ptl_handle_me_t *get_me_p;
int num_gets; int num_gets;
int put_acked; int put_done;
ptl_size_t chunk_offset; ptl_size_t chunk_offset;
void *chunk_buffer[MPID_NEM_PTL_NUM_CHUNK_BUFFERS]; void *chunk_buffer[MPID_NEM_PTL_NUM_CHUNK_BUFFERS];
MPIDI_msg_sz_t bytes_put; MPIDI_msg_sz_t bytes_put;
...@@ -72,7 +72,7 @@ typedef struct { ...@@ -72,7 +72,7 @@ typedef struct {
REQ_PTL(req_)->put_me = PTL_INVALID_HANDLE; \ REQ_PTL(req_)->put_me = PTL_INVALID_HANDLE; \
REQ_PTL(req_)->get_me_p = NULL; \ REQ_PTL(req_)->get_me_p = NULL; \
REQ_PTL(req_)->num_gets = 0; \ REQ_PTL(req_)->num_gets = 0; \
REQ_PTL(req_)->put_acked = 0; \ REQ_PTL(req_)->put_done = 0; \
REQ_PTL(req_)->event_handler = NULL; \ REQ_PTL(req_)->event_handler = NULL; \
REQ_PTL(req_)->chunk_offset = 0; \ REQ_PTL(req_)->chunk_offset = 0; \
} while (0) } while (0)
......
...@@ -177,7 +177,7 @@ static inline int send_pkt(MPIDI_VC_t *vc, void *hdr_p, void *data_p, MPIDI_msg_ ...@@ -177,7 +177,7 @@ static inline int send_pkt(MPIDI_VC_t *vc, void *hdr_p, void *data_p, MPIDI_msg_
NEW_TAG(sendbuf->tag); NEW_TAG(sendbuf->tag);
TMPBUF(sreq) = NULL; TMPBUF(sreq) = NULL;
REQ_PTL(sreq)->num_gets = 0; REQ_PTL(sreq)->num_gets = 0;
REQ_PTL(sreq)->put_acked = 0; REQ_PTL(sreq)->put_done = 0;
if (data_sz) { if (data_sz) {
MPIU_Memcpy(sendbuf->packet + sizeof(MPIDI_CH3_Pkt_t), data_p, sent_sz); MPIU_Memcpy(sendbuf->packet + sizeof(MPIDI_CH3_Pkt_t), data_p, sent_sz);
...@@ -230,7 +230,7 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p) ...@@ -230,7 +230,7 @@ static int send_noncontig_pkt(MPIDI_VC_t *vc, MPID_Request *sreq, void *hdr_p)
NEW_TAG(sendbuf->tag); NEW_TAG(sendbuf->tag);
TMPBUF(sreq) = NULL; TMPBUF(sreq) = NULL;
REQ_PTL(sreq)->num_gets = 0; REQ_PTL(sreq)->num_gets = 0;
REQ_PTL(sreq)->put_acked = 0; REQ_PTL(sreq)->put_done = 0;
if (sreq->dev.segment_size) { if (sreq->dev.segment_size) {
MPIDI_msg_sz_t last = sent_sz; MPIDI_msg_sz_t last = sent_sz;
...@@ -456,7 +456,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) ...@@ -456,7 +456,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e)
if (--REQ_PTL(req)->num_gets == 0) { if (--REQ_PTL(req)->num_gets == 0) {
MPIU_Free(TMPBUF(req)); MPIU_Free(TMPBUF(req));
if (REQ_PTL(req)->put_acked) if (REQ_PTL(req)->put_done)
on_data_avail(req); /* Otherwise we'll do it on the SEND */ on_data_avail(req); /* Otherwise we'll do it on the SEND */
} }
} }
...@@ -467,7 +467,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e) ...@@ -467,7 +467,7 @@ int MPID_nem_ptl_nm_ctl_event_handler(const ptl_event_t *e)
MPID_Request *const req = e->user_ptr; MPID_Request *const req = e->user_ptr;
MPIU_Free(SENDBUF(req)); MPIU_Free(SENDBUF(req));
REQ_PTL(req)->put_acked = 1; REQ_PTL(req)->put_done = 1;
if (REQ_PTL(req)->num_gets == 0) /* Otherwise GET will do it */ if (REQ_PTL(req)->num_gets == 0) /* Otherwise GET will do it */
on_data_avail(req); on_data_avail(req);
} }
......
...@@ -104,13 +104,13 @@ static int handler_large(const ptl_event_t *e) ...@@ -104,13 +104,13 @@ static int handler_large(const ptl_event_t *e)
MPIU_Assert(e->type == PTL_EVENT_SEND || e->type == PTL_EVENT_GET); MPIU_Assert(e->type == PTL_EVENT_SEND || e->type == PTL_EVENT_GET);
if (e->type == PTL_EVENT_SEND) { if (e->type == PTL_EVENT_SEND) {
REQ_PTL(sreq)->put_acked = 1; REQ_PTL(sreq)->put_done = 1;
} else if (e->type == PTL_EVENT_GET) { } else if (e->type == PTL_EVENT_GET) {
/* decrement the remaining get operations */ /* decrement the remaining get operations */
REQ_PTL(sreq)->num_gets--; REQ_PTL(sreq)->num_gets--;
} }
if (REQ_PTL(sreq)->num_gets == 0 && REQ_PTL(sreq)->put_acked) if (REQ_PTL(sreq)->num_gets == 0 && REQ_PTL(sreq)->put_done)
mpi_errno = handler_send_complete(e); mpi_errno = handler_send_complete(e);
fn_exit: fn_exit:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment