Commit 39cb917f authored by Darius Buntinas's avatar Darius Buntinas
Browse files

[svn-r10461] added debugging messages and check for request private area size

parent 2f24577b
......@@ -23,7 +23,6 @@ ptl_pt_index_t MPIDI_nem_ptl_control_pt; /* portal for MPICH control messages *
ptl_handle_eq_t MPIDI_nem_ptl_eq;
ptl_handle_md_t MPIDI_nem_ptl_global_md;
extern ptl_handle_md_t MPIDI_nem_ptl_global_md;
static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max_sz_p);
static int ptl_finalize(void);
static int get_business_card(int my_rank, char **bc_val_p, int *val_max_sz_p);
......@@ -83,8 +82,9 @@ static int ptl_init(MPIDI_PG_t *pg_p, int pg_rank, char **bc_val_p, int *val_max
MPIDI_FUNC_ENTER(MPID_STATE_PTL_INIT);
/* first make sure that our private fields in the vc fit into the area provided */
/* first make sure that our private fields in the vc and req fit into the area provided */
MPIU_Assert(sizeof(MPID_nem_ptl_vc_area) <= MPID_NEM_VC_NETMOD_AREA_LEN);
MPIU_Assert(sizeof(MPID_nem_ptl_req_area) <= MPID_NEM_REQ_NETMOD_AREA_LEN);
/* Make sure our IOV is the same as portals4's IOV */
MPIU_Assert(sizeof(ptl_iovec_t) == sizeof(MPID_IOV));
......
......@@ -10,7 +10,7 @@
#define BUFLEN (sizeof(MPIDI_CH3_Pkt_t) + PTL_MAX_EAGER)
#define OVERFLOW_LENGTH (1024*1024)
#define NUM_OVERFLOW_ME 5
#define NUM_OVERFLOW_ME 50
#if 0
static char recvbuf[BUFLEN][NUMBUFS];
......@@ -186,6 +186,8 @@ int MPID_nem_ptl_poll(int is_blocking_poll)
case PTL_EVENT_REPLY:
case PTL_EVENT_SEARCH: {
MPID_Request * const req = event.user_ptr;
MPIU_DBG_MSG_P(CH3_CHANNEL, VERBOSE, "req = %p", req);
MPIU_DBG_MSG_P(CH3_CHANNEL, VERBOSE, "REQ_PTL(req)->event_handler = %p", REQ_PTL(req)->event_handler);
mpi_errno = REQ_PTL(req)->event_handler(&event);
if (mpi_errno) MPIU_ERR_POP(mpi_errno);
break;
......@@ -201,7 +203,7 @@ int MPID_nem_ptl_poll(int is_blocking_poll)
/* ignore */
break;
default:
MPIDI_err_printf(FCNAME, "Received unexpected event type: %d", event.type);
MPIDI_err_printf(FCNAME, "Received unexpected event type: %d %s", event.type, MPID_nem_ptl_strevent(&event));
MPIU_ERR_INTERNALANDJUMP(mpi_errno, "Unexpected event type");
}
}
......
......@@ -51,7 +51,7 @@ static int handler_recv_complete(const ptl_event_t *e)
MPIDI_FUNC_ENTER(MPID_STATE_HANDLER_RECV_COMPLETE);
MPIU_Assert(e->type == PTL_EVENT_REPLY || e->type == PTL_EVENT_PUT);
MPIU_Assert(e->type == PTL_EVENT_REPLY || e->type == PTL_EVENT_PUT || e->type == PTL_EVENT_PUT_OVERFLOW);
if (REQ_PTL(rreq)->md != PTL_INVALID_HANDLE) {
ret = PtlMDRelease(REQ_PTL(rreq)->md);
......@@ -156,7 +156,7 @@ static int handler_recv_dequeue_unpack_complete(const ptl_event_t *e)
MPIDI_FUNC_ENTER(MPID_STATE_HANDLER_RECV_DEQUEUE_UNPACK_COMPLETE);
MPIU_Assert(e->type == PTL_EVENT_PUT);
MPIU_Assert(e->type == PTL_EVENT_PUT || e->type == PTL_EVENT_PUT_OVERFLOW);
dequeue_req(e);
mpi_errno = handler_recv_unpack_complete(e);
......
......@@ -812,12 +812,17 @@ static int send_msg(ptl_hdr_data_t ssend_flag, struct MPIDI_VC *vc, const void *
/* Small message. Send all data eagerly */
if (dt_contig) {
REQ_PTL(sreq)->event_handler = handler_send_complete;
MPIU_DBG_MSG_P(CH3_CHANNEL, VERBOSE, "&REQ_PTL(sreq)->event_handler = %p", &(REQ_PTL(sreq)->event_handler));
ret = PtlPut(MPIDI_nem_ptl_global_md, (ptl_size_t)buf, data_sz, PTL_ACK_REQ, vc_ptl->id, vc_ptl->pt,
NPTL_MATCH(tag, comm->context_id + context_offset, comm->rank), 0, sreq,
NPTL_HEADER(ssend_flag, 0, data_sz));
MPIU_ERR_CHKANDJUMP1(ret, mpi_errno, MPI_ERR_OTHER, "**ptlput", "**ptlput %s", MPID_nem_ptl_strerror(ret));
DBG_MSG_PUT("global", data_sz, vc->pg_rank, NPTL_MATCH(tag, comm->context_id + context_offset, comm->rank), NPTL_HEADER(ssend_flag, 0, data_sz));
goto fn_exit;
MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "id.nid = %#x", vc_ptl->id.phys.nid);
MPIU_DBG_MSG_D(CH3_CHANNEL, VERBOSE, "id.pid = %#x", vc_ptl->id.phys.pid);
MPIU_DBG_MSG_P(CH3_CHANNEL, VERBOSE, "sreq = %p", sreq);
MPIU_DBG_MSG_P(CH3_CHANNEL, VERBOSE, "REQ_PTL(sreq)->event_handler = %p", REQ_PTL(sreq)->event_handler);
goto fn_exit;
}
/* noncontig data */
......
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